--- a/www-thermferm/liveview.php Wed Aug 20 14:01:15 2014 +0200 +++ b/www-thermferm/liveview.php Wed Aug 20 17:42:35 2014 +0200 @@ -170,9 +170,13 @@ $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_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; $outstr .= ' $("#load_led3_'.$unr.'").html(data.led3);'.PHP_EOL; + $outstr .= ' $("#load_sw1_'.$unr.'").html(data.sw1);'.PHP_EOL; + $outstr .= ' $("#load_sw2_'.$unr.'").html(data.sw2);'.PHP_EOL; + $outstr .= ' $("#load_sw3_'.$unr.'").html(data.sw3);'.PHP_EOL; $outstr .= ' });'.PHP_EOL; $outstr .= ' }, 10000);'.PHP_EOL; $outstr .= ' });'.PHP_EOL; @@ -183,6 +187,7 @@ $outstr .= ' <div id="fermentor_panel_top">'.PHP_EOL; $outstr .= ' <div id="fermentor_selector">'.PHP_EOL; $outstr .= ' <form id="select_'.$unr.'" action="index.php" method="post">'.PHP_EOL; + $outstr .= ' <div id="load_select_'.$unr.'">'.PHP_EOL; strcmp($mode, "OFF") ? $se = "" : $se = " checked"; $outstr .= ' <input type="radio" name="mode" onchange="this.form.submit()" class="select" value="OFF"'.$se.'>Off<br>'.PHP_EOL; strcmp($mode, "NONE") ? $se = "" : $se = " checked"; @@ -194,6 +199,7 @@ $outstr .= ' <input type="radio" name="mode" onchange="this.form.submit()" class="select" value="BEER"'.$se.$dis.'>Beer<br>'.PHP_EOL; strcmp($mode, "PROFILE") ? $se = "" : $se = " checked"; $outstr .= ' <input type="radio" name="mode" onchange="this.form.submit()" class="select" value="PROFILE"'.$se.$dis.'>Profile'.PHP_EOL; + $outstr .= ' </div>'.PHP_EOL; $outstr .= ' <input type="hidden" name="UUID" value="'.$unit.'">'.PHP_EOL; $outstr .= ' </form>'.PHP_EOL; $outstr .= ' </div>'.PHP_EOL; @@ -321,9 +327,11 @@ $outstr .= ' <form action="index.php" method="post">'.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; + $outstr .= ' <div id="load_sw1_'.$unr.'">'.PHP_EOL; + $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="radio" name="CoolerState" onchange="this.form.submit()" value="100"'.$dis.$ch.'>On'.PHP_EOL; + $outstr .= ' </div>'.PHP_EOL; $outstr .= ' <input type="hidden" name="UUID" value="'.$unit.'">'.PHP_EOL; $outstr .= ' </form>'.PHP_EOL; $outstr .= ' </div>'.PHP_EOL; @@ -332,9 +340,11 @@ $outstr .= ' <form action="index.php" method="post">'.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; + $outstr .= ' <div id="load_sw2_'.$unr.'">'.PHP_EOL; + $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="radio" name="HeaterState" onchange="this.form.submit()" value="100"'.$dis.$ch.'>On'.PHP_EOL; + $outstr .= ' </div>'.PHP_EOL; $outstr .= ' <input type="hidden" name="UUID" value="'.$unit.'">'.PHP_EOL; $outstr .= ' </form>'.PHP_EOL; $outstr .= ' </div>'.PHP_EOL; @@ -343,9 +353,11 @@ $outstr .= ' <form action="index.php" method="post">'.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; + $outstr .= ' <div id="load_sw3_'.$unr.'">'.PHP_EOL; + $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="radio" name="FanState" onchange="this.form.submit()" value="100"'.$dis.$ch.'>On'.PHP_EOL; + $outstr .= ' </div>'.PHP_EOL; $outstr .= ' <input type="hidden" name="UUID" value="'.$unit.'">'.PHP_EOL; $outstr .= ' </form>'.PHP_EOL; $outstr .= ' </div>'.PHP_EOL;