Fixed issue with "Test Dim" button not presenting the value selector

when there was a body with a dim command. Added ability to specifically
set the web server address port.

Fixes #225
Fixes #217

README.md

@@ -1,5 +1,5 @@
 # ha-bridge
-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.
+Emulates Philips Hue api to other home automation gateways such as an Amazon Echo or Google Home.  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 and so is the Nest module. The Bridge has helpers to build devices for the gateway for the Logitech Harmony Hub, Vera, Vera Lite or Vera Edge, Nest and the ability to proxy all of your real Hue bridges behind this bridge.
 
@@ -21,7 +21,7 @@ Then locate the jar and start the server with:
 ATTENTION: This requires JDK 1.8 to run
 
 ```
-java -jar ha-bridge-3.2.0.jar
+java -jar ha-bridge-3.2.2.jar
 ```
 ### Automation on Linux systems
 To have this configured and running automatically there are a few resources to use. One is using Docker and a docker container has been built for this and can be gotten here: https://github.com/aptalca/docker-ha-bridge
@@ -38,7 +38,7 @@ After=network.target
 
 [Service]
 Type=simple
-ExecStart=/usr/bin/java -jar -Dconfig.file=/home/pi/amazon-echo/data/habridge.config /home/pi/amazon-echo/ha-bridge-3.2.0.jar
+ExecStart=/usr/bin/java -jar -Dconfig.file=/home/pi/amazon-echo/data/habridge.config /home/pi/amazon-echo/ha-bridge-3.2.2.jar
 
 [Install]
 WantedBy=multi-user.target
@@ -46,11 +46,11 @@ WantedBy=multi-user.target
 
 Basic script setup to run the bridge on a pi.
 
-Create the directory and make sure that ha-bridge-3.2.0.jar is in your /home/pi/habridge directory.
+Create the directory and make sure that ha-bridge-3.2.2.jar is in your /home/pi/habridge directory.
 ```
 pi@raspberrypi:~ $ mkdir habridge
 pi@raspberrypi:~ $ cd habridge
-pi@raspberrypi:~/habridge $ wget https://github.com/bwssytems/ha-bridge/releases/download/v3.2.0/ha-bridge-3.2.0.jar
+pi@raspberrypi:~/habridge $ wget https://github.com/bwssytems/ha-bridge/releases/download/v3.2.2/ha-bridge-3.2.2.jar
 ```
 Edit the shell script for starting:
 ```
@@ -60,7 +60,7 @@ Then cut and past this, modify any locations that are not correct
 ```
 cd /home/pi/habridge
 rm /home/pi/habridge/habridge-log.txt
-nohup java -jar /home/pi/habridge/ha-bridge-3.2.0.jar > /home/pi/habridge/habridge-log.txt 2>&1 &
+nohup java -jar /home/pi/habridge/ha-bridge-3.2.2.jar > /home/pi/habridge/habridge-log.txt 2>&1 &
 chmod 777 /home/pi/habridge/habridge-log.txt
 ```
 Exit and save the file with ctrl-X and follow the prompts and then execute on the command line:
@@ -87,6 +87,7 @@ The default port number for the bridge is 80. To override what the default or wh
 ```
 java -jar -Dserver.port=80 ha-bridge-W.X.Y.jar
 ```
+Note: if using with a Google Home device, port 80 *must* be used.
 
 ## HA Bridge Usage and Configuration
 This section will cover the basics of configuration and where this configuration can be done. This requires that you have started your bridge process and then have pointed your
@@ -107,6 +108,8 @@ The default location for the configuration file to contain the settings for the
 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 `<directory>/<filename>  explicitly.
 #### UPNP IP Address
 The server defaults to the first available address on the host if this is not given. This default may NOT be the correct IP that is your public IP for your host on the network. It is best to set this parameter to not have discovery issues. Replace this value with the server ipv4 address you would like to use as the address that any upnp device will call after discovery. 
