Mercurial > mbsePi-apps / file diff

--- a/www-thermferm/liveview.php	Fri Aug 01 16:13:55 2014 +0200
+++ b/www-thermferm/liveview.php	Fri Aug 01 21:40:02 2014 +0200
@@ -160,18 +160,13 @@
 	$outstr .= '           }]'.PHP_EOL;
 	$outstr .= '       };'.PHP_EOL;
 	$outstr .= '       $("#fermentor_chart_'.$unit.'").jqxChart(settings'.$unr.');'.PHP_EOL;
-	$outstr .= '       var target_refresh_'.$unr.' = setInterval('.PHP_EOL;
-	$outstr .= '         function () {'.PHP_EOL;
-	$outstr .= '           $("#load_target_'.$unr.'").load("getdata.php?uuid='.$unit.'&what=TARGET").fadeIn("slow");'.PHP_EOL;
-	$outstr .= '         }, 65000);'.PHP_EOL;
-	$outstr .= '       var air_refresh_'.$unr.' = setInterval('.PHP_EOL;
-	$outstr .= '         function () {'.PHP_EOL;
-	$outstr .= '           $("#load_air_'.$unr.'").load("getdata.php?uuid='.$unit.'&what=AIR").fadeIn("slow");'.PHP_EOL;
-	$outstr .= '         }, 10001);'.PHP_EOL;
-	$outstr .= '       var beer_refresh_'.$unr.' = setInterval('.PHP_EOL;
-	$outstr .= '         function () {'.PHP_EOL;
-	$outstr .= '           $("#load_beer_'.$unr.'").load("getdata.php?uuid='.$unit.'&what=BEER").fadeIn("slow");'.PHP_EOL;
-	$outstr .= '         }, 10100);'.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 .= '     });'.PHP_EOL;
 	$outstr .= '    </script>'.PHP_EOL;
 	$outstr .= '    <div id="fermentor">'.PHP_EOL;