From 1921a9a0c4e060c6ced124d144160e070cbcab86 Mon Sep 17 00:00:00 2001 From: xuexiaofei <279716582@qq.com> Date: Thu, 24 Oct 2024 10:59:18 +0800 Subject: [PATCH 1/6] feat(config): add ZVIDAR WM25L Smartwings Smart Motor feat(config): add ZVIDAR WM25L Smartwings Smart Motor --- .../config/config/devices/0x045a/WM25L.json | 245 ++++++++++++++++++ 1 file changed, 245 insertions(+) create mode 100644 packages/config/config/devices/0x045a/WM25L.json diff --git a/packages/config/config/devices/0x045a/WM25L.json b/packages/config/config/devices/0x045a/WM25L.json new file mode 100644 index 000000000000..1ea35c35147e --- /dev/null +++ b/packages/config/config/devices/0x045a/WM25L.json @@ -0,0 +1,245 @@ +{ + "manufacturer": "ZVIDAR", + "manufacturerId": "0x045a", + "label": "WM25L", + "description": "Smartwings Smart Motor", + "devices": [ + { + "productType": "0x0004", + "productId": "0x050b" + } + ], + "firmwareVersion": { + "min": "0.0", + "max": "255.255" + }, + "associations": { + "1": { + "label": "Lifeline", + "maxNodes": 5, + "isLifeline": true + }, + "2": { + "label": "On/Off Control", + "maxNodes": 5 + }, + "3": { + "label": "Multilevel Set", + "maxNodes": 5 + }, + "4": { + "label": "Multilevel Start/Stop", + "maxNodes": 5 + } + }, + "paramInformation": [ + { + "#": "1", + "label": "Enable Manual Pull-Start", + "valueSize": 1, + "defaultValue": 1, + "allowManualEntry": false, + "options": [ + { + "label": "Close", + "value": 0 + }, + { + "label": "Open", + "value": 1 + } + ] + }, + { + "#": "2", + "label": "Set Motor Direction", + "valueSize": 1, + "defaultValue": 1, + "allowManualEntry": false, + "options": [ + { + "label": "Forward", + "value": 1 + }, + { + "label": "Reverse", + "value": 2 + } + ] + }, + { + "#": "3", + "label": "Manually Set Open Borders", + "valueSize": 1, + "defaultValue": 0, + "allowManualEntry": false, + "options": [ + { + "label": "Cancel", + "value": 0 + }, + { + "label": "Start", + "value": 1 + } + ] + }, + { + "#": "4", + "label": "Manually Set Close Borders", + "valueSize": 1, + "defaultValue": 0, + "allowManualEntry": false, + "options": [ + { + "label": "Cancel", + "value": 0 + }, + { + "label": "Start", + "value": 1 + } + ] + }, + { + "#": "5", + "label": "Set Motor Status", + "valueSize": 1, + "defaultValue": 3, + "allowManualEntry": false, + "options": [ + { + "label": "Open (Up)", + "value": 1 + }, + { + "label": "Close (Down)", + "value": 2 + }, + { + "label": "Stop", + "value": 3 + } + ] + }, + { + "#": "6", + "label": "Calibrate Travel Point", + "valueSize": 1, + "defaultValue": 1, + "allowManualEntry": false, + "options": [ + { + "label": "Up travel point", + "value": 1 + }, + { + "label": "Down travel point", + "value": 2 + }, + { + "label": "Third travel point", + "value": 3 + } + ] + }, + { + "#": "7", + "label": "Delete Travel Point", + "valueSize": 1, + "defaultValue": 0, + "allowManualEntry": false, + "options": [ + { + "label": "Delete all travel", + "value": 0 + }, + { + "label": "Delete up travel", + "value": 1 + }, + { + "label": "Delete down travel", + "value": 2 + }, + { + "label": "Delete third travel", + "value": 3 + } + ] + }, + { + "#": "8", + "label": "Low Battery Level Alarm Threshold", + "valueSize": 1, + "unit": "%", + "minValue": 0, + "maxValue": 50, + "defaultValue": 10 + }, + { + "#": "9", + "label": "Battery Auto Report Interval Time", + "valueSize": 4, + "unit": "seconds", + "minValue": 0, + "maxValue": 2678400, + "defaultValue": 3600 + }, + { + "#": "10", + "label": "Battery Change Report Threshold", + "valueSize": 1, + "unit": "%", + "minValue": 0, + "maxValue": 50, + "defaultValue": 5 + }, + { + "#": "11", + "label": "Curtain Status Report Command Setting", + "valueSize": 1, + "defaultValue": 6, + "allowManualEntry": false, + "options": [ + { + "label": "Send nothing", + "value": 0 + }, + { + "label": "Send Basic Report", + "value": 1 + }, + { + "label": "Send Multilevel Switch Report", + "value": 2 + }, + { + "label": "Send window covering report", + "value": 3 + }, + { + "label": "Send Basic Report and Multilevel Switch Report", + "value": 4 + }, + { + "label": "Send Basic Report and window covering report", + "value": 5 + }, + { + "label": "Send Multilevel Switch Report and window covering report", + "value": 6 + }, + { + "label": "Send Basic Report and Multilevel Switch Report and window covering report", + "value": 7 + } + ] + } + ], + "metadata": { + "inclusion": "Follow the user guide of hub to enter inclusion mode.\nPress and hold the Config Button more than 6s, enter Include Mode", + "exclusion": "Follow the user guide of hub to enter exclusion mode.\nPress and hold the Config Button more than 6s, enter Exclusion Mode", + "reset": "Press and hold the Config Button more than 10s. The Curtain will reset itself to factory default by sending a Device Reset Locally Notification to gateway when the button is released.\nNote:Please use this procedure only when the network primary controller is missing or otherwise inoperable" + } +} From cb8240158e4acb9485c648e0e7d756da161fc07e Mon Sep 17 00:00:00 2001 From: xuexiaofei <279716582@qq.com> Date: Thu, 24 Oct 2024 11:26:34 +0800 Subject: [PATCH 2/6] fix(config): update config file fromat fix(config): update config file fromat --- .../config/config/devices/0x045a/WM25L.json | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/packages/config/config/devices/0x045a/WM25L.json b/packages/config/config/devices/0x045a/WM25L.json index 1ea35c35147e..f7dc0e9781e0 100644 --- a/packages/config/config/devices/0x045a/WM25L.json +++ b/packages/config/config/devices/0x045a/WM25L.json @@ -36,6 +36,7 @@ { "#": "1", "label": "Enable Manual Pull-Start", + "description": "Enable Manual Pull-Start", "valueSize": 1, "defaultValue": 1, "allowManualEntry": false, @@ -53,6 +54,7 @@ { "#": "2", "label": "Set Motor Direction", + "description": "Set Motor Direction", "valueSize": 1, "defaultValue": 1, "allowManualEntry": false, @@ -70,6 +72,7 @@ { "#": "3", "label": "Manually Set Open Borders", + "description": "Manually Set Open Borders", "valueSize": 1, "defaultValue": 0, "allowManualEntry": false, @@ -87,6 +90,7 @@ { "#": "4", "label": "Manually Set Close Borders", + "description": "Manually Set Close Borders", "valueSize": 1, "defaultValue": 0, "allowManualEntry": false, @@ -104,6 +108,7 @@ { "#": "5", "label": "Set Motor Status", + "description": "Set Motor Status", "valueSize": 1, "defaultValue": 3, "allowManualEntry": false, @@ -125,6 +130,7 @@ { "#": "6", "label": "Calibrate Travel Point", + "description": "Calibrate Travel Point", "valueSize": 1, "defaultValue": 1, "allowManualEntry": false, @@ -146,6 +152,7 @@ { "#": "7", "label": "Delete Travel Point", + "description": "Delete Travel Point", "valueSize": 1, "defaultValue": 0, "allowManualEntry": false, @@ -171,33 +178,40 @@ { "#": "8", "label": "Low Battery Level Alarm Threshold", + "description": "Low Battery Level Alarm Threshold", "valueSize": 1, "unit": "%", "minValue": 0, "maxValue": 50, - "defaultValue": 10 + "defaultValue": 10, + "unsigned": true }, { "#": "9", "label": "Battery Auto Report Interval Time", + "description": "Battery Auto Report Interval Time", "valueSize": 4, "unit": "seconds", "minValue": 0, "maxValue": 2678400, - "defaultValue": 3600 + "defaultValue": 3600, + "unsigned": true }, { "#": "10", "label": "Battery Change Report Threshold", + "description": "Battery Change Report Threshold", "valueSize": 1, "unit": "%", "minValue": 0, "maxValue": 50, - "defaultValue": 5 + "defaultValue": 5, + "unsigned": true }, { "#": "11", "label": "Curtain Status Report Command Setting", + "description": "Curtain Status Report Command Setting", "valueSize": 1, "defaultValue": 6, "allowManualEntry": false, From f38b3128af49206298de46aeded5a63b44326c02 Mon Sep 17 00:00:00 2001 From: xuexiaofei <279716582@qq.com> Date: Thu, 24 Oct 2024 11:36:08 +0800 Subject: [PATCH 3/6] fix(config): update config file fromat fix(config): update config file fromat --- packages/config/config/devices/0x045a/WM25L.json | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/packages/config/config/devices/0x045a/WM25L.json b/packages/config/config/devices/0x045a/WM25L.json index f7dc0e9781e0..f4075cf3595c 100644 --- a/packages/config/config/devices/0x045a/WM25L.json +++ b/packages/config/config/devices/0x045a/WM25L.json @@ -36,7 +36,6 @@ { "#": "1", "label": "Enable Manual Pull-Start", - "description": "Enable Manual Pull-Start", "valueSize": 1, "defaultValue": 1, "allowManualEntry": false, @@ -54,7 +53,6 @@ { "#": "2", "label": "Set Motor Direction", - "description": "Set Motor Direction", "valueSize": 1, "defaultValue": 1, "allowManualEntry": false, @@ -72,7 +70,6 @@ { "#": "3", "label": "Manually Set Open Borders", - "description": "Manually Set Open Borders", "valueSize": 1, "defaultValue": 0, "allowManualEntry": false, @@ -90,7 +87,6 @@ { "#": "4", "label": "Manually Set Close Borders", - "description": "Manually Set Close Borders", "valueSize": 1, "defaultValue": 0, "allowManualEntry": false, @@ -130,7 +126,6 @@ { "#": "6", "label": "Calibrate Travel Point", - "description": "Calibrate Travel Point", "valueSize": 1, "defaultValue": 1, "allowManualEntry": false, @@ -152,7 +147,6 @@ { "#": "7", "label": "Delete Travel Point", - "description": "Delete Travel Point", "valueSize": 1, "defaultValue": 0, "allowManualEntry": false, @@ -178,7 +172,6 @@ { "#": "8", "label": "Low Battery Level Alarm Threshold", - "description": "Low Battery Level Alarm Threshold", "valueSize": 1, "unit": "%", "minValue": 0, @@ -189,7 +182,6 @@ { "#": "9", "label": "Battery Auto Report Interval Time", - "description": "Battery Auto Report Interval Time", "valueSize": 4, "unit": "seconds", "minValue": 0, @@ -200,7 +192,6 @@ { "#": "10", "label": "Battery Change Report Threshold", - "description": "Battery Change Report Threshold", "valueSize": 1, "unit": "%", "minValue": 0, @@ -211,7 +202,6 @@ { "#": "11", "label": "Curtain Status Report Command Setting", - "description": "Curtain Status Report Command Setting", "valueSize": 1, "defaultValue": 6, "allowManualEntry": false, From fac53fc42b14000d4e0326868be67616e7fe41c2 Mon Sep 17 00:00:00 2001 From: xuexiaofei <279716582@qq.com> Date: Thu, 24 Oct 2024 11:42:19 +0800 Subject: [PATCH 4/6] fix(config): update config file fromat fix(config): update config file fromat --- packages/config/config/devices/0x045a/WM25L.json | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/packages/config/config/devices/0x045a/WM25L.json b/packages/config/config/devices/0x045a/WM25L.json index f4075cf3595c..1ea35c35147e 100644 --- a/packages/config/config/devices/0x045a/WM25L.json +++ b/packages/config/config/devices/0x045a/WM25L.json @@ -104,7 +104,6 @@ { "#": "5", "label": "Set Motor Status", - "description": "Set Motor Status", "valueSize": 1, "defaultValue": 3, "allowManualEntry": false, @@ -176,8 +175,7 @@ "unit": "%", "minValue": 0, "maxValue": 50, - "defaultValue": 10, - "unsigned": true + "defaultValue": 10 }, { "#": "9", @@ -186,8 +184,7 @@ "unit": "seconds", "minValue": 0, "maxValue": 2678400, - "defaultValue": 3600, - "unsigned": true + "defaultValue": 3600 }, { "#": "10", @@ -196,8 +193,7 @@ "unit": "%", "minValue": 0, "maxValue": 50, - "defaultValue": 5, - "unsigned": true + "defaultValue": 5 }, { "#": "11", From 98c5dcb6a37ff20d90d2560289689827ee9af7d4 Mon Sep 17 00:00:00 2001 From: Dominic Griesel Date: Thu, 24 Oct 2024 13:36:54 +0200 Subject: [PATCH 5/6] fix: formatting, add Window Covering to list of Title Case names --- .../config/config/devices/0x045a/WM25L.json | 486 +++++++++--------- .../eslint-plugin/src/utils/wordsAndNames.ts | 1 + 2 files changed, 244 insertions(+), 243 deletions(-) diff --git a/packages/config/config/devices/0x045a/WM25L.json b/packages/config/config/devices/0x045a/WM25L.json index 1ea35c35147e..d3c1422014c2 100644 --- a/packages/config/config/devices/0x045a/WM25L.json +++ b/packages/config/config/devices/0x045a/WM25L.json @@ -1,245 +1,245 @@ { - "manufacturer": "ZVIDAR", - "manufacturerId": "0x045a", - "label": "WM25L", - "description": "Smartwings Smart Motor", - "devices": [ - { - "productType": "0x0004", - "productId": "0x050b" - } - ], - "firmwareVersion": { - "min": "0.0", - "max": "255.255" - }, - "associations": { - "1": { - "label": "Lifeline", - "maxNodes": 5, - "isLifeline": true - }, - "2": { - "label": "On/Off Control", - "maxNodes": 5 - }, - "3": { - "label": "Multilevel Set", - "maxNodes": 5 - }, - "4": { - "label": "Multilevel Start/Stop", - "maxNodes": 5 - } - }, - "paramInformation": [ - { - "#": "1", - "label": "Enable Manual Pull-Start", - "valueSize": 1, - "defaultValue": 1, - "allowManualEntry": false, - "options": [ - { - "label": "Close", - "value": 0 - }, - { - "label": "Open", - "value": 1 - } - ] - }, - { - "#": "2", - "label": "Set Motor Direction", - "valueSize": 1, - "defaultValue": 1, - "allowManualEntry": false, - "options": [ - { - "label": "Forward", - "value": 1 - }, - { - "label": "Reverse", - "value": 2 - } - ] - }, - { - "#": "3", - "label": "Manually Set Open Borders", - "valueSize": 1, - "defaultValue": 0, - "allowManualEntry": false, - "options": [ - { - "label": "Cancel", - "value": 0 - }, - { - "label": "Start", - "value": 1 - } - ] - }, - { - "#": "4", - "label": "Manually Set Close Borders", - "valueSize": 1, - "defaultValue": 0, - "allowManualEntry": false, - "options": [ - { - "label": "Cancel", - "value": 0 - }, - { - "label": "Start", - "value": 1 - } - ] - }, - { - "#": "5", - "label": "Set Motor Status", - "valueSize": 1, - "defaultValue": 3, - "allowManualEntry": false, - "options": [ - { - "label": "Open (Up)", - "value": 1 - }, - { - "label": "Close (Down)", - "value": 2 - }, - { - "label": "Stop", - "value": 3 - } - ] - }, - { - "#": "6", - "label": "Calibrate Travel Point", - "valueSize": 1, - "defaultValue": 1, - "allowManualEntry": false, - "options": [ - { - "label": "Up travel point", - "value": 1 - }, - { - "label": "Down travel point", - "value": 2 - }, - { - "label": "Third travel point", - "value": 3 - } - ] - }, - { - "#": "7", - "label": "Delete Travel Point", - "valueSize": 1, - "defaultValue": 0, - "allowManualEntry": false, - "options": [ - { - "label": "Delete all travel", - "value": 0 - }, - { - "label": "Delete up travel", - "value": 1 - }, - { - "label": "Delete down travel", - "value": 2 - }, - { - "label": "Delete third travel", - "value": 3 - } - ] - }, - { - "#": "8", - "label": "Low Battery Level Alarm Threshold", - "valueSize": 1, - "unit": "%", - "minValue": 0, - "maxValue": 50, - "defaultValue": 10 - }, - { - "#": "9", - "label": "Battery Auto Report Interval Time", - "valueSize": 4, - "unit": "seconds", - "minValue": 0, - "maxValue": 2678400, - "defaultValue": 3600 - }, - { - "#": "10", - "label": "Battery Change Report Threshold", - "valueSize": 1, - "unit": "%", - "minValue": 0, - "maxValue": 50, - "defaultValue": 5 - }, - { - "#": "11", - "label": "Curtain Status Report Command Setting", - "valueSize": 1, - "defaultValue": 6, - "allowManualEntry": false, - "options": [ - { - "label": "Send nothing", - "value": 0 - }, - { - "label": "Send Basic Report", - "value": 1 - }, - { - "label": "Send Multilevel Switch Report", - "value": 2 - }, - { - "label": "Send window covering report", - "value": 3 - }, - { - "label": "Send Basic Report and Multilevel Switch Report", - "value": 4 - }, - { - "label": "Send Basic Report and window covering report", - "value": 5 - }, - { - "label": "Send Multilevel Switch Report and window covering report", - "value": 6 - }, - { - "label": "Send Basic Report and Multilevel Switch Report and window covering report", - "value": 7 - } - ] - } - ], - "metadata": { - "inclusion": "Follow the user guide of hub to enter inclusion mode.\nPress and hold the Config Button more than 6s, enter Include Mode", - "exclusion": "Follow the user guide of hub to enter exclusion mode.\nPress and hold the Config Button more than 6s, enter Exclusion Mode", - "reset": "Press and hold the Config Button more than 10s. The Curtain will reset itself to factory default by sending a Device Reset Locally Notification to gateway when the button is released.\nNote:Please use this procedure only when the network primary controller is missing or otherwise inoperable" - } + "manufacturer": "ZVIDAR", + "manufacturerId": "0x045a", + "label": "WM25L", + "description": "Smartwings Smart Motor", + "devices": [ + { + "productType": "0x0004", + "productId": "0x050b" + } + ], + "firmwareVersion": { + "min": "0.0", + "max": "255.255" + }, + "associations": { + "1": { + "label": "Lifeline", + "maxNodes": 5, + "isLifeline": true + }, + "2": { + "label": "On/Off Control", + "maxNodes": 5 + }, + "3": { + "label": "Multilevel Set", + "maxNodes": 5 + }, + "4": { + "label": "Multilevel Start/Stop", + "maxNodes": 5 + } + }, + "paramInformation": [ + { + "#": "1", + "label": "Enable Manual Pull-Start", + "valueSize": 1, + "defaultValue": 1, + "allowManualEntry": false, + "options": [ + { + "label": "Close", + "value": 0 + }, + { + "label": "Open", + "value": 1 + } + ] + }, + { + "#": "2", + "label": "Set Motor Direction", + "valueSize": 1, + "defaultValue": 1, + "allowManualEntry": false, + "options": [ + { + "label": "Forward", + "value": 1 + }, + { + "label": "Reverse", + "value": 2 + } + ] + }, + { + "#": "3", + "label": "Manually Set Open Borders", + "valueSize": 1, + "defaultValue": 0, + "allowManualEntry": false, + "options": [ + { + "label": "Cancel", + "value": 0 + }, + { + "label": "Start", + "value": 1 + } + ] + }, + { + "#": "4", + "label": "Manually Set Close Borders", + "valueSize": 1, + "defaultValue": 0, + "allowManualEntry": false, + "options": [ + { + "label": "Cancel", + "value": 0 + }, + { + "label": "Start", + "value": 1 + } + ] + }, + { + "#": "5", + "label": "Set Motor Status", + "valueSize": 1, + "defaultValue": 3, + "allowManualEntry": false, + "options": [ + { + "label": "Open (Up)", + "value": 1 + }, + { + "label": "Close (Down)", + "value": 2 + }, + { + "label": "Stop", + "value": 3 + } + ] + }, + { + "#": "6", + "label": "Calibrate Travel Point", + "valueSize": 1, + "defaultValue": 1, + "allowManualEntry": false, + "options": [ + { + "label": "Up travel point", + "value": 1 + }, + { + "label": "Down travel point", + "value": 2 + }, + { + "label": "Third travel point", + "value": 3 + } + ] + }, + { + "#": "7", + "label": "Delete Travel Point", + "valueSize": 1, + "defaultValue": 0, + "allowManualEntry": false, + "options": [ + { + "label": "Delete all travel", + "value": 0 + }, + { + "label": "Delete up travel", + "value": 1 + }, + { + "label": "Delete down travel", + "value": 2 + }, + { + "label": "Delete third travel", + "value": 3 + } + ] + }, + { + "#": "8", + "label": "Low Battery Level Alarm Threshold", + "valueSize": 1, + "unit": "%", + "minValue": 0, + "maxValue": 50, + "defaultValue": 10 + }, + { + "#": "9", + "label": "Battery Auto Report Interval Time", + "valueSize": 4, + "unit": "seconds", + "minValue": 0, + "maxValue": 2678400, + "defaultValue": 3600 + }, + { + "#": "10", + "label": "Battery Change Report Threshold", + "valueSize": 1, + "unit": "%", + "minValue": 0, + "maxValue": 50, + "defaultValue": 5 + }, + { + "#": "11", + "label": "Curtain Status Report Command Setting", + "valueSize": 1, + "defaultValue": 6, + "allowManualEntry": false, + "options": [ + { + "label": "Send nothing", + "value": 0 + }, + { + "label": "Send Basic Report", + "value": 1 + }, + { + "label": "Send Multilevel Switch Report", + "value": 2 + }, + { + "label": "Send Window Covering Report", + "value": 3 + }, + { + "label": "Send Basic Report and Multilevel Switch Report", + "value": 4 + }, + { + "label": "Send Basic Report and Window Covering Report", + "value": 5 + }, + { + "label": "Send Multilevel Switch Report and Window Covering Report", + "value": 6 + }, + { + "label": "Send Basic Report and Multilevel Switch Report and Window Covering Report", + "value": 7 + } + ] + } + ], + "metadata": { + "inclusion": "Follow the user guide of hub to enter inclusion mode.\nPress and hold the Config Button more than 6s, enter Include Mode", + "exclusion": "Follow the user guide of hub to enter exclusion mode.\nPress and hold the Config Button more than 6s, enter Exclusion Mode", + "reset": "Press and hold the Config Button more than 10s. The Curtain will reset itself to factory default by sending a Device Reset Locally Notification to gateway when the button is released.\nNote:Please use this procedure only when the network primary controller is missing or otherwise inoperable" + } } diff --git a/packages/eslint-plugin/src/utils/wordsAndNames.ts b/packages/eslint-plugin/src/utils/wordsAndNames.ts index fc41fd975f38..099530ed4b2b 100644 --- a/packages/eslint-plugin/src/utils/wordsAndNames.ts +++ b/packages/eslint-plugin/src/utils/wordsAndNames.ts @@ -33,6 +33,7 @@ const ccAndCommandNames = combinations( "Scene Activation", "Meter", "Indicator", + "Window Covering", ], [ "Command Class", From 4aa09af5d657719e6f452cdc797b2c4c56d183f1 Mon Sep 17 00:00:00 2001 From: xuexiaofei <279716582@qq.com> Date: Thu, 24 Oct 2024 19:43:04 +0800 Subject: [PATCH 6/6] fix(config): update config file fromat fix(config): update config file fromat