Merge pull request #504 from kind3r/master

New configuration option advanced/adapter_delay and adapter: zigate, fixes #499, #498
danielwelch · Jan 4, 2021 · 59f3446 · 59f3446
2 parents 8a6aa58 + 1fae388
commit 59f3446
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git 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?"
@@ -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
@@ -1,3 +1,10 @@
+## 1.17.0.1
+- 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)
 

diff --git 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,
@@ -100,7 +100,7 @@
     "serial": {
       "port": "str",
       "disable_led": "bool?",
-      "adapter": "match(^zstack|deconz$)?"
+      "adapter": "match(^zstack|deconz|zigate$)?"
     },
     "blocklist": [
       "str?"
@@ -124,6 +124,7 @@
       "rtscts": "bool?",
       "soft_reset_timeout": "int?",
       "adapter_concurrent": "int?",
+      "adapter_delay": "int?",
       "network_key": [
         "int?"
       ],