zigbee-herdsman-converters 14.0.672 → 14.0.674

package/converters/fromZigbee.js

@@ -2973,7 +2973,7 @@ const converters = {
         convert: (model, msg, publish, options, meta) => {
             const stateHeader = Buffer.from([122, 209]);
             if (msg.data.indexOf(stateHeader) === 0) {
-                if (msg.data[10] === 5) {
+                if (msg.data[10] === 5 || msg.data[10] === 2) {
                     const status = msg.data[14];
                     return {
                         state_left: status === 1 ? 'ON' : 'OFF',

package/devices/ledvance.js

@@ -66,6 +66,14 @@ module.exports = [
         extend: extend.ledvance.light_onoff_brightness_colortemp_color({colorTempRange: [153, 370]}),
         ota: ota.ledvance,
     },
+    {
+        zigbeeModel: ['PAR16 RGBW T'],
+        model: '4058075729186',
+        vendor: 'LEDVANCE',
+        description: 'SMART+ Spot PAR16 28 GU10 Multicolor',
+        extend: extend.ledvance.light_onoff_brightness_colortemp_color({colorTempRange: [153, 370]}),
+        ota: ota.ledvance,
+    },
     {
         zigbeeModel: ['PAR16S TW'],
         model: 'AC33905',
@@ -170,6 +178,14 @@ module.exports = [
         extend: extend.ledvance.light_onoff_brightness_colortemp({colorTempRange: [153, 370]}),
         ota: ota.ledvance,
     },
+    {
+        zigbeeModel: ['P40 TW T'],
+        model: '4058075729124',
+        vendor: 'LEDVANCE',
+        description: 'SMART+ CL P40 E14 Tunable white',
+        extend: extend.ledvance.light_onoff_brightness_colortemp({colorTempRange: [153, 370]}),
+        ota: ota.ledvance,
+    },
     {
         zigbeeModel: ['CLA60 RGBW JP'],
         model: 'SMARTZBA60RGBW',
@@ -255,6 +271,19 @@ module.exports = [
             await reporting.onOff(endpoint);
         },
     },
+    {
+        zigbeeModel: ['PLUG UK T'],
+        model: '4058075729285',
+        vendor: 'LEDVANCE',
+        description: 'SMART+ Plug UK',
+        extend: extend.switch(),
+        ota: ota.ledvance,
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff']);
+            await reporting.onOff(endpoint);
+        },
+    },
     {
         zigbeeModel: ['PLUG OUTDOOR EU T'],
         model: '4058075729308',

package/devices/philips.js

@@ -742,6 +742,13 @@ module.exports = [
         description: 'Hue White and Color Ambiance BR30 with bluetooth',
         extend: hueExtend.light_onoff_brightness_colortemp_color(),
     },
+    {
+        zigbeeModel: ['LCB002'],
+        model: '046677577957',
+        vendor: 'Philips',
+        description: 'Hue White and Color Ambiance BR30 with bluetooth',
+        extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
+    },
     {
         zigbeeModel: ['LWB004'],
         model: '433714',
@@ -2359,10 +2366,10 @@ module.exports = [
     },
     {
         zigbeeModel: ['LLM001'],
-        model: '7121131PU',
+        model: '7121131PU/7120031PH/7120131PH/7120231PU',
         vendor: 'Philips',
-        description: 'Hue Beyond white and color ambiance suspension light',
-        extend: hueExtend.light_onoff_brightness_colortemp_color(),
+        description: 'Hue Beyond white and color ambiance suspension/ceiling/table lamp',
+        extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
     },
     {
         zigbeeModel: ['5041131P9', '5041148P9'],
@@ -2918,7 +2925,7 @@ module.exports = [
         zigbeeModel: ['LCX012'],
         model: '929003535301',
         vendor: 'Philips',
-        description: 'Hue Festivia gradient light string 250',
+        description: 'Hue Festavia gradient light string 250',
         extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
     },
 ];

package/devices/schneider_electric.js

@@ -464,6 +464,18 @@ module.exports = [
             await reporting.currentPositionLiftPercentage(endpoint);
         },
     },
+    {
+        zigbeeModel: ['1GANG/SWITCH/1'],
+        model: 'MEG5161-0000',
+        vendor: 'Schneider Electric',
+        description: 'Merten PlusLink relay insert with Merten Wiser system M push button (1fold)',
+        extend: extend.switch(),
+        configure: async (device, coordinatorEndpoint, logger) => {
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff']);
+            await reporting.onOff(endpoint);
+        },
+    },
     {
         zigbeeModel: ['LK Switch'],
         model: '545D6514',

package/devices/shinasystem.js

@@ -70,8 +70,12 @@ const tzLocal = {
             case 'counting_freeze':
                 if (value.toLowerCase() === 'on') {
                     payload = {'presentValue': 82};
+                    await endpoint.write('genAnalogInput', payload);
+                    return {state: {counting_freeze: 'ON'}};
                 } else if (value.toLowerCase() === 'off') {
                     payload = {'presentValue': 84};
+                    await endpoint.write('genAnalogInput', payload);
+                    return {state: {counting_freeze: 'OFF'}};
                 }
                 break;
             case 'tof_init':
@@ -80,44 +84,72 @@ const tzLocal = {
             case 'led_state':
                 if (value === 'enable') {
                     payload = {'presentValue': 86};
+                    await endpoint.write('genAnalogInput', payload);
+                    return {state: {led_state: 'enable'}};
                 } else if (value === 'disable') {
                     payload = {'presentValue': 87};
+                    await endpoint.write('genAnalogInput', payload);
+                    return {state: {led_state: 'disable'}};
                 }
                 break;
             case 'rf_state':
                 if (value === 'enable') {
                     payload = {'presentValue': 88};
+                    await endpoint.write('genAnalogInput', payload);
+                    return {state: {rf_state: 'enable'}};
                 } else if (value === 'disable') {
                     payload = {'presentValue': 89};
+                    await endpoint.write('genAnalogInput', payload);
+                    return {state: {rf_state: 'disable'}};
                 }
                 break;
             case 'transaction':
                 if (value === '0ms') {
                     payload = {'presentValue': 90};
+                    await endpoint.write('genAnalogInput', payload);
+                    return {state: {transaction: '0ms'}};
                 } else if (value === '200ms') {
                     payload = {'presentValue': 91};
+                    await endpoint.write('genAnalogInput', payload);
+                    return {state: {transaction: '200ms'}};
                 } else if (value === '400ms') {
                     payload = {'presentValue': 92};
+                    await endpoint.write('genAnalogInput', payload);
+                    return {state: {transaction: '400ms'}};
                 } else if (value === '600ms') {
                     payload = {'presentValue': 93};
+                    await endpoint.write('genAnalogInput', payload);
+                    return {state: {transaction: '600ms'}};
                 } else if (value === '800ms') {
                     payload = {'presentValue': 94};
+                    await endpoint.write('genAnalogInput', payload);
+                    return {state: {transaction: '800ms'}};
                 } else if (value === '1,000ms') {
                     payload = {'presentValue': 95};
+                    await endpoint.write('genAnalogInput', payload);
+                    return {state: {transaction: '1,000ms'}};
                 }
                 break;
             case 'fast_in':
                 if (value === 'enable') {
                     payload = {'presentValue': 96};
+                    await endpoint.write('genAnalogInput', payload);
+                    return {state: {fast_in: 'enable'}};
                 } else if (value === 'disable') {
                     payload = {'presentValue': 97};
+                    await endpoint.write('genAnalogInput', payload);
+                    return {state: {fast_in: 'disable'}};
                 }
                 break;
             case 'fast_out':
                 if (value === 'enable') {
                     payload = {'presentValue': 98};
+                    await endpoint.write('genAnalogInput', payload);
+                    return {state: {fast_out: 'enable'}};
                 } else if (value === 'disable') {
                     payload = {'presentValue': 99};
+                    await endpoint.write('genAnalogInput', payload);
+                    return {state: {fast_out: 'disable'}};
                 }
                 break;
             }

package/devices/sinope.js

@@ -355,15 +355,21 @@ module.exports = [
         model: 'SP2600ZB',
         vendor: 'Sinopé',
         description: 'Zigbee smart plug',
-        fromZigbee: [fz.on_off, fz.electrical_measurement],
+        fromZigbee: [fz.on_off, fz.electrical_measurement, fz.metering],
         toZigbee: [tz.on_off],
-        exposes: [e.switch(), e.power()],
+        exposes: [e.switch(), e.power(), e.current(), e.voltage(), e.ac_frequency(), e.energy()],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
-            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'haElectricalMeasurement']);
-            await reporting.readEletricalMeasurementMultiplierDivisors(endpoint);
+            const binds = ['genBasic', 'genIdentify', 'genOnOff', 'haElectricalMeasurement', 'seMetering'];
+            await reporting.bind(endpoint, coordinatorEndpoint, binds);
+            await reporting.readEletricalMeasurementMultiplierDivisors(endpoint, {readFrequencyAttrs: true});
             await reporting.onOff(endpoint);
-            await reporting.activePower(endpoint, {min: 10, change: 1});
+            await reporting.activePower(endpoint, {min: 10, change: 1}); // divider 10 : 0.1W
+            await reporting.rmsCurrent(endpoint, {min: 10, change: 10}); // divider 100: 0.1Arms
+            await reporting.rmsVoltage(endpoint, {min: 10, change: 10}); // divider 100: 0.1Vrms
+            await reporting.acFrequency(endpoint, {min: 10, change: 100}); // divider 100: 1Hz
+            await endpoint.read('haElectricalMeasurement', ['acFrequency']); // get a first read
+            await reporting.currentSummDelivered(endpoint, {min: 10, max: 307, change: [1, 1]});
         },
     },
     {

package/devices/third_reality.js

@@ -3,6 +3,7 @@ const fz = {...require('../converters/fromZigbee'), legacy: require('../lib/lega
 const tz = require('../converters/toZigbee');
 const reporting = require('../lib/reporting');
 const extend = require('../lib/extend');
+const ota = require('../lib/ota');
 const e = exposes.presets;
 
 module.exports = [
@@ -60,6 +61,7 @@ module.exports = [
         fromZigbee: [fz.ias_water_leak_alarm_1, fz.battery],
         meta: {battery: {dontDividePercentage: true}},
         toZigbee: [],
+        ota: ota.zigbeeOTA,
         exposes: [e.water_leak(), e.battery_low(), e.battery(), e.battery_voltage()],
         configure: async (device, coordinatorEndpoint, logger) => {
             device.powerSource = 'Battery';
@@ -144,5 +146,6 @@ module.exports = [
         fromZigbee: [fz.battery, fz.temperature, fz.humidity],
         toZigbee: [],
         exposes: [e.battery(), e.temperature(), e.humidity(), e.battery_voltage()],
+        ota: ota.zigbeeOTA,
     },
 ];

package/devices/tuya.js

@@ -1399,7 +1399,8 @@ module.exports = [
         fingerprint: [{modelID: 'TS0215A', manufacturerName: '_TZ3000_4fsgukof'},
             {modelID: 'TS0215A', manufacturerName: '_TZ3000_wr2ucaj9'},
             {modelID: 'TS0215A', manufacturerName: '_TZ3000_zsh6uat3'},
-            {modelID: 'TS0215A', manufacturerName: '_TZ3000_tj4pwzzm'}],
+            {modelID: 'TS0215A', manufacturerName: '_TZ3000_tj4pwzzm'},
+            {modelID: 'TS0215A', manufacturerName: '_TZ3000_2izubafb'}],
         model: 'TS0215A_sos',
         vendor: 'TuYa',
         description: 'SOS button',
@@ -1986,7 +1987,7 @@ module.exports = [
                     'to the desired temperature. If you want TRV to properly regulate the temperature you need to use mode `auto` ' +
                     'instead setting the desired temperature.')
                 .withLocalTemperatureCalibration(-9, 9, 1, ea.STATE_SET)
-                .withPreset(['schedule', 'manual', 'boost', 'complex', 'comfort', 'eco'])
+                .withPreset(['schedule', 'manual', 'boost', 'complex', 'comfort', 'eco', 'away'])
                 .withRunningState(['idle', 'heat'], ea.STATE),
             e.auto_lock(), e.away_mode(), e.away_preset_days(), e.boost_time(), e.comfort_temperature(), e.eco_temperature(), e.force(),
             e.max_temperature(), e.min_temperature(), e.away_preset_temperature(),
@@ -3335,8 +3336,7 @@ module.exports = [
         exposes: [e.illuminance_lux(), e.brightness_state()],
     },
     {
-        fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_kltffuzl'}, {modelID: 'TS0601', manufacturerName: '_TZE200_fwoorn8y'},
-            {modelID: 'TS0601', manufacturerName: '_TZE200_pay2byax'}],
+        fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_kltffuzl'}, {modelID: 'TS0601', manufacturerName: '_TZE200_fwoorn8y'}],
         model: 'TM001-ZA/TM081',
         vendor: 'TuYa',
         description: 'Door and window sensor',
@@ -3418,18 +3418,7 @@ module.exports = [
         ],
     },
     {
-        fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_qoy0ekbd'},
-            {modelID: 'TS0601', manufacturerName: '_TZE200_znbl8dj5'}],
-        model: 'CX-0726',
-        vendor: 'TuYa',
-        description: 'Temperature & humidity LCD sensor',
-        fromZigbee: [fz.tuya_temperature_humidity_sensor, fz.ignore_tuya_set_time],
-        toZigbee: [],
-        onEvent: tuya.onEventSetLocalTime,
-        exposes: [e.temperature(), e.humidity(), e.battery()],
-    },
-    {
-        fingerprint: [{modelID: 'TS0601', manufacturerName: '_TZE200_3towulqd'}, {modelID: 'TS0601', manufacturerName: '_TZE200_1ibpyhdc'}],
+        fingerprint: tuya.fingerprint('TS0601', ['_TZE200_3towulqd', '_TZE200_1ibpyhdc', '_TZE200_bh3n6gk8']),
         model: 'ZG-204ZL',
         vendor: 'TuYa',
         description: 'Luminance motion sensor',
@@ -3550,4 +3539,58 @@ module.exports = [
                 .withDescription('Turns the onboard LED on or off'),
         ],
     },
+    {
+        fingerprint: tuya.fingerprint('TS0601', ['_TZE200_qoy0ekbd', '_TZE200_znbl8dj5', '_TZE200_a8sdabtg']),
+        model: 'ZG-227ZL',
+        vendor: 'TuYa',
+        description: 'Temperature & humidity LCD sensor',
+        fromZigbee: [tuya.fzDataPoints],
+        toZigbee: [tuya.tzDataPoints],
+        configure: tuya.configureMagicPacket,
+        exposes: [e.temperature(), e.humidity(), tuya.exposes.temperatureUnit(), tuya.exposes.temperatureCalibration(),
+            tuya.exposes.humidityCalibration(), e.battery()],
+        meta: {
+            tuyaDatapoints: [
+                [1, 'temperature', tuya.valueConverter.divideBy10],
+                [2, 'humidity', tuya.valueConverter.raw],
+                [4, 'battery', tuya.valueConverter.raw],
+                [9, 'temperature_unit', tuya.valueConverter.temperatureUnit],
+                [23, 'temperature_calibration', tuya.valueConverter.divideBy10],
+                [24, 'humidity_calibration', tuya.valueConverter.raw],
+            ],
+        },
+    },
+    {
+        fingerprint: tuya.fingerprint('TS0601', ['_TZE200_n8dljorx', '_TZE200_pay2byax']),
+        model: 'ZG-102ZL',
+        vendor: 'TuYa',
+        description: 'Luminance door sensor',
+        fromZigbee: [tuya.fzDataPoints],
+        toZigbee: [tuya.tzDataPoints],
+        configure: tuya.configureMagicPacket,
+        exposes: [e.contact(), e.illuminance().withUnit('lx'), e.battery()],
+        meta: {
+            tuyaDatapoints: [
+                [1, 'contact', tuya.valueConverter.inverse],
+                [101, 'illuminance', tuya.valueConverter.raw],
+                [2, 'battery', tuya.valueConverter.raw],
+            ],
+        },
+    },
+    {
+        fingerprint: tuya.fingerprint('TS0601', ['_TZE200_8isdky6j']),
+        model: 'ZG-225Z',
+        vendor: 'TuYa',
+        description: 'Gas sensor',
+        fromZigbee: [tuya.fzDataPoints],
+        toZigbee: [tuya.tzDataPoints],
+        configure: tuya.configureMagicPacket,
+        exposes: [e.gas(), tuya.exposes.gasValue()],
+        meta: {
+            tuyaDatapoints: [
+                [1, 'gas', tuya.valueConverter.true0ElseFalse],
+                [2, 'gas_value', tuya.valueConverter.raw],
+            ],
+        },
+    },
 ];

package/devices/xiaomi.js

@@ -131,7 +131,7 @@ const fzLocal = {
                         break;
                     case 0x041502bc: { // feeding report
                         const report = val.toString();
-                        result['feeding_source'] = {1: 'manual', 2: 'remote'}[parseInt(report.slice(0, 2))];
+                        result['feeding_source'] = {0: 'schedule', 1: 'manual', 2: 'remote'}[parseInt(report.slice(0, 2))];
                         result['feeding_size'] = parseInt(report.slice(3, 4));
                         break;
                     }
@@ -2582,7 +2582,7 @@ module.exports = [
         toZigbee: [tzLocal.aqara_feeder],
         exposes: [
             exposes.enum('feed', ea.STATE_SET, ['START']).withDescription('Start feeding'),
-            exposes.enum('feeding_source', ea.STATE, ['manual', 'remote']).withDescription('Feeding source'),
+            exposes.enum('feeding_source', ea.STATE, ['schedule', 'manual', 'remote']).withDescription('Feeding source'),
             exposes.numeric('feeding_size', ea.STATE).withDescription('Feeding size').withUnit('portion'),
             exposes.numeric('portions_per_day', ea.STATE).withDescription('Portions per day'),
             exposes.numeric('weight_per_day', ea.STATE).withDescription('Weight per day').withUnit('g'),

package/lib/tuya.js

@@ -1170,6 +1170,12 @@ const tuyaExposes = {
     errorStatus: () => exposes.numeric('error_status', ea.STATE).withDescription('Error status'),
     scheduleAllDays: (access, format) => ['monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday', 'sunday']
         .map((day) => exposes.text(`schedule_${day}`, access).withDescription(`Schedule for ${day}, format: "${format}"`)),
+    temperatureUnit: () => exposes.enum('temperature_unit', ea.STATE_SET, ['celsius', 'fahrenheit']).withDescription('Temperature unit'),
+    temperatureCalibration: () => exposes.numeric('temperature_calibration', ea.STATE_SET).withValueMin(-2.0).withValueMax(2.0)
+        .withValueStep(0.1).withUnit('°C').withDescription('Temperature calibration'),
+    humidityCalibration: () => exposes.numeric('humidity_calibration', ea.STATE_SET).withValueMin(-30).withValueMax(30)
+        .withValueStep(1).withUnit('%').withDescription('Humidity calibration'),
+    gasValue: () => exposes.numeric('gas_value', ea.STATE).withDescription('Measured gas concentration').withUnit('ppm'),
 };
 
 const skip = {
@@ -1255,6 +1261,7 @@ const valueConverter = {
     scale0_254to0_1000: valueConverterBasic.scale(0, 254, 0, 1000),
     scale0_1to0_1000: valueConverterBasic.scale(0, 1, 0, 1000),
     divideBy100: valueConverterBasic.divideBy(100),
+    temperatureUnit: valueConverterBasic.lookup({'celsius': 0, 'fahrenheit': 1}),
     divideBy10: valueConverterBasic.divideBy(10),
     raw: valueConverterBasic.raw(),
     phaseVariant1: {
@@ -1452,11 +1459,13 @@ const valueConverter = {
             return {system_mode: v === false ? 'heat' : 'off', heating_stop: v === false ? 'OFF' : 'ON'};
         },
     },
+    inverse: {to: (v) => !v, from: (v) => !v},
     onOffNotStrict: {from: (v) => v ? 'ON' : 'OFF', to: (v) => v === 'ON'},
 };
 
 const tzDataPoints = {
     key: [
+        'temperature_unit', 'temperature_calibration', 'humidity_calibration',
         'state', 'brightness', 'min_brightness', 'max_brightness', 'power_on_behavior',
         'countdown', 'light_type', 'silence', 'self_test', 'child_lock', 'open_window', 'open_window_temperature', 'frost_protection',
         'system_mode', 'heating_stop', 'current_heating_setpoint', 'local_temperature_calibration', 'preset', 'boost_timeset_countdown',

package/package.json

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