zigbee-herdsman-converters 20.12.1 → 20.14.0

package/devices/tuya.js

@@ -139,7 +139,7 @@ const storeLocal = {
                     // Only publish if the set is complete otherwise discard everything.
                     if (sign !== null && power !== null && current !== null && powerFactor !== null) {
                         const signedPowerKey = 'signed_power_' + channel;
-                        const signedPower = options.hasOwnProperty(signedPowerKey) ? options[signedPowerKey] : false;
+                        const signedPower = options[signedPowerKey] !== undefined ? options[signedPowerKey] : false;
                         if (signedPower) {
                             result['power_' + channel] = sign * power;
                             result['energy_flow_' + channel] = 'sign';
@@ -197,7 +197,7 @@ const convLocal = {
                 const result = {};
                 priv['sign_' + channel] = v == 1 ? -1 : +1;
                 const lateEnergyFlowKey = 'late_energy_flow_' + channel;
-                const lateEnergyFlow = options.hasOwnProperty(lateEnergyFlowKey) ? options[lateEnergyFlowKey] : false;
+                const lateEnergyFlow = options[lateEnergyFlowKey] !== undefined ? options[lateEnergyFlowKey] : false;
                 if (lateEnergyFlow) {
                     priv.flush(result, channel, options);
                 }
@@ -241,7 +241,7 @@ const convLocal = {
                 const result = {};
                 priv['power_factor_' + channel] = v;
                 const lateEnergyFlowKey = 'late_energy_flow_' + channel;
-                const lateEnergyFlow = options.hasOwnProperty(lateEnergyFlowKey) ? options[lateEnergyFlowKey] : false;
+                const lateEnergyFlow = options[lateEnergyFlowKey] !== undefined ? options[lateEnergyFlowKey] : false;
                 if (!lateEnergyFlow) {
                     priv.flush(result, channel, options);
                 }
@@ -316,9 +316,9 @@ const tzLocal = {
                     // Load current state or defaults
                     const newSettings = {
                         brightness: meta.state.brightness ?? 254, //      full brightness
-                        // @ts-expect-error
+                        // @ts-expect-error ignore
                         hue: (meta.state.color ?? {}).hue ?? 0, //          red
-                        // @ts-expect-error
+                        // @ts-expect-error ignore
                         saturation: (meta.state.color ?? {}).saturation ?? 100, // full saturation
                     };
                     // Apply changes
@@ -522,7 +522,7 @@ const fzLocal = {
     TS0222_humidity: {
         ...fromZigbee_1.default.humidity,
         convert: async (model, msg, publish, options, meta) => {
-            const result = await fromZigbee_1.default.humidity.convert(model, msg, publish, options, meta);
+            const result = fromZigbee_1.default.humidity.convert(model, msg, publish, options, meta);
             if (result)
                 result.humidity *= 10;
             return result;
@@ -581,7 +581,7 @@ const fzLocal = {
         type: ['attributeReport', 'readResponse'],
         convert: (model, msg, publish, options, meta) => {
             const result = {};
-            if (msg.data.hasOwnProperty('57355')) {
+            if (msg.data['57355'] !== undefined) {
                 result.temperature_unit = utils.getFromLookup(msg.data['57355'], { '0': 'celsius', '1': 'fahrenheit' });
             }
             return result;
@@ -590,7 +590,7 @@ const fzLocal = {
     TS011F_electrical_measurement: {
         ...fromZigbee_1.default.electrical_measurement,
         convert: async (model, msg, publish, options, meta) => {
-            const result = (await fromZigbee_1.default.electrical_measurement.convert(model, msg, publish, options, meta)) ?? {};
+            const result = fromZigbee_1.default.electrical_measurement.convert(model, msg, publish, options, meta) ?? {};
             const lookup = { power: 'activePower', current: 'rmsCurrent', voltage: 'rmsVoltage' };
             // Wait 5 seconds before reporting a 0 value as this could be an invalid measurement.
             // https://github.com/Koenkk/zigbee2mqtt/issues/16709#issuecomment-1509599046
@@ -644,12 +644,16 @@ const fzLocal = {
             const data = msg.data.slice(3);
             if (command == 0xe6) {
                 const value = splitToAttributes(data);
-                return {
-                    temperature_threshold: value[0x05][1],
-                    temperature_breaker: lookup[value[0x05][0]],
-                    power_threshold: value[0x07][1],
-                    power_breaker: lookup[value[0x07][0]],
-                };
+                const result = {};
+                if (0x05 in value) {
+                    result.temperature_threshold = value[0x05][1];
+                    result.temperature_breaker = lookup[value[0x05][0]];
+                }
+                if (0x07 in value) {
+                    result.power_threshold = value[0x07][1];
+                    result.power_breaker = lookup[value[0x07][0]];
+                }
+                return result;
             }
             if (command == 0xe7) {
                 const value = splitToAttributes(data);
@@ -871,7 +875,7 @@ const definitions = [
                 await reporting.batteryPercentageRemaining(endpoint);
                 await reporting.batteryVoltage(endpoint);
             }
-            catch (error) {
+            catch {
                 /* Fails for some*/
             }
         },
@@ -927,10 +931,7 @@ const definitions = [
                 [10, 'battery', tuya.valueConverter.raw],
             ],
         },
-        whiteLabel: [
-            tuya.whitelabel('Linkoze', 'LKWSZ211', 'Wireless switch (2-key)', ['_TZ3210_3ulg9kpo']),
-            tuya.whitelabel('Adaprox', 'LKWSZ211', 'Remote wireless switch (2-key)', ['_TZ3210_3ulg9kpo']),
-        ],
+        whiteLabel: [tuya.whitelabel('Linkoze', 'LKWSZ211', 'Wireless switch (2-key)', ['_TZ3210_3ulg9kpo'])],
     },
     {
         fingerprint: [
@@ -1735,7 +1736,7 @@ const definitions = [
                 await reporting.batteryPercentageRemaining(endpoint);
                 await reporting.batteryVoltage(endpoint);
             }
-            catch (error) {
+            catch {
                 /* Fails for some https://github.com/Koenkk/zigbee2mqtt/issues/13708 */
             }
         },
@@ -1874,7 +1875,7 @@ const definitions = [
             e.illuminance().withUnit('lx'),
             e.numeric('illuminance_average_20min', ea.STATE).withUnit('lx').withDescription('Illuminance average for the last 20 minutes'),
             e.numeric('illuminance_maximum_today', ea.STATE).withUnit('lx').withDescription('Illuminance maximum for the last 24 hours'),
-            e.binary('cleaning_reminder', ea.STATE, 'ON', 'OFF').withDescription('Cleaning reminder'),
+            e.binary('cleaning_reminder', ea.STATE, true, false).withDescription('Cleaning reminder'),
             e.numeric('rain_intensity', ea.STATE).withUnit('mV').withDescription('Rainfall intensity'),
         ],
         meta: {
@@ -2520,7 +2521,7 @@ const definitions = [
                 e.binary('motor_reversal', ea.ALL, 'ON', 'OFF'),
                 e.numeric('calibration_time', ea.STATE).withUnit('s').withDescription('Calibration time'),
             ];
-            if (!device || device.manufacturerName !== ('_TZ3210_xbpt8ewc' || '_TZ3000_1dd0d5yi')) {
+            if (device?.manufacturerName !== '_TZ3210_xbpt8ewc' && device?.manufacturerName !== '_TZ3000_1dd0d5yi') {
                 exps.push(tuya.exposes.indicatorMode(), tuya.exposes.backlightModeOffOn());
             }
             exps.push(e.linkquality());
@@ -3243,7 +3244,7 @@ const definitions = [
             try {
                 await endpoint.read(0xe001, [0xd011]);
             }
-            catch (err) {
+            catch {
                 /* do nothing */
             }
             await endpoint.read('genPowerCfg', ['batteryVoltage', 'batteryPercentageRemaining']);
@@ -3305,7 +3306,7 @@ const definitions = [
             try {
                 await endpoint.read(0xe001, [0xd011]);
             }
-            catch (err) {
+            catch {
                 /* do nothing */
             }
             await endpoint.read('genPowerCfg', ['batteryVoltage', 'batteryPercentageRemaining']);
@@ -3686,8 +3687,8 @@ const definitions = [
             tuya.whitelabel('AVATTO', 'ZWSM16-2-Zigbee', '2 gang switch module', ['_TZ3000_mtnpt6ws']),
             tuya.whitelabel('PSMART', 'T442', '2 gang switch module', ['_TZ3000_mufwv0ry']),
             tuya.whitelabel('Lonsonho', 'X702A', '2 gang switch with backlight', ['_TZ3000_54hjn4vs', '_TZ3000_aa5t61rh']),
-            tuya.whitelabel('Homeetec', '37022463', '2 Gang switch with backlight', ['_TZ3000_in5qxhtt']),
-            tuya.whitelabel('RoomsAI', '37022463', '2 Gang switch with backlight', ['_TZ3000_ogpla3lh']),
+            tuya.whitelabel('Homeetec', '37022463-1', '2 Gang switch with backlight', ['_TZ3000_in5qxhtt']),
+            tuya.whitelabel('RoomsAI', '37022463-2', '2 Gang switch with backlight', ['_TZ3000_ogpla3lh']),
         ],
     },
     {
@@ -4105,6 +4106,7 @@ const definitions = [
             { modelID: 'TS0601', manufacturerName: '_TZE200_7fqkphoq' }, // AFINTEK
             { modelID: 'TS0601', manufacturerName: '_TZE200_rufdtfyv' },
             { modelID: 'TS0601', manufacturerName: '_TZE200_lpwgshtl' },
+            { modelID: 'TS0601', manufacturerName: '_TZE200_rk1wojce' }, // Emos P5630S
         ],
         model: 'TS0601_thermostat',
         vendor: 'Tuya',
@@ -4117,6 +4119,7 @@ const definitions = [
             { vendor: 'Immax', model: '07732B' },
             tuya.whitelabel('Immax', '07732L', 'Radiator valve with thermostat', ['_TZE200_rufdtfyv']),
             { vendor: 'Evolveo', model: 'Heat M30' },
+            tuya.whitelabel('Emos', 'P5630S', 'Radiator valve with thermostat', ['_TZE200_rk1wojce']),
         ],
         meta: { tuyaThermostatPreset: legacy.thermostatPresets, tuyaThermostatSystemMode: legacy.thermostatSystemModes3 },
         ota: ota.zigbeeOTA,
@@ -5003,7 +5006,7 @@ const definitions = [
                 await reporting.rmsCurrent(endpoint, { change: 50 });
                 await reporting.activePower(endpoint, { change: 10 });
             }
-            catch (error) {
+            catch {
                 /* fails for some https://github.com/Koenkk/zigbee2mqtt/issues/11179
                                 and https://github.com/Koenkk/zigbee2mqtt/issues/16864 */
             }
@@ -5866,7 +5869,7 @@ const definitions = [
                     await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff']);
                 }
             }
-            catch (e) {
+            catch {
                 // Fails for some: https://github.com/Koenkk/zigbee2mqtt/issues/4872
             }
             device.powerSource = 'Mains (single phase)';
@@ -5899,7 +5902,7 @@ const definitions = [
                     await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff']);
                 }
             }
-            catch (e) {
+            catch {
                 // Fails for some: https://github.com/Koenkk/zigbee2mqtt/issues/4872
             }
             device.powerSource = 'Mains (single phase)';
@@ -5930,7 +5933,7 @@ const definitions = [
                     await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff']);
                 }
             }
-            catch (e) {
+            catch {
                 // Fails for some: https://github.com/Koenkk/zigbee2mqtt/issues/4872
             }
             device.powerSource = 'Mains (single phase)';
@@ -6343,7 +6346,7 @@ const definitions = [
                             return { auto: tuya.enum(1), manual: tuya.enum(0), temporary_manual: tuya.enum(2) };
                         }
                         else {
-                            return { manual: tuya.enum(0), auto: tuya.enum(1), temporary_manual: tuya.enum(2) };
+                            return { auto: tuya.enum(0), manual: tuya.enum(1), temporary_manual: tuya.enum(2) };
                         }
                     }),
                 ],
@@ -6848,7 +6851,7 @@ const definitions = [
             try {
                 await endpoint.read(0xe001, [0xd011]);
             }
-            catch (err) {
+            catch {
                 /* do nothing */
             }
             await endpoint.read('genPowerCfg', ['batteryVoltage', 'batteryPercentageRemaining']);
@@ -6944,7 +6947,7 @@ const definitions = [
             try {
                 await endpoint.read(0xe001, [0xd011]);
             }
-            catch (err) {
+            catch {
                 /* do nothing */
             }
             await endpoint.read('genPowerCfg', ['batteryVoltage', 'batteryPercentageRemaining']);
@@ -8278,15 +8281,15 @@ const definitions = [
                     .withValueMax(100)
                     .withValueStep(1)
                     .withUnit('*C')
-                    .withDescription('High temperature threshold'), e.binary('temperature_breaker', ea.STATE_SET, 'ON', 'OFF').withDescription('High temperature breaker'), e
-                    .numeric('power_threshold', ea.STATE_SET)
-                    .withValueMin(1)
-                    .withValueMax(26)
-                    .withValueStep(1)
-                    .withUnit('kW')
-                    .withDescription('High power threshold'), e.binary('power_breaker', ea.STATE_SET, 'ON', 'OFF').withDescription('High power breaker'));
+                    .withDescription('High temperature threshold'), e.binary('temperature_breaker', ea.STATE_SET, 'ON', 'OFF').withDescription('High temperature breaker'));
             }
             exposes.push(e
+                .numeric('power_threshold', ea.STATE_SET)
+                .withValueMin(1)
+                .withValueMax(26)
+                .withValueStep(1)
+                .withUnit('kW')
+                .withDescription('High power threshold'), e.binary('power_breaker', ea.STATE_SET, 'ON', 'OFF').withDescription('High power breaker'), e
                 .numeric('over_current_threshold', ea.STATE_SET)
                 .withValueMin(1)
                 .withValueMax(64)
@@ -11325,7 +11328,10 @@ const definitions = [
         },
     },
     {
-        fingerprint: tuya.fingerprint('TS0601', ['_TZE204_fhvdgeuh']),
+        fingerprint: [
+            { modelID: 'TS0601', manufacturerName: '_TZE204_fhvdgeuh' },
+            { modelID: 'TS0601', manufacturerName: '_TZE200_abatw3kj' },
+        ],
         model: 'TS0601_din_4',
         vendor: 'Tuya',
         description: 'Din rail switch with power monitoring and threshold settings',
@@ -11336,6 +11342,7 @@ const definitions = [
             // Required to get the device to start reporting
             await device.getEndpoint(1).command('manuSpecificTuya', 'dataQuery', {});
         },
+        whiteLabel: [tuya.whitelabel('RTX', 'TS0601_RTX_DIN', 'Din rail switch', ['_TZE200_abatw3kj'])],
         exposes: [
             e.switch().setAccess('state', ea.STATE_SET),
             e.power(),