@zwave-js/cc 11.13.0 → 11.14.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/cc/AlarmSensorCC.d.ts +1 -1
- package/build/cc/AlarmSensorCC.d.ts.map +1 -1
- package/build/cc/AlarmSensorCC.js +4 -4
- package/build/cc/AlarmSensorCC.js.map +1 -1
- package/build/cc/AssociationCC.d.ts +2 -2
- package/build/cc/AssociationCC.d.ts.map +1 -1
- package/build/cc/AssociationCC.js +8 -6
- package/build/cc/AssociationCC.js.map +1 -1
- package/build/cc/AssociationGroupInfoCC.d.ts +1 -1
- package/build/cc/AssociationGroupInfoCC.d.ts.map +1 -1
- package/build/cc/AssociationGroupInfoCC.js +19 -18
- package/build/cc/AssociationGroupInfoCC.js.map +1 -1
- package/build/cc/BarrierOperatorCC.d.ts +2 -2
- package/build/cc/BarrierOperatorCC.d.ts.map +1 -1
- package/build/cc/BarrierOperatorCC.js +10 -7
- package/build/cc/BarrierOperatorCC.js.map +1 -1
- package/build/cc/BasicCC.d.ts +2 -2
- package/build/cc/BasicCC.d.ts.map +1 -1
- package/build/cc/BasicCC.js +12 -11
- package/build/cc/BasicCC.js.map +1 -1
- package/build/cc/BatteryCC.d.ts +1 -1
- package/build/cc/BatteryCC.d.ts.map +1 -1
- package/build/cc/BatteryCC.js +17 -16
- package/build/cc/BatteryCC.js.map +1 -1
- package/build/cc/BinarySensorCC.d.ts +1 -1
- package/build/cc/BinarySensorCC.d.ts.map +1 -1
- package/build/cc/BinarySensorCC.js +3 -3
- package/build/cc/BinarySensorCC.js.map +1 -1
- package/build/cc/BinarySwitchCC.d.ts +2 -2
- package/build/cc/BinarySwitchCC.d.ts.map +1 -1
- package/build/cc/BinarySwitchCC.js +4 -2
- package/build/cc/BinarySwitchCC.js.map +1 -1
- package/build/cc/CRC16CC.d.ts +1 -1
- package/build/cc/CRC16CC.d.ts.map +1 -1
- package/build/cc/CRC16CC.js +4 -4
- package/build/cc/CRC16CC.js.map +1 -1
- package/build/cc/CentralSceneCC.d.ts +2 -2
- package/build/cc/CentralSceneCC.d.ts.map +1 -1
- package/build/cc/CentralSceneCC.js +5 -5
- package/build/cc/CentralSceneCC.js.map +1 -1
- package/build/cc/ClimateControlScheduleCC.d.ts +2 -2
- package/build/cc/ClimateControlScheduleCC.d.ts.map +1 -1
- package/build/cc/ClimateControlScheduleCC.js +6 -6
- package/build/cc/ClimateControlScheduleCC.js.map +1 -1
- package/build/cc/ClockCC.d.ts +1 -1
- package/build/cc/ClockCC.d.ts.map +1 -1
- package/build/cc/ClockCC.js.map +1 -1
- package/build/cc/ColorSwitchCC.d.ts +3 -3
- package/build/cc/ColorSwitchCC.d.ts.map +1 -1
- package/build/cc/ColorSwitchCC.js +25 -22
- package/build/cc/ColorSwitchCC.js.map +1 -1
- package/build/cc/ConfigurationCC.d.ts +4 -4
- package/build/cc/ConfigurationCC.d.ts.map +1 -1
- package/build/cc/ConfigurationCC.js +91 -86
- package/build/cc/ConfigurationCC.js.map +1 -1
- package/build/cc/DeviceResetLocallyCC.d.ts.map +1 -1
- package/build/cc/DoorLockCC.d.ts +3 -3
- package/build/cc/DoorLockCC.d.ts.map +1 -1
- package/build/cc/DoorLockCC.js +15 -12
- package/build/cc/DoorLockCC.js.map +1 -1
- package/build/cc/DoorLockLoggingCC.d.ts +1 -1
- package/build/cc/DoorLockLoggingCC.d.ts.map +1 -1
- package/build/cc/DoorLockLoggingCC.js +4 -4
- package/build/cc/DoorLockLoggingCC.js.map +1 -1
- package/build/cc/EnergyProductionCC.d.ts +1 -1
- package/build/cc/EnergyProductionCC.d.ts.map +1 -1
- package/build/cc/EnergyProductionCC.js.map +1 -1
- package/build/cc/EntryControlCC.d.ts +2 -2
- package/build/cc/EntryControlCC.d.ts.map +1 -1
- package/build/cc/EntryControlCC.js +5 -6
- package/build/cc/EntryControlCC.js.map +1 -1
- package/build/cc/FirmwareUpdateMetaDataCC.d.ts +2 -2
- package/build/cc/FirmwareUpdateMetaDataCC.d.ts.map +1 -1
- package/build/cc/FirmwareUpdateMetaDataCC.js +16 -12
- package/build/cc/FirmwareUpdateMetaDataCC.js.map +1 -1
- package/build/cc/HumidityControlModeCC.d.ts +2 -2
- package/build/cc/HumidityControlModeCC.d.ts.map +1 -1
- package/build/cc/HumidityControlModeCC.js +2 -2
- package/build/cc/HumidityControlModeCC.js.map +1 -1
- package/build/cc/HumidityControlOperatingStateCC.d.ts.map +1 -1
- package/build/cc/HumidityControlOperatingStateCC.js +2 -2
- package/build/cc/HumidityControlOperatingStateCC.js.map +1 -1
- package/build/cc/HumidityControlSetpointCC.d.ts +3 -3
- package/build/cc/HumidityControlSetpointCC.d.ts.map +1 -1
- package/build/cc/HumidityControlSetpointCC.js +15 -13
- package/build/cc/HumidityControlSetpointCC.js.map +1 -1
- package/build/cc/InclusionControllerCC.d.ts +1 -1
- package/build/cc/InclusionControllerCC.d.ts.map +1 -1
- package/build/cc/IndicatorCC.d.ts +2 -2
- package/build/cc/IndicatorCC.d.ts.map +1 -1
- package/build/cc/IndicatorCC.js +38 -25
- package/build/cc/IndicatorCC.js.map +1 -1
- package/build/cc/IrrigationCC.d.ts +2 -2
- package/build/cc/IrrigationCC.d.ts.map +1 -1
- package/build/cc/IrrigationCC.js +48 -46
- package/build/cc/IrrigationCC.js.map +1 -1
- package/build/cc/LanguageCC.d.ts +1 -1
- package/build/cc/LanguageCC.d.ts.map +1 -1
- package/build/cc/LanguageCC.js +2 -2
- package/build/cc/LanguageCC.js.map +1 -1
- package/build/cc/LockCC.d.ts +2 -2
- package/build/cc/LockCC.d.ts.map +1 -1
- package/build/cc/LockCC.js.map +1 -1
- package/build/cc/ManufacturerProprietaryCC.d.ts +1 -1
- package/build/cc/ManufacturerProprietaryCC.d.ts.map +1 -1
- package/build/cc/ManufacturerProprietaryCC.js +9 -9
- package/build/cc/ManufacturerProprietaryCC.js.map +1 -1
- package/build/cc/ManufacturerSpecificCC.d.ts +1 -1
- package/build/cc/ManufacturerSpecificCC.d.ts.map +1 -1
- package/build/cc/ManufacturerSpecificCC.js +8 -9
- package/build/cc/ManufacturerSpecificCC.js.map +1 -1
- package/build/cc/MeterCC.d.ts +18 -14
- package/build/cc/MeterCC.d.ts.map +1 -1
- package/build/cc/MeterCC.js +102 -81
- package/build/cc/MeterCC.js.map +1 -1
- package/build/cc/MultiChannelAssociationCC.d.ts +2 -2
- package/build/cc/MultiChannelAssociationCC.d.ts.map +1 -1
- package/build/cc/MultiChannelAssociationCC.js +18 -16
- package/build/cc/MultiChannelAssociationCC.js.map +1 -1
- package/build/cc/MultiChannelCC.d.ts +2 -2
- package/build/cc/MultiChannelCC.d.ts.map +1 -1
- package/build/cc/MultiChannelCC.js +39 -33
- package/build/cc/MultiChannelCC.js.map +1 -1
- package/build/cc/MultiCommandCC.d.ts +1 -1
- package/build/cc/MultiCommandCC.d.ts.map +1 -1
- package/build/cc/MultiCommandCC.js +2 -2
- package/build/cc/MultiCommandCC.js.map +1 -1
- package/build/cc/MultilevelSensorCC.d.ts +1 -1
- package/build/cc/MultilevelSensorCC.d.ts.map +1 -1
- package/build/cc/MultilevelSensorCC.js +29 -26
- package/build/cc/MultilevelSensorCC.js.map +1 -1
- package/build/cc/MultilevelSwitchCC.d.ts +2 -2
- package/build/cc/MultilevelSwitchCC.d.ts.map +1 -1
- package/build/cc/MultilevelSwitchCC.js +20 -18
- package/build/cc/MultilevelSwitchCC.js.map +1 -1
- package/build/cc/NodeNamingCC.d.ts +2 -2
- package/build/cc/NodeNamingCC.d.ts.map +1 -1
- package/build/cc/NodeNamingCC.js.map +1 -1
- package/build/cc/NotificationCC.d.ts +1 -1
- package/build/cc/NotificationCC.d.ts.map +1 -1
- package/build/cc/NotificationCC.js +86 -77
- package/build/cc/NotificationCC.js.map +1 -1
- package/build/cc/PowerlevelCC.d.ts +1 -1
- package/build/cc/PowerlevelCC.d.ts.map +1 -1
- package/build/cc/PowerlevelCC.js.map +1 -1
- package/build/cc/ProtectionCC.d.ts +3 -3
- package/build/cc/ProtectionCC.d.ts.map +1 -1
- package/build/cc/ProtectionCC.js +4 -4
- package/build/cc/ProtectionCC.js.map +1 -1
- package/build/cc/SceneActivationCC.d.ts +1 -1
- package/build/cc/SceneActivationCC.d.ts.map +1 -1
- package/build/cc/SceneActivationCC.js.map +1 -1
- package/build/cc/SceneActuatorConfigurationCC.d.ts +2 -2
- package/build/cc/SceneActuatorConfigurationCC.d.ts.map +1 -1
- package/build/cc/SceneActuatorConfigurationCC.js +15 -12
- package/build/cc/SceneActuatorConfigurationCC.js.map +1 -1
- package/build/cc/SceneControllerConfigurationCC.d.ts +2 -2
- package/build/cc/SceneControllerConfigurationCC.d.ts.map +1 -1
- package/build/cc/SceneControllerConfigurationCC.js +21 -16
- package/build/cc/SceneControllerConfigurationCC.js.map +1 -1
- package/build/cc/ScheduleEntryLockCC.d.ts +2 -2
- package/build/cc/ScheduleEntryLockCC.d.ts.map +1 -1
- package/build/cc/ScheduleEntryLockCC.js +27 -11
- package/build/cc/ScheduleEntryLockCC.js.map +1 -1
- package/build/cc/Security2CC.d.ts +2 -2
- package/build/cc/Security2CC.d.ts.map +1 -1
- package/build/cc/Security2CC.js +59 -52
- package/build/cc/Security2CC.js.map +1 -1
- package/build/cc/SecurityCC.d.ts +1 -1
- package/build/cc/SecurityCC.d.ts.map +1 -1
- package/build/cc/SecurityCC.js +9 -7
- package/build/cc/SecurityCC.js.map +1 -1
- package/build/cc/SoundSwitchCC.d.ts +2 -2
- package/build/cc/SoundSwitchCC.d.ts.map +1 -1
- package/build/cc/SoundSwitchCC.js +4 -4
- package/build/cc/SoundSwitchCC.js.map +1 -1
- package/build/cc/SupervisionCC.d.ts +2 -2
- package/build/cc/SupervisionCC.d.ts.map +1 -1
- package/build/cc/SupervisionCC.js +17 -17
- package/build/cc/SupervisionCC.js.map +1 -1
- package/build/cc/ThermostatFanModeCC.d.ts +2 -2
- package/build/cc/ThermostatFanModeCC.d.ts.map +1 -1
- package/build/cc/ThermostatFanModeCC.js +2 -2
- package/build/cc/ThermostatFanModeCC.js.map +1 -1
- package/build/cc/ThermostatFanStateCC.d.ts.map +1 -1
- package/build/cc/ThermostatFanStateCC.js +2 -2
- package/build/cc/ThermostatFanStateCC.js.map +1 -1
- package/build/cc/ThermostatModeCC.d.ts +2 -2
- package/build/cc/ThermostatModeCC.d.ts.map +1 -1
- package/build/cc/ThermostatModeCC.js +14 -13
- package/build/cc/ThermostatModeCC.js.map +1 -1
- package/build/cc/ThermostatOperatingStateCC.d.ts.map +1 -1
- package/build/cc/ThermostatOperatingStateCC.js.map +1 -1
- package/build/cc/ThermostatSetbackCC.d.ts +2 -2
- package/build/cc/ThermostatSetbackCC.d.ts.map +1 -1
- package/build/cc/ThermostatSetbackCC.js +2 -2
- package/build/cc/ThermostatSetbackCC.js.map +1 -1
- package/build/cc/ThermostatSetpointCC.d.ts +2 -2
- package/build/cc/ThermostatSetpointCC.d.ts.map +1 -1
- package/build/cc/ThermostatSetpointCC.js +20 -7
- package/build/cc/ThermostatSetpointCC.js.map +1 -1
- package/build/cc/TimeCC.d.ts +1 -1
- package/build/cc/TimeCC.d.ts.map +1 -1
- package/build/cc/TimeCC.js.map +1 -1
- package/build/cc/TimeParametersCC.d.ts +2 -2
- package/build/cc/TimeParametersCC.d.ts.map +1 -1
- package/build/cc/TimeParametersCC.js +4 -2
- package/build/cc/TimeParametersCC.js.map +1 -1
- package/build/cc/TransportServiceCC.d.ts +1 -1
- package/build/cc/TransportServiceCC.d.ts.map +1 -1
- package/build/cc/TransportServiceCC.js +33 -31
- package/build/cc/TransportServiceCC.js.map +1 -1
- package/build/cc/UserCodeCC.d.ts +2 -2
- package/build/cc/UserCodeCC.d.ts.map +1 -1
- package/build/cc/UserCodeCC.js +32 -31
- package/build/cc/UserCodeCC.js.map +1 -1
- package/build/cc/VersionCC.d.ts +2 -2
- package/build/cc/VersionCC.d.ts.map +1 -1
- package/build/cc/VersionCC.js +2 -2
- package/build/cc/VersionCC.js.map +1 -1
- package/build/cc/WakeUpCC.d.ts +2 -2
- package/build/cc/WakeUpCC.d.ts.map +1 -1
- package/build/cc/WakeUpCC.js.map +1 -1
- package/build/cc/WindowCoveringCC.d.ts +3 -3
- package/build/cc/WindowCoveringCC.d.ts.map +1 -1
- package/build/cc/WindowCoveringCC.js +16 -15
- package/build/cc/WindowCoveringCC.js.map +1 -1
- package/build/cc/ZWavePlusCC.d.ts +1 -1
- package/build/cc/ZWavePlusCC.d.ts.map +1 -1
- package/build/cc/ZWaveProtocolCC.d.ts +3 -3
- package/build/cc/ZWaveProtocolCC.d.ts.map +1 -1
- package/build/cc/ZWaveProtocolCC.js +18 -5
- package/build/cc/ZWaveProtocolCC.js.map +1 -1
- package/build/cc/index.d.ts +3 -3
- package/build/cc/index.d.ts.map +1 -1
- package/build/cc/index.js.map +1 -1
- package/build/cc/manufacturerProprietary/FibaroCC.d.ts +2 -2
- package/build/cc/manufacturerProprietary/FibaroCC.d.ts.map +1 -1
- package/build/cc/manufacturerProprietary/FibaroCC.js +6 -6
- package/build/cc/manufacturerProprietary/FibaroCC.js.map +1 -1
- package/build/lib/API.d.ts +64 -64
- package/build/lib/API.d.ts.map +1 -1
- package/build/lib/API.js +19 -19
- package/build/lib/API.js.map +1 -1
- package/build/lib/CommandClass.d.ts +1 -1
- package/build/lib/CommandClass.d.ts.map +1 -1
- package/build/lib/CommandClass.js +41 -41
- package/build/lib/CommandClass.js.map +1 -1
- package/build/lib/CommandClassDecorators.d.ts.map +1 -1
- package/build/lib/CommandClassDecorators.js +2 -2
- package/build/lib/CommandClassDecorators.js.map +1 -1
- package/build/lib/EncapsulatingCommandClass.js +2 -2
- package/build/lib/EncapsulatingCommandClass.js.map +1 -1
- package/build/lib/Security2/Extension.d.ts.map +1 -1
- package/build/lib/Security2/Extension.js +7 -7
- package/build/lib/Security2/Extension.js.map +1 -1
- package/build/lib/Security2/shared.d.ts.map +1 -1
- package/build/lib/Security2/shared.js.map +1 -1
- package/build/lib/SetValueResult.d.ts.map +1 -1
- package/build/lib/SetValueResult.js +9 -9
- package/build/lib/SetValueResult.js.map +1 -1
- package/build/lib/Values.d.ts +1 -1
- package/build/lib/Values.d.ts.map +1 -1
- package/build/lib/Values.js +3 -3
- package/build/lib/Values.js.map +1 -1
- package/build/lib/_Types.d.ts +1 -1
- package/build/lib/_Types.d.ts.map +1 -1
- package/build/lib/_Types.js +4 -4
- package/build/lib/_Types.js.map +1 -1
- package/build/lib/serializers.d.ts.map +1 -1
- package/build/lib/serializers.js +4 -3
- package/build/lib/serializers.js.map +1 -1
- package/build/lib/utils.d.ts.map +1 -1
- package/build/lib/utils.js +81 -77
- package/build/lib/utils.js.map +1 -1
- package/package.json +9 -12
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ManufacturerProprietaryCC.d.ts","sourceRoot":"","sources":["../../src/cc/ManufacturerProprietaryCC.ts"],"names":[],"mappings":";AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"ManufacturerProprietaryCC.d.ts","sourceRoot":"","sources":["../../src/cc/ManufacturerProprietaryCC.ts"],"names":[],"mappings":";AAAA,OAAO,EAEN,KAAK,gBAAgB,EACrB,KAAK,cAAc,EAInB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,oBAAoB,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAG3E,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EACN,KAAK,gBAAgB,EACrB,YAAY,EACZ,KAAK,kCAAkC,EAEvC,MAAM,qBAAqB,CAAC;AAc7B,MAAM,MAAM,oCAAoC,CAC/C,CAAC,SAAS,OAAO,yBAAyB,GACzC,OAAO,yBAAyB,IAC9B,CAAC,GAAG;IAEP,KAAK,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;CACrD,CAAC;AAEF,qBACa,4BAA6B,SAAQ,KAAK;gBAErD,QAAQ,EAAE,oBAAoB,EAC9B,QAAQ,EAAE,cAAc,GAAG,gBAAgB;IAuB/B,QAAQ,CACpB,cAAc,EAAE,MAAM,EACtB,IAAI,CAAC,EAAE,MAAM,GACX,OAAO,CAAC,IAAI,CAAC;IAaH,kBAAkB,CAAC,cAAc,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM;;;;CAsBrE;AAED,MAAM,WAAW,gCAAiC,SAAQ,gBAAgB;IACzE,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,0BAA0B,CAAC,EAAE,OAAO,CAAC;CACrC;AAgBD,qBAMa,yBAA0B,SAAQ,YAAY;IAClD,SAAS,EAAE,SAAS,CAAC;gBAG5B,IAAI,EAAE,SAAS,EACf,OAAO,EACJ,kCAAkC,GAClC,gCAAgC;IAoC7B,cAAc,CAAC,EAAE,MAAM,CAAC;IAS/B,OAAO,CAAC,wBAAwB;IAUzB,SAAS,IAAI,MAAM;IAgBnB,sBAAsB,IAAI,yBAAyB,GAAG,SAAS;IAezD,SAAS,CAAC,QAAQ,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC;IAuBxD,aAAa,CAAC,QAAQ,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC;CAqBzE"}
|
|
@@ -48,8 +48,8 @@ let ManufacturerProprietaryCCAPI = exports.ManufacturerProprietaryCCAPI = class
|
|
|
48
48
|
// If possible, try to defer to a specific subclass of this API
|
|
49
49
|
if (manufacturerId != undefined) {
|
|
50
50
|
const SpecificAPIConstructor = (0, Decorators_1.getManufacturerProprietaryAPI)(manufacturerId);
|
|
51
|
-
if (SpecificAPIConstructor != undefined
|
|
52
|
-
new.target !== SpecificAPIConstructor) {
|
|
51
|
+
if (SpecificAPIConstructor != undefined
|
|
52
|
+
&& new.target !== SpecificAPIConstructor) {
|
|
53
53
|
return new SpecificAPIConstructor(applHost, endpoint);
|
|
54
54
|
}
|
|
55
55
|
}
|
|
@@ -102,21 +102,21 @@ let ManufacturerProprietaryCC = exports.ManufacturerProprietaryCC = class Manufa
|
|
|
102
102
|
if ((0, CommandClass_1.gotDeserializationOptions)(options)) {
|
|
103
103
|
(0, safe_1.validatePayload)(this.payload.length >= 1);
|
|
104
104
|
// ManufacturerProprietaryCC has no CC command, so the first byte is stored in ccCommand.
|
|
105
|
-
this.manufacturerId =
|
|
106
|
-
|
|
105
|
+
this.manufacturerId = (this.ccCommand << 8)
|
|
106
|
+
+ this.payload[0];
|
|
107
107
|
// Try to parse the proprietary command
|
|
108
108
|
const PCConstructor = (0, Decorators_1.getManufacturerProprietaryCCConstructor)(this.manufacturerId);
|
|
109
|
-
if (PCConstructor
|
|
110
|
-
new.target !== PCConstructor
|
|
111
|
-
!(0, safe_2.staticExtends)(new.target, PCConstructor)) {
|
|
109
|
+
if (PCConstructor
|
|
110
|
+
&& new.target !== PCConstructor
|
|
111
|
+
&& !(0, safe_2.staticExtends)(new.target, PCConstructor)) {
|
|
112
112
|
return new PCConstructor(host, options);
|
|
113
113
|
}
|
|
114
114
|
// If the constructor is correct, update the payload for subclass deserialization
|
|
115
115
|
this.payload = this.payload.slice(1);
|
|
116
116
|
}
|
|
117
117
|
else {
|
|
118
|
-
this.manufacturerId =
|
|
119
|
-
|
|
118
|
+
this.manufacturerId = options.manufacturerId
|
|
119
|
+
?? (0, Decorators_1.getManufacturerId)(this);
|
|
120
120
|
this.unspecifiedExpectsResponse =
|
|
121
121
|
options.unspecifiedExpectsResponse;
|
|
122
122
|
// To use this CC, a manufacturer ID must exist in the value DB
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ManufacturerProprietaryCC.js","sourceRoot":"","sources":["../../src/cc/ManufacturerProprietaryCC.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAO6B;AAE7B,gDAAsD;AAEtD,oCAAmC;AACnC,sDAK6B;AAC7B,0EAKuC;AACvC,qEAAwE;AACxE,qEAI8C;
|
|
1
|
+
{"version":3,"file":"ManufacturerProprietaryCC.js","sourceRoot":"","sources":["../../src/cc/ManufacturerProprietaryCC.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import type { MessageOrCCLogEntry } from "@zwave-js/core/safe";
|
|
|
3
3
|
import { CommandClasses, type MaybeNotKnown } from "@zwave-js/core/safe";
|
|
4
4
|
import type { ZWaveApplicationHost, ZWaveHost } from "@zwave-js/host/safe";
|
|
5
5
|
import { PhysicalCCAPI } from "../lib/API";
|
|
6
|
-
import {
|
|
6
|
+
import { type CCCommandOptions, CommandClass, type CommandClassDeserializationOptions } from "../lib/CommandClass";
|
|
7
7
|
import { DeviceIdType, ManufacturerSpecificCommand } from "../lib/_Types";
|
|
8
8
|
export declare const ManufacturerSpecificCCValues: Readonly<{
|
|
9
9
|
deviceId: ((type: DeviceIdType) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ManufacturerSpecificCC.d.ts","sourceRoot":"","sources":["../../src/cc/ManufacturerSpecificCC.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EACN,cAAc,
|
|
1
|
+
{"version":3,"file":"ManufacturerSpecificCC.d.ts","sourceRoot":"","sources":["../../src/cc/ManufacturerSpecificCC.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EACN,cAAc,EACd,KAAK,aAAa,EAMlB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,oBAAoB,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAG3E,OAAO,EAAS,aAAa,EAAE,MAAM,YAAY,CAAC;AAClD,OAAO,EACN,KAAK,gBAAgB,EACrB,YAAY,EACZ,KAAK,kCAAkC,EAEvC,MAAM,qBAAqB,CAAC;AAW7B,OAAO,EAAE,YAAY,EAAE,2BAA2B,EAAE,MAAM,eAAe,CAAC;AAE1E,eAAO,MAAM,4BAA4B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA8CvC,CAAC;AAIH,qBACa,yBAA0B,SAAQ,aAAa;IACpD,eAAe,CACrB,GAAG,EAAE,2BAA2B,GAC9B,aAAa,CAAC,OAAO,CAAC;IAWZ,GAAG;IA0BH,iBAAiB,CAC7B,YAAY,EAAE,YAAY,GACxB,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;CAmBjC;AAED,qBAGa,sBAAuB,SAAQ,YAAY;IAC/C,SAAS,EAAE,2BAA2B,CAAC;IAExC,6BAA6B,IAAI,SAAS,cAAc,EAAE;IAKpD,SAAS,CAAC,QAAQ,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC;CA4CrE;AAED,MAAM,WAAW,mCAAoC,SAAQ,gBAAgB;IAC5E,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;CAClB;AAED,qBACa,4BAA6B,SAAQ,sBAAsB;gBAEtE,IAAI,EAAE,SAAS,EACf,OAAO,EACJ,mCAAmC,GACnC,kCAAkC;IAgBtC,SACgB,cAAc,EAAE,MAAM,CAAC;IAEvC,SACgB,WAAW,EAAE,MAAM,CAAC;IAEpC,SACgB,SAAS,EAAE,MAAM,CAAC;IAE3B,SAAS,IAAI,MAAM;IAQnB,UAAU,CAAC,QAAQ,EAAE,oBAAoB,GAAG,mBAAmB;CAUtE;AAED,qBAEa,yBAA0B,SAAQ,sBAAsB;CAAG;AAExE,qBACa,0CACZ,SAAQ,sBAAsB;gBAG7B,IAAI,EAAE,SAAS,EACf,OAAO,EAAE,kCAAkC;IAgB5C,SAAgB,IAAI,EAAE,YAAY,CAAC;IAEnC,SAKgB,QAAQ,EAAE,MAAM,CAAC;IAE1B,UAAU,CAAC,QAAQ,EAAE,oBAAoB,GAAG,mBAAmB;CAStE;AAED,UAAU,8CACT,SAAQ,gBAAgB;IAExB,YAAY,EAAE,YAAY,CAAC;CAC3B;AAED,qBAEa,uCACZ,SAAQ,sBAAsB;gBAG7B,IAAI,EAAE,SAAS,EACf,OAAO,EACJ,kCAAkC,GAClC,8CAA8C;IAa3C,YAAY,EAAE,YAAY,CAAC;IAE3B,SAAS,IAAI,MAAM;IAKnB,UAAU,CAAC,QAAQ,EAAE,oBAAoB,GAAG,mBAAmB;CAWtE"}
|
|
@@ -42,9 +42,9 @@ exports.ManufacturerSpecificCCValues = Object.freeze({
|
|
|
42
42
|
}, { supportsEndpoints: false }),
|
|
43
43
|
}),
|
|
44
44
|
...Values_1.V.defineDynamicCCValues(safe_1.CommandClasses["Manufacturer Specific"], {
|
|
45
|
-
...Values_1.V.dynamicPropertyAndKeyWithName("deviceId", "deviceId", (type) => (0, safe_2.getEnumMemberName)(_Types_1.DeviceIdType, type), ({ property, propertyKey }) => property === "deviceId"
|
|
46
|
-
typeof propertyKey === "string"
|
|
47
|
-
propertyKey in _Types_1.DeviceIdType, (type) => ({
|
|
45
|
+
...Values_1.V.dynamicPropertyAndKeyWithName("deviceId", "deviceId", (type) => (0, safe_2.getEnumMemberName)(_Types_1.DeviceIdType, type), ({ property, propertyKey }) => property === "deviceId"
|
|
46
|
+
&& typeof propertyKey === "string"
|
|
47
|
+
&& propertyKey in _Types_1.DeviceIdType, (type) => ({
|
|
48
48
|
...safe_1.ValueMetadata.ReadOnlyString,
|
|
49
49
|
label: `Device ID (${(0, safe_2.getEnumMemberName)(_Types_1.DeviceIdType, type)})`,
|
|
50
50
|
}), { minVersion: 2 }),
|
|
@@ -115,8 +115,8 @@ let ManufacturerSpecificCC = exports.ManufacturerSpecificCC = class Manufacturer
|
|
|
115
115
|
const mfResp = await api.get();
|
|
116
116
|
if (mfResp) {
|
|
117
117
|
const logMessage = `received response for manufacturer information:
|
|
118
|
-
manufacturer: ${applHost.configManager.lookupManufacturer(mfResp.manufacturerId)
|
|
119
|
-
"unknown"} (${(0, safe_2.num2hex)(mfResp.manufacturerId)})
|
|
118
|
+
manufacturer: ${applHost.configManager.lookupManufacturer(mfResp.manufacturerId)
|
|
119
|
+
|| "unknown"} (${(0, safe_2.num2hex)(mfResp.manufacturerId)})
|
|
120
120
|
product type: ${(0, safe_2.num2hex)(mfResp.productType)}
|
|
121
121
|
product id: ${(0, safe_2.num2hex)(mfResp.productId)}`;
|
|
122
122
|
applHost.controllerLog.logNode(node.id, {
|
|
@@ -195,10 +195,9 @@ let ManufacturerSpecificCCDeviceSpecificReport = exports.ManufacturerSpecificCCD
|
|
|
195
195
|
const dataLength = this.payload[1] & 0b11111;
|
|
196
196
|
(0, safe_1.validatePayload)(dataLength > 0, this.payload.length >= 2 + dataLength);
|
|
197
197
|
const deviceIdData = this.payload.slice(2, 2 + dataLength);
|
|
198
|
-
this.deviceId =
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
: "0x" + deviceIdData.toString("hex");
|
|
198
|
+
this.deviceId = dataFormat === 0
|
|
199
|
+
? deviceIdData.toString("utf8")
|
|
200
|
+
: "0x" + deviceIdData.toString("hex");
|
|
202
201
|
}
|
|
203
202
|
toLogEntry(applHost) {
|
|
204
203
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ManufacturerSpecificCC.js","sourceRoot":"","sources":["../../src/cc/ManufacturerSpecificCC.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;AACA,8CAQ6B;AAE7B,gDAAyE;AAEzE,oCAAkD;AAClD,sDAK6B;AAC7B,0EAQuC;AACvC,0CAAkC;AAClC,0CAA0E;AAE7D,QAAA,4BAA4B,GAAG,MAAM,CAAC,MAAM,CAAC;IACzD,GAAG,UAAC,CAAC,oBAAoB,CAAC,qBAAc,CAAC,uBAAuB,CAAC,EAAE;QAClE,GAAG,UAAC,CAAC,cAAc,CAClB,gBAAgB,EAChB;YACC,GAAG,oBAAa,CAAC,cAAc;YAC/B,KAAK,EAAE,iBAAiB;SACf,EACV,EAAE,iBAAiB,EAAE,KAAK,EAAE,CAC5B;QAED,GAAG,UAAC,CAAC,cAAc,CAClB,aAAa,EACb;YACC,GAAG,oBAAa,CAAC,cAAc;YAC/B,KAAK,EAAE,cAAc;SACZ,EACV,EAAE,iBAAiB,EAAE,KAAK,EAAE,CAC5B;QAED,GAAG,UAAC,CAAC,cAAc,CAClB,WAAW,EACX;YACC,GAAG,oBAAa,CAAC,cAAc;YAC/B,KAAK,EAAE,YAAY;SACV,EACV,EAAE,iBAAiB,EAAE,KAAK,EAAE,CAC5B;KACD,CAAC;IAEF,GAAG,UAAC,CAAC,qBAAqB,CAAC,qBAAc,CAAC,uBAAuB,CAAC,EAAE;QACnE,GAAG,UAAC,CAAC,6BAA6B,CACjC,UAAU,EACV,UAAU,EACV,CAAC,IAAkB,EAAE,EAAE,CAAC,IAAA,wBAAiB,EAAC,qBAAY,EAAE,IAAI,CAAC,EAC7D,CAAC,EAAE,QAAQ,EAAE,WAAW,EAAE,EAAE,EAAE,CAC7B,QAAQ,KAAK,UAAU;
|
|
1
|
+
{"version":3,"file":"ManufacturerSpecificCC.js","sourceRoot":"","sources":["../../src/cc/ManufacturerSpecificCC.ts"],"names":[],"mappings":"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"}
|
package/build/cc/MeterCC.d.ts
CHANGED
|
@@ -3,8 +3,8 @@ import { type MeterScale } from "@zwave-js/config";
|
|
|
3
3
|
import { type IZWaveEndpoint, type MaybeUnknown } from "@zwave-js/core";
|
|
4
4
|
import { CommandClasses, type MaybeNotKnown, type MessageOrCCLogEntry, type SinglecastCC, type SupervisionResult } from "@zwave-js/core/safe";
|
|
5
5
|
import type { ZWaveApplicationHost, ZWaveHost } from "@zwave-js/host/safe";
|
|
6
|
-
import { POLL_VALUE, PhysicalCCAPI,
|
|
7
|
-
import {
|
|
6
|
+
import { POLL_VALUE, PhysicalCCAPI, type PollValueImplementation, SET_VALUE, type SetValueImplementation } from "../lib/API";
|
|
7
|
+
import { type CCCommandOptions, CommandClass, type CommandClassDeserializationOptions } from "../lib/CommandClass";
|
|
8
8
|
import { MeterCommand, RateType } from "../lib/_Types";
|
|
9
9
|
export declare const MeterCCValues: Readonly<{
|
|
10
10
|
value: ((meterType: number, rateType: RateType, scale: number) => {
|
|
@@ -255,20 +255,24 @@ export declare class MeterCC extends CommandClass {
|
|
|
255
255
|
static getSupportedRateTypesCached(applHost: ZWaveApplicationHost, endpoint: IZWaveEndpoint): MaybeNotKnown<RateType[]>;
|
|
256
256
|
translatePropertyKey(applHost: ZWaveApplicationHost, property: string | number, propertyKey: string | number): string | undefined;
|
|
257
257
|
}
|
|
258
|
+
export interface MeterCCReportOptions extends CCCommandOptions {
|
|
259
|
+
type: number;
|
|
260
|
+
scale: number;
|
|
261
|
+
value: number;
|
|
262
|
+
previousValue?: MaybeNotKnown<number>;
|
|
263
|
+
rateType?: RateType;
|
|
264
|
+
deltaTime?: MaybeUnknown<number>;
|
|
265
|
+
}
|
|
258
266
|
export declare class MeterCCReport extends MeterCC {
|
|
259
|
-
constructor(host: ZWaveHost, options: CommandClassDeserializationOptions);
|
|
267
|
+
constructor(host: ZWaveHost, options: CommandClassDeserializationOptions | MeterCCReportOptions);
|
|
260
268
|
persistValues(applHost: ZWaveApplicationHost): boolean;
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
private _rateType;
|
|
269
|
-
get rateType(): RateType;
|
|
270
|
-
private _deltaTime;
|
|
271
|
-
get deltaTime(): MaybeUnknown<number>;
|
|
269
|
+
type: number;
|
|
270
|
+
scale: number;
|
|
271
|
+
value: number;
|
|
272
|
+
previousValue: MaybeNotKnown<number>;
|
|
273
|
+
rateType: RateType;
|
|
274
|
+
deltaTime: MaybeUnknown<number>;
|
|
275
|
+
serialize(): Buffer;
|
|
272
276
|
toLogEntry(applHost: ZWaveApplicationHost): MessageOrCCLogEntry;
|
|
273
277
|
}
|
|
274
278
|
interface MeterCCGetOptions {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MeterCC.d.ts","sourceRoot":"","sources":["../../src/cc/MeterCC.ts"],"names":[],"mappings":";AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"MeterCC.d.ts","sourceRoot":"","sources":["../../src/cc/MeterCC.ts"],"names":[],"mappings":"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"}
|
package/build/cc/MeterCC.js
CHANGED
|
@@ -304,8 +304,8 @@ let MeterCCAPI = exports.MeterCCAPI = class MeterCCAPI extends API_1.PhysicalCCA
|
|
|
304
304
|
if (property !== "reset") {
|
|
305
305
|
(0, API_1.throwUnsupportedProperty)(this.ccId, property);
|
|
306
306
|
}
|
|
307
|
-
else if (propertyKey != undefined
|
|
308
|
-
typeof propertyKey !== "number") {
|
|
307
|
+
else if (propertyKey != undefined
|
|
308
|
+
&& typeof propertyKey !== "number") {
|
|
309
309
|
(0, API_1.throwUnsupportedPropertyKey)(this.ccId, property, propertyKey);
|
|
310
310
|
}
|
|
311
311
|
else if (value !== true) {
|
|
@@ -393,7 +393,8 @@ supports reset: ${suppResp.supportsReset}`;
|
|
|
393
393
|
await api.get();
|
|
394
394
|
}
|
|
395
395
|
else {
|
|
396
|
-
const type = this.getValue(applHost, exports.MeterCCValues.type)
|
|
396
|
+
const type = this.getValue(applHost, exports.MeterCCValues.type)
|
|
397
|
+
?? 0;
|
|
397
398
|
const supportedScales = this.getValue(applHost, exports.MeterCCValues.supportedScales) ?? [];
|
|
398
399
|
const supportedRateTypes = this.getValue(applHost, exports.MeterCCValues.supportedRateTypes) ?? [];
|
|
399
400
|
const rateTypes = supportedRateTypes.length
|
|
@@ -423,8 +424,8 @@ supports reset: ${suppResp.supportsReset}`;
|
|
|
423
424
|
const values = this.getDefinedValueIDs(applHost).filter((v) => exports.MeterCCValues.value.is(v));
|
|
424
425
|
return values.some((v) => {
|
|
425
426
|
const lastUpdated = valueDB.getTimestamp(v);
|
|
426
|
-
return (lastUpdated == undefined
|
|
427
|
-
Date.now() - lastUpdated > core_1.timespan.hours(6));
|
|
427
|
+
return (lastUpdated == undefined
|
|
428
|
+
|| Date.now() - lastUpdated > core_1.timespan.hours(6));
|
|
428
429
|
});
|
|
429
430
|
}
|
|
430
431
|
/**
|
|
@@ -493,52 +494,62 @@ exports.MeterCC = MeterCC = __decorate([
|
|
|
493
494
|
let MeterCCReport = exports.MeterCCReport = class MeterCCReport extends MeterCC {
|
|
494
495
|
constructor(host, options) {
|
|
495
496
|
super(host, options);
|
|
496
|
-
(0,
|
|
497
|
-
|
|
498
|
-
|
|
499
|
-
|
|
500
|
-
|
|
501
|
-
|
|
502
|
-
|
|
503
|
-
|
|
504
|
-
|
|
505
|
-
|
|
506
|
-
|
|
507
|
-
this.
|
|
508
|
-
|
|
509
|
-
|
|
510
|
-
this.
|
|
511
|
-
|
|
512
|
-
|
|
513
|
-
|
|
514
|
-
|
|
515
|
-
this.
|
|
516
|
-
|
|
517
|
-
|
|
518
|
-
|
|
519
|
-
Buffer.
|
|
520
|
-
|
|
521
|
-
|
|
522
|
-
|
|
523
|
-
|
|
497
|
+
if ((0, CommandClass_1.gotDeserializationOptions)(options)) {
|
|
498
|
+
(0, safe_1.validatePayload)(this.payload.length >= 2);
|
|
499
|
+
this.type = this.payload[0] & 31;
|
|
500
|
+
this.rateType = (this.payload[0] & 96) >>> 5;
|
|
501
|
+
const scale1Bit2 = (this.payload[0] & 128) >>> 7;
|
|
502
|
+
const { scale: scale1Bits10, value, bytesRead, } = (0, safe_1.parseFloatWithScale)(this.payload.slice(1));
|
|
503
|
+
let offset = 2 + (bytesRead - 1);
|
|
504
|
+
// The scale is composed of two fields (see SDS13781)
|
|
505
|
+
const scale1 = (scale1Bit2 << 2) | scale1Bits10;
|
|
506
|
+
let scale2 = 0;
|
|
507
|
+
this.value = value;
|
|
508
|
+
if (this.version >= 2 && this.payload.length >= offset + 2) {
|
|
509
|
+
this.deltaTime = this.payload.readUInt16BE(offset);
|
|
510
|
+
offset += 2;
|
|
511
|
+
if (this.deltaTime === 0xffff) {
|
|
512
|
+
this.deltaTime = safe_1.UNKNOWN_STATE;
|
|
513
|
+
}
|
|
514
|
+
if (
|
|
515
|
+
// 0 means that no previous value is included
|
|
516
|
+
this.deltaTime !== 0
|
|
517
|
+
&& this.payload.length >= offset + (bytesRead - 1)) {
|
|
518
|
+
const { value: prevValue } = (0, safe_1.parseFloatWithScale)(
|
|
519
|
+
// This float is split in the payload
|
|
520
|
+
Buffer.concat([
|
|
521
|
+
Buffer.from([this.payload[1]]),
|
|
522
|
+
this.payload.slice(offset),
|
|
523
|
+
]));
|
|
524
|
+
offset += bytesRead - 1;
|
|
525
|
+
this.previousValue = prevValue;
|
|
526
|
+
}
|
|
527
|
+
if (this.version >= 4
|
|
528
|
+
&& scale1 === 7
|
|
529
|
+
&& this.payload.length >= offset + 1) {
|
|
530
|
+
scale2 = this.payload[offset];
|
|
531
|
+
}
|
|
524
532
|
}
|
|
525
|
-
|
|
526
|
-
|
|
527
|
-
this.
|
|
528
|
-
scale2 = this.payload[offset];
|
|
533
|
+
else {
|
|
534
|
+
// 0 means that no previous value is included
|
|
535
|
+
this.deltaTime = 0;
|
|
529
536
|
}
|
|
537
|
+
this.scale = scale1 === 7 ? scale1 + scale2 : scale1;
|
|
530
538
|
}
|
|
531
539
|
else {
|
|
532
|
-
|
|
533
|
-
this.
|
|
540
|
+
this.type = options.type;
|
|
541
|
+
this.scale = options.scale;
|
|
542
|
+
this.value = options.value;
|
|
543
|
+
this.previousValue = options.previousValue;
|
|
544
|
+
this.rateType = options.rateType ?? _Types_1.RateType.Unspecified;
|
|
545
|
+
this.deltaTime = options.deltaTime ?? safe_1.UNKNOWN_STATE;
|
|
534
546
|
}
|
|
535
|
-
this.scale = scale1 === 7 ? scale1 + scale2 : scale1;
|
|
536
547
|
}
|
|
537
548
|
persistValues(applHost) {
|
|
538
549
|
if (!super.persistValues(applHost))
|
|
539
550
|
return false;
|
|
540
|
-
const meterType = applHost.configManager.lookupMeter(this.
|
|
541
|
-
const scale = applHost.configManager.lookupMeterScale(this.
|
|
551
|
+
const meterType = applHost.configManager.lookupMeter(this.type);
|
|
552
|
+
const scale = applHost.configManager.lookupMeterScale(this.type, this.scale);
|
|
542
553
|
// Filter out unknown meter types and scales, unless the strict validation is disabled
|
|
543
554
|
const measurementValidation = !this.host.getDeviceConfig?.(this.nodeId)?.compat?.disableStrictMeasurementValidation;
|
|
544
555
|
if (measurementValidation) {
|
|
@@ -548,7 +559,7 @@ let MeterCCReport = exports.MeterCCReport = class MeterCCReport extends MeterCC
|
|
|
548
559
|
if (this.version >= 2) {
|
|
549
560
|
const expectedType = this.getValue(applHost, exports.MeterCCValues.type);
|
|
550
561
|
if (expectedType != undefined) {
|
|
551
|
-
safe_1.validatePayload.withReason("Unexpected meter type or corrupted data")(this.
|
|
562
|
+
safe_1.validatePayload.withReason("Unexpected meter type or corrupted data")(this.type === expectedType);
|
|
552
563
|
}
|
|
553
564
|
const supportedScales = this.getValue(applHost, exports.MeterCCValues.supportedScales);
|
|
554
565
|
if (supportedScales?.length) {
|
|
@@ -556,53 +567,63 @@ let MeterCCReport = exports.MeterCCReport = class MeterCCReport extends MeterCC
|
|
|
556
567
|
}
|
|
557
568
|
const supportedRateTypes = this.getValue(applHost, exports.MeterCCValues.supportedRateTypes);
|
|
558
569
|
if (supportedRateTypes?.length) {
|
|
559
|
-
safe_1.validatePayload.withReason(`Unsupported rate type ${(0, safe_2.getEnumMemberName)(_Types_1.RateType, this.
|
|
570
|
+
safe_1.validatePayload.withReason(`Unsupported rate type ${(0, safe_2.getEnumMemberName)(_Types_1.RateType, this.rateType)} or corrupted data`)(supportedRateTypes.includes(this.rateType));
|
|
560
571
|
}
|
|
561
572
|
}
|
|
562
573
|
}
|
|
563
|
-
const valueValue = exports.MeterCCValues.value(this.
|
|
574
|
+
const valueValue = exports.MeterCCValues.value(this.type, this.rateType, this.scale);
|
|
564
575
|
this.setMetadata(applHost, valueValue, {
|
|
565
576
|
...valueValue.meta,
|
|
566
|
-
label: getValueLabel(applHost.configManager, this.
|
|
577
|
+
label: getValueLabel(applHost.configManager, this.type, scale, this.rateType),
|
|
567
578
|
unit: scale.label,
|
|
568
579
|
ccSpecific: {
|
|
569
|
-
meterType: this.
|
|
580
|
+
meterType: this.type,
|
|
570
581
|
scale: this.scale,
|
|
571
|
-
rateType: this.
|
|
582
|
+
rateType: this.rateType,
|
|
572
583
|
},
|
|
573
584
|
});
|
|
574
|
-
this.setValue(applHost, valueValue, this.
|
|
585
|
+
this.setValue(applHost, valueValue, this.value);
|
|
575
586
|
return true;
|
|
576
587
|
}
|
|
577
|
-
|
|
578
|
-
|
|
579
|
-
|
|
580
|
-
|
|
581
|
-
|
|
582
|
-
|
|
583
|
-
|
|
584
|
-
|
|
585
|
-
|
|
586
|
-
|
|
587
|
-
|
|
588
|
-
|
|
589
|
-
|
|
590
|
-
|
|
588
|
+
serialize() {
|
|
589
|
+
const scale1 = this.scale >= 7 ? 7 : this.scale & 0b111;
|
|
590
|
+
const scale1Bits10 = scale1 & 0b11;
|
|
591
|
+
const scale1Bit2 = scale1 >>> 2;
|
|
592
|
+
const scale2 = this.scale >= 7 ? this.scale - 7 : 0;
|
|
593
|
+
const typeByte = (this.type & 31)
|
|
594
|
+
| ((this.rateType & 0b11) << 5)
|
|
595
|
+
| (scale1Bit2 << 7);
|
|
596
|
+
const floatParams = (0, core_1.getFloatParameters)(this.value);
|
|
597
|
+
const valueBytes = (0, core_1.encodeFloatWithScale)(this.value, scale1Bits10, floatParams);
|
|
598
|
+
const prevValueBytes = this.previousValue != undefined
|
|
599
|
+
? (0, core_1.encodeFloatWithScale)(this.previousValue, scale1Bits10, floatParams)
|
|
600
|
+
: Buffer.from([]);
|
|
601
|
+
const deltaTime = this.deltaTime ?? 0xffff;
|
|
602
|
+
const deltaTimeBytes = Buffer.allocUnsafe(2);
|
|
603
|
+
deltaTimeBytes.writeUInt16BE(deltaTime, 0);
|
|
604
|
+
this.payload = Buffer.concat([
|
|
605
|
+
Buffer.from([typeByte]),
|
|
606
|
+
valueBytes,
|
|
607
|
+
deltaTimeBytes,
|
|
608
|
+
prevValueBytes,
|
|
609
|
+
Buffer.from([scale2]),
|
|
610
|
+
]);
|
|
611
|
+
return super.serialize();
|
|
591
612
|
}
|
|
592
613
|
toLogEntry(applHost) {
|
|
593
|
-
const meterType = applHost.configManager.lookupMeter(this.
|
|
594
|
-
const scale = applHost.configManager.lookupMeterScale(this.
|
|
614
|
+
const meterType = applHost.configManager.lookupMeter(this.type);
|
|
615
|
+
const scale = applHost.configManager.lookupMeterScale(this.type, this.scale);
|
|
595
616
|
const message = {
|
|
596
|
-
type: meterType?.name ?? `Unknown (${(0, safe_2.num2hex)(this.
|
|
617
|
+
type: meterType?.name ?? `Unknown (${(0, safe_2.num2hex)(this.type)})`,
|
|
597
618
|
scale: scale.label,
|
|
598
|
-
"rate type": (0, safe_2.getEnumMemberName)(_Types_1.RateType, this.
|
|
619
|
+
"rate type": (0, safe_2.getEnumMemberName)(_Types_1.RateType, this.rateType),
|
|
599
620
|
value: this.value,
|
|
600
621
|
};
|
|
601
|
-
if (this.
|
|
622
|
+
if (this.deltaTime !== safe_1.UNKNOWN_STATE) {
|
|
602
623
|
message["time delta"] = `${this.deltaTime} seconds`;
|
|
603
624
|
}
|
|
604
|
-
if (this.
|
|
605
|
-
message["prev. value"] = this.
|
|
625
|
+
if (this.previousValue != undefined) {
|
|
626
|
+
message["prev. value"] = this.previousValue;
|
|
606
627
|
}
|
|
607
628
|
return {
|
|
608
629
|
...super.toLogEntry(applHost),
|
|
@@ -616,8 +637,8 @@ exports.MeterCCReport = MeterCCReport = __decorate([
|
|
|
616
637
|
function testResponseForMeterGet(sent, received) {
|
|
617
638
|
// We expect a Meter Report that matches the requested scale and rate type
|
|
618
639
|
// (if they were requested)
|
|
619
|
-
return ((sent.scale == undefined || sent.scale === received.scale)
|
|
620
|
-
(sent.rateType == undefined || sent.rateType == received.rateType));
|
|
640
|
+
return ((sent.scale == undefined || sent.scale === received.scale)
|
|
641
|
+
&& (sent.rateType == undefined || sent.rateType == received.rateType));
|
|
621
642
|
}
|
|
622
643
|
let MeterCCGet = exports.MeterCCGet = class MeterCCGet extends MeterCC {
|
|
623
644
|
constructor(host, options) {
|
|
@@ -733,8 +754,8 @@ let MeterCCSupportedReport = exports.MeterCCSupportedReport = class MeterCCSuppo
|
|
|
733
754
|
}
|
|
734
755
|
toLogEntry(applHost) {
|
|
735
756
|
const message = {
|
|
736
|
-
type: `${applHost.configManager.lookupMeter(this.type)?.name
|
|
737
|
-
`Unknown (${(0, safe_2.num2hex)(this.type)})`}`,
|
|
757
|
+
type: `${applHost.configManager.lookupMeter(this.type)?.name
|
|
758
|
+
?? `Unknown (${(0, safe_2.num2hex)(this.type)})`}`,
|
|
738
759
|
"supports reset": this.supportsReset,
|
|
739
760
|
"supported scales": `${this.supportedScales
|
|
740
761
|
.map((scale) => `
|
|
@@ -782,17 +803,17 @@ let MeterCCReset = exports.MeterCCReset = class MeterCCReset extends MeterCC {
|
|
|
782
803
|
this.type = options.type;
|
|
783
804
|
this.targetValue = options.targetValue;
|
|
784
805
|
// Test if this is a valid target value
|
|
785
|
-
if (this.targetValue != undefined
|
|
786
|
-
!(0, safe_1.getMinIntegerSize)(this.targetValue, true)) {
|
|
806
|
+
if (this.targetValue != undefined
|
|
807
|
+
&& !(0, safe_1.getMinIntegerSize)(this.targetValue, true)) {
|
|
787
808
|
throw new safe_1.ZWaveError(`${this.targetValue} is not a valid target value!`, safe_1.ZWaveErrorCodes.Argument_Invalid);
|
|
788
809
|
}
|
|
789
810
|
}
|
|
790
811
|
}
|
|
791
812
|
serialize() {
|
|
792
813
|
if (this.version >= 6 && this.targetValue != undefined && this.type) {
|
|
793
|
-
const size = (this.targetValue
|
|
794
|
-
(0, safe_1.getMinIntegerSize)(this.targetValue, true))
|
|
795
|
-
0;
|
|
814
|
+
const size = (this.targetValue
|
|
815
|
+
&& (0, safe_1.getMinIntegerSize)(this.targetValue, true))
|
|
816
|
+
|| 0;
|
|
796
817
|
if (size > 0) {
|
|
797
818
|
this.payload = Buffer.allocUnsafe(1 + size);
|
|
798
819
|
this.payload[0] = (size << 5) | (this.type & 0b11111);
|
|
@@ -804,8 +825,8 @@ let MeterCCReset = exports.MeterCCReset = class MeterCCReset extends MeterCC {
|
|
|
804
825
|
toLogEntry(applHost) {
|
|
805
826
|
const message = {};
|
|
806
827
|
if (this.type != undefined) {
|
|
807
|
-
message.type = `${applHost.configManager.lookupMeter(this.type)?.name
|
|
808
|
-
`Unknown (${(0, safe_2.num2hex)(this.type)})`}`;
|
|
828
|
+
message.type = `${applHost.configManager.lookupMeter(this.type)?.name
|
|
829
|
+
?? `Unknown (${(0, safe_2.num2hex)(this.type)})`}`;
|
|
809
830
|
}
|
|
810
831
|
if (this.targetValue != undefined) {
|
|
811
832
|
message["target value"] = this.targetValue;
|