zigbee-herdsman-converters 14.0.520 → 14.0.521

package/converters/toZigbee.js

@@ -2727,6 +2727,17 @@ const converters = {
             await entity.read('aqaraOpple', [0x0002], manufacturerOptions.xiaomi);
         },
     },
+    RTCGQ14LM_trigger_indicator: {
+        key: ['trigger_indicator'],
+        convertSet: async (entity, key, value, meta) => {
+            const lookup = {true: 1, false: 0};
+            await entity.write('aqaraOpple', {0x0152: {value: lookup[value], type: 0x20}}, manufacturerOptions.xiaomi);
+            return {state: {trigger_indicator: value}};
+        },
+        convertGet: async (entity, key, meta) => {
+            await entity.read('aqaraOpple', [0x0152], manufacturerOptions.xiaomi);
+        },
+    },
     LLKZMK11LM_interlock: {
         key: ['interlock'],
         convertSet: async (entity, key, value, meta) => {

package/devices/sonoff.js

@@ -5,6 +5,7 @@ const constants = require('../lib/constants');
 const reporting = require('../lib/reporting');
 const extend = require('../lib/extend');
 const e = exposes.presets;
+const ota = require('../lib/ota');
 
 module.exports = [
     {
@@ -20,6 +21,7 @@ module.exports = [
         model: 'ZBMINI-L',
         vendor: 'SONOFF',
         description: 'Zigbee smart switch (no neutral)',
+        ota: ota.zigbeeOTA,
         extend: extend.switch(),
         toZigbee: extend.switch().toZigbee.concat([tz.power_on_behavior]),
         fromZigbee: extend.switch().fromZigbee.concat([fz.power_on_behavior]),

package/devices/the_light_group.js

@@ -1,10 +1,34 @@
 const exposes = require('../lib/exposes');
-const fz = {...require('../converters/fromZigbee'), legacy: require('../lib/legacy').fromZigbee};
+const fz = require('../converters/fromZigbee');
+const tz = require('../converters/toZigbee');
 const reporting = require('../lib/reporting');
 const extend = require('../lib/extend');
 const e = exposes.presets;
 
 module.exports = [
+    {
+        zigbeeModel: ['S24019'],
+        model: 'S24019',
+        vendor: 'The Light Group',
+        description: 'SLC SmartOne led dimmer',
+        fromZigbee: [fz.on_off, fz.brightness, fz.metering, fz.electrical_measurement],
+        toZigbee: [tz.light_onoff_brightness, tz.level_config],
+        exposes: [e.light_brightness().withLevelConfig()],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            // Endpoint 1
+            const endpoint1 = device.getEndpoint(1);
+            const binds1 = ['genOnOff', 'genLevelCtrl', 'haElectricalMeasurement', 'seMetering'];
+            await reporting.bind(endpoint1, coordinatorEndpoint, binds1);
+            await reporting.onOff(endpoint1);
+            await reporting.brightness(endpoint1);
+            await reporting.readEletricalMeasurementMultiplierDivisors(endpoint1);
+            await reporting.activePower(endpoint1, {min: 5, max: 3600, change: 1000});
+            await reporting.rmsCurrent(endpoint1, {min: 5, max: 3600, change: 100});
+            await reporting.rmsVoltage(endpoint1, {min: 5, max: 3600, change: 100});
+            // read switch state
+            await endpoint1.read('genOnOff', ['onOff']);
+        },
+    },
     {
         zigbeeModel: ['S57003'],
         model: 'S57003',

package/devices/tuya.js

@@ -247,7 +247,7 @@ module.exports = [
         fingerprint: [{modelID: 'TS011F', manufacturerName: '_TZ3000_rk2yzt0u'},
             {modelID: 'TS0001', manufacturerName: '_TZ3000_o4cjetlm'}, {manufacturerName: '_TZ3000_o4cjetlm'},
             {modelID: 'TS0001', manufacturerName: '_TZ3000_iedbgyxt'}, {modelID: 'TS0001', manufacturerName: '_TZ3000_h3noz0a5'},
-            {modelID: 'TS0001', manufacturerName: '_TYZB01_4tlksk8a'}],
+            {modelID: 'TS0001', manufacturerName: '_TYZB01_4tlksk8a'}, {modelID: 'TS0011', manufacturerName: '_TYZB01_rifa0wlb'}],
         model: 'ZN231392',
         vendor: 'TuYa',
         description: 'Smart water/gas valve',

package/devices/xiaomi.js

@@ -177,7 +177,8 @@ module.exports = [
         vendor: 'Xiaomi',
         description: 'Aqara wireless switch',
         meta: {battery: {voltageToPercentage: '3V_2850_3000_log'}},
-        exposes: [e.battery(), e.battery_voltage(), e.action(['single', 'double', 'triple', 'quadruple', 'hold', 'release'])],
+        exposes: [e.battery(), e.battery_voltage(), e.action(['single', 'double', 'triple', 'quadruple', 'hold', 'release']),
+            e.temperature(), e.power_outage_count()],
         fromZigbee: [fz.xiaomi_multistate_action, fz.xiaomi_WXKG11LM_action, fz.xiaomi_basic,
             fz.legacy.WXKG11LM_click, fz.legacy.xiaomi_action_click_multistate],
         toZigbee: [],
@@ -925,18 +926,21 @@ module.exports = [
         whiteLabel: [{vendor: 'Xiaomi', model: 'MS-S02'}],
         description: 'Aqara P1 human body movement and illuminance sensor',
         fromZigbee: [fz.aqara_occupancy_illuminance, fz.aqara_opple, fz.battery],
-        toZigbee: [tz.aqara_detection_interval, tz.aqara_motion_sensitivity],
+        toZigbee: [tz.aqara_detection_interval, tz.aqara_motion_sensitivity, tz.RTCGQ14LM_trigger_indicator],
         exposes: [e.occupancy(), e.illuminance_lux().withProperty('illuminance'),
             e.illuminance().withUnit('lx').withDescription('Measured illuminance in lux'),
             exposes.enum('motion_sensitivity', ea.ALL, ['low', 'medium', 'high']),
             exposes.numeric('detection_interval', ea.ALL).withValueMin(2).withValueMax(65535).withUnit('s')
-                .withDescription('Time interval for detecting actions'), e.temperature(), e.battery()],
+                .withDescription('Time interval for detecting actions'),
+            exposes.binary('trigger_indicator', ea.ALL, true, false).withDescription('When this option is enabled then ' +
+                'blue LED will blink once when motion is detected'), e.temperature(), e.battery(), e.battery_voltage()],
         meta: {battery: {voltageToPercentage: '3V_2850_3000_log'}},
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await endpoint.read('genPowerCfg', ['batteryVoltage']);
             await endpoint.read('aqaraOpple', [0x0102], {manufacturerCode: 0x115f});
             await endpoint.read('aqaraOpple', [0x010c], {manufacturerCode: 0x115f});
+            await endpoint.read('aqaraOpple', [0x0152], {manufacturerCode: 0x115f});
         },
         ota: ota.zigbeeOTA,
     },
@@ -1286,7 +1290,7 @@ module.exports = [
         fromZigbee: [fz.xiaomi_basic, fz.DJT11LM_vibration],
         toZigbee: [tz.DJT11LM_vibration_sensitivity],
         exposes: [
-            e.battery(), e.vibration(), e.action(['vibration', 'tilt', 'drop']),
+            e.battery(), e.temperature(), e.vibration(), e.action(['vibration', 'tilt', 'drop']),
             exposes.numeric('strength', ea.STATE), exposes.enum('sensitivity', ea.STATE_SET, ['low', 'medium', 'high']),
             e.angle_axis('angle_x'), e.angle_axis('angle_y'), e.angle_axis('angle_z'), e.battery_voltage(),
         ],
@@ -1568,7 +1572,7 @@ module.exports = [
         fromZigbee: [fz.on_off, fz.device_temperature, fz.aqara_opple, fz.ignore_metering, fz.ignore_electrical_measurement,
             fz.xiaomi_power],
         exposes: [e.switch(), e.energy(), e.power(), e.device_temperature(), e.power_outage_memory(), e.power_outage_count(),
-            e.switch_type(), e.voltage(), e.temperature(), e.current(),
+            e.switch_type(), e.voltage(), e.current(),
         ],
         toZigbee: [tz.xiaomi_switch_type, tz.on_off, tz.xiaomi_switch_power_outage_memory, tz.xiaomi_led_disabled_night],
         configure: async (device, coordinatorEndpoint, logger) => {
@@ -1602,7 +1606,7 @@ module.exports = [
         vendor: 'Xiaomi',
         description: 'Aqara single switch module T1 (without neutral). Doesn\'t work as a router and doesn\'t support power meter',
         fromZigbee: [fz.on_off, fz.aqara_opple],
-        exposes: [e.switch(), e.power_outage_memory(), e.switch_type()],
+        exposes: [e.switch(), e.power_outage_memory(), e.switch_type(), e.power_outage_count(), e.device_temperature()],
         toZigbee: [tz.xiaomi_switch_type, tz.on_off, tz.xiaomi_switch_power_outage_memory],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);

package/lib/xiaomi.js

@@ -160,6 +160,8 @@ const numericAttributes2Payload = (msg, meta, model, options, dataObject) => {
         case '3':
             if (['WSDCGQ12LM'].includes(model.model)) {
                 // This temperature value is ignored because with greater accuracy it is reported in key №100
+            } else if (['SSM-U01'].includes(model.model)) {
+                payload.device_temperature = value;
             } else if (!['WXCJKG11LM', 'WXCJKG12LM', 'WXCJKG13LM'].includes(model.model)) {
                 payload.temperature = calibrateAndPrecisionRoundOptions(value, options, 'temperature'); // 0x03
             }
@@ -202,7 +204,7 @@ const numericAttributes2Payload = (msg, meta, model, options, dataObject) => {
                 payload[`state_${mapping}`] = value === 1 ? 'ON' : 'OFF';
             } else if (['WXKG14LM', 'WXKG16LM', 'WXKG17LM'].includes(model.model)) {
                 payload.click_mode = {1: 'fast', 2: 'multi'}[value];
-            } else if (['WXCJKG11LM', 'WXCJKG12LM', 'WXCJKG13LM', 'ZNMS12LM'].includes(model.model)) {
+            } else if (['WXCJKG11LM', 'WXCJKG12LM', 'WXCJKG13LM', 'ZNMS12LM', 'RTCGQ14LM'].includes(model.model)) {
                 // We don't know what the value means for these devices.
                 // https://github.com/Koenkk/zigbee2mqtt/issues/11126
                 // https://github.com/Koenkk/zigbee2mqtt/issues/12279
@@ -297,6 +299,11 @@ const numericAttributes2Payload = (msg, meta, model, options, dataObject) => {
                 payload.motion_sensitivity = {1: 'low', 2: 'medium', 3: 'high'}[value];
             }
             break;
+        case '107':
+            if (['RTCGQ14LM'].includes(model.model)) {
+                payload.trigger_indicator = value === 1;
+            }
+            break;
         case '149':
             payload.energy = precisionRound(value, 2); // 0x95
             // Consumption is deprecated
@@ -383,7 +390,7 @@ const numericAttributes2Payload = (msg, meta, model, options, dataObject) => {
             payload.detection_interval = value;
             break;
         case '268':
-            if (['RTCGQ13LM', 'RTCZCGQ11LM'].includes(model.model)) {
+            if (['RTCGQ13LM', 'RTCGQ14LM', 'RTCZCGQ11LM'].includes(model.model)) {
                 payload.motion_sensitivity = {1: 'low', 2: 'medium', 3: 'high'}[value];
             } else if (['JT-BZ-01AQ/A'].includes(model.model)) {
                 payload.gas_sensitivity = {1: '15%LEL', 2: '10%LEL'}[value];
@@ -454,6 +461,11 @@ const numericAttributes2Payload = (msg, meta, model, options, dataObject) => {
                 payload.linkage_alarm = value === 1;
             }
             break;
+        case '338':
+            if (['RTCGQ14LM'].includes(model.model)) {
+                payload.trigger_indicator = value === 1;
+            }
+            break;
         case '512':
             if (['ZNCZ15LM', 'QBCZ14LM', 'QBCZ15LM'].includes(model.model)) {
                 payload.button_lock = value === 1 ? 'OFF' : 'ON';
@@ -530,6 +542,9 @@ const numericAttributes2Payload = (msg, meta, model, options, dataObject) => {
         case 'modelId':
             // We ignore it, but we add it here to not shown an unknown key in the log
             break;
+        case 'illuminance':
+            // It contains the illuminance and occupancy, but in z2m we use a custom timer to do it, so we ignore it
+            break;
         default:
             if (meta.logger) meta.logger.debug(`${model.zigbeeModel}: unknown key ${key} with value ${value}`);
         }

package/package.json

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