From 4f1b521beef38e30303be5ce4778ec9977f085ee Mon Sep 17 00:00:00 2001
From: sebastianheierhoff <6094238+sebastianheierhoff@users.noreply.github.com>
Date: Wed, 29 Aug 2018 18:49:01 +0200
Subject: [PATCH 1/3] Fix issue #229: router devices can't be managed by
 zigbee2mqtt

---
 lib/controller.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/controller.js b/lib/controller.js
index 9b0ce7175..9a0f36e6d 100644
--- a/lib/controller.js
+++ b/lib/controller.js
@@ -8,8 +8,8 @@ const homeassistant = require('./homeassistant');
 const objectAssignDeep = require(`object-assign-deep`);
 
 const mqttConfigRegex = new RegExp(`${settings.get().mqtt.base_topic}/bridge/config/\\w+`, 'g');
-const mqttDeviceRegex = new RegExp(`${settings.get().mqtt.base_topic}/[\\w\\s\\d]+/set`, 'g');
-const mqttDevicePrefixRegex = new RegExp(`${settings.get().mqtt.base_topic}/[\\w\\s\\d]+/[\\w\\s\\d]+/set`, 'g');
+const mqttDeviceRegex = new RegExp(`${settings.get().mqtt.base_topic}/[\\w\\s\\d\.\-]+/set`, 'g');
+const mqttDevicePrefixRegex = new RegExp(`${settings.get().mqtt.base_topic}/[\\w\\s\\d\.\-]+/[\\w\\s\\d\.\-]+/set`, 'g');
 
 const pollInterval = 60 * 1000; // seconds * 1000.
 const softResetTimeout = 3600 * 1000; // seconds * 1000.

From ed5c52654f29faacbf86b791f3a5290d9494607a Mon Sep 17 00:00:00 2001
From: sebastianheierhoff <6094238+sebastianheierhoff@users.noreply.github.com>
Date: Wed, 29 Aug 2018 19:19:54 +0200
Subject: [PATCH 2/3] Fix issue #229: router devices can't be managed by
 zigbee2mqtt

---
 lib/controller.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/controller.js b/lib/controller.js
index 9a0f36e6d..80d1ad1f5 100644
--- a/lib/controller.js
+++ b/lib/controller.js
@@ -8,8 +8,9 @@ const homeassistant = require('./homeassistant');
 const objectAssignDeep = require(`object-assign-deep`);
 
 const mqttConfigRegex = new RegExp(`${settings.get().mqtt.base_topic}/bridge/config/\\w+`, 'g');
-const mqttDeviceRegex = new RegExp(`${settings.get().mqtt.base_topic}/[\\w\\s\\d\.\-]+/set`, 'g');
-const mqttDevicePrefixRegex = new RegExp(`${settings.get().mqtt.base_topic}/[\\w\\s\\d\.\-]+/[\\w\\s\\d\.\-]+/set`, 'g');
+const mqttDeviceRegex = new RegExp(`${settings.get().mqtt.base_topic}/[\\w\\s\\d.-]+/set`, 'g');
+const mqttDevicePrefixRegex = new RegExp(`${settings.get().mqtt.base_topic}/[\\w\\s\\d.-]
+    +/[\\w\\s\\d\.\-]+/set`, 'g');
 
 const pollInterval = 60 * 1000; // seconds * 1000.
 const softResetTimeout = 3600 * 1000; // seconds * 1000.

From ad43d61f2867b89bd0b63e8a6049b585e4a74f92 Mon Sep 17 00:00:00 2001
From: sebastianheierhoff <6094238+sebastianheierhoff@users.noreply.github.com>
Date: Wed, 29 Aug 2018 19:22:36 +0200
Subject: [PATCH 3/3] Fix issue #229: router devices can't be managed by
 zigbee2mqtt

---
 lib/controller.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/controller.js b/lib/controller.js
index 80d1ad1f5..40fd1446b 100644
--- a/lib/controller.js
+++ b/lib/controller.js
@@ -10,7 +10,7 @@ const objectAssignDeep = require(`object-assign-deep`);
 const mqttConfigRegex = new RegExp(`${settings.get().mqtt.base_topic}/bridge/config/\\w+`, 'g');
 const mqttDeviceRegex = new RegExp(`${settings.get().mqtt.base_topic}/[\\w\\s\\d.-]+/set`, 'g');
 const mqttDevicePrefixRegex = new RegExp(`${settings.get().mqtt.base_topic}/[\\w\\s\\d.-]
-    +/[\\w\\s\\d\.\-]+/set`, 'g');
+    +/[\\w\\s\\d.-]+/set`, 'g');
 
 const pollInterval = 60 * 1000; // seconds * 1000.
 const softResetTimeout = 3600 * 1000; // seconds * 1000.