zigbee-herdsman-converters 14.0.480 → 14.0.483

package/devices/ikea.js

@@ -378,7 +378,7 @@ module.exports = [
     },
     {
         zigbeeModel: ['TRADFRI bulb E27 CWS opal 600lm', 'TRADFRI bulb E26 CWS opal 600lm', 'TRADFRI bulb E14 CWS opal 600lm',
-            'TRADFRI bulb E12 CWS opal 600lm'],
+            'TRADFRI bulb E12 CWS opal 600lm', 'TRADFRI bulb E27 C/WS opal 600'],
         model: 'LED1624G9',
         vendor: 'IKEA',
         description: 'TRADFRI LED bulb E14/E26/E27 600 lumen, dimmable, color, opal white',
@@ -590,6 +590,8 @@ module.exports = [
         model: 'E1842',
         description: 'KNYCKLAN receiver electronic water valve shut-off',
         vendor: 'IKEA',
+        fromZigbee: extend.switch().fromZigbee.concat([fz.ias_water_leak_alarm_1]),
+        exposes: extend.switch().exposes.concat([e.water_leak()]),
         extend: extend.switch(),
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
@@ -704,6 +706,23 @@ module.exports = [
         },
         exposes: [e.cover_position(), e.battery()],
     },
+    {
+        zigbeeModel: ['TREDANSEN cellular blind'],
+        model: 'E2103',
+        vendor: 'IKEA',
+        description: 'TREDANSEN cellular blind',
+        fromZigbee: [fz.cover_position_tilt, fz.battery],
+        toZigbee: [tz.cover_state, tz.cover_position_tilt],
+        meta: {battery: {dontDividePercentage: true}},
+        ota: ota.tradfri,
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genPowerCfg', 'closuresWindowCovering']);
+            await reporting.batteryPercentageRemaining(endpoint);
+            await reporting.currentPositionLiftPercentage(endpoint);
+        },
+        exposes: [e.cover_position(), e.battery()],
+    },
     {
         zigbeeModel: ['TRADFRI open/close remote'],
         model: 'E1766',

package/devices/iotperfect.js

@@ -7,7 +7,8 @@ const ea = exposes.access;
 
 module.exports = [
     {
-        fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_vrjkcam9'}],
+        fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_vrjkcam9'},
+            {modelID: 'TS0601', manufacturerName: '_TZE200_d0ypnbvn'}],
         model: 'PF-PM02D-TYZ',
         vendor: 'IOTPerfect',
         description: 'Smart water/gas valve',

package/devices/lidl.js

@@ -440,6 +440,16 @@ module.exports = [
         fromZigbee: [fz.command_on, fz.command_off, fz.command_step, fz.command_move, fz.command_stop],
         toZigbee: [],
     },
+    {
+        fingerprint: [{modelID: 'TS1001', manufacturerName: '_TYZB01_hww2py6b'}],
+        model: 'FB21-001',
+        vendor: 'Lidl',
+        description: 'Livarno Lux switch and dimming light remote control',
+        exposes: [e.action(['on', 'off', 'brightness_stop', 'brightness_step_up', 'brightness_step_down', 'brightness_move_up',
+            'brightness_move_down'])],
+        fromZigbee: [fz.command_on, fz.command_off, fz.command_step, fz.command_move, fz.command_stop],
+        toZigbee: [],
+    },
     {
         fingerprint: [
             {modelID: 'TS011F', manufacturerName: '_TZ3000_wzauvbcs'}, // EU
@@ -647,7 +657,8 @@ module.exports = [
         },
     },
     {
-        fingerprint: [{modelID: 'TS0505A', manufacturerName: '_TZ3000_gek6snaj'}],
+        fingerprint: [{modelID: 'TS0505A', manufacturerName: '_TZ3000_gek6snaj'},
+            {modelID: 'TS0505B', manufacturerName: '_TZ3210_iystcadi'}],
         model: '14149505L/14149506L',
         vendor: 'Lidl',
         description: 'Livarno Lux light bar RGB+CCT (black/white)',
@@ -720,6 +731,14 @@ module.exports = [
             await reporting.onOff(endpoint);
         },
     },
+    {
+        fingerprint: [{modelID: 'TS0505B', manufacturerName: '_TZ3000_lxw3zcdk'}],
+        model: 'HG08633',
+        vendor: 'Lidl',
+        description: 'Livarno gardenspot RGB',
+        extend: extend.light_onoff_brightness_colortemp_color({disableColorTempStartup: true, colorTempRange: [153, 500]}),
+        meta: {applyRedFix: true, enhancedHue: false},
+    },
     {
         fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_chyvmhay'}],
         model: '368308_2010',

package/devices/lixee.js

@@ -196,7 +196,8 @@ const fzLocal = {
 // we are doing it with exclusion and not inclusion because the list is dynamic (based on zlinky mode),
 // and change based on that. Just some few attributes are useless, so we exclude them
 const tarifsDef = {
-    histo_BASE: {fname: 'Historique - BASE',
+    histo_BASE: {
+        fname: 'Historique - BASE',
         currentTarf: 'BASE', excluded: [
             'HCHC',
             'HCHP',
@@ -212,7 +213,8 @@ const tarifsDef = {
             'DEMAIN',
             'PEJP',
         ]},
-    histo_HCHP: {fname: 'Historique - HCHP',
+    histo_HCHP: {
+        fname: 'Historique - HCHP',
         currentTarf: 'HC..', excluded: [
             'BASE',
             'EJPHN',
@@ -226,7 +228,8 @@ const tarifsDef = {
             'DEMAIN',
             'PEJP',
         ]},
-    histo_EJP: {fname: 'Historique - EJP',
+    histo_EJP: {
+        fname: 'Historique - EJP',
         currentTarf: 'EJP.', excluded: [
             'BASE',
             'HCHC',
@@ -239,7 +242,8 @@ const tarifsDef = {
             'BBRHPJR',
             'DEMAIN',
         ]},
-    histo_BBR: {fname: 'Historique - BBR',
+    histo_BBR: {
+        fname: 'Historique - BBR',
         currentTarf: 'BBR', excluded: [
             'BASE',
             'HCHC',
@@ -248,7 +252,8 @@ const tarifsDef = {
             'EJPHPM',
             'PEJP',
         ]},
-    stand_SEM_WE_MERCR: {fname: 'Standard - Sem WE Mercredi',
+    stand_SEM_WE_MERCR: {
+        fname: 'Standard - Sem WE Mercredi',
         currentTarf: 'SEM WE MERCREDI', excluded: [
             'EASF04',
             'EASF05',
@@ -271,8 +276,10 @@ const tarifsDef = {
             'PJOURF+1',
             'PPOINTE1',
         ]},
-    stand_HPHC: {fname: 'Standard - Heure Pleine Heure Creuse',
-        currentTarf: 'H PLEINE/CREUSE', excluded: [
+    stand_BASE: {
+        fname: 'Standard - BASE',
+        currentTarf: 'BASE',
+        excluded: [
             'EASF03',
             'EASF04',
             'EASF05',
@@ -295,8 +302,33 @@ const tarifsDef = {
             'PJOURF+1',
             'PPOINTE1',
         ]},
+    stand_HPHC: {
+        fname: 'Standard - Heure Pleine Heure Creuse',
+        currentTarf: 'H PLEINE/CREUSE', excluded: [
+            'EASF03',
+            'EASF04',
+            'EASF05',
+            'EASF06',
+            'EASF07',
+            'EASF08',
+            'EASF09',
+            'EASF10',
+            'EASD03',
+            'EASD04',
+            'DPM1',
+            'DPM2',
+            'DPM3',
+            'FPM1',
+            'FPM2',
+            'FPM3',
+            'NJOURF',
+            'NJOURF+1',
+            'PJOURF+1',
+            'PPOINTE1',
+        ]},
 };
 
+
 const linkyModeDef = {
     standard: 'standard',
     legacy: 'historique',
@@ -505,6 +537,9 @@ function getCurrentConfig(device, options, logger=console) {
     case linkyMode == linkyModeDef.standard && tarifsDef.stand_HPHC.currentTarf:
         myExpose = myExpose.filter((a) => !tarifsDef.stand_HPHC.excluded.includes(a.exposes.name));
         break;
+    case linkyMode == linkyModeDef.standard && tarifsDef.stand_BASE.currentTarf:
+        myExpose = myExpose.filter((a) => !tarifsDef.stand_BASE.excluded.includes(a.exposes.name));
+        break;
     default:
         break;
     }

package/devices/micromatic.js

@@ -20,6 +20,7 @@ module.exports = [
             await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'genLevelCtrl', 'haElectricalMeasurement', 'seMetering']);
             await reporting.brightness(endpoint);
             await reporting.readEletricalMeasurementMultiplierDivisors(endpoint);
+            await reporting.readMeteringMultiplierDivisor(endpoint);
             await reporting.rmsVoltage(endpoint, {min: 10, change: 20}); // Voltage - Min change of 2V
             await reporting.rmsCurrent(endpoint, {min: 10, change: 10}); // A - z2m displays only the first decimals, change of 10 / 0,01A
             await reporting.activePower(endpoint, {min: 10, change: 15}); // W - Min change of 1,5W
@@ -28,4 +29,3 @@ module.exports = [
         exposes: [e.light_brightness(), e.power(), e.current(), e.voltage().withAccess(ea.STATE), e.energy()],
     },
 ];
-

package/devices/schneider_electric.js

@@ -54,7 +54,7 @@ const fzLocal = {
 
             if (rxAfterTx) {
                 // Send Schneider specific ACK to make PowerTag happy
-                const networkParameters = await msg.device.zh.getNetworkParameters();
+                const networkParameters = await msg.device.zh.constructor.adapter.getNetworkParameters();
                 const payload = {
                     options: 0b000,
                     tempMaster: msg.data.gppNwkAddr,

package/devices/sunricher.js

@@ -29,6 +29,16 @@ module.exports = [
         description: '50W Zigbee CCT LED driver (constant current)',
         extend: extend.light_onoff_brightness_colortemp({colorTempRange: [160, 450]}),
     },
+    {
+        zigbeeModel: ['ZGRC-KEY-004'],
+        model: 'SR-ZG9001K2-DIM',
+        vendor: 'Sunricher',
+        description: 'Zigbee wall remote control for single color, 1 zone',
+        fromZigbee: [fz.command_on, fz.command_off, fz.command_move, fz.command_stop, fz.battery],
+        toZigbee: [],
+        exposes: [e.battery(), e.action(['on', 'off',
+            'brightness_move_up', 'brightness_move_down', 'brightness_move_stop'])],
+    },
     {
         zigbeeModel: ['ZGRC-KEY-007'],
         model: 'SR-ZG9001K2-DIM2',

package/devices/tuya.js

@@ -210,7 +210,8 @@ module.exports = [
             {manufacturerName: '_TZ3000_q6a3tepg'}, {modelID: 'TS000F', manufacturerName: '_TZ3000_m9af2l6g'},
             {modelID: 'TS0001', manufacturerName: '_TZ3000_npzfdcof'},
             {modelID: 'TS0001', manufacturerName: '_TZ3000_5ng23zjs'},
-            {modelID: 'TS0001', manufacturerName: '_TZ3000_v7gnj3ad'}],
+            {modelID: 'TS0001', manufacturerName: '_TZ3000_v7gnj3ad'},
+            {modelID: 'TS0001', manufacturerName: '_TZ3000_mx3vgyea'}],
         model: 'WHD02',
         vendor: 'TuYa',
         description: 'Wall switch module',

package/devices/vbled.js

@@ -0,0 +1,18 @@
+const reporting = require('../lib/reporting');
+const extend = require('../lib/extend');
+
+module.exports = [
+    {
+        zigbeeModel: ['43023'],
+        model: '43023',
+        vendor: 'VBLED',
+        description: 'ZigBee AC phase-cut dimmer',
+        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);
+        },
+    },
+];

package/lib/xiaomi.js

@@ -212,7 +212,8 @@ const numericAttributes2Payload = (msg, meta, model, options, dataObject) => {
             } else if (['MCCGQ11LM'].includes(model.model)) {
                 payload.contact = value === 0;
             } else if (['SJCGQ11LM'].includes(model.model)) {
-                payload.water_leak = value === 1;
+                // Ignore the message. It seems not reliable. See discussion here https://github.com/Koenkk/zigbee2mqtt/issues/12018
+                // payload.water_leak = value === 1;
             } else if (['JTYJ-GD-01LM/BW'].includes(model.model)) {
                 payload.smoke_density = value;
             } else {
@@ -514,6 +515,9 @@ const numericAttributes2Payload = (msg, meta, model, options, dataObject) => {
         case 'mode':
             payload.operation_mode = ['command', 'event'][value];
             break;
+        case 'modelId':
+            // We ignore it, but we add it here to not shown an unknown key in the log
+            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.480",
+  "version": "14.0.483",
   "description": "Collection of device converters to be used with zigbee-herdsman",
   "main": "index.js",
   "files": [
@@ -38,7 +38,7 @@
     "buffer-crc32": "^0.2.13",
     "https-proxy-agent": "^5.0.0",
     "tar-stream": "^2.2.0",
-    "zigbee-herdsman": "^0.14.22"
+    "zigbee-herdsman": "^0.14.24"
   },
   "devDependencies": {
     "eslint": "*",