zigbee-herdsman-converters 21.15.0 → 21.17.0

package/devices/tuya.js

@@ -1073,6 +1073,7 @@ const definitions = [
             '_TZE200_cirvgep4',
             '_TZE200_upagmta9',
             '_TZE204_yjjdcqsq',
+            '_TZE204_jygvp6fk',
             '_TZE204_cirvgep4',
         ]),
         model: 'TS0601_temperature_humidity_sensor_2',
@@ -2409,7 +2410,7 @@ const definitions = [
             },
         ],
         model: 'ZDMS16-1',
-        vendor: 'Avatto',
+        vendor: 'AVATTO',
         description: 'Zigbee 1 channel Dimmer',
         fromZigbee: [tuya.fz.datapoints],
         toZigbee: [tuya.tz.datapoints],
@@ -2444,7 +2445,7 @@ const definitions = [
             },
         ],
         model: 'ZDMS16-2',
-        vendor: 'Avatto',
+        vendor: 'AVATTO',
         description: 'Zigbee 2 channels Dimmer',
         fromZigbee: [tuya.fz.datapoints],
         toZigbee: [tuya.tz.datapoints],
@@ -3090,6 +3091,7 @@ const definitions = [
             { vendor: 'BlitzWolf', model: 'BW-IS4' },
             tuya.whitelabel('Tuya', 'TS0201_1', 'Zigbee 3.0 temperature humidity sensor with display', ['_TZ3210_alxkwn0h']),
             tuya.whitelabel('Tuya', 'ZTH01/ZTH02', 'Temperature and humidity sensor', ['_TZ3000_0s1izerx']),
+            tuya.whitelabel('Tuya', 'ZY-ZTH02', 'Temperature and humidity sensor', ['_TZ3000_v1w2k9dd']),
             tuya.whitelabel('SEDEA', 'eTH730', 'Temperature and humidity sensor', ['_TZ3000_lqmvrwa2']),
             tuya.whitelabel('Danfoss', '014G2480', 'Temperature and humidity sensor', ['_TZ3000_mxzo5rhf']),
         ],
@@ -4054,6 +4056,8 @@ const definitions = [
             { modelID: 'TS0601', manufacturerName: '_TZE200_2odrmqwq' },
             { modelID: 'TS0601', manufacturerName: '_TZE204_lh3arisb' },
             { modelID: 'TS0601', manufacturerName: '_TZE284_udank5zs' },
+            { modelID: 'TS0601', manufacturerName: '_TZE200_7shyddj3' },
+            { modelID: 'TS0601', manufacturerName: '_TZE204_a2jcoyuk' },
         ],
         model: 'TS0601_cover_1',
         vendor: 'Tuya',
