fix: consider 800 series in conditionals, add other parameters

zwave-js · Sep 20, 2023 · fb50acb · fb50acb
1 parent 2624431
commit fb50acb
Showing 1 changed file with 65 additions and 10 deletions.
diff --git a/packages/config/config/devices/0x027a/zen32.json b/packages/config/config/devices/0x027a/zen32.json
@@ -1,7 +1,24 @@
+// The firmware versions on this device are a mess
+// 1.1 -> 10.0 -> 10.10 -> 10.20 -> 10.30 -> (10.40 ≅ 2.10) -> 2.20
+
+// Conditionals:
+// 10.0  and later: firmwareVersion >= 10.0 || firmwareVersion >= 2.10 && firmwareVersion < 10.0
+// 10.10 and later: firmwareVersion >= 10.10 || firmwareVersion >= 2.10 && firmwareVersion < 10.0
+// 10.20 and later: firmwareVersion >= 10.20 || firmwareVersion >= 2.10 && firmwareVersion < 10.0
+// 10.30 and later: firmwareVersion >= 10.30 || firmwareVersion >= 2.10 && firmwareVersion < 10.0
+// 10.40 and later: firmwareVersion >= 10.40 || firmwareVersion >= 2.10 && firmwareVersion < 10.0
+// 800 series: firmwareVersion >= 2.10 && firmwareVersion < 10.0
+
 {
 	"manufacturer": "Zooz",
 	"manufacturerId": "0x027a",
-	"label": "ZEN32",
+	"label": [
+		{
+			"$if": "firmwareVersion >= 2.10 && firmwareVersion < 10.0",
+			"value": "ZEN32 800LR"
+		},
+		"ZEN32"
+	],
 	"description": "Scene Controller",
 	"devices": [
 		{
@@ -93,7 +110,7 @@
 		},
 		{
 			"#": "6",
-			"$if": "firmwareVersion >= 10.40",
+			"$if": "firmwareVersion >= 10.40 || firmwareVersion >= 2.10 && firmwareVersion < 10.0",
 			"$import": "templates/zooz_template.json#led_indicator_color_extended",
 			"label": "LED Indicator Color (Relay)",
 			"defaultValue": 0
@@ -106,7 +123,7 @@
 		},
 		{
 			"#": "7",
-			"$if": "firmwareVersion >= 10.40",
+			"$if": "firmwareVersion >= 10.40 || firmwareVersion >= 2.10 && firmwareVersion < 10.0",
 			"$import": "templates/zooz_template.json#led_indicator_color_extended",
 			"label": "LED Indicator Color (Button 1)",
 			"defaultValue": 0
@@ -119,7 +136,7 @@
 		},
 		{
 			"#": "8",
-			"$if": "firmwareVersion >= 10.40",
+			"$if": "firmwareVersion >= 10.40 || firmwareVersion >= 2.10 && firmwareVersion < 10.0",
 			"$import": "templates/zooz_template.json#led_indicator_color_extended",
 			"label": "LED Indicator Color (Button 2)",
 			"defaultValue": 0
@@ -132,7 +149,7 @@
 		},
 		{
 			"#": "9",
-			"$if": "firmwareVersion >= 10.40",
+			"$if": "firmwareVersion >= 10.40 || firmwareVersion >= 2.10 && firmwareVersion < 10.0",
 			"$import": "templates/zooz_template.json#led_indicator_color_extended",
 			"label": "LED Indicator Color (Button 3)",
 			"defaultValue": 0
@@ -145,7 +162,7 @@
 		},
 		{
 			"#": "10",
-			"$if": "firmwareVersion >= 10.40",
+			"$if": "firmwareVersion >= 10.40 || firmwareVersion >= 2.10 && firmwareVersion < 10.0",
 			"$import": "templates/zooz_template.json#led_indicator_color_extended",
 			"label": "LED Indicator Color (Button 4)",
 			"defaultValue": 0
@@ -207,27 +224,65 @@
 		},
 		{
 			"#": "21",
-			"$if": "firmwareVersion >= 1.2",
+			"$if": "firmwareVersion >= 10.0 || firmwareVersion >= 2.10 && firmwareVersion < 10.0",
 			"$import": "templates/zooz_template.json#3way_switch_type"
 		},
 		{
 			"#": "22",
-			"$if": "firmwareVersion >= 10.0",
+			"$if": "firmwareVersion >= 10.0 || firmwareVersion >= 2.10 && firmwareVersion < 10.0",
 			"$import": "templates/zooz_template.json#local_programming"
 		},
 		{
 			"#": "23",
-			"$if": "firmwareVersion >= 10.20",
+			"$if": "firmwareVersion >= 10.20 || firmwareVersion >= 2.10 && firmwareVersion < 10.0",
 			"$import": "~/templates/master_template.json#base_enable_disable_inverted",
 			"label": "LED Settings Indicator",
 			"defaultValue": 0
 		},
 		{
 			"#": "24",
 			"$import": "~/templates/master_template.json#base_enable_disable_inverted",
-			"$if": "firmwareVersion >= 10.30",
+			"$if": "firmwareVersion >= 10.30 || firmwareVersion >= 2.10 && firmwareVersion < 10.0",
 			"label": "Scene Control (Relay)",
 			"defaultValue": 0
+		},
+		{
+			"#": "26",
+			"$import": "templates/zooz_template.json#enable_scene_control_3way",
+			"$if": "firmwareVersion >= 10.40 || firmwareVersion >= 2.10 && firmwareVersion < 10.0",
+			"label": "Scene Control (Relay)"
+		},
+		{
+			"#": "25[0x01]",
+			"$if": "firmwareVersion >= 10.40 || firmwareVersion >= 2.10 && firmwareVersion < 10.0",
+			"$import": "~/templates/master_template.json#base_enable_disable",
+			"label": "Send Status Change Report: Local Control",
+			"description": "Determine whether a trigger of this type should prompt a status change report to associated devices.",
+			"defaultValue": 1
+		},
+		{
+			"#": "25[0x02]",
+			"$if": "firmwareVersion >= 10.40 || firmwareVersion >= 2.10 && firmwareVersion < 10.0",
+			"$import": "~/templates/master_template.json#base_enable_disable",
+			"label": "Send Status Change Report: 3-Way",
+			"description": "Determine whether a trigger of this type should prompt a status change report to associated devices.",
+			"defaultValue": 1
+		},
+		{
+			"#": "25[0x04]",
+			"$if": "firmwareVersion >= 10.40 || firmwareVersion >= 2.10 && firmwareVersion < 10.0",
+			"$import": "~/templates/master_template.json#base_enable_disable",
+			"label": "Send Status Change Report: Z-Wave",
+			"description": "Determine whether a trigger of this type should prompt a status change report to associated devices.",
+			"defaultValue": 1
+		},
+		{
+			"#": "25[0x08]",
+			"$if": "firmwareVersion >= 10.40 || firmwareVersion >= 2.10 && firmwareVersion < 10.0",
+			"$import": "~/templates/master_template.json#base_enable_disable",
+			"label": "Send Status Change Report: Timer",
+			"description": "Determine whether a trigger of this type should prompt a status change report to associated devices.",
+			"defaultValue": 1
 		}
 	],
 	"compat": {