zigbee-herdsman-converters 14.0.657 → 14.0.658

package/converters/fromZigbee.js

@@ -338,9 +338,24 @@ const converters = {
             }
 
             if (msg.data.hasOwnProperty('batteryAlarmState')) {
-                const battery1Low = (msg.data.batteryAlarmState & 1<<0) > 0;
-                const battery2Low = (msg.data.batteryAlarmState & 1<<9) > 0;
-                const battery3Low = (msg.data.batteryAlarmState & 1<<19) > 0;
+                const battery1Low = (
+                    msg.data.batteryAlarmState & 1<<0 ||
+                    msg.data.batteryAlarmState & 1<<1 ||
+                    msg.data.batteryAlarmState & 1<<2 ||
+                    msg.data.batteryAlarmState & 1<<3
+                ) > 0;
+                const battery2Low = (
+                    msg.data.batteryAlarmState & 1<<9 ||
+                    msg.data.batteryAlarmState & 1<<10 ||
+                    msg.data.batteryAlarmState & 1<<11 ||
+                    msg.data.batteryAlarmState & 1<<12
+                ) > 0;
+                const battery3Low = (
+                    msg.data.batteryAlarmState & 1<<19 ||
+                    msg.data.batteryAlarmState & 1<<20 ||
+                    msg.data.batteryAlarmState & 1<<21 ||
+                    msg.data.batteryAlarmState & 1<<22
+                ) > 0;
                 payload.battery_low = battery1Low || battery2Low || battery3Low;
             }
 

package/devices/custom_devices_diy.js

