From 63e33c09fb22cdef357f14790506540abc30ebf3 Mon Sep 17 00:00:00 2001 From: Emanuel Posescu Date: Sun, 27 Dec 2020 23:57:44 +0200 Subject: [PATCH 1/3] New configuration option advanced/adapter_delay --- zigbee2mqtt-edge/config.json | 1 + zigbee2mqtt/CHANGELOG.md | 5 +++++ zigbee2mqtt/config.json | 3 ++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/zigbee2mqtt-edge/config.json b/zigbee2mqtt-edge/config.json index cf8cece..a03358d 100644 --- a/zigbee2mqtt-edge/config.json +++ b/zigbee2mqtt-edge/config.json @@ -124,6 +124,7 @@ "rtscts": "bool?", "soft_reset_timeout": "int?", "adapter_concurrent": "int?", + "adapter_delay": "int?", "network_key": [ "int?" ], diff --git a/zigbee2mqtt/CHANGELOG.md b/zigbee2mqtt/CHANGELOG.md index 05a0e29..08097eb 100644 --- a/zigbee2mqtt/CHANGELOG.md +++ b/zigbee2mqtt/CHANGELOG.md @@ -1,3 +1,8 @@ +## 1.17.0.1 +- New configuration option + - `advanced` + - `adapter_delay` + ## 1.17.0 - Updated Zigbee2mqtt to version [`1.17.0`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.17.0) diff --git a/zigbee2mqtt/config.json b/zigbee2mqtt/config.json index c6e212b..a1183e3 100644 --- a/zigbee2mqtt/config.json +++ b/zigbee2mqtt/config.json @@ -1,6 +1,6 @@ { "name": "Zigbee2mqtt", - "version": "1.17.0", + "version": "1.17.0.1", "slug": "zigbee2mqtt", "description": "Zigbee to MQTT Bridge", "auto_uart": true, @@ -124,6 +124,7 @@ "rtscts": "bool?", "soft_reset_timeout": "int?", "adapter_concurrent": "int?", + "adapter_delay": "int?", "network_key": [ "int?" ], From b6e37455c4bfd24730234dbbb2a4bbe27ffe7a42 Mon Sep 17 00:00:00 2001 From: Emanuel Posescu Date: Mon, 28 Dec 2020 08:10:25 +0200 Subject: [PATCH 2/3] Add zigate adapter, fixes #498 --- zigbee2mqtt-edge/config.json | 2 +- zigbee2mqtt/config.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/zigbee2mqtt-edge/config.json b/zigbee2mqtt-edge/config.json index a03358d..2e12c05 100644 --- a/zigbee2mqtt-edge/config.json +++ b/zigbee2mqtt-edge/config.json @@ -100,7 +100,7 @@ "serial": { "port": "str", "disable_led": "bool?", - "adapter": "match(^zstack|deconz$)?" + "adapter": "match(^zstack|deconz|zigate$)?" }, "blocklist": [ "str?" diff --git a/zigbee2mqtt/config.json b/zigbee2mqtt/config.json index a1183e3..ee7c85f 100644 --- a/zigbee2mqtt/config.json +++ b/zigbee2mqtt/config.json @@ -100,7 +100,7 @@ "serial": { "port": "str", "disable_led": "bool?", - "adapter": "match(^zstack|deconz$)?" + "adapter": "match(^zstack|deconz|zigate$)?" }, "blocklist": [ "str?" From 1fae3888fefe5a2db5663faf04acef0d8c408f7b Mon Sep 17 00:00:00 2001 From: Emanuel Posescu Date: Mon, 28 Dec 2020 08:13:52 +0200 Subject: [PATCH 3/3] Update changelog --- zigbee2mqtt/CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/zigbee2mqtt/CHANGELOG.md b/zigbee2mqtt/CHANGELOG.md index 08097eb..2d2d10e 100644 --- a/zigbee2mqtt/CHANGELOG.md +++ b/zigbee2mqtt/CHANGELOG.md @@ -1,7 +1,9 @@ ## 1.17.0.1 -- New configuration option +- New configuration options - `advanced` - `adapter_delay` + - `serial` + - `adapter: zigate` ## 1.17.0 - Updated Zigbee2mqtt to version [`1.17.0`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.17.0)