zigbee-herdsman-converters 14.0.578 → 14.0.579

package/devices/ajax_online.js

@@ -30,4 +30,12 @@ module.exports = [
         description: 'Smart Zigbee pro 12W A60 RGBCW bulb',
         extend: extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
     },
+    {
+        fingerprint: [{modelID: 'TS0505B', manufacturerName: '_TZ3210_hzy4rjz3'}],
+        model: 'AJ_RGBCCT_CTRL',
+        vendor: 'Ajax Online',
+        description: 'Smart Zigbee LED strip RGB+CCT',
+        extend: extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500], disableColorTempStartup: true}),
+        meta: {applyRedFix: true, enhancedHue: false},
+    },
 ];

package/devices/bitron.js

@@ -136,7 +136,11 @@ module.exports = [
             await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'seMetering']);
             await reporting.instantaneousDemand(endpoint);
             await reporting.currentSummDelivered(endpoint);
-            await reporting.currentSummReceived(endpoint);
+            try {
+                await reporting.currentSummReceived(endpoint);
+            } catch (error) {
+                /* fails for some: https://github.com/Koenkk/zigbee2mqtt/issues/13258 */
+            }
             endpoint.saveClusterAttributeKeyValue('seMetering', {divisor: 10000, multiplier: 1});
         },
     },

package/devices/legrand.js

@@ -266,6 +266,24 @@ module.exports = [
             // Read configuration values that are not sent periodically as well as current power (activePower).
             await endpoint.read('haElectricalMeasurement', ['activePower', 0xf000, 0xf001, 0xf002]);
         },
+        onEvent: async (type, data, device, options, state) => {
+            /**
+             * The DIN power consumption module loses the configure reporting
+             * after device restart/powerloss.
+             *
+             * We reconfigure the reporting at deviceAnnounce.
+             */
+            if (type === 'deviceAnnounce') {
+                for (const endpoint of device.endpoints) {
+                    for (const c of endpoint.configuredReportings) {
+                        await endpoint.configureReporting(c.cluster.name, [{
+                            attribute: c.attribute.name, minimumReportInterval: c.minimumReportInterval,
+                            maximumReportInterval: c.maximumReportInterval, reportableChange: c.reportableChange,
+                        }]);
+                    }
+                }
+            }
+        },
     },
     {
         zigbeeModel: ['Remote switch Wake up / Sleep'],

package/devices/mecrator.js

@@ -6,6 +6,30 @@ const e = exposes.presets;
 const ea = exposes.access;
 
 module.exports = [
+    {
+        fingerprint: [{modelID: 'TS011F', manufacturerName: '_TZ3210_yvxjawlt'}],
+        model: 'SPP04G',
+        vendor: 'Mercator',
+        description: 'Ikuü Quad Power Point',
+        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],
+        exposes: [e.switch().withEndpoint('left'), e.switch().withEndpoint('right'),
+            e.power().withEndpoint('left'), e.current().withEndpoint('left'),
+            e.voltage().withEndpoint('left').withAccess(ea.STATE), e.energy(),
+            exposes.enum('power_outage_memory', ea.ALL, ['on', 'off', 'restore'])
+                .withDescription('Recover state after power outage')],
+        endpoint: (device) => {
+            return {left: 1, right: 2};
+        },
+        meta: {multiEndpoint: true},
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await endpoint.read('genBasic', ['manufacturerName', 'zclVersion', 'appVersion', 'modelId', 'powerSource', 0xfffe]);
+            endpoint.saveClusterAttributeKeyValue('haElectricalMeasurement', {acCurrentDivisor: 1000, acCurrentMultiplier: 1});
+            endpoint.saveClusterAttributeKeyValue('seMetering', {divisor: 100, multiplier: 1});
+            device.save();
+        },
+    },
     {
         fingerprint: [{modelID: 'TS011F', manufacturerName: '_TZ3210_7jnk7l3k'}],
         model: 'SPP02GIP',

package/devices/philips.js

@@ -406,7 +406,7 @@ module.exports = [
         extend: hueExtend.light_onoff_brightness(),
     },
     {
-        zigbeeModel: ['LCT026', '7602031P7', '7602031U7'],
+        zigbeeModel: ['LCT026', '7602031P7', '7602031U7', '7602031PU'],
         model: '7602031P7',
         vendor: 'Philips',
         description: 'Hue Go with Bluetooth',

package/devices/plugwise.js

@@ -149,4 +149,27 @@ module.exports = [
                 .withDescription('Calibrates valve on next wakeup'),
         ],
     },
+    {
+        zigbeeModel: ['158-01'],
+        model: '158-01',
+        vendor: 'Plugwise',
+        description: 'Lisa zone thermostat',
+        fromZigbee: [fz.thermostat, fz.temperature, fz.battery],
+        toZigbee: [
+            tz.thermostat_system_mode,
+            tz.thermostat_occupied_heating_setpoint,
+        ],
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genBasic', 'genPowerCfg', 'hvacThermostat']);
+            await reporting.batteryPercentageRemaining(endpoint);
+            await reporting.thermostatTemperature(endpoint);
+        },
+        exposes: [e.battery(),
+            exposes.climate()
+                .withSetpoint('occupied_heating_setpoint', 5, 30, 0.5, ea.ALL)
+                .withLocalTemperature(ea.STATE)
+                .withSystemMode(['off', 'auto'], ea.ALL),
+        ],
+    },
 ];

