From 457e7565690413340d51cd3e22c7f1a049ea62fa Mon Sep 17 00:00:00 2001 From: NoobishSVK Date: Sun, 28 Jan 2024 18:29:06 +0100 Subject: [PATCH] eq/ims bugfix --- datahandler.js | 40 +++++++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/datahandler.js b/datahandler.js index e4c165e..49ed2b0 100644 --- a/datahandler.js +++ b/datahandler.js @@ -238,22 +238,32 @@ function handleData(ws, receivedData) { } break; case receivedLine.startsWith('G'): - if(receivedLine === 'G11') { - initialData.eq, initialData.ims, dataToSend.eq, dataToSend.ims = 1; + switch (receivedLine) { + case 'G11': + initialData.eq = 1; + dataToSend.eq = 1; + initialData.ims = 1; + dataToSend.ims = 1; + break; + case 'G01': + initialData.eq = 0; + dataToSend.eq = 0; + initialData.ims = 1; + dataToSend.ims = 1; + break; + case 'G10': + initialData.eq = 1; + dataToSend.eq = 1; + initialData.ims = 0; + dataToSend.ims = 0; + break; + case 'G00': + initialData.eq = 0; + initialData.ims = 0; + dataToSend.eq = 0; + dataToSend.ims = 0; + break; } - if(receivedLine === 'G01') { - initialData.eq, dataToSend.eq = 0; - initialData.ims, dataToSend.ims = 1; - } - if(receivedLine === 'G10') { - initialData.eq, dataToSend.eq = 1; - initialData.ims, dataToSend.ims = 0; - } - if(receivedLine === 'G00') { - initialData.eq, initialData.ims, dataToSend.eq, dataToSend.ims = 0; - } - break; - case receivedLine.startsWith('Sm'): modifiedData = receivedLine.substring(2); parsedValue = parseFloat(modifiedData);