Mercurial > mbsePi-apps / file diff

--- a/www-thermferm/liveview.php	Wed Jul 16 13:42:14 2014 +0200
+++ b/www-thermferm/liveview.php	Thu Jul 17 21:19:22 2014 +0200
@@ -26,7 +26,7 @@
 
 
 
-function showunit($unit)
+function showunit($unit, $unr)
 {
     $outstr = '';
     $air_state = $beer_state = 1;
@@ -79,30 +79,60 @@
 		$outstr .= '     <div id="fermentor_pict">'.PHP_EOL;
 		$outstr .= '      <img src="images/Fermenter_60l.gif">'.PHP_EOL;
 		$outstr .= '     </div>'.PHP_EOL;
-		$outstr .= '     <div id="fermentor_control">'.PHP_EOL;
 	    }
 	    if (strcmp($vals[0], "MODE") == 0) {
-		$outstr .= '      mode ' . $vals[1] . '<br>' .PHP_EOL;
+		$mode = $vals[1];
 	    }
 	    if (strcmp($vals[0], "AIR_STATE") == 0) {
 		$air_state = $vals[1];
 	    }
 	    if (strcmp($vals[0], "AIR_TEMPERATURE") == 0) {
 		if ($air_state == 0)
-		    $outstr .= '      air temperature ' . $vals[1] . '<br>' .PHP_EOL;
+		    $air_temperature = $vals[1];
 		else
-		    $outstr .= '      air temperature N/A<br>' .PHP_EOL;		
+		    $air_temperature = "N/A";
 	    }
 	    if (strcmp($vals[0], "BEER_STATE") == 0) {
 		$beer_state = $vals[1];
 	    }
 	    if (strcmp($vals[0], "BEER_TEMPERATURE") == 0) {
 		if ($beer_state == 0)
-		    $outstr .= '      beer temperature ' . $vals[1] . '<br>' .PHP_EOL;
+		    $beer_temperature = $vals[1];
 		else
-		    $outstr .= '      beer temperature N/A<br>' .PHP_EOL;    
+		    $beer_temperature = "N/A";
 	    }
 	}
+	$outstr .= '     <div id="fermentor_panel">'.PHP_EOL;
+	$outstr .= '      <div id="fermentor_selector">'.PHP_EOL;
+	$outstr .= '       Mode '.$mode.PHP_EOL;
+	$outstr .= '      </div>'.PHP_EOL;
+	$outstr .= '      <div id="fermentor_powerled">'.PHP_EOL;
+	$outstr .= '      </div>'.PHP_EOL;
+	$outstr .= '      <div id="fermentor_display1">'.PHP_EOL;
+	$outstr .= '      </div>'.PHP_EOL;
+	$outstr .= '      <div id="fermentor_display2">'.PHP_EOL;
+	$outstr .= '       Air<br>'.$air_temperature.PHP_EOL;
+	$outstr .= '      </div>'.PHP_EOL;
+	$outstr .= '      <div id="fermentor_display3">'.PHP_EOL;
+	$outstr .= '       Beer<br>'.$beer_temperature.PHP_EOL;
+	$outstr .= '      </div>'.PHP_EOL;
+	$outstr .= '      <div id="fermentor_led1">'.PHP_EOL;
+	$outstr .= '      </div>'.PHP_EOL;
+	$outstr .= '      <div id="fermentor_led2">'.PHP_EOL;
+	$outstr .= '      </div>'.PHP_EOL;
+	$outstr .= '      <div id="fermentor_led3">'.PHP_EOL;
+	$outstr .= '      </div>'.PHP_EOL;
+	$outstr .= '      <div id="fermentor_toggle1">'.PHP_EOL;
+	$outstr .= '      </div>'.PHP_EOL;
+	$outstr .= '      <div id="fermentor_toggle2">'.PHP_EOL;
+	$outstr .= '      </div>'.PHP_EOL;
+	$outstr .= '      <div id="fermentor_toggle3">'.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;
@@ -142,7 +172,7 @@
 		if (strcmp($arr[$i], ".") == 0)
 			break;
 		$parts = explode(",", $arr[$i]);
-		$outstr .= showunit($parts[1]);
+		$outstr .= showunit($parts[1], $i);
 		$i++;
 	    }
 	}