From e6db6e11e5a5ce55b7f58a8a972f66d5fa6fdfec Mon Sep 17 00:00:00 2001 From: bsamuels Date: Mon, 29 Jan 2018 16:44:12 -0600 Subject: [PATCH] Update broadlinnk to dump clients when discovered in debug and to drop clients when re-init. --- pom.xml | 2 +- .../HABridge/plugins/broadlink/BroadlinkHome.java | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 6e9db61..c329b82 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.bwssystems.HABridge ha-bridge - 5.2.0RC9 + 5.2.0RC10 jar HA Bridge diff --git a/src/main/java/com/bwssystems/HABridge/plugins/broadlink/BroadlinkHome.java b/src/main/java/com/bwssystems/HABridge/plugins/broadlink/BroadlinkHome.java index 11f225d..a8a4bcf 100644 --- a/src/main/java/com/bwssystems/HABridge/plugins/broadlink/BroadlinkHome.java +++ b/src/main/java/com/bwssystems/HABridge/plugins/broadlink/BroadlinkHome.java @@ -76,8 +76,12 @@ public class BroadlinkHome implements Home { return this; } for(int i = 0; i < clients.length; i++) { - if(clients[i].getDeviceType() != BLDevice.DEV_A1) + if(clients[i].getDeviceType() != BLDevice.DEV_A1) { broadlinkMap.put(clients[i].getHost() + "-" + String.format("%04x", clients[i].getDeviceType()), clients[i]); + log.debug("Adding Device to Map - host: " + clients[i].getHost() + ", device Type: " + clients[i].getDeviceDescription() + ", mac: " + (clients[i].getMac() == null ? "no Mac in client" : clients[i].getMac().getMacString())); + } else { + log.debug("Ignoring A1 Device - host: " + clients[i].getHost() + ", device Type: " + clients[i].getDeviceDescription() + ", mac: " + (clients[i].getMac() == null ? "no Mac in client" : clients[i].getMac().getMacString())); + } } } catch (IOException e) { log.warn("Could not discover Broadlinks, with IO Exception", e); @@ -300,6 +304,8 @@ public class BroadlinkHome implements Home { if(!validBroadlink) return; log.debug("Closing Home."); + broadlinkMap.clear(); + broadlinkMap = null; if(closed) { log.debug("Home is already closed...."); return;