package/devices/tuya.js

@@ -981,6 +981,7 @@ module.exports = [
             {modelID: 'TS0502B', manufacturerName: '_TZ3210_2p6wbry3'},
             {modelID: 'TS0502B', manufacturerName: '_TZ3210_qamcypen'},
             {modelID: 'TS0502B', manufacturerName: '_TZ3210_zdrhqmo0'},
+            {modelID: 'TS0502B', manufacturerName: '_TZ3210_2cjfbpy0'},
         ],
         model: 'TS0502B',
         vendor: 'TuYa',
@@ -2520,7 +2521,7 @@ module.exports = [
     },
     {
         fingerprint: [{modelID: 'TS004F', manufacturerName: '_TZ3000_4fjiwweb'}, {modelID: 'TS004F', manufacturerName: '_TZ3000_uri7ongn'},
-            {modelID: 'TS004F', manufacturerName: '_TZ3000_ixla93vd'}],
+            {modelID: 'TS004F', manufacturerName: '_TZ3000_ixla93vd'}, {modelID: 'TS004F', manufacturerName: '_TZ3000_qja6nq5z'}],
         model: 'ERS-10TZBVK-AA',
         vendor: 'TuYa',
         description: 'Smart knob',

package/devices/xiaomi.js

@@ -40,6 +40,21 @@ const preventReset = async (type, data, device) => {
 };
 
 module.exports = [
+    {
+        zigbeeModel: ['lumi.flood.acn001'],
+        model: 'SJCGQ13LM',
+        vendor: 'Xiaomi',
+        description: 'Aqara E1 water leak sensor',
+        fromZigbee: [fz.ias_water_leak_alarm_1, fz.aqara_opple, fz.battery],
+        toZigbee: [],
+        exposes: [e.water_leak(), e.battery(), e.battery_low(), e.battery_voltage(), e.device_temperature(), e.power_outage_count(false)],
+        meta: {battery: {voltageToPercentage: '3V_2850_3200'}},
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await endpoint.read('genPowerCfg', ['batteryVoltage']);
+        },
+        ota: ota.zigbeeOTA,
+    },
     {
         zigbeeModel: ['lumi.magnet.acn001'],
         model: 'MCCGQ14LM',

package/lib/xiaomi.js

@@ -191,10 +191,7 @@ const numericAttributes2Payload = (msg, meta, model, options, dataObject) => {
             }
             break;
         case '11':
-            if (['JT-BZ-01AQ/A', 'QBKG25LM', 'ZNLDP13LM'].includes(model.model)) {
-                // We don't know what the value means for these devices.
-                // https://github.com/Koenkk/zigbee2mqtt/issues/12451
-            } else {
+            if (['RTCGQ11LM'].includes(model.model)) {
                 payload.illuminance = calibrateAndPrecisionRoundOptions(value, options, 'illuminance');
                 // DEPRECATED: remove illuminance_lux here.
                 payload.illuminance_lux = calibrateAndPrecisionRoundOptions(value, options, 'illuminance_lux');
@@ -241,6 +238,8 @@ const numericAttributes2Payload = (msg, meta, model, options, dataObject) => {
             } else if (['SJCGQ11LM'].includes(model.model)) {
                 // Ignore the message. It seems not reliable. See discussion here https://github.com/Koenkk/zigbee2mqtt/issues/12018
                 // payload.water_leak = value === 1;
+            } else if (['SJCGQ13LM'].includes(model.model)) {
+                payload.water_leak = value === 1;
             } else if (['JTYJ-GD-01LM/BW'].includes(model.model)) {
                 payload.smoke_density = value;
             } else if (['GZCGQ01LM'].includes(model.model)) {

package/package.json

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