Skip to content

Commit 2efa822

Browse files
jonnysciarjonnysciar
authored
Merge branch 'Koenkk:master' into master
2 parents 1c4c284 + 11fd4ac commit 2efa822

22 files changed

+244
-37
lines changed

‎.release-please-manifest.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
".": "20.24.0"
2+
".": "20.26.0"
33
}

‎CHANGELOG.md

+48
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,53 @@
11
# Changelog
22

3+
## [20.26.0](https://github.com/Koenkk/zigbee-herdsman-converters/compare/v20.25.0...v20.26.0) (2024-10-12)
4+
5+
6+
### Features
7+
8+
* **add:** 046677584658 https://github.com/Koenkk/zigbee2mqtt/discussions/24269 ([870c47b](https://github.com/Koenkk/zigbee-herdsman-converters/commit/870c47b5b4c555a6bab5d1dd23c69061809440d5))
9+
* **add:** 1745930V7 ([#8111](https://github.com/Koenkk/zigbee-herdsman-converters/issues/8111)) ([a7a331d](https://github.com/Koenkk/zigbee-herdsman-converters/commit/a7a331d17e5fb019fbff40227dac3586ee4842e2))
10+
* **add:** 3RWK0148Z ([#8106](https://github.com/Koenkk/zigbee-herdsman-converters/issues/8106)) ([357c46e](https://github.com/Koenkk/zigbee-herdsman-converters/commit/357c46efc4edd2afbec040c869c3172830ff6832))
11+
* **add:** 4512782 ([#8119](https://github.com/Koenkk/zigbee-herdsman-converters/issues/8119)) ([a4727d7](https://github.com/Koenkk/zigbee-herdsman-converters/commit/a4727d7fa1c6d9ddc90fcb3f62cbd95b09c1ef4c))
12+
* **add:** HK-SL-DIM-AU-R-A ([#8118](https://github.com/Koenkk/zigbee-herdsman-converters/issues/8118)) ([df23a20](https://github.com/Koenkk/zigbee-herdsman-converters/commit/df23a20b11cce8ff3da62d2033820e51a08bbf59))
13+
* **add:** SLR1d ([#8105](https://github.com/Koenkk/zigbee-herdsman-converters/issues/8105)) ([171aaea](https://github.com/Koenkk/zigbee-herdsman-converters/commit/171aaea6fb200c30556486cd2f9dd86ba03a242b))
14+
* **add:** TSL-TRV-TV05ZG ([#8109](https://github.com/Koenkk/zigbee-herdsman-converters/issues/8109)) ([784e172](https://github.com/Koenkk/zigbee-herdsman-converters/commit/784e1729833e7a7ca9d4411a1fa3f0b9d960af73))
15+
* **add:** YMI70A ([#8095](https://github.com/Koenkk/zigbee-herdsman-converters/issues/8095)) ([9c405da](https://github.com/Koenkk/zigbee-herdsman-converters/commit/9c405da8330a4a416b86f58debe9da538b764dcf))
16+
17+
18+
### Bug Fixes
19+
20+
* **detect:** Detect `_TZ3210_ifga63rg` as Moes ZB-TDC6-RCW-E14 ([#8114](https://github.com/Koenkk/zigbee-herdsman-converters/issues/8114)) ([f9d88fa](https://github.com/Koenkk/zigbee-herdsman-converters/commit/f9d88facda769b040bd8d7d9c956a10748585fa5))
21+
* **detect:** Detect `LCZ002` as Philips 8719514419278 ([#8110](https://github.com/Koenkk/zigbee-herdsman-converters/issues/8110)) ([6c3ec8a](https://github.com/Koenkk/zigbee-herdsman-converters/commit/6c3ec8a5a0a1e33b63056c468b5a2f5f4c1c7000))
22+
* **detect:** Detect `TRADFRIbulbE17WScandleopal440lm` as IKEA LED1949C5 ([#8112](https://github.com/Koenkk/zigbee-herdsman-converters/issues/8112)) ([e644326](https://github.com/Koenkk/zigbee-herdsman-converters/commit/e64432683aefe2fccfcb0b49b4df87174454b9c8))
23+
* Fix Tuya ZY-M100-24GV2 move/presence sensitivty range https://github.com/Koenkk/zigbee2mqtt/issues/24049 ([e9cc0de](https://github.com/Koenkk/zigbee-herdsman-converters/commit/e9cc0def058c7e65b8b2b235102b98ee5c1bfe5d))
24+
* Improve reporting of IKEA E2206 ([#8060](https://github.com/Koenkk/zigbee-herdsman-converters/issues/8060)) ([6e66a7d](https://github.com/Koenkk/zigbee-herdsman-converters/commit/6e66a7d3ab8fde6ac1d26076d189d1b54f20e320))
25+
26+
## [20.25.0](https://github.com/Koenkk/zigbee-herdsman-converters/compare/v20.24.0...v20.25.0) (2024-10-10)
27+
28+
29+
### Features
30+
31+
* **add:** 929003816901 ([#8102](https://github.com/Koenkk/zigbee-herdsman-converters/issues/8102)) ([4b88f21](https://github.com/Koenkk/zigbee-herdsman-converters/commit/4b88f212c5871b054f7c47e73f5093d29e88485b))
32+
* **add:** E22-N1E ([#8107](https://github.com/Koenkk/zigbee-herdsman-converters/issues/8107)) ([5c3c560](https://github.com/Koenkk/zigbee-herdsman-converters/commit/5c3c5605b0c1a8139bc82a2ba1f5ef68ab90a2e5))
33+
* **add:** GL-SD-001P ([8eea12a](https://github.com/Koenkk/zigbee-herdsman-converters/commit/8eea12a411d895315f5a1dc95805f7c16b6251ff))
34+
35+
36+
### Bug Fixes
37+
38+
* Change ZWT198/ZWT100-BH minimum deadzone value and step ([#8100](https://github.com/Koenkk/zigbee-herdsman-converters/issues/8100)) ([35822d5](https://github.com/Koenkk/zigbee-herdsman-converters/commit/35822d5f5906fb54780fa148a86ebef183220ef4))
39+
* **detect:** Detect `_TZ3000_wmlc9p9z` as Tuya TS0207_repeater https://github.com/Koenkk/zigbee2mqtt/issues/7901 ([508ab1d](https://github.com/Koenkk/zigbee-herdsman-converters/commit/508ab1ddefcea5a0204920c8025228c75e13b3cc))
40+
* **detect:** Detect `_TZE284_nlrfgpny` as Neo NAS-AB06B2 ([#8091](https://github.com/Koenkk/zigbee-herdsman-converters/issues/8091)) ([53f2959](https://github.com/Koenkk/zigbee-herdsman-converters/commit/53f2959a5bf0935fa74b10b126bff52b522c559c))
41+
* **detect:** Detect `PLUG COMPACT EU EM T` as LEDVANCE 4099854293276 ([#8086](https://github.com/Koenkk/zigbee-herdsman-converters/issues/8086)) ([dbde944](https://github.com/Koenkk/zigbee-herdsman-converters/commit/dbde944ae2a1b601d4fbb25d904798d881c9851c))
42+
* **detect:** Detect `SPM01X` as SPM01-U01 and SPM02X as SPM02-U01 ([#8101](https://github.com/Koenkk/zigbee-herdsman-converters/issues/8101)) ([96b0cad](https://github.com/Koenkk/zigbee-herdsman-converters/commit/96b0cada2e3e36e38639f0119baa8d737b116cdd))
43+
* Fix Aqara DJT11LM x/y/` values https://github.com/Koenkk/zigbee2mqtt/discussions/24185 ([6e6921e](https://github.com/Koenkk/zigbee-herdsman-converters/commit/6e6921ea83a56ea56942292f4e27a9269a15ebcb))
44+
* Fix Legrand device pairing ([#8093](https://github.com/Koenkk/zigbee-herdsman-converters/issues/8093)) ([ef59340](https://github.com/Koenkk/zigbee-herdsman-converters/commit/ef59340c723f2cf8ea8381997a9de69b431c657e))
45+
* Fix Lumi ZNCLBL01LM state and position reporting https://github.com/Koenkk/zigbee2mqtt/issues/23557 ([1c92165](https://github.com/Koenkk/zigbee-herdsman-converters/commit/1c92165a06fe89337c83cf87ec19f261f3e55454))
46+
* Fix ShinaSystem PMM-300Z2 and PMM-300Z3 ac frequency ([#8094](https://github.com/Koenkk/zigbee-herdsman-converters/issues/8094)) ([6b36819](https://github.com/Koenkk/zigbee-herdsman-converters/commit/6b368190fc311ae33a7bd768f89050e9462404d4))
47+
* Fix some Tuya devices not reporting data https://github.com/Koenkk/zigbee2mqtt/issues/24261 ([bdefb31](https://github.com/Koenkk/zigbee-herdsman-converters/commit/bdefb3122faea816593f00955f8d39651f8aa9e5))
48+
* Fix Tuya ZWT198/ZWT100-BH `manuSpecificTuya.mcuVersionRequest` times out https://github.com/Koenkk/zigbee2mqtt/issues/23874 ([0366d33](https://github.com/Koenkk/zigbee-herdsman-converters/commit/0366d33b3bc3d1ba360b941bce27cfa39b62c26a))
49+
* Remove position from Siterwell GS361A-H04 ([#8092](https://github.com/Koenkk/zigbee-herdsman-converters/issues/8092)) ([51d99cc](https://github.com/Koenkk/zigbee-herdsman-converters/commit/51d99cc42ba5919fd35d16a7a8ad13528a3553c7))
50+
351
## [20.24.0](https://github.com/Koenkk/zigbee-herdsman-converters/compare/v20.23.1...v20.24.0) (2024-10-06)
452

553

‎package-lock.json

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "zigbee-herdsman-converters",
3-
"version": "20.24.0",
3+
"version": "20.26.0",
44
"description": "Collection of device converters to be used with zigbee-herdsman",
55
"main": "index.js",
66
"types": "index.d.ts",

‎src/devices/bituo_technik.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const e = exposes.presets;
77

88
const definitions: DefinitionWithExtend[] = [
99
{
10-
zigbeeModel: ['SPM01X001'],
10+
zigbeeModel: ['SPM01X001', 'SPM01X'],
1111
model: 'SPM01-U01',
1212
vendor: 'BITUO TECHNIK',
1313
description: 'Smart energy sensor',
@@ -38,7 +38,7 @@ const definitions: DefinitionWithExtend[] = [
3838
},
3939
},
4040
{
41-
zigbeeModel: ['SPM02X001'],
41+
zigbeeModel: ['SPM02X001', 'SPM02X'],
4242
model: 'SPM02-U01',
4343
vendor: 'BITUO TECHNIK',
4444
description: 'Smart energy sensor',

‎src/devices/gledopto.ts

+7
Original file line numberDiff line numberDiff line change
@@ -845,6 +845,13 @@ const definitions: DefinitionWithExtend[] = [
845845
description: 'Zigbee 30W Floodlight RGB+CCT',
846846
extend: [gledoptoLight({colorTemp: {range: undefined}, color: true})],
847847
},
848+
{
849+
zigbeeModel: ['GL-SD-001P'],
850+
model: 'GL-SD-001P',
851+
vendor: 'Gledopto',
852+
description: 'Triac-dimmer',
853+
extend: [light()],
854+
},
848855
{
849856
zigbeeModel: ['GL-FL-005TZS'],
850857
model: 'GL-FL-005TZS',

‎src/devices/hive.ts

+40
Original file line numberDiff line numberDiff line change
@@ -333,6 +333,46 @@ const definitions: DefinitionWithExtend[] = [
333333
await reporting.thermostatTemperatureSetpointHoldDuration(endpoint);
334334
},
335335
},
336+
{
337+
zigbeeModel: ['SLR1d'],
338+
model: 'SLR1d',
339+
vendor: 'Hive',
340+
description: 'Single channel receiver',
341+
fromZigbee: [fz.thermostat, fz.thermostat_weekly_schedule],
342+
toZigbee: [
343+
tz.thermostat_local_temperature,
344+
tz.thermostat_system_mode,
345+
tz.thermostat_running_state,
346+
tz.thermostat_occupied_heating_setpoint,
347+
tz.thermostat_control_sequence_of_operation,
348+
tz.thermostat_weekly_schedule,
349+
tz.thermostat_clear_weekly_schedule,
350+
tz.thermostat_temperature_setpoint_hold,
351+
tz.thermostat_temperature_setpoint_hold_duration,
352+
],
353+
exposes: [
354+
e
355+
.climate()
356+
.withSetpoint('occupied_heating_setpoint', 5, 32, 0.5)
357+
.withLocalTemperature()
358+
.withSystemMode(['off', 'auto', 'heat'])
359+
.withRunningState(['idle', 'heat']),
360+
e
361+
.binary('temperature_setpoint_hold', ea.ALL, true, false)
362+
.withDescription(
363+
'Prevent changes. `false` = run normally. `true` = prevent from making changes.' +
364+
' Must be set to `false` when system_mode = off or `true` for heat',
365+
),
366+
e
367+
.numeric('temperature_setpoint_hold_duration', ea.ALL)
368+
.withValueMin(0)
369+
.withValueMax(65535)
370+
.withDescription(
371+
'Period in minutes for which the setpoint hold will be active. 65535 = attribute not' +
372+
' used. 0 to 360 to match the remote display',
373+
),
374+
],
375+
},
336376
{
337377
zigbeeModel: ['SLR2'],
338378
model: 'SLR2',

‎src/devices/ikea.ts

+11-3
Original file line numberDiff line numberDiff line change
@@ -315,10 +315,10 @@ const definitions: DefinitionWithExtend[] = [
315315
extend: [addCustomClusterManuSpecificIkeaUnknown(), ikeaLight(), identify()],
316316
},
317317
{
318-
zigbeeModel: ['TRADFRIbulbE14WScandleopal470lm', 'TRADFRIbulbE12WScandleopal450lm'],
318+
zigbeeModel: ['TRADFRIbulbE14WScandleopal470lm', 'TRADFRIbulbE12WScandleopal450lm', 'TRADFRIbulbE17WScandleopal440lm'],
319319
model: 'LED1949C5',
320320
vendor: 'IKEA',
321-
description: 'TRADFRI bulb E12/E14, white spectrum, candle, opal, 450/470 lm',
321+
description: 'TRADFRI bulb E12/E14/E17, white spectrum, candle, opal, 450/470/440 lm',
322322
extend: [addCustomClusterManuSpecificIkeaUnknown(), ikeaLight({colorTemp: true}), identify()],
323323
},
324324
{
@@ -602,7 +602,15 @@ const definitions: DefinitionWithExtend[] = [
602602
model: 'E2206',
603603
vendor: 'IKEA',
604604
description: 'INSPELNING smart plug',
605-
extend: [addCustomClusterManuSpecificIkeaUnknown(), onOff(), identify(), ota(), electricityMeter()],
605+
extend: [addCustomClusterManuSpecificIkeaUnknown(), onOff(), identify(), ikeaOta(), electricityMeter()],
606+
configure: async (device) => {
607+
const endpoint = device.getEndpoint(1);
608+
// Enable reporting of powerDivisor, needs to change dynamically with the amount of power
609+
// For details, see: https://github.com/Koenkk/zigbee2mqtt/issues/23961#issuecomment-2366733453
610+
await endpoint.configureReporting('haElectricalMeasurement', [
611+
{attribute: 'acPowerDivisor', minimumReportInterval: 10, maximumReportInterval: 65000, reportableChange: 1},
612+
]);
613+
},
606614
},
607615
// #endregion on/off controls
608616
// #region blinds

‎src/devices/ledvance.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ const definitions: DefinitionWithExtend[] = [
4646
extend: [onOff(), electricityMeter()],
4747
},
4848
{
49-
zigbeeModel: ['PLUG COMPACT OUTDOOR EU EM T'],
49+
zigbeeModel: ['PLUG COMPACT OUTDOOR EU EM T', 'PLUG COMPACT EU EM T'],
5050
model: '4099854293276',
5151
vendor: 'LEDVANCE',
5252
description: 'SMART+ Compact outdoor plug EU with energy meter',

‎src/devices/namron.ts

+11
Original file line numberDiff line numberDiff line change
@@ -1366,6 +1366,17 @@ const definitions: DefinitionWithExtend[] = [
13661366
],
13671367
},
13681368
},
1369+
{
1370+
zigbeeModel: ['4512782', '4512781'],
1371+
model: '4512782',
1372+
vendor: 'Namron AS',
1373+
description: 'Rotary dimmer with screen',
1374+
extend: [
1375+
light({effect: false, configureReporting: true, powerOnBehavior: false}),
1376+
electricityMeter({voltage: false, current: false, configureReporting: true}),
1377+
],
1378+
meta: {},
1379+
},
13691380
];
13701381

13711382
export default definitions;

‎src/devices/neo.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ const definitions: DefinitionWithExtend[] = [
103103
},
104104
},
105105
{
106-
fingerprint: tuya.fingerprint('TS0601', ['_TZE200_nlrfgpny', '_TZE204_nlrfgpny']),
106+
fingerprint: tuya.fingerprint('TS0601', ['_TZE200_nlrfgpny', '_TZE284_nlrfgpny', '_TZE204_nlrfgpny']),
107107
model: 'NAS-AB06B2',
108108
vendor: 'Neo',
109109
description: 'Outdoor solar alarm',

‎src/devices/philips.ts

+22-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ const definitions: DefinitionWithExtend[] = [
128128
extend: [philipsLight({colorTemp: {range: [153, 454]}})],
129129
},
130130
{
131-
zigbeeModel: ['LCZ001'],
131+
zigbeeModel: ['LCZ001', 'LCZ002'],
132132
model: '8719514419278',
133133
vendor: 'Philips',
134134
description: 'Hue Ellipse E27 smart bulb',
@@ -1107,6 +1107,13 @@ const definitions: DefinitionWithExtend[] = [
11071107
description: 'Hue white and color ambiance LightStrip plus',
11081108
extend: [philipsLight({colorTemp: {range: undefined}, color: true})],
11091109
},
1110+
{
1111+
zigbeeModel: ['LCL008'],
1112+
model: '929003816901',
1113+
vendor: 'Philips',
1114+
description: 'Philips Hue indoor 10 Ft smart LED solo lightstrip',
1115+
extend: [philipsLight({colorTemp: {range: [153, 500]}, color: {modes: ['xy', 'hs'], enhancedHue: true}})],
1116+
},
11101117
{
11111118
zigbeeModel: ['LCL002'],
11121119
model: '9290022890',
@@ -1862,6 +1869,13 @@ const definitions: DefinitionWithExtend[] = [
18621869
description: 'Hue outdoor Impress wall lamp',
18631870
extend: [philipsLight({colorTemp: {range: undefined}, color: true})],
18641871
},
1872+
{
1873+
zigbeeModel: ['1745930V7'],
1874+
model: '1745930V7',
1875+
vendor: 'Philips',
1876+
description: 'Hue outdoor Impress wall lamp',
1877+
extend: [philipsLight({colorTemp: {range: [153, 500]}, color: {modes: ['xy', 'hs'], enhancedHue: true}})],
1878+
},
18651879
{
18661880
zigbeeModel: ['1745930P7'],
18671881
model: '1745930P7',
@@ -3033,6 +3047,13 @@ const definitions: DefinitionWithExtend[] = [
30333047
description: 'Hue White and color ambiance GU10 spot LED with Bluetooth',
30343048
extend: [philipsLight({colorTemp: {range: [153, 500]}, color: true})],
30353049
},
3050+
{
3051+
zigbeeModel: ['LCG007'],
3052+
model: '046677584658',
3053+
vendor: 'Philips',
3054+
description: 'Hue White and color ambiance GU10 spot LED with Bluetooth',
3055+
extend: [philipsLight({colorTemp: {range: [153, 500]}, color: true})],
3056+
},
30363057
{
30373058
zigbeeModel: ['5309030P9', '5309031P9', '5309030P6', '5309031P6', '929003046101'],
30383059
model: '5309030P9',

‎src/devices/sengled.ts

+12
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,18 @@ const definitions: DefinitionWithExtend[] = [
8686
ota(),
8787
],
8888
},
89+
{
90+
zigbeeModel: ['E22-N1E'],
91+
model: 'E22-N1E',
92+
vendor: 'Sengled',
93+
description: 'Smart LED multicolor BR30 bulb',
94+
extend: [
95+
forcePowerSource({powerSource: 'Mains (single phase)'}),
96+
sengledLight({colorTemp: {range: [154, 500]}, color: {modes: ['xy']}}),
97+
electricityMeter({cluster: 'metering'}),
98+
ota(),
99+
],
100+
},
89101
{
90102
zigbeeModel: ['E12-N1E'],
91103
model: 'E12-N1E',

‎src/devices/shinasystem.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -586,15 +586,15 @@ const definitions: DefinitionWithExtend[] = [
586586
vendor: 'ShinaSystem',
587587
ota: ota.zigbeeOTA,
588588
description: 'SiHAS energy monitor',
589-
extend: [electricityMeter({acFrequency: true, powerFactor: true}), temperature()],
589+
extend: [electricityMeter({acFrequency: {multiplier: 1, divisor: 10}, powerFactor: true}), temperature()],
590590
},
591591
{
592592
zigbeeModel: ['PMM-300Z3'],
593593
model: 'PMM-300Z3',
594594
vendor: 'ShinaSystem',
595595
ota: ota.zigbeeOTA,
596596
description: 'SiHAS 3phase energy monitor',
597-
extend: [electricityMeter({acFrequency: true, powerFactor: true}), temperature()],
597+
extend: [electricityMeter({acFrequency: {multiplier: 1, divisor: 10}, powerFactor: true}), temperature()],
598598
},
599599
{
600600
zigbeeModel: ['DLM-300Z'],

‎src/devices/siterwell.ts

-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ const definitions: DefinitionWithExtend[] = [
6060
e.window_detection(),
6161
e.battery(),
6262
e.valve_detection(),
63-
e.position().withDescription('TRV valve position in %.'),
6463
e
6564
.climate()
6665
.withSetpoint('current_heating_setpoint', 5, 30, 0.5, ea.STATE_SET)

‎src/devices/sunricher.ts

+7
Original file line numberDiff line numberDiff line change
@@ -357,6 +357,13 @@ const definitions: DefinitionWithExtend[] = [
357357
{vendor: 'Samotech', model: 'SM311'},
358358
],
359359
},
360+
{
361+
zigbeeModel: ['HK-SL-DIM-AU-R-A'],
362+
model: 'HK-SL-DIM-AU-R-A',
363+
vendor: 'Sunricher',
364+
description: 'ZigBee knob smart dimmer',
365+
extend: [identify(), electricityMeter(), light({configureReporting: true})],
366+
},
360367
{
361368
zigbeeModel: ['ZG2835'],
362369
model: 'ZG2835',

‎src/devices/third_reality.ts

+25-2
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ const definitions: DefinitionWithExtend[] = [
283283
extend: [
284284
temperature(),
285285
humidity(),
286-
battery({voltage: true}),
286+
battery(),
287287
deviceAddCustomCluster('3rSpecialCluster', {
288288
ID: 0xff01,
289289
manufacturerCode: 0x1233,
@@ -332,7 +332,7 @@ const definitions: DefinitionWithExtend[] = [
332332
battery(),
333333
deviceAddCustomCluster('3rSpecialCluster', {
334334
ID: 0xff01,
335-
manufacturerCode: 0x1233,
335+
manufacturerCode: 0x1407,
336336
attributes: {
337337
celsiusDegreeCalibration: {ID: 0x0031, type: Zcl.DataType.INT16},
338338
humidityCalibration: {ID: 0x0032, type: Zcl.DataType.INT16},
@@ -344,6 +344,29 @@ const definitions: DefinitionWithExtend[] = [
344344
],
345345
ota: ota.zigbeeOTA,
346346
},
347+
{
348+
zigbeeModel: ['3RWK0148Z'],
349+
model: '3RWK0148Z',
350+
vendor: 'Third Reality',
351+
description: 'Smart watering kit',
352+
extend: [
353+
battery(),
354+
onOff(),
355+
deviceAddCustomCluster('3rWateringSpecialCluster', {
356+
ID: 0xfff2,
357+
manufacturerCode: 0x1407,
358+
attributes: {
359+
watering_times: {ID: 0x0000, type: Zcl.DataType.UINT8},
360+
interval_day: {ID: 0x0001, type: Zcl.DataType.UINT8},
361+
more_watering_times: {ID: 0x0002, type: Zcl.DataType.UINT16},
362+
water_speed_control: {ID: 0x0003, type: Zcl.DataType.UINT8},
363+
},
364+
commands: {},
365+
commandsResponse: {},
366+
}),
367+
],
368+
ota: ota.zigbeeOTA,
369+
},
347370
{
348371
zigbeeModel: ['3RSP02028BZ'],
349372
model: '3RSP02028BZ',

0 commit comments

Comments
 (0)