Finished implementation of generic UDP handling. This will support the

LimitlessLED Bridge. Updated Readme for UDP and more on configuration setup. Fixed issue with HueMulator handliong due to devices without mapTypes. Fixes #6.
Start adding UDP handling.
2025-12-18 08:13:23 +00:00 · 2015-12-07 16:34:37 -06:00 · 2015-12-04 16:21:11 -06:00 · 2015-12-03 14:36:23 -06:00 · 2015-12-02 15:42:09 -06:00 · 2015-12-02 15:35:35 -06:00
25 changed files with 577 additions and 150 deletions
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 # ha-bridge
-Emulates Philips Hue api to other home automation gateways such as an Amazon Echo.  The Bridge has helpers to build devices for the gateway for the Logitech Harmony Hub, Vera, Vera Lite or Vera Edge. Alternatively the Bridge supports custom calls as well. The Bridge handles basic commands such as "On", "Off" and "brightness" commands of the hue protocol. 
+Emulates Philips Hue api to other home automation gateways such as an Amazon Echo.  The Bridge handles basic commands such as "On", "Off" and "brightness" commands of the hue protocol.  This bridge can control most devices that have a distinct API. In the cases of systems that require authorization and/or have API's that cannot be handled in the current method, a module may need to be built. The Harmony Hub is such a module. The Bridge has helpers to build devices for the gateway for the Logitech Harmony Hub, Vera, Vera Lite or Vera Edge. Alternatively the Bridge supports custom calls as well.
 ## Build
 To customize and build it yourself, build a new jar with maven:  
 ```
@@ -22,8 +22,8 @@ The server defaults to running on port 8080. If you're already running a server
 The default location for the db to contain the devices as they are added is "data/devices.db". If you would like a different filename or directory, specify -Dupnp.devices.db=`<directory>/<filename> or <filename>` if it is the same directory.
 ### -Dupnp.response.port=`<port>`
 The upnp response port that will be used. The default is 50000.  
-### -Dharmony.address=`<ip address>`
-The argument for the Harmony Hub address should be given as the system does not have a way to find the address. Supply -Dharmony.address=X.Y.Z.A on the command line to provide it. If a Harmony Hub is not used, do not set it.
+### -Dharmony.address=`<ip address>` | `<{devices:[{name:ahub,ip:x.y.w.z},{name:anotherhub,ip:a.b.c.d}]}>`
+The argument for the Harmony Hub address should be given as the system does not have a way to find the address. Supply -Dharmony.address=X.Y.Z.A on the command line to provide it. If a Harmony Hub is not used, do not set it. To provide multiple harmony hubs, use the json style notation outlined above to provide the list. This argument is backwards compatible.
 ### -Dharmony.user=`<username>`
 The user name of the MyHarmony.com account for the Harmony Hub. This needs to be given if you are using the Harmony Hub Features, provide -Dharmony.user=`<username>` on the command line.
 ### -Dharmony.pwd=`<password>`
@@ -32,8 +32,16 @@ The password for the user name of the MyHarmony.com account for the Harmony Hub.
 Upnp has been very closed on this platform to try and respond as a hue and there is now a setting to control if it is more open or strict, Add -Dupnp.strict=`<true|false>` to your command line to have the emulator respond to what it thinks is an echo to a hue or any other device. The default is upnp.strict=true.
 ### -Dtrace.upnp=`<true|false>`
 Turn on tracing for upnp discovery messages. The default is false.
-## Web Config
-Configure by going to the url for the host you are running on or localhost with port you have assigned: and use the helpers for the Vera or Harmony Hub to create devices that the Echo will find.
+## HA Bridge Device Configuration
+You must configure devices before you will have any thing for the Echo to receive. The easy way to get devices configures is with the web interface by going to the url for the host you are running on or localhost with port you have assigned: and use the helpers for the Vera or Harmony Hub to create devices that the Echo will find.
+
+Another way to add a device is through the Manual Add Tab. This allows you to manually enter the name, the on and off URLs and select if there are custom handling with the type of call that can be made. This allows for control of anything that has a distinct request that can be executed so you are not limited to the Vera or the Harmony.
+
+The format of these can be the default HTTP request which excecutes the URLs formtted as http://<your stuff here> as a GET. Other options to this are to select the HTTP Verb and add the data type and add a body that is passed with the request. Another option that is detected by the bridge is to use the udp://<ip_address>:<port>/<your stuff here to send a UDP request. If your data for the UDP request is formatted as "0x00F009B9" lexical hex format, the bridge will convert the UDP data into a binary stream to send. Sed the examples inthe Configuration REST API Usage Section to get an idea.
+
+Also, you may want to use the REST API's listed below to configure your devices.
+
+Web Configuration Access
 ```
 http://<ip address>:<port>
 ```
@@ -50,7 +58,7 @@ Turn on / off your connected home device | "Turn on/off [connected home device n
 Set the brightness of compatible lights	| "Set brightness to [##]%." OR "Dim the lights to [##]%."

 To view or remove devices that Alexa knows about, you can use the mobile app `Menu / Settings / Connected Home`.
-## Configuration REST API usage
+## Configuration REST API Usage
 This section will describe the REST api available for configuration. The REST body examples are all formatted for easy reading, the actual body usage should be like this:
 ```
 {"var1":"value1","var2":"value2","var3:"value3"}
@@ -62,7 +70,7 @@ Add a new device to the HA Bridge configuration. There is a basic examples and t
 ```
 POST http://host:8080/api/devices
 ```
-#### Body arguments
+#### Body Arguments
 Name |	Type |	Description | Required
 -----|-------|--------------|------------
 name | string | A name for the device. This is also the utterance value that the Echo will use. | Required
@@ -73,7 +81,7 @@ httpVerb | string | This is used for "custom" calls that the user would like to
 contentType | string | This is an http type string such as "application/text" or "application/xml" or "application/json". | Optional
 contentBody | string | This is the content body that you would like to send when executing an "on" request. | Optional
 contentBodyOff | string | This is the content body that you would like to send when executing an "off" request. | Optional
-#### Basic example
+#### Basic Example
 ```
 {
 "name" : "bedroom light",
@@ -82,8 +90,8 @@ contentBodyOff | string | This is the content body that you would like to send w
  "offUrl" : "http://192.168.1.201:3480/data_request?id=action&output_format=json&serviceId=urn:upnp-org:serviceId:SwitchPower1&action=SetTarget&newTargetValue=0&DeviceNum=41"
 }
 ```
-#### Dimming and value passing control example
-Dimming is also supported by using the expressions ${intensity.percent} for 0-100 or ${intensity.byte} for 0-255 or custom values using ${intensity.math(<your expression using "X" as the value to operate on>)} i.e. "${intensity.math(X/4)}".    
+#### Dimming Control Example
+Dimming is also supported by using the expressions ${intensity.percent} for 0-100 or ${intensity.byte} for 0-255 for straight pass trhough of the value.
 e.g.
 ```
 {
@@ -95,13 +103,26 @@ e.g.
 ```
 See the echo's documentation for the dimming phrase.

-#### POST/PUT support example
+#### Value Passing Control Example
+You can control items that require special calculated values using ${intensity.math(<your expression using "X" as the value to operate on>)} i.e. "${intensity.math(X/4)}".    
+e.g.
+```
+{
+    "name": "Thermostat,
+    "deviceType": "custom",
+    "offUrl": "http://192.168.1.201:3480/data_request?id=action&output_format=json&serviceId=urn:upnp-org:serviceId:SwitchPower1&action=SetTarget&newTargetValue=0&DeviceNum=10",
+    "onUrl": "http://192.168.1.201:3480/data_request?id=action&output_format=json&DeviceNum=10&serviceId=urn:upnp-org:serviceId:Dimming1&action=SetLoadLevelTarget&newLoadlevelTarget=${intensity.math(X/4)}"
+}
+```
+See the echo's documentation for the dimming phrase.
+
+#### POST/PUT Support Example
 ```
 This will allow control of any other application that may need more then GET.  You can also use the dimming and value control commands within the URLs as well.
 e.g: 
 {
    "name": "test device",
-    "deviceType": "switch",
+    "deviceType": "custom",
    "offUrl": "http://192.168.1.201:3480/data_request?id=action&output_format=json&serviceId=urn:upnp-org:serviceId:SwitchPower1&action=SetTarget&newTargetValue=0&DeviceNum=31",
    "onUrl": "http://192.168.1.201:3480/data_request?id=action&output_format=json&DeviceNum=31&serviceId=urn:upnp-org:serviceId:Dimming1&action=SetLoadLevelTarget&newLoadlevelTarget=${intensity.percent}",
  "httpVerb":"POST",
@@ -115,12 +136,20 @@ Anything that takes an action as a result of an HTTP request will probably work
 ```
 {
  "name": "night mode",
-  "deviceType": "switch",
+  "deviceType": ""custom",
  "offUrl": "http://192.168.1.201:3480/data_request?id=lu_action&serviceId=urn:micasaverde-com:serviceId:HomeAutomationGateway1&action=SetHouseMode&Mode=1",
  "onUrl": "http://192.168.1.201:3480/data_request?id=lu_action&serviceId=urn:micasaverde-com:serviceId:HomeAutomationGateway1&action=SetHouseMode&Mode=3"
 }
 ```
-#### Response
+Here is a UDP example that can send binary data.
+```
+{
+  "name": "UDPPacket",
+  "deviceType": "custom",
+  "offUrl": "udp://192.168.1.1:8899/0x460055",
+  "onUrl": "udp://192.168.1.1:8899/0x450055"
+}
+```#### Response
 Name |	Type |	Description
 -----|-------|-------------
 id   | number | This is the ID assigned to the device and used for lookup.
@@ -141,12 +170,12 @@ contentBodyOff | string | This is the content body that you would like to send w
  "offUrl" : "http://192.168.1.201:3480/data_request?id=action&output_format=json&serviceId=urn:upnp-org:serviceId:SwitchPower1&action=SetTarget&newTargetValue=0&DeviceNum=41"
 }
 ```
-### Update a device 
+### Update a Device 
 Update an existing device using it's ID that was given when the device was created and the update could contain any of the fields that are used and shown in the previous examples when adding a device. 
 ```
 POST http://host:8080/api/devices/<id>
 ```
-#### Body arguments
+#### Body Arguments
 Name |	Type |	Description | Required
 -----|-------|--------------|------------
 id   | number | This is the ID assigned to the device and used for lookup.
@@ -178,7 +207,7 @@ contentBodyOff | string | This is the content body that you would like to send w
  "offUrl" : "http://192.168.1.201:3480/data_request?id=action&output_format=json&serviceId=urn:upnp-org:serviceId:SwitchPower1&action=SetTarget&newTargetValue=0&DeviceNum=41"
 }
 ```
-### Get all devices 
+### Get All Devices 
 Get all devices saved in the HA bridge configuration. 
 ```
 GET http://host:8080/api/devices