@@ -4942,7 +4946,7 @@ const definitions = [
         description: 'Thermostatic radiator valve',
         whiteLabel: [
             tuya.whitelabel('id3', 'GTZ06', 'Thermostatic radiator valve', ['_TZE200_z1tyspqw']),
-            tuya.whitelabel('Avatto', 'TRV07', 'Thermostatic radiator valve', ['_TZE200_bvrlmajk']),
+            tuya.whitelabel('AVATTO', 'TRV07', 'Thermostatic radiator valve', ['_TZE200_bvrlmajk']),
         ],
         onEvent: tuya.onEventSetLocalTime,
         fromZigbee: [tuya.fz.datapoints],
@@ -6590,7 +6594,7 @@ const definitions = [
         whiteLabel: [
             tuya.whitelabel('Tuya', 'DS-111', 'Smart light switch - 4 gang with neutral wire', ['_TZ3000_mdj7kra9']),
             tuya.whitelabel('MHCOZY', 'TYWB 4ch-RF', '4 channel relay', ['_TZ3000_u3oupgdy', '_TZ3000_imaccztn']),
-            tuya.whitelabel('Avatto', 'TS0004_1', 'Smart light switch - 4 gang with neutral wire', ['_TZ3000_nivavasg', '_TZ3000_gexniqbq']),
+            tuya.whitelabel('AVATTO', 'TS0004_1', 'Smart light switch - 4 gang with neutral wire', ['_TZ3000_nivavasg', '_TZ3000_gexniqbq']),
         ],
         meta: { multiEndpoint: true },
         configure: async (device, coordinatorEndpoint) => {
@@ -6944,7 +6948,7 @@ const definitions = [
         fingerprint: tuya.fingerprint('TS0601', ['_TZE200_viy9ihs7', '_TZE204_lzriup1j', '_TZE204_xnbkhhdr']),
         model: 'ZWT198/ZWT100-BH',
         vendor: 'Tuya',
-        description: 'Avatto wall thermostat',
+        description: 'Wall thermostat',
         onEvent: tuya.onEvent({ timeStart: '1970', respondToMcuVersionResponse: false }),
         fromZigbee: [tuya.fz.datapoints],
         toZigbee: [tuya.tz.datapoints],
@@ -7164,6 +7168,7 @@ const definitions = [
         fingerprint: [
             { modelID: 'TS0222', manufacturerName: '_TYZB01_4mdqxxnn' },
             { modelID: 'TS0222', manufacturerName: '_TYZB01_m6ec2pgj' },
+            { modelID: 'TS0222', manufacturerName: '_TZ3000_do6txrcw' },
         ],
         model: 'TS0222',
         vendor: 'Tuya',
@@ -8057,7 +8062,7 @@ const definitions = [
         whiteLabel: [tuya.whitelabel('iHseno', 'TY_24G_Sensor_V2', 'Human presence sensor 24G', ['_TZE204_ztqnh5cg'])],
     },
     {
-        fingerprint: tuya.fingerprint('TS0601', ['_TZE204_laokfqwu']),
+        fingerprint: tuya.fingerprint('TS0601', ['_TZE204_laokfqwu', '_TZE200_clrdrnya']),
         model: 'WZ-M100',
         vendor: 'Wenzhi',
         description: 'Human presence sensor',
@@ -8633,7 +8638,7 @@ const definitions = [
                 .withValueStep(0.01)
                 .withUnit('m')
                 .withDescription('Motion detection distance'),
-            e.enum('motion_state', ea.STATE, ['none', 'small', 'medium', 'large']).withDescription('State of the motion'),
+            e.enum('motion_state', ea.STATE, ['none', 'small', 'medium', 'large', 'mini', 'micro']).withDescription('State of the motion'),
             e
                 .numeric('fading_time', ea.STATE_SET)
                 .withValueMin(0)
@@ -8679,7 +8684,14 @@ const definitions = [
                 [
                     101,
                     'motion_state',
-                    tuya.valueConverterBasic.lookup({ none: tuya.enum(0), large: tuya.enum(1), medium: tuya.enum(2), small: tuya.enum(3) }),
+                    tuya.valueConverterBasic.lookup({
+                        none: tuya.enum(0),
+                        large: tuya.enum(1),
+                        medium: tuya.enum(2),
+                        small: tuya.enum(3),
+                        mini: tuya.enum(4),
+                        micro: tuya.enum(5),
+                    }),
                 ],
                 [102, 'fading_time', tuya.valueConverter.raw],
                 [104, 'medium_motion_detection_distance', tuya.valueConverter.divideBy100],
@@ -9573,6 +9585,99 @@ const definitions = [
             ],
         },
     },
+    {
+        fingerprint: [{ modelID: 'TS0601', manufacturerName: '_TZE204_dhotiauw' }],
+        model: '2CT',
+        vendor: 'Tuya',
+        description: 'Bidirectional energy meter with 80A current clamp',
+        extend: [tuyaBase({ dp: true })],
+        exposes: [
+            e.ac_frequency(),
+            e.voltage(),
+            tuya.exposes.powerWithPhase('a'),
+            tuya.exposes.powerWithPhase('b'),
+            tuya.exposes.currentWithPhase('a'),
+            tuya.exposes.currentWithPhase('b'),
+            tuya.exposes.powerFactorWithPhase('a'),
+            tuya.exposes.powerFactorWithPhase('b'),
+            tuya.exposes.energyWithPhase('a'),
+            tuya.exposes.energyWithPhase('b'),
+            e
+                .numeric('update_frequency', ea.STATE_SET)
+                .withUnit('s')
+                .withDescription('Update frequency')
+                .withValueMin(3)
+                .withValueMax(60)
+                .withPreset('default', 10, 'Default value'),
+            e.numeric('timestamp_a', ea.STATE).withDescription('Timestamp at power measure (phase a)'),
+            e.numeric('timestamp_b', ea.STATE).withDescription('Timestamp at power measure (phase b)'),
+            e
+                .numeric('calibration_ac_frequency', ea.STATE_SET)
+                .withDescription('Calibration AC frequency')
+                .withValueMin(0.5)
+                .withValueMax(1.5)
+                .withValueStep(0.01)
+                .withPreset('default', 1.0, 'Default value'),
+            e
+                .numeric('calibration_voltage', ea.STATE_SET)
+                .withDescription('Calibration voltage')
+                .withValueMin(0.5)
+                .withValueMax(1.5)
+                .withValueStep(0.01)
+                .withPreset('default', 1.0, 'Default value'),
+            e
+                .numeric('calibration_power_a', ea.STATE_SET)
+                .withDescription('Calibration power A')
+                .withValueMin(0.5)
+                .withValueMax(1.5)
+                .withValueStep(0.01)
+                .withPreset('default', 1.0, 'Default value'),
+            e
+                .numeric('calibration_current_a', ea.STATE_SET)
+                .withDescription('Calibration current A')
+                .withValueMin(0.5)
+                .withValueMax(1.5)
+                .withValueStep(0.01)
+                .withPreset('default', 1.0, 'Default value'),
+            e
+                .numeric('calibration_power_b', ea.STATE_SET)
+                .withDescription('Calibration power B')
+                .withValueMin(0.5)
+                .withValueMax(1.5)
+                .withValueStep(0.01)
+                .withPreset('default', 1.0, 'Default value'),
+            e
+                .numeric('calibration_current_b', ea.STATE_SET)
+                .withDescription('Calibration current B')
+                .withValueMin(0.5)
+                .withValueMax(1.5)
+                .withValueStep(0.01)
+                .withPreset('default', 1.0, 'Default value'),
+        ],
+        meta: {
+            multiEndpointSkip: ['power_factor', 'power_factor_phase_a', 'power_factor_phase_b', 'energy'],
+            tuyaDatapoints: [
+                [105, 'ac_frequency', tuya.valueConverter.divideBy100],
+                [103, 'power_a', tuya.valueConverter.divideBy10],
+                [104, 'power_b', tuya.valueConverter.divideBy10],
+                [19, 'power', tuya.valueConverter.divideBy10],
+                [20, 'voltage', tuya.valueConverter.divideBy10],
+                [101, 'current_a', tuya.valueConverter.divideBy1000],
+                [102, 'current_b', tuya.valueConverter.divideBy1000],
+                [120, 'power_factor_a', tuya.valueConverter.raw],
+                [121, 'power_factor_b', tuya.valueConverter.raw],
+                [115, 'energy_a', tuya.valueConverter.divideBy100],
+                [117, 'energy_b', tuya.valueConverter.divideBy100],
+                [122, 'update_frequency', tuya.valueConverter.raw],
+                [123, 'calibration_voltage', tuya.valueConverter.divideBy1000],
+                [125, 'calibration_current_a', tuya.valueConverter.divideBy1000],
+                [126, 'calibration_power_a', tuya.valueConverter.divideBy1000],
+                [130, 'calibration_current_b', tuya.valueConverter.divideBy1000],
+                [131, 'calibration_power_b', tuya.valueConverter.divideBy1000],
+                [124, 'calibration_ac_frequency', tuya.valueConverter.divideBy1000],
+            ],
+        },
+    },
     {
         fingerprint: [
             { modelID: 'TS0601', manufacturerName: '_TZE200_iwn0gpzz' },
@@ -11979,7 +12084,6 @@ const definitions = [
                 .withValueStep(1)
                 .withUnit('°C')
                 .withDescription('Max temperature in ECO mode. Default: 20'),
-            e.binary('valve_state', ea.STATE, false, true).withLabel('Heating in process'),
             e
                 .climate()
                 .withSystemMode(['off', 'heat'], ea.STATE_SET)
@@ -11987,7 +12091,8 @@ const definitions = [
                 .withSetpoint('current_heating_setpoint', 5, 35, 0.5, ea.STATE_SET)
                 .withLocalTemperature(ea.STATE)
                 .withLocalTemperatureCalibration(-9, 9, 1, ea.STATE_SET)
-                .withDescription('Default: -3'),
+                .withDescription('Default: -3')
+                .withRunningState(['idle', 'heat'], ea.STATE),
             e
                 .numeric('deadzone_temperature', ea.STATE_SET)
                 .withValueMin(1)
@@ -12079,7 +12184,7 @@ const definitions = [
                 [26, 'min_temperature', tuya.valueConverter.divideBy10],
                 [27, 'local_temperature_calibration', tuya.valueConverter.raw],
                 [28, 'factory_reset', tuya.valueConverterBasic.lookup({ factory_reset: true })],
-                [36, 'valve_state', tuya.valueConverter.trueFalseInvert],
+                [36, 'running_state', tuya.valueConverterBasic.lookup({ idle: tuya.enum(1), heat: tuya.enum(0) })],
                 [39, 'child_lock', tuya.valueConverterBasic.lookup({ ON: true, OFF: false })],
                 [40, 'eco_mode', tuya.valueConverterBasic.lookup({ ON: true, OFF: false })],
                 [43, 'sensor', tuya.valueConverterBasic.lookup({ IN: tuya.enum(0), OU: tuya.enum(2), AL: tuya.enum(1) })],