From 9d732ec070a72f351497aedb946f5cc5689a4ec8 Mon Sep 17 00:00:00 2001 From: Bob Eckhoff Date: Wed, 27 Sep 2023 08:03:39 -0400 Subject: [PATCH 1/3] feat(config): add Alloy (Zipato) devices In response to #6323 and #6324. These devices are neo (0x0258) clones, so I copied those configs and made adjustments based on the manual provided by the poster. Signed-off-by: Bob Eckhoff --- .../config/devices/0x0131/ne-nas-pd07u1.json | 163 ++++++++++++++++++ .../config/devices/0x0131/ne-neo-ds07z.json | 120 +++++++++++++ 2 files changed, 283 insertions(+) create mode 100644 packages/config/config/devices/0x0131/ne-nas-pd07u1.json create mode 100644 packages/config/config/devices/0x0131/ne-neo-ds07z.json diff --git a/packages/config/config/devices/0x0131/ne-nas-pd07u1.json b/packages/config/config/devices/0x0131/ne-nas-pd07u1.json new file mode 100644 index 000000000000..65ec4cfc68e6 --- /dev/null +++ b/packages/config/config/devices/0x0131/ne-nas-pd07u1.json @@ -0,0 +1,163 @@ +{ + "manufacturer": "Zipato", + "manufacturerId": "0x0131", + "label": "NE-NAS-PD07U1", + "description": "Alloy 5 in 1 PIR Motion Sensor", + "devices": [ + { + "productType": "0x0004", + "productId": "0x1123" + } + ], + "firmwareVersion": { + "min": "0.0", + "max": "255.255" + }, + "associations": { + "1": { + "label": "Lifeline", + "maxNodes": 5, + "isLifeline": true + }, + "2": { + "label": "BASIC_SET", + "maxNodes": 5 + } + }, + "paramInformation": [ + { + "#": "1", + "$import": "~/templates/master_template.json#enable_led_indicator", + "defaultValue": 1 + }, + { + "#": "2", + "$import": "~/templates/master_template.json#base_enable_disable", + "label": "Motion Enable", + "defaultValue": 1 + }, + { + "#": "3", + "$import": "~/templates/master_template.json#base_enable_disable", + "label": "Motion Alarm Once Enable", + "defaultValue": 1 + }, + { + "#": "4", + "$import": "~/templates/master_template.json#base_enable_disable", + "label": "Require Luminance Change for Basic Sets on Motion", + "description": "Basic Set if light below Parameter 14 value and motion detected" + }, + { + "#": "5", + "$import": "~/templates/master_template.json#base_enable_disable", + "label": "Binary Sensor Report Enable" + }, + { + "#": "6", + "label": "Temperature Offset Value", + "valueSize": 1, + "unit": "0.1 °C/F", + "minValue": -120, + "maxValue": 120, + "defaultValue": 0, + "unsigned": false + }, + { + "#": "7", + "label": "Humidity Offset Value", + "valueSize": 1, + "unit": "0.1 %", + "minValue": -120, + "maxValue": 120, + "defaultValue": 0, + "unsigned": false + }, + { + "#": "8", + "label": "Temperature Change Report Threshold", + "valueSize": 1, + "unit": "0.1 °C/F", + "minValue": 0, + "maxValue": 100, + "defaultValue": 10 + }, + { + "#": "9", + "label": "Humidity Change Report Threshold", + "valueSize": 1, + "unit": "0.1 %", + "minValue": 0, + "maxValue": 100, + "defaultValue": 20 + }, + { + "#": "10", + "label": "Luminance Change Report Threshold", + "valueSize": 1, + "unit": "lux", + "minValue": 0, + "maxValue": 120, + "defaultValue": 50 + }, + { + "#": "11", + "label": "Association Group 2: Basic Set Level", + "valueSize": 1, + "minValue": 0, + "maxValue": 100, + "defaultValue": 100, + "options": [ + { + "label": "On (255)", + "value": 100 + } + ] + }, + { + "#": "12", + "label": "Basic Set Off Delay Time", + "valueSize": 2, + "unit": "seconds", + "minValue": 0, + "maxValue": 30000, + "defaultValue": 30 + }, + { + "#": "13", + "label": "Motion Clear Time", + "valueSize": 2, + "unit": "seconds", + "minValue": 1, + "maxValue": 30000, + "defaultValue": 30 + }, + { + "#": "14", + "label": "Luminance Threshold for Basic Sets", + "valueSize": 2, + "unit": "lux", + "minValue": 0, + "maxValue": 1000, + "defaultValue": 50 + }, + { + "#": "15", + "label": "Sensor Report Interval", + "valueSize": 2, + "unit": "seconds", + "minValue": 0, + "maxValue": 30000, + "defaultValue": 180 + }, + { + "#": "99", + "label": "Light Intensity Offset Value", + "description": "See manual for details", + "valueSize": 2, + "minValue": 1, + "maxValue": 32767, + "defaultValue": 450 + } + ] +} diff --git a/packages/config/config/devices/0x0131/ne-neo-ds07z.json b/packages/config/config/devices/0x0131/ne-neo-ds07z.json new file mode 100644 index 000000000000..7d4b672440d5 --- /dev/null +++ b/packages/config/config/devices/0x0131/ne-neo-ds07z.json @@ -0,0 +1,120 @@ +{ + "manufacturer": "Zipato", + "manufacturerId": "0x0131", + "label": "NE-NEO-DS07Z", + "description": "Alloy Contact Sensor 2", + "devices": [ + { + "productType": "0x0004", + "productId": "0x1118" + } + ], + "firmwareVersion": { + "min": "2.0", + "max": "255.255" + }, + "associations": { + "1": { + "label": "Lifeline", + "maxNodes": 5, + "isLifeline": true + }, + "2": { + "label": "BASIC_SET", + "maxNodes": 5 + } + }, + "paramInformation": [ + { + "#": "1", + "$import": "~/templates/master_template.json#enable_led_indicator", + "defaultValue": 1 + }, + { + "#": "2", + "$import": "~/templates/master_template.json#base_enable_disable", + "label": "Binary Sensor Report" + }, + { + "#": "3", + "label": "Temperature Offset Value", + "valueSize": 1, + "unit": "0.1 (°C/°F)", + "minValue": -120, + "maxValue": 121, + "defaultValue": 0, + "unsigned": false + }, + { + "#": "4", + "label": "Humidity Offset Value", + "valueSize": 1, + "unit": "0.1 (RH%)", + "minValue": -120, + "maxValue": 120, + "defaultValue": 0, + "unsigned": false + }, + { + "#": "5", + "label": "Temperature Change Report Threshold", + "valueSize": 1, + "unit": "0.1 (°C/°F)", + "minValue": 0, + "maxValue": 100, + "defaultValue": 10 + }, + { + "#": "6", + "label": "Humidity Change Report Threshold", + "valueSize": 1, + "unit": "0.1 %rH", + "minValue": 0, + "maxValue": 100, + "defaultValue": 20 + }, + { + "#": "7", + "label": "Association Group 2: Basic Set Value (Open)", + "valueSize": 1, + "minValue": 0, + "maxValue": 100, + "defaultValue": 100, + "options": [ + { + "label": "On (255)", + "value": 100 + } + ] + }, + { + "#": "8", + "label": "Basic Set Off Delay Time (Close)", + "valueSize": 2, + "unit": "seconds", + "minValue": 0, + "maxValue": 30000, + "defaultValue": 30 + }, + { + "#": "9", + "label": "Sensor Measuring Interval", + "valueSize": 2, + "unit": "seconds", + "minValue": 0, + "maxValue": 30000, + "defaultValue": 80, + "options": [ + { + "label": "Disable", + "value": 0 + } + ] + } + ], + "metadata": { + "inclusion": "1. Power Up The Device.\n2. Set Z-Wave Controller Into Inclusion Mode\n3. Press And Hold The Button For 5s Until White Led Lights Is On, Then Release The Button Before Led Turn Off.\nBlue Led Will Blink With 1s Interval Until Inclusion Successful.", + "exclusion": "1. Power Up The Device.\n2. Set Z-Wave Controller Into Exclusion Mode\n3. Press And Hold The Button For 5s Until White Led Lights Is On, Then Release The Button Before Led Turn Off.\nBlue Led Will Blink With 0.5sinterval Until Exclusion Successful.", + "reset": "1. Power Up The Device.\n2. Press And Hold The Button For 10s Until Pink Led Lights Is On, Then Release The Button Before Led Turn Off." + } +} From 5a7b6288a0541c3cb372e6defccb9fcdf450102b Mon Sep 17 00:00:00 2001 From: Dominic Griesel Date: Wed, 11 Oct 2023 12:12:12 +0200 Subject: [PATCH 2/3] fix: consistency --- .../config/devices/0x0131/ne-nas-pd07u1.json | 8 +++----- .../config/devices/0x0131/ne-neo-ds07z.json | 20 +++++++++++-------- .../config/devices/0x0258/nas-pd07u1.json | 2 +- .../config/devices/0x0258/neo-ds07z.json | 4 ++-- 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/packages/config/config/devices/0x0131/ne-nas-pd07u1.json b/packages/config/config/devices/0x0131/ne-nas-pd07u1.json index 65ec4cfc68e6..8eae417271cd 100644 --- a/packages/config/config/devices/0x0131/ne-nas-pd07u1.json +++ b/packages/config/config/devices/0x0131/ne-nas-pd07u1.json @@ -20,7 +20,7 @@ "isLifeline": true }, "2": { - "label": "BASIC_SET", + "label": "Basic Set", "maxNodes": 5 } }, @@ -38,15 +38,13 @@ }, { "#": "3", - "$import": "~/templates/master_template.json#base_enable_disable", - "label": "Motion Alarm Once Enable", - "defaultValue": 1 + "$import": "../0x0258/templates/shenzhen_neo_template.json#motion_prevent_retrigger" }, { "#": "4", "$import": "~/templates/master_template.json#base_enable_disable", "label": "Require Luminance Change for Basic Sets on Motion", - "description": "Basic Set if light below Parameter 14 value and motion detected" + "description": "If enabled, a Basic Set will be sent if the ambient light is below the level defined in Parameter 14" }, { "#": "5", diff --git a/packages/config/config/devices/0x0131/ne-neo-ds07z.json b/packages/config/config/devices/0x0131/ne-neo-ds07z.json index 7d4b672440d5..e84f4367721e 100644 --- a/packages/config/config/devices/0x0131/ne-neo-ds07z.json +++ b/packages/config/config/devices/0x0131/ne-neo-ds07z.json @@ -20,7 +20,7 @@ "isLifeline": true }, "2": { - "label": "BASIC_SET", + "label": "Basic Set", "maxNodes": 5 } }, @@ -37,19 +37,19 @@ }, { "#": "3", - "label": "Temperature Offset Value", + "label": "Temperature Calibration", "valueSize": 1, "unit": "0.1 (°C/°F)", "minValue": -120, - "maxValue": 121, + "maxValue": 120, "defaultValue": 0, "unsigned": false }, { "#": "4", - "label": "Humidity Offset Value", + "label": "Humidity Calibration", "valueSize": 1, - "unit": "0.1 (RH%)", + "unit": "0.1 %rH", "minValue": -120, "maxValue": 120, "defaultValue": 0, @@ -82,14 +82,18 @@ "defaultValue": 100, "options": [ { - "label": "On (255)", + "label": "Off (0x00)", + "value": 0 + }, + { + "label": "On (0xff)", "value": 100 } ] }, { "#": "8", - "label": "Basic Set Off Delay Time (Close)", + "label": "Association Group 2: Basic Set Off Delay Time (Close)", "valueSize": 2, "unit": "seconds", "minValue": 0, @@ -103,7 +107,7 @@ "unit": "seconds", "minValue": 0, "maxValue": 30000, - "defaultValue": 80, + "defaultValue": 180, "options": [ { "label": "Disable", diff --git a/packages/config/config/devices/0x0258/nas-pd07u1.json b/packages/config/config/devices/0x0258/nas-pd07u1.json index 89b2397f0664..a5443315c5ce 100644 --- a/packages/config/config/devices/0x0258/nas-pd07u1.json +++ b/packages/config/config/devices/0x0258/nas-pd07u1.json @@ -36,7 +36,7 @@ "#": "4", "$import": "~/templates/master_template.json#base_enable_disable", "label": "Require Luminance Change for Basic Sets on Motion", - "description": "If enabled, a Basic Set will be set if the ambient light is below the level defined in Parameter 16" + "description": "If enabled, a Basic Set will be sent if the ambient light is below the level defined in Parameter 16" }, { "#": "5", diff --git a/packages/config/config/devices/0x0258/neo-ds07z.json b/packages/config/config/devices/0x0258/neo-ds07z.json index 93bfb3516055..9580426311b9 100644 --- a/packages/config/config/devices/0x0258/neo-ds07z.json +++ b/packages/config/config/devices/0x0258/neo-ds07z.json @@ -35,9 +35,9 @@ }, { "#": "4", - "label": "Humidity Offset Value", + "label": "Humidity Calibration", "valueSize": 1, - "unit": "0.1 (RH%)", + "unit": "0.1 %rH", "minValue": -120, "maxValue": 120, "defaultValue": 0, From 1be38e03f9bd88180fd3d9354c6b9562a57e8573 Mon Sep 17 00:00:00 2001 From: Bob Eckhoff Date: Wed, 11 Oct 2023 09:47:12 -0400 Subject: [PATCH 3/3] feat(config): make suggested changes to Zipato (Alloy) devices Changes as suggested Signed-off-by: Bob Eckhoff --- .../0x0131/{ne-nas-pd07u1.json => ah-nas-pd07u1.json} | 6 +++--- .../devices/0x0131/{ne-neo-ds07z.json => ah-neo-ds07z.json} | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) rename packages/config/config/devices/0x0131/{ne-nas-pd07u1.json => ah-nas-pd07u1.json} (96%) rename packages/config/config/devices/0x0131/{ne-neo-ds07z.json => ah-neo-ds07z.json} (96%) diff --git a/packages/config/config/devices/0x0131/ne-nas-pd07u1.json b/packages/config/config/devices/0x0131/ah-nas-pd07u1.json similarity index 96% rename from packages/config/config/devices/0x0131/ne-nas-pd07u1.json rename to packages/config/config/devices/0x0131/ah-nas-pd07u1.json index 8eae417271cd..ccaf2ab96b5a 100644 --- a/packages/config/config/devices/0x0131/ne-nas-pd07u1.json +++ b/packages/config/config/devices/0x0131/ah-nas-pd07u1.json @@ -1,8 +1,8 @@ { - "manufacturer": "Zipato", + "manufacturer": "Alloy", "manufacturerId": "0x0131", - "label": "NE-NAS-PD07U1", - "description": "Alloy 5 in 1 PIR Motion Sensor", + "label": "AH-NAS-PD07U1", + "description": "5 in 1 PIR Motion Sensor", "devices": [ { "productType": "0x0004", diff --git a/packages/config/config/devices/0x0131/ne-neo-ds07z.json b/packages/config/config/devices/0x0131/ah-neo-ds07z.json similarity index 96% rename from packages/config/config/devices/0x0131/ne-neo-ds07z.json rename to packages/config/config/devices/0x0131/ah-neo-ds07z.json index e84f4367721e..265511b4cad1 100644 --- a/packages/config/config/devices/0x0131/ne-neo-ds07z.json +++ b/packages/config/config/devices/0x0131/ah-neo-ds07z.json @@ -1,8 +1,8 @@ { - "manufacturer": "Zipato", + "manufacturer": "Alloy", "manufacturerId": "0x0131", - "label": "NE-NEO-DS07Z", - "description": "Alloy Contact Sensor 2", + "label": "AH-NEO-DS07Z", + "description": "Contact Sensor 2", "devices": [ { "productType": "0x0004",