@@ -201,7 +230,7 @@ Individual entries are the same as a single device but in json list format.
  "offUrl" : "http://192.168.1.201:3480/data_request?id=action&output_format=json&serviceId=urn:upnp-org:serviceId:SwitchPower1&action=SetTarget&newTargetValue=0&DeviceNum=41"
 }]
 ```
-### Get a specific device 
+### Get a Specific Device 
 Get a device by ID assigned from creation and saved in the HA bridge configuration. 
 ```
 GET http://host:8080/api/devices/<id>
@@ -217,7 +246,7 @@ The response is the same layout as defined in the add device response.
  "offUrl" : "http://192.168.1.201:3480/data_request?id=action&output_format=json&serviceId=urn:upnp-org:serviceId:SwitchPower1&action=SetTarget&newTargetValue=0&DeviceNum=41"
 }
 ```
-### Delete a specific device 
+### Delete a Specific Device 
 Delete a device by ID assigned from creation and saved in the HA bridge configuration. 
 ```
 DELETE http://host:8080/api/devices/<id>
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@

 	<groupId>com.bwssystems.HABridge</groupId>
 	<artifactId>ha-bridge</artifactId>
-	<version>1.1.0</version>
+	<version>1.2.2</version>
 	<packaging>jar</packaging>

 	<name>HA Bridge</name>
@@ -33,7 +33,7 @@
 		<dependency>
 		    <groupId>com.sparkjava</groupId>
 		    <artifactId>spark-core</artifactId>
-		    <version>2.2</version>
+		    <version>2.3</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
--- a/src/main/java/com/bwssystems/HABridge/BridgeSettings.java
+++ b/src/main/java/com/bwssystems/HABridge/BridgeSettings.java
@@ -1,14 +1,17 @@
 package com.bwssystems.HABridge;

