Skip to content

Commit 2f7c464

Browse files
committed
Fix run rununtilcompleteby variable
1 parent fe81cb0 commit 2f7c464

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

demandshaper_run.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,9 @@
196196
if (isset($schedule->settings->device_type)) $device_type = $schedule->settings->device_type;
197197
$ctrlmode = false;
198198
if (isset($schedule->settings->ctrlmode)) $ctrlmode = $schedule->settings->ctrlmode;
199-
199+
$rununtilcompleteby = false;
200+
if (isset($schedule->settings->rununtilcompleteby)) $ctrlmode = $schedule->settings->rununtilcompleteby;
201+
200202
if ($device_type && $ctrlmode)
201203
{
202204
$log->info(date("Y-m-d H:i:s")." Schedule:$device ".$schedule->settings->ctrlmode);
@@ -391,8 +393,8 @@
391393
}
392394
// -------------------------------------------------------------------
393395

394-
$forecast = get_forecast($redis,$schedule->settings->signal,$timezone);
395-
$schedule->runtime->periods = schedule_smart($forecast,$schedule->runtime->timeleft,$schedule->settings->end,$schedule->settings->interruptible,900,$timezone,$schedule->settings->rununtilcompleteby);
396+
$forecast = get_forecast($redis,$schedule->settings->signal,$timezone,$rununtilcompleteby);
397+
$schedule->runtime->periods = schedule_smart($forecast,$schedule->runtime->timeleft,$schedule->settings->end,$schedule->settings->interruptible,900,$timezone,$rununtilcompleteby);
396398

397399
} else if ($schedule->settings->ctrlmode=="timer") {
398400
$forecast = get_forecast($redis,$schedule->settings->signal,$timezone);

0 commit comments

Comments
 (0)