--- a/www-thermferm/liveview.php Mon Aug 04 15:25:13 2014 +0200
+++ b/www-thermferm/liveview.php Mon Aug 04 19:31:03 2014 +0200
@@ -56,6 +56,7 @@
$beer_temperature = "NA";
$power_led = $cooler_led = $heater_led = $fan_led = "off";
$heater = $cooler = $fan = "no";
+ $heater_state = $cooler_state = $fan_state = 0;
foreach($arr as $l) {
$vals = explode(",", $l);
@@ -76,15 +77,24 @@
if ((strcmp($vals[0], "BEER_TEMPERATURE") == 0) && ($beer_state == 0)) {
$beer_temperature = $vals[1];
}
- if ((strcmp($vals[0], "HEATER") == 0) && (strcmp($vals[1], "YES"))) {
+ if ((strcmp($vals[0], "HEATER_ADDRESS") == 0) && (strcmp($vals[1], "(null)"))) {
$heater = "yes";
}
- if ((strcmp($vals[0], "COOLER") == 0) && (strcmp($vals[1], "YES"))) {
+ if (strcmp($vals[0], "HEATER_STATE") == 0) {
+ $heater_state = $vals[1];
+ }
+ if ((strcmp($vals[0], "COOLER_ADDRESS") == 0) && (strcmp($vals[1], "(null)"))) {
$cooler = "yes";
}
- if ((strcmp($vals[0], "FAN") == 0) && (strcmp($vals[1], "YES"))) {
+ if (strcmp($vals[0], "COOLER_STATE") == 0) {
+ $cooler_state = $vals[1];
+ }
+ if ((strcmp($vals[0], "FAN_ADDRESS") == 0) && (strcmp($vals[1], "(null)"))) {
$fan = "yes";
}
+ if (strcmp($vals[0], "FAN_STATE") == 0) {
+ $fan_state = $vals[1];
+ }
}
$outstr .= ' <script type="text/javascript">'.PHP_EOL;
@@ -191,39 +201,53 @@
$outstr .= ' </div>'.PHP_EOL;
$outstr .= ' </div> <!-- fermentor_panel_display -->'.PHP_EOL;
+
$outstr .= ' <div id="fermentor_panel_control">'.PHP_EOL;
+ if ($cooler_state == "100")
+ $cooler_led = "on";
$outstr .= ' <div id="fermentor_led1">'.PHP_EOL;
$outstr .= ' <img src="images/led_green_'.$cooler_led.'.png"><br>Cool'.PHP_EOL;
$outstr .= ' </div>'.PHP_EOL;
+ if ($heater_state == "100")
+ $heater_led = "on";
$outstr .= ' <div id="fermentor_led2">'.PHP_EOL;
$outstr .= ' <img src="images/led_green_'.$heater_led.'.png"><br>Heat'.PHP_EOL;
$outstr .= ' </div>'.PHP_EOL;
+ if ($fan_state == "100")
+ $fan_led = "on";
$outstr .= ' <div id="fermentor_led3">'.PHP_EOL;
$outstr .= ' <img src="images/led_green_'.$fan_led.'.png"><br>Fan'.PHP_EOL;
$outstr .= ' </div>'.PHP_EOL;
+
$outstr .= ' <div id="fermentor_toggle1">'.PHP_EOL;
$outstr .= ' <form action="index.php" method="post">'.PHP_EOL;
- strcmp($mode, "NONE") ? $dis = " disabled" : $dis = "";
- $ch = " checked";
-
- $outstr .= ' <input type="radio" name="cooler" onchange="this.form.submit()" value="OFF"'.$dis.$ch.'>Off<br>'.PHP_EOL;
- $outstr .= ' <input type="radio" name="cooler" onchange="this.form.submit()" value="ON"'.$dis.'>On'.PHP_EOL;
+ (($mode == "NONE") && ($cooler == "yes")) ? $dis = "" : $dis = " disabled";
+ ($cooler_state == "0") ? $ch = " checked" : $ch = "";
+ $outstr .= ' <input type="radio" name="CoolerState" onchange="this.form.submit()" value="0"'.$dis.$ch.'>Off<br>'.PHP_EOL;
+ ($cooler_state == "100") ? $ch = " checked" : $ch = "";
+ $outstr .= ' <input type="radio" name="CoolerState" onchange="this.form.submit()" value="100"'.$dis.$ch.'>On'.PHP_EOL;
$outstr .= ' <input type="hidden" name="UUID" value="'.$unit.'">'.PHP_EOL;
$outstr .= ' </form>'.PHP_EOL;
$outstr .= ' </div>'.PHP_EOL;
+
$outstr .= ' <div id="fermentor_toggle2">'.PHP_EOL;
$outstr .= ' <form action="index.php" method="post">'.PHP_EOL;
- strcmp($mode, "NONE") ? $dis = " disabled" : $dis = "";
- $outstr .= ' <input type="radio" name="heater" onchange="this.form.submit()" value="OFF"'.$dis.$ch.'>Off<br>'.PHP_EOL;
- $outstr .= ' <input type="radio" name="heater" onchange="this.form.submit()" value="ON"'.$dis.'>On'.PHP_EOL;
+ (($mode == "NONE") && ($heater == "yes")) ? $dis = "" : $dis = " disabled";
+ ($heater_state == "0") ? $ch = " checked" : $ch = "";
+ $outstr .= ' <input type="radio" name="HeaterState" onchange="this.form.submit()" value="0"'.$dis.$ch.'>Off<br>'.PHP_EOL;
+ ($heater_state == "100") ? $ch = " checked" : $ch = "";
+ $outstr .= ' <input type="radio" name="HeaterState" onchange="this.form.submit()" value="100"'.$dis.$ch.'>On'.PHP_EOL;
$outstr .= ' <input type="hidden" name="UUID" value="'.$unit.'">'.PHP_EOL;
$outstr .= ' </form>'.PHP_EOL;
$outstr .= ' </div>'.PHP_EOL;
+
$outstr .= ' <div id="fermentor_toggle3">'.PHP_EOL;
$outstr .= ' <form action="index.php" method="post">'.PHP_EOL;
- strcmp($mode, "NONE") ? $dis = " disabled" : $dis = "";
- $outstr .= ' <input type="radio" name="fan" onchange="this.form.submit()" value="OFF"'.$dis.$ch.'>Off<br>'.PHP_EOL;
- $outstr .= ' <input type="radio" name="fan" onchange="this.form.submit()" value="ON"'.$dis.'>On'.PHP_EOL;
+ (($mode == "NONE") && ($fan== "yes")) ? $dis = "" : $dis = " disabled";
+ ($fan_state == "0") ? $ch = " checked" : $ch = "";
+ $outstr .= ' <input type="radio" name="FanState" onchange="this.form.submit()" value="0"'.$dis.$ch.'>Off<br>'.PHP_EOL;
+ ($fan_state == "100") ? $ch = " checked" : $ch = "";
+ $outstr .= ' <input type="radio" name="FanState" onchange="this.form.submit()" value="100"'.$dis.$ch.'>On'.PHP_EOL;
$outstr .= ' <input type="hidden" name="UUID" value="'.$unit.'">'.PHP_EOL;
$outstr .= ' </form>'.PHP_EOL;
$outstr .= ' </div>'.PHP_EOL;