Mercurial > mbsePi-apps / file diff

--- a/www-thermferm/liveview.php	Tue Sep 15 17:29:15 2015 +0200
+++ b/www-thermferm/liveview.php	Wed Sep 16 22:05:05 2015 +0200
@@ -37,7 +37,8 @@
 
     if (startsWith($arr[0], "213")) {
 
-	$set_temperature = "NA";
+	$set_temperature_lo = "NA";
+	$set_temperature_hi = "NA";
 	$air_temperature = "NA";
 	$beer_temperature = "NA";
 	$profile = "";
@@ -90,13 +91,16 @@
 		$prof_state = $vals[1];
 	    }
 	    if (($vals[0] == "BEER_SET") && ($mode == "BEER")) {
-		$set_temperature = $vals[1];
+		$set_temperature_lo = $set_temperature_hi = $vals[1];
 	    }
 	    if (($vals[0] == "FRIDGE_SET") && ($mode == "FRIDGE")) {
-		$set_temperature = $vals[1];
+		$set_temperature_lo = $set_temperature_hi = $vals[1];
 	    }
-	    if (($vals[0] == "PROF_TARGET") && ($mode == "PROFILE")) {
-		$set_temperature = $vals[1];
+	    if (($vals[0] == "PROF_TARGET_LO") && ($mode == "PROFILE")) {
+		$set_temperature_lo = $vals[1];
+	    }
+	    if (($vals[0] == "PROF_TARGET_HI") && ($mode == "PROFILE")) {
+		$set_temperature_hi = $vals[1];
 	    }
 	}
 
@@ -114,7 +118,8 @@
 	$outstr .= '             { name: "Mode" },'.PHP_EOL;
 	$outstr .= '             { name: "Air", type: "float" },'.PHP_EOL;
 	$outstr .= '             { name: "Beer", type: "float" },'.PHP_EOL;
-	$outstr .= '             { name: "Target", type: "float" },'.PHP_EOL;
+	$outstr .= '             { name: "Target_lo", type: "float" },'.PHP_EOL;
+	$outstr .= '             { name: "Target_hi", type: "float" },'.PHP_EOL;
 	$outstr .= '             { name: "Heater", type: "int" },'.PHP_EOL;
 	$outstr .= '             { name: "Cooler", type: "int" },'.PHP_EOL;
 	$outstr .= '             { name: "HeatUse", type: "int" },'.PHP_EOL;
@@ -181,7 +186,8 @@
 	$outstr .= '             series: ['.PHP_EOL;
 	$outstr .= '               { dataField: "Air", lineWidth: 1, displayText: "Air" },'.PHP_EOL;
 	$outstr .= '               { dataField: "Beer", lineWidth: 2, displayText: "Beer" },'.PHP_EOL;
-	$outstr .= '               { dataField: "Target", lineWidth: 1, displayText: "Target", opacity: 0.7 },'.PHP_EOL;
+	$outstr .= '               { dataField: "Target_lo", lineWidth: 1, displayText: "Target Lo", opacity: 0.7 },'.PHP_EOL;
+	$outstr .= '               { dataField: "Target_hi", lineWidth: 1, displayText: "Target Hi", opacity: 0.7 },'.PHP_EOL;
 	$outstr .= '               { dataField: "Room", lineWidth: 1, displayText: "Room", opacity: 0.5 }'.PHP_EOL;
 	$outstr .= '             ]'.PHP_EOL;
 	$outstr .= '           }]'.PHP_EOL;
@@ -226,7 +232,8 @@
 	$outstr .= '         $.getJSON("getstate.php?uuid='.$unit.'", function(data) {'.PHP_EOL;
 	$outstr .= '           $("#load_air_'.$unr.'").html(data.air_temperature);'.PHP_EOL;
 	$outstr .= '           $("#load_beer_'.$unr.'").html(data.beer_temperature);'.PHP_EOL;
-	$outstr .= '           $("#load_target_'.$unr.'").html(data.target_temperature);'.PHP_EOL;
+	$outstr .= '           $("#load_target_lo_'.$unr.'").html(data.target_temperature_lo);'.PHP_EOL;
+	$outstr .= '           $("#load_target_hi_'.$unr.'").html(data.target_temperature_hi);'.PHP_EOL;
 	$outstr .= '           $("#load_select_'.$unr.'").html(data.mode);'.PHP_EOL;
 	$outstr .= '           $("#load_led1_'.$unr.'").html(data.led1);'.PHP_EOL;
 	$outstr .= '           $("#load_led2_'.$unr.'").html(data.led2);'.PHP_EOL;
@@ -270,14 +277,14 @@
 	$outstr .= '      <div id="fermentor_mode_control">'.PHP_EOL;
 	if ($mode == "FRIDGE") {
 	    $outstr .= '       <form id="set_fridge_'.$unr.'" action="index.php" method="post">'.PHP_EOL;
-	    $outstr .= '        <input type="text" name="Fridge" size="5" value="'.$set_temperature.'"><br>'.PHP_EOL;
+	    $outstr .= '        <input type="text" name="Fridge" size="5" value="'.$set_temperature_lo.'"><br>'.PHP_EOL;
 	    $outstr .= '        <input type="submit" value="Set" name="key">'.PHP_EOL;
 	    $outstr .= '        <input type="hidden" value="'.$unit.'" name="UUID">'.PHP_EOL;
 	    $outstr .= '       </form>'.PHP_EOL;
 	}
 	if ($mode == "BEER") {
 	    $outstr .= '       <form id="set_beer_'.$unr.'" action="index.php" method="post">'.PHP_EOL;
-	    $outstr .= '        <input type="text" name="Beer" size="5" value="'.$set_temperature.'">'.PHP_EOL;
+	    $outstr .= '        <input type="text" name="Beer" size="5" value="'.$set_temperature_lo.'">'.PHP_EOL;
 	    $outstr .= '        <input type="submit" value="Set" name="key">'.PHP_EOL;
 	    $outstr .= '        <input type="hidden" value="'.$unit.'" name="UUID">'.PHP_EOL;
 	    $outstr .= '       </form>'.PHP_EOL;
@@ -354,7 +361,8 @@
 
 	$outstr .= '     <div id="fermentor_panel_display">'.PHP_EOL;
 	$outstr .= '      <div id="fermentor_display1">'.PHP_EOL;
-	$outstr .= '       <div id="load_target_'.$unr.'" class="dtemp">'.$set_temperature.'</div>Set'.PHP_EOL;
+	$outstr .= '       <div id="load_target_hi_'.$unr.'" class="htemp">'.$set_temperature_hi.'</div>'.PHP_EOL;
+	$outstr .= '       <div id="load_target_lo_'.$unr.'" class="ltemp">'.$set_temperature_lo.'</div>'.PHP_EOL;
 	$outstr .= '      </div>'.PHP_EOL;
 	$outstr .= '      <div id="fermentor_display2">'.PHP_EOL;
 	$outstr .= '       <div id="load_air_'.$unr.'" class="dtemp">'.$air_temperature.'</div>Air'.PHP_EOL;