zigbee-herdsman-converters 14.0.683 → 14.0.684

package/devices/ecodim.js

@@ -3,6 +3,7 @@ const fz = {...require('../converters/fromZigbee'), legacy: require('../lib/lega
 const e = exposes.presets;
 const reporting = require('../lib/reporting');
 const extend = require('../lib/extend');
+const ota = require('../lib/ota');
 
 module.exports = [
     {
@@ -48,6 +49,7 @@ module.exports = [
         model: 'Eco-Dim.07/Eco-Dim.10',
         vendor: 'EcoDim',
         description: 'Zigbee & Z-wave dimmer',
+        ota: ota.zigbeeOTA,
         extend: extend.light_onoff_brightness({noConfigure: true, disableEffect: true}),
         configure: async (device, coordinatorEndpoint, logger) => {
             await extend.light_onoff_brightness().configure(device, coordinatorEndpoint, logger);

package/devices/immax.js

@@ -182,4 +182,22 @@ module.exports = [
             // eslint-disable-next-line
             exposes.enum('keep_time', ea.STATE_SET, ['0', '30', '60', '120', '240']).withDescription('PIR keep time in seconds')],
     },
+    {
+        fingerprint: tuya.fingerprint('TS0601', ['_TZE200_n9clpsht']),
+        model: '07505L',
+        vendor: 'Immax',
+        description: 'Neo smart keypad',
+        fromZigbee: [tuya.fz.datapoints],
+        toZigbee: [],
+        exposes: [e.action(['disarm', 'arm_home', 'arm_away', 'sos']), e.tamper()],
+        meta: {
+            tuyaDatapoints: [
+                [24, 'tamper', tuya.valueConverter.trueFalse],
+                [26, 'action', tuya.valueConverter.static('disarm')],
+                [27, 'action', tuya.valueConverter.static('arm_away')],
+                [28, 'action', tuya.valueConverter.static('arm_home')],
+                [29, 'action', tuya.valueConverter.static('sos')],
+            ],
+        },
+    },
 ];

package/devices/philips.js

@@ -662,9 +662,16 @@ module.exports = [
         zigbeeModel: ['1740193P0'],
         model: '1740193P0',
         vendor: 'Philips',
-        description: 'Hue Lucca wall light',
+        description: 'Hue White Lucca wall light',
         extend: hueExtend.light_onoff_brightness(),
     },
+    {
+        zigbeeModel: ['929003089301'],
+        model: '929003089301',
+        vendor: 'Philips',
+        description: 'Hue White and Color Ambiance Lucca wall light',
+        extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
+    },
     {
         zigbeeModel: ['1740293P0'],
         model: '1740293P0',
@@ -2372,7 +2379,7 @@ module.exports = [
         extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
     },
     {
-        zigbeeModel: ['5041131P9', '5041148P9'],
+        zigbeeModel: ['5041131P9', '5041148P9', '929003047301'],
         model: '5041131P9',
         vendor: 'Philips',
         description: 'Hue White ambiance Milliskin',
@@ -2955,4 +2962,18 @@ module.exports = [
             ...hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}).exposes],
         extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
     },
+    {
+        zigbeeModel: ['929003526301'],
+        model: '929003526301',
+        vendor: 'Philips',
+        description: 'Hue White & Color Ambiance Xamento M',
+        extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
+    },
+    {
+        zigbeeModel: ['LWE008'],
+        model: '929003021301',
+        vendor: 'Philips',
+        description: 'Hue White E17 470 lumen',
+        extend: hueExtend.light_onoff_brightness(),
+    },
 ];

package/devices/saswell.js

@@ -15,6 +15,7 @@ module.exports = [
             {modelID: 'w7cahqs', manufacturerName: '_TYST11_yw7cahqs'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_c88teujp'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_yw7cahqs'},
+            {modelID: 'aj4jz0i\u0000', manufacturerName: '_TYST11_caj4jz0i'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_azqp6ssj'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_zuhszj9s'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_9gvruqf5'},
@@ -22,12 +23,13 @@ module.exports = [
             {modelID: 'TS0601', manufacturerName: '_TZE200_0dvm9mva'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_h4cgnbzg'},
             {modelID: 'TS0601', manufacturerName: '_TZE200_exfrnlow'},
+            {modelID: 'TS0601', manufacturerName: '_TZE200_9m4kmbfu'},
         ],
         model: 'SEA801-Zigbee/SEA802-Zigbee',
         vendor: 'Saswell',
         description: 'Thermostatic radiator valve',
         whiteLabel: [{vendor: 'HiHome', model: 'WZB-TRVL'}, {vendor: 'Hama', model: '00176592'},
-            {vendor: 'RTX', model: 'ZB-RT1'}],
+            {vendor: 'RTX', model: 'ZB-RT1'}, {vendor: 'SETTI+', model: 'TRV001'}],
         fromZigbee: [fz.saswell_thermostat, fz.ignore_tuya_set_time, fz.ignore_basic_report, fz.legacy.tuya_thermostat_weekly_schedule],
         toZigbee: [tz.saswell_thermostat_current_heating_setpoint, tz.saswell_thermostat_mode, tz.saswell_thermostat_away,
             tz.saswell_thermostat_child_lock, tz.saswell_thermostat_window_detection, tz.saswell_thermostat_frost_detection,

package/devices/sinope.js

@@ -580,8 +580,8 @@ module.exports = [
             tzLocal.sinope_temperature_sensor],
         exposes: [
             exposes.climate()
-                .withSetpoint('occupied_heating_setpoint', 5, 30, 0.5)
-                .withSetpoint('unoccupied_heating_setpoint', 5, 30, 0.5)
+                .withSetpoint('occupied_heating_setpoint', 5, 36, 0.5)
+                .withSetpoint('unoccupied_heating_setpoint', 5, 36, 0.5)
                 .withLocalTemperature()
                 .withSystemMode(['off', 'heat'], ea.ALL, 'Mode of the thermostat')
                 .withPiHeatingDemand(ea.STATE_GET)
@@ -653,7 +653,7 @@ module.exports = [
             tzLocal.sinope_thermostat_main_cycle_output, tzLocal.sinope_thermostat_aux_cycle_output, tzLocal.sinope_pump_protection],
         exposes: [
             exposes.climate()
-                .withSetpoint('occupied_heating_setpoint', 5, 36, 1)
+                .withSetpoint('occupied_heating_setpoint', 5, 36, 0.5)
                 .withLocalTemperature()
                 .withSystemMode(['off', 'heat'])
                 .withRunningState(['idle', 'heat'])

package/devices/siterwell.js

@@ -34,9 +34,11 @@ module.exports = [
             {vendor: 'Nedis', description: 'Thermostatic Radiator Valve Controller', model: 'ZBHTR10WT'},
             {vendor: 'TCP Smart', description: 'Smart Thermostatic Radiator Valve', model: 'TBUWTRV'},
             {vendor: 'Brennenstuhl', description: 'Radiator Thermostat', model: 'HT CZ 01'}],
-        exposes: [e.child_lock(), e.window_detection(), e.battery(), e.valve_detection(), e.position(), exposes.climate()
-            .withSetpoint('current_heating_setpoint', 5, 30, 0.5, ea.STATE_SET).withLocalTemperature(ea.STATE)
-            .withSystemMode(['off', 'auto', 'heat'], ea.STATE_SET)
-            .withRunningState(['idle', 'heat'], ea.STATE)],
+        exposes: [e.child_lock(), e.window_detection(), e.battery(), e.valve_detection(),
+            e.position().withDescription('TRV valve position in %.'),
+            exposes.climate()
+                .withSetpoint('current_heating_setpoint', 5, 30, 0.5, ea.STATE_SET).withLocalTemperature(ea.STATE)
+                .withSystemMode(['off', 'auto', 'heat'], ea.STATE_SET)
+                .withRunningState(['idle', 'heat'], ea.STATE)],
     },
 ];

package/devices/smartthings.js

@@ -393,12 +393,11 @@ module.exports = [
         description: 'Water leak sensor (2018 model)',
         fromZigbee: [fz.temperature, fz.ias_water_leak_alarm_1, fz.battery, fz.ias_water_leak_alarm_1_report],
         toZigbee: [],
-        meta: {battery: {voltageToPercentage: '3V_2500'}},
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
             await reporting.bind(endpoint, coordinatorEndpoint, ['msTemperatureMeasurement', 'genPowerCfg']);
             await reporting.temperature(endpoint);
-            await reporting.batteryVoltage(endpoint);
+            await reporting.batteryPercentageRemaining(endpoint);
         },
         exposes: [e.temperature(), e.water_leak(), e.battery_low(), e.tamper(), e.battery()],
     },

package/devices/third_reality.js

@@ -102,12 +102,17 @@ module.exports = [
         model: '3RSP019BZ',
         vendor: 'Third Reality',
         description: 'Zigbee / BLE smart plug',
-        extend: extend.switch(),
+        fromZigbee: [fz.on_off, fz.electrical_measurement],
+        toZigbee: [tz.on_off],
         ota: ota.zigbeeOTA,
+        exposes: [e.switch(), e.power(), e.current(), e.voltage()],
         configure: async (device, coordinatorEndpoint, logger) => {
             const endpoint = device.getEndpoint(1);
-            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff']);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'haElectricalMeasurement']);
             await reporting.onOff(endpoint);
+            await reporting.activePower(endpoint);
+            await reporting.rmsCurrent(endpoint);
+            await reporting.rmsVoltage(endpoint);
         },
     },
     {

package/devices/tuya.js

@@ -2088,7 +2088,6 @@ module.exports = [
             '_TZE200_mudxchsu', /* model: 'TV05-ZG curve', vendor: 'TuYa' */
             '_TZE200_7yoranx2', /* model: 'TV01-ZB', vendor: 'Moes' */
             '_TZE200_kds0pmmv', /* model: 'TV01-ZB', vendor: 'Moes' */
-            '_TZE200_bvu2wnxz', /* model: 'ME167', vendor: 'Avatto' */
         ]),
         model: 'TV02-Zigbee',
         vendor: 'TuYa',
@@ -2157,7 +2156,7 @@ module.exports = [
                 [10, 'frost_protection', tuya.valueConverter.onOff],
                 [16, 'current_heating_setpoint', tuya.valueConverter.divideBy10],
                 [24, 'local_temperature', tuya.valueConverter.divideBy10],
-                [27, 'local_temperature_calibration', tuya.valueConverter.localTempCalibration],
+                [27, 'local_temperature_calibration', tuya.valueConverter.localTempCalibration1],
                 [31, 'working_day', tuya.valueConverterBasic.lookup({'mon_sun': tuya.enum(0), 'mon_fri+sat+sun': tuya.enum(1),
                     'separate': tuya.enum(2)})],
                 [32, 'holiday_temperature', tuya.valueConverter.divideBy10],
@@ -2207,7 +2206,7 @@ module.exports = [
                 [10, 'frost_protection', tuya.valueConverter.onOff],
                 [16, 'current_heating_setpoint', tuya.valueConverter.divideBy10],
                 [24, 'local_temperature', tuya.valueConverter.divideBy10],
-                [27, 'local_temperature_calibration', tuya.valueConverter.localTempCalibration],
+                [27, 'local_temperature_calibration', tuya.valueConverter.localTempCalibration1],
                 [35, 'battery_low', tuya.valueConverter.true0ElseFalse],
                 [40, 'child_lock', tuya.valueConverter.lockUnlock],
                 [45, 'error_status', tuya.valueConverter.raw],
@@ -2231,6 +2230,49 @@ module.exports = [
             ...tuya.exposes.scheduleAllDays(ea.STATE_SET, 'HH:MM/C HH:MM/C HH:MM/C HH:MM/C'),
         ],
     },
+    {
+        fingerprint: tuya.fingerprint('TS0601', [
+            '_TZE200_bvu2wnxz', /* model: 'ME167', vendor: 'Avatto' */
+        ]),
+        model: 'TS0601_thermostat_3',
+        vendor: 'TuYa',
+        description: 'Thermostatic radiator valve',
+        fromZigbee: [tuya.fzDataPoints],
+        toZigbee: [tuya.tzDataPoints],
+        whiteLabel: [{vendor: 'Avatto', model: 'ME167'}],
+        onEvent: tuya.onEventSetTime,
+        configure: tuya.configureMagicPacket,
+        exposes: [
+            e.child_lock(), e.battery_low(),
+            exposes.climate()
+                .withSetpoint('current_heating_setpoint', 5, 35, 1, ea.STATE_SET)
+                .withLocalTemperature(ea.STATE)
+                .withSystemMode(['auto', 'heat', 'off'], ea.STATE_SET)
+                .withRunningState(['idle', 'heat'], ea.STATE)
+                .withLocalTemperatureCalibration(-3, 3, 1, ea.STATE_SET),
+            exposes.binary('scale_protection', ea.STATE_SET, 'ON', 'OFF').withDescription('If the heat sink is not fully opened within ' +
+                'two weeks or is not used for a long time, the valve will be blocked due to silting up and the heat sink will not be ' +
+                'able to be used. To ensure normal use of the heat sink, the controller will automatically open the valve fully every ' +
+                'two weeks. It will run for 30 seconds per time with the screen displaying "Ad", then return to its normal working state ' +
+                'again.'),
+            exposes.binary('frost_protection', ea.STATE_SET, 'ON', 'OFF').withDescription('When the room temperature is lower than ' +
+                '5 °C, the valve opens; when the temperature rises to 8 °C, the valve closes.'),
+            exposes.numeric('error', ea.STATE).withDescription('If NTC is damaged, "Er" will be on the TRV display.'),
+        ],
+        meta: {
+            tuyaDatapoints: [
+                [2, 'system_mode', tuya.valueConverterBasic.lookup({'auto': tuya.enum(0), 'heat': tuya.enum(1), 'off': tuya.enum(2)})],
+                [3, 'running_state', tuya.valueConverterBasic.lookup({'heat': tuya.enum(0), 'idle': tuya.enum(1)})],
+                [4, 'current_heating_setpoint', tuya.valueConverter.divideBy10],
+                [5, 'local_temperature', tuya.valueConverter.divideBy10],
+                [7, 'child_lock', tuya.valueConverter.lockUnlock],
+                [35, null, tuya.valueConverter.errorOrBatteryLow],
+                [36, 'frost_protection', tuya.valueConverter.onOff],
+                [39, 'scale_protection', tuya.valueConverter.onOff],
+                [47, 'local_temperature_calibration', tuya.valueConverter.localTempCalibration2],
+            ],
+        },
+    },
     {
         fingerprint: [
             {modelID: 'v90ladg\u0000', manufacturerName: '_TYST11_wv90ladg'},
@@ -3211,7 +3253,7 @@ module.exports = [
         model: 'TS0046',
         vendor: 'TuYa',
         description: 'Wireless switch with 6 buttons',
-        whiteLabel: [{vendor: 'LoraTap', model: 'TS0046'}],
+        whiteLabel: [{vendor: 'LoraTap', model: 'SS9600ZB'}],
         fromZigbee: [fz.tuya_on_off_action, fz.battery],
         exposes: [e.battery(), e.action(['1_single', '1_double', '1_hold', '2_single', '2_double', '2_hold',
             '3_single', '3_double', '3_hold', '4_single', '4_double', '4_hold',

package/lib/tuya.js

@@ -1254,6 +1254,13 @@ const valueConverter = {
     divideBy10: valueConverterBasic.divideBy(10),
     divideBy1000: valueConverterBasic.divideBy(1000),
     raw: valueConverterBasic.raw(),
+    static: (value) => {
+        return {
+            from: (v) => {
+                return value;
+            },
+        };
+    },
     phaseVariant1: {
         from: (v) => {
             const buffer = Buffer.from(v, 'base64');
@@ -1295,7 +1302,7 @@ const valueConverter = {
     true0ElseFalse: {from: (v) => v === 0},
     selfTestResult: valueConverterBasic.lookup({'checking': 0, 'success': 1, 'failure': 2, 'others': 3}),
     lockUnlock: valueConverterBasic.lookup({'LOCK': true, 'UNLOCK': false}),
-    localTempCalibration: {
+    localTempCalibration1: {
         from: (v) => {
             if (v > 55) v -= 0x100000000;
             return v / 10;
@@ -1306,6 +1313,13 @@ const valueConverter = {
             return v;
         },
     },
+    localTempCalibration2: {
+        from: (v) => v,
+        to: (v) => {
+            if (v < 0) return v + 0x100000000;
+            return v;
+        },
+    },
     thermostatHolidayStartStop: {
         from: (v) => {
             const start = {
@@ -1462,6 +1476,13 @@ const valueConverter = {
     },
     inverse: {to: (v) => !v, from: (v) => !v},
     onOffNotStrict: {from: (v) => v ? 'ON' : 'OFF', to: (v) => v === 'ON'},
+    errorOrBatteryLow: {
+        from: (v) => {
+            if (v === 0) return {'battery_low': false};
+            if (v === 1) return {'battery_low': true};
+            return {'error': v};
+        },
+    },
 };
 
 const tuyaTz = {
@@ -1521,6 +1542,7 @@ const tuyaTz = {
             'holiday_start_stop', 'holiday_temperature', 'comfort_temperature', 'eco_temperature', 'working_day',
             'week_schedule_programming', 'online', 'holiday_mode_date', 'schedule', 'schedule_monday', 'schedule_tuesday',
             'schedule_wednesday', 'schedule_thursday', 'schedule_friday', 'schedule_saturday', 'schedule_sunday', 'clear_fault',
+            'scale_protection', 'error',
         ],
         convertSet: async (entity, key, value, meta) => {
             // A set converter is only called once; therefore we need to loop

package/package.json

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