Mercurial > mbsePi-apps / changeset

--- a/www-thermferm/liveview.php	Fri Jul 18 16:33:41 2014 +0200
+++ b/www-thermferm/liveview.php	Fri Jul 18 16:57:27 2014 +0200
@@ -66,6 +66,10 @@
 
 	$outstr .= '    <div id="fermentor">'.PHP_EOL;
 
+	$set_temperature = "N/A";
+	$air_temperature = "N/A";
+	$beer_temperature = "N/A";
+
 	foreach($arr as $l) {
 	    $vals = explode(",", $l);
 	    if (strcmp($vals[0], "NAME") == 0) {
@@ -86,20 +90,14 @@
 	    if (strcmp($vals[0], "AIR_STATE") == 0) {
 		$air_state = $vals[1];
 	    }
-	    if (strcmp($vals[0], "AIR_TEMPERATURE") == 0) {
-		if ($air_state == 0)
-		    $air_temperature = $vals[1];
-		else
-		    $air_temperature = "N/A";
+	    if ((strcmp($vals[0], "AIR_TEMPERATURE") == 0) && ($air_state == 0)) {
+		$air_temperature = $vals[1];
 	    }
 	    if (strcmp($vals[0], "BEER_STATE") == 0) {
 		$beer_state = $vals[1];
 	    }
-	    if (strcmp($vals[0], "BEER_TEMPERATURE") == 0) {
-		if ($beer_state == 0)
-		    $beer_temperature = $vals[1];
-		else
-		    $beer_temperature = "N/A";
+	    if ((strcmp($vals[0], "BEER_TEMPERATURE") == 0) && ($beer_state == 0)) {
+		$beer_temperature = $vals[1];
 	    }
 	}
 	$outstr .= '     <div id="fermentor_panel">'.PHP_EOL;
@@ -107,35 +105,41 @@
 	$outstr .= '       Mode '.$mode.PHP_EOL;
 	$outstr .= '      </div>'.PHP_EOL;
 	$outstr .= '      <div id="fermentor_powerled">'.PHP_EOL;
+	$outstr .= '       PwrLED'.PHP_EOL;
 	$outstr .= '      </div>'.PHP_EOL;
 	$outstr .= '      <div id="fermentor_display1">'.PHP_EOL;
+	$outstr .= '       '.$set_temperature.'<br>Set'.PHP_EOL;
 	$outstr .= '      </div>'.PHP_EOL;
 	$outstr .= '      <div id="fermentor_display2">'.PHP_EOL;
-	$outstr .= '       Air<br>'.$air_temperature.PHP_EOL;
+	$outstr .= '       '.$air_temperature.'<br>Air'.PHP_EOL;
 	$outstr .= '      </div>'.PHP_EOL;
 	$outstr .= '      <div id="fermentor_display3">'.PHP_EOL;
-	$outstr .= '       Beer<br>'.$beer_temperature.PHP_EOL;
+	$outstr .= '       '.$beer_temperature.'<br>Beer'.PHP_EOL;
 	$outstr .= '      </div>'.PHP_EOL;
 	$outstr .= '      <div id="fermentor_led1">'.PHP_EOL;
+	$outstr .= '       CoolLED'.PHP_EOL;
 	$outstr .= '      </div>'.PHP_EOL;
 	$outstr .= '      <div id="fermentor_led2">'.PHP_EOL;
+	$outstr .= '       HeatLED'.PHP_EOL;
 	$outstr .= '      </div>'.PHP_EOL;
 	$outstr .= '      <div id="fermentor_led3">'.PHP_EOL;
+	$outstr .= '       FanLED'.PHP_EOL;
 	$outstr .= '      </div>'.PHP_EOL;
 	$outstr .= '      <div id="fermentor_toggle1">'.PHP_EOL;
+	$outstr .= '       CoolSW'.PHP_EOL;
 	$outstr .= '      </div>'.PHP_EOL;
 	$outstr .= '      <div id="fermentor_toggle2">'.PHP_EOL;
+	$outstr .= '       HeatSW'.PHP_EOL;
 	$outstr .= '      </div>'.PHP_EOL;
 	$outstr .= '      <div id="fermentor_toggle3">'.PHP_EOL;
+	$outstr .= '       FanSW'.PHP_EOL;
 	$outstr .= '      </div>'.PHP_EOL;
 	$outstr .= '     </div>'.PHP_EOL;
 	$outstr .= '     <div id="fermentor_control">'.PHP_EOL;
-//	$outstr .= '      mode ' . $mode . '<br>' .PHP_EOL;
-//	$outstr .= '      air temperature ' . $air_temperature . '<br>' .PHP_EOL;
-//	$outstr .= '      beer temperature ' . $beer_temperature . '<br>' .PHP_EOL;
 	$outstr .= '     </div>'.PHP_EOL;
 	$outstr .= '     <div id="fermentor_edit">'.PHP_EOL;
 	$outstr .= '      <button id="fermentor_setup" class="ui-state-default">Edit fermentor</button>'.PHP_EOL;
+	$outstr .= '      <button id="fermentor_history" class="ui-state-default">History</button>'.PHP_EOL;
 	$outstr .= '     </div>'.PHP_EOL;
     	$outstr .= '    </div> <!-- fermentor -->'.PHP_EOL;
     }