--- a/www-thermferm/liveview.php Tue Nov 11 16:19:07 2014 +0100
+++ b/www-thermferm/liveview.php Sat Nov 15 20:35:32 2014 +0100
@@ -117,8 +117,8 @@
$outstr .= ' { name: "Target", type: "float" },'.PHP_EOL;
$outstr .= ' { name: "Heater", type: "int" },'.PHP_EOL;
$outstr .= ' { name: "Cooler", type: "int" },'.PHP_EOL;
- $outstr .= ' { name: "Fan", type: "int" },'.PHP_EOL;
- $outstr .= ' { name: "Door", type: "int" }'.PHP_EOL;
+ $outstr .= ' { name: "HeatUse", type: "int" },'.PHP_EOL;
+ $outstr .= ' { name: "CoolUse", type: "int" }'.PHP_EOL;
$outstr .= ' ],'.PHP_EOL;
$outstr .= ' url: \'getlog.php?unit='.$unit.'\''.PHP_EOL;
$outstr .= ' };'.PHP_EOL;
@@ -147,19 +147,19 @@
$outstr .= ' colorScheme: \'scheme01\','.PHP_EOL;
$outstr .= ' seriesGroups:'.PHP_EOL;
$outstr .= ' [{'.PHP_EOL;
- $outstr .= ' type: "stepline",'.PHP_EOL;
+ $outstr .= ' type: "spline",'.PHP_EOL;
$outstr .= ' columnsGapPercent: 30,'.PHP_EOL;
$outstr .= ' seriesGapPercent: 0,'.PHP_EOL;
$outstr .= ' valueAxis:'.PHP_EOL;
$outstr .= ' {'.PHP_EOL;
$outstr .= ' minValue: 0,'.PHP_EOL;
- $outstr .= ' maxValue: 4,'.PHP_EOL;
+ $outstr .= ' maxValue: 100,'.PHP_EOL;
$outstr .= ' displayValueAxis: false,'.PHP_EOL;
- $outstr .= ' description: "Heat/Cool"'.PHP_EOL;
+ $outstr .= ' description: "Heat/Cool %"'.PHP_EOL;
$outstr .= ' },'.PHP_EOL;
$outstr .= ' series: ['.PHP_EOL;
- $outstr .= ' { dataField: "Cooler", lineWidth: 1, displayText: "Cool", opacity: 0.5 },'.PHP_EOL;
- $outstr .= ' { dataField: "Heater", lineWidth: 1, displayText: "Heat", opacity: 0.5 }'.PHP_EOL;
+ $outstr .= ' { dataField: "CoolUse", lineWidth: 1, displayText: "Cool %", opacity: 0.5 },'.PHP_EOL;
+ $outstr .= ' { dataField: "HeatUse", lineWidth: 1, displayText: "Heat %", opacity: 0.5 }'.PHP_EOL;
$outstr .= ' ]'.PHP_EOL;
$outstr .= ' },'.PHP_EOL;
$outstr .= ' {'.PHP_EOL;