fix: missing ccSpecific values (#35)

zwave-js · Nov 30, 2020 · ac4ed9a · ac4ed9a
1 parent 815b497
commit ac4ed9a
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/lib/Gateway.js b/lib/Gateway.js
@@ -1317,11 +1317,23 @@ Gateway.prototype.discoverValue = function (node, vId) {
         // https://github.com/zwave-js/node-zwave-js/blob/master/packages/zwave-js/src/lib/commandclass/MultilevelSensorCC.ts
         if (cmdClass === CommandClasses['Multilevel Sensor']) {
           // https://github.com/zwave-js/node-zwave-js/blob/master/packages/config/config/sensorTypes.json
-          sensor = Constants.sensorType(valueId.ccSpecific.sensorType)
+          // In some cases Multilevel Sensors offer Reset option or DeltaTime sensors, but do not include ccSpecific
+          // information. With this change, we target only the sensors and not the additional Properties.
+          if (valueId.ccSpecific) {
+            sensor = Constants.sensorType(valueId.ccSpecific.sensorType)
+          } else {
+            return
+          }
         } else if (cmdClass === CommandClasses.Meter) {
           // https://github.com/zwave-js/node-zwave-js/blob/master/packages/zwave-js/src/lib/commandclass/MeterCC.ts
           // https://github.com/zwave-js/node-zwave-js/blob/master/packages/config/config/meters.json
-          sensor = Constants.meterType(valueId.ccSpecific.meterType)
+          // In some cases Metering devices offer Reset option or DeltaTime sensors, but do not include ccSpecific
+          // information. With this change, we target only the sensors and not the additional Properties.
+          if (valueId.ccSpecific) {
+            sensor = Constants.meterType(valueId.ccSpecific.meterType)
+          } else {
+            return
+          }
         } else if (cmdClass === CommandClasses['Pulse Meter']) {
           sensor = {
             sensor: 'pulse',