Mercurial > mbsePi-apps / file diff

--- a/www-thermferm/liveview.php	Tue Aug 05 16:24:17 2014 +0200
+++ b/www-thermferm/liveview.php	Tue Aug 05 21:33:06 2014 +0200
@@ -110,9 +110,9 @@
 	$outstr .= '             { name: \'Beer\', type: \'float\' },'.PHP_EOL;
 	$outstr .= '             { name: \'Target\', type: \'float\' },'.PHP_EOL;
 	$outstr .= '             { name: \'Heater\' },'.PHP_EOL;
-	$outstr .= '             { name: \'Cooler\' },'.PHP_EOL;
+	$outstr .= '             { name: \'Cooler\', type: \'int\' },'.PHP_EOL;
 	$outstr .= '             { name: \'Fan\' },'.PHP_EOL;
-	$outstr .= '             { name: \'Door\' }'.PHP_EOL;
+	$outstr .= '             { name: \'Door\', type: \'bool\' }'.PHP_EOL;
 	$outstr .= '          ],'.PHP_EOL;
 	$outstr .= '          url: \'getlog.php?unit='.$unit.'\''.PHP_EOL;
 	$outstr .= '       };'.PHP_EOL;
@@ -150,18 +150,25 @@
 	$outstr .= '             },'.PHP_EOL;
 	$outstr .= '             series: ['.PHP_EOL;
 	$outstr .= '               { dataField: \'Air\', displayText: \'Air\' },'.PHP_EOL;
-	$outstr .= '               { dataField: \'Beer\', displayText: \'Beer\' }'.PHP_EOL;
+	$outstr .= '               { dataField: \'Beer\', displayText: \'Beer\' },'.PHP_EOL;
+	$outstr .= '               { dataField: \'Target\', displayText: \'Target\' }'.PHP_EOL;
 	$outstr .= '             ]'.PHP_EOL;
 	$outstr .= '           }]'.PHP_EOL;
 	$outstr .= '       };'.PHP_EOL;
+	/* Direct draw for the first time */
 	$outstr .= '       $("#fermentor_chart_'.$unit.'").jqxChart(settings'.$unr.');'.PHP_EOL;
+	/* Regular updates of the chart */
+//	$outstr .= '       setInterval(function(){'.PHP_EOL;
+//	$outstr .= '         $("#fermentor_chart_'.$unit.'").jqxChart("update");'.PHP_EOL;
+//	$outstr .= '       }, 3000);'.PHP_EOL;
+
 	$outstr .= '       setInterval(function(){'.PHP_EOL;
-	$outstr .= '           $.getJSON("getstate.php?uuid='.$unit.'", function(data) {'.PHP_EOL;
-	$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 .= '           });'.PHP_EOL;
-	$outstr .= '         }, 10000);'.PHP_EOL;
+	$outstr .= '         $.getJSON("getstate.php?uuid='.$unit.'", function(data) {'.PHP_EOL;
+	$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 .= '         });'.PHP_EOL;
+	$outstr .= '       }, 10000);'.PHP_EOL;
 	$outstr .= '     });'.PHP_EOL;
 	$outstr .= '    </script>'.PHP_EOL;
 	$outstr .= '    <div id="fermentor">'.PHP_EOL;