+import java.util.List;
+
 public class BridgeSettings {
 	private String upnpconfigaddress;
 	private String serverport;
 	private String upnpresponseport;
 	private String upnpdevicedb;
 	private String veraaddress;
-	private String harmonyaddress;
+	private IpList harmonyaddress;
 	private String harmonyuser;
 	private String harmonypwd;
+	private Integer upnpresponsedevices;
 	private boolean upnpstrict;
 	private boolean traceupnp;
 	private boolean devmode;
@@ -43,10 +46,10 @@ public class BridgeSettings {
 	public void setVeraAddress(String veraAddress) {
 		this.veraaddress = veraAddress;
 	}
-	public String getHarmonyAddress() {
+	public IpList getHarmonyAddress() {
 		return harmonyaddress;
 	}
-	public void setHarmonyAddress(String harmonyaddress) {
+	public void setHarmonyAddress(IpList harmonyaddress) {
 		this.harmonyaddress = harmonyaddress;
 	}
 	public String getHarmonyUser() {
@@ -61,6 +64,12 @@ public class BridgeSettings {
 	public void setHarmonyPwd(String harmonypwd) {
 		this.harmonypwd = harmonypwd;
 	}
+	public Integer getUpnpResponseDevices() {
+		return upnpresponsedevices;
+	}
+	public void setUpnpResponseDevices(Integer upnpresponsedevices) {
+		this.upnpresponsedevices = upnpresponsedevices;
+	}
 	public boolean isUpnpStrict() {
 		return upnpstrict;
 	}
@@ -85,7 +94,8 @@ public class BridgeSettings {
 		return true;
 	}
 	public Boolean isValidHarmony() {
-		if(this.harmonyaddress.contains(Configuration.DEFAULT_HARMONY_ADDRESS))
+		List<NamedIP> devicesList = this.harmonyaddress.getDevices();
+		if(devicesList.get(0).getIp().contains(Configuration.DEFAULT_HARMONY_ADDRESS))
 			return false;
 		if(this.harmonypwd == null || this.harmonypwd == "")
 			return false;
--- a/src/main/java/com/bwssystems/HABridge/Configuration.java
+++ b/src/main/java/com/bwssystems/HABridge/Configuration.java
@@ -3,8 +3,10 @@ package com.bwssystems.HABridge;
 public class Configuration {
 	public final static String DEVICE_DB_DIRECTORY = "data/device.db"; 
 	public final static String UPNP_RESPONSE_PORT = "50000";
+	public final static String UPNP_RESPONSE_DEVICES = "30";
 	public final static String DEFAULT_VERA_ADDRESS = "1.1.1.1";
 	public final static String DEFAULT_HARMONY_ADDRESS = "1.1.1.1";
+	public final static String DEFAULT_HARMONY_ADDRESS_LIST = "{devices:[{name:default,ip:1.1.1.1}]}";
 	public final static String DEFAULT_HARMONY_USER = "";
 	public final static String DEFAULT_HARMONY_PWD = "";
 	public final static String DFAULT_WEB_PORT = "8080";
--- a/src/main/java/com/bwssystems/HABridge/HABridge.java
+++ b/src/main/java/com/bwssystems/HABridge/HABridge.java
@@ -12,7 +12,8 @@ import com.bwssystems.HABridge.devicemanagmeent.*;
 import com.bwssystems.HABridge.hue.HueMulator;
 import com.bwssystems.HABridge.upnp.UpnpListener;
 import com.bwssystems.HABridge.upnp.UpnpSettingsResource;
-import com.bwssystems.harmony.HarmonyServer;
+import com.bwssystems.harmony.HarmonyHome;
+import com.google.gson.Gson;

 public class HABridge {
 	
@@ -34,7 +35,7 @@ public class HABridge {
    public static void main(String[] args) {
        Logger log = LoggerFactory.getLogger(HABridge.class);
        DeviceResource theResources;
-        HarmonyServer myHarmonyServer;
+        HarmonyHome harmonyHome;
        HueMulator theHueMulator;
        UpnpSettingsResource theSettingResponder;
        UpnpListener theUpnpListener;
@@ -61,13 +62,26 @@ public class HABridge {
        bridgeSettings.setUpnpDeviceDb(System.getProperty("upnp.device.db", Configuration.DEVICE_DB_DIRECTORY));
        bridgeSettings.setUpnpResponsePort(System.getProperty("upnp.response.port", Configuration.UPNP_RESPONSE_PORT));
        bridgeSettings.setVeraAddress(System.getProperty("vera.address", Configuration.DEFAULT_VERA_ADDRESS));
-        bridgeSettings.setHarmonyAddress(System.getProperty("harmony.address", Configuration.DEFAULT_HARMONY_ADDRESS));
+        IpList theHarmonyList;
+
+        try {
+        	theHarmonyList = new Gson().fromJson(System.getProperty("harmony.address", Configuration.DEFAULT_HARMONY_ADDRESS_LIST), IpList.class);
+        } catch (Exception e) {
+        	try {
+        		theHarmonyList = new Gson().fromJson("{devices:[{name:default,ip:" + System.getProperty("harmony.address", Configuration.DEFAULT_HARMONY_ADDRESS) + "}]}", IpList.class);
+        	} catch (Exception et) {
+    	        log.error("Cannot parse harmony.address, Exiting with message: " + e.getMessage(), e);
+    	        return;
+        	}
+        }
+        bridgeSettings.setHarmonyAddress(theHarmonyList);
        bridgeSettings.setHarmonyUser(System.getProperty("harmony.user", Configuration.DEFAULT_HARMONY_USER));
        bridgeSettings.setHarmonyPwd(System.getProperty("harmony.pwd", Configuration.DEFAULT_HARMONY_PWD));
        bridgeSettings.setUpnpStrict(Boolean.parseBoolean(System.getProperty("upnp.strict", "true")));
        bridgeSettings.setTraceupnp(Boolean.parseBoolean(System.getProperty("trace.upnp", "false")));
        bridgeSettings.setDevMode(Boolean.parseBoolean(System.getProperty("dev.mode", "false")));
-
+        bridgeSettings.setUpnpResponseDevices(Integer.parseInt(System.getProperty("upnp.response.devices", Configuration.UPNP_RESPONSE_DEVICES)));
+        
        // sparkjava config directive to set ip address for the web server to listen on
        // ipAddress("0.0.0.0"); // not used
        // sparkjava config directive to set port for the web server to listen on
@@ -75,16 +89,11 @@ public class HABridge {
        // sparkjava config directive to set html static file location for Jetty
        staticFileLocation("/public");
        //setup the harmony connection if available
-      	try {
-      		myHarmonyServer = HarmonyServer.setup(bridgeSettings);
-		} catch (Exception e) {
-	        log.error("Cannot get harmony client setup, Exiting with message: " + e.getMessage(), e);
-	        return;
-		}
+        harmonyHome = new HarmonyHome(bridgeSettings);
        // setup the class to handle the resource setup rest api
-        theResources = new DeviceResource(bridgeSettings, theVersion, myHarmonyServer.getMyHarmony());
+        theResources = new DeviceResource(bridgeSettings, theVersion, harmonyHome);
        // setup the class to handle the hue emulator rest api
-        theHueMulator = new HueMulator(theResources.getDeviceRepository(), myHarmonyServer.getMyHarmony());
+        theHueMulator = new HueMulator(bridgeSettings, theResources.getDeviceRepository(), harmonyHome);
        theHueMulator.setupServer();
        // setup the class to handle the upnp response rest api
        theSettingResponder = new UpnpSettingsResource(bridgeSettings);
--- a/src/main/java/com/bwssystems/HABridge/IpList.java
+++ b/src/main/java/com/bwssystems/HABridge/IpList.java
@@ -0,0 +1,16 @@
+package com.bwssystems.HABridge;
+
+import java.util.List;
+
+public class IpList {
+	private List<NamedIP> devices;
+
+	public List<NamedIP> getDevices() {
+		return devices;
+	}
+
+	public void setDevices(List<NamedIP> devices) {
+		this.devices = devices;
+	}
+
+}
--- a/src/main/java/com/bwssystems/HABridge/NamedIP.java
+++ b/src/main/java/com/bwssystems/HABridge/NamedIP.java
@@ -0,0 +1,25 @@
+package com.bwssystems.HABridge;
+
+public class NamedIP {
+	private String name;
+	private String ip;
+	private String port;
+	public String getName() {
+		return name;
+	}
+	public void setName(String name) {
+		this.name = name;
+	}
+	public String getIp() {
+		return ip;
+	}
+	public void setIp(String ip) {
+		this.ip = ip;
+	}
+	public String getPort() {
+		return port;
+	}
+	public void setPort(String port) {
+		this.port = port;
+	}
+}
--- a/src/main/java/com/bwssystems/HABridge/dao/DeviceDescriptor.java
+++ b/src/main/java/com/bwssystems/HABridge/dao/DeviceDescriptor.java
@@ -8,6 +8,7 @@ public class DeviceDescriptor{
    private String mapId;
    private String mapType;
    private String deviceType;
+    private String targetDevice;
    private String offUrl;
    private String onUrl;
    private String httpVerb;
@@ -47,7 +48,15 @@ public class DeviceDescriptor{
        this.deviceType = deviceType;
    }

-    public String getOffUrl() {
+    public String getTargetDevice() {
+		return targetDevice;
+	}
+
+	public void setTargetDevice(String targetDevice) {
+		this.targetDevice = targetDevice;
+	}
+
+	public String getOffUrl() {
        return offUrl;
    }

--- a/src/main/java/com/bwssystems/HABridge/dao/DeviceRepository.java
+++ b/src/main/java/com/bwssystems/HABridge/dao/DeviceRepository.java
@@ -187,6 +187,9 @@ public class DeviceRepository {
 		       } else if (name.equals("deviceType")) {
 			        deviceEntry.setDeviceType(reader.nextString());
 			    	log.debug("Read a Device - device json type:" + deviceEntry.getDeviceType());
+		       } else if (name.equals("targetDevice")) {
+			        deviceEntry.setTargetDevice(reader.nextString());
+			    	log.debug("Read a Device - device json type:" + deviceEntry.getTargetDevice());
 		       } else if (name.equals("offUrl")) {
 			        deviceEntry.setOffUrl(reader.nextString());
 			    	log.debug("Read a Device - device json off URL:" + deviceEntry.getOffUrl());
--- a/src/main/java/com/bwssystems/HABridge/devicemanagmeent/DeviceResource.java
+++ b/src/main/java/com/bwssystems/HABridge/devicemanagmeent/DeviceResource.java
@@ -20,7 +20,7 @@ import com.bwssystems.HABridge.JsonTransformer;
 import com.bwssystems.HABridge.Version;
 import com.bwssystems.HABridge.dao.DeviceDescriptor;
 import com.bwssystems.HABridge.dao.DeviceRepository;
-import com.bwssystems.harmony.HarmonyHandler;
+import com.bwssystems.harmony.HarmonyHome;
 import com.bwssystems.luupRequests.Sdata;
 import com.bwssystems.vera.VeraInfo;
 import com.google.gson.Gson;
@@ -35,14 +35,16 @@ public class DeviceResource {
    private DeviceRepository deviceRepository;
    private VeraInfo veraInfo;
    private Version version;
-    private HarmonyHandler myHarmonyHandler;
+    private HarmonyHome myHarmonyHome;
    private static final Set<String> supportedVerbs = new HashSet<>(Arrays.asList("get", "put", "post"));

-	public DeviceResource(BridgeSettings theSettings, Version theVersion, HarmonyHandler myHarmony) {
-		super();
+	public DeviceResource(BridgeSettings theSettings, Version theVersion, HarmonyHome theHarmonyHome) {
 		this.deviceRepository = new DeviceRepository(theSettings.getUpnpDeviceDb());
 		this.veraInfo = new VeraInfo(theSettings.getVeraAddress(), theSettings.isValidVera());
-		this.myHarmonyHandler = myHarmony;
+		if(theSettings.isValidHarmony())
+			this.myHarmonyHome = theHarmonyHome;
+		else
+			this.myHarmonyHome = null;
 		this.version = theVersion;
        setupEndpoints();
 	}
@@ -109,6 +111,7 @@ public class DeviceResource {
 					deviceEntry.setDeviceType(device.getDeviceType());
 				deviceEntry.setMapId(device.getMapId());
 				deviceEntry.setMapType(device.getMapType());
+				deviceEntry.setTargetDevice(device.getTargetDevice());
 				deviceEntry.setOnUrl(device.getOnUrl());
 				deviceEntry.setOffUrl(device.getOffUrl());
 				deviceEntry.setHttpVerb(device.getHttpVerb());
@@ -187,32 +190,32 @@ public class DeviceResource {

    	get (API_CONTEXT + "/harmony/activities", "application/json", (request, response) -> {
 	    	log.debug("Get harmony activities");
-	      	if(myHarmonyHandler == null) {
+	      	if(myHarmonyHome == null) {
 				response.status(HttpStatus.SC_NOT_FOUND);
 		      	return null;	      		
 	      	}
 	      	response.status(HttpStatus.SC_OK);
-	      	return myHarmonyHandler.getActivities();
+	      	return myHarmonyHome.getActivities();
 	    }, new JsonTransformer());

    	get (API_CONTEXT + "/harmony/show", "application/json", (request, response) -> {
 	    	log.debug("Get harmony current activity");
-	      	if(myHarmonyHandler == null) {
+	      	if(myHarmonyHome == null) {
 	      		response.status(HttpStatus.SC_NOT_FOUND);
 	      		return null;
 	      	}
 	      	response.status(HttpStatus.SC_OK);
-      		return myHarmonyHandler.getCurrentActivity();
+      		return myHarmonyHome.getCurrentActivities();
 	    }, new JsonTransformer());

    	get (API_CONTEXT + "/harmony/devices", "application/json", (request, response) -> {
 	    	log.debug("Get harmony devices");
-	      	if(myHarmonyHandler == null) {
+	      	if(myHarmonyHome == null) {
 				response.status(HttpStatus.SC_NOT_FOUND);
 		      	return null;	      		
 	      	}
 	      	response.status(HttpStatus.SC_OK);
-	      	return myHarmonyHandler.getDevices();
+	      	return myHarmonyHome.getDevices();
 	    }, new JsonTransformer());

    }
--- a/src/main/java/com/bwssystems/HABridge/hue/HueMulator.java
+++ b/src/main/java/com/bwssystems/HABridge/hue/HueMulator.java
@@ -1,5 +1,6 @@
 package com.bwssystems.HABridge.hue;

+import com.bwssystems.HABridge.BridgeSettings;
 import com.bwssystems.HABridge.JsonTransformer;
 import com.bwssystems.HABridge.api.UserCreateRequest;
 import com.bwssystems.HABridge.api.hue.DeviceResponse;
@@ -8,6 +9,7 @@ import com.bwssystems.HABridge.api.hue.HueApiResponse;
 import com.bwssystems.HABridge.dao.*;
 import com.bwssystems.harmony.ButtonPress;
 import com.bwssystems.harmony.HarmonyHandler;
+import com.bwssystems.harmony.HarmonyHome;
 import com.bwssystems.harmony.RunActivity;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -37,10 +39,15 @@ import org.slf4j.LoggerFactory;

 import java.io.IOException;
 import java.math.BigDecimal;
+import java.net.DatagramPacket;
+import java.net.DatagramSocket;
+import java.net.InetAddress;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

+import javax.xml.bind.DatatypeConverter;
+
 /**
 * Based on Armzilla's HueMulator - a Philips Hue emulator using sparkjava rest server
 */
@@ -55,17 +62,23 @@ public class HueMulator {
    private static final String HUE_CONTEXT = "/api";

    private DeviceRepository repository;
-    private HarmonyHandler myHarmony;
+    private HarmonyHome myHarmonyHome;
    private HttpClient httpClient;
    private ObjectMapper mapper;
+    private BridgeSettings bridgeSettings;
+    private byte[] sendData;


-    public HueMulator(DeviceRepository aDeviceRepository, HarmonyHandler theHandler){
+    public HueMulator(BridgeSettings theBridgeSettings, DeviceRepository aDeviceRepository, HarmonyHome theHarmonyHome){
        httpClient = HttpClients.createDefault();
        mapper = new ObjectMapper(); //armzilla: work around Echo incorrect content type and breaking mapping. Map manually
        mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
        repository = aDeviceRepository;
-        myHarmony = theHandler;
+		if(theBridgeSettings.isValidHarmony())
+			this.myHarmonyHome = theHarmonyHome;
+		else
+			this.myHarmonyHome = null;
+        bridgeSettings = theBridgeSettings;
    }

 //	This function sets up the sparkjava rest calls for the hue api
@@ -74,6 +87,8 @@ public class HueMulator {
    	// http://ip_address:port/api/{userId}/lights  returns json objects of all lights configured
 	    get(HUE_CONTEXT + "/:userid/lights", "application/json", (request, response) -> {
 	    	String userId = request.params(":userid");
+        	if(bridgeSettings.isTraceupnp())
+        		log.info("Traceupnp: hue lights list requested: " + userId + " from " + request.ip());
 	        log.debug("hue lights list requested: " + userId + " from " + request.ip());
 	        List<DeviceDescriptor> deviceList = repository.findAll();
 	        Map<String, DeviceResponse> deviceResponseMap = new HashMap<>();
@@ -101,6 +116,8 @@ public class HueMulator {
        	String newUser = null;
        	String aDeviceType = null;
        	
+        	if(bridgeSettings.isTraceupnp())
+        		log.info("Traceupnp: hue api user create requested: " + request.body() + " from " + request.ip());
        	log.debug("hue api user create requested: " + request.body() + " from " + request.ip());
 	        
 	        if(request.body() != null && !request.body().isEmpty()) {
@@ -113,6 +130,8 @@ public class HueMulator {
    		
    		if(aDeviceType == null)
    			aDeviceType = "<not given>";
+        	if(bridgeSettings.isTraceupnp())
+        		log.info("Traceupnp: hue api user create requested for device type: " + aDeviceType + " and username: " + newUser);
    		log.debug("hue api user create requested for device type: " + aDeviceType + " and username: " + newUser);

 	        response.header("Access-Control-Allow-Origin", request.headers("Origin"));
@@ -241,26 +260,29 @@ public class HueMulator {
 	         */
 	    	String userId = request.params(":userid");
 	    	String lightId = request.params(":id");
-	        log.debug("hue state change requested: " + userId + " from " + request.ip() + " body: " + request.body());
-	
+	        String responseString = null;
+	        String url = null;
 	        DeviceState state = null;
+	        log.debug("hue state change requested: " + userId + " from " + request.ip() + " body: " + request.body());
+	        response.header("Access-Control-Allow-Origin", request.headers("Origin"));
+			response.type("application/json; charset=utf-8"); 
+	        response.status(HttpStatus.SC_OK);
+	
 	        try {
 	            state = mapper.readValue(request.body(), DeviceState.class);
 	        } catch (IOException e) {
-	            log.error("Object mapper barfed on input of body.", e);
-	        	response.status(HttpStatus.SC_BAD_REQUEST);
-	            return null;
+	        	log.warn("Object mapper barfed on input of body.", e);
+        		responseString = "[{\"error\":{\"type\": 2, \"address\": \"/lights/" + lightId + ",\"description\": \"Object mapper barfed on input of body.\"}}]";
+    	        return responseString;
 	        }
 	
 	        DeviceDescriptor device = repository.findOne(lightId);
 	        if (device == null) {
-	        	response.status(HttpStatus.SC_NOT_FOUND);
-	            log.error("Could not find devcie: " + lightId + " for hue state change request: " + userId + " from " + request.ip() + " body: " + request.body());
-	            return null;
+	        	log.warn("Could not find device: " + lightId + " for hue state change request: " + userId + " from " + request.ip() + " body: " + request.body());
+        		responseString = "[{\"error\":{\"type\": 3, \"address\": \"/lights/" + lightId + ",\"description\": \"Could not find device\", \"resource\": \"/lights/" + lightId + "\"}}]";
+    	        return responseString;
 	        }
 	
-	        String responseString =null;
-	        String url = null;
 	        if (state.isOn()) {
 	            responseString = "[{\"success\":{\"/lights/" + lightId + "/state/on\":true}}";
 	            url = device.getOnUrl();
@@ -283,19 +305,54 @@ public class HueMulator {
 	        }
 	        else
 	        	responseString = responseString + "]";
-	        	
-	        
-	        if(device.getDeviceType().toLowerCase().contains("activity"))
+
+	        if(device.getDeviceType().toLowerCase().contains("activity") || (device.getMapType() != null && device.getMapType().equalsIgnoreCase("harmonyActivity")))
 	        {
 	        	log.debug("executing activity to Harmony: " + url);
 	        	RunActivity anActivity = new Gson().fromJson(url, RunActivity.class);
-	        	myHarmony.startActivity(anActivity);
+	        	HarmonyHandler myHarmony = myHarmonyHome.getHarmonyHandler(device.getTargetDevice());
+	        	if(myHarmony == null)
+	        	{
+	        		log.warn("Should not get here, no harmony hub available");
+	        		responseString = "[{\"error\":{\"type\": 6, \"address\": \"/lights/" + lightId + ",\"description\": \"Should not get here, no harmony hub available\", \"parameter\": \"/lights/" + lightId + "state\"}}]";
+	        	}
+	        	else
+	        		myHarmony.startActivity(anActivity);
 	        }
-	        else if(device.getDeviceType().toLowerCase().contains("button"))
+	        else if(device.getDeviceType().toLowerCase().contains("button") || (device.getMapType() != null && device.getMapType().equalsIgnoreCase("harmonyButton")))
 	        {
 	        	log.debug("executing button press to Harmony: " + url);
 	        	ButtonPress aDeviceButton = new Gson().fromJson(url, ButtonPress.class);
-	        	myHarmony.pressButton(aDeviceButton);
+	        	HarmonyHandler myHarmony = myHarmonyHome.getHarmonyHandler(device.getTargetDevice());
+	        	if(myHarmony == null)
+	        	{
+	        		log.warn("Should not get here, no harmony hub available");
+	        		responseString = "[{\"error\":{\"type\": 6, \"address\": \"/lights/" + lightId + ",\"description\": \"Should not get here, no harmony hub available\", \"parameter\": \"/lights/" + lightId + "state\"}}]";
+	        	}
+	        	else
+	        		myHarmony.pressButton(aDeviceButton);
+	        }
+	        else if(url.startsWith("udp://"))
+	        {
+	        	try {
+	        		String intermediate = url.substring(6);
+	        		String ipAddr = intermediate.substring(0, intermediate.indexOf(':'));
+	        		String port = intermediate.substring(intermediate.indexOf(':') + 1, intermediate.indexOf('/'));
+	        		String theBody = intermediate.substring(intermediate.indexOf('/')+1);
+	        		DatagramSocket responseSocket = new DatagramSocket(Integer.parseInt(port));
+	        		if(theBody.startsWith("0x")) {
+	        			sendData = DatatypeConverter.parseHexBinary(theBody.substring(2));
+	        		}
+	        		else
+	        			sendData = theBody.getBytes();
+	        		InetAddress IPAddress = InetAddress.getByName(ipAddr);
+	        		DatagramPacket sendPacket = new DatagramPacket(sendData, sendData.length, IPAddress, Integer.parseInt(port));
+	        		responseSocket.send(sendPacket);
+	        		responseSocket.close();
+	    		}  catch (IOException e) {
+	    			log.warn("Could not send UDP Datagram packet for request.", e);
+	    			responseString = "[{\"error\":{\"type\": 6, \"address\": \"/lights/" + lightId + ",\"description\": \"Error on calling out to device\", \"parameter\": \"/lights/" + lightId + "state\"}}]";
+	    		}
 	        }
 	        else
 	        {
@@ -309,15 +366,11 @@ public class HueMulator {
 					body = replaceIntensityValue(device.getContentBodyOff(), state.getBri());
 				// make call
 				if (!doHttpRequest(url, device.getHttpVerb(), device.getContentType(), body)) {
-					response.status(HttpStatus.SC_SERVICE_UNAVAILABLE);
-					log.error("Error on calling url to change device state: " + url);
-					return null;
+					log.warn("Error on calling url to change device state: " + url);
+					responseString = "[{\"error\":{\"type\": 6, \"address\": \"/lights/" + lightId + ",\"description\": \"Error on calling url to change device state\", \"parameter\": \"/lights/" + lightId + "state\"}}]";
 				}
 	        }
 	
-	        response.header("Access-Control-Allow-Origin", request.headers("Origin"));
-			response.type("application/json; charset=utf-8"); 
-	        response.status(HttpStatus.SC_OK);
 	        return responseString;
 	    });
    }
@@ -353,7 +406,7 @@ public class HueMulator {
 				Integer endResult = Math.round(result.floatValue());
 	            request = request.replace(INTENSITY_MATH + mathDescriptor + INTENSITY_MATH_CLOSE, endResult.toString());
 			} catch (Exception e) {
-				log.error("Could not execute Math: " + mathDescriptor, e);
+				log.warn("Could not execute Math: " + mathDescriptor, e);
 			}        }
        return request;
    }
@@ -386,7 +439,7 @@ public class HueMulator {
                return true;
            }
        } catch (IOException e) {
-            log.error("Error calling out to HA gateway", e);
+        	log.warn("Error calling out to HA gateway", e);
        }
        return false;
    }
--- a/src/main/java/com/bwssystems/HABridge/upnp/UpnpSettingsResource.java
+++ b/src/main/java/com/bwssystems/HABridge/upnp/UpnpSettingsResource.java
@@ -40,9 +40,19 @@ public class UpnpSettingsResource {
 			+ "<depth>24</depth>\n" + "<url>hue_logo_3.png</url>\n" + "</icon>\n" + "</iconList>\n" + "</device>\n"
 			+ "</root>\n";

-	public UpnpSettingsResource(BridgeSettings theSettings) {
+	public UpnpSettingsResource(BridgeSettings theBridgeSettings) {
 		super();
-		this.theSettings = theSettings;
+		this.theSettings = new BridgeSettings();
+		this.theSettings.setDevMode(theBridgeSettings.isDevMode());
+		this.theSettings.setHarmonyAddress(theBridgeSettings.getHarmonyAddress());
+		this.theSettings.setServerPort(theBridgeSettings.getServerPort());
+		this.theSettings.setTraceupnp(theBridgeSettings.isTraceupnp());
+		this.theSettings.setUpnpConfigAddress(theBridgeSettings.getUpnpConfigAddress());
+		this.theSettings.setUpnpDeviceDb(theBridgeSettings.getUpnpDeviceDb());
+		this.theSettings.setUpnpResponseDevices(theBridgeSettings.getUpnpResponseDevices());
+		this.theSettings.setUpnpResponsePort(theBridgeSettings.getUpnpResponsePort());
+		this.theSettings.setUpnpStrict(theBridgeSettings.isUpnpStrict());
+		this.theSettings.setVeraAddress(theBridgeSettings.getVeraAddress());
 	}

 	public void setupServer() {
--- a/src/main/java/com/bwssystems/harmony/HarmonyActivity.java
+++ b/src/main/java/com/bwssystems/harmony/HarmonyActivity.java
@@ -0,0 +1,21 @@
+package com.bwssystems.harmony;
+
+import net.whistlingfish.harmony.config.Activity;
+
+public class HarmonyActivity {
+	private String hub;
+	private Activity activity;
+	public String getHub() {
+		return hub;
+	}
+	public void setHub(String hub) {
+		this.hub = hub;
+	}
+	public Activity getActivity() {
+		return activity;
+	}
+	public void setActivity(Activity activity) {
+		this.activity = activity;
+	}
+
+}
--- a/src/main/java/com/bwssystems/harmony/HarmonyDevice.java
+++ b/src/main/java/com/bwssystems/harmony/HarmonyDevice.java
@@ -0,0 +1,20 @@
+package com.bwssystems.harmony;
+
+import net.whistlingfish.harmony.config.Device;
+
+public class HarmonyDevice {
+	private Device device;
+	private String hub;
+	public Device getDevice() {
+		return device;
+	}
+	public void setDevice(Device device) {
+		this.device = device;
+	}
+	public String getHub() {
+		return hub;
+	}
+	public void setHub(String hub) {
+		this.hub = hub;
+	}
+}
--- a/src/main/java/com/bwssystems/harmony/HarmonyHome.java
+++ b/src/main/java/com/bwssystems/harmony/HarmonyHome.java
@@ -0,0 +1,115 @@
+package com.bwssystems.harmony;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.bwssystems.HABridge.BridgeSettings;
+import com.bwssystems.HABridge.IpList;
+import com.bwssystems.HABridge.NamedIP;
+
+import net.whistlingfish.harmony.config.Activity;
+import net.whistlingfish.harmony.config.Device;
+
+public class HarmonyHome {
+    private static final Logger log = LoggerFactory.getLogger(HarmonyHome.class);
+	private Map<String, HarmonyServer> hubs;
+
+	public HarmonyHome(BridgeSettings bridgeSettings) {
+		super();
+		hubs = new HashMap<String, HarmonyServer>();
+		if(!bridgeSettings.isValidHarmony() && !bridgeSettings.isDevMode())
+			return;
+		if(bridgeSettings.isDevMode()) {
+			NamedIP devModeIp = new NamedIP();
+			devModeIp.setIp("10.10.10.10");
+			devModeIp.setName("devMode");
+			List<NamedIP> theList = new ArrayList<NamedIP>();
+			theList.add(devModeIp);
+			IpList thedevList = new IpList();
+			thedevList.setDevices(theList);
+			bridgeSettings.setHarmonyAddress(thedevList);
+		}
+		Iterator<NamedIP> theList = bridgeSettings.getHarmonyAddress().getDevices().iterator();
+		while(theList.hasNext()) {
+			NamedIP aHub = theList.next();
+	      	try {
+	      		hubs.put(aHub.getName(), HarmonyServer.setup(bridgeSettings, aHub));
+			} catch (Exception e) {
+		        log.error("Cannot get harmony client (" + aHub.getName() + ") setup, Exiting with message: " + e.getMessage(), e);
+		        return;
+			}
+		}
+	}
+
+	public HarmonyHandler getHarmonyHandler(String aName) {
+		HarmonyHandler aHandler = null;
+		if(aName == null || aName.equals("")) {
+			aName = "default";
+		}
+
+		if(hubs.get(aName) == null) {
+			Set<String> keys = hubs.keySet();
+			if(!keys.isEmpty()) {
+				aHandler = hubs.get(keys.toArray()[0]).getMyHarmony();
+			}
+			else
+				aHandler = null;
+		}
+		else
+			aHandler = hubs.get(aName).getMyHarmony();
+		return aHandler;
+	}
+	
+	public List<HarmonyActivity> getActivities() {
+		Iterator<String> keys = hubs.keySet().iterator();
+		ArrayList<HarmonyActivity> activityList = new ArrayList<HarmonyActivity>();
+		while(keys.hasNext()) {
+			String key = keys.next();
+			Iterator<Activity> activities = hubs.get(key).getMyHarmony().getActivities().iterator();
+			while(activities.hasNext()) {
+				HarmonyActivity anActivity = new HarmonyActivity();
+				anActivity.setActivity(activities.next());
+				anActivity.setHub(key);
+				activityList.add(anActivity);
+			}
+		}
+		return activityList;
+	}
+	public List<HarmonyActivity> getCurrentActivities() {
+		Iterator<String> keys = hubs.keySet().iterator();
+		ArrayList<HarmonyActivity> activityList = new ArrayList<HarmonyActivity>();
+		while(keys.hasNext()) {
+			String key = keys.next();
+			Iterator<Activity> activities = hubs.get(key).getMyHarmony().getActivities().iterator();
+			while(activities.hasNext()) {
+				HarmonyActivity anActivity = new HarmonyActivity();
+				anActivity.setActivity(activities.next());
+				anActivity.setHub(key);
+				activityList.add(anActivity);
+			}
+		}
+		return activityList;
+	}
+	public List<HarmonyDevice> getDevices() {
+		Iterator<String> keys = hubs.keySet().iterator();
+		ArrayList<HarmonyDevice> deviceList = new ArrayList<HarmonyDevice>();
+		while(keys.hasNext()) {
+			String key = keys.next();
+			Iterator<Device> devices = hubs.get(key).getMyHarmony().getDevices().iterator();
+			while(devices.hasNext()) {
+				HarmonyDevice aDevice = new HarmonyDevice();
+				aDevice.setDevice(devices.next());
+				aDevice.setHub(key);
+				deviceList.add(aDevice);
+			}
+		}
+		return deviceList;
+	}
+}
--- a/src/main/java/com/bwssystems/harmony/HarmonyServer.java
+++ b/src/main/java/com/bwssystems/harmony/HarmonyServer.java
@@ -8,6 +8,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

 import com.bwssystems.HABridge.BridgeSettings;
+import com.bwssystems.HABridge.NamedIP;
 import com.google.inject.Guice;
 import com.google.inject.Injector;

@@ -24,23 +25,25 @@ public class HarmonyServer {
    private HarmonyHandler myHarmony;
    private DevModeResponse devResponse;
    private OAReplyProvider dummyProvider;
+    private NamedIP myNameAndIP;
    
    private Logger log = LoggerFactory.getLogger(HarmonyServer.class);

-	public HarmonyServer() {
+	public HarmonyServer(NamedIP theHarmonyAddress) {
 		super();
 		myHarmony = null;
 		dummyProvider = null;
+		myNameAndIP = theHarmonyAddress;
 	}

-	public static HarmonyServer setup(BridgeSettings bridgeSettings) throws Exception {
-		if(!bridgeSettings.isValidHarmony()) {
-			return new HarmonyServer();
+	public static HarmonyServer setup(BridgeSettings bridgeSettings, NamedIP theHarmonyAddress) throws Exception {
+		if(!bridgeSettings.isValidHarmony() && !bridgeSettings.isDevMode()) {
+			return new HarmonyServer(theHarmonyAddress);
 		}
    	Injector injector = null;
    	if(!bridgeSettings.isDevMode())
    		injector = Guice.createInjector(new HarmonyClientModule());
-        HarmonyServer mainObject = new HarmonyServer();
+        HarmonyServer mainObject = new HarmonyServer(theHarmonyAddress);
    	if(!bridgeSettings.isDevMode())
    		injector.injectMembers(mainObject);
  		mainObject.execute(bridgeSettings);
@@ -70,7 +73,7 @@ public class HarmonyServer {
 					log.info(format("activity changed: [%d] %s", activity.getId(), activity.getLabel()));
 				}
 			});
-			harmonyClient.connect(mySettings.getHarmonyAddress(), mySettings.getHarmonyUser(), mySettings.getHarmonyPwd());
+			harmonyClient.connect(myNameAndIP.getIp(), mySettings.getHarmonyUser(), mySettings.getHarmonyPwd());
        }
        myHarmony = new HarmonyHandler(harmonyClient, noopCalls, devResponse);
 	}
--- a/src/main/java/com/bwssystems/vera/VeraInfo.java
+++ b/src/main/java/com/bwssystems/vera/VeraInfo.java
@@ -30,7 +30,7 @@ public class VeraInfo {

    public VeraInfo(String addressString, Boolean isValidVera) {
 		super();
-        httpClient = HttpClients.createMinimal();
+        httpClient = HttpClients.createDefault();
        veraAddressString = addressString;
        validVera = isValidVera;
 	}
--- a/src/main/resources/public/index.html
+++ b/src/main/resources/public/index.html
@@ -29,6 +29,7 @@
 				<ul class="nav navbar-nav">
 					<li class="active"><a href="#">Home</a></li>
 					<li><a href="http://echo.amazon.com/#cards" target="_blank">My Echo</a></li>
+					<li><a href="https://github.com/bwssytems/ha-bridge/blob/master/README.md" target="_blank">Help</a></li>
 					<li class="dropdown">
 						<a id="dropdownMenu1" href="" class="dropdown-toggle"
 						data-toggle="dropdown" role="button" aria-haspopup="true"
--- a/src/main/resources/public/scripts/app.js
+++ b/src/main/resources/public/scripts/app.js
@@ -124,6 +124,31 @@ app.service('bridgeService', function ($http, $window, BridgeSettings) {
            );
        };

+        this.aContainsB = function (a, b) {
+            return a.indexOf(b) >= 0;
+        }
+
+        this.updateShowVera = function () {
+            if(this.aContainsB(self.BridgeSettings.veraaddress, "1.1.1.1") || self.BridgeSettings.veraaddress == "" || self.BridgeSettings.veraaddress == null)
+            	this.state.showVera = false;
+            else
+            	this.state.showVera = true;
+        	return;
+        }
+        
+        this.updateShowHarmony = function () {
+        	if(self.BridgeSettings.harmonyaddress.devices) {
+	            if(this.aContainsB(self.BridgeSettings.harmonyaddress.devices[0].ip, "1.1.1.1") || self.BridgeSettings.harmonyaddress == "" || self.BridgeSettings.harmonyaddress == null)
+	            	this.state.showHarmony = false;
+	            else
+	            	this.state.showHarmony = true;
+        	}
+            else
+            	this.state.showHarmony = false;
+       	return;
+        }
+
+
        this.loadBridgeSettings = function () {
            this.state.error = "";
            return $http.get(this.state.upnpbase).then(
@@ -137,14 +162,6 @@ app.service('bridgeService', function ($http, $window, BridgeSettings) {
                	self.BridgeSettings.settraceupnp(response.data.traceupnp);
                	self.BridgeSettings.setupnpstrict(response.data.upnpstrict);
                	self.BridgeSettings.setdevmode(response.data.devmode);
-                    if(self.BridgeSettings.veraaddress == "1.1.1.1" || self.BridgeSettings.veraaddress == "")
-                    	self.state.showVera = false;
-                    else
-                    	self.state.showVera = true;
-                    if(self.BridgeSettings.harmonyaddress == "1.1.1.1" || self.BridgeSettings.harmonyaddress == "")
-                    	self.state.showHarmony = false;
-                    else
-                    	self.state.showHarmony = true;
                },
                function (error) {
                    if (error.data) {
@@ -157,22 +174,6 @@ app.service('bridgeService', function ($http, $window, BridgeSettings) {
            );
        };

-        this.updateShowVera = function () {
-            if(self.BridgeSettings.veraaddress == "1.1.1.1" || self.BridgeSettings.veraaddress == "")
-            	this.state.showVera = false;
-            else
-            	this.state.showVera = true;
-        	return;
-        }
-        
-        this.updateShowHarmony = function () {
-            if(self.BridgeSettings.harmonyaddress == "1.1.1.1" || self.BridgeSettings.harmonyaddress == "")
-            	this.state.showHarmony = false;
-            else
-            	this.state.showHarmony = true;
-        	return;
-        }
-
        this.viewVeraDevices = function () {
            this.state.error = "";
        	if(!this.state.showVera)
@@ -246,9 +247,9 @@ app.service('bridgeService', function ($http, $window, BridgeSettings) {
            );
        };

-        this.findDeviceByMapId = function(id) {
+        this.findDeviceByMapId = function(id, target, type) {
        	for(var i = 0; i < this.state.devices.length; i++) {
-        		if(this.state.devices[i].mapId == id)
+        		if(this.state.devices[i].mapId == id && this.state.devices[i].mapType == type && this.state.devices[i].targetDevice == target)
        			return true;
        	}
        	return false;
@@ -266,6 +267,7 @@ app.service('bridgeService', function ($http, $window, BridgeSettings) {
                    mapId: device.mapId,
                    mapType: device.mapType,
                    deviceType: device.deviceType,
+                    targetDevice: device.targetDevice,
                    onUrl: device.onUrl,
                    offUrl: device.offUrl,
                    httpVerb: device.httpVerb,
@@ -285,7 +287,7 @@ app.service('bridgeService', function ($http, $window, BridgeSettings) {
                );
            } else {
            	if(device.deviceType == null || device.deviceType == "")
-            		device.deviceType = "switch";
+            		device.deviceType = "custom";
                if(device.httpVerb != null && device.httpVerb != "")
                	device.deviceType = "custom";
                return $http.post(this.state.base, {
@@ -293,6 +295,7 @@ app.service('bridgeService', function ($http, $window, BridgeSettings) {
                    mapId: device.mapId,
                    mapType: device.mapType,
                    deviceType: device.deviceType,
+                    targetDevice: device.targetDevice,
                    onUrl: device.onUrl,
                    offUrl: device.offUrl,
                    httpVerb: device.httpVerb,
@@ -328,9 +331,9 @@ app.service('bridgeService', function ($http, $window, BridgeSettings) {
            );
        };

-        this.deleteDeviceByMapId = function (id) {
+        this.deleteDeviceByMapId = function (id, type) {
        	for(var i = 0; i < this.state.devices.length; i++) {
-        		if(this.state.devices[i].mapId == id)
+        		if(this.state.devices[i].mapId == id && this.state.devices[i].mapType == type)
        			return self.deleteDevice(this.state.devices[i].id);
        	}
        };
@@ -390,6 +393,9 @@ app.controller('ViewingController', function ($scope, $location, $http, $window,
            bridgeService.state.base = url;
            bridgeService.viewDevices();
        };
+        $scope.goBridgeUrl = function (url) {
+        	window.open(url, "_blank");
+        };
        $scope.editDevice = function (device) {
            bridgeService.editDevice(device);
            $location.path('/editdevice');
@@ -405,7 +411,7 @@ app.controller('ViewingController', function ($scope, $location, $http, $window,

 app.controller('AddingController', function ($scope, $location, $http, bridgeService, BridgeSettings) {

-        $scope.device = {id: "", name: "", deviceType: "switch", onUrl: "", offUrl: ""};
+        $scope.device = {id: "", name: "", deviceType: "custom", onUrl: "", offUrl: ""};
        $scope.vera = {base: "", port: "3480", id: ""};
        $scope.vera.base = "http://" + BridgeSettings.veraaddress;
        bridgeService.device = $scope.device;
@@ -499,7 +505,7 @@ app.controller('AddingController', function ($scope, $location, $http, bridgeSer
            }
            $scope.device.deviceType = "scene";
            $scope.device.name = verascene.name;
-            $scope.devoce.mapType = "veraScene";
+            $scope.device.mapType = "veraScene";
            $scope.device.mapId = verascene.id;
            $scope.device.onUrl = $scope.vera.base + ":" + $scope.vera.port
                + "/data_request?id=action&output_format=json&serviceId=urn:micasaverde-com:serviceId:HomeAutomationGateway1&action=RunScene&SceneNum="
@@ -511,20 +517,22 @@ app.controller('AddingController', function ($scope, $location, $http, bridgeSer

        $scope.buildActivityUrls = function (harmonyactivity) {
            $scope.device.deviceType = "activity";
-            $scope.device.name = harmonyactivity.label;
+            $scope.device.targetDevice = harmonyactivity.hub;
+            $scope.device.name = harmonyactivity.activity.label;
            $scope.device.mapType = "harmonyActivity";
-            $scope.device.mapId = harmonyactivity.id;
-            $scope.device.onUrl = "{\"name\":\"" + harmonyactivity.id + "\"}";
+            $scope.device.mapId = harmonyactivity.activity.id;
+            $scope.device.onUrl = "{\"name\":\"" + harmonyactivity.activity.id + "\"}";
            $scope.device.offUrl = "{\"name\":\"-1\"}";
        };

        $scope.buildButtonUrls = function (harmonydevice, onbutton, offbutton) {
            $scope.device.deviceType = "button";
-            $scope.device.name = harmonydevice.label;
+            $scope.device.targetDevice = harmonydevice.hub;
+            $scope.device.name = harmonydevice.device.label;
            $scope.device.mapType = "harmonyButton";
-            $scope.device.mapId = harmonydevice.id + "-" + onbutton + "-" + offbutton;
-            $scope.device.onUrl = "{\"device\":\"" + harmonydevice.id + "\",\"button\":\"" + onbutton + "\"}";
-            $scope.device.offUrl = "{\"device\":\"" + harmonydevice.id + "\",\"button\":\"" + offbutton + "\"}";
+            $scope.device.mapId = harmonydevice.device.id + "-" + onbutton + "-" + offbutton;
+            $scope.device.onUrl = "{\"device\":\"" + harmonydevice.device.id + "\",\"button\":\"" + onbutton + "\"}";
+            $scope.device.offUrl = "{\"device\":\"" + harmonydevice.device.id + "\",\"button\":\"" + offbutton + "\"}";
        };

        $scope.testUrl = function (device, type) {
@@ -539,7 +547,8 @@ app.controller('AddingController', function ($scope, $location, $http, bridgeSer
                    $scope.device.mapId = null;
                    $scope.device.name = "";
                    $scope.device.onUrl = "";
-                    $scope.device.deviceType = "switch";
+                    $scope.device.deviceType = "custom";
+                    $scope.device.targetDevice = null;
                    $scope.device.offUrl = "";
                    $scope.device.httpVerb = null;
                    $scope.device.contentType = null;
@@ -584,19 +593,19 @@ app.controller('AddingController', function ($scope, $location, $http, bridgeSer
                $scope.imgScenesUrl = "glyphicon glyphicon-plus";
        };
        
-        $scope.deleteDeviceByMapId = function (id) {
-        	bridgeService.deleteDeviceByMapId(id);
+        $scope.deleteDeviceByMapId = function (id, mapType) {
+        	bridgeService.deleteDeviceByMapId(id, mapType);
        };
        
    });

-app.filter('availableId', function(bridgeService) {
+app.filter('availableHarmonyActivityId', function(bridgeService) {
        return function(input) {
            var out = [];
            if(input == null)
            	return out;
            for (var i = 0; i < input.length; i++) {
-                if(!bridgeService.findDeviceByMapId(input[i].id)){
+                if(!bridgeService.findDeviceByMapId(input[i].activity.id, input[i].hub, "harmonyActivity")){
                    out.push(input[i]);
                }
            }
@@ -604,13 +613,13 @@ app.filter('availableId', function(bridgeService) {
        }
    });

-app.filter('unavailableId', function(bridgeService) {
+app.filter('unavailableHarmonyActivityId', function(bridgeService) {
    return function(input) {
        var out = [];
        if(input == null)
        	return out;
        for (var i = 0; i < input.length; i++) {
-            if(bridgeService.findDeviceByMapId(input[i].id)){
+            if(bridgeService.findDeviceByMapId(input[i].activity.id, input[i].hub, "harmonyActivity")){
                out.push(input[i]);
            }
        }
@@ -618,6 +627,62 @@ app.filter('unavailableId', function(bridgeService) {
    }
 });

+app.filter('availableVeraDeviceId', function(bridgeService) {
+    return function(input) {
+        var out = [];
+        if(input == null)
+        	return out;
+        for (var i = 0; i < input.length; i++) {
+            if(!bridgeService.findDeviceByMapId(input[i].id, null, "veraDevice")){
+                out.push(input[i]);
+            }
+        }
+        return out;
+    }
+});
+
+app.filter('unavailableVeraDeviceId', function(bridgeService) {
+return function(input) {
+    var out = [];
+    if(input == null)
+    	return out;
+    for (var i = 0; i < input.length; i++) {
+        if(bridgeService.findDeviceByMapId(input[i].id, null, "veraDevice")){
+            out.push(input[i]);
+        }
+    }
+    return out;
+}
+});
+
+app.filter('availableVeraSceneId', function(bridgeService) {
+    return function(input) {
+        var out = [];
+        if(input == null)
+        	return out;
+        for (var i = 0; i < input.length; i++) {
+            if(!bridgeService.findDeviceByMapId(input[i].id, null, "veraScene")){
+                out.push(input[i]);
+            }
+        }
+        return out;
+    }
+});
+
+app.filter('unavailableVeraSceneId', function(bridgeService) {
+return function(input) {
+    var out = [];
+    if(input == null)
+    	return out;
+    for (var i = 0; i < input.length; i++) {
+        if(bridgeService.findDeviceByMapId(input[i].id, null, "veraScene")){
+            out.push(input[i]);
+        }
+    }
+    return out;
+}
+});
+
 app.filter('configuredButtons', function() {
    return function(input) {
        var out = [];
--- a/src/main/resources/public/views/configuration.html
+++ b/src/main/resources/public/views/configuration.html
@@ -37,6 +37,9 @@
 					<th>
 						<a href="" ng-click="order('deviceType')">Type</a>
        				<span class="sortorder" ng-show="predicate === 'deviceType'" ng-class="{reverse:reverse}"></span></th>
+					<th>
+						<a href="" ng-click="order('targetDevice')">Target</a>
+        				<span class="sortorder" ng-show="predicate === 'targetDevice'" ng-class="{reverse:reverse}"></span></th>
 					<th>Actions</th>
 				</tr>
 			</thead>
@@ -44,6 +47,7 @@
 				<td>{{device.id}}</td>
 				<td>{{device.name}}</td>
 				<td>{{device.deviceType}}</td>
+				<td>{{device.targetDevice}}</td>
 				<td>
 					<button class="btn btn-info" type="submit"
 						ng-click="testUrl(device, 'on')">Test ON</button>
@@ -66,7 +70,7 @@

 			<form class="form-horizontal">
 				<div class="form-group">
-					<label class="col-xs-12 col-sm-3 control-label" for="bridge-base">Bridge
+					<label class="col-xs-12 col-sm-2 control-label" for="bridge-base">Bridge
 						server</label>

 					<div class="col-xs-8 col-sm-7">
@@ -76,7 +80,7 @@
 					<button type="submit" class="col-xs-2 col-sm-1 btn btn-primary"
 						ng-click="setBridgeUrl(bridge.base)">Load</button>
 					<button type="submit" class="col-xs-2 col-sm-1 btn btn-primary"
-						ng-click="testUrl(bridge.base)">Go</button>
+						ng-click="goBridgeUrl(bridge.base)">Go</button>
 				</div>
 			</form>
 			<table class="table table-bordered table-striped table-hover">
--- a/src/main/resources/public/views/editdevice.html
+++ b/src/main/resources/public/views/editdevice.html
@@ -26,6 +26,15 @@
 					<button type="submit" class="col-xs-4 col-sm-2 btn btn-primary">
 						Update Device</button>
 				</div>
+				<div class="form-group">
+					<label class="col-xs-12 col-sm-2 control-label" for="device-target">Target
+					</label>
+
+					<div class="col-xs-8 col-sm-7">
+						<input type="text" class="form-control" id="device-target"
+							ng-model="device.targetDevice" placeholder="default">
+					</div>
+				</div>
 				<div class="form-group">
 					<div class="row">
 					<label class="col-xs-12 col-sm-2 control-label" for="device-map-type">Map Type
--- a/src/main/resources/public/views/harmonyactivity.html
+++ b/src/main/resources/public/views/harmonyactivity.html
@@ -26,13 +26,18 @@
 						<th>
 							<a href="" ng-click="order('id')">Id</a>
        					<span class="sortorder" ng-show="predicate === 'id'" ng-class="{reverse:reverse}"></span>
+        				</th>
+						<th>
+							<a href="" ng-click="order('hub')">Hub</a>
+        					<span class="sortorder" ng-show="predicate === 'hub'" ng-class="{reverse:reverse}"></span>
        				</th>
 						<th>Actions</th>
 					</tr>
 				</thead>
-				<tr ng-repeat="harmonyactivity in bridge.harmonyactivities | availableId | orderBy:predicate:reverse">
-					<td>{{harmonyactivity.label}}</td>
-					<td>{{harmonyactivity.id}}</td>
+				<tr ng-repeat="harmonyactivity in bridge.harmonyactivities | availableHarmonyActivityId | orderBy:predicate:reverse">
+					<td>{{harmonyactivity.activity.label}}</td>
+					<td>{{harmonyactivity.activity.id}}</td>
+					<td>{{harmonyactivity.hub}}</td>
 					<td>
 						<button class="btn btn-success" type="submit"
 							ng-click="buildActivityUrls(harmonyactivity)">Generate
@@ -57,15 +62,20 @@
 						<th>
 							<a href="" ng-click="order('id')">Id</a>
        					<span class="sortorder" ng-show="predicate === 'id'" ng-class="{reverse:reverse}"></span>
+        				</th>
+						<th>
+							<a href="" ng-click="order('hub')">Hub</a>
+        					<span class="sortorder" ng-show="predicate === 'hub'" ng-class="{reverse:reverse}"></span>
        				</th>
 						<th>Actions</th>
 					</tr>
 				</thead>
-				<tr ng-repeat="harmonyactivity in bridge.harmonyactivities | unavailableId | orderBy:predicate:reverse">
-					<td>{{harmonyactivity.label}}</td>
-					<td>{{harmonyactivity.id}}</td>
+				<tr ng-repeat="harmonyactivity in bridge.harmonyactivities | unavailableHarmonyActivityId | orderBy:predicate:reverse">
+					<td>{{harmonyactivity.activity.label}}</td>
+					<td>{{harmonyactivity.activity.id}}</td>
+					<td>{{harmonyactivity.hub}}</td>
 					<td><button class="btn btn-danger" type="submit"
-						ng-click="deleteDeviceByMapId(harmonyactivity.id)">Delete</button></td>
+						ng-click="deleteDeviceByMapId(harmonyactivity.activity.id, 'harmonyActivity')">Delete</button></td>
 				</tr>
 			</table>
 		</li>
--- a/src/main/resources/public/views/harmonydevice.html
+++ b/src/main/resources/public/views/harmonydevice.html
@@ -26,6 +26,10 @@
 						<th>
 							<a href="" ng-click="order('id')">Id</a>
        					<span class="sortorder" ng-show="predicate === 'id'" ng-class="{reverse:reverse}"></span>
+        				</th>
+						<th>
+							<a href="" ng-click="order('hub')">Hub</a>
+        					<span class="sortorder" ng-show="predicate === 'hub'" ng-class="{reverse:reverse}"></span>
        				</th>
 						<th>On Button</th>
 						<th>Off Button</th>
@@ -33,18 +37,19 @@
 					</tr>
 				</thead>
 				<tr ng-repeat="harmonydevice in bridge.harmonydevices | orderBy:predicate:reverse">
-					<td>{{harmonydevice.label}}</td>
-					<td>{{harmonydevice.id}}</td>
+					<td>{{harmonydevice.device.label}}</td>
+					<td>{{harmonydevice.device.id}}</td>
+					<td>{{harmonydevice.hub}}</td>
 					<td>
 						<select name="device-ctrlon" id="device-ctrlon" ng-model="devicectrlon">
-							<optgroup ng-repeat="ctrlon in harmonydevice.controlGroup" label="{{ctrlon.name}}">
+							<optgroup ng-repeat="ctrlon in harmonydevice.device.controlGroup" label="{{ctrlon.name}}">
 								<option ng-repeat="funcon in ctrlon.function">{{funcon.name}}</option>
 							</optgroup >
 						</select>
 					</td>
 					<td>
 						<select name="device-ctrloff" id="device-ctrloff" ng-model="devicectrloff">
-							<optgroup ng-repeat="ctrloff in harmonydevice.controlGroup" label="{{ctrloff.name}}">
+							<optgroup ng-repeat="ctrloff in harmonydevice.device.controlGroup" label="{{ctrloff.name}}">
 								<option ng-repeat="funcoff in ctrloff.function">{{funcoff.name}}</option>
 							</optgroup >
 						</select>
@@ -73,6 +78,10 @@
 						<th>
 							<a href="" ng-click="order('id')">Device Id</a>
        					<span class="sortorder" ng-show="predicate === 'id'" ng-class="{reverse:reverse}"></span>
+        				</th>
+						<th>
+							<a href="" ng-click="order('targetDevice')">Hub</a>
+        					<span class="sortorder" ng-show="predicate === 'targetDevice'" ng-class="{reverse:reverse}"></span>
        				</th>
 						<th>
 							<a href="" ng-click="order('mapId')">Harmony Device-Button On-Button Off</a>
@@ -84,10 +93,11 @@
 				<tr ng-repeat="device in bridge.devices | configuredButtons | orderBy:predicate:reverse">
 					<td>{{device.name}}</td>
 					<td>{{device.id}}</td>
+					<td>{{device.targetDevice}}</td>
 					<td>{{device.mapId}}</td>
 					<td>
 						<button class="btn btn-danger" type="submit"
-						ng-click="deleteDeviceByMapId(device.mapId)">Delete</button>
+						ng-click="deleteDeviceByMapId(device.mapId, device.mapType)">Delete</button>
 					</td>
 				</tr>
 			</table>
--- a/src/main/resources/public/views/veradevice.html
+++ b/src/main/resources/public/views/veradevice.html
@@ -45,7 +45,7 @@
 						<th>Actions</th>
 					</tr>
 				</thead>
-				<tr ng-repeat="veradevice in bridge.veradevices | availableId | orderBy:predicate:reverse">
+				<tr ng-repeat="veradevice in bridge.veradevices | availableVeraDeviceId | orderBy:predicate:reverse">
 					<td>{{veradevice.name}}</td>
 					<td>{{veradevice.id}}</td>
 					<td>{{veradevice.category}}</td>
@@ -86,14 +86,14 @@
 						<th>Actions</th>
 					</tr>
 				</thead>
-				<tr ng-repeat="veradevice in bridge.veradevices | unavailableId | orderBy:predicate:reverse">
+				<tr ng-repeat="veradevice in bridge.veradevices | unavailableVeraDeviceId | orderBy:predicate:reverse">
 					<td>{{veradevice.name}}</td>
 					<td>{{veradevice.id}}</td>
 					<td>{{veradevice.category}}</td>
 					<td>{{veradevice.room}}</td>
 					<td>
 						<button class="btn btn-danger" type="submit"
-						ng-click="deleteDeviceByMapId(harmonyactivity.id)">Delete</button>
+						ng-click="deleteDeviceByMapId(veradevice.id, 'veraDevice')">Delete</button>
 					</td>
 				</tr>
 			</table>
--- a/src/main/resources/public/views/verascene.html
+++ b/src/main/resources/public/views/verascene.html
@@ -34,7 +34,7 @@
 						<th>Actions</th>
 					</tr>
 				</thead>
-				<tr ng-repeat="verascene in bridge.verascenes | availableId | orderBy:predicate:reverse">
+				<tr ng-repeat="verascene in bridge.verascenes | availableVeraSceneId | orderBy:predicate:reverse">
 					<td>{{verascene.name}}</td>
 					<td>{{verascene.id}}</td>
 					<td>{{verascene.room}}</td>
@@ -70,13 +70,13 @@
 						<th>Actions</th>
 					</tr>
 				</thead>
-				<tr ng-repeat="verascene in bridge.verascenes | unavailableId | orderBy:predicate:reverse">
+				<tr ng-repeat="verascene in bridge.verascenes | unavailableVeraSceneId | orderBy:predicate:reverse">
 					<td>{{verascene.name}}</td>
 					<td>{{verascene.id}}</td>
 					<td>{{verascene.room}}</td>
 					<td>
 						<button class="btn btn-danger" type="submit"
-						ng-click="deleteDeviceByMapId(harmonyactivity.id)">Delete</button>
+						ng-click="deleteDeviceByMapId(verascene.id, 'veraScene')">Delete</button>
 					</td>
 				</tr>
 			</table>
Author	SHA1	Message	Date
Admin	3c54ccd56d	Finished implementation of generic UDP handling. This will support the LimitlessLED Bridge. Updated Readme for UDP and more on configuration setup. Fixed issue with HueMulator handliong due to devices without mapTypes. Fixes #6.	2015-12-07 16:34:37 -06:00
Admin	cf772334c4	Start adding UDP handling.	2015-12-04 16:21:11 -06:00
Admin	5a843f7569	Fixed handling when no harmony hub is given. dev.mode was updated as well. This closes #14.	2015-12-03 14:36:23 -06:00
Admin	2a52783bb1	Final release of multiple harmony hubs and fixes for GUI. This closes #5 and #13	2015-12-02 15:42:09 -06:00
Admin	195f1854ec	Remove Current Activity object as it is not needed.	2015-12-02 15:35:35 -06:00
Admin	2e5596a6e4	Pre-release of multiple Harmony Hub Support	2015-12-02 15:34:30 -06:00
Admin	9fc13c6c45	Conitinuation of multiple harmony hub implementation.	2015-12-01 16:40:29 -06:00
Admin	4b4d4e36c7	Update filtering capability. Still errors in html/angular.	2015-11-30 16:43:14 -06:00
Admin	1e7bdc560b	Start adding components to handle multiple harmony hubs.	2015-11-24 14:27:21 -06:00
Admin	aff0f8d64c	Removed the doling out of hue devices on a get call.	2015-11-23 15:17:17 -06:00
Admin	7a812d6e6b	Updated VeraInfo to use default http client. Finished work on doling out devices in the resource manager. Caveat, this did not work well with the echo. Next version will roll this back.	2015-11-23 15:14:38 -06:00
Admin	26f2105801	First try at doling out lights when requested.	2015-11-20 16:40:43 -06:00
Admin	feef345a3b	Update for start of virtualize multiple respnses	2015-11-19 16:43:30 -06:00