From 5c746820fa9f5596a3b800ff1906d67c34078f36 Mon Sep 17 00:00:00 2001 From: Jude Ibe Date: Sun, 23 Oct 2022 12:17:52 -0500 Subject: [PATCH 1/5] Correct Paremeters for Evalogik ZW39 --- .../config/config/devices/0x0312/zw39.json | 118 ++++-------------- 1 file changed, 25 insertions(+), 93 deletions(-) diff --git a/packages/config/config/devices/0x0312/zw39.json b/packages/config/config/devices/0x0312/zw39.json index 89421ab42396..40aaa5464616 100644 --- a/packages/config/config/devices/0x0312/zw39.json +++ b/packages/config/config/devices/0x0312/zw39.json @@ -25,142 +25,74 @@ "paramInformation": [ { "#": "1", - "label": "Dimming Step", - "description": "Percentage of step when switch is dimming up or down (0 = instant)", - "valueSize": 1, - "minValue": 0, - "maxValue": 99, - "defaultValue": 0 + "$import": "~/templates/master_template.json#led_indicator_four_options" }, { "#": "2", - "label": "Minimum Level", - "description": "Minimum dimming level for attached light", - "valueSize": 1, - "minValue": 1, - "maxValue": 99, - "defaultValue": 1 - }, - { - "#": "3", - "$import": "~/templates/master_template.json#led_indicator_four_options", - "defaultValue": 1 + "$import": "templates/minoston_template.json#auto_off_timer" }, { "#": "4", - "$import": "~/templates/master_template.json#orientation" + "$import": "templates/minoston_template.json#auto_on_timer" }, { - "#": "5", - "$import": "templates/minoston_template.json#auto_off_timer_32767s" + "#": "6", + "$import": "templates/manufacturer_template.json#state_after_power_failure_off_on_prev", + "defaultValue": 0 }, { "#": "7", - "label": "Association Group 3 Setting", - "description": "Change how devices respond when associated in group 3", - "valueSize": 1, - "defaultValue": 0, - "allowManualEntry": false, - "options": [ - { - "label": "Dim up/down", - "value": 0 - }, - { - "label": "Keep in sync", - "value": 1 - } - ] + "$import": "~/templates/master_template.json#dimming_speed_1-99_seconds", + "defaultValue": 1 }, { "#": "8", - "label": "Default Level (local)", - "description": "Default level when light is turned on at the switch (0 = previous level)", - "valueSize": 1, - "minValue": 0, - "maxValue": 99, - "defaultValue": 0 - }, - { - "#": "9", - "label": "Default Level (Z-Wave)", - "description": "Default level when light is turned on via Z-Wave command (0 = previous level)", - "valueSize": 1, - "minValue": 0, - "maxValue": 99, - "defaultValue": 0 - }, - { - "#": "6[0x01]", - "label": "Send command on local action", - "description": "When should the switch send commands to Group 3 devices?", - "valueSize": 1, - "defaultValue": 1, - "allowManualEntry": false, + "$import": "~/templates/master_template.json#minimum_dim_level_1-99", + "defaultValue": 10, "options": [ { "label": "Disable", "value": 0 - }, - { - "label": "Enable", - "value": 1 } ] }, { - "#": "6[0x02]", - "label": "Send command on 3-way action", - "description": "When should the switch send commands to Group 3 devices?", - "valueSize": 1, - "defaultValue": 0, - "allowManualEntry": false, + "#": "9", + "$import": "~/templates/master_template.json#maximum_dim_level_1-99", + "defaultValue": 99, "options": [ { "label": "Disable", "value": 0 - }, - { - "label": "Enable", - "value": 1 } ] }, { - "#": "6[0x04]", - "label": "Send command on z-wave action", - "description": "When should the switch send commands to Group 3 devices?", + "#": "10", + "label": "Local dimmer speed control", + "description": "Local dimmer speed control", "valueSize": 1, + "minValue": 0, + "maxValue": 1, "defaultValue": 0, "allowManualEntry": false, "options": [ { - "label": "Disable", + "label": "Control by paremeter 9", "value": 0 }, { - "label": "Enable", + "label": "On/off instantly", "value": 1 } ] }, { - "#": "6[0x08]", - "label": "Send command on auto off timer", - "description": "When should the switch send commands to Group 3 devices?", - "valueSize": 1, - "defaultValue": 0, - "allowManualEntry": false, - "options": [ - { - "label": "Disable", - "value": 0 - }, - { - "label": "Enable", - "value": 1 - } - ] + "#": "11", + "$import": "~/templates/master_template.json#base_1-10_nounit", + "label": "Dimming Speed", + "description": "Adjust the dimming speed", + "defaultValue": 4 } ], "metadata": { From 66928649a64354ba21e74216b365a6ccb5243568 Mon Sep 17 00:00:00 2001 From: Jude Ibe Date: Sun, 23 Oct 2022 16:11:17 -0500 Subject: [PATCH 2/5] fix path to import template --- packages/config/config/devices/0x0312/zw39.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/config/config/devices/0x0312/zw39.json b/packages/config/config/devices/0x0312/zw39.json index 40aaa5464616..e11f9c4de71e 100644 --- a/packages/config/config/devices/0x0312/zw39.json +++ b/packages/config/config/devices/0x0312/zw39.json @@ -37,7 +37,7 @@ }, { "#": "6", - "$import": "templates/manufacturer_template.json#state_after_power_failure_off_on_prev", + "$import": "~/templates/manufacturer_template.json#state_after_power_failure_off_on_prev", "defaultValue": 0 }, { From 1bacd0d235628c7bb2e9193ba6dec45465668b1e Mon Sep 17 00:00:00 2001 From: Jude Ibe Date: Sun, 23 Oct 2022 17:13:13 -0500 Subject: [PATCH 3/5] fix(config): fix template location --- packages/config/config/devices/0x0312/zw39.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/config/config/devices/0x0312/zw39.json b/packages/config/config/devices/0x0312/zw39.json index e11f9c4de71e..df83079b4bc5 100644 --- a/packages/config/config/devices/0x0312/zw39.json +++ b/packages/config/config/devices/0x0312/zw39.json @@ -37,7 +37,7 @@ }, { "#": "6", - "$import": "~/templates/manufacturer_template.json#state_after_power_failure_off_on_prev", + "$import": "~/templates/master_template.json#state_after_power_failure_off_on_prev", "defaultValue": 0 }, { From d7642c4010d30b96b8f1bf2ff0baac285e3cf191 Mon Sep 17 00:00:00 2001 From: Jude Ibe Date: Sun, 23 Oct 2022 17:30:07 -0500 Subject: [PATCH 4/5] feat(config): remove duplicate label --- packages/config/config/devices/0x0312/zw39.json | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/packages/config/config/devices/0x0312/zw39.json b/packages/config/config/devices/0x0312/zw39.json index df83079b4bc5..192b738199f3 100644 --- a/packages/config/config/devices/0x0312/zw39.json +++ b/packages/config/config/devices/0x0312/zw39.json @@ -47,7 +47,7 @@ }, { "#": "8", - "$import": "~/templates/master_template.json#minimum_dim_level_1-99", + "$import": "~/templates/master_template.json#minimum_dim_level_0-99", "defaultValue": 10, "options": [ { @@ -58,7 +58,7 @@ }, { "#": "9", - "$import": "~/templates/master_template.json#maximum_dim_level_1-99", + "$import": "~/templates/master_template.json#maximum_dim_level_0-99", "defaultValue": 99, "options": [ { @@ -70,7 +70,6 @@ { "#": "10", "label": "Local dimmer speed control", - "description": "Local dimmer speed control", "valueSize": 1, "minValue": 0, "maxValue": 1, @@ -90,8 +89,7 @@ { "#": "11", "$import": "~/templates/master_template.json#base_1-10_nounit", - "label": "Dimming Speed", - "description": "Adjust the dimming speed", + "label": "Dimming Rate", "defaultValue": 4 } ], From b8a790c5c8a5a0309145c49fcbbea05e7bdbdfc6 Mon Sep 17 00:00:00 2001 From: Dominic Griesel Date: Wed, 25 Jan 2023 15:54:56 +0100 Subject: [PATCH 5/5] fix: cleanup --- packages/config/config/devices/0x0312/zw39.json | 7 +++---- specs | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/packages/config/config/devices/0x0312/zw39.json b/packages/config/config/devices/0x0312/zw39.json index 192b738199f3..d2aad8788e22 100644 --- a/packages/config/config/devices/0x0312/zw39.json +++ b/packages/config/config/devices/0x0312/zw39.json @@ -59,7 +59,6 @@ { "#": "9", "$import": "~/templates/master_template.json#maximum_dim_level_0-99", - "defaultValue": 99, "options": [ { "label": "Disable", @@ -69,7 +68,7 @@ }, { "#": "10", - "label": "Local dimmer speed control", + "label": "Local Dimmer Speed Control", "valueSize": 1, "minValue": 0, "maxValue": 1, @@ -77,11 +76,11 @@ "allowManualEntry": false, "options": [ { - "label": "Control by paremeter 9", + "label": "Controlled by parameter 9", "value": 0 }, { - "label": "On/off instantly", + "label": "Instant On/Off", "value": 1 } ] diff --git a/specs b/specs index 9cdd880fe220..d6c115ec1c46 160000 --- a/specs +++ b/specs @@ -1 +1 @@ -Subproject commit 9cdd880fe2204819df5b9e7d4715e6595791d744 +Subproject commit d6c115ec1c46dd1db9f3dca3fc2106df577fac9c