Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
Feb 1, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc1d610
feat(config): override minValue to Zen14
apella12 Jan 30, 2024
00a77a5
fix: clean up all Zooz ZEN1x timer config params
AlCalzone Feb 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions packages/config/config/devices/0x027a/templates/zooz_template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions packages/config/config/devices/0x027a/zen05.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
12 changes: 6 additions & 6 deletions packages/config/config/devices/0x027a/zen14.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)"
},
{
Expand Down
62 changes: 25 additions & 37 deletions packages/config/config/devices/0x027a/zen16.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down
Loading
Loading