zigbee-herdsman-converters 14.0.669 → 14.0.670

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/devices/acova.js CHANGED
@@ -5,7 +5,7 @@ const reporting = require('../lib/reporting');
5
5
 
6
6
  module.exports = [
7
7
  {
8
- zigbeeModel: ['PERCALE2 D1.00P1.01Z1.00', 'PERCALE2 D1.00P1.02Z1.00'],
8
+ zigbeeModel: ['PERCALE2 D1.00P1.01Z1.00', 'PERCALE2 D1.00P1.02Z1.00', 'PERCALE2 D1.00P1.03Z1.00'],
9
9
  model: 'PERCALE2',
10
10
  vendor: 'Acova',
11
11
  description: 'Percale 2 heater',
@@ -21,6 +21,7 @@ module.exports = [
21
21
  exposes: [
22
22
  exposes.climate()
23
23
  .withSetpoint('occupied_heating_setpoint', 7, 28, 0.5)
24
+ .withSetpoint('unoccupied_heating_setpoint', 7, 28, 0.5)
24
25
  .withLocalTemperature()
25
26
  .withSystemMode(['off', 'heat', 'auto'])
26
27
  .withRunningState(['idle', 'heat']),
@@ -50,6 +51,7 @@ module.exports = [
50
51
  exposes: [
51
52
  exposes.climate()
52
53
  .withSetpoint('occupied_heating_setpoint', 7, 28, 0.5)
54
+ .withSetpoint('unoccupied_heating_setpoint', 7, 28, 0.5)
53
55
  .withLocalTemperature()
54
56
  .withSystemMode(['off', 'heat', 'auto'])
55
57
  .withRunningState(['idle', 'heat']),
@@ -81,6 +83,7 @@ module.exports = [
81
83
  exposes: [
82
84
  exposes.climate()
83
85
  .withSetpoint('occupied_heating_setpoint', 7, 28, 0.5)
86
+ .withSetpoint('unoccupied_heating_setpoint', 7, 28, 0.5)
84
87
  .withLocalTemperature()
85
88
  .withSystemMode(['off', 'heat', 'auto'])
86
89
  .withRunningState(['idle', 'heat']),
package/devices/bosch.js CHANGED
@@ -1,5 +1,6 @@
1
1
  const exposes = require('../lib/exposes');
2
- const fz = {...require('../converters/fromZigbee'), legacy: require('../lib/legacy').fromZigbee};
2
+ const fz = require('../converters/fromZigbee');
3
+ const tz = require('../converters/toZigbee');
3
4
  const reporting = require('../lib/reporting');
4
5
  const e = exposes.presets;
5
6
 
@@ -38,4 +39,26 @@ module.exports = [
38
39
  },
39
40
  exposes: [e.temperature(), e.battery(), e.occupancy(), e.battery_low(), e.tamper()],
40
41
  },
42
+ {
43
+ zigbeeModel: ['RBSH-TRV0-ZB-EU'],
44
+ model: 'BTH-RA',
45
+ vendor: 'Bosch',
46
+ description: 'Radiator thermostat II',
47
+ fromZigbee: [fz.thermostat, fz.battery],
48
+ toZigbee: [tz.thermostat_occupied_heating_setpoint, tz.thermostat_local_temperature_calibration, tz.thermostat_local_temperature],
49
+ exposes: [
50
+ e.battery(),
51
+ exposes.climate()
52
+ .withSetpoint('occupied_heating_setpoint', 5, 30, 0.5)
53
+ .withLocalTemperature()
54
+ .withLocalTemperatureCalibration(-30, 30, 0.1),
55
+ ],
56
+ configure: async (device, coordinatorEndpoint, logger) => {
57
+ const endpoint = device.getEndpoint(1);
58
+ await reporting.bind(endpoint, coordinatorEndpoint, ['genPowerCfg', 'hvacThermostat']);
59
+ await reporting.thermostatOccupiedHeatingSetpoint(endpoint);
60
+ await reporting.thermostatTemperature(endpoint);
61
+ await reporting.batteryPercentageRemaining(endpoint);
62
+ },
63
+ },
41
64
  ];
package/devices/datek.js CHANGED
@@ -84,6 +84,15 @@ module.exports = [
84
84
  exposes: [e.power(), e.energy(), e.current(), e.voltage(), e.current_phase_b(), e.voltage_phase_b(), e.current_phase_c(),
85
85
  e.voltage_phase_c(), e.temperature()],
86
86
  },
87
+ {
88
+ fingerprint: [{modelID: 'Motion Sensor', manufacturerName: 'Eva'}],
89
+ model: 'HSE2927E',
90
+ vendor: 'Datek',
91
+ description: 'Eva Zigbee motion sensor',
92
+ fromZigbee: [fz.ias_occupancy_alarm_1, fz.ias_occupancy_alarm_1_with_timeout, fz.illuminance, fz.temperature],
93
+ toZigbee: [],
94
+ exposes: [e.occupancy(), e.battery_low(), e.tamper(), e.illuminance(), e.illuminance_lux(), e.temperature()],
95
+ },
87
96
  {
88
97
  zigbeeModel: ['ID Lock 150'],
89
98
  model: '0402946',
@@ -49,7 +49,7 @@ const develco = {
49
49
  },
50
50
  },
51
51
  fz: {
52
- // SPLZB-134 and SPLZB-131 reports strange values sometimes
52
+ // Some Develco devices report strange values sometimes
53
53
  // https://github.com/Koenkk/zigbee2mqtt/issues/13329
54
54
  electrical_measurement: {
55
55
  ...fz.electrical_measurement,
@@ -67,6 +67,14 @@ const develco = {
67
67
  }
68
68
  },
69
69
  },
70
+ temperature: {
71
+ ...fz.temperature,
72
+ convert: (model, msg, publish, options, meta) => {
73
+ if (msg.data.measuredValue !== -0x8000 && msg.data.measuredValue !== 0xFFFF) {
74
+ return fz.temperature.convert(model, msg, publish, options, meta);
75
+ }
76
+ },
77
+ },
70
78
  metering: {
71
79
  ...fz.metering,
72
80
  convert: (model, msg, publish, options, meta) => {
@@ -299,7 +307,7 @@ module.exports = [
299
307
  model: 'SPLZB-132',
300
308
  vendor: 'Develco',
301
309
  description: 'Power plug',
302
- fromZigbee: [fz.on_off, fz.electrical_measurement, fz.metering, fz.device_temperature],
310
+ fromZigbee: [fz.on_off, develco.fz.electrical_measurement, develco.fz.metering, develco.fz.device_temperature],
303
311
  toZigbee: [tz.on_off],
304
312
  exposes: [e.switch(), e.power(), e.current(), e.voltage(), e.energy(), e.device_temperature(), e.ac_frequency()],
305
313
  options: [exposes.options.precision(`ac_frequency`)],
@@ -352,7 +360,7 @@ module.exports = [
352
360
  model: 'SMRZB-143',
353
361
  vendor: 'Develco',
354
362
  description: 'Smart cable',
355
- fromZigbee: [fz.on_off, fz.electrical_measurement, fz.metering, fz.device_temperature],
363
+ fromZigbee: [fz.on_off, develco.fz.electrical_measurement, develco.fz.metering, develco.fz.device_temperature],
356
364
  toZigbee: [tz.on_off],
357
365
  exposes: [e.switch(), e.power(), e.current(), e.voltage(), e.energy(), e.device_temperature()],
358
366
  configure: async (device, coordinatorEndpoint, logger) => {
@@ -417,7 +425,7 @@ module.exports = [
417
425
  model: 'SMSZB-120',
418
426
  vendor: 'Develco',
419
427
  description: 'Smoke detector with siren',
420
- fromZigbee: [fz.temperature, fz.battery, fz.ias_smoke_alarm_1_develco, fz.ignore_basic_report,
428
+ fromZigbee: [develco.fz.temperature, fz.battery, fz.ias_smoke_alarm_1_develco, fz.ignore_basic_report,
421
429
  fz.ias_enroll, fz.ias_wd, develco.fz.fault_status],
422
430
  toZigbee: [tz.warning, tz.ias_max_duration, tz.warning_simple],
423
431
  ota: ota.zigbeeOTA,
@@ -452,7 +460,7 @@ module.exports = [
452
460
  model: 'HESZB-120',
453
461
  vendor: 'Develco',
454
462
  description: 'Fire detector with siren',
455
- fromZigbee: [fz.temperature, fz.battery, fz.ias_smoke_alarm_1_develco, fz.ignore_basic_report,
463
+ fromZigbee: [develco.fz.temperature, fz.battery, fz.ias_smoke_alarm_1_develco, fz.ignore_basic_report,
456
464
  fz.ias_enroll, fz.ias_wd, develco.fz.fault_status],
457
465
  toZigbee: [tz.warning, tz.ias_max_duration, tz.warning_simple],
458
466
  meta: {battery: {voltageToPercentage: '3V_2500'}},
@@ -486,7 +494,7 @@ module.exports = [
486
494
  model: 'WISZB-120',
487
495
  vendor: 'Develco',
488
496
  description: 'Window sensor',
489
- fromZigbee: [fz.ias_contact_alarm_1, fz.battery, fz.temperature],
497
+ fromZigbee: [fz.ias_contact_alarm_1, fz.battery, develco.fz.temperature],
490
498
  toZigbee: [],
491
499
  exposes: [e.contact(), e.battery(), e.battery_low(), e.tamper(), e.temperature()],
492
500
  meta: {battery: {voltageToPercentage: '3V_2500'}},
@@ -525,7 +533,7 @@ module.exports = [
525
533
  vendor: 'Develco',
526
534
  description: 'Motion sensor',
527
535
  fromZigbee: [
528
- fz.temperature, fz.illuminance, fz.ias_occupancy_alarm_1, fz.battery,
536
+ develco.fz.temperature, fz.illuminance, fz.ias_occupancy_alarm_1, fz.battery,
529
537
  develco.fz.led_control, develco.fz.ias_occupancy_timeout,
530
538
  ],
531
539
  toZigbee: [develco.tz.led_control, develco.tz.ias_occupancy_timeout],
@@ -591,7 +599,7 @@ module.exports = [
591
599
  model: 'HMSZB-110',
592
600
  vendor: 'Develco',
593
601
  description: 'Temperature & humidity sensor',
594
- fromZigbee: [fz.battery, fz.temperature, fz.humidity],
602
+ fromZigbee: [fz.battery, develco.fz.temperature, fz.humidity],
595
603
  toZigbee: [],
596
604
  exposes: [e.battery(), e.battery_low(), e.temperature(), e.humidity()],
597
605
  meta: {battery: {voltageToPercentage: '3V_2500_3200'}},
@@ -609,7 +617,7 @@ module.exports = [
609
617
  model: 'ZHEMI101',
610
618
  vendor: 'Develco',
611
619
  description: 'Energy meter',
612
- fromZigbee: [fz.metering, develco.fz.pulse_configuration, develco.fz.interface_mode],
620
+ fromZigbee: [develco.fz.metering, develco.fz.pulse_configuration, develco.fz.interface_mode],
613
621
  toZigbee: [develco.tz.pulse_configuration, develco.tz.interface_mode, develco.tz.current_summation],
614
622
  endpoint: (device) => {
615
623
  return {'default': 2};
@@ -640,7 +648,7 @@ module.exports = [
640
648
  model: 'SMRZB-332',
641
649
  vendor: 'Develco',
642
650
  description: 'Smart relay DIN',
643
- fromZigbee: [fz.on_off, fz.metering],
651
+ fromZigbee: [fz.on_off, develco.fz.metering],
644
652
  toZigbee: [tz.on_off],
645
653
  exposes: [e.power(), e.energy(), e.switch()],
646
654
  endpoint: (device) => {
@@ -658,7 +666,7 @@ module.exports = [
658
666
  model: 'FLSZB-110',
659
667
  vendor: 'Develco',
660
668
  description: 'Flood alarm device ',
661
- fromZigbee: [fz.ias_water_leak_alarm_1, fz.temperature, fz.battery],
669
+ fromZigbee: [fz.ias_water_leak_alarm_1, develco.fz.temperature, fz.battery],
662
670
  toZigbee: [],
663
671
  exposes: [e.battery_low(), e.tamper(), e.water_leak(), e.temperature(), e.battery_voltage()],
664
672
  configure: async (device, coordinatorEndpoint, logger) => {
@@ -673,7 +681,7 @@ module.exports = [
673
681
  model: 'AQSZB-110',
674
682
  vendor: 'Develco',
675
683
  description: 'Air quality sensor',
676
- fromZigbee: [develco.fz.voc, develco.fz.voc_battery, fz.temperature, fz.humidity],
684
+ fromZigbee: [develco.fz.voc, develco.fz.voc_battery, develco.fz.temperature, fz.humidity],
677
685
  toZigbee: [],
678
686
  ota: ota.zigbeeOTA,
679
687
  exposes: [
@@ -703,7 +711,7 @@ module.exports = [
703
711
  model: 'SIRZB-110',
704
712
  vendor: 'Develco',
705
713
  description: 'Customizable siren',
706
- fromZigbee: [fz.temperature, fz.battery, fz.ias_enroll, fz.ias_wd, fz.ias_siren],
714
+ fromZigbee: [develco.fz.temperature, fz.battery, fz.ias_enroll, fz.ias_wd, fz.ias_siren],
707
715
  toZigbee: [tz.warning, tz.warning_simple, tz.ias_max_duration, tz.squawk],
708
716
  meta: {battery: {voltageToPercentage: '3V_2500'}},
709
717
  configure: async (device, coordinatorEndpoint, logger) => {
package/devices/ge.js CHANGED
@@ -67,6 +67,7 @@ module.exports = [
67
67
  configure: async (device, coordinatorEndpoint, logger) => {
68
68
  const endpoint = device.getEndpoint(1);
69
69
  await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'seMetering']);
70
+ await reporting.onOff(endpoint);
70
71
  await reporting.instantaneousDemand(endpoint);
71
72
  await reporting.currentSummDelivered(endpoint);
72
73
  endpoint.saveClusterAttributeKeyValue('seMetering', {divisor: 10000, multiplier: 1});
package/devices/innr.js CHANGED
@@ -572,6 +572,7 @@ module.exports = [
572
572
  vendor: 'Innr',
573
573
  description: 'Smart plug',
574
574
  extend: extend.switch(),
575
+ ota: ota.zigbeeOTA,
575
576
  configure: async (device, coordinatorEndpoint, logger) => {
576
577
  const endpoint = device.getEndpoint(1);
577
578
  await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff']);
@@ -211,7 +211,7 @@ module.exports = [
211
211
  extend: hueExtend.light_onoff_brightness_colortemp({colorTempRange: [153, 454]}),
212
212
  },
213
213
  {
214
- zigbeeModel: ['LWA018'],
214
+ zigbeeModel: ['LWA018', 'LWA028'],
215
215
  model: '9290024693',
216
216
  vendor: 'Philips',
217
217
  description: 'Hue white A60 bulb B22 1055lm with Bluetooth',
@@ -561,7 +561,7 @@ module.exports = [
561
561
  extend: hueExtend.light_onoff_brightness(),
562
562
  },
563
563
  {
564
- zigbeeModel: ['LCT026', '7602031P7', '7602031U7', '7602031PU'],
564
+ zigbeeModel: ['LCT026', '7602031P7', '7602031U7', '7602031PU', '7602031J6'],
565
565
  model: '7602031P7',
566
566
  vendor: 'Philips',
567
567
  description: 'Hue Go with Bluetooth',
@@ -30,7 +30,7 @@ module.exports = [
30
30
  {vendor: 'TuYa', description: 'Głowica termostatyczna', model: 'GTZ02'},
31
31
  {vendor: 'Revolt', description: 'Thermostatic Radiator Valve Controller', model: 'NX-4911'},
32
32
  {vendor: 'Unitec', description: 'Thermostatic Radiator Valve Controller', model: '30946'},
33
- {vendor: 'Tesla', description: 'Thermostatic Radiator Valve Controller', model: 'TSL-TRV-GS361A'},
33
+ {vendor: 'Tesla Smart', description: 'Thermostatic Radiator Valve Controller', model: 'TSL-TRV-GS361A'},
34
34
  {vendor: 'Nedis', description: 'Thermostatic Radiator Valve Controller', model: 'ZBHTR10WT'},
35
35
  {vendor: 'TCP Smart', description: 'Smart Thermostatic Radiator Valve', model: 'TBUWTRV'},
36
36
  {vendor: 'Brennenstuhl', description: 'Radiator Thermostat', model: 'HT CZ 01'}],
package/devices/tuya.js CHANGED
@@ -22,7 +22,7 @@ const TS011Fplugs = ['_TZ3000_5f43h46b', '_TZ3000_cphmq0q7', '_TZ3000_dpo1ysak',
22
22
  '_TZ3000_zloso4jk', '_TZ3000_r6buo8ba', '_TZ3000_iksasdbv', '_TZ3000_idrffznf', '_TZ3000_okaz9tjs', '_TZ3210_q7oryllx',
23
23
  '_TZ3000_ss98ec5d', '_TZ3000_gznh2xla', '_TZ3000_hdopuwv6', '_TZ3000_gvn91tmx', '_TZ3000_dksbtrzs', '_TZ3000_b28wrpvx',
24
24
  '_TZ3000_aim0ztek', '_TZ3000_mlswgkc3', '_TZ3000_7dndcnnb', '_TZ3000_waho4jtj', '_TZ3000_nmsciidq', '_TZ3000_jtgxgmks',
25
- '_TZ3000_rdfh8cfs', '_TZ3000_yujkchbz', '_TZ3000_fgwhjm9j', '_TZ3000_qeuvnohg'];
25
+ '_TZ3000_rdfh8cfs', '_TZ3000_yujkchbz', '_TZ3000_fgwhjm9j', '_TZ3000_qeuvnohg', '_TZ3000_rul9yxcc'];
26
26
 
27
27
  const tzLocal = {
28
28
  SA12IZL_silence_siren: {
@@ -813,13 +813,14 @@ module.exports = [
813
813
  {modelID: 'TS0001', manufacturerName: '_TZ3000_5ng23zjs'},
814
814
  {modelID: 'TS0001', manufacturerName: '_TZ3000_rmjr4ufz'},
815
815
  {modelID: 'TS0001', manufacturerName: '_TZ3000_v7gnj3ad'},
816
+ {modelID: 'TS0001', manufacturerName: '_TZ3000_3a9beq8a'},
816
817
  {modelID: 'TS0001', manufacturerName: '_TZ3000_ark8nv4y'},
817
818
  {modelID: 'TS0001', manufacturerName: '_TZ3000_mx3vgyea'},
818
819
  {modelID: 'TS0001', manufacturerName: '_TZ3000_qsp2pwtf'},
819
820
  {modelID: 'TS0001', manufacturerName: '_TZ3000_46t1rvdu'}],
820
821
  model: 'WHD02',
821
822
  vendor: 'TuYa',
822
- whiteLabel: [{vendor: 'TuYa', model: 'iHSW02'}],
823
+ whiteLabel: [{vendor: 'TuYa', model: 'iHSW02'}, {vendor: 'Aubess', model: 'TMZ02'}],
823
824
  description: 'Wall switch module',
824
825
  toZigbee: extend.switch().toZigbee.concat([tz.moes_power_on_behavior, tz.tuya_switch_type]),
825
826
  fromZigbee: extend.switch().fromZigbee.concat([fz.moes_power_on_behavior, fz.tuya_switch_type]),
@@ -881,54 +882,7 @@ module.exports = [
881
882
  whiteLabel: [{vendor: 'KTNNKG', model: 'ZB1248-10A'}],
882
883
  },
883
884
  {
884
- fingerprint: [{modelID: 'TS0505B', manufacturerName: '_TZ3000_qqjaziws'},
885
- {modelID: 'TS0505B', manufacturerName: '_TZ3000_jtmhndw2'},
886
- {modelID: 'TS0505B', manufacturerName: '_TZ3000_ezlg0pht'},
887
- {modelID: 'TS0505B', manufacturerName: '_TZ3210_3lbtuxgp'},
888
- {modelID: 'TS0505B', manufacturerName: '_TZ3210_5snkkrxw'},
889
- {modelID: 'TS0505B', manufacturerName: '_TZ3000_12sxjap4'},
890
- {modelID: 'TS0505B', manufacturerName: '_TZ3000_x2fqbdun'},
891
- {modelID: 'TS0505B', manufacturerName: '_TZ3000_589kq4ul'},
892
- {modelID: 'TS0505B', manufacturerName: '_TZ3000_1mtktxdk'},
893
- {modelID: 'TS0505B', manufacturerName: '_TZ3210_remypqqm'},
894
- {modelID: 'TS0505B', manufacturerName: '_TZ3000_kohbva1f'},
895
- {modelID: 'TS0505B', manufacturerName: '_TZ3000_luit1t00'},
896
- {modelID: 'TS0505B', manufacturerName: '_TZ3210_r5afgmkl'},
897
- {modelID: 'TS0505B', manufacturerName: '_TZ3210_wslkvrau'},
898
- {modelID: 'TS0505B', manufacturerName: '_TZ3210_0rn9qhnu'},
899
- {modelID: 'TS0505B', manufacturerName: '_TZ3210_ejctepku'},
900
- {modelID: 'TS0505B', manufacturerName: '_TZ3210_bicjqpg4'},
901
- {modelID: 'TS0505B', manufacturerName: '_TZ3210_jmiuubkz'},
902
- {modelID: 'TS0505B', manufacturerName: '_TZ3000_cmaky9gq'},
903
- {modelID: 'TS0505B', manufacturerName: '_TZ3000_tza2vjxx'},
904
- {modelID: 'TS0505B', manufacturerName: '_TZ3210_it1u8ahz'},
905
- {modelID: 'TS0505B', manufacturerName: '_TZ3210_k1pe6ibm'},
906
- {modelID: 'TS0505B', manufacturerName: '_TZB210_1ecortg6'},
907
- {modelID: 'TS0505B', manufacturerName: '_TZ3210_e020aaaj'},
908
- {modelID: 'TS0505B', manufacturerName: '_TZ3210_bfwvfyx1'},
909
- {modelID: 'TS0505B', manufacturerName: '_TZ3210_leyz4rju'},
910
- {modelID: 'TS0505B', manufacturerName: '_TZ3210_jd3z4yig'},
911
- {modelID: 'TS0505B', manufacturerName: '_TZ3210_dgdjiw1c'},
912
- {modelID: 'TS0505B', manufacturerName: '_TZ3210_mzdax7ha'},
913
- {modelID: 'TS0505B', manufacturerName: '_TZB210_tmi0rihb'},
914
- {modelID: 'TS0505B', manufacturerName: '_TZ3210_a4s41wm4'},
915
- {modelID: 'TS0505B', manufacturerName: '_TZ3210_awrucboq'},
916
- {modelID: 'TS0505B', manufacturerName: '_TZ3210_ijczzg9h'},
917
- {modelID: 'TS0505B', manufacturerName: '_TZ3210_qxenlrin'},
918
- {modelID: 'TS0505B', manufacturerName: '_TZ3210_vaiyrvd1'},
919
- {modelID: 'TS0505B', manufacturerName: '_TZ3210_iwbaamgh'},
920
- {modelID: 'TS0505B', manufacturerName: '_TZ3210_klv2wul0'},
921
- {modelID: 'TS0505B', manufacturerName: '_TZ3210_s6zec0of'},
922
- {modelID: 'TS0505B', manufacturerName: '_TZ3210_y5fjkn7x'},
923
- {modelID: 'TS0505B', manufacturerName: '_TZ3210_cuqkfz2q'},
924
- {modelID: 'TS0505B', manufacturerName: '_TZ3210_6amjviba'},
925
- {modelID: 'TS0505B', manufacturerName: '_TZ3000_xr5m6kfg'},
926
- {modelID: 'TS0505B', manufacturerName: '_TZ3210_xr5m6kfg'},
927
- {modelID: 'TS0505B', manufacturerName: '_TZ3210_bf175wi4'},
928
- {modelID: 'TS0505B', manufacturerName: '_TZB210_3zfp8mki'},
929
- {modelID: 'TS0505B', manufacturerName: '_TZ3000_y1vbo44x'},
930
- {modelID: 'TS0505B', manufacturerName: '_TZ3210_mny0zvkm'},
931
- {modelID: 'TS0505B', manufacturerName: '_TZ3210_pfupy2pg'}],
885
+ zigbeeModel: ['TS0505B'],
932
886
  model: 'TS0505B',
933
887
  vendor: 'TuYa',
934
888
  description: 'Zigbee RGB+CCT light',
@@ -943,31 +897,17 @@ module.exports = [
943
897
  meta: {applyRedFix: true, enhancedHue: false},
944
898
  },
945
899
  {
946
- fingerprint: [{modelID: 'TS0503B', manufacturerName: '_TZ3000_i8l0nqdu'},
947
- {modelID: 'TS0503B', manufacturerName: '_TZ3210_a5fxguxr'},
948
- {modelID: 'TS0503B', manufacturerName: '_TZ3210_778drfdt'},
949
- {modelID: 'TS0503B', manufacturerName: '_TZ3000_g5xawfcq'},
950
- {modelID: 'TS0503B', manufacturerName: '_TZ3210_trm3l2aw'},
951
- {modelID: 'TS0503B', manufacturerName: '_TZ3210_95txyzbx'},
952
- {modelID: 'TS0503B', manufacturerName: '_TZ3210_odlghna1'},
953
- {modelID: 'TS0503B', manufacturerName: '_TZB210_nfzrlz29'},
954
- {modelID: 'TS0503B', manufacturerName: '_TZ3220_wp1k8xws'},
955
- {modelID: 'TS0503B', manufacturerName: '_TZ3210_wp1k8xws'}],
900
+ zigbeeModel: ['TS0503B'],
956
901
  model: 'TS0503B',
957
902
  vendor: 'TuYa',
958
903
  description: 'Zigbee RGB light',
904
+ whiteLabel: [{vendor: 'BTF-Lighting', model: 'C03Z'}],
959
905
  extend: extend.light_onoff_brightness_color(),
960
906
  // Requires red fix: https://github.com/Koenkk/zigbee2mqtt/issues/5962#issue-796462106
961
907
  meta: {applyRedFix: true, enhancedHue: false},
962
908
  },
963
909
  {
964
- fingerprint: [{modelID: 'TS0504B', manufacturerName: '_TZ3000_ukuvyhaa'},
965
- {modelID: 'TS0504B', manufacturerName: '_TZ3210_bfvybixd'},
966
- {modelID: 'TS0504B', manufacturerName: '_TZ3210_i2i0bsnv'},
967
- {modelID: 'TS0504B', manufacturerName: '_TZ3210_elzv6aia'},
968
- {modelID: 'TS0504B', manufacturerName: '_TZ3210_1elppmba'},
969
- {modelID: 'TS0504B', manufacturerName: '_TZB210_5jn6an2y'},
970
- {modelID: 'TS0504B', manufacturerName: '_TZ3210_onejz0gt'}],
910
+ zigbeeModel: ['TS0504B'],
971
911
  model: 'TS0504B',
972
912
  vendor: 'TuYa',
973
913
  description: 'Zigbee RGBW light',
@@ -976,25 +916,14 @@ module.exports = [
976
916
  meta: {applyRedFix: true},
977
917
  },
978
918
  {
979
- fingerprint: [{modelID: 'TS0501A', manufacturerName: '_TZ3000_yeg1e5eh'}],
919
+ zigbeeModel: ['TS0501A'],
980
920
  model: 'TS0501A',
981
921
  description: 'Zigbee light',
982
922
  vendor: 'TuYa',
983
923
  extend: extend.light_onoff_brightness(),
984
924
  },
985
925
  {
986
- fingerprint: [{modelID: 'TS0501B', manufacturerName: '_TZ3000_4whigl8i'},
987
- {modelID: 'TS0501B', manufacturerName: '_TZ3210_4whigl8i'},
988
- {modelID: 'TS0501B', manufacturerName: '_TZ3210_9q49basr'},
989
- {modelID: 'TS0501B', manufacturerName: '_TZ3210_i680rtja'},
990
- {modelID: 'TS0501B', manufacturerName: '_TZ3210_grnwgegn'},
991
- {modelID: 'TS0501B', manufacturerName: '_TZ3210_nehayyhx'},
992
- {modelID: 'TS0501B', manufacturerName: '_TZ3210_wuheofsg'},
993
- {modelID: 'TS0501B', manufacturerName: '_TZ3210_e5t9bfdv'},
994
- {modelID: 'TS0501B', manufacturerName: '_TZ3210_19qb27da'},
995
- {modelID: 'TS0501B', manufacturerName: '_TZ3210_aurnbfv4'},
996
- {modelID: 'TS0501B', manufacturerName: '_TZ3210_4zinq6io'},
997
- {modelID: 'TS0501B', manufacturerName: '_TZ3210_93gnbdgz'}],
926
+ zigbeeModel: ['TS0501B'],
998
927
  model: 'TS0501B',
999
928
  description: 'Zigbee light',
1000
929
  vendor: 'TuYa',
@@ -1145,11 +1074,11 @@ module.exports = [
1145
1074
  exposes: [e.water_leak(), e.battery_low(), e.battery()],
1146
1075
  },
1147
1076
  {
1148
- fingerprint: [{modelID: 'TS0101', manufacturerName: '_TYZB01_ijihzffk'}],
1077
+ fingerprint: tuya.fingerprint('TS0101', ['_TYZB01_ijihzffk', '_TZ3210_tfxwxklq']),
1149
1078
  model: 'TS0101',
1150
1079
  vendor: 'TuYa',
1151
1080
  description: 'Zigbee Socket',
1152
- whiteLabel: [{vendor: 'Larkkey', model: 'PS080'}],
1081
+ whiteLabel: [{vendor: 'Larkkey', model: 'PS080'}, {vendor: 'Mercator', model: 'SPBS01G'}],
1153
1082
  extend: extend.switch(),
1154
1083
  meta: {disableDefaultResponse: true},
1155
1084
  },
@@ -1524,31 +1453,7 @@ module.exports = [
1524
1453
  extend: extend.light_onoff_brightness_colortemp(),
1525
1454
  },
1526
1455
  {
1527
- fingerprint: [
1528
- {modelID: 'TS0502B', manufacturerName: '_TZ3210_s1x7gcq0'},
1529
- {modelID: 'TS0502B', manufacturerName: '_TZ3210_hi1ym4bl'},
1530
- {modelID: 'TS0502B', manufacturerName: '_TZ3000_muqovqv0'},
1531
- {modelID: 'TS0502B', manufacturerName: '_TZ3210_qjdimezy'},
1532
- {modelID: 'TS0502B', manufacturerName: '_TZ3210_psgq7ysz'},
1533
- {modelID: 'TS0502B', manufacturerName: '_TZ3000_zw7wr5uo'},
1534
- {modelID: 'TS0502B', manufacturerName: '_TZ3210_ok08rifa'},
1535
- {modelID: 'TS0502B', manufacturerName: '_TZ3210_pz9zmxjj'},
1536
- {modelID: 'TS0502B', manufacturerName: '_TZ3000_fzwhym79'},
1537
- {modelID: 'TS0502B', manufacturerName: '_TZ3000_ogceypug'},
1538
- {modelID: 'TS0502B', manufacturerName: '_TZ3210_rm0hthdo'},
1539
- {modelID: 'TS0502B', manufacturerName: '_TZ3210_zwqnazkb'},
1540
- {modelID: 'TS0502B', manufacturerName: '_TZ3210_ijsj2evj'},
1541
- {modelID: 'TS0502B', manufacturerName: '_TZ3210_pgq2qvyv'},
1542
- {modelID: 'TS0502B', manufacturerName: '_TZ3210_nvaik6gk'},
1543
- {modelID: 'TS0502B', manufacturerName: '_TZB210_rkgngb5o'},
1544
- {modelID: 'TS0502B', manufacturerName: '_TZ3000_armwcncd'},
1545
- {modelID: 'TS0502B', manufacturerName: '_TZ3210_2p6wbry3'},
1546
- {modelID: 'TS0502B', manufacturerName: '_TZB210_nfzrlz29'},
1547
- {modelID: 'TS0502B', manufacturerName: '_TZ3210_qamcypen'},
1548
- {modelID: 'TS0502B', manufacturerName: '_TZ3210_zdrhqmo0'},
1549
- {modelID: 'TS0502B', manufacturerName: '_TZ3210_2cjfbpy0'},
1550
- {modelID: 'TS0502B', manufacturerName: '_TZ3000_bujv0r9b'},
1551
- ],
1456
+ zigbeeModel: ['TS0502B'],
1552
1457
  model: 'TS0502B',
1553
1458
  vendor: 'TuYa',
1554
1459
  description: 'Light controller',
@@ -1559,7 +1464,7 @@ module.exports = [
1559
1464
  extend: extend.light_onoff_brightness_colortemp({colorTempRange: [153, 500]}),
1560
1465
  },
1561
1466
  {
1562
- fingerprint: [{modelID: 'TS0504A', manufacturerName: '_TZ3000_nzbm4ad4'}],
1467
+ zigbeeModel: ['TS0504A'],
1563
1468
  model: 'TS0504A',
1564
1469
  vendor: 'TuYa',
1565
1470
  description: 'RGBW LED controller',
@@ -1807,14 +1712,13 @@ module.exports = [
1807
1712
  configure: async (device, coordinatorEndpoint, logger) => {
1808
1713
  const endpoint = device.getEndpoint(1);
1809
1714
  await tuya.configureMagicPacket(device, coordinatorEndpoint, logger);
1810
- await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'haElectricalMeasurement']);
1715
+ await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'haElectricalMeasurement', 'seMetering']);
1811
1716
  await reporting.rmsVoltage(endpoint, {change: 5});
1812
- await reporting.activePower(endpoint, {change: 10});
1717
+ await reporting.rmsCurrent(endpoint, {change: 50});
1718
+ await reporting.currentSummDelivered(endpoint);
1813
1719
  endpoint.saveClusterAttributeKeyValue('seMetering', {divisor: 100, multiplier: 1});
1814
1720
  device.save();
1815
1721
  },
1816
- options: [exposes.options.measurement_poll_interval().withDescription('Only the energy value is polled for this device.')],
1817
- onEvent: (type, data, device, options) => tuya.onEventMeasurementPoll(type, data, device, options, false, true),
1818
1722
  whiteLabel: [{vendor: 'Aubess', model: 'WDH02'}],
1819
1723
  exposes: [e.switch(), e.power(), e.voltage().withAccess(ea.STATE), e.energy(), e.power_on_behavior(), e.switch_type_2()],
1820
1724
  },
@@ -2394,7 +2298,8 @@ module.exports = [
2394
2298
  vendor: 'TuYa',
2395
2299
  whiteLabel: [{vendor: 'LELLKI', model: 'TS011F_plug'}, {vendor: 'NEO', model: 'NAS-WR01B'},
2396
2300
  {vendor: 'BlitzWolf', model: 'BW-SHP15'}, {vendor: 'Nous', model: 'A1Z'}, {vendor: 'BlitzWolf', model: 'BW-SHP13'},
2397
- {vendor: 'MatSee Plus', model: 'PJ-ZSW01'}, {vendor: 'MODEMIX', model: 'MOD037'}, {vendor: 'MODEMIX', model: 'MOD048'}],
2301
+ {vendor: 'MatSee Plus', model: 'PJ-ZSW01'}, {vendor: 'MODEMIX', model: 'MOD037'}, {vendor: 'MODEMIX', model: 'MOD048'},
2302
+ {vendor: 'Coswall', model: 'CS-AJ-DE2U-ZG-11'}],
2398
2303
  ota: ota.zigbeeOTA,
2399
2304
  fromZigbee: [fz.on_off, fzLocal.electrical_measurement_skip_duplicate, fzLocal.metering_skip_duplicate, fz.ignore_basic_report,
2400
2305
  fz.tuya_switch_power_outage_memory, fz.ts011f_plug_indicator_mode, fz.ts011f_plug_child_mode],
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "zigbee-herdsman-converters",
3
- "version": "14.0.669",
3
+ "version": "14.0.670",
4
4
  "description": "Collection of device converters to be used with zigbee-herdsman",
5
5
  "main": "index.js",
6
6
  "files": [
@@ -38,7 +38,7 @@
38
38
  "buffer-crc32": "^0.2.13",
39
39
  "https-proxy-agent": "^5.0.1",
40
40
  "tar-stream": "^2.2.0",
41
- "zigbee-herdsman": "^0.14.71"
41
+ "zigbee-herdsman": "^0.14.73"
42
42
  },
43
43
  "devDependencies": {
44
44
  "eslint": "*",