+#### Web Server IP Address
+The server defaults to all interfaces on the machine (0.0.0.0). Replace this value with the server ipv4 address you would like to use as the address that will bind to a specific ip address on an interface if you would like. This is only necessary if you want to isolate how access is handled to the web UI. 
 #### Web Server Port
 The server defaults to running on port 80. To override what the default is, specify a different number. ATTENTION: If you want to use any of the apps made for the Hue to control this bridge, you should keep this port set to 80.
 #### UPNP Response Port
@@ -272,6 +275,39 @@ DIM Commands |
 To see what Alexa thinks you said, you can check in the home page for your Alexa.
 
 To view or remove devices that Alexa knows about, you can use the mobile app `Menu / Settings / Connected Home` or go to http://echo.amazon.com/#cards.
+
+## Google Assistant
+Google Home is supported as of v3.2.0 and forward, but only if the bridge is running on port 80.
+
+Use the Google Home app on a phone to add new "home control" devices by going into `Settings / Home Control / +`
+as described [here](https://support.google.com/googlehome/answer/7124115?hl=en&ref_topic=7125624#homecontrol).
+Click on `Philips Hue` under the `Add new` section. If ha-bridge is on the same network as the
+phone as well as the Home device, then the app should quickly pass through the pairing step and
+populate with all of the devices. If instead it takes you to a Philips Hue login page, this means
+that the bridge was not properly discovered.
+
+Then you can say "OK Google, Turn on the office light" or whatever name you have given your configured devices.
+
+The Google Assistant can also group lights into rooms as described in the main [help article](https://support.google.com/googlehome/answer/7072090?hl=en&ref_topic=7029100).
+
+Here is the table of items to use to tell Google what you want to do. Note that either "OK Google"
+or "Hey Google" can be used as a trigger.
+ 
+To do this: | Say "Hey Google", then...
+------------|--------------------------
+To turn on/off a light | "Turn on <light name>"
+Dim a light | "Dim the <light name>"
+Brighten a light | "Brighten the <light name>"
+Set a light brightness to a certain percentage | "Set <light name> to 50%"
+Dim/Brighten lights by a certain percentage | "Dim/Brighten <light name> by 50%"
+Turn on/off all lights in room | “Turn on/off lights in <room name>" 
+Turn on/off all lights | “Turn on/off all of the lightsâ€<C3A2>
+
+To see what Home thinks you said, you can ask "Hey Google, What did I say?" or check the history in the app.
+
+New or removed devices are picked up automatically as soon as they are added/removed from ha-bridge.
+No re-discovery step is necessary.
+
 ## 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:
 ```
@@ -932,17 +968,45 @@ ST: upnp:rootdevice\r\n
 ST: ssdp:all\r\n
 ```
 
-If this criteria is met, the following response is provided to the calling application:
+If this criteria is met, the following three responses are provided to the calling application:
 
 ```
-HTTP/1.1 200 OK\r\n
-CACHE-CONTROL: max-age=86400\r\n
-EXT:\r\n
-LOCATION: http://192.168.1.1:80/description.xml\r\n
-SERVER: FreeRTOS/7.4.2 UPnP/1.0 IpBridge/1.10.0\r\n 
-ST: urn:schemas-upnp-org:device:basic:1\r\n
-"USN: uuid:2f402f80-da50-11e1-9b23-001788102201::urn:schemas-upnp-org:device:basic:1\r\n\r\n
+HTTP/1.1 200 OK
+HOST: 239.255.255.250:1900
+CACHE-CONTROL: max-age=100
+EXT:
+LOCATION: http://192.168.1.1:80/description.xml
+SERVER: Linux/3.14.0 UPnP/1.0 IpBridge/1.15.0
+hue-bridgeid: 001E06FFFE123456
+ST: upnp:rootdevice
+USN: uuid:2f402f80-da50-11e1-9b23-001e06123456::upnp:rootdevice
 ```
+```
+HTTP/1.1 200 OK
+HOST: 239.255.255.250:1900
+CACHE-CONTROL: max-age=100
+EXT:
+LOCATION: http://192.168.1.1:80/description.xml
+SERVER: Linux/3.14.0 UPnP/1.0 IpBridge/1.15.0
+hue-bridgeid: 001E06FFFE123456
+ST: uuid:2f402f80-da50-11e1-9b23-001e06123456
+USN: uuid:2f402f80-da50-11e1-9b23-001e06123456
+```
+```
+HTTP/1.1 200 OK
+HOST: 239.255.255.250:1900
+CACHE-CONTROL: max-age=100
+EXT:
+LOCATION: http://192.168.1.1:80/description.xml
+SERVER: Linux/3.14.0 UPnP/1.0 IpBridge/1.15.0
+hue-bridgeid: 001E06FFFE123456
+ST: urn:schemas-upnp-org:device:basic:1
+USN: uuid:2f402f80-da50-11e1-9b23-001e06123456
+```
+ 
+Note that `192.168.1.1` and `12345` are replaced with the actual IP address and last 6 digits of the MAC address, respectively.
+
+
 ### UPNP description service
 The bridge provides the description service which is used by the calling app to interogate access details after it has decided the upnp multicast response is the correct device.
 #### Get Description

kodivolume.md

@@ -0,0 +1,160 @@
+# Kodi volume control using dim commands & JSON-RPC
+
+You can use HA Bridge to adjust the Kodi software volume output. This allows you to use dim commands and set the volume level with percentage values.
+### What is JSON-RPC?
+
+The short answer is JSON-RPC an interface to communicate with Kodi. [See the official Kodi Wiki for more info](http://kodi.wiki/view/JSON-RPC_API) 
+### Setup Kodi to allow control through JSON-RPC
+
+In Kodi navigate to Settings/Services/Control ([screenshot](http://kodi.wiki/view/Settings/Services/Control))
+
+Turn **ON** the following:
+- Allow control of Kodi via HTTP
+- Allow remote control from applications on this system
+- Allow remote control from applications on other systems
+
+Change the **username** to something unique and set a strong **password**. 
+
+Make a note of the **PORT**
+### Adding the device to HA Bridge
+
+Access the HA Bridge Configuration in your browser and open the  **Manual Add** tab.
+#### Name
+
+Give the device a unique name that doesn<73>t include **<EFBFBD>volume<EFBFBD>** as it will cause conflicts with the Echo<68>s built in volume controls. A device name of **<EFBFBD>cody sound<6E>** works well.
+#### Device type
+
+Select **TCP** in the dropdown
+### URLs
+
+This section might seem a little long winded and if you know what you are doing then feel free to jump ahead. 
+#### Building the URL
+
+We need to log into the Kodi web server without having to fill in the popup each time. You can do this by putting the username and password in the URL. It is not a good idea to do this on other websites as it does put your password in clear view, but for your local network it is fine. 
+
+Use the example below replacing the relevant sections with the details that you defined in the Kodi settings screen in the first step. Replacing the IP with the address of the machine that Kodi is running on.
+
+```
+http://KODI_USERNAME:KODI_PASSWORD@192.168.1.123:8080/jsonrpc
+```
+##### Testing the URL in a browser
+
+Before you continue, open your custom URL in a browser (making sure Kodi is running). If all is working as it should you will see a big page of JSON that starts with:
+
+``` json
+{
+    "description": "JSON-RPC API of XBMC",
+    "id": "http://xbmc.org/jsonrpc/ServiceDescription.json",
+```
+
+If you don<6F>t see something that looks like the code above, then go back and double check your settings.
+#### The JSON request
+
+The URL is what connects you to Kodi, JSON is what is used to communicate with it. The JSON that is used to set the volume level is:
+
+``` json
+{"jsonrpc":"2.0","method":"Application.SetVolume","params":{"volume":100},"id":1}
+```
+##### Joining the URL and JSON
+
+Join the two together by adding `?request=` to the end of the URL and then add the JSON to the end of the request. You will end up with something like:
+
+```
+http://KODI_USERNAME:KODI_PASSWORD@192.168.1.123:8080/jsonrpc?request={"jsonrpc":"2.0","method":"Application.SetVolume","params":{"volume":100},"id":1}
+```
+##### Testing the request in a browser
+
+Go ahead and test the combined URL/JSON in a browser changing **100** to whatever level you want to set. Kodi should adjust the volume accordingly, try a few different levels to be sure it is working correctly. 
+
+The browser will reformat the URL each time you press return so don<6F>t build the URL in the browser bar without making a copy first. 
+
+Ideally build the URL in a text document which you can easily edit and then copy/paste each time. 
+#### Prepare the three URLs
+
+You want to end up with three full URLs in your text file, one for each of the commands.
+
+**ON**
+
+```
+http://KODI_USERNAME:KODI_PASSWORD@192.168.1.123:8080/jsonrpc?request={"jsonrpc":"2.0","method":"Application.SetVolume","params":{"volume":100},"id":1}
+```
+
+**DIM**
+
+```
+http://KODI_USERNAME:KODI_PASSWORD@192.168.1.123:8080/jsonrpc?request={"jsonrpc":"2.0","method":"Application.SetVolume","params":{"volume":45},"id":1}
+```
+
+**OFF**
+
+```
+http://KODI_USERNAME:KODI_PASSWORD@192.168.1.123:8080/jsonrpc?request={"jsonrpc":"2.0","method":"Application.SetVolume","params":{"volume":0},"id":1}
+```
+#### Encoding the JSON part
+
+You should now be able to control the volume of Kodi using the structured URL you built above in a browser. If you can<61>t get it to work in a browser then you won<6F>t be able to get it to work in HA Bridge.
+
+In order for HA Bridge to send the JSON request you need to encode the URL. This means we take this:
+
+```
+http://KODI_USERNAME:KODI_PASSWORD@192.168.1.123:8080/jsonrpc?request={"jsonrpc":"2.0","method":"Application.SetVolume","params":{"volume":100},"id":1}
+```
+
+And turn it into this:
+
+```
+http://KODI_USERNAME:KODI_PASSWORD@192.168.1.123:8080/jsonrpc?request=%7B%22jsonrpc%22%3A%222.0%22%2C%22method%22%3A%22Application.SetVolume%22%2C%22params%22%3A%7B%22volume%22%3A100%7D%2C%22id%22%3A1%7D
+```
+
+Note that we are only encoding the JSON, the URL part we leave as is.
+
+Using the online tool [www.url-encode-decode.com](http://www.url-encode-decode.com/), copy the JSON part (shown in bold below) and paste it into the left hand field.
+
+http://KODI_USERNAME:KODI_PASSWORD@192.168.1.123:8080/jsonrpc?request=**{"jsonrpc":"2.0","method":"Application.SetVolume","params":{"volume":100},"id":1}**
+
+Click the **Encode url** button.
+
+Copy the output from the right hand box and paste it on a new line in your text file.
+
+```
+%7B%22jsonrpc%22%3A%222.0%22%2C%22method%22%3A%22Application.SetVolume%22%2C%22params%22%3A%7B%22volume%22%3A100%7D%2C%22id%22%3A1%7D
+```
+#### Join the URL and JSON
+
+Finally you want to insert the URL part before the request (shown in bold below)
+
+**http://KODI_USERNAME:KODI_PASSWORD@192.168.1.123:8080/jsonrpc?request=**%7B%22jsonrpc%22%3A%222.0%22%2C%22method%22%3A%22Application.SetVolume%22%2C%22params%22%3A%7B%22volume%22%3A100%7D%2C%22id%22%3A1%7D
+### HA Bridge
+
+Paste the final URL in **On URL** field. Just do the one for now, add the device and in the Bridge Control tab click Save.
+
+Test the button in the Bridge Devices tab and hopefully it should turn the volume up in Kodi.
+
+Go ahead and repeat the steps for the **Off URL**. All the same steps but change 100% to 0%. If you want to use the previous URL you can, just find the 100% in the encoded URL.
+
+`<EFBFBD>%22%3A%7B%22volume%22%3A`**100**`%7D%2C%22id%22%3A1%7D`
+
+and change it to 0
+
+`<EFBFBD>%22%3A%7B%22volume%22%3A`**0**`%7D%2C%22id%22%3A1%7D`
+#### Dim JSON
+
+The Dim URL uses the `${intensity.percent}` to take the given number from your voice command and pass it to Kodi.
+
+Here is the JSON to <20>Dim<69> the volume 
+
+``` json
+{"jsonrpc":"2.0","method":"Application.SetVolume","params":{"volume":"${intensity.percent}""},"id":1}
+```
+
+You don<6F>t need to encode the `${intensity.percent}` part. This means you can simply replace the number value (100/0) with `${intensity.percent}` as shown below.
+
+`<EFBFBD>%22%3A%7B%22volume%22%3A`**${intensity.percent}**`%7D%2C%22id%22%3A1%7D`
+### Controlling the Device
+
+You can use the commands as listed in the [README](https://github.com/bwssytems/ha-bridge#ask-alexa)
+
+<EFBFBD>Set Cody Sound to 50 percent<6E>
+<EFBFBD>Cody Sound to 70 percent<6E>
+
+Remembering that <20>Turn on Cody Sound<6E> will set the volume to 100%, and <20>Turn off Cody Sound<6E> will mute.

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>com.bwssystems.HABridge</groupId>
 	<artifactId>ha-bridge</artifactId>
-	<version>3.2.0</version>
+	<version>3.2.2</version>
 	<packaging>jar</packaging>
 
 	<name>HA Bridge</name>

src/main/java/com/bwssystems/HABridge/BridgeSettings.java

@@ -31,6 +31,11 @@ public class BridgeSettings extends BackupHandler {
 		super();
 		bridgeControl = new BridgeControlDescriptor();
 		theBridgeSettings = new BridgeSettingsDescriptor();
+        String ipV6Stack = System.getProperty("ipV6Stack");
+        if(ipV6Stack == null || !ipV6Stack.equalsIgnoreCase("true")) {
+        	System.setProperty("java.net.preferIPv4Stack" , "true");
+        }
+
 	}
 	public BridgeControlDescriptor getBridgeControl() {
 		return bridgeControl;
@@ -42,7 +47,6 @@ public class BridgeSettings extends BackupHandler {
         String addressString = null;
         String theVeraAddress = null;
         String theHarmonyAddress = null;
-
         String configFileProperty = System.getProperty("config.file");
         if(configFileProperty == null) {
         	Path filePath = Paths.get(Configuration.CONFIG_FILE);

src/main/java/com/bwssystems/HABridge/BridgeSettingsDescriptor.java

@@ -32,6 +32,8 @@ public class BridgeSettingsDescriptor {
 	private boolean halconfigured;
 	private Map<String, WhitelistEntry> whitelist;
 	private boolean settingsChanged;
+	private String myechourl;
+	private String webaddress;
 	
 	public BridgeSettingsDescriptor() {
 		super();
@@ -45,6 +47,8 @@ public class BridgeSettingsDescriptor {
 		this.farenheit = true;
 		this.whitelist = null;
 		this.settingsChanged = false;
+		this.myechourl = "echo.amazon.com/#cards";
+		this.webaddress = "0.0.0.0";
 	}
 	public String getUpnpConfigAddress() {
 		return upnpconfigaddress;
@@ -208,6 +212,18 @@ public class BridgeSettingsDescriptor {
 	public void setSettingsChanged(boolean settingsChanged) {
 		this.settingsChanged = settingsChanged;
 	}
+	public String getMyechourl() {
+		return myechourl;
+	}
+	public void setMyechourl(String myechourl) {
+		this.myechourl = myechourl;
+	}
+	public String getWebaddress() {
+		return webaddress;
+	}
+	public void setWebaddress(String webaddress) {
+		this.webaddress = webaddress;
+	}
 	public Boolean isValidVera() {
 		if(this.getVeraAddress() == null || this.getVeraAddress().getDevices().size() <= 0)
 			return false;

src/main/java/com/bwssystems/HABridge/HABridge.java

@@ -54,9 +54,9 @@ public class HABridge {
         bridgeSettings = new BridgeSettings();
         while(!bridgeSettings.getBridgeControl().isStop()) {
         	bridgeSettings.buildSettings();
-            log.info("HA Bridge (v" + theVersion.getVersion() + ") initializing....");
+            log.info("HA Bridge initializing....");
 	        // sparkjava config directive to set ip address for the web server to listen on
-	        // ipAddress("0.0.0.0"); // not used
+	        ipAddress(bridgeSettings.getBridgeSettingsDescriptor().getWebaddress());
 	        // sparkjava config directive to set port for the web server to listen on
 	        port(bridgeSettings.getBridgeSettingsDescriptor().getServerPort());
 	        // sparkjava config directive to set html static file location for Jetty

src/main/java/com/bwssystems/HABridge/dao/DeviceRepository.java

@@ -33,7 +33,7 @@ public class DeviceRepository extends BackupHandler {
 	private Map<String, DeviceDescriptor> devices;
     private Path repositoryPath;
 	private Gson gson;
-    private Integer maxId;
+    private Integer nextId;
     private Logger log = LoggerFactory.getLogger(DeviceRepository.class);
 	
     public DeviceRepository(String deviceDb) {
@@ -45,7 +45,7 @@ public class DeviceRepository extends BackupHandler {
 		repositoryPath = null;
 		repositoryPath = Paths.get(deviceDb);
 		setupParams(repositoryPath, ".bk", "device.db-");
-		maxId = 1;
+		nextId = 0;
 		_loadRepository(repositoryPath);
 	}
     
@@ -62,8 +62,8 @@ public class DeviceRepository extends BackupHandler {
 			DeviceDescriptor list[] = gson.fromJson(jsonContent, DeviceDescriptor[].class);
 			for(int i = 0; i < list.length; i++) {
 				put(list[i].getId(), list[i]);
-				if(Integer.decode(list[i].getId()) > maxId) {
-					maxId = Integer.decode(list[i].getId());
+				if(Integer.decode(list[i].getId()) > nextId) {
+					nextId = Integer.decode(list[i].getId());
 				}
 			}
 		}    	
@@ -93,8 +93,8 @@ public class DeviceRepository extends BackupHandler {
 	        if(descriptors[i].getId() != null && descriptors[i].getId().length() > 0)
 	        	devices.remove(descriptors[i].getId());
 	        else {
-	        	descriptors[i].setId(String.valueOf(maxId));
-	        	maxId++;
+	        	nextId++;
+	        	descriptors[i].setId(String.valueOf(nextId));
 	        }
 	        if(descriptors[i].getUniqueid() == null || descriptors[i].getUniqueid().length() == 0) {
 	        	BigInteger bigInt = BigInteger.valueOf(Integer.decode(descriptors[i].getId()));
@@ -115,18 +115,18 @@ public class DeviceRepository extends BackupHandler {
 		List<DeviceDescriptor> list = new ArrayList<DeviceDescriptor>(devices.values());
 		Iterator<DeviceDescriptor> deviceIterator = list.iterator();
 		Map<String, DeviceDescriptor> newdevices = new HashMap<String, DeviceDescriptor>();;
-		maxId = 1;
+		nextId = 0;
         log.debug("Renumber devices.");
 		while(deviceIterator.hasNext()) {
+        	nextId++;
 			DeviceDescriptor theDevice = deviceIterator.next();
-        	theDevice.setId(String.valueOf(maxId));
-        	BigInteger bigInt = BigInteger.valueOf(maxId);
+        	theDevice.setId(String.valueOf(nextId));
+        	BigInteger bigInt = BigInteger.valueOf(nextId);
         	byte[] theBytes = bigInt.toByteArray();
         	String hexValue = DatatypeConverter.printHexBinary(theBytes);
        	
         	theDevice.setUniqueid("00:17:88:5E:D3:" + hexValue + "-" + hexValue);
 	        newdevices.put(theDevice.getId(), theDevice);
-        	maxId++;
 		}
         devices = newdevices;
     	String  jsonValue = gson.toJson(findAll());

src/main/java/com/bwssystems/HABridge/hue/HueMulator.java

@@ -931,7 +931,9 @@ public class HueMulator implements HueErrorStringSet {
 		        			
 							String anUrl = replaceIntensityValue(callItems[i].getItem(), calculateIntensity(state, theStateChanges, stateHasBri, stateHasBriInc), false);
 							String body;
-							if (state.isOn())
+							if(stateHasBri || stateHasBriInc)
+								body = replaceIntensityValue(device.getContentBodyDim(), calculateIntensity(state, theStateChanges, stateHasBri, stateHasBriInc), false);
+							else if (state.isOn())
 								body = replaceIntensityValue(device.getContentBody(), calculateIntensity(state, theStateChanges, stateHasBri, stateHasBriInc), false);
 							else
 								body = replaceIntensityValue(device.getContentBodyOff(), calculateIntensity(state, theStateChanges, stateHasBri, stateHasBriInc), false);

src/main/java/com/bwssystems/HABridge/upnp/UpnpListener.java

@@ -126,12 +126,8 @@ public class UpnpListener {
 					try {
 						sendUpnpResponse(packet.getAddress(), packet.getPort());
 					} catch (IOException e) {
-						if(e.getMessage().equalsIgnoreCase("Host is down"))
-							log.warn("UpnpListener encountered an error sending upnp response packet as requesting host is now not available. IP: " + packet.getAddress().getHostAddress());
-						else {
-							log.error("UpnpListener encountered an error sending upnp response packet. Shutting down", e);
-							error = true;
-						}
+						log.warn("UpnpListener encountered an error sending upnp response packet. IP: " + packet.getAddress().getHostAddress() + " with message: " + e.getMessage());
+						log.debug("UpnpListener send upnp exception: ", e);
 					}
 				}
 			} catch (IOException e) {

src/main/resources/public/index.html

@@ -36,7 +36,7 @@
 			<div id="navbar" class="navbar-collapse collapse">
 				<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="http://{{bridge.settings.myechourl}}" 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="dLabel" href="" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">About <span class="caret"></span></a>

src/main/resources/public/scripts/app.js

@@ -769,11 +769,7 @@ app.controller('ViewingController', function ($scope, $location, $http, $window,
 				(type == "off" && (bridgeService.aContainsB(device.offUrl, "${intensity.byte}") ||
 				bridgeService.aContainsB(device.offUrl, "${intensity.percent}") ||
 				bridgeService.aContainsB(device.offUrl, "${intensity.math(")))   ||
-				(type == "dim" && (bridgeService.aContainsB(device.dimUrl, "${intensity.byte}") ||
-						bridgeService.aContainsB(device.dimUrl, "${intensity.percent}") ||
-						bridgeService.aContainsB(device.dimUrl, "${intensity.math(") ||
-						bridgeService.aContainsB(device.deviceType, "passthru") ||
-						bridgeService.aContainsB(device.mapType, "hueDevice"))))) {
+				(type == "dim"))) {
 			$scope.bridge.device = device;
 			$scope.bridge.type = type;
 			ngDialog.open({

src/main/resources/public/views/system.html

@@ -82,6 +82,13 @@
 						ng-model="bridge.settings.upnpconfigaddress"
 						placeholder="192.168.1.1"></td>
 				</tr>
+				<tr>
+					<td>Web Server IP Address</td>
+					<td><input id="bridge-settings-webaddress"
+						class="form-control" type="text"
+						ng-model="bridge.settings.webaddress"
+						placeholder="0.0.0.0"></td>
+				</tr>
 				<tr>
 					<td>Web Server Port</td>
 					<td><input id="bridge-settings-serverport"
@@ -272,6 +279,12 @@
 						ng-model="bridge.settings.traceupnp" ng-true-value=true
 						ng-false-value=false> {{bridge.settings.traceupnp}}</td>
 				</tr>
+				<tr>
+					<td>My Echo URL</td>
+					<td><input id="bridge-settings-myechourl" class="form-control"
+						type="text" ng-model="bridge.settings.myechourl"
+						placeholder="echo.amazon.com/#cards"></td>
+				</tr>
 			</table>
 		</form>
 	</div>