From de1ae975a4ccafc9a1b495335dbce1f87bd393dc Mon Sep 17 00:00:00 2001 From: Dano van den Bosch Date: Tue, 5 Mar 2024 14:46:43 +0100 Subject: [PATCH] added code for muliple nodes --- web/main.js | 49 +++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 39 insertions(+), 10 deletions(-) diff --git a/web/main.js b/web/main.js index 96ae13d..2c9f35f 100644 --- a/web/main.js +++ b/web/main.js @@ -10,7 +10,8 @@ let valueArray = [1, 2, 3, 4, 5]; let newValueArray = [4, 5, 6]; let myValue = 1; let intervalDelay = 50; -const sendorData = []; +const sendorDataNode1 = []; +const sendorDataNode2 = []; // const socket = new WebSocket("ws://127.0.0.1:8001"); @@ -79,6 +80,7 @@ openConnection(); function handleIncomingData(data) { + nodeNumber = data.node; temperature = data.Temp; humidity = data.Humi; CO2 = data.eCO2; @@ -89,16 +91,43 @@ function handleIncomingData(data) { // console.log("CO2: ", CO2); // console.log("TVOC: ", TVOC); - sendorData.push({ - 'temp': temperature, - 'humi': humidity, - 'CO2': CO2, - 'TVOC': TVOC, - }); - console.log(sendorData); + if (nodeNumber == 1) { + sendorDataNode1.push({ + 'node': nodeNumber, + 'temp': temperature, + 'humi': humidity, + 'CO2': CO2, + 'TVOC': TVOC, + }); + } else if (nodeNumber == 2) { + sendorDataNode2.push({ + 'node': nodeNumber, + 'temp': temperature, + 'humi': humidity, + 'CO2': CO2, + 'TVOC': TVOC, + }); + } - if (sendorData.length >= 10) { - sendorData.shift(); + // sendorData.push({ + // 'node': nodeNumber, + // 'temp': temperature, + // 'humi': humidity, + // 'CO2': CO2, + // 'TVOC': TVOC, + // }); + + if (nodeNumber == 1) { + console.log(sendorDataNode1); + } else if (nodeNumber == 2) { + console.log(sendorDataNode2); + } + + if (sendorDataNode1.length >= 10) { + sendorDataNode1.shift(); + } + if (sendorDataNode2.length >= 10) { + sendorDataNode2.shift(); } }