Updated Hue Device emulation to be Lux bulbs as most things this bridge

will emulate will not be color friendly....
bwssytems · Oct 23, 2015 · c872f35 · c872f35
1 parent 23f2d27
commit c872f35
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 16 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.bwssystems.HABridge</groupId>
 	<artifactId>ha-bridge</artifactId>
-	<version>0.4.9</version>
+	<version>0.4.10</version>
 	<packaging>jar</packaging>
 
 	<name>HA Bridge</name>

diff --git 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
@@ -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<Double> 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
@@ -36,7 +36,7 @@
 						<ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
 							<li><a href="http://www.bwssystems.com" target="_blank">Developed by BWS Systems</a></li>
 							<li><a href="http://www.amazon.com/echo" target="_blank">Amazon Echo</a></li>
-							<li><a href="">HA Bridge Version 0.4.9</a></li>
+							<li><a href="">HA Bridge Version 0.4.10</a></li>
 						</ul>
 					</li>
 				</ul>