@zwave-js/cc 12.12.3 → 13.0.0-beta.3

package/build/cc/MeterCC.js

@@ -7,6 +7,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MeterCCReset = exports.MeterCCSupportedGet = exports.MeterCCSupportedReport = exports.MeterCCGet = exports.MeterCCReport = exports.MeterCC = exports.MeterCCAPI = exports.MeterCCValues = void 0;
+exports.isAccumulatedValue = isAccumulatedValue;
 function __assertType(argName, typeName, boundHasError) {
     const { ZWaveError, ZWaveErrorCodes } = require("@zwave-js/core");
     if (boundHasError()) {
@@ -45,29 +46,125 @@ const __assertType__optional_MeterCCGetOptions = $o => {
     }
     return optional__0($o);
 };
-const __assertType__optional_MeterCCResetOptions = $o => {
+const __assertType__MeterCCReportOptions = $o => {
+    function _number($o) {
+        return typeof $o !== "number" ? {} : null;
+    }
     function _undefined($o) {
         return $o !== undefined ? {} : null;
     }
-    function _1($o) {
+    function su__undefined__number_eu($o) {
+        const conditions = [_undefined, _number];
+        for (const condition of conditions) {
+            const error = condition($o);
+            if (!error)
+                return null;
+        }
+        return {};
+    }
+    function su__5__6__7_eu($o) {
+        return ![0, 1, 2].includes($o) ? {} : null;
+    }
+    function _null($o) {
+        return $o !== null ? {} : null;
+    }
+    function su__null__number_eu($o) {
+        const conditions = [_null, _number];
+        for (const condition of conditions) {
+            const error = condition($o);
+            if (!error)
+                return null;
+        }
+        return {};
+    }
+    function _0($o) {
         if (typeof $o !== "object" || $o === null || Array.isArray($o))
             return {};
         if ("type" in $o && $o["type"] !== undefined) {
-            const error = _undefined($o["type"]);
+            const error = _number($o["type"]);
             if (error)
                 return error;
         }
-        if ("targetValue" in $o && $o["targetValue"] !== undefined) {
-            const error = _undefined($o["targetValue"]);
+        else
+            return {};
+        if ("scale" in $o && $o["scale"] !== undefined) {
+            const error = _number($o["scale"]);
+            if (error)
+                return error;
+        }
+        else
+            return {};
+        if ("value" in $o && $o["value"] !== undefined) {
+            const error = _number($o["value"]);
+            if (error)
+                return error;
+        }
+        else
+            return {};
+        if ("previousValue" in $o && $o["previousValue"] !== undefined) {
+            const error = su__undefined__number_eu($o["previousValue"]);
+            if (error)
+                return error;
+        }
+        if ("rateType" in $o && $o["rateType"] !== undefined) {
+            const error = su__5__6__7_eu($o["rateType"]);
+            if (error)
+                return error;
+        }
+        if ("deltaTime" in $o && $o["deltaTime"] !== undefined) {
+            const error = su__null__number_eu($o["deltaTime"]);
             if (error)
                 return error;
         }
         return null;
     }
+    return _0($o);
+};
+const __assertType__optional_boolean = $o => {
+    function _boolean($o) {
+        return typeof $o !== "boolean" ? {} : null;
+    }
+    function optional__boolean($o) {
+        if ($o !== undefined) {
+            const error = _boolean($o);
+            if (error)
+                return error;
+        }
+        return null;
+    }
+    return optional__boolean($o);
+};
+const __assertType__MeterCCSupportedReportOptions = $o => {
     function _number($o) {
         return typeof $o !== "number" ? {} : null;
     }
-    function _2($o) {
+    function _boolean($o) {
+        return typeof $o !== "boolean" ? {} : null;
+    }
+    function sa__number_ea_3($o) {
+        if (!Array.isArray($o))
+            return {};
+        for (let i = 0; i < $o.length; i++) {
+            const error = _number($o[i]);
+            if (error)
+                return error;
+        }
+        return null;
+    }
+    function su__5__6__7_eu($o) {
+        return ![0, 1, 2].includes($o) ? {} : null;
+    }
+    function sa_su__5__6__7_eu_ea_4($o) {
+        if (!Array.isArray($o))
+            return {};
+        for (let i = 0; i < $o.length; i++) {
+            const error = su__5__6__7_eu($o[i]);
+            if (error)
+                return error;
+        }
+        return null;
+    }
+    function _0($o) {
         if (typeof $o !== "object" || $o === null || Array.isArray($o))
             return {};
         if ("type" in $o && $o["type"] !== undefined) {
@@ -75,6 +172,62 @@ const __assertType__optional_MeterCCResetOptions = $o => {
             if (error)
                 return error;
         }
+        else
+            return {};
+        if ("supportsReset" in $o && $o["supportsReset"] !== undefined) {
+            const error = _boolean($o["supportsReset"]);
+            if (error)
+                return error;
+        }
+        else
+            return {};
+        if ("supportedScales" in $o && $o["supportedScales"] !== undefined) {
+            const error = sa__number_ea_3($o["supportedScales"]);
+            if (error)
+                return error;
+        }
+        else
+            return {};
+        if ("supportedRateTypes" in $o && $o["supportedRateTypes"] !== undefined) {
+            const error = sa_su__5__6__7_eu_ea_4($o["supportedRateTypes"]);
+            if (error)
+                return error;
+        }
+        else
+            return {};
+        return null;
+    }
+    return _0($o);
+};
+const __assertType__optional_MeterCCResetOptions = $o => {
+    function _number($o) {
+        return typeof $o !== "number" ? {} : null;
+    }
+    function su__4__5__6_eu($o) {
+        return ![0, 1, 2].includes($o) ? {} : null;
+    }
+    function _1($o) {
+        if (typeof $o !== "object" || $o === null || Array.isArray($o))
+            return {};
+        if ("type" in $o && $o["type"] !== undefined) {
+            const error = _number($o["type"]);
+            if (error)
+                return error;
+        }
+        else
+            return {};
+        if ("scale" in $o && $o["scale"] !== undefined) {
+            const error = _number($o["scale"]);
+            if (error)
+                return error;
+        }
+        else
+            return {};
+        if ("rateType" in $o && $o["rateType"] !== undefined) {
+            const error = su__4__5__6_eu($o["rateType"]);
+            if (error)
+                return error;
+        }
         else
             return {};
         if ("targetValue" in $o && $o["targetValue"] !== undefined) {
@@ -86,6 +239,34 @@ const __assertType__optional_MeterCCResetOptions = $o => {
             return {};
         return null;
     }
+    function _undefined($o) {
+        return $o !== undefined ? {} : null;
+    }
+    function _2($o) {
+        if (typeof $o !== "object" || $o === null || Array.isArray($o))
+            return {};
+        if ("type" in $o && $o["type"] !== undefined) {
+            const error = _undefined($o["type"]);
+            if (error)
+                return error;
+        }
+        if ("scale" in $o && $o["scale"] !== undefined) {
+            const error = _undefined($o["scale"]);
+            if (error)
+                return error;
+        }
+        if ("rateType" in $o && $o["rateType"] !== undefined) {
+            const error = _undefined($o["rateType"]);
+            if (error)
+                return error;
+        }
+        if ("targetValue" in $o && $o["targetValue"] !== undefined) {
+            const error = _undefined($o["targetValue"]);
+            if (error)
+                return error;
+        }
+        return null;
+    }
     function su__1__2_eu($o) {
         const conditions = [_1, _2];
         for (const condition of conditions) {
@@ -105,7 +286,6 @@ const __assertType__optional_MeterCCResetOptions = $o => {
     }
     return optional_su__1__2_eu($o);
 };
-const config_1 = require("@zwave-js/config");
 const core_1 = require("@zwave-js/core");
 const safe_1 = require("@zwave-js/core/safe");
 const safe_2 = require("@zwave-js/shared/safe");
@@ -131,15 +311,23 @@ exports.MeterCCValues = Object.freeze({
         }),
     }),
     ...Values_1.V.defineDynamicCCValues(safe_1.CommandClasses.Meter, {
-        ...Values_1.V.dynamicPropertyAndKeyWithName("resetSingle", "reset", (meterType) => meterType, ({ property, propertyKey }) => property === "reset" && typeof propertyKey === "number", (meterType) => ({
+        ...Values_1.V.dynamicPropertyAndKeyWithName("resetSingle", "reset", toPropertyKey, ({ property, propertyKey }) => property === "reset" && typeof propertyKey === "number", (meterType, rateType, scale) => ({
             ...safe_1.ValueMetadata.WriteOnlyBoolean,
             // This is only a placeholder label. A config manager is needed to
             // determine the actual label.
-            label: `Reset (${(0, safe_2.num2hex)(meterType)})`,
+            label: `Reset (${rateType === _Types_1.RateType.Consumed
+                ? "Consumption, "
+                : rateType === _Types_1.RateType.Produced
+                    ? "Production, "
+                    : ""}${(0, safe_2.num2hex)(scale)})`,
             states: {
                 true: "Reset",
             },
-            ccSpecific: { meterType },
+            ccSpecific: {
+                meterType,
+                rateType,
+                scale,
+            },
         })),
         ...Values_1.V.dynamicPropertyAndKeyWithName("value", "value", toPropertyKey, ({ property, propertyKey }) => property === "value" && typeof propertyKey === "number", (meterType, rateType, scale) => ({
             ...safe_1.ValueMetadata.ReadOnlyNumber,
@@ -162,32 +350,102 @@ function splitPropertyKey(key) {
         meterType: key >>> 16,
     };
 }
-function getMeterTypeName(configManager, type) {
-    return (configManager.lookupMeter(type)?.name ?? `UNKNOWN (${(0, safe_2.num2hex)(type)})`);
-}
-function getValueLabel(configManager, meterType, scale, rateType, suffix) {
-    let ret = getMeterTypeName(configManager, meterType);
+function getValueLabel(meterType, scale, rateType, suffix) {
+    let ret = (0, core_1.getMeterName)(meterType);
+    const scaleLabel = ((0, core_1.getMeterScale)(meterType, scale) ?? (0, core_1.getUnknownMeterScale)(scale)).label;
     switch (rateType) {
         case _Types_1.RateType.Consumed:
-            ret += ` Consumption [${scale.label}]`;
+            ret += ` Consumption [${scaleLabel}]`;
             break;
         case _Types_1.RateType.Produced:
-            ret += ` Production [${scale.label}]`;
+            ret += ` Production [${scaleLabel}]`;
             break;
         default:
-            ret += ` [${scale.label}]`;
+            ret += ` [${scaleLabel}]`;
     }
     if (suffix) {
         ret += ` (${suffix})`;
     }
     return ret;
 }
+function parseMeterValueAndInfo(data, offset) {
+    (0, safe_1.validatePayload)(data.length >= offset + 1);
+    const type = data[offset] & 0b0_00_11111;
+    const rateType = (data[offset] & 0b0_11_00000) >>> 5;
+    const scale1Bit2 = (data[offset] & 0b1_00_00000) >>> 7;
+    const { scale: scale1Bits10, value, bytesRead, } = (0, safe_1.parseFloatWithScale)(data.subarray(offset + 1));
+    return {
+        type,
+        rateType,
+        // The scale is composed of two fields
+        scale1: (scale1Bit2 << 2) | scale1Bits10,
+        value,
+        // We've read one byte more than the float contains
+        bytesRead: bytesRead + 1,
+    };
+}
+function encodeMeterValueAndInfo(type, rateType, scale, value) {
+    // We need at least 2 bytes
+    const scale1 = scale >= 7 ? 7 : scale & 0b111;
+    const scale1Bits10 = scale1 & 0b11;
+    const scale1Bit2 = scale1 >>> 2;
+    const scale2 = scale >= 7 ? scale - 7 : undefined;
+    const typeByte = (type & 0b0_00_11111)
+        | ((rateType & 0b11) << 5)
+        | (scale1Bit2 << 7);
+    const floatParams = (0, core_1.getFloatParameters)(value);
+    const valueBytes = (0, core_1.encodeFloatWithScale)(value, scale1Bits10, floatParams);
+    return {
+        data: Buffer.concat([Buffer.from([typeByte]), valueBytes]),
+        floatParams: (0, safe_2.pick)(floatParams, ["precision", "size"]),
+        scale2,
+    };
+}
+function parseScale(scale1, data, scale2Offset) {
+    if (scale1 === 7) {
+        (0, safe_1.validatePayload)(data.length >= scale2Offset + 1);
+        const scale2 = data[scale2Offset];
+        return scale1 + scale2;
+    }
+    else {
+        return scale1;
+    }
+}
+function isAccumulatedValue(meterType, scale) {
+    // FIXME: We should probably move the meter definitions into code
+    switch (meterType) {
+        case 0x01: // Electric
+            return (scale === 0x00 // kWh
+                || scale === 0x01 // kVAh
+                || scale === 0x03 // Pulse count
+                || scale === 0x08 // kVarh
+            );
+        case 0x02: // Gas
+            return (scale === 0x00 // m³
+                || scale === 0x01 // ft³
+                || scale === 0x03 // Pulse count
+            );
+        case 0x03: // Water
+            return (scale === 0x00 // m³
+                || scale === 0x01 // ft³
+                || scale === 0x02 // US gallons
+                || scale === 0x03 // Pulse count
+            );
+        case 0x04: // Heating
+            return scale === 0x00; // kWh
+        case 0x05: // Cooling
+            return scale === 0x00; // kWh
+    }
+    return false;
+}
 let MeterCCAPI = class MeterCCAPI extends API_1.PhysicalCCAPI {
     supportsCommand(cmd) {
         switch (cmd) {
             case _Types_1.MeterCommand.Get:
+            case _Types_1.MeterCommand.Report:
                 return true; // This is mandatory
             case _Types_1.MeterCommand.SupportedGet:
+            case _Types_1.MeterCommand.SupportedReport:
                 return this.version >= 2;
             case _Types_1.MeterCommand.Reset: {
                 const ret = this.tryGetValueDB()?.getValue({
@@ -235,7 +493,8 @@ let MeterCCAPI = class MeterCCAPI extends API_1.PhysicalCCAPI {
         if (response) {
             return {
                 type: response.type,
-                scale: this.applHost.configManager.lookupMeterScale(response.type, response.scale),
+                scale: (0, core_1.getMeterScale)(response.type, response.scale)
+                    ?? (0, core_1.getUnknownMeterScale)(response.scale),
                 ...(0, safe_2.pick)(response, [
                     "value",
                     "previousValue",
@@ -245,10 +504,21 @@ let MeterCCAPI = class MeterCCAPI extends API_1.PhysicalCCAPI {
             };
         }
     }
-    // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
-    async getAll() {
+    async sendReport(options) {
+        __assertType("options", "MeterCCReportOptions", __assertType__MeterCCReportOptions.bind(void 0, options));
+        this.assertSupportsCommand(_Types_1.MeterCommand, _Types_1.MeterCommand.Report);
+        const cc = new MeterCCReport(this.applHost, {
+            nodeId: this.endpoint.nodeId,
+            endpoint: this.endpoint.index,
+            ...options,
+        });
+        return this.applHost.sendCommand(cc, this.commandOptions);
+    }
+    async getAll(accumulatedOnly = false) {
+        __assertType("accumulatedOnly", "(optional) boolean", __assertType__optional_boolean.bind(void 0, accumulatedOnly));
         const valueDB = this.tryGetValueDB();
         if (this.version >= 2) {
+            const meterType = valueDB?.getValue(exports.MeterCCValues.type.endpoint(this.endpoint.index));
             const supportedScales = valueDB?.getValue(exports.MeterCCValues.supportedScales.endpoint(this.endpoint.index)) ?? [];
             const supportedRateTypes = valueDB?.getValue(exports.MeterCCValues.supportedRateTypes.endpoint(this.endpoint.index)) ?? [];
             const rateTypes = supportedRateTypes.length
@@ -257,6 +527,12 @@ let MeterCCAPI = class MeterCCAPI extends API_1.PhysicalCCAPI {
             const ret = [];
             for (const rateType of rateTypes) {
                 for (const scale of supportedScales) {
+                    // Skip non-accumulated values if requested
+                    if (accumulatedOnly
+                        && meterType != undefined
+                        && !isAccumulatedValue(meterType, scale)) {
+                        continue;
+                    }
                     const response = await this.get({
                         scale,
                         rateType,
@@ -289,6 +565,16 @@ let MeterCCAPI = class MeterCCAPI extends API_1.PhysicalCCAPI {
             ]);
         }
     }
+    async sendSupportedReport(options) {
+        __assertType("options", "MeterCCSupportedReportOptions", __assertType__MeterCCSupportedReportOptions.bind(void 0, options));
+        this.assertSupportsCommand(_Types_1.MeterCommand, _Types_1.MeterCommand.SupportedReport);
+        const cc = new MeterCCSupportedReport(this.applHost, {
+            nodeId: this.endpoint.nodeId,
+            endpoint: this.endpoint.index,
+            ...options,
+        });
+        await this.applHost.sendCommand(cc, this.commandOptions);
+    }
     async reset(options) {
         __assertType("options", "(optional) MeterCCResetOptions", __assertType__optional_MeterCCResetOptions.bind(void 0, options));
         this.assertSupportsCommand(_Types_1.MeterCommand, _Types_1.MeterCommand.Reset);
@@ -311,18 +597,83 @@ let MeterCCAPI = class MeterCCAPI extends API_1.PhysicalCCAPI {
             else if (value !== true) {
                 (0, API_1.throwWrongValueType)(this.ccId, property, "true", value === false ? "false" : typeof value);
             }
-            const resetOptions = propertyKey != undefined
-                ? {
-                    type: propertyKey,
+            if (typeof propertyKey === "number") {
+                const { meterType, scale, rateType } = splitPropertyKey(propertyKey);
+                return this.reset({
+                    type: meterType,
+                    scale,
+                    rateType,
                     targetValue: 0,
-                }
-                : {};
-            await this.reset(resetOptions);
-            // Refresh values
-            await this.getAll();
+                });
+            }
+            else {
+                return this.reset();
+            }
             return undefined;
         };
     }
+    [API_1.SET_VALUE_HOOKS] = ({ property, propertyKey }, _value, _options) => {
+        if (property !== "reset")
+            return;
+        if (typeof propertyKey === "number") {
+            // Reset single
+            const { meterType, rateType, scale } = splitPropertyKey(propertyKey);
+            const readingValueId = exports.MeterCCValues.value(meterType, rateType, scale).endpoint(this.endpoint.index);
+            return {
+                optimisticallyUpdateRelatedValues: (supervisedAndSuccessful) => {
+                    if (!supervisedAndSuccessful)
+                        return;
+                    // After resetting a single reading with supervision, store zero
+                    // in the corresponding value
+                    const valueDB = this.tryGetValueDB();
+                    if (!valueDB)
+                        return;
+                    if (isAccumulatedValue(meterType, scale)) {
+                        valueDB.setValue({
+                            commandClass: this.ccId,
+                            endpoint: this.endpoint.index,
+                            property,
+                            propertyKey,
+                        }, 0);
+                    }
+                },
+                verifyChanges: () => {
+                    this.schedulePoll(readingValueId, 0, { transition: "fast" });
+                },
+            };
+        }
+        else {
+            // Reset all
+            const valueDB = this.tryGetValueDB();
+            if (!valueDB)
+                return;
+            const accumulatedValues = valueDB.findValues((vid) => vid.commandClass === this.ccId
+                && vid.endpoint === this.endpoint.index
+                && exports.MeterCCValues.value.is(vid)).filter(({ propertyKey }) => {
+                if (typeof propertyKey !== "number")
+                    return false;
+                const { meterType, scale } = splitPropertyKey(propertyKey);
+                return isAccumulatedValue(meterType, scale);
+            });
+            return {
+                optimisticallyUpdateRelatedValues: (supervisedAndSuccessful) => {
+                    if (!supervisedAndSuccessful)
+                        return;
+                    // After setting the reset all value with supervision,
+                    // reset all accumulated values, since we know they are now zero.
+                    for (const value of accumulatedValues) {
+                        valueDB.setValue(value, 0);
+                    }
+                },
+                verifyChanges: () => {
+                    // Poll all accumulated values, unless they were updated by the device
+                    for (const valueID of accumulatedValues) {
+                        this.schedulePoll(valueID, 0, { transition: "fast" });
+                    }
+                },
+            };
+        }
+    };
 };
 exports.MeterCCAPI = MeterCCAPI;
 exports.MeterCCAPI = MeterCCAPI = __decorate([
@@ -349,9 +700,10 @@ let MeterCC = class MeterCC extends CommandClass_1.CommandClass {
             const suppResp = await api.getSupported();
             if (suppResp) {
                 const logMessage = `received meter support:
-type:                 ${getMeterTypeName(applHost.configManager, suppResp.type)}
+type:                 ${(0, core_1.getMeterName)(suppResp.type)}
 supported scales:     ${suppResp.supportedScales
-                    .map((s) => applHost.configManager.lookupMeterScale(suppResp.type, s).label)
+                    .map((s) => ((0, core_1.getMeterScale)(suppResp.type, s)
+                    ?? (0, core_1.getUnknownMeterScale)(s)).label)
                     .map((label) => `\n· ${label}`)
                     .join("")}
 supported rate types: ${suppResp.supportedRateTypes
@@ -405,8 +757,8 @@ supports reset:       ${suppResp.supportsReset}`;
                 for (const scale of supportedScales) {
                     applHost.controllerLog.logNode(node.id, {
                         endpoint: this.endpointIndex,
-                        message: `querying meter value (type = ${getMeterTypeName(applHost.configManager, type)}, scale = ${applHost.configManager.lookupMeterScale(type, scale)
-                            .label}${rateType != undefined
+                        message: `querying meter value (type = ${(0, core_1.getMeterName)(type)}, scale = ${((0, core_1.getMeterScale)(type, scale)
+                            ?? (0, core_1.getUnknownMeterScale)(scale)).label}${rateType != undefined
                             ? `, rate type = ${(0, safe_2.getEnumMemberName)(_Types_1.RateType, rateType)}`
                             : ""})...`,
                         direction: "outbound",
@@ -471,8 +823,8 @@ supports reset:       ${suppResp.supportsReset}`;
             const { meterType, rateType, scale } = splitPropertyKey(propertyKey);
             let ret;
             if (meterType !== 0) {
-                ret = `${applHost.configManager.getMeterName(meterType)}_${applHost.configManager.lookupMeterScale(meterType, scale)
-                    .label}`;
+                ret = `${(0, core_1.getMeterName)(meterType)}_${((0, core_1.getMeterScale)(meterType, scale)
+                    ?? (0, core_1.getUnknownMeterScale)(scale)).label}`;
             }
             else {
                 ret = "default";
@@ -483,7 +835,7 @@ supports reset:       ${suppResp.supportsReset}`;
             return ret;
         }
         else if (property === "reset" && typeof propertyKey === "number") {
-            return getMeterTypeName(applHost.configManager, propertyKey);
+            return (0, core_1.getMeterName)(propertyKey);
         }
         return super.translatePropertyKey(applHost, property, propertyKey);
     }
@@ -498,46 +850,37 @@ let MeterCCReport = class MeterCCReport extends MeterCC {
     constructor(host, options) {
         super(host, options);
         if ((0, CommandClass_1.gotDeserializationOptions)(options)) {
-            (0, safe_1.validatePayload)(this.payload.length >= 2);
-            this.type = this.payload[0] & 0b0_00_11111;
-            this.rateType = (this.payload[0] & 0b0_11_00000) >>> 5;
-            const scale1Bit2 = (this.payload[0] & 0b1_00_00000) >>> 7;
-            const { scale: scale1Bits10, value, bytesRead, } = (0, safe_1.parseFloatWithScale)(this.payload.subarray(1));
-            let offset = 2 + (bytesRead - 1);
-            // The scale is composed of two fields (see SDS13781)
-            const scale1 = (scale1Bit2 << 2) | scale1Bits10;
-            let scale2 = 0;
+            const { type, rateType, scale1, value, bytesRead } = parseMeterValueAndInfo(this.payload, 0);
+            this.type = type;
+            this.rateType = rateType;
             this.value = value;
-            if (this.version >= 2 && this.payload.length >= offset + 2) {
+            let offset = bytesRead;
+            const floatSize = bytesRead - 2;
+            if (this.payload.length >= offset + 2) {
                 this.deltaTime = this.payload.readUInt16BE(offset);
                 offset += 2;
                 if (this.deltaTime === 0xffff) {
                     this.deltaTime = safe_1.UNKNOWN_STATE;
                 }
                 if (
-                // 0 means that no previous value is included
+                // Previous value is included only if delta time is not 0
                 this.deltaTime !== 0
-                    && this.payload.length >= offset + (bytesRead - 1)) {
+                    && this.payload.length >= offset + floatSize) {
                     const { value: prevValue } = (0, safe_1.parseFloatWithScale)(
                     // This float is split in the payload
                     Buffer.concat([
                         Buffer.from([this.payload[1]]),
                         this.payload.subarray(offset),
                     ]));
-                    offset += bytesRead - 1;
+                    offset += floatSize;
                     this.previousValue = prevValue;
                 }
-                if (this.version >= 4
-                    && scale1 === 7
-                    && this.payload.length >= offset + 1) {
-                    scale2 = this.payload[offset];
-                }
             }
             else {
                 // 0 means that no previous value is included
                 this.deltaTime = 0;
             }
-            this.scale = scale1 === 7 ? scale1 + scale2 : scale1;
+            this.scale = parseScale(scale1, this.payload, offset);
         }
         else {
             this.type = options.type;
@@ -551,13 +894,14 @@ let MeterCCReport = class MeterCCReport extends MeterCC {
     persistValues(applHost) {
         if (!super.persistValues(applHost))
             return false;
-        const meterType = applHost.configManager.lookupMeter(this.type);
-        const scale = applHost.configManager.lookupMeterScale(this.type, this.scale);
+        const meter = (0, core_1.getMeter)(this.type);
+        const scale = (0, core_1.getMeterScale)(this.type, this.scale)
+            ?? (0, core_1.getUnknownMeterScale)(this.scale);
         // Filter out unknown meter types and scales, unless the strict validation is disabled
         const measurementValidation = !this.host.getDeviceConfig?.(this.nodeId)?.compat?.disableStrictMeasurementValidation;
         if (measurementValidation) {
-            safe_1.validatePayload.withReason(`Unknown meter type ${(0, safe_2.num2hex)(this.type)} or corrupted data`)(!!meterType);
-            safe_1.validatePayload.withReason(`Unknown meter scale ${(0, safe_2.num2hex)(this.scale)} or corrupted data`)(scale.label !== (0, config_1.getDefaultMeterScale)(this.scale).label);
+            safe_1.validatePayload.withReason(`Unknown meter type ${(0, safe_2.num2hex)(this.type)} or corrupted data`)(!!meter);
+            safe_1.validatePayload.withReason(`Unknown meter scale ${(0, safe_2.num2hex)(this.scale)} or corrupted data`)(scale.label !== (0, core_1.getUnknownMeterScale)(this.scale).label);
             // Filter out unsupported meter types, scales and rate types if possible
             if (this.version >= 2) {
                 const expectedType = this.getValue(applHost, exports.MeterCCValues.type);
@@ -577,7 +921,7 @@ let MeterCCReport = class MeterCCReport extends MeterCC {
         const valueValue = exports.MeterCCValues.value(this.type, this.rateType, this.scale);
         this.setMetadata(applHost, valueValue, {
             ...valueValue.meta,
-            label: getValueLabel(applHost.configManager, this.type, scale, this.rateType),
+            label: getValueLabel(this.type, this.scale, this.rateType),
             unit: scale.label,
             ccSpecific: {
                 meterType: this.type,
@@ -595,35 +939,36 @@ let MeterCCReport = class MeterCCReport extends MeterCC {
     rateType;
     deltaTime;
     serialize() {
-        const scale1 = this.scale >= 7 ? 7 : this.scale & 0b111;
-        const scale1Bits10 = scale1 & 0b11;
-        const scale1Bit2 = scale1 >>> 2;
-        const scale2 = this.scale >= 7 ? this.scale - 7 : 0;
-        const typeByte = (this.type & 0b0_00_11111)
-            | ((this.rateType & 0b11) << 5)
-            | (scale1Bit2 << 7);
-        const floatParams = (0, core_1.getFloatParameters)(this.value);
-        const valueBytes = (0, core_1.encodeFloatWithScale)(this.value, scale1Bits10, floatParams);
-        const prevValueBytes = this.previousValue != undefined
-            ? (0, core_1.encodeFloatWithScale)(this.previousValue, scale1Bits10, floatParams)
-            : Buffer.from([]);
+        const { data: typeAndValue, floatParams, scale2 } = encodeMeterValueAndInfo(this.type, this.rateType, this.scale, this.value);
         const deltaTime = this.deltaTime ?? 0xffff;
         const deltaTimeBytes = Buffer.allocUnsafe(2);
         deltaTimeBytes.writeUInt16BE(deltaTime, 0);
         this.payload = Buffer.concat([
-            Buffer.from([typeByte]),
-            valueBytes,
+            typeAndValue,
             deltaTimeBytes,
-            prevValueBytes,
-            Buffer.from([scale2]),
         ]);
+        if (this.deltaTime !== 0 && this.previousValue != undefined) {
+            // Encode the float, but only keep the value bytes
+            const prevValueBytes = (0, core_1.encodeFloatWithScale)(this.previousValue, 0, // we discard the scale anyways
+            floatParams).subarray(1);
+            this.payload = Buffer.concat([
+                this.payload,
+                prevValueBytes,
+            ]);
+        }
+        if (scale2 != undefined) {
+            this.payload = Buffer.concat([
+                this.payload,
+                Buffer.from([scale2]),
+            ]);
+        }
         return super.serialize();
     }
-    toLogEntry(applHost) {
-        const meterType = applHost.configManager.lookupMeter(this.type);
-        const scale = applHost.configManager.lookupMeterScale(this.type, this.scale);
+    toLogEntry(host) {
+        const scale = (0, core_1.getMeterScale)(this.type, this.scale)
+            ?? (0, core_1.getUnknownMeterScale)(this.scale);
         const message = {
-            type: meterType?.name ?? `Unknown (${(0, safe_2.num2hex)(this.type)})`,
+            "meter type": (0, core_1.getMeterName)(this.type),
             scale: scale.label,
             "rate type": (0, safe_2.getEnumMemberName)(_Types_1.RateType, this.rateType),
             value: this.value,
@@ -635,7 +980,7 @@ let MeterCCReport = class MeterCCReport extends MeterCC {
             message["prev. value"] = this.previousValue;
         }
         return {
-            ...super.toLogEntry(applHost),
+            ...super.toLogEntry(host),
             message,
         };
     }
@@ -654,8 +999,14 @@ let MeterCCGet = class MeterCCGet extends MeterCC {
     constructor(host, options) {
         super(host, options);
         if ((0, CommandClass_1.gotDeserializationOptions)(options)) {
-            // TODO: Deserialize payload
-            throw new safe_1.ZWaveError(`${this.constructor.name}: deserialization not implemented`, safe_1.ZWaveErrorCodes.Deserialization_NotImplemented);
+            if (this.payload.length >= 1) {
+                this.rateType = (this.payload[0] & 0b11_000_000) >>> 6;
+                this.scale = (this.payload[0] & 0b00_111_000) >>> 3;
+                if (this.scale === 7) {
+                    (0, safe_1.validatePayload)(this.payload.length >= 2);
+                    this.scale += this.payload[1];
+                }
+            }
         }
         else {
             this.rateType = options.rateType;
@@ -698,20 +1049,26 @@ let MeterCCGet = class MeterCCGet extends MeterCC {
             this.payload[1] = scale2;
         return super.serialize();
     }
-    toLogEntry(applHost) {
+    toLogEntry(host) {
         const message = {};
         if (this.rateType != undefined) {
             message["rate type"] = (0, safe_2.getEnumMemberName)(_Types_1.RateType, this.rateType);
         }
         if (this.scale != undefined) {
-            // Try to lookup the meter type to translate the scale
-            const type = this.getValue(applHost, exports.MeterCCValues.type);
-            if (type != undefined) {
-                message.scale = applHost.configManager.lookupMeterScale(type, this.scale).label;
+            if (host) {
+                // Try to lookup the meter type to translate the scale
+                const type = this.getValue(host, exports.MeterCCValues.type);
+                if (type != undefined) {
+                    message.scale = ((0, core_1.getMeterScale)(type, this.scale)
+                        ?? (0, core_1.getUnknownMeterScale)(this.scale)).label;
+                }
+            }
+            else {
+                message.scale = this.scale;
             }
         }
         return {
-            ...super.toLogEntry(applHost),
+            ...super.toLogEntry(host),
             message,
         };
     }
@@ -724,28 +1081,36 @@ exports.MeterCCGet = MeterCCGet = __decorate([
 let MeterCCSupportedReport = class MeterCCSupportedReport extends MeterCC {
     constructor(host, options) {
         super(host, options);
-        (0, safe_1.validatePayload)(this.payload.length >= 2);
-        this.type = this.payload[0] & 0b0_00_11111;
-        this.supportsReset = !!(this.payload[0] & 0b1_00_00000);
-        const hasMoreScales = !!(this.payload[1] & 0b1_0000000);
-        if (hasMoreScales) {
-            // The bitmask is spread out
-            (0, safe_1.validatePayload)(this.payload.length >= 3);
-            const extraBytes = this.payload[2];
-            (0, safe_1.validatePayload)(this.payload.length >= 3 + extraBytes);
-            // The bitmask is the original payload byte plus all following bytes
-            // Since the first byte only has 7 bits, we need to reduce all following bits by 1
-            this.supportedScales = (0, safe_1.parseBitMask)(Buffer.concat([
-                Buffer.from([this.payload[1] & 0b0_1111111]),
-                this.payload.subarray(3, 3 + extraBytes),
-            ]), 0).map((scale) => (scale >= 8 ? scale - 1 : scale));
+        if ((0, CommandClass_1.gotDeserializationOptions)(options)) {
+            (0, safe_1.validatePayload)(this.payload.length >= 2);
+            this.type = this.payload[0] & 0b0_00_11111;
+            this.supportsReset = !!(this.payload[0] & 0b1_00_00000);
+            const hasMoreScales = !!(this.payload[1] & 0b1_0000000);
+            if (hasMoreScales) {
+                // The bitmask is spread out
+                (0, safe_1.validatePayload)(this.payload.length >= 3);
+                const extraBytes = this.payload[2];
+                (0, safe_1.validatePayload)(this.payload.length >= 3 + extraBytes);
+                // The bitmask is the original payload byte plus all following bytes
+                // Since the first byte only has 7 bits, we need to reduce all following bits by 1
+                this.supportedScales = (0, safe_1.parseBitMask)(Buffer.concat([
+                    Buffer.from([this.payload[1] & 0b0_1111111]),
+                    this.payload.subarray(3, 3 + extraBytes),
+                ]), 0).map((scale) => (scale >= 8 ? scale - 1 : scale));
+            }
+            else {
+                // only 7 bits in the bitmask. Bit 7 is 0, so no need to mask it out
+                this.supportedScales = (0, safe_1.parseBitMask)(Buffer.from([this.payload[1]]), 0);
+            }
+            // This is only present in V4+
+            this.supportedRateTypes = (0, safe_1.parseBitMask)(Buffer.from([(this.payload[0] & 0b0_11_00000) >>> 5]), 1);
         }
         else {
-            // only 7 bits in the bitmask. Bit 7 is 0, so no need to mask it out
-            this.supportedScales = (0, safe_1.parseBitMask)(Buffer.from([this.payload[1]]), 0);
+            this.type = options.type;
+            this.supportsReset = options.supportsReset;
+            this.supportedScales = options.supportedScales;
+            this.supportedRateTypes = options.supportedRateTypes;
         }
-        // This is only present in V4+
-        this.supportedRateTypes = (0, safe_1.parseBitMask)(Buffer.from([(this.payload[0] & 0b0_11_00000) >>> 5]), 1);
     }
     type;
     supportsReset;
@@ -761,29 +1126,64 @@ let MeterCCSupportedReport = class MeterCCSupportedReport extends MeterCC {
             this.ensureMetadata(applHost, exports.MeterCCValues.resetAll);
         }
         else {
-            const resetSingleValue = exports.MeterCCValues.resetSingle(this.type);
-            this.ensureMetadata(applHost, resetSingleValue, {
-                ...resetSingleValue.meta,
-                label: `Reset (${getMeterTypeName(applHost.configManager, this.type)})`,
-            });
+            for (const scale of this.supportedScales) {
+                // Only accumulated values can be reset
+                if (!isAccumulatedValue(this.type, scale))
+                    continue;
+                for (const rateType of this.supportedRateTypes) {
+                    const resetSingleValue = exports.MeterCCValues.resetSingle(this.type, rateType, scale);
+                    this.ensureMetadata(applHost, resetSingleValue, {
+                        ...resetSingleValue.meta,
+                        label: `Reset ${getValueLabel(this.type, scale, rateType)}`,
+                    });
+                }
+            }
         }
         return true;
     }
-    toLogEntry(applHost) {
+    serialize() {
+        const typeByte = (this.type & 0b0_00_11111)
+            | (this.supportedRateTypes.includes(_Types_1.RateType.Consumed)
+                ? 0b0_01_00000
+                : 0)
+            | (this.supportedRateTypes.includes(_Types_1.RateType.Produced)
+                ? 0b0_10_00000
+                : 0)
+            | (this.supportsReset ? 0b1_00_00000 : 0);
+        const supportedScales = (0, core_1.encodeBitMask)(this.supportedScales, undefined, 
+        // The first byte only has 7 bits for the bitmask,
+        // so we add a fake bit for the value -1 and later shift
+        // the first byte one to the right
+        -1);
+        const scalesByte1 = (supportedScales[0] >>> 1)
+            | (supportedScales.length > 1 ? 0b1000_0000 : 0);
+        this.payload = Buffer.from([
+            typeByte,
+            scalesByte1,
+        ]);
+        if (supportedScales.length > 1) {
+            this.payload = Buffer.concat([
+                this.payload,
+                Buffer.from([supportedScales.length - 1]),
+                Buffer.from(supportedScales.subarray(1)),
+            ]);
+        }
+        return super.serialize();
+    }
+    toLogEntry(host) {
         const message = {
-            type: `${applHost.configManager.lookupMeter(this.type)?.name
-                ?? `Unknown (${(0, safe_2.num2hex)(this.type)})`}`,
+            "meter type": (0, core_1.getMeterName)(this.type),
             "supports reset": this.supportsReset,
             "supported scales": `${this.supportedScales
                 .map((scale) => `
-· ${applHost.configManager.lookupMeterScale(this.type, scale).label}`)
+· ${((0, core_1.getMeterScale)(this.type, scale) ?? (0, core_1.getUnknownMeterScale)(scale)).label}`)
                 .join("")}`,
             "supported rate types": this.supportedRateTypes
                 .map((rt) => (0, safe_2.getEnumMemberName)(_Types_1.RateType, rt))
                 .join(", "),
         };
         return {
-            ...super.toLogEntry(applHost),
+            ...super.toLogEntry(host),
             message,
         };
     }
@@ -815,45 +1215,58 @@ let MeterCCReset = class MeterCCReset extends MeterCC {
     constructor(host, options) {
         super(host, options);
         if ((0, CommandClass_1.gotDeserializationOptions)(options)) {
-            // TODO: Deserialize payload
-            throw new safe_1.ZWaveError(`${this.constructor.name}: deserialization not implemented`, safe_1.ZWaveErrorCodes.Deserialization_NotImplemented);
+            if (this.payload.length > 0) {
+                const { type, rateType, scale1, value, bytesRead: scale2Offset, } = parseMeterValueAndInfo(this.payload, 0);
+                this.type = type;
+                this.rateType = rateType;
+                this.targetValue = value;
+                this.scale = parseScale(scale1, this.payload, scale2Offset);
+            }
         }
         else {
             this.type = options.type;
+            this.scale = options.scale;
+            this.rateType = options.rateType;
             this.targetValue = options.targetValue;
-            // Test if this is a valid target value
-            if (this.targetValue != undefined
-                && !(0, safe_1.getMinIntegerSize)(this.targetValue, true)) {
-                throw new safe_1.ZWaveError(`${this.targetValue} is not a valid target value!`, safe_1.ZWaveErrorCodes.Argument_Invalid);
-            }
         }
     }
     type;
+    scale;
+    rateType;
     targetValue;
     serialize() {
-        if (this.version >= 6 && this.targetValue != undefined && this.type) {
-            const size = (this.targetValue
-                && (0, safe_1.getMinIntegerSize)(this.targetValue, true))
-                || 0;
-            if (size > 0) {
-                this.payload = Buffer.allocUnsafe(1 + size);
-                this.payload[0] = (size << 5) | (this.type & 0b11111);
-                this.payload.writeIntBE(this.targetValue, 1, size);
+        if (this.type != undefined
+            && this.scale != undefined
+            && this.rateType != undefined
+            && this.targetValue != undefined) {
+            const { data: typeAndValue, scale2 } = encodeMeterValueAndInfo(this.type, this.rateType, this.scale, this.targetValue);
+            this.payload = typeAndValue;
+            if (scale2 != undefined) {
+                this.payload = Buffer.concat([
+                    this.payload,
+                    Buffer.from([scale2]),
+                ]);
             }
         }
         return super.serialize();
     }
-    toLogEntry(applHost) {
+    toLogEntry(host) {
         const message = {};
         if (this.type != undefined) {
-            message.type = `${applHost.configManager.lookupMeter(this.type)?.name
-                ?? `Unknown (${(0, safe_2.num2hex)(this.type)})`}`;
+            message.type = (0, core_1.getMeterName)(this.type);
+        }
+        if (this.rateType != undefined) {
+            message["rate type"] = (0, safe_2.getEnumMemberName)(_Types_1.RateType, this.rateType);
+        }
+        if (this.type != undefined && this.scale != undefined) {
+            message.scale = ((0, core_1.getMeterScale)(this.type, this.scale)
+                ?? (0, core_1.getUnknownMeterScale)(this.scale)).label;
         }
         if (this.targetValue != undefined) {
             message["target value"] = this.targetValue;
         }
         return {
-            ...super.toLogEntry(applHost),
+            ...super.toLogEntry(host),
             message,
         };
     }