From 0900fec60f7062292c512980c385bcc242297a49 Mon Sep 17 00:00:00 2001 From: Admin Date: Mon, 19 Jun 2017 16:22:03 -0500 Subject: [PATCH] Working on pairing with hue app --- .../com/bwssystems/HABridge/BridgeSettingsDescriptor.java | 1 - .../com/bwssystems/HABridge/api/hue/HueApiResponse.java | 4 ++-- .../java/com/bwssystems/HABridge/api/hue/HueConfig.java | 4 ++-- src/main/java/com/bwssystems/HABridge/hue/HueMulator.java | 7 ++++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/bwssystems/HABridge/BridgeSettingsDescriptor.java b/src/main/java/com/bwssystems/HABridge/BridgeSettingsDescriptor.java index 47be8a7..434c99e 100644 --- a/src/main/java/com/bwssystems/HABridge/BridgeSettingsDescriptor.java +++ b/src/main/java/com/bwssystems/HABridge/BridgeSettingsDescriptor.java @@ -121,7 +121,6 @@ public class BridgeSettingsDescriptor { this.somfyconfigured = false; this.lifxconfigured = false; this.farenheit = true; - this.whitelist = null; this.securityData = null; this.settingsChanged = false; this.myechourl = "echo.amazon.com/#cards"; diff --git a/src/main/java/com/bwssystems/HABridge/api/hue/HueApiResponse.java b/src/main/java/com/bwssystems/HABridge/api/hue/HueApiResponse.java index fcc0adb..17cc14e 100644 --- a/src/main/java/com/bwssystems/HABridge/api/hue/HueApiResponse.java +++ b/src/main/java/com/bwssystems/HABridge/api/hue/HueApiResponse.java @@ -18,9 +18,9 @@ public class HueApiResponse { private Map rules; private HueConfig config; - public HueApiResponse(String name, String ipaddress, Map awhitelist, String emulateHubVersion) { + public HueApiResponse(String name, String ipaddress, Map awhitelist, String emulateHubVersion, boolean isLinkButtonPressed) { super(); - this.setConfig(HueConfig.createConfig(name, ipaddress, awhitelist, emulateHubVersion)); + this.setConfig(HueConfig.createConfig(name, ipaddress, awhitelist, emulateHubVersion, isLinkButtonPressed)); this.setRules(new HashMap<>()); this.setSensors(new HashMap<>()); this.setSchedules(new HashMap<>()); diff --git a/src/main/java/com/bwssystems/HABridge/api/hue/HueConfig.java b/src/main/java/com/bwssystems/HABridge/api/hue/HueConfig.java index 367e30a..3b9be6c 100644 --- a/src/main/java/com/bwssystems/HABridge/api/hue/HueConfig.java +++ b/src/main/java/com/bwssystems/HABridge/api/hue/HueConfig.java @@ -34,7 +34,7 @@ public class HueConfig private String replacesbridgeid; private Map whitelist; - public static HueConfig createConfig(String name, String ipaddress, Map awhitelist, String emulateHubVersion) { + public static HueConfig createConfig(String name, String ipaddress, Map awhitelist, String emulateHubVersion, boolean isLinkButtonPressed) { HueConfig aConfig = new HueConfig(); SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss"); SimpleDateFormat dateFormatGmt = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss"); @@ -44,7 +44,7 @@ public class HueConfig aConfig.setPortalservices(false); aConfig.setGateway(ipaddress); aConfig.setSwversion(emulateHubVersion); - aConfig.setLinkbutton(true); + aConfig.setLinkbutton(isLinkButtonPressed); aConfig.setIpaddress(ipaddress); aConfig.setProxyport(0); aConfig.setSwupdate(Swupdate.createSwupdate()); diff --git a/src/main/java/com/bwssystems/HABridge/hue/HueMulator.java b/src/main/java/com/bwssystems/HABridge/hue/HueMulator.java index 09d29f8..30be3c2 100644 --- a/src/main/java/com/bwssystems/HABridge/hue/HueMulator.java +++ b/src/main/java/com/bwssystems/HABridge/hue/HueMulator.java @@ -60,6 +60,7 @@ public class HueMulator { validMapTypes = new DeviceMapTypes(); bridgeSettingMaster = bridgeMaster; bridgeSettings = bridgeSettingMaster.getBridgeSettingsDescriptor(); + homeManager= aHomeManager; myHueHome = (HueHome) homeManager.findHome(DeviceMapTypes.HUE_DEVICE[DeviceMapTypes.typeIndex]); aGsonHandler = new GsonBuilder().create(); @@ -769,8 +770,8 @@ public class HueMulator { } HueApiResponse apiResponse = new HueApiResponse("Philips hue", bridgeSettings.getUpnpConfigAddress(), - bridgeSettings.getWhitelist(), bridgeSettings.getHubversion()); - + bridgeSettings.getWhitelist(), bridgeSettings.getHubversion(), bridgeSettingMaster.getBridgeControl().isLinkButton()); + log.debug("api response config <<<" + aGsonHandler.toJson(apiResponse.getConfig()) + ">>>"); return apiResponse.getConfig(); } @@ -782,7 +783,7 @@ public class HueMulator { return theErrors; HueApiResponse apiResponse = new HueApiResponse("Philips hue", bridgeSettings.getUpnpConfigAddress(), - bridgeSettings.getWhitelist(), bridgeSettings.getHubversion()); + bridgeSettings.getWhitelist(), bridgeSettings.getHubversion(), bridgeSettingMaster.getBridgeControl().isLinkButton()); apiResponse.setLights((Map) this.lightsListHandler(userId, ipAddress)); apiResponse.setGroups((Map) this.groupsListHandler(userId, ipAddress));