fix(config): correct Zooz ZEN1x timer config params (#6648)

Co-authored-by: Dominic Griesel <[email protected]>
zwave-js · Feb 1, 2024 · 223965f · 223965f
1 parent 508d101
commit 223965f
Show file tree

Hide file tree

Showing 13 changed files with 103 additions and 177 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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",