diff --git a/pom.xml b/pom.xml index 5510e084..68a8d45b 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.bwssystems.HABridge ha-bridge - 0.4.9 + 0.4.10 jar HA Bridge diff --git a/src/main/java/com/bwssystems/HABridge/HABridge.java b/src/main/java/com/bwssystems/HABridge/HABridge.java index 30c90e2f..bfda0d6b 100644 --- a/src/main/java/com/bwssystems/HABridge/HABridge.java +++ b/src/main/java/com/bwssystems/HABridge/HABridge.java @@ -40,6 +40,7 @@ public static void main(String[] args) { String addressString; BridgeSettings bridgeSettings; + log.info("HA Bridge (v0.4.10) starting setup...."); //get ip address for upnp requests try { address = InetAddress.getLocalHost(); @@ -65,7 +66,6 @@ public static void main(String[] args) { port(Integer.valueOf(bridgeSettings.getServerPort())); // sparkjava config directive to set html static file location for Jetty staticFileLocation("/public"); - log.info("Starting setup...."); // setup the class to handle the resource setup rest api theResources = new DeviceResource(bridgeSettings); // setup the class to handle the hue emulator rest api diff --git a/src/main/java/com/bwssystems/HABridge/api/hue/DeviceResponse.java b/src/main/java/com/bwssystems/HABridge/api/hue/DeviceResponse.java index 9f957f50..de2b30d4 100644 --- a/src/main/java/com/bwssystems/HABridge/api/hue/DeviceResponse.java +++ b/src/main/java/com/bwssystems/HABridge/api/hue/DeviceResponse.java @@ -1,8 +1,6 @@ package com.bwssystems.HABridge.api.hue; import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; import java.util.Map; /** @@ -104,20 +102,13 @@ public static DeviceResponse createResponse(String name, String id){ deviceState.setEffect("none"); deviceState.setAlert("none"); deviceState.setBri(254); - deviceState.setHue(15823); - deviceState.setSat(88); - deviceState.setCt(313); - - List xv = new LinkedList<>(); - xv.add(Double.valueOf("0.4255")); - xv.add(Double.valueOf("0.3998")); - deviceState.setXy(xv); - deviceState.setColormode("ct"); + deviceState.setSat(254); + response.setName(name); response.setUniqueid(id); response.setManufacturername("Philips"); - response.setType("Extended color light"); - response.setModelid("LCT001"); + response.setType("Dimmable light"); + response.setModelid("LWB004"); response.setSwversion("65003148"); return response; diff --git a/src/main/resources/public/index.html b/src/main/resources/public/index.html index f0585ff9..4faf09c8 100644 --- a/src/main/resources/public/index.html +++ b/src/main/resources/public/index.html @@ -36,7 +36,7 @@