From 899e07aa9ac210e97af1141612e351ec6a49de01 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Tue, 12 Jul 2016 12:47:50 +0200 Subject: [PATCH] fixed web socket JS --- contrib/websocket/app.js | 8 +++--- contrib/websocket/index.html | 6 ++--- contrib/websocket/msg.js | 48 ++++++++++++++++++------------------ etc/websocket.conf | 21 ++++++---------- 4 files changed, 39 insertions(+), 44 deletions(-) diff --git a/contrib/websocket/app.js b/contrib/websocket/app.js index 77b6c2ccd..a1b584dca 100644 --- a/contrib/websocket/app.js +++ b/contrib/websocket/app.js @@ -177,7 +177,7 @@ function wsConnect(url, protocol) { console.log('Received ' + msgs.length + ' messages with ' + msgs[0].data.length + ' values: ' + msgs[0].timestamp); for (var j = 0; j < plotData.length; j++) { - // remove old values + // remove old while (plotData[j].length > 0 && plotData[j][0][0] < (Date.now() - xPast)) plotData[j].shift() } @@ -186,11 +186,11 @@ function wsConnect(url, protocol) { var msg = msgs[j]; // add empty arrays for data series - while (plotData.length < msg.values) + while (plotData.length < msg.length) plotData.push([]); // add data to arrays - for (var i = 0; i < msg.values; i++) + for (var i = 0; i < msg.length; i++) plotData[i].push([msg.timestamp, msg.data[i]]); } }; @@ -240,7 +240,7 @@ function fileStart(e) { var data = []; for (var i = 0; i < msgs.length; i++) - data.push(msgs[i].ts + offset, msgs[i].values[0]); + data.push(msgs[i].ts + offset, msgs[i].data[0]); plotData.push(data); } diff --git a/contrib/websocket/index.html b/contrib/websocket/index.html index d1fa119f4..0fd7aae49 100644 --- a/contrib/websocket/index.html +++ b/contrib/websocket/index.html @@ -2,7 +2,7 @@ - VILLASnode / WebSocket Mockup + VILLASweb Mockup @@ -18,7 +18,7 @@
    @@ -76,7 +76,7 @@