summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEbus-at-dockstar <ebus@dockstar>2013-04-30 18:56:58 +0200
committerEbus-at-dockstar <ebus@dockstar>2013-04-30 18:56:58 +0200
commit6c670b35f1af5fda5a3b9b2e23b039cf5aea933c (patch)
treee355b6701d66bde130ac280c5a519d0064c56dd5
parentb7090c76f86f1f5a0c2f6dd21836d2b880db0210 (diff)
downloadebus-alt-6c670b35f1af5fda5a3b9b2e23b039cf5aea933c.tar.gz
ebus-alt-6c670b35f1af5fda5a3b9b2e23b039cf5aea933c.zip
wider step sizes for ebus values -> higher speed
-rw-r--r--datastore-leveldb/wwwroot_ebus/src/ebus.js11
1 files changed, 8 insertions, 3 deletions
diff --git a/datastore-leveldb/wwwroot_ebus/src/ebus.js b/datastore-leveldb/wwwroot_ebus/src/ebus.js
index 5b56d76..530faf4 100644
--- a/datastore-leveldb/wwwroot_ebus/src/ebus.js
+++ b/datastore-leveldb/wwwroot_ebus/src/ebus.js
@@ -29,7 +29,7 @@ $(document).ready(function(){
{
"sensorname":"heizkreisregler10.betriebsdatenRegler1.kesselTemperatur",
"description":"Kessel Temperatur",
- "values":jQuery("#ebusgraph").width()/4,
+ "values":Math.floor(jQuery("#ebusgraph").width()/8),
"lines":{fill: true, fillColor: "rgba(80,40,100, 0.1)"},
"show":true,
"color":"rgb(80,40,100)"
@@ -38,6 +38,7 @@ $(document).ready(function(){
"sensorname":"heizkreisregler9.solarDaten.tempKollektor",
"description":"Kollektortemperatur",
"lines":{fill: true, fillColor: "rgba(255, 0, 0, 0.4)"},
+ "values":Math.floor(jQuery("#ebusgraph").width()/1),
"show":true,
"color":"#f30000"
},
@@ -45,13 +46,14 @@ $(document).ready(function(){
"sensorname":"heizkreisregler9.solarDaten.tempWarmwasserSolar",
"description":"Warmwasser Solar",
"lines":{fill: true, fillColor: "rgba(30,250,20,0.05)"},
+ "values":Math.floor(jQuery("#ebusgraph").width()/8),
"show":true,
"color":"rgba(30,250,20,0.5)"
},
{
"sensorname":"feuerungsautomat1.betriebsdatenRegler1.aussenTemperatur",
"description":"Aussentemperatur (ebus)",
- "values":jQuery("#ebusgraph").width()/4,
+ "values":Math.floor(jQuery("#ebusgraph").width()/4),
"show":true,
"lines":{fill: true, fillColor: "rgba(250, 250, 0, 0.2)"},
"color":"rgb(250,250,0)"
@@ -73,12 +75,14 @@ $(document).ready(function(){
{
"sensorname":"heizkreisregler10.betriebsdatenRegler1.boilerTemperatur",
"description":"Boilertemperatur",
+ "values":Math.floor(jQuery("#ebusgraph").width()/8),
"show":false,
"color":"#48b4ff"
},
{"sensorname":"de.wettermichel.temperature",
"description":"Aussentemperatur (wettermichel)",
"show":false,
+ "values":Math.floor(jQuery("#ebusgraph").width()/16),
"lines":{fill: true, fillColor: "rgba(132, 181, 0, 0.2)"},
"color":"#84b500"
},
@@ -155,7 +159,8 @@ var unplotSensorDetail = function(sensorname) {
};
var plotSensorOverview = function(sensorConfig) {
- $.getJSON("api/range/"+escape(sensorConfig.sensorname)+"/"+fromOverview+"/"+toOverview+ "/" + numberOfValues/2,
+ var values = sensorConfig.values || Math.floor(numberOfValues/2);
+ $.getJSON("api/range/"+escape(sensorConfig.sensorname)+"/"+fromOverview+"/"+toOverview+ "/" + values,
function(response) {
if (!response.error) {
response.data = response.data.map(function(d) {