@@ -10,6 +10,16 @@ const {calibrateAndPrecisionRoundOptions} = require('../lib/utils');
 
 
 const tzLocal = {
+    tirouter: {
+        key: ['transmit_power'],
+        convertSet: async (entity, key, value, meta) => {
+            await entity.write('genBasic', {0x1337: {value, type: 0x28}});
+            return {state: {[key]: value}};
+        },
+        convertGet: async (entity, key, meta) => {
+            await entity.read('genBasic', [0x1337]);
+        },
+    },
     node_config: {
         key: ['report_delay'],
         convertSet: async (entity, key, rawValue, meta) => {
@@ -133,6 +143,15 @@ const tzLocal = {
 };
 
 const fzLocal = {
+    tirouter: {
+        cluster: 'genBasic',
+        type: ['attributeReport', 'readResponse'],
+        convert: (model, msg, publish, options, meta) => {
+            const result = {linkquality: msg.linkquality};
+            if (msg.data['4919']) result['transmit_power'] = msg.data['4919'] + 1;
+            return result;
+        },
+    },
     node_config: {
         cluster: 'genPowerCfg',
         type: ['attributeReport', 'readResponse'],
@@ -267,9 +286,11 @@ module.exports = [
         model: 'ti.router',
         vendor: 'Custom devices (DiY)',
         description: 'Texas Instruments router',
-        fromZigbee: [fz.linkquality_from_basic],
-        toZigbee: [],
-        exposes: [],
+        fromZigbee: [fzLocal.tirouter],
+        toZigbee: [tzLocal.tirouter],
+        exposes: [exposes.numeric('transmit_power', ea.ALL).withValueMin(-20).withValueMax(20).withValueStep(1).withUnit('dBm')
+            .withDescription('Transmit power, supported from firmware 20221102. The max for CC1352 is 20 dBm and 5 dBm for CC2652' +
+                            ' (any higher value is converted to 5dBm)')],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(8);
             const payload = [{attribute: 'zclVersion', minimumReportInterval: 0, maximumReportInterval: 3600, reportableChange: 0}];

package/devices/develco.js

@@ -600,7 +600,8 @@ module.exports = [
             await reporting.bind(endpoint, coordinatorEndpoint, ['msTemperatureMeasurement', 'msRelativeHumidity', 'genPowerCfg']);
             await reporting.temperature(endpoint, {min: constants.repInterval.MINUTE, max: constants.repInterval.MINUTES_10, change: 10});
             await reporting.humidity(endpoint, {min: constants.repInterval.MINUTE, max: constants.repInterval.MINUTES_10, change: 300});
-            await reporting.batteryVoltage(endpoint);
+            await reporting.batteryVoltage(endpoint, {min: constants.repInterval.HOUR, max: 43200, change: 100});
+            await develco.configure.read_sw_hw_version(device, logger);
         },
     },
     {

package/devices/eglo.js

@@ -0,0 +1,11 @@
+const extend = require('../lib/extend');
+
+module.exports = [
+    {
+        zigbeeModel: ['EBF_RGB_Zm'],
+        model: '900091',
+        vendor: 'EGLO',
+        description: 'ROVITO-Z ceiling light',
+        extend: extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 370]}),
+    },
+];

package/devices/hive.js

@@ -344,7 +344,7 @@ module.exports = [
         },
         exposes: [
             exposes.climate().withSetpoint('occupied_heating_setpoint', 5, 32, 0.5).withLocalTemperature()
-                .withSystemMode(['off', 'auto', 'heat', 'emergency_heating']).withRunningState(['idle', 'heat']).withEndpoint('heat'),
+                .withSystemMode(['off', 'auto', 'heat']).withRunningState(['idle', 'heat']).withEndpoint('heat'),
             exposes.binary('temperature_setpoint_hold', ea.ALL, true, false)
                 .withDescription('Prevent changes. `false` = run normally. `true` = prevent from making changes.' +
                     ' Must be set to `false` when system_mode = off or `true` for heat').withEndpoint('heat'),
@@ -396,7 +396,7 @@ module.exports = [
         },
         exposes: [
             exposes.climate().withSetpoint('occupied_heating_setpoint', 5, 32, 0.5).withLocalTemperature()
-                .withSystemMode(['off', 'auto', 'heat', 'emergency_heating']).withRunningState(['idle', 'heat']).withEndpoint('heat'),
+                .withSystemMode(['off', 'auto', 'heat']).withRunningState(['idle', 'heat']).withEndpoint('heat'),
             exposes.binary('temperature_setpoint_hold', ea.ALL, true, false)
                 .withDescription('Prevent changes. `false` = run normally. `true` = prevent from making changes.' +
                     ' Must be set to `false` when system_mode = off or `true` for heat').withEndpoint('heat'),

package/devices/moes.js

@@ -125,7 +125,7 @@ module.exports = [
             tz.moes_thermostat_deadzone_temperature, tz.moes_thermostat_max_temperature_limit, tz.moes_thermostat_min_temperature_limit,
             tz.moes_thermostat_program_schedule],
         exposes: [e.child_lock(), e.deadzone_temperature(), e.max_temperature_limit(), e.min_temperature_limit(),
-            exposes.climate().withSetpoint('current_heating_setpoint', 5, 30, 1, ea.STATE_SET)
+            exposes.climate().withSetpoint('current_heating_setpoint', 5, 35, 1, ea.STATE_SET)
                 .withLocalTemperature(ea.STATE).withLocalTemperatureCalibration(-30, 30, 0.1, ea.STATE_SET)
                 .withSystemMode(['off', 'heat'], ea.STATE_SET).withRunningState(['idle', 'heat', 'cool'], ea.STATE)
                 .withPreset(['hold', 'program']),

package/devices/m/303/274ller_licht.js

@@ -64,7 +64,7 @@ module.exports = [
         toZigbee: extend.light_onoff_brightness().toZigbee.concat([tz.tint_scene]),
     },
     {
-        zigbeeModel: ['ZBT-ExtendedColor'],
+        zigbeeModel: ['ZBT-ExtendedColor', 'Bulb white+color'],
         model: '404000/404005/404012/404019',
         vendor: 'Müller Licht',
         description: 'Tint LED bulb GU10/E14/E27 350/470/806 lumen, dimmable, color, opal white',

package/devices/orvibo.js

@@ -29,7 +29,8 @@ module.exports = [
         // https://github.com/Koenkk/zigbee2mqtt/issues/13123#issuecomment-1198793749
         meta: {disableDefaultResponse: true},
         toZigbee: [tz.on_off, tzLocal.DD10Z_brightness, tz.light_colortemp, tz.effect],
-        extend: extend.light_onoff_brightness_colortemp({colorTempRange: [153, 370], disableColorTempStartup: true}),
+        extend: extend.light_onoff_brightness_colortemp(
+            {colorTempRange: [153, 370], disableColorTempStartup: true, disablePowerOnBehavior: true}),
     },
     {
         zigbeeModel: ['4a33f5ea766a4c96a962b371ffde9943'],

package/devices/samotech.js

@@ -13,11 +13,24 @@ module.exports = [
             await reporting.bind(endpoint, coordinatorEndpoint, ['genBasic', 'genIdentify', 'genOnOff']);
         },
     },
+    {
+        zigbeeModel: ['SM309-S'],
+        model: 'SM309-S',
+        vendor: 'Samotech',
+        description: 'Zigbee dimmer 400W',
+        extend: extend.light_onoff_brightness({noConfigure: true}),
+        configure: async (device, coordinatorEndpoint, logger) => {
+            await extend.light_onoff_brightness().configure(device, coordinatorEndpoint, logger);
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'genLevelCtrl']);
+            await reporting.onOff(endpoint);
+        },
+    },
     {
         zigbeeModel: ['SM309'],
         model: 'SM309',
         vendor: 'Samotech',
-        description: 'ZigBee dimmer 400W',
+        description: 'Zigbee dimmer 400W',
         extend: extend.light_onoff_brightness({noConfigure: true}),
         configure: async (device, coordinatorEndpoint, logger) => {
             await extend.light_onoff_brightness().configure(device, coordinatorEndpoint, logger);

package/devices/tuya.js

@@ -1044,6 +1044,7 @@ module.exports = [
             {modelID: 'TS0202', manufacturerName: '_TZE200_bq5c8xfe'},
             {modelID: 'TS0202', manufacturerName: '_TYZB01_dl7cejts'},
             {modelID: 'TS0202', manufacturerName: '_TYZB01_qjqgmqxr'},
+            {modelID: 'TS0202', manufacturerName: '_TZ3000_nss8amz9'},
             {modelID: 'TS0202', manufacturerName: '_TZ3000_mmtwjmaq'},
             {modelID: 'TS0202', manufacturerName: '_TYZB01_zwvaj5wy'},
             {modelID: 'TS0202', manufacturerName: '_TZ3000_bsvqrxru'},
@@ -1787,8 +1788,8 @@ module.exports = [
         model: 'TS0001_power',
         description: 'Switch with power monitoring',
         vendor: 'TuYa',
-        fromZigbee: [fz.on_off, fz.electrical_measurement, fz.metering, fz.ignore_basic_report],
-        toZigbee: [tz.on_off],
+        fromZigbee: [fz.on_off, fz.electrical_measurement, fz.metering, fz.ignore_basic_report, fz.tuya_switch_power_outage_memory],
+        toZigbee: [tz.on_off, tz.tuya_switch_power_outage_memory],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await endpoint.read('genBasic', ['manufacturerName', 'zclVersion', 'appVersion', 'modelId', 'powerSource', 0xfffe]);
@@ -1801,7 +1802,8 @@ module.exports = [
             endpoint.saveClusterAttributeKeyValue('seMetering', {divisor: 100, multiplier: 1});
             device.save();
         },
-        exposes: [e.switch(), e.power(), e.current(), e.voltage().withAccess(ea.STATE), e.energy()],
+        exposes: [e.switch(), e.power(), e.current(), e.voltage().withAccess(ea.STATE), e.energy(),
+            exposes.enum('power_outage_memory', ea.ALL, ['on', 'off', 'restore']).withDescription('Recover state after power outage')],
     },
     {
         zigbeeModel: ['TS0001'],
@@ -2685,6 +2687,7 @@ module.exports = [
         },
         meta: {multiEndpoint: true},
         configure: async (device, coordinatorEndpoint, logger) => {
+            await tuya.configureMagicPacket(device, coordinatorEndpoint, logger);
             await reporting.bind(device.getEndpoint(1), coordinatorEndpoint, ['genOnOff']);
             await reporting.bind(device.getEndpoint(2), coordinatorEndpoint, ['genOnOff']);
             device.powerSource = 'Mains (single phase)';

package/lib/exposes.js

@@ -598,7 +598,7 @@ module.exports = {
         power: () => new Numeric('power', access.STATE).withUnit('W').withDescription('Instantaneous measured power'),
         power_factor: () => new Numeric('power_factor', access.STATE).withUnit('%').withDescription('Instantaneous measured power factor'),
         power_apparent: () => new Numeric('power_apparent', access.STATE).withUnit('VA').withDescription('Instantaneous measured apparent power'),
-        power_on_behavior: () => new Enum('power_on_behavior', access.ALL, ['off', 'previous', 'on']).withDescription('Controls the behavior when the device is powered on'),
+        power_on_behavior: (values=['off', 'previous', 'on']) => new Enum('power_on_behavior', access.ALL, values).withDescription('Controls the behavior when the device is powered on after power loss'),
         power_outage_count: (resetsWhenPairing = true) => new Numeric('power_outage_count', access.STATE).withDescription('Number of power outages' + (resetsWhenPairing ? ' (since last pairing)' : '')),
         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'),

package/lib/extend.js

@@ -19,6 +19,7 @@ const extend = {
             tz.light_brightness_step, tz.level_config, ...(!options.disableEffect ? [tz.effect] : [])];
 
         if (!options.disablePowerOnBehavior) {
+            exposes.push(e.power_on_behavior(['off', 'on', 'toggle', 'previous']));
             fromZigbee.push(fz.power_on_behavior);
             toZigbee.push(tz.power_on_behavior);
         }
@@ -46,6 +47,7 @@ const extend = {
         }
 
         if (!options.disablePowerOnBehavior) {
+            exposes.push(e.power_on_behavior(['off', 'on', 'toggle', 'previous']));
             fromZigbee.push(fz.power_on_behavior);
             toZigbee.push(tz.power_on_behavior);
         }
@@ -69,6 +71,7 @@ const extend = {
             tz.light_hue_saturation_step, tz.light_color_options, tz.light_color_mode, ...(!options.disableEffect ? [tz.effect] : [])];
 
         if (!options.disablePowerOnBehavior) {
+            exposes.push(e.power_on_behavior(['off', 'on', 'toggle', 'previous']));
             fromZigbee.push(fz.power_on_behavior);
             toZigbee.push(tz.power_on_behavior);
         }
@@ -105,6 +108,7 @@ const extend = {
         }
 
         if (!options.disablePowerOnBehavior) {
+            exposes.push(e.power_on_behavior(['off', 'on', 'toggle', 'previous']));
             fromZigbee.push(fz.power_on_behavior);
             toZigbee.push(tz.power_on_behavior);
         }

package/package.json

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