From fa61d17f0b97a7a34927bd3b1ce08d61ee3d1fee Mon Sep 17 00:00:00 2001 From: Koen Kanters Date: Sun, 15 Apr 2018 01:26:04 +0200 Subject: [PATCH] Better battery status parsing. --- parsers.js | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/parsers.js b/parsers.js index 404c280d..a2f85b3e 100644 --- a/parsers.js +++ b/parsers.js @@ -29,11 +29,16 @@ const parsers = [ cid: 'genBasic', attribute: true, parse: (msg, publish) => { - if (msg.data.data['65282']) { - const voltage = msg.data.data['65282']['1'].elmVal; - if (voltage) { - return {battery: toPercentage(voltage, battery.min, battery.max)} - } + let voltage = null; + + if (msg.data.data['65281']) { + voltage = msg.data.data['65281']['1']; + } else if (msg.data.data['65282']) { + voltage = msg.data.data['65282']['1'].elmVal; + } + + if (voltage) { + return {battery: toPercentage(voltage, battery.min, battery.max)} } } },