zigbee-herdsman-converters 15.0.62 → 15.0.63

package/converters/toZigbee.js

@@ -1222,24 +1222,69 @@ const converters = {
         key: ['weekly_schedule'],
         convertSet: async (entity, key, value, meta) => {
             const payload = {
-                numoftrans: value.numoftrans,
                 dayofweek: value.dayofweek,
-                mode: value.mode,
                 transitions: value.transitions,
             };
 
+            if (Array.isArray(payload.transitions)) {
+                // calculate numoftrans
+                if (typeof value.numoftrans !== 'undefined') {
+                    meta.logger.warn(`weekly_schedule: igonoring provided numoftrans value (${JSON.stringify(value.numoftrans)}),\
+                         this is now calculated automatically`);
+                }
+                payload.numoftrans = payload.transitions.length;
 
-            // map array of desired modes to bitmask
-            if (typeof payload.dayofweek === 'string') payload.dayofweek = [payload.dayofweek];
-            if (Array.isArray(payload.dayofweek)) {
-                let mode = 0;
-                for (let m of payload.mode) {
-                    // lookup mode bit
-                    m = utils.getKey(constants.thermostatScheduleMode, m.toLowerCase(), m, Number);
-                    mode |= (1 << m);
+                // mode is calculated below
+                if (typeof value.mode !== 'undefined') {
+                    meta.logger.warn(
+                        `weekly_schedule: igonoring provided mode value (${JSON.stringify(value.mode)}),\
+                         this is now calculated automatically`);
+                }
+                payload.mode = [];
+
+                // transform transition payload values if needed
+                for (const elem of payload.transitions) {
+                    // update payload.mode if needed
+                    if (elem.hasOwnProperty('heatSetpoint') && !payload.mode.includes('heat')) {
+                        payload.mode.push('heat');
+                    }
+                    if (elem.hasOwnProperty('coolSetpoint') && !payload.mode.includes('cool')) {
+                        payload.mode.push('cool');
+                    }
+
+                    // transform setpoint values if numeric
+                    if (typeof elem['heatSetpoint'] === 'number') {
+                        elem['heatSetpoint'] = Math.round(elem['heatSetpoint'] * 100);
+                    }
+                    if (typeof elem['coolSetpoint'] === 'number') {
+                        elem['coolSetpoint'] = Math.round(elem['coolSetpoint'] * 100);
+                    }
+
+                    // accept 24h time notation (e.g. 19:30)
+                    if (typeof elem['transitionTime'] === 'string') {
+                        const time = elem['transitionTime'].split(':');
+                        if ((time.length != 2) || isNaN(time[0]) || isNaN(time[1])) {
+                            meta.logger.warn(
+                                `weekly_schedule: expected 24h time notation (e.g. 19:30) but got '${elem['transitionTime']}'!`,
+                            );
+                        } else {
+                            elem['transitionTime'] = ((parseInt(time[0]) * 60) + parseInt(time[1]));
+                        }
+                    }
                 }
-                payload.mode = mode;
+            } else {
+                meta.logger.error('weekly_schedule: transitions is not an array!');
+                return;
+            }
+
+            // map array of desired modes to bitmask
+            let mode = 0;
+            for (let m of payload.mode) {
+                // lookup mode bit
+                m = utils.getKey(constants.thermostatScheduleMode, m.toLowerCase(), m, Number);
+                mode |= (1 << m);
             }
+            payload.mode = mode;
 
             // map array of days to desired dayofweek bitmask
             if (typeof payload.dayofweek === 'string') payload.dayofweek = [payload.dayofweek];
@@ -1253,24 +1298,6 @@ const converters = {
                 payload.dayofweek = dayofweek;
             }
 
-            for (const elem of payload['transitions']) {
-                if (typeof elem['heatSetpoint'] === 'number') {
-                    elem['heatSetpoint'] = Math.round(elem['heatSetpoint'] * 100);
-                }
-                if (typeof elem['coolSetpoint'] === 'number') {
-                    elem['coolSetpoint'] = Math.round(elem['coolSetpoint'] * 100);
-                }
-
-                // accept 24h time notation (e.g. 19:30)
-                if (typeof elem['transitionTime'] === 'string') {
-                    const time = elem['transitionTime'].split(':');
-                    if ((time.length != 2) || isNaN(time[0]) || isNaN(time[1])) {
-                        meta.logger.warn(`weekly_schedule: expected 24h time notation (e.g. 19:30) but got '${elem['transitionTime']}'!`);
-                    } else {
-                        elem['transitionTime'] = ((parseInt(time[0]) * 60) + parseInt(time[1]));
-                    }
-                }
-            }
             await entity.command('hvacThermostat', 'setWeeklySchedule', payload, utils.getOptions(meta.mapped, entity));
         },
         convertGet: async (entity, key, meta) => {

package/devices/namron.js

@@ -452,7 +452,7 @@ module.exports = [
                         const time = Math.round(((new Date()).getTime() - constants.OneJanuary2000) / 1000 + ((new Date())
                             .getTimezoneOffset() * -1) * 60);
                         const values = {time: time};
-                        endpoint.write('genTime', values);
+                        await endpoint.write('genTime', values);
                     } catch (error) {/* Do nothing*/}
                 }, hours24);
                 globalStore.putValue(device, 'time', interval);

package/devices/philips.js

@@ -1788,6 +1788,13 @@ module.exports = [
         description: 'Hue Centura',
         extend: philips.extend.light_onoff_brightness_colortemp_color(),
     },
+    {
+        zigbeeModel: ['LWV007'],
+        model: '9290030523',
+        vendor: 'Philips',
+        description: 'Hue white filament Edison ST72 LED',
+        extend: philips.extend.light_onoff_brightness(),
+    },
     {
         zigbeeModel: ['5055148P7'],
         model: '5055148P7',

package/devices/seastar_intelligence.js

@@ -7,5 +7,10 @@ module.exports = [
         vendor: 'Fischer & Honsel',
         description: 'LED Tischleuchte Beta Zig',
         extend: extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 370]}),
+        endpoint: (device) => {
+            // https://github.com/Koenkk/zigbee-herdsman-converters/issues/5463
+            const endpoint = device.endpoints.find((e) => e.inputClusters.includes(6)).ID;
+            return {'default': endpoint};
+        },
     },
 ];

package/devices/sonoff.js

@@ -216,7 +216,7 @@ module.exports = [
         model: 'S40ZBTPB',
         vendor: 'SONOFF',
         description: '15A Zigbee smart plug',
-        extend: extend.switch(),
+        extend: extend.switch({disablePowerOnBehavior: true}),
         fromZigbee: [fz.on_off_skip_duplicate_transaction],
         ota: ota.zigbeeOTA,
         configure: async (device, coordinatorEndpoint, logger) => {

package/lib/constants.js

@@ -24,6 +24,7 @@ const thermostatControlSequenceOfOperations = {
 const thermostatProgrammingOperationModes = {
     0: 'setpoint',
     1: 'schedule',
+    3: 'schedule_with_preheat',
     4: 'eco',
 };
 

package/lib/exposes.js

@@ -626,7 +626,7 @@ module.exports = {
         power_outage_memory: () => new Binary('power_outage_memory', access.ALL, true, false).withDescription('Enable/disable the power outage memory, this recovers the on/off mode after power failure'),
         presence: () => new Binary('presence', access.STATE, true, false).withDescription('Indicates whether the device detected presence'),
         pressure: () => new Numeric('pressure', access.STATE).withUnit('hPa').withDescription('The measured atmospheric pressure'),
-        programming_operation_mode: () => new Enum('programming_operation_mode', access.ALL, ['setpoint', 'schedule', 'eco']).withDescription('Controls how programming affects the thermostat. Possible values: setpoint (only use specified setpoint), schedule (follow programmed setpoint schedule). Changing this value does not clear programmed schedules.'),
+        programming_operation_mode: () => new Enum('programming_operation_mode', access.ALL, ['setpoint', 'schedule', 'schedule_with_preheat', 'eco']).withDescription('Controls how programming affects the thermostat. Possible values: setpoint (only use specified setpoint), schedule (follow programmed setpoint schedule), schedule_with_preheat (follow programmed setpoint schedule with pre-heating). Changing this value does not clear programmed schedules.'),
         smoke: () => new Binary('smoke', access.STATE, true, false).withDescription('Indicates whether the device detected smoke'),
         soil_moisture: () => new Numeric('soil_moisture', access.STATE).withUnit('%').withDescription('Measured soil moisture value'),
         sos: () => new Binary('sos', access.STATE, true, false).withDescription('SOS alarm'),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zigbee-herdsman-converters",
-  "version": "15.0.62",
+  "version": "15.0.63",
   "description": "Collection of device converters to be used with zigbee-herdsman",
   "main": "index.js",
   "files": [