Manual start program does not respect weather scaling

[morthul]

Normal loop:
unsigned long water_time = (unsigned long)water_time_decode(prog.durations[sid]);
// if the program is set to use weather scaling
if (prog.use_weather)
water_time = water_time * os.options[OPTION_WATER_PERCENTAGE].value / 100;
pd.scheduled_stop_time[sid] = water_time;

Manual start:
else if(pid>0)
dur = water_time_decode(prog.durations[sid]);
if (dur>0 && !(os.stndis_bits[bid]&(1<<s))) {
pd.scheduled_stop_time[sid] = dur;

Shouldn't we be scaling the duration in a manual start by the weather setting?

[morthul]

Completely untested (not even compiled, don't have a dev environment set up for this right now):

Something like changing this:

else if(pid>0)
  dur = water_time_decode(prog.durations[sid]);

To this:

else if(pid>0) {
  unsigned long water_time = (unsigned long)water_time_decode(prog.durations[sid]);
  // if the program is set to use weather scaling
  if (prog.use_weather) water_time = water_time * os.options[OPTION_WATER_PERCENTAGE].value / 100;
  dur = water_time;
}

[rayshobby]

As specified in the user manual: Manual start program will ignore water percentage, this is because 'manual start program' is assumed to be manually overriding the normal sprinkler programs, therefore it should not observe water percentage, to avoid confusion (for example, a user who wants to manually start a program that waters each station 10 minutes will not want the water percentage to change the timing).

[morthul]

Thanks, Ray - I totally understand that in principle and missed that in the manual. I think it's confusing personally, though ;-)