From 3c604dfa6d38995a0acfa332ded6534a30757708 Mon Sep 17 00:00:00 2001 From: Dustin Henning Date: Fri, 13 Dec 2024 13:48:14 -0500 Subject: [PATCH 01/18] reorder parameters to match doc --- .../config/config/devices/0x027a/zen15.json | 104 +++++++++--------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/packages/config/config/devices/0x027a/zen15.json b/packages/config/config/devices/0x027a/zen15.json index 73cd2bdb7996..7c65942b3fd2 100644 --- a/packages/config/config/devices/0x027a/zen15.json +++ b/packages/config/config/devices/0x027a/zen15.json @@ -15,6 +15,51 @@ "max": "255.255" }, "paramInformation": [ + { + "#": "27", + "$if": "firmwareVersion < 1.3", + "label": "LED Indicator", + "valueSize": 1, + "defaultValue": 0, + "allowManualEntry": false, + "options": [ + { + "label": "Always on", + "value": 0 + }, + { + "label": "Momentary (At status change)", + "value": 1 + } + ] + }, + { + "#": "27", + "$if": "firmwareVersion >= 1.3", + "label": "LED Power Consumption Indicator", + "description": "Pink = Power Switch is off; Blue = 0–300 W; Cyan = 300–600 W; Green = 600–900 W; Yellow = 900–1200 W; Red = 1200–1500 W; Purple = 1500–1800 W; Purple blink = over 1800 W", + "valueSize": 1, + "defaultValue": 1, + "allowManualEntry": false, + "options": [ + { + "label": "Always on", + "value": 0 + }, + { + "label": "On when switch is on, off when switch is off", + "value": 1 + }, + { + "label": "5 seconds following switch activation, then off", + "value": 2 + }, + { + "label": "Always off (Except for inclusion, exclusion, and Z-Wave range test)", + "value": 3 + } + ] + }, { "#": "20", "$import": "~/templates/master_template.json#base_enable_disable", @@ -78,58 +123,6 @@ } ] }, - { - "#": "30", - "$if": "firmwareVersion >= 1.3", - "$import": "~/templates/master_template.json#base_enable_disable", - "label": "Manual Control", - "description": "Disables manual control from the device itself" - }, - { - "#": "27", - "$if": "firmwareVersion < 1.3", - "label": "LED Indicator", - "valueSize": 1, - "defaultValue": 0, - "allowManualEntry": false, - "options": [ - { - "label": "Always on", - "value": 0 - }, - { - "label": "Momentary (At status change)", - "value": 1 - } - ] - }, - { - "#": "27", - "$if": "firmwareVersion >= 1.3", - "label": "LED Power Consumption Indicator", - "description": "Pink = Power Switch is off; Blue = 0–300 W; Cyan = 300–600 W; Green = 600–900 W; Yellow = 900–1200 W; Red = 1200–1500 W; Purple = 1500–1800 W; Purple blink = over 1800 W", - "valueSize": 1, - "defaultValue": 1, - "allowManualEntry": false, - "options": [ - { - "label": "Always on", - "value": 0 - }, - { - "label": "On when switch is on, off when switch is off", - "value": 1 - }, - { - "label": "5 seconds following switch activation, then off", - "value": 2 - }, - { - "label": "Always off (Except for inclusion, exclusion, and Z-Wave range test)", - "value": 3 - } - ] - }, { "#": "151", "label": "Power Report Value Threshold", @@ -220,6 +213,13 @@ "value": 0 } ] + }, + { + "#": "30", + "$if": "firmwareVersion >= 1.3", + "$import": "~/templates/master_template.json#base_enable_disable", + "label": "Manual Control", + "description": "Disables manual control from the device itself" } ], "metadata": { From 5583fddbe233ac1ffaa3abe0f95a5349a912c34f Mon Sep 17 00:00:00 2001 From: Dustin Henning Date: Fri, 13 Dec 2024 13:49:48 -0500 Subject: [PATCH 02/18] update param 20 for fw 2.10 --- packages/config/config/devices/0x027a/zen15.json | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/packages/config/config/devices/0x027a/zen15.json b/packages/config/config/devices/0x027a/zen15.json index 7c65942b3fd2..9c0da7fa1de0 100644 --- a/packages/config/config/devices/0x027a/zen15.json +++ b/packages/config/config/devices/0x027a/zen15.json @@ -62,10 +62,23 @@ }, { "#": "20", + "$if": "firmwareVersion < 2.10", "$import": "~/templates/master_template.json#base_enable_disable", "label": "Overload Protection", + "description": "Turn off once power draw on the connected device exceeds 16.5A", "defaultValue": 1 }, + { + "#": "20", + "$if": "firmwareVersion >= 2.10", + "label": "Overload Protection", + "description": "Secunds power draw on the connected device can exceed 16.5A before shut off.", + "valueSize": 1, + "unit": "seconds", + "minValue": 2, + "maxValue": 5, + "defaultValue": 2 + }, { "#": "21", "$import": "~/templates/master_template.json#state_after_power_failure_prev_on_off" From 48cabd76a316773fccead0eb099f783bf1e9968c Mon Sep 17 00:00:00 2001 From: Dustin Henning Date: Fri, 13 Dec 2024 13:50:59 -0500 Subject: [PATCH 03/18] add param 36 for fw 2.10 --- packages/config/config/devices/0x027a/zen15.json | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/packages/config/config/devices/0x027a/zen15.json b/packages/config/config/devices/0x027a/zen15.json index 9c0da7fa1de0..efd14bf1c728 100644 --- a/packages/config/config/devices/0x027a/zen15.json +++ b/packages/config/config/devices/0x027a/zen15.json @@ -79,6 +79,22 @@ "maxValue": 5, "defaultValue": 2 }, + { + "#": "36", + "$if": "firmwareVersion >= 2.10", + "label": "Overload Protection Turn On Delay", + "description": "Disable or set the delay for the automatic turn on after the unit has been turned off after the overload protection was triggered. (0 – Disabled [Default]; 10 – 65535 [seconds])", + "valueSize": 2, + "minValue": 0, + "maxValue": 65535, + "defaultValue": 0, + "options": [ + { + "label": "Disable", + "value": 0 + } + ] + }, { "#": "21", "$import": "~/templates/master_template.json#state_after_power_failure_prev_on_off" From c61eb5378c7d2e19c7c30fc81c2ac6209a54573f Mon Sep 17 00:00:00 2001 From: Dustin Henning Date: Fri, 13 Dec 2024 13:53:35 -0500 Subject: [PATCH 04/18] add param 35 for fw 2.0 --- .../config/config/devices/0x027a/zen15.json | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/packages/config/config/devices/0x027a/zen15.json b/packages/config/config/devices/0x027a/zen15.json index efd14bf1c728..df5506bb725e 100644 --- a/packages/config/config/devices/0x027a/zen15.json +++ b/packages/config/config/devices/0x027a/zen15.json @@ -99,6 +99,23 @@ "#": "21", "$import": "~/templates/master_template.json#state_after_power_failure_prev_on_off" }, + { + "#": "35", + "$if": "firmwareVersion >= 2.0", + "label": "Delay Turn-On after power outage", + "description": "Delay turn on of the relay after a power outage occurs. (0 – Disabled [Default]; 1 – 600)", + "valueSize": 2, + "unit": "seconds", + "minValue": 0, + "maxValue": 600, + "defaultValue": 0, + "options": [ + { + "label": "Disable", + "value": 0 + } + ] + }, { "#": "24", "label": "On/Off Status Change Notifications", From 5ecab3751d907d37532ccca54b10b0bfe96f3381 Mon Sep 17 00:00:00 2001 From: Dustin Henning Date: Fri, 13 Dec 2024 13:55:57 -0500 Subject: [PATCH 05/18] add param 176 and 176 for fw 2.10 --- .../config/config/devices/0x027a/zen15.json | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/packages/config/config/devices/0x027a/zen15.json b/packages/config/config/devices/0x027a/zen15.json index df5506bb725e..1b1f63c1ba38 100644 --- a/packages/config/config/devices/0x027a/zen15.json +++ b/packages/config/config/devices/0x027a/zen15.json @@ -200,6 +200,28 @@ } ] }, + { + "#": "175", + "$if": "firmwareVersion >= 2.10", + "label": "Voltage Report Threshold", + "valueSize": 1, + "unit": "volts", + "minValue": 0, + "maxValue": 255, + "defaultValue": 10 + }, + { + "#": "176", + "$if": "firmwareVersion >= 2.10", + "label": "Electrical Current Report Threshold", + "description": "Values: 0 – disabled; 1 – 65535", + "valueSize": 2, + "unit": "mA", + "minValue": 0, + "maxValue": 65535, + "defaultValue": 1000, + "unsigned": true + }, { "#": "171", "label": "Power Report Frequency", From b9a9399ed0650152d65c520d35796dd991230d35 Mon Sep 17 00:00:00 2001 From: Dustin Henning Date: Fri, 13 Dec 2024 13:57:36 -0500 Subject: [PATCH 06/18] add missing param 31 and 32 --- packages/config/config/devices/0x027a/zen15.json | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/packages/config/config/devices/0x027a/zen15.json b/packages/config/config/devices/0x027a/zen15.json index 1b1f63c1ba38..f3ed1075a8d1 100644 --- a/packages/config/config/devices/0x027a/zen15.json +++ b/packages/config/config/devices/0x027a/zen15.json @@ -288,6 +288,20 @@ "$import": "~/templates/master_template.json#base_enable_disable", "label": "Manual Control", "description": "Disables manual control from the device itself" + }, + { + "#": "31", + "$import": "~/templates/master_template.json#base_enable_disable", + "label": "Z-Wave ON Control", + "defaultValue": 1, + "description": "Disables ON control from the hub" + }, + { + "#": "32", + "$import": "~/templates/master_template.json#base_enable_disable", + "label": "Z-Wave OFF Control", + "defaultValue": 1, + "description": "Disables OFF control from the hub" } ], "metadata": { From 8ee5ed6ac072dc63486719446221c5771394eea5 Mon Sep 17 00:00:00 2001 From: Dustin Henning Date: Fri, 13 Dec 2024 14:03:50 -0500 Subject: [PATCH 07/18] add unit (watts) to param 151 --- packages/config/config/devices/0x027a/zen15.json | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/config/config/devices/0x027a/zen15.json b/packages/config/config/devices/0x027a/zen15.json index f3ed1075a8d1..62567435047c 100644 --- a/packages/config/config/devices/0x027a/zen15.json +++ b/packages/config/config/devices/0x027a/zen15.json @@ -173,6 +173,7 @@ "#": "151", "label": "Power Report Value Threshold", "valueSize": 2, + "unit": "watts", "minValue": 0, "maxValue": 65535, "defaultValue": 50, From 5fb6e15916268bbb86bac7c4768e0f8dcb8fefbf Mon Sep 17 00:00:00 2001 From: Dustin Henning Date: Fri, 13 Dec 2024 14:16:09 -0500 Subject: [PATCH 08/18] relabel param 151 and 174 to match documentation --- packages/config/config/devices/0x027a/zen15.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/config/config/devices/0x027a/zen15.json b/packages/config/config/devices/0x027a/zen15.json index 62567435047c..652efdbb9a2d 100644 --- a/packages/config/config/devices/0x027a/zen15.json +++ b/packages/config/config/devices/0x027a/zen15.json @@ -171,7 +171,7 @@ }, { "#": "151", - "label": "Power Report Value Threshold", + "label": "Power Wattage Report Value Threshold", "valueSize": 2, "unit": "watts", "minValue": 0, @@ -270,7 +270,7 @@ }, { "#": "174", - "label": "Electricity Report Frequency", + "label": "Electrical Current Report Frequency", "valueSize": 4, "unit": "seconds", "minValue": 0, From c9c406c0eeda238a4d999dd0b534ff00a65657fa Mon Sep 17 00:00:00 2001 From: Dustin Henning Date: Fri, 13 Dec 2024 14:24:58 -0500 Subject: [PATCH 09/18] set param 36 to unsigned --- packages/config/config/devices/0x027a/zen15.json | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/config/config/devices/0x027a/zen15.json b/packages/config/config/devices/0x027a/zen15.json index 652efdbb9a2d..84980c026f25 100644 --- a/packages/config/config/devices/0x027a/zen15.json +++ b/packages/config/config/devices/0x027a/zen15.json @@ -88,6 +88,7 @@ "minValue": 0, "maxValue": 65535, "defaultValue": 0, + "unsigned": true, "options": [ { "label": "Disable", From 1509aa0bd5bcfda50daff83285503367639f5cca Mon Sep 17 00:00:00 2001 From: Dustin Henning Date: Fri, 13 Dec 2024 14:39:01 -0500 Subject: [PATCH 10/18] lint --- packages/config/config/devices/0x027a/zen15.json | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/packages/config/config/devices/0x027a/zen15.json b/packages/config/config/devices/0x027a/zen15.json index 84980c026f25..f8ae5c3836c5 100644 --- a/packages/config/config/devices/0x027a/zen15.json +++ b/packages/config/config/devices/0x027a/zen15.json @@ -103,7 +103,7 @@ { "#": "35", "$if": "firmwareVersion >= 2.0", - "label": "Delay Turn-On after power outage", + "label": "Delay Turn-On After Power Outage", "description": "Delay turn on of the relay after a power outage occurs. (0 – Disabled [Default]; 1 – 600)", "valueSize": 2, "unit": "seconds", @@ -174,7 +174,7 @@ "#": "151", "label": "Power Wattage Report Value Threshold", "valueSize": 2, - "unit": "watts", + "unit": "W", "minValue": 0, "maxValue": 65535, "defaultValue": 50, @@ -207,9 +207,7 @@ "$if": "firmwareVersion >= 2.10", "label": "Voltage Report Threshold", "valueSize": 1, - "unit": "volts", - "minValue": 0, - "maxValue": 255, + "unit": "V", "defaultValue": 10 }, { @@ -295,15 +293,15 @@ "#": "31", "$import": "~/templates/master_template.json#base_enable_disable", "label": "Z-Wave ON Control", - "defaultValue": 1, - "description": "Disables ON control from the hub" + "description": "Disables ON control from the hub", + "defaultValue": 1 }, { "#": "32", "$import": "~/templates/master_template.json#base_enable_disable", "label": "Z-Wave OFF Control", - "defaultValue": 1, - "description": "Disables OFF control from the hub" + "description": "Disables OFF control from the hub", + "defaultValue": 1 } ], "metadata": { From 94936897f1c8ccdd31e382552081c55fd159423f Mon Sep 17 00:00:00 2001 From: Dustin Henning Date: Fri, 13 Dec 2024 15:39:45 -0500 Subject: [PATCH 11/18] typo --- packages/config/config/devices/0x027a/zen15.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/config/config/devices/0x027a/zen15.json b/packages/config/config/devices/0x027a/zen15.json index f8ae5c3836c5..fbda970be335 100644 --- a/packages/config/config/devices/0x027a/zen15.json +++ b/packages/config/config/devices/0x027a/zen15.json @@ -72,7 +72,7 @@ "#": "20", "$if": "firmwareVersion >= 2.10", "label": "Overload Protection", - "description": "Secunds power draw on the connected device can exceed 16.5A before shut off.", + "description": "Seconds power draw on the connected device can exceed 16.5A before shut off.", "valueSize": 1, "unit": "seconds", "minValue": 2, From fad6ca5c78a3419f7cb6beaa492c00e0d8c1379f Mon Sep 17 00:00:00 2001 From: Dustin Henning Date: Fri, 13 Dec 2024 16:02:41 -0500 Subject: [PATCH 12/18] unlint --- packages/config/config/devices/0x027a/zen15.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/config/config/devices/0x027a/zen15.json b/packages/config/config/devices/0x027a/zen15.json index fbda970be335..fd9cdb2d659f 100644 --- a/packages/config/config/devices/0x027a/zen15.json +++ b/packages/config/config/devices/0x027a/zen15.json @@ -207,6 +207,8 @@ "$if": "firmwareVersion >= 2.10", "label": "Voltage Report Threshold", "valueSize": 1, + "minValue": 0, + "maxValue": 255, "unit": "V", "defaultValue": 10 }, From 779044a058be0c6491594f822da34defd9115f4b Mon Sep 17 00:00:00 2001 From: Dustin Henning Date: Fri, 13 Dec 2024 16:12:01 -0500 Subject: [PATCH 13/18] lint --- packages/config/config/devices/0x027a/zen15.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/config/config/devices/0x027a/zen15.json b/packages/config/config/devices/0x027a/zen15.json index fd9cdb2d659f..44d64cf2d6d1 100644 --- a/packages/config/config/devices/0x027a/zen15.json +++ b/packages/config/config/devices/0x027a/zen15.json @@ -207,9 +207,9 @@ "$if": "firmwareVersion >= 2.10", "label": "Voltage Report Threshold", "valueSize": 1, + "unit": "V", "minValue": 0, "maxValue": 255, - "unit": "V", "defaultValue": 10 }, { From b9586bf29c511bd22006824faf397d4a7a3d5ba7 Mon Sep 17 00:00:00 2001 From: Dustin Henning Date: Fri, 13 Dec 2024 16:31:22 -0500 Subject: [PATCH 14/18] param 175 unsigned --- packages/config/config/devices/0x027a/zen15.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/config/config/devices/0x027a/zen15.json b/packages/config/config/devices/0x027a/zen15.json index 44d64cf2d6d1..045fc19598ad 100644 --- a/packages/config/config/devices/0x027a/zen15.json +++ b/packages/config/config/devices/0x027a/zen15.json @@ -206,11 +206,13 @@ "#": "175", "$if": "firmwareVersion >= 2.10", "label": "Voltage Report Threshold", + "description": "Values: 0 – 255; 0 – disabled", "valueSize": 1, "unit": "V", "minValue": 0, "maxValue": 255, "defaultValue": 10 + "unsigned": true, }, { "#": "176", From 5307394d245dd7d8c1ceab5a88ef45b22d401c90 Mon Sep 17 00:00:00 2001 From: Dustin Henning Date: Fri, 13 Dec 2024 16:33:41 -0500 Subject: [PATCH 15/18] lint --- packages/config/config/devices/0x027a/zen15.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/config/config/devices/0x027a/zen15.json b/packages/config/config/devices/0x027a/zen15.json index 045fc19598ad..b6f1d9a760da 100644 --- a/packages/config/config/devices/0x027a/zen15.json +++ b/packages/config/config/devices/0x027a/zen15.json @@ -211,8 +211,8 @@ "unit": "V", "minValue": 0, "maxValue": 255, - "defaultValue": 10 - "unsigned": true, + "defaultValue": 10, + "unsigned": true }, { "#": "176", From 92e0700c4278bcc89cfeda00ddd5e2c67ddaca7c Mon Sep 17 00:00:00 2001 From: Dustin Henning Date: Fri, 13 Dec 2024 16:50:33 -0500 Subject: [PATCH 16/18] Label based on firmwareVersion --- packages/config/config/devices/0x027a/zen15.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/config/config/devices/0x027a/zen15.json b/packages/config/config/devices/0x027a/zen15.json index b6f1d9a760da..68d832924f68 100644 --- a/packages/config/config/devices/0x027a/zen15.json +++ b/packages/config/config/devices/0x027a/zen15.json @@ -1,7 +1,13 @@ { "manufacturer": "Zooz", "manufacturerId": "0x027a", - "label": "ZEN15", + "label": [ + { + "$if": "firmwareVersion >= 2.0", + "value": "ZEN15 800LR" + }, + "ZEN15" + ], "description": "Power Switch", "devices": [ { From 9b5915530e3c5a52b0d7669f760e49a9de6d9bfe Mon Sep 17 00:00:00 2001 From: Dustin Henning Date: Fri, 13 Dec 2024 17:07:03 -0500 Subject: [PATCH 17/18] lint --- packages/config/config/devices/0x027a/zen15.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/config/config/devices/0x027a/zen15.json b/packages/config/config/devices/0x027a/zen15.json index 68d832924f68..e7a5c85b892b 100644 --- a/packages/config/config/devices/0x027a/zen15.json +++ b/packages/config/config/devices/0x027a/zen15.json @@ -2,12 +2,12 @@ "manufacturer": "Zooz", "manufacturerId": "0x027a", "label": [ - { - "$if": "firmwareVersion >= 2.0", - "value": "ZEN15 800LR" - }, - "ZEN15" - ], + { + "$if": "firmwareVersion >= 2.0", + "value": "ZEN15 800LR" + }, + "ZEN15" + ], "description": "Power Switch", "devices": [ { From b9ee35018a127cfd4e6e8d51fd885d23b0e7d82f Mon Sep 17 00:00:00 2001 From: Dustin Henning Date: Mon, 13 Jan 2025 10:21:53 -0500 Subject: [PATCH 18/18] Revert label change --- packages/config/config/devices/0x027a/zen15.json | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/packages/config/config/devices/0x027a/zen15.json b/packages/config/config/devices/0x027a/zen15.json index e7a5c85b892b..b6f1d9a760da 100644 --- a/packages/config/config/devices/0x027a/zen15.json +++ b/packages/config/config/devices/0x027a/zen15.json @@ -1,13 +1,7 @@ { "manufacturer": "Zooz", "manufacturerId": "0x027a", - "label": [ - { - "$if": "firmwareVersion >= 2.0", - "value": "ZEN15 800LR" - }, - "ZEN15" - ], + "label": "ZEN15", "description": "Power Switch", "devices": [ {