From 62e5048dadb4bd09bd0b994a5a0f7ed87834723e Mon Sep 17 00:00:00 2001 From: martyn-vesternet <74303058+martyn-vesternet@users.noreply.github.com> Date: Thu, 25 Jan 2024 12:03:58 +0000 Subject: [PATCH 1/5] fix(config): extend version range for Vesternet VES-ZW-DIM-001 (#6636) Co-authored-by: Dominic Griesel --- .../config/config/devices/0x0330/ves-zw-dim-001.json | 2 +- .../config/config/devices/0x0330/ves-zw-mot-018.json | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/packages/config/config/devices/0x0330/ves-zw-dim-001.json b/packages/config/config/devices/0x0330/ves-zw-dim-001.json index fa48162726da..0ffd1eb54e80 100644 --- a/packages/config/config/devices/0x0330/ves-zw-dim-001.json +++ b/packages/config/config/devices/0x0330/ves-zw-dim-001.json @@ -12,7 +12,7 @@ ], "firmwareVersion": { "min": "1.21", - "max": "1.26" + "max": "1.30" }, "paramInformation": [ { diff --git a/packages/config/config/devices/0x0330/ves-zw-mot-018.json b/packages/config/config/devices/0x0330/ves-zw-mot-018.json index ddb66fed876e..ce6c2c8e605a 100644 --- a/packages/config/config/devices/0x0330/ves-zw-mot-018.json +++ b/packages/config/config/devices/0x0330/ves-zw-mot-018.json @@ -223,6 +223,16 @@ ] } ], + "compat": { + "commandClasses": { + "remove": { + // The device probably has a bugged Window Covering CC implementation + "0x6a": { + "endpoints": "*" + } + } + } + }, "metadata": { "inclusion": "Step 1. Set primary controller/gateway into inclusion mode.\nStep 2. Either power cycle the product, or triple press the action button.\n Step 3. The connected light will stay on solid for 3 seconds to indicate successful inclusion.", "exclusion": "Step 1. Set primary controller/gateway into exclusion mode.\nStep 2. Triple press the action button.", From 06c2713733392ea936e22758d4becaccbe509d6c Mon Sep 17 00:00:00 2001 From: AlCalzone Date: Thu, 25 Jan 2024 13:21:02 +0100 Subject: [PATCH 2/5] fix: update DB library to reduce idle load (#6640) --- package.json | 2 +- packages/core/package.json | 2 +- packages/zwave-js/package.json | 2 +- test/run.ts | 9 --------- yarn.lock | 14 +++++++------- 5 files changed, 10 insertions(+), 19 deletions(-) diff --git a/package.json b/package.json index 12a5a121c050..bf2b22c816c1 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "@actions/core": "^1.9.1", "@actions/exec": "^1.1.1", "@actions/github": "^5.0.3", - "@alcalzone/jsonl-db": "^3.1.0", + "@alcalzone/jsonl-db": "^3.1.1", "@alcalzone/monopack": "^1.2.2", "@alcalzone/release-script": "~3.7.0", "@commitlint/cli": "^17.7.1", diff --git a/packages/core/package.json b/packages/core/package.json index 2bcd61e7c361..251e3b0654b7 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -55,7 +55,7 @@ "test:dirty": "node -r ../../maintenance/esbuild-register.js ../maintenance/src/resolveDirtyTests.ts --run" }, "dependencies": { - "@alcalzone/jsonl-db": "^3.1.0", + "@alcalzone/jsonl-db": "^3.1.1", "@zwave-js/shared": "workspace:*", "alcalzone-shared": "^4.0.8", "ansi-colors": "^4.1.3", diff --git a/packages/zwave-js/package.json b/packages/zwave-js/package.json index 95338479b48e..f96147a80e9e 100644 --- a/packages/zwave-js/package.json +++ b/packages/zwave-js/package.json @@ -81,7 +81,7 @@ "test:dirty": "node -r ../../maintenance/esbuild-register.js ../maintenance/src/resolveDirtyTests.ts --run" }, "dependencies": { - "@alcalzone/jsonl-db": "^3.1.0", + "@alcalzone/jsonl-db": "^3.1.1", "@alcalzone/pak": "^0.10.1", "@zwave-js/cc": "workspace:*", "@zwave-js/config": "workspace:*", diff --git a/test/run.ts b/test/run.ts index f77d60c6b9c0..e20b90bcfb89 100644 --- a/test/run.ts +++ b/test/run.ts @@ -52,15 +52,6 @@ const driver = new Driver(port, { .on("error", console.error) .once("driver ready", async () => { // Test code goes here - await wait(10000); - console.log("TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT"); - console.log("TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT"); - console.log("TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT"); - console.log("TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT"); - - await driver["writeSerial"](Buffer.from("010800130201002503c1", "hex")); - await wait(3); - await driver["writeSerial"](Buffer.from("01030016ea", "hex")); }) .once("bootloader ready", async () => { // What to do when stuck in the bootloader diff --git a/yarn.lock b/yarn.lock index 59805e658c8b..3708b8d715a4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -59,14 +59,14 @@ __metadata: languageName: node linkType: hard -"@alcalzone/jsonl-db@npm:^3.1.0": - version: 3.1.0 - resolution: "@alcalzone/jsonl-db@npm:3.1.0" +"@alcalzone/jsonl-db@npm:^3.1.1": + version: 3.1.1 + resolution: "@alcalzone/jsonl-db@npm:3.1.1" dependencies: "@alcalzone/proper-lockfile": ^4.1.3-0 alcalzone-shared: ^4.0.8 fs-extra: ^10.1.0 - checksum: 7ca8b6ba7ba92abc59e2ef6affecaeeb0797d20756904f08e906882e15173b6a2c975fc170355ac9b2ac57c07fd1e37a09c70c4a1a1c35249ab51b425514a04d + checksum: 377a1bcb4f5d00d9ae7ebaabd066e077eb8cf790311cbe44878fbcd8da5ae912630b2d2a505c57c8e6aa0d116b57ccbd6c798ace2a2d5341215b40b53e87ee30 languageName: node linkType: hard @@ -1973,7 +1973,7 @@ __metadata: version: 0.0.0-use.local resolution: "@zwave-js/core@workspace:packages/core" dependencies: - "@alcalzone/jsonl-db": ^3.1.0 + "@alcalzone/jsonl-db": ^3.1.1 "@microsoft/api-extractor": ^7.37.3 "@types/node": ^18.17.14 "@types/sinon": ^10.0.16 @@ -2122,7 +2122,7 @@ __metadata: "@actions/core": ^1.9.1 "@actions/exec": ^1.1.1 "@actions/github": ^5.0.3 - "@alcalzone/jsonl-db": ^3.1.0 + "@alcalzone/jsonl-db": ^3.1.1 "@alcalzone/monopack": ^1.2.2 "@alcalzone/release-script": ~3.7.0 "@commitlint/cli": ^17.7.1 @@ -9235,7 +9235,7 @@ __metadata: version: 0.0.0-use.local resolution: "zwave-js@workspace:packages/zwave-js" dependencies: - "@alcalzone/jsonl-db": ^3.1.0 + "@alcalzone/jsonl-db": ^3.1.1 "@alcalzone/pak": ^0.10.1 "@microsoft/api-extractor": ^7.37.3 "@types/fs-extra": ^11.0.1 From 508d10100e4268877c49781a2de2a0e03b1f949b Mon Sep 17 00:00:00 2001 From: Dominic Griesel Date: Thu, 25 Jan 2024 13:51:01 +0100 Subject: [PATCH 3/5] chore: release v12.4.3 ### Bugfixes * Reduce idle CPU load (#6640) ### Config file changes * Extend version range for Vesternet VES-ZW-DIM-001 (#6636) --- CHANGELOG.md | 7 +++++++ package.json | 2 +- packages/cc/package.json | 2 +- packages/config/package.json | 2 +- packages/core/package.json | 2 +- packages/eslint-plugin/package.json | 2 +- packages/flash/package.json | 2 +- packages/host/package.json | 2 +- packages/maintenance/package.json | 2 +- packages/nvmedit/package.json | 2 +- packages/serial/package.json | 2 +- packages/testing/package.json | 2 +- packages/zwave-js/package.json | 2 +- 13 files changed, 19 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f4d30075e54d..93d91c7904d0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,13 @@ +## 12.4.3 (2024-01-25) +### Bugfixes +* Reduce idle CPU load (#6640) + +### Config file changes +* Extend version range for Vesternet VES-ZW-DIM-001 (#6636) + ## 12.4.2 (2024-01-23) ### Bugfixes * The check for a changed device config now always returns `false` for the controller (#6625) diff --git a/package.json b/package.json index bf2b22c816c1..c65ea3f3b49e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@zwave-js/repo", - "version": "12.4.2", + "version": "12.4.3", "private": true, "description": "Z-Wave driver written entirely in JavaScript/TypeScript", "keywords": [], diff --git a/packages/cc/package.json b/packages/cc/package.json index 143c885acf89..e5b3ac27a0b5 100644 --- a/packages/cc/package.json +++ b/packages/cc/package.json @@ -1,6 +1,6 @@ { "name": "@zwave-js/cc", - "version": "12.4.2", + "version": "12.4.3", "description": "zwave-js: Command Classes", "keywords": [], "publishConfig": { diff --git a/packages/config/package.json b/packages/config/package.json index eab3029290da..9678b880bd00 100644 --- a/packages/config/package.json +++ b/packages/config/package.json @@ -1,6 +1,6 @@ { "name": "@zwave-js/config", - "version": "12.4.2", + "version": "12.4.3", "description": "zwave-js: configuration files", "publishConfig": { "access": "public" diff --git a/packages/core/package.json b/packages/core/package.json index 251e3b0654b7..b4ebbb54428b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@zwave-js/core", - "version": "12.4.0", + "version": "12.4.3", "description": "zwave-js: core components", "keywords": [], "publishConfig": { diff --git a/packages/eslint-plugin/package.json b/packages/eslint-plugin/package.json index f44faac3b586..86134dfe32aa 100644 --- a/packages/eslint-plugin/package.json +++ b/packages/eslint-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@zwave-js/eslint-plugin", - "version": "12.4.2", + "version": "12.4.3", "description": "zwave-js: custom ESLint rules", "private": true, "keywords": [], diff --git a/packages/flash/package.json b/packages/flash/package.json index 15159a0c42e3..caebd395c6e6 100644 --- a/packages/flash/package.json +++ b/packages/flash/package.json @@ -1,6 +1,6 @@ { "name": "@zwave-js/flash", - "version": "12.4.2", + "version": "12.4.3", "description": "zwave-js: firmware flash utility", "keywords": [], "publishConfig": { diff --git a/packages/host/package.json b/packages/host/package.json index 68961a37b9e7..44f64ac82a3c 100644 --- a/packages/host/package.json +++ b/packages/host/package.json @@ -1,6 +1,6 @@ { "name": "@zwave-js/host", - "version": "12.4.2", + "version": "12.4.3", "description": "zwave-js: Host abstractions", "keywords": [], "publishConfig": { diff --git a/packages/maintenance/package.json b/packages/maintenance/package.json index 54dcf5692314..8a777b372a95 100644 --- a/packages/maintenance/package.json +++ b/packages/maintenance/package.json @@ -1,6 +1,6 @@ { "name": "@zwave-js/maintenance", - "version": "12.4.0", + "version": "12.4.3", "description": "zwave-js: maintenance scripts", "private": true, "keywords": [], diff --git a/packages/nvmedit/package.json b/packages/nvmedit/package.json index 47dbae2afd8d..ca466db8bcab 100644 --- a/packages/nvmedit/package.json +++ b/packages/nvmedit/package.json @@ -1,6 +1,6 @@ { "name": "@zwave-js/nvmedit", - "version": "12.4.0", + "version": "12.4.3", "description": "zwave-js: library to edit NVM backups", "keywords": [], "publishConfig": { diff --git a/packages/serial/package.json b/packages/serial/package.json index e2b2624f600a..10b91c16231c 100644 --- a/packages/serial/package.json +++ b/packages/serial/package.json @@ -1,6 +1,6 @@ { "name": "@zwave-js/serial", - "version": "12.4.2", + "version": "12.4.3", "description": "zwave-js: Serialport driver", "publishConfig": { "access": "public" diff --git a/packages/testing/package.json b/packages/testing/package.json index f60be74f6fa2..ec2f9fda0f3b 100644 --- a/packages/testing/package.json +++ b/packages/testing/package.json @@ -1,6 +1,6 @@ { "name": "@zwave-js/testing", - "version": "12.4.2", + "version": "12.4.3", "description": "zwave-js: testing utilities", "keywords": [], "publishConfig": { diff --git a/packages/zwave-js/package.json b/packages/zwave-js/package.json index f96147a80e9e..cb46023ebd70 100644 --- a/packages/zwave-js/package.json +++ b/packages/zwave-js/package.json @@ -1,6 +1,6 @@ { "name": "zwave-js", - "version": "12.4.2", + "version": "12.4.3", "description": "Z-Wave driver written entirely in JavaScript/TypeScript", "keywords": [], "main": "build/index.js", From 223965f2b70333d581480fbea4029b595984f8f6 Mon Sep 17 00:00:00 2001 From: Robert Eckhoff <54947543+apella12@users.noreply.github.com> Date: Thu, 1 Feb 2024 04:31:29 -0500 Subject: [PATCH 4/5] fix(config): correct Zooz ZEN1x timer config params (#6648) Co-authored-by: Dominic Griesel --- .../0x027a/templates/zooz_template.json | 17 +- .../config/config/devices/0x027a/zen05.json | 4 +- .../config/config/devices/0x027a/zen14.json | 12 +- .../config/config/devices/0x027a/zen16.json | 62 +++----- .../config/config/devices/0x027a/zen17.json | 149 +++++------------- .../config/config/devices/0x027a/zen30.json | 8 +- .../config/config/devices/0x027a/zen32.json | 4 +- .../config/config/devices/0x027a/zen71.json | 4 +- .../config/config/devices/0x027a/zen72.json | 4 +- .../config/config/devices/0x027a/zen73.json | 4 +- .../config/config/devices/0x027a/zen74.json | 4 +- .../config/config/devices/0x027a/zen76.json | 4 +- .../config/config/devices/0x027a/zen77.json | 4 +- 13 files changed, 103 insertions(+), 177 deletions(-) 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]", From 72cae6dccbbba0d62d11d9284ea2eedb0ff63d0f Mon Sep 17 00:00:00 2001 From: Zarklord Date: Sun, 4 Feb 2024 06:33:41 -0500 Subject: [PATCH 5/5] fix(config): use Color Switch V2 for Inovelli LZW42 (#6654) Co-authored-by: AlCalzone --- packages/config/config/devices/0x031e/lzw42.json | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/packages/config/config/devices/0x031e/lzw42.json b/packages/config/config/devices/0x031e/lzw42.json index d942ce9eacbd..67a004fefe91 100644 --- a/packages/config/config/devices/0x031e/lzw42.json +++ b/packages/config/config/devices/0x031e/lzw42.json @@ -66,5 +66,16 @@ "exclusion": "Put your hub in exclusion mode and turn the power to the bulb on. Your bulb will blink twice (2x) indicating it's in exclusion mode. When exclusion is successful, it will blink one more time (1x) to confirm. Your hub should say that the device is excluded.", "reset": "You may power on/off the bulb 6x (between 0.5-2 seconds each time) or use a certified controller to remove the device from your network to factory default. Only use this procedure in the event that the network primary controller is missing or otherwise inoperable. Your bulb will flash twice to confirm factory reset.", "manual": "https://products.z-wavealliance.org/ProductManual/File?folder=&filename=product_documents/3613/LZW42%20Manual.pdf" + }, + "compat": { + // The device supports Color Switch V2, despite only reporting support for V1 + "commandClasses": { + "add": { + "Color Switch": { + "isSupported": true, + "version": 2 + } + } + } } }