fix: better zwave valueid parsing

zwave-js · Dec 28, 2020 · 967a28f · 967a28f
1 parent efab02e
commit 967a28f
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/lib/ZwaveClient.js b/lib/ZwaveClient.js
@@ -710,9 +710,13 @@ function parseValue (zwaveNode, zwaveValue, zwaveValueMeta) {
 
   const vID = getValueID(valueId)
 
-  const prevValue = node.values[vID] ? node.values[vID].value : null
-  valueId.value =
-    zwaveValue.newValue || prevValue || zwaveNode.getValue(zwaveValue)
+  valueId.value = zwaveNode.getValue(zwaveValue)
+
+  if (valueId.value === undefined) {
+    const prevValue = node.values[vID] ? node.values[vID].value : undefined
+    valueId.value =
+      zwaveValue.newValue !== undefined ? zwaveValue.newValue : prevValue
+  }
 
   if (isCurrentValue(valueId)) {
     valueId.isCurrentValue = true