fix: missing discovery #109 #108 (#112)

Co-authored-by: V. Aretakis <v.aretakis@elsevier.com>
Co-authored-by: Daniel Lando <daniel.sorridi@gmail.com>

lib/Gateway.js

@@ -1463,6 +1463,9 @@ Gateway.prototype.discoverValue = function (node, vId) {
       case CommandClasses['Central Scene']:
       case CommandClasses['Scene Activation']:
         cfg = copy(hassCfg.central_scene)
+        cfg.object_id = [cfg.object_id, valueId.propertyKey, valueId.property]
+          .filter(v => !!v)
+          .join('_')
         break
       case CommandClasses['Binary Sensor']:
         // https://github.com/zwave-js/node-zwave-js/blob/master/packages/zwave-js/src/lib/commandclass/BinarySensorCC.ts#L41
@@ -1592,8 +1595,15 @@ Gateway.prototype.discoverValue = function (node, vId) {
         }
 
         cfg = copy(hassCfg.sensor_generic)
+        // Assemble an object ID including propertyKey and property.
+        // PropertyKey is set before property as propertyKey can have multiple relevant properties.
         cfg.object_id =
           sensor.sensor + (sensor.objectId ? '_' + sensor.objectId : '')
+        if (valueId.propertyKey) {
+          cfg.object_id +=
+            (valueId.propertyKey ? '_' + valueId.propertyKey : '') +
+            (valueId.property ? '_' + valueId.property : '')
+        }
 
         Object.assign(cfg.discovery_payload, sensor.props || {})