zigbee-herdsman-converters 25.91.0 → 25.93.0

package/dist/devices/sonoff.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sonoff.d.ts","sourceRoot":"","sources":["../../src/devices/sonoff.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAC,oBAAoB,EAAyC,MAAM,cAAc,CAAC;AAmK/F,MAAM,WAAW,aAAa;IAC1B,UAAU,EAAE;QACR,UAAU,EAAE,MAAM,CAAC;QACnB,SAAS,EAAE,MAAM,CAAC;QAClB,SAAS,EAAE,MAAM,CAAC;QAClB,UAAU,EAAE,MAAM,CAAC;QACnB,sBAAsB,EAAE,MAAM,CAAC;QAC/B,mBAAmB,EAAE,MAAM,CAAC;QAC5B,kBAAkB,EAAE,MAAM,CAAC;QAC3B,mBAAmB,EAAE,MAAM,CAAC;QAC5B,eAAe,EAAE,MAAM,CAAC;QACxB,cAAc,EAAE,MAAM,CAAC;QACvB,gBAAgB,EAAE,MAAM,CAAC;QACzB,0BAA0B,EAAE,MAAM,CAAC;QACnC,4BAA4B,EAAE,MAAM,CAAC;QACrC,cAAc,EAAE,MAAM,CAAC;QACvB,qBAAqB,EAAE,MAAM,CAAC;QAC9B,qBAAqB,EAAE,MAAM,CAAC;QAC9B,mBAAmB,EAAE,MAAM,CAAC;QAE5B,sBAAsB,EAAE,MAAM,CAAC;QAC/B,WAAW,EAAE,MAAM,CAAC;QACpB,WAAW,EAAE,MAAM,CAAC;QACpB,eAAe,EAAE,MAAM,CAAC;QACxB,oBAAoB,EAAE,MAAM,EAAE,CAAC;QAC/B,iBAAiB,EAAE,MAAM,CAAC;QAC1B,mBAAmB,EAAE,MAAM,CAAC;QAC5B,sBAAsB,EAAE,MAAM,CAAC;QAC/B,cAAc,EAAE,MAAM,CAAC;QACvB,gBAAgB,EAAE,MAAM,CAAC;KAC5B,CAAC;IACF,QAAQ,EAAE;QACN,YAAY,EAAE;YAAC,IAAI,EAAE,MAAM,EAAE,CAAA;SAAC,CAAC;KAClC,CAAC;IACF,gBAAgB,EAAE,KAAK,CAAC;CAC3B;AA29BD,eAAO,MAAM,WAAW,EAAE,oBAAoB,EA47D7C,CAAC"}
+{"version":3,"file":"sonoff.d.ts","sourceRoot":"","sources":["../../src/devices/sonoff.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAC,oBAAoB,EAAyC,MAAM,cAAc,CAAC;AAmK/F,MAAM,WAAW,aAAa;IAC1B,UAAU,EAAE;QACR,UAAU,EAAE,MAAM,CAAC;QACnB,SAAS,EAAE,MAAM,CAAC;QAClB,SAAS,EAAE,MAAM,CAAC;QAClB,UAAU,EAAE,MAAM,CAAC;QACnB,sBAAsB,EAAE,MAAM,CAAC;QAC/B,mBAAmB,EAAE,MAAM,CAAC;QAC5B,kBAAkB,EAAE,MAAM,CAAC;QAC3B,mBAAmB,EAAE,MAAM,CAAC;QAC5B,eAAe,EAAE,MAAM,CAAC;QACxB,cAAc,EAAE,MAAM,CAAC;QACvB,gBAAgB,EAAE,MAAM,CAAC;QACzB,0BAA0B,EAAE,MAAM,CAAC;QACnC,4BAA4B,EAAE,MAAM,CAAC;QACrC,cAAc,EAAE,MAAM,CAAC;QACvB,qBAAqB,EAAE,MAAM,CAAC;QAC9B,qBAAqB,EAAE,MAAM,CAAC;QAC9B,mBAAmB,EAAE,MAAM,CAAC;QAE5B,sBAAsB,EAAE,MAAM,CAAC;QAC/B,WAAW,EAAE,MAAM,CAAC;QACpB,WAAW,EAAE,MAAM,CAAC;QACpB,eAAe,EAAE,MAAM,CAAC;QACxB,oBAAoB,EAAE,MAAM,EAAE,CAAC;QAC/B,iBAAiB,EAAE,MAAM,CAAC;QAC1B,mBAAmB,EAAE,MAAM,CAAC;QAC5B,sBAAsB,EAAE,MAAM,CAAC;QAC/B,cAAc,EAAE,MAAM,CAAC;QACvB,gBAAgB,EAAE,MAAM,CAAC;KAC5B,CAAC;IACF,QAAQ,EAAE;QACN,YAAY,EAAE;YAAC,IAAI,EAAE,MAAM,EAAE,CAAA;SAAC,CAAC;KAClC,CAAC;IACF,gBAAgB,EAAE,KAAK,CAAC;CAC3B;AAi9BD,eAAO,MAAM,WAAW,EAAE,oBAAoB,EA+7D7C,CAAC"}

package/dist/devices/sonoff.js

@@ -217,21 +217,13 @@ const sonoffExtend = {
         };
     },
     weeklySchedule: () => {
-        const exposes = e
-            .composite("schedule", "weekly_schedule", ea.STATE_SET)
-            .withCategory("config")
-            .withDescription('The preset heating schedule to use when the system mode is set to "auto" (indicated with ⏲ on the TRV). ' +
+        const scheduleDescription = 'The preset heating schedule to use when the system mode is set to "auto" (indicated with ⏲ on the TRV). ' +
             "Up to 6 transitions can be defined per day, where a transition is expressed in the format 'HH:mm/temperature', each " +
             "separated by a space. The first transition for each day must start at 00:00 and the valid temperature range is 4-35°C " +
             "(in 0.5°C steps). The temperature will be set at the time of the first transition until the time of the next transition, " +
-            "e.g. '04:00/20 10:00/25' will result in the temperature being set to 20°C at 04:00 until 10:00, when it will change to 25°C.")
-            .withFeature(e.text("sunday", ea.STATE_SET))
-            .withFeature(e.text("monday", ea.STATE_SET))
-            .withFeature(e.text("tuesday", ea.STATE_SET))
-            .withFeature(e.text("wednesday", ea.STATE_SET))
-            .withFeature(e.text("thursday", ea.STATE_SET))
-            .withFeature(e.text("friday", ea.STATE_SET))
-            .withFeature(e.text("saturday", ea.STATE_SET));
+            "e.g. '04:00/20 10:00/25' will result in the temperature being set to 20°C at 04:00 until 10:00, when it will change to 25°C.";
+        const days = ["sunday", "monday", "tuesday", "wednesday", "thursday", "friday", "saturday"];
+        const exposes = days.map((day) => e.text(`weekly_schedule_${day}`, ea.STATE_SET).withCategory("config").withDescription(scheduleDescription));
         const fromZigbee = [
             {
                 cluster: "hvacThermostat",
@@ -253,63 +245,60 @@ const sonoffExtend = {
                         .sort()
                         .join(" ");
                     return {
-                        weekly_schedule: {
-                            ...meta.state.weekly_schedule,
-                            [day]: transitions,
-                        },
+                        [`weekly_schedule_${day}`]: transitions,
                     };
                 },
             },
         ];
         const toZigbee = [
             {
-                key: ["weekly_schedule"],
+                key: days.map((day) => `weekly_schedule_${day}`),
                 convertSet: async (entity, key, value, meta) => {
                     // Transition format: HH:mm/temperature
                     const transitionRegex = /^(0[0-9]|1[0-9]|2[0-3]):([0-5][0-9])\/(\d+(\.5)?)$/;
-                    utils.assertObject(value, key);
-                    for (const dayOfWeekName of Object.keys(value)) {
-                        const dayKey = utils.getKey(constants.thermostatDayOfWeek, dayOfWeekName.toLowerCase(), null);
-                        if (dayKey === null) {
-                            throw new Error(`Invalid schedule: invalid day name, found: ${dayOfWeekName}`);
-                        }
-                        const dayOfWeekBit = Number(dayKey);
-                        const rawTransitions = value[dayOfWeekName].split(" ").sort();
-                        if (rawTransitions.length > 6) {
-                            throw new Error("Invalid schedule: days must have no more than 6 transitions");
-                        }
-                        const transitions = [];
-                        for (const transition of rawTransitions) {
-                            const matches = transition.match(transitionRegex);
-                            if (!matches) {
-                                throw new Error(`Invalid schedule: transitions must be in format HH:mm/temperature (e.g. 12:00/15.5), found: ${transition}`);
-                            }
-                            const hour = Number.parseInt(matches[1], 10);
-                            const mins = Number.parseInt(matches[2], 10);
-                            const temp = Number.parseFloat(matches[3]);
-                            if (temp < 4 || temp > 35) {
-                                throw new Error(`Invalid schedule: temperature value must be between 4-35 (inclusive), found: ${temp}`);
-                            }
-                            transitions.push({
-                                transitionTime: hour * 60 + mins,
-                                heatSetpoint: Math.round(temp * 100),
-                            });
+                    utils.assertString(value, key);
+                    // Extract day name from key (e.g., "weekly_schedule_monday" -> "monday")
+                    const dayOfWeekName = key.replace("weekly_schedule_", "");
+                    const dayKey = utils.getKey(constants.thermostatDayOfWeek, dayOfWeekName, null);
+                    if (dayKey === null) {
+                        throw new Error(`Invalid schedule: invalid day name, found: ${dayOfWeekName}`);
+                    }
+                    const dayOfWeekBit = Number(dayKey);
+                    const rawTransitions = value.split(" ").sort();
+                    if (rawTransitions.length > 6) {
+                        throw new Error("Invalid schedule: days must have no more than 6 transitions");
+                    }
+                    const transitions = [];
+                    for (const transition of rawTransitions) {
+                        const matches = transition.match(transitionRegex);
+                        if (!matches) {
+                            throw new Error(`Invalid schedule: transitions must be in format HH:mm/temperature (e.g. 12:00/15.5), found: ${transition}`);
                         }
-                        if (transitions[0].transitionTime !== 0) {
-                            throw new Error("Invalid schedule: the first transition of each day should start at 00:00");
+                        const hour = Number.parseInt(matches[1], 10);
+                        const mins = Number.parseInt(matches[2], 10);
+                        const temp = Number.parseFloat(matches[3]);
+                        if (temp < 4 || temp > 35) {
+                            throw new Error(`Invalid schedule: temperature value must be between 4-35 (inclusive), found: ${temp}`);
                         }
-                        await entity.command("hvacThermostat", "setWeeklySchedule", {
-                            dayofweek: 1 << Number(dayOfWeekBit),
-                            numoftrans: rawTransitions.length,
-                            mode: 1 << 0, // heat
-                            transitions,
-                        }, utils.getOptions(meta.mapped, entity));
+                        transitions.push({
+                            transitionTime: hour * 60 + mins,
+                            heatSetpoint: Math.round(temp * 100),
+                        });
                     }
+                    if (transitions[0].transitionTime !== 0) {
+                        throw new Error("Invalid schedule: the first transition of each day should start at 00:00");
+                    }
+                    await entity.command("hvacThermostat", "setWeeklySchedule", {
+                        dayofweek: 1 << Number(dayOfWeekBit),
+                        numoftrans: rawTransitions.length,
+                        mode: 1 << 0, // heat
+                        transitions,
+                    }, utils.getOptions(meta.mapped, entity));
                 },
             },
         ];
         return {
-            exposes: [exposes],
+            exposes,
             fromZigbee,
             toZigbee,
             isModernExtend: true,
@@ -2101,6 +2090,7 @@ exports.definitions = [
             }),
             m.numeric({
                 name: "energy_yesterday",
+                label: "Energy yesterday",
                 cluster: "customClusterEwelink",
                 attribute: "energyYesterday",
                 description: "Electricity consumption for the yesterday",
@@ -2110,6 +2100,7 @@ exports.definitions = [
             }),
             m.numeric({
                 name: "energy_today",
+                label: "Energy today",
                 cluster: "customClusterEwelink",
                 attribute: "energyToday",
                 description: "Electricity consumption for the day",
@@ -2119,6 +2110,7 @@ exports.definitions = [
             }),
             m.numeric({
                 name: "energy_month",
+                label: "Energy month",
                 cluster: "customClusterEwelink",
                 attribute: "energyMonth",
                 description: "Electricity consumption for the month",