diff -r 66d4e137b99d -r 00ca08f5a6f8 www-thermferm/profiles.php --- a/www-thermferm/profiles.php Tue Sep 15 17:29:15 2015 +0200 +++ b/www-thermferm/profiles.php Wed Sep 16 22:05:05 2015 +0200 @@ -22,6 +22,8 @@ *****************************************************************************/ require_once('utilities.php'); +$my_style = 'ui-redmond'; + /* * Each time this page is loaded, get the profiles from the server. @@ -68,14 +70,14 @@ * $steps contains all steps of a profile */ $steps = array ( - 1 => array("steptime" => 0, "resttime" => 0, "target" => 20.0 ), - 2 => array("steptime" => 0, "resttime" => 0, "target" => 20.0 ), - 3 => array("steptime" => 0, "resttime" => 0, "target" => 20.0 ), - 4 => array("steptime" => 0, "resttime" => 0, "target" => 20.0 ), - 5 => array("steptime" => 0, "resttime" => 0, "target" => 20.0 ), - 6 => array("steptime" => 0, "resttime" => 0, "target" => 20.0 ), - 7 => array("steptime" => 0, "resttime" => 0, "target" => 20.0 ), - 8 => array("steptime" => 0, "resttime" => 0, "target" => 20.0 ), + 1 => array("steptime" => 0, "resttime" => 0, "target_lo" => 19.8, "target_hi" => 20.2, "fridge_mode" => 0 ), + 2 => array("steptime" => 0, "resttime" => 0, "target_lo" => 19.8, "target_hi" => 20.2, "fridge_mode" => 0 ), + 3 => array("steptime" => 0, "resttime" => 0, "target_lo" => 19.8, "target_hi" => 20.2, "fridge_mode" => 0 ), + 4 => array("steptime" => 0, "resttime" => 0, "target_lo" => 19.8, "target_hi" => 20.2, "fridge_mode" => 0 ), + 5 => array("steptime" => 0, "resttime" => 0, "target_lo" => 19.8, "target_hi" => 20.2, "fridge_mode" => 0 ), + 6 => array("steptime" => 0, "resttime" => 0, "target_lo" => 19.8, "target_hi" => 20.2, "fridge_mode" => 0 ), + 7 => array("steptime" => 0, "resttime" => 0, "target_lo" => 19.8, "target_hi" => 20.2, "fridge_mode" => 0 ), + 8 => array("steptime" => 0, "resttime" => 0, "target_lo" => 19.8, "target_hi" => 20.2, "fridge_mode" => 0 ), ); $answer = send_cmd("PROFILE GETS ".$UUID); @@ -89,7 +91,9 @@ $f = explode(",", $psteps[$j]); $steps[$j]["steptime"] = $f[0]; $steps[$j]["resttime"] = $f[1]; - $steps[$j]["target"] = $f[2]; + $steps[$j]["target_lo"] = $f[2]; + $steps[$j]["target_hi"] = $f[3]; + $steps[$j]["fridge_mode"] = $f[4]; $j++; } } @@ -111,7 +115,9 @@ $outstr .= ' Step'.PHP_EOL; $outstr .= ' Steptime'.PHP_EOL; $outstr .= ' Resttime'.PHP_EOL; - $outstr .= ' Temperature'.PHP_EOL; + $outstr .= ' Temp low'.PHP_EOL; + $outstr .= ' Temp high'.PHP_EOL; + $outstr .= ' Fridge mode'.PHP_EOL; $outstr .= ' '.PHP_EOL; for ($i = 1; $i <= 8; $i++) { @@ -119,7 +125,12 @@ $outstr .= ' Step '.$i.''.PHP_EOL; $outstr .= ' '.PHP_EOL; $outstr .= ' '.PHP_EOL; - $outstr .= ' '.PHP_EOL; + $outstr .= ' '.PHP_EOL; + $outstr .= ' '.PHP_EOL; + $outstr .= ' 30)) - return 3; + if (($_POST['target_lo'.$i] < -5) || ($_POST['target_lo'.$i] > 30)) + return 3; + if (($_POST['target_hi'.$i] < -5) || ($_POST['target_hi'.$i] > 30)) + return 3; + if ($_POST['target_lo'.$i] > $_POST['target_hi'.$i]) + return 3; } } else { return 1; @@ -260,11 +288,13 @@ case 0: $cmd = array("PROFILE PUTS ".$_POST['UUID']); for ($i = 1; $i <= 8; $i++) { if (($_POST['steptime'.$i] > 0) || ($_POST['resttime'.$i] > 0)) { - $cmd[] = $_POST['steptime'.$i].','.$_POST['resttime'.$i].','.$_POST['target'.$i]; + $cmd[] = $_POST['steptime'.$i].','.$_POST['resttime'.$i].','.$_POST['target_lo'.$i].','.$_POST['target_hi'.$i].','.$_POST['fridge_mode'.$i]; } unset($_POST['steptime'.$i]); unset($_POST['resttime'.$i]); - unset($_POST['target'.$i]); + unset($_POST['target_lo'.$i]); + unset($_POST['target_hi'.$i]); + unset($_POST['fridge_mode'.$i]); } $cmd[] = "."; send_array($cmd); @@ -285,14 +315,14 @@ } $steps = array ( - 1 => array("steptime" => $_POST['steptime1'], "resttime" => $_POST['resttime1'], "target" => $_POST['target1'] ), - 2 => array("steptime" => $_POST['steptime2'], "resttime" => $_POST['resttime2'], "target" => $_POST['target2'] ), - 3 => array("steptime" => $_POST['steptime3'], "resttime" => $_POST['resttime3'], "target" => $_POST['target3'] ), - 4 => array("steptime" => $_POST['steptime4'], "resttime" => $_POST['resttime4'], "target" => $_POST['target4'] ), - 5 => array("steptime" => $_POST['steptime5'], "resttime" => $_POST['resttime5'], "target" => $_POST['target5'] ), - 6 => array("steptime" => $_POST['steptime6'], "resttime" => $_POST['resttime6'], "target" => $_POST['target6'] ), - 7 => array("steptime" => $_POST['steptime7'], "resttime" => $_POST['resttime7'], "target" => $_POST['target7'] ), - 8 => array("steptime" => $_POST['steptime8'], "resttime" => $_POST['resttime8'], "target" => $_POST['target8'] ), + 1 => array("steptime" => $_POST['steptime1'], "resttime" => $_POST['resttime1'], "target_lo" => $_POST['target_lo1'], "target_hi" => $_POST['target_hi1'], "fridge_mode" => $_POST['mode_fridge1'] ), + 2 => array("steptime" => $_POST['steptime2'], "resttime" => $_POST['resttime2'], "target_lo" => $_POST['target_lo2'], "target_hi" => $_POST['target_hi2'], "fridge_mode" => $_POST['mode_fridge2'] ), + 3 => array("steptime" => $_POST['steptime3'], "resttime" => $_POST['resttime3'], "target_lo" => $_POST['target_lo3'], "target_hi" => $_POST['target_hi3'], "fridge_mode" => $_POST['mode_fridge3'] ), + 4 => array("steptime" => $_POST['steptime4'], "resttime" => $_POST['resttime4'], "target_lo" => $_POST['target_lo4'], "target_hi" => $_POST['target_hi4'], "fridge_mode" => $_POST['mode_fridge4'] ), + 5 => array("steptime" => $_POST['steptime5'], "resttime" => $_POST['resttime5'], "target_lo" => $_POST['target_lo5'], "target_hi" => $_POST['target_hi5'], "fridge_mode" => $_POST['mode_fridge5'] ), + 6 => array("steptime" => $_POST['steptime6'], "resttime" => $_POST['resttime6'], "target_lo" => $_POST['target_lo6'], "target_hi" => $_POST['target_hi6'], "fridge_mode" => $_POST['mode_fridge6'] ), + 7 => array("steptime" => $_POST['steptime7'], "resttime" => $_POST['resttime7'], "target_lo" => $_POST['target_lo7'], "target_hi" => $_POST['target_hi7'], "fridge_mode" => $_POST['mode_fridge7'] ), + 8 => array("steptime" => $_POST['steptime8'], "resttime" => $_POST['resttime8'], "target_lo" => $_POST['target_lo8'], "target_hi" => $_POST['target_hi8'], "fridge_mode" => $_POST['mode_fridge8'] ), ); edit_steps($_POST['UUID'], $steps, $error, "ThermFerm - Edit Profile Steps"); @@ -305,7 +335,9 @@ * * @param string $_POST['UUID'] Unique record UUID * @param string $_POST['Name'] Profile name - * @param float $_POST['Inittemp'] Profile initial temperature + * @param float $_POST['Inittemp_lo'] Profile initial temperature + * @param float $_POST['Inittemp_hi'] Profile initial temperature + * @param float $_POST['Fridge_mode'] Profile fridge mode * @param string $_POST['key'] Key choice, Save or Cancel * @param string $_POST['command'] Command used, 'add' or 'update' * @@ -319,7 +351,7 @@ global $arr; - if (isset($_POST['UUID']) && isset($_POST['Name']) && isset($_POST['Inittemp']) && isset($_POST['key']) && isset($_POST['command'])) { + if (isset($_POST['UUID']) && isset($_POST['Name']) && isset($_POST['Inittemp_lo']) && isset($_POST['Inittemp_hi']) && isset($_POST['key']) && isset($_POST['command'])) { if ($_POST['key'] == 'Cancel') return 99; @@ -426,12 +458,28 @@ $outstr .= ' '.PHP_EOL; $outstr .= ' '.PHP_EOL; } - if ($f[0] == "INITTEMP") { + if ($f[0] == "INITTEMP_LO") { $outstr .= ' '.PHP_EOL; - $outstr .= ' Initial temperature'.PHP_EOL; - $outstr .= ' '.PHP_EOL; + $outstr .= ' Initial temperature low'.PHP_EOL; + $outstr .= ' '.PHP_EOL; $outstr .= ' '.PHP_EOL; } + if ($f[0] == "INITTEMP_HI") { + $outstr .= ' '.PHP_EOL; + $outstr .= ' Initial temperature high'.PHP_EOL; + $outstr .= ' '.PHP_EOL; + $outstr .= ' '.PHP_EOL; + } + if ($f[0] == "FRIDGE_MODE") { + $outstr .= ' '.PHP_EOL; + $outstr .= ' Fridge mode'.PHP_EOL; + $outstr .= '