zigbee-herdsman-converters 14.0.433 → 14.0.436

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.
@@ -8457,6 +8457,25 @@ const converters = {
8457
8457
  }
8458
8458
  },
8459
8459
  },
8460
+ tuya_remote: {
8461
+ cluster: 'manuSpecificTuya',
8462
+ type: ['commandGetData', 'commandDataResponse'],
8463
+ convert: (model, msg, publish, options, meta) => {
8464
+ const result = {};
8465
+ const clickMapping = {0: 'single', 1: 'double', 2: 'hold'};
8466
+ const buttonMapping = {1: '1', 2: '2', 3: '3', 4: '4', 5: '5', 6: '6'};
8467
+ for (const dpValue of msg.data.dpValues) {
8468
+ const value = tuya.getDataValue(dpValue);
8469
+ // battery DP
8470
+ if (dpValue.dp == 10) {
8471
+ result.battery = value;
8472
+ } else {
8473
+ result.action = `${buttonMapping[dpValue.dp]}_${clickMapping[value]}`;
8474
+ }
8475
+ }
8476
+ return result;
8477
+ },
8478
+ },
8460
8479
  // #endregion
8461
8480
 
8462
8481
  // #region Ignore converters (these message dont need parsing).
@@ -3430,7 +3430,7 @@ const converters = {
3430
3430
  // upscale to 1000
3431
3431
  let newValue;
3432
3432
  let dp = tuya.dataPoints.dimmerLevel;
3433
- if (meta.device.manufacturerName === '_TZE200_9i9dt8is' || meta.device.manufacturerName === '_TZE200_dfxkcots') {
3433
+ if (['_TZE200_3p5ydos3', '_TZE200_9i9dt8is', '_TZE200_dfxkcots'].includes(meta.device.manufacturerName)) {
3434
3434
  dp = tuya.dataPoints.eardaDimmerLevel;
3435
3435
  }
3436
3436
  if (key === 'brightness_min') {
package/devices/adeo.js CHANGED
@@ -13,6 +13,13 @@ module.exports = [
13
13
  description: 'ENKI LEXMAN E27 LED white',
14
14
  extend: extend.light_onoff_brightness_colortemp({colorTempRange: [153, 454]}),
15
15
  },
16
+ {
17
+ zigbeeModel: ['ZBEK-3'],
18
+ model: 'IP-CDZOTAAP005JA-MAN',
19
+ vendor: 'ADEO',
20
+ description: 'ENKI LEXMAN E14 LED RGBW',
21
+ extend: extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 370]}),
22
+ },
16
23
  {
17
24
  zigbeeModel: ['LDSENK01F'],
18
25
  model: 'LDSENK01F',
@@ -11,10 +11,11 @@ module.exports = [
11
11
  {
12
12
  // eTRV0100 is the same as Hive TRV001 and Popp eT093WRO. If implementing anything, please consider
13
13
  // changing those two too.
14
- zigbeeModel: ['eTRV0100'],
14
+ zigbeeModel: ['eTRV0100', 'eTRV0101'],
15
15
  model: '014G2461',
16
16
  vendor: 'Danfoss',
17
17
  description: 'Ally thermostat',
18
+ whiteLabel: [{vendor: 'Danfoss', model: '014G2463'}],
18
19
  fromZigbee: [fz.battery, fz.thermostat, fz.thermostat_weekly_schedule, fz.hvac_user_interface, fz.danfoss_thermostat],
19
20
  toZigbee: [tz.danfoss_thermostat_occupied_heating_setpoint, tz.thermostat_local_temperature, tz.danfoss_mounted_mode_active,
20
21
  tz.danfoss_mounted_mode_control, tz.danfoss_thermostat_vertical_orientation, tz.danfoss_algorithm_scale_factor,
@@ -795,6 +795,15 @@ module.exports = [
795
795
  extend: hueExtend.light_onoff_brightness(),
796
796
  ota: ota.zigbeeOTA,
797
797
  },
798
+ {
799
+ zigbeeModel: ['LWG003'],
800
+ model: '9290019536',
801
+ vendor: 'Philips',
802
+ description: 'Hue white GU10',
803
+ meta: {turnsOffAtBrightness1: true},
804
+ extend: hueExtend.light_onoff_brightness(),
805
+ ota: ota.zigbeeOTA,
806
+ },
798
807
  {
799
808
  zigbeeModel: ['LWG004'],
800
809
  model: 'LWG004',
@@ -2474,7 +2483,7 @@ module.exports = [
2474
2483
  ota: ota.zigbeeOTA,
2475
2484
  },
2476
2485
  {
2477
- zigbeeModel: ['5309331P6', '5309330P6'],
2486
+ zigbeeModel: ['5309331P6', '5309330P6', '929003046301_03'],
2478
2487
  model: '5309331P6',
2479
2488
  vendor: 'Philips',
2480
2489
  description: 'Hue White ambiance Runner triple spotlight',
@@ -0,0 +1,11 @@
1
+ const extend = require('../lib/extend');
2
+
3
+ module.exports = [
4
+ {
5
+ zigbeeModel: ['020B0B'],
6
+ model: '020B0B',
7
+ vendor: 'Fischer & Honsel',
8
+ description: 'LED Tischleuchte Beta Zig',
9
+ extend: extend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 370]}),
10
+ },
11
+ ];
package/devices/tuya.js CHANGED
@@ -43,6 +43,18 @@ const tzLocal = {
43
43
  },
44
44
  };
45
45
 
46
+ const fzLocal = {
47
+ TS0201_battery: {
48
+ cluster: 'genPowerCfg',
49
+ type: ['attributeReport', 'readResponse'],
50
+ convert: (model, msg, publish, options, meta) => {
51
+ // https://github.com/Koenkk/zigbee2mqtt/issues/11470
52
+ if (msg.data.batteryVoltage < 30) return;
53
+ return fz.battery(model, msg, publish, options, meta);
54
+ },
55
+ },
56
+ };
57
+
46
58
  module.exports = [
47
59
  {
48
60
  zigbeeModel: ['TS0204'],
@@ -300,6 +312,7 @@ module.exports = [
300
312
  {modelID: 'TS0202', manufacturerName: '_TZ3000_bsvqrxru'},
301
313
  {modelID: 'TS0202', manufacturerName: '_TYZB01_tv3wxhcz'},
302
314
  {modelID: 'TS0202', manufacturerName: '_TYZB01_hqbdru35'},
315
+ {modelID: 'TS0202', manufacturerName: '_TZ3000_otvn3lne'},
303
316
  {modelID: 'TS0202', manufacturerName: '_TZ3000_tiwq83wk'},
304
317
  {modelID: 'TS0202', manufacturerName: '_TZ3000_ykwcwxmz'},
305
318
  {modelID: 'WHD02', manufacturerName: '_TZ3000_hktqahrq'}],
@@ -411,7 +424,12 @@ module.exports = [
411
424
  vendor: 'TuYa',
412
425
  description: 'Socket module',
413
426
  extend: extend.switch(),
414
- whiteLabel: [{vendor: 'LoraTap', model: 'RR400ZB'}],
427
+ whiteLabel: [{vendor: 'LoraTap', model: 'RR400ZB'}, {vendor: 'LoraTap', model: 'SP400ZB'}],
428
+ configure: async (device, coordinatorEndpoint, logger) => {
429
+ const endpoint = device.getEndpoint(1);
430
+ await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff']);
431
+ await reporting.onOff(endpoint);
432
+ },
415
433
  },
416
434
  {
417
435
  fingerprint: [{modelID: 'TS011F', manufacturerName: '_TZ3000_wxtp7c5y'},
@@ -649,7 +667,7 @@ module.exports = [
649
667
  vendor: 'TuYa',
650
668
  description: 'Temperature & humidity sensor with display',
651
669
  whiteLabel: [{vendor: 'BlitzWolf', model: 'BW-IS4'}],
652
- fromZigbee: [fz.battery, fz.temperature, fz.humidity],
670
+ fromZigbee: [fzLocal.TS0201_battery, fz.temperature, fz.humidity],
653
671
  toZigbee: [],
654
672
  exposes: [e.battery(), e.temperature(), e.humidity(), e.battery_voltage()],
655
673
  },
@@ -2071,4 +2089,15 @@ module.exports = [
2071
2089
  toZigbee: [],
2072
2090
  exposes: [e.contact(), e.battery()],
2073
2091
  },
2092
+ {
2093
+ fingerprint: [{modelID: `TS0601`, manufacturerName: `_TZE200_2m38mh6k`}],
2094
+ model: 'SS9600ZB',
2095
+ vendor: 'TuYa',
2096
+ description: '6 gang remote',
2097
+ exposes: [e.battery(),
2098
+ e.action(['1_single', '1_double', '1_hold', '2_single', '2_double', '2_hold', '3_single', '3_double', '3_hold',
2099
+ '4_single', '4_double', '4_hold', '5_single', '5_double', '5_hold', '6_single', '6_double', '6_hold'])],
2100
+ fromZigbee: [fz.tuya_remote],
2101
+ toZigbee: [],
2102
+ },
2074
2103
  ];
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "zigbee-herdsman-converters",
3
- "version": "14.0.433",
3
+ "version": "14.0.436",
4
4
  "lockfileVersion": 1,
5
5
  "requires": true,
6
6
  "dependencies": {
@@ -146,9 +146,9 @@
146
146
  }
147
147
  },
148
148
  "@babel/helper-module-transforms": {
149
- "version": "7.16.7",
150
- "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.16.7.tgz",
151
- "integrity": "sha512-gaqtLDxJEFCeQbYp9aLAefjhkKdjKcdh6DB7jniIGU3Pz52WAmP268zK0VgPz9hUNkMSYeH976K2/Y6yPadpng==",
149
+ "version": "7.17.6",
150
+ "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.17.6.tgz",
151
+ "integrity": "sha512-2ULmRdqoOMpdvkbT8jONrZML/XALfzxlb052bldftkicAUy8AxSCkD5trDPQcwHNmolcl7wP6ehNqMlyUw6AaA==",
152
152
  "dev": true,
153
153
  "requires": {
154
154
  "@babel/helper-environment-visitor": "^7.16.7",
@@ -157,8 +157,8 @@
157
157
  "@babel/helper-split-export-declaration": "^7.16.7",
158
158
  "@babel/helper-validator-identifier": "^7.16.7",
159
159
  "@babel/template": "^7.16.7",
160
- "@babel/traverse": "^7.16.7",
161
- "@babel/types": "^7.16.7"
160
+ "@babel/traverse": "^7.17.3",
161
+ "@babel/types": "^7.17.0"
162
162
  }
163
163
  },
164
164
  "@babel/helper-plugin-utils": {
@@ -454,9 +454,9 @@
454
454
  "dev": true
455
455
  },
456
456
  "@eslint/eslintrc": {
457
- "version": "1.1.0",
458
- "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.1.0.tgz",
459
- "integrity": "sha512-C1DfL7XX4nPqGd6jcP01W9pVM1HYCuUkFk1432D7F0v3JSlUIeOYn9oCoi3eoLZ+iwBSb29BMFxxny0YrrEZqg==",
457
+ "version": "1.2.0",
458
+ "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.2.0.tgz",
459
+ "integrity": "sha512-igm9SjJHNEJRiUnecP/1R5T3wKLEJ7pL6e2P+GUSfCd0dGjPYYZve08uzw8L2J8foVHFz+NGu12JxRcU2gGo6w==",
460
460
  "dev": true,
461
461
  "requires": {
462
462
  "ajv": "^6.12.4",
@@ -479,9 +479,9 @@
479
479
  }
480
480
  },
481
481
  "@humanwhocodes/config-array": {
482
- "version": "0.9.3",
483
- "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.3.tgz",
484
- "integrity": "sha512-3xSMlXHh03hCcCmFc0rbKp3Ivt2PFEJnQUJDDMTJQ2wkECZWdq4GePs2ctc5H8zV+cHPaq8k2vU8mrQjA6iHdQ==",
482
+ "version": "0.9.5",
483
+ "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.5.tgz",
484
+ "integrity": "sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==",
485
485
  "dev": true,
486
486
  "requires": {
487
487
  "@humanwhocodes/object-schema": "^1.2.1",
@@ -885,9 +885,9 @@
885
885
  "dev": true
886
886
  },
887
887
  "@types/node": {
888
- "version": "17.0.18",
889
- "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.18.tgz",
890
- "integrity": "sha512-eKj4f/BsN/qcculZiRSujogjvp5O/k4lOW5m35NopjZM/QwLOR075a8pJW5hD+Rtdm2DaCVPENS6KtSQnUD6BA==",
888
+ "version": "17.0.21",
889
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.21.tgz",
890
+ "integrity": "sha512-DBZCJbhII3r90XbQxI8Y9IjjiiOGlZ0Hr32omXIZvwwZ7p4DMMXGrKXVyPfuoBOri9XNtL0UK69jYIBIsRX3QQ==",
891
891
  "dev": true
892
892
  },
893
893
  "@types/prettier": {
@@ -918,29 +918,29 @@
918
918
  "dev": true
919
919
  },
920
920
  "@typescript-eslint/scope-manager": {
921
- "version": "5.12.0",
922
- "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.12.0.tgz",
923
- "integrity": "sha512-GAMobtIJI8FGf1sLlUWNUm2IOkIjvn7laFWyRx7CLrv6nLBI7su+B7lbStqVlK5NdLvHRFiJo2HhiDF7Ki01WQ==",
921
+ "version": "5.12.1",
922
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.12.1.tgz",
923
+ "integrity": "sha512-J0Wrh5xS6XNkd4TkOosxdpObzlYfXjAFIm9QxYLCPOcHVv1FyyFCPom66uIh8uBr0sZCrtS+n19tzufhwab8ZQ==",
924
924
  "dev": true,
925
925
  "requires": {
926
- "@typescript-eslint/types": "5.12.0",
927
- "@typescript-eslint/visitor-keys": "5.12.0"
926
+ "@typescript-eslint/types": "5.12.1",
927
+ "@typescript-eslint/visitor-keys": "5.12.1"
928
928
  }
929
929
  },
930
930
  "@typescript-eslint/types": {
931
- "version": "5.12.0",
932
- "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.12.0.tgz",
933
- "integrity": "sha512-JowqbwPf93nvf8fZn5XrPGFBdIK8+yx5UEGs2QFAYFI8IWYfrzz+6zqlurGr2ctShMaJxqwsqmra3WXWjH1nRQ==",
931
+ "version": "5.12.1",
932
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.12.1.tgz",
933
+ "integrity": "sha512-hfcbq4qVOHV1YRdhkDldhV9NpmmAu2vp6wuFODL71Y0Ixak+FLeEU4rnPxgmZMnGreGEghlEucs9UZn5KOfHJA==",
934
934
  "dev": true
935
935
  },
936
936
  "@typescript-eslint/typescript-estree": {
937
- "version": "5.12.0",
938
- "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.12.0.tgz",
939
- "integrity": "sha512-Dd9gVeOqt38QHR0BEA8oRaT65WYqPYbIc5tRFQPkfLquVEFPD1HAtbZT98TLBkEcCkvwDYOAvuSvAD9DnQhMfQ==",
937
+ "version": "5.12.1",
938
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.12.1.tgz",
939
+ "integrity": "sha512-ahOdkIY9Mgbza7L9sIi205Pe1inCkZWAHE1TV1bpxlU4RZNPtXaDZfiiFWcL9jdxvW1hDYZJXrFm+vlMkXRbBw==",
940
940
  "dev": true,
941
941
  "requires": {
942
- "@typescript-eslint/types": "5.12.0",
943
- "@typescript-eslint/visitor-keys": "5.12.0",
942
+ "@typescript-eslint/types": "5.12.1",
943
+ "@typescript-eslint/visitor-keys": "5.12.1",
944
944
  "debug": "^4.3.2",
945
945
  "globby": "^11.0.4",
946
946
  "is-glob": "^4.0.3",
@@ -949,15 +949,15 @@
949
949
  }
950
950
  },
951
951
  "@typescript-eslint/utils": {
952
- "version": "5.12.0",
953
- "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.12.0.tgz",
954
- "integrity": "sha512-k4J2WovnMPGI4PzKgDtQdNrCnmBHpMUFy21qjX2CoPdoBcSBIMvVBr9P2YDP8jOqZOeK3ThOL6VO/sy6jtnvzw==",
952
+ "version": "5.12.1",
953
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.12.1.tgz",
954
+ "integrity": "sha512-Qq9FIuU0EVEsi8fS6pG+uurbhNTtoYr4fq8tKjBupsK5Bgbk2I32UGm0Sh+WOyjOPgo/5URbxxSNV6HYsxV4MQ==",
955
955
  "dev": true,
956
956
  "requires": {
957
957
  "@types/json-schema": "^7.0.9",
958
- "@typescript-eslint/scope-manager": "5.12.0",
959
- "@typescript-eslint/types": "5.12.0",
960
- "@typescript-eslint/typescript-estree": "5.12.0",
958
+ "@typescript-eslint/scope-manager": "5.12.1",
959
+ "@typescript-eslint/types": "5.12.1",
960
+ "@typescript-eslint/typescript-estree": "5.12.1",
961
961
  "eslint-scope": "^5.1.1",
962
962
  "eslint-utils": "^3.0.0"
963
963
  },
@@ -981,12 +981,12 @@
981
981
  }
982
982
  },
983
983
  "@typescript-eslint/visitor-keys": {
984
- "version": "5.12.0",
985
- "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.12.0.tgz",
986
- "integrity": "sha512-cFwTlgnMV6TgezQynx2c/4/tx9Tufbuo9LPzmWqyRC3QC4qTGkAG1C6pBr0/4I10PAI/FlYunI3vJjIcu+ZHMg==",
984
+ "version": "5.12.1",
985
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.12.1.tgz",
986
+ "integrity": "sha512-l1KSLfupuwrXx6wc0AuOmC7Ko5g14ZOQ86wJJqRbdLbXLK02pK/DPiDDqCc7BqqiiA04/eAA6ayL0bgOrAkH7A==",
987
987
  "dev": true,
988
988
  "requires": {
989
- "@typescript-eslint/types": "5.12.0",
989
+ "@typescript-eslint/types": "5.12.1",
990
990
  "eslint-visitor-keys": "^3.0.0"
991
991
  }
992
992
  },
@@ -1526,9 +1526,9 @@
1526
1526
  }
1527
1527
  },
1528
1528
  "electron-to-chromium": {
1529
- "version": "1.4.71",
1530
- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.71.tgz",
1531
- "integrity": "sha512-Hk61vXXKRb2cd3znPE9F+2pLWdIOmP7GjiTj45y6L3W/lO+hSnUSUhq+6lEaERWBdZOHbk2s3YV5c9xVl3boVw==",
1529
+ "version": "1.4.73",
1530
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.73.tgz",
1531
+ "integrity": "sha512-RlCffXkE/LliqfA5m29+dVDPB2r72y2D2egMMfIy3Le8ODrxjuZNVo4NIC2yPL01N4xb4nZQLwzi6Z5tGIGLnA==",
1532
1532
  "dev": true
1533
1533
  },
1534
1534
  "emittery": {
@@ -1627,12 +1627,12 @@
1627
1627
  }
1628
1628
  },
1629
1629
  "eslint": {
1630
- "version": "8.9.0",
1631
- "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.9.0.tgz",
1632
- "integrity": "sha512-PB09IGwv4F4b0/atrbcMFboF/giawbBLVC7fyDamk5Wtey4Jh2K+rYaBhCAbUyEI4QzB1ly09Uglc9iCtFaG2Q==",
1630
+ "version": "8.10.0",
1631
+ "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.10.0.tgz",
1632
+ "integrity": "sha512-tcI1D9lfVec+R4LE1mNDnzoJ/f71Kl/9Cv4nG47jOueCMBrCCKYXr4AUVS7go6mWYGFD4+EoN6+eXSrEbRzXVw==",
1633
1633
  "dev": true,
1634
1634
  "requires": {
1635
- "@eslint/eslintrc": "^1.1.0",
1635
+ "@eslint/eslintrc": "^1.2.0",
1636
1636
  "@humanwhocodes/config-array": "^0.9.2",
1637
1637
  "ajv": "^6.10.0",
1638
1638
  "chalk": "^4.0.0",
@@ -3824,9 +3824,9 @@
3824
3824
  "dev": true
3825
3825
  },
3826
3826
  "zigbee-herdsman": {
3827
- "version": "0.14.16",
3828
- "resolved": "https://registry.npmjs.org/zigbee-herdsman/-/zigbee-herdsman-0.14.16.tgz",
3829
- "integrity": "sha512-j49iDadyNCC3/3PQd7gKWz6+YSeTsuJgUkP5KTQW8CL+zLb7AAYVmF2rcC9ItHSgxnVYDSdxKAmR1c7IidIWJQ==",
3827
+ "version": "0.14.20",
3828
+ "resolved": "https://registry.npmjs.org/zigbee-herdsman/-/zigbee-herdsman-0.14.20.tgz",
3829
+ "integrity": "sha512-YwvAHEfWtcCLilnoHcIpZ9DCPHSLwpy2iboC2zjJUGNQp0vUClJhjAxb6JdTnaHxrNB2FN6+b3Q6BS8QiTtg5g==",
3830
3830
  "requires": {
3831
3831
  "debounce": "^1.2.1",
3832
3832
  "debug": "^4.3.3",
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "zigbee-herdsman-converters",
3
- "version": "14.0.433",
3
+ "version": "14.0.436",
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.0",
40
40
  "tar-stream": "^2.2.0",
41
- "zigbee-herdsman": "^0.14.16"
41
+ "zigbee-herdsman": "^0.14.20"
42
42
  },
43
43
  "devDependencies": {
44
44
  "eslint": "*",