--- a/www-thermferm/liveview.php Sat Apr 20 11:48:20 2024 +0200
+++ b/www-thermferm/liveview.php Mon Apr 22 11:33:04 2024 +0200
@@ -67,7 +67,7 @@
if (strcmp($vals[0], "AIR_STATE") == 0) {
$air_state = $vals[1];
}
- if ((strcmp($vals[0], "AIR_TEMPERATURE") == 0) && ($air_state == 0)) {
+ if ((strcmp($vals[0], "AIR_TEMPERATURE") == 0) && (strcmp($air_state, "YES") == 0)) {
$air_temperature = $vals[1];
}
if (strcmp($vals[0], "BEER_STATE") == 0) {
@@ -133,7 +133,7 @@
$outstr .= ' <script type="text/javascript">'.PHP_EOL;
$outstr .= ' $(document).ready(function () {'.PHP_EOL;
- if ("$air_state" == "OK") {
+ if ("$air_state" == "YES") {
$outstr .= ' $("#gaugeContainer_air'.$unr.'").jqxGauge({'.PHP_EOL;
$outstr .= ' min: -5, max: 45, width: 275, height: 275,'.PHP_EOL;
$outstr .= ' ranges: [{ startValue: -5, endValue: 0, style: { fill: \'#3399FF\', stroke: \'#3399FF\' }, endWidth: 10, startWidth: 10 },'.PHP_EOL;
@@ -150,7 +150,7 @@
$outstr .= ' });'.PHP_EOL;
}
- if ("$beer_state" == "OK") {
+ if ("$beer_state" == "YES") {
$outstr .= ' $(\'#gaugeContainer_beer'.$unr.'\').jqxGauge({'.PHP_EOL;
$outstr .= ' min: -5, max: 45, width: 275, height: 275,'.PHP_EOL;
$outstr .= ' ranges: [{ startValue: -5, endValue: 0, style: { fill: \'#3399FF\', stroke: \'#3399FF\' }, endWidth: 10, startWidth: 10 },'.PHP_EOL;
@@ -167,7 +167,7 @@
$outstr .= ' });'.PHP_EOL;
}
- if ("$chiller_state" == "OK") {
+ if ("$chiller_state" == "YES") {
$outstr .= ' $(\'#gaugeContainer_chiller'.$unr.'\').jqxGauge({'.PHP_EOL;
$outstr .= ' min: -20, max: 25, width: 150, height: 150,'.PHP_EOL;
$outstr .= ' ranges: [{ startValue: -20, endValue: 0, startWidth: 5, endWidth: 5, style: { fill: \'#3399FF\', stroke: \'#3399FF\' }},'.PHP_EOL;
@@ -184,15 +184,15 @@
$outstr .= ' setInterval(function(){'.PHP_EOL;
$outstr .= ' $.getJSON("getstate.php?uuid='.$unit.'", function(data) {'.PHP_EOL;
- if ("$air_state" == "OK") {
+ if ("$air_state" == "YES") {
$outstr .= ' $("#load_air_'.$unr.'").html(data.air_temperature);'.PHP_EOL;
$outstr .= ' $("#gaugeContainer_air'.$unr.'").jqxGauge(\'value\', data.air_temperature);'.PHP_EOL;
}
- if ("$beer_state" == "OK") {
+ if ("$beer_state" == "YES") {
$outstr .= ' $("#load_beer_'.$unr.'").html(data.beer_temperature);'.PHP_EOL;
$outstr .= ' $("#gaugeContainer_beer'.$unr.'").jqxGauge(\'value\', data.beer_temperature);'.PHP_EOL;
}
- if ("$chiller_state" == "OK") {
+ if ("$chiller_state" == "YES") {
$outstr .= ' $("#gaugeContainer_chiller'.$unr.'").jqxGauge(\'value\', data.chiller_temperature);'.PHP_EOL;
}
$outstr .= ' $("#load_target_lo_'.$unr.'").html(data.target_temperature_lo);'.PHP_EOL;
@@ -230,14 +230,14 @@
$outstr .= ' <div id="fermentor">'.PHP_EOL;
$outstr .= ' <div id="fermentor_thermometers">'.PHP_EOL;
- if (("$air_state" == "OK") && ("$beer_state" == "OK") && ("$chiller_state" == "OK")) {
+ if (("$air_state" == "YES") && ("$beer_state" == "YES") && ("$chiller_state" == "YES")) {
$outstr .= ' <div id="gaugeContainer_air'.$unr.'" style="float: left; margin-top: 10px; margin-left: 10px;"></div>'.PHP_EOL;
$outstr .= ' <div id="gaugeContainer_beer'.$unr.'" style="float: right; margin-top: 10px; margin-right: 10px;"></div>'.PHP_EOL;
$outstr .= ' <div id="gaugeContainer_chiller'.$unr.'" style="float: left; margin-top: 200px;"></div>'.PHP_EOL;
- } else if (("$air_state" == "OK") && ("$beer_state" == "OK")) {
+ } else if (("$air_state" == "YES") && ("$beer_state" == "YES")) {
$outstr .= ' <div id="gaugeContainer_air'.$unr.'" style="float: left; margin-top: 48px; margin-left: 48px;"></div>'.PHP_EOL;
$outstr .= ' <div id="gaugeContainer_beer'.$unr.'" style="float: right; margin-top: 48px; margin-right: 48px;"></div>'.PHP_EOL;
- } else if ("$air_state" == "OK") {
+ } else if ("$air_state" == "YES") {
$outstr .= ' <div id="gaugeContainer_air'.$unr.'" style="margin-top: 48px; margin-left: 222px;"></div>'.PHP_EOL;
}
$outstr .= ' </div>'.PHP_EOL;