diff --git a/packages/config/config/devices/0x027a/templates/zooz_template.json b/packages/config/config/devices/0x027a/templates/zooz_template.json index 135125f2e410..5b5f12f32270 100644 --- a/packages/config/config/devices/0x027a/templates/zooz_template.json +++ b/packages/config/config/devices/0x027a/templates/zooz_template.json @@ -1,8 +1,7 @@ { - // Auto-On/Off-Timers for ZEN3x and ZEN7x - "auto_timer_base_0x_3x_7x": { + // Auto-On/Off-Timers for ZEN0x, ZEN1x (except ZEN15), ZEN3x and ZEN7x + "auto_timer_base_0x_1x_3x_7x_nounit": { "valueSize": 4, - "unit": "minutes", "minValue": 0, "maxValue": 65535, "defaultValue": 0, @@ -14,13 +13,17 @@ } ] }, - "auto_off_timer_0x_3x_7x": { + "auto_timer_base_0x_1x_3x_7x": { + "$import": "#auto_timer_base_0x_1x_3x_7x_nounit", + "unit": "minutes" + }, + "auto_off_timer_0x_1x_3x_7x": { "label": "Auto Turn-Off Timer", - "$import": "#auto_timer_base_0x_3x_7x" + "$import": "#auto_timer_base_0x_1x_3x_7x" }, - "auto_on_timer_0x_3x_7x": { + "auto_on_timer_0x_1x_3x_7x": { "label": "Auto Turn-On Timer", - "$import": "#auto_timer_base_0x_3x_7x" + "$import": "#auto_timer_base_0x_1x_3x_7x" }, // Auto-On/Off-Timers for ZEN5x with fixed time unit diff --git a/packages/config/config/devices/0x027a/zen05.json b/packages/config/config/devices/0x027a/zen05.json index f9873e5ceb1a..919377d3cedc 100644 --- a/packages/config/config/devices/0x027a/zen05.json +++ b/packages/config/config/devices/0x027a/zen05.json @@ -42,11 +42,11 @@ }, { "#": "2", - "$import": "templates/zooz_template.json#auto_off_timer_0x_3x_7x" + "$import": "templates/zooz_template.json#auto_off_timer_0x_1x_3x_7x" }, { "#": "4", - "$import": "templates/zooz_template.json#auto_on_timer_0x_3x_7x" + "$import": "templates/zooz_template.json#auto_on_timer_0x_1x_3x_7x" }, { "#": "6", diff --git a/packages/config/config/devices/0x027a/zen14.json b/packages/config/config/devices/0x027a/zen14.json index f0f3e5078c34..8a7f5314affb 100644 --- a/packages/config/config/devices/0x027a/zen14.json +++ b/packages/config/config/devices/0x027a/zen14.json @@ -36,22 +36,22 @@ }, { "#": "2", - "$import": "templates/zooz_template.json#auto_off_timer_duration", - "label": "Auto Turn-Off Timer Duration (Outlet 1)" + "$import": "templates/zooz_template.json#auto_off_timer_0x_1x_3x_7x", + "label": "Auto Turn-Off Timer (Outlet 1)" }, { "#": "3", - "$import": "templates/zooz_template.json#auto_off_timer_duration", - "label": "Auto Turn-Off Timer Duration (Outlet 2)" + "$import": "templates/zooz_template.json#auto_off_timer_0x_1x_3x_7x", + "label": "Auto Turn-Off Timer (Outlet 2)" }, { "#": "4", - "$import": "~/templates/master_template.json#base_enable_disable", + "$import": "templates/zooz_template.json#auto_on_timer_0x_1x_3x_7x", "label": "Auto Turn-On Timer (Outlet 1)" }, { "#": "5", - "$import": "~/templates/master_template.json#base_enable_disable", + "$import": "templates/zooz_template.json#auto_on_timer_0x_1x_3x_7x", "label": "Auto Turn-On Timer (Outlet 2)" }, { diff --git a/packages/config/config/devices/0x027a/zen16.json b/packages/config/config/devices/0x027a/zen16.json index 456f8c705817..b019fb90b59a 100644 --- a/packages/config/config/devices/0x027a/zen16.json +++ b/packages/config/config/devices/0x027a/zen16.json @@ -126,17 +126,15 @@ { "#": "6", "$if": "firmwareVersion < 1.1", - "$import": "~/templates/master_template.json#base_0-65535", - "label": "Relay 1: Auto Turn-Off Timer", - "description": "Sets the time after which relay 1 turns off once it has been turned on.", - "unit": "minutes" + "$import": "templates/zooz_template.json#auto_off_timer_0x_1x_3x_7x", + "label": "Relay 1: Auto Turn-Off Timer" }, { "#": "6", "$if": "firmwareVersion >= 1.1", - "$import": "~/templates/master_template.json#base_0-65535", + "$import": "templates/zooz_template.json#auto_timer_base_0x_1x_3x_7x_nounit", "label": "Relay 1: Auto Turn-Off Timer", - "description": "Sets the time after which relay 1 turns off once it has been turned on. Using the units defined in parameter 15." + "description": "Unit defined in parameter 15." }, { "#": "15", @@ -163,17 +161,15 @@ { "#": "7", "$if": "firmwareVersion < 1.1", - "$import": "~/templates/master_template.json#base_0-65535", - "label": "Relay 1: Auto Turn-On Timer", - "description": "Sets the time after which relay 1 turns on once it has been turned off.", - "unit": "minutes" + "$import": "templates/zooz_template.json#auto_on_timer_0x_1x_3x_7x", + "label": "Relay 1: Auto Turn-On Timer" }, { "#": "7", "$if": "firmwareVersion >= 1.1", - "$import": "~/templates/master_template.json#base_0-65535", + "$import": "templates/zooz_template.json#auto_timer_base_0x_1x_3x_7x_nounit", "label": "Relay 1: Auto Turn-On Timer", - "description": "Sets the time after which relay 1 turns on once it has been turned off. Using the units defined in parameter 16." + "description": "Unit defined in parameter 16." }, { "#": "16", @@ -184,17 +180,15 @@ { "#": "8", "$if": "firmwareVersion < 1.1", - "$import": "~/templates/master_template.json#base_0-65535", - "label": "Relay 2: Auto Turn-Off Timer", - "description": "Sets the time after which relay 2 turns off once it has been turned on.", - "unit": "minutes" + "$import": "templates/zooz_template.json#auto_off_timer_0x_1x_3x_7x", + "label": "Relay 2: Auto Turn-Off Timer" }, { "#": "8", "$if": "firmwareVersion >= 1.1", - "$import": "~/templates/master_template.json#base_0-65535", + "$import": "templates/zooz_template.json#auto_timer_base_0x_1x_3x_7x_nounit", "label": "Relay 2: Auto Turn-Off Timer", - "description": "Sets the time after which relay 2 turns off once it has been turned on. Using the units defined in parameter 17." + "description": "Unit defined in parameter 17." }, { "#": "17", @@ -205,17 +199,15 @@ { "#": "9", "$if": "firmwareVersion < 1.1", - "$import": "~/templates/master_template.json#base_0-65535", - "label": "Relay 2: Auto Turn-On Timer", - "description": "Sets the time after which relay 2 turns on once it has been turned off.", - "unit": "minutes" + "$import": "templates/zooz_template.json#auto_on_timer_0x_1x_3x_7x", + "label": "Relay 2: Auto Turn-On Timer" }, { "#": "9", "$if": "firmwareVersion >= 1.1", - "$import": "~/templates/master_template.json#base_0-65535", + "$import": "templates/zooz_template.json#auto_timer_base_0x_1x_3x_7x_nounit", "label": "Relay 2: Auto Turn-On Timer", - "description": "Sets the time after which relay 2 turns on once it has been turned off. Using the units defined in parameter 18." + "description": "Unit defined in parameter 18." }, { "#": "18", @@ -226,17 +218,15 @@ { "#": "10", "$if": "firmwareVersion < 1.1", - "$import": "~/templates/master_template.json#base_0-65535", - "label": "Relay 3: Auto Turn-Off Timer", - "description": "Sets the time after which relay 3 turns off once it has been turned on.", - "unit": "minutes" + "$import": "templates/zooz_template.json#auto_off_timer_0x_1x_3x_7x", + "label": "Relay 3: Auto Turn-Off Timer" }, { "#": "10", "$if": "firmwareVersion >= 1.1", - "$import": "~/templates/master_template.json#base_0-65535", + "$import": "templates/zooz_template.json#auto_timer_base_0x_1x_3x_7x_nounit", "label": "Relay 3: Auto Turn-Off Timer", - "description": "Sets the time after which relay 3 turns off once it has been turned on. Using the units defined in parameter 19." + "description": "Unit defined in parameter 19." }, { "#": "19", @@ -247,17 +237,15 @@ { "#": "11", "$if": "firmwareVersion < 1.1", - "$import": "~/templates/master_template.json#base_0-65535", - "label": "Relay 3: Auto Turn-On Timer", - "description": "Sets the time after which relay 3 turns on once it has been turned off.", - "unit": "minutes" + "$import": "templates/zooz_template.json#auto_on_timer_0x_1x_3x_7x", + "label": "Relay 3: Auto Turn-On Timer" }, { "#": "11", "$if": "firmwareVersion >= 1.1", - "$import": "~/templates/master_template.json#base_0-65535", - "label": "Relay 3: Auto Turn-On Timer", - "description": "Sets the time after which relay 3 turns on once it has been turned off. Using the units defined in parameter 20." + "$import": "templates/zooz_template.json#auto_timer_base_0x_1x_3x_7x_nounit", + "label": "Relay 2: Auto Turn-On Timer", + "description": "Unit defined in parameter 20." }, { "#": "20", diff --git a/packages/config/config/devices/0x027a/zen17.json b/packages/config/config/devices/0x027a/zen17.json index d110f10658f1..796bf6dc97b2 100644 --- a/packages/config/config/devices/0x027a/zen17.json +++ b/packages/config/config/devices/0x027a/zen17.json @@ -368,81 +368,14 @@ }, { "#": "6", - "label": "Auto Turn-Off Timer (Relay 1)", - "description": "Sets the time after which you want relay 1 to automatically turn off once it has been turned on, using the unit defined in parameter 15.", - "valueSize": 4, - "minValue": 0, - "maxValue": 65535, - "defaultValue": 0 - }, - { - "#": "7", - "label": "Auto Turn-On Timer (Relay 1)", - "description": "The time after relay 1 will automatically turn on, using the unit defined in parameter 16", - "valueSize": 4, - "minValue": 0, - "maxValue": 65535, - "defaultValue": 0 - }, - { - "#": "8", - "label": "Auto Turn-Off Timer (Relay 2)", - "description": "The time after relay 2 will automatically turn off, using the unit defined in parameter 17", - "valueSize": 4, - "minValue": 0, - "maxValue": 65535, - "defaultValue": 0 - }, - { - "#": "9", - "label": "Auto Turn-On Timer (Relay 2)", - "description": "The time after relay 2 will automatically turn on, using the unit defined in parameter 18", - "valueSize": 4, - "minValue": 0, - "maxValue": 65535, - "defaultValue": 0 - }, - { - "#": "10", - "label": "Control Relay 1 with S1 Input", - "description": "If disabled and Parameter 2 is >= 4, a Z-Wave report will be sent but R1 will not be triggered", - "valueSize": 1, - "defaultValue": 1, - "allowManualEntry": false, - "options": [ - { - "label": "Disable", - "value": 0 - }, - { - "label": "Enable", - "value": 1 - } - ] - }, - { - "#": "11", - "label": "Control Relay 2 with S2 Input", - "description": "If disabled and Parameter 3 is >= 4, a Z-Wave report will be sent but R2 will not be triggered", - "valueSize": 1, - "defaultValue": 1, - "allowManualEntry": false, - "options": [ - { - "label": "Disable", - "value": 0 - }, - { - "label": "Enable", - "value": 1 - } - ] + "$import": "templates/zooz_template.json#auto_timer_base_0x_1x_3x_7x_nounit", + "label": "Relay 1: Auto Turn-Off Timer" }, { "#": "15", - "label": "Auto Turn-Off Timer Unit (Relay 1)", + "label": "Relay 1: Auto Turn-Off Timer Unit", "valueSize": 1, - "defaultValue": 1, + "defaultValue": 0, "allowManualEntry": false, "options": [ { @@ -459,67 +392,69 @@ } ] }, + { + "#": "7", + "$import": "templates/zooz_template.json#auto_timer_base_0x_1x_3x_7x_nounit", + "label": "Relay 1: Auto Turn-On Timer" + }, { "#": "16", - "label": "Auto Turn-On Timer Unit (Relay 1)", - "valueSize": 1, - "defaultValue": 0, - "allowManualEntry": false, - "options": [ - { - "label": "Minutes", - "value": 0 - }, - { - "label": "Seconds", - "value": 1 - }, - { - "label": "Hours", - "value": 2 - } - ] + "$import": "#paramInformation/15", + "label": "Relay 1: Auto Turn-On Timer Unit" + }, + { + "#": "8", + "$import": "templates/zooz_template.json#auto_timer_base_0x_1x_3x_7x_nounit", + "label": "Relay 2: Auto Turn-Off Timer" }, { "#": "17", - "label": "Auto Turn-Off Timer Unit (Relay 2)", - "description": "Choose between second, minutes, and hours as the unit for Auto Turn-Off time for Relay 2. Default: minutes", + "$import": "#paramInformation/15", + "label": "Relay 2: Auto Turn-Off Timer Unit" + }, + { + "#": "9", + "$import": "templates/zooz_template.json#auto_timer_base_0x_1x_3x_7x_nounit", + "label": "Relay 2: Auto Turn-On Timer" + }, + { + "#": "18", + "$import": "#paramInformation/15", + "label": "Relay 2: Auto Turn-On Timer Unit" + }, + { + "#": "10", + "label": "Control Relay 1 with S1 Input", + "description": "If disabled and Parameter 2 is >= 4, a Z-Wave report will be sent but R1 will not be triggered", "valueSize": 1, - "defaultValue": 0, + "defaultValue": 1, "allowManualEntry": false, "options": [ { - "label": "Minutes", + "label": "Disable", "value": 0 }, { - "label": "Seconds", + "label": "Enable", "value": 1 - }, - { - "label": "Hours", - "value": 2 } ] }, { - "#": "18", - "label": "Auto Turn-On Timer Unit (Relay 2)", + "#": "11", + "label": "Control Relay 2 with S2 Input", + "description": "If disabled and Parameter 3 is >= 4, a Z-Wave report will be sent but R2 will not be triggered", "valueSize": 1, - "defaultValue": 0, + "defaultValue": 1, "allowManualEntry": false, "options": [ { - "label": "Minutes", + "label": "Disable", "value": 0 }, { - "label": "Seconds", + "label": "Enable", "value": 1 - }, - { - "label": "Hours", - "value": 2 } ] }, diff --git a/packages/config/config/devices/0x027a/zen30.json b/packages/config/config/devices/0x027a/zen30.json index 52fe60d007d3..6be4da3d4c3a 100644 --- a/packages/config/config/devices/0x027a/zen30.json +++ b/packages/config/config/devices/0x027a/zen30.json @@ -69,22 +69,22 @@ }, { "#": "8", - "$import": "templates/zooz_template.json#auto_timer_base_0x_3x_7x", + "$import": "templates/zooz_template.json#auto_timer_base_0x_1x_3x_7x", "label": "Auto Turn-Off Timer for Dimmer" }, { "#": "9", - "$import": "templates/zooz_template.json#auto_timer_base_0x_3x_7x", + "$import": "templates/zooz_template.json#auto_timer_base_0x_1x_3x_7x", "label": "Auto Turn-On Timer for Dimmer" }, { "#": "10", - "$import": "templates/zooz_template.json#auto_timer_base_0x_3x_7x", + "$import": "templates/zooz_template.json#auto_timer_base_0x_1x_3x_7x", "label": "Auto Turn-Off Timer for Relay" }, { "#": "11", - "$import": "templates/zooz_template.json#auto_timer_base_0x_3x_7x", + "$import": "templates/zooz_template.json#auto_timer_base_0x_1x_3x_7x", "label": "Auto Turn-On Timer for Relay" }, { diff --git a/packages/config/config/devices/0x027a/zen32.json b/packages/config/config/devices/0x027a/zen32.json index fbf18e2fa109..daf6d57f8182 100644 --- a/packages/config/config/devices/0x027a/zen32.json +++ b/packages/config/config/devices/0x027a/zen32.json @@ -200,12 +200,12 @@ }, { "#": "16", - "$import": "templates/zooz_template.json#auto_off_timer_0x_3x_7x", + "$import": "templates/zooz_template.json#auto_off_timer_0x_1x_3x_7x", "label": "Auto-Off Timer (Relay)" }, { "#": "17", - "$import": "templates/zooz_template.json#auto_on_timer_0x_3x_7x", + "$import": "templates/zooz_template.json#auto_on_timer_0x_1x_3x_7x", "label": "Auto-On Timer (Relay)" }, { diff --git a/packages/config/config/devices/0x027a/zen71.json b/packages/config/config/devices/0x027a/zen71.json index c6302fc1c08b..6efdaf4901d2 100644 --- a/packages/config/config/devices/0x027a/zen71.json +++ b/packages/config/config/devices/0x027a/zen71.json @@ -53,11 +53,11 @@ }, { "#": "3", - "$import": "templates/zooz_template.json#auto_off_timer_0x_3x_7x" + "$import": "templates/zooz_template.json#auto_off_timer_0x_1x_3x_7x" }, { "#": "5", - "$import": "templates/zooz_template.json#auto_on_timer_0x_3x_7x" + "$import": "templates/zooz_template.json#auto_on_timer_0x_1x_3x_7x" }, { "#": "7[0x01]", diff --git a/packages/config/config/devices/0x027a/zen72.json b/packages/config/config/devices/0x027a/zen72.json index 4b2d885027b3..ff2be075780b 100644 --- a/packages/config/config/devices/0x027a/zen72.json +++ b/packages/config/config/devices/0x027a/zen72.json @@ -74,11 +74,11 @@ }, { "#": "3", - "$import": "templates/zooz_template.json#auto_off_timer_0x_3x_7x" + "$import": "templates/zooz_template.json#auto_off_timer_0x_1x_3x_7x" }, { "#": "5", - "$import": "templates/zooz_template.json#auto_on_timer_0x_3x_7x" + "$import": "templates/zooz_template.json#auto_on_timer_0x_1x_3x_7x" }, { "#": "7[0x01]", diff --git a/packages/config/config/devices/0x027a/zen73.json b/packages/config/config/devices/0x027a/zen73.json index 4306b8e701fe..870419eec725 100644 --- a/packages/config/config/devices/0x027a/zen73.json +++ b/packages/config/config/devices/0x027a/zen73.json @@ -36,11 +36,11 @@ }, { "#": "3", - "$import": "templates/zooz_template.json#auto_off_timer_0x_3x_7x" + "$import": "templates/zooz_template.json#auto_off_timer_0x_1x_3x_7x" }, { "#": "5", - "$import": "templates/zooz_template.json#auto_on_timer_0x_3x_7x" + "$import": "templates/zooz_template.json#auto_on_timer_0x_1x_3x_7x" }, { "#": "8", diff --git a/packages/config/config/devices/0x027a/zen74.json b/packages/config/config/devices/0x027a/zen74.json index 21671e53b182..990e65421c30 100644 --- a/packages/config/config/devices/0x027a/zen74.json +++ b/packages/config/config/devices/0x027a/zen74.json @@ -36,11 +36,11 @@ }, { "#": "3", - "$import": "templates/zooz_template.json#auto_off_timer_0x_3x_7x" + "$import": "templates/zooz_template.json#auto_off_timer_0x_1x_3x_7x" }, { "#": "5", - "$import": "templates/zooz_template.json#auto_on_timer_0x_3x_7x" + "$import": "templates/zooz_template.json#auto_on_timer_0x_1x_3x_7x" }, { "#": "8", diff --git a/packages/config/config/devices/0x027a/zen76.json b/packages/config/config/devices/0x027a/zen76.json index b30f3d0cf31d..b3ae7068fdee 100644 --- a/packages/config/config/devices/0x027a/zen76.json +++ b/packages/config/config/devices/0x027a/zen76.json @@ -57,11 +57,11 @@ }, { "#": "3", - "$import": "templates/zooz_template.json#auto_off_timer_0x_3x_7x" + "$import": "templates/zooz_template.json#auto_off_timer_0x_1x_3x_7x" }, { "#": "5", - "$import": "templates/zooz_template.json#auto_on_timer_0x_3x_7x" + "$import": "templates/zooz_template.json#auto_on_timer_0x_1x_3x_7x" }, { "#": "7[0x01]", diff --git a/packages/config/config/devices/0x027a/zen77.json b/packages/config/config/devices/0x027a/zen77.json index faed5b45053f..031af09f9278 100644 --- a/packages/config/config/devices/0x027a/zen77.json +++ b/packages/config/config/devices/0x027a/zen77.json @@ -72,11 +72,11 @@ }, { "#": "3", - "$import": "templates/zooz_template.json#auto_off_timer_0x_3x_7x" + "$import": "templates/zooz_template.json#auto_off_timer_0x_1x_3x_7x" }, { "#": "5", - "$import": "templates/zooz_template.json#auto_on_timer_0x_3x_7x" + "$import": "templates/zooz_template.json#auto_on_timer_0x_1x_3x_7x" }, { "#": "7[0x01]",