Fix some bugs for brightness decode in tcp and udp plugins

Fixes #434 Fixes #435
Update version
2025-12-18 16:17:30 +00:00 · 2017-02-04 18:40:13 -06:00 · 2017-02-01 11:38:41 -06:00 · 2017-02-01 11:31:04 -06:00 · 2017-01-30 15:57:35 -06:00 · 2017-01-30 15:40:58 -06:00
13 changed files with 100 additions and 526 deletions
--- a/README.md
+++ b/README.md
@@ -1,11 +1,11 @@
 # ha-bridge
 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.

-**SECURITY RISK: If you are unsure on how this software operates and what it exposes to your netowrk, please make sure you understand that it can allow root access to your sytem. It is best practice to not open this to the itnernet through your router as there are no security protocols in place to protect the system. The Licenese agreement states specifically that you use this at your own risk.**
+**SECURITY RISK: If you are unsure on how this software operates and what it exposes to your network, please make sure you understand that it can allow root access to your system. It is best practice to not open this to the Internet through your router as there are no security protocols in place to protect the system. The License agreement states specifically that you use this at your own risk.**

 **ATTENTION: This requires a physical Amazon Echo, Dot or Tap and does not work with prototype devices built using the Alexa Voice Service e.g. Amazon's Alexa AVS Sample App and Sam Machin's AlexaPi. The AVS version does not have any capability for Hue Bridge discovery!**

-**NOTE: This software does require the user to have knwoledge on how processes run on Linux or Windows with java. Also, an understanding of networking basics will help as well. This system reveives upnp udp multicast packets from devices to be found, so that is some thing to understand. Please make sure you have all your devices use static IP addresses from your router. Most all questions have been answered already. PLEASE USE GOOGLE TO FIND YOUR ANSWERS!**
+**NOTE: This software does require the user to have knowledge on how processes run on Linux or Windows with java. Also, an understanding of networking basics will help as well. This system receives upnp udp multicast packets from devices to be found, so that is something to understand. Please make sure you have all your devices use static IP addresses from your router. Most all questions have been answered already. PLEASE USE GOOGLE TO FIND YOUR ANSWERS!**

 **NOTE: This software does not control Philips Hue devices directly. A physical Philips Hue Hub is required for that, by which the ha-bridge can then proxy all of your real Hue bridges behind this bridge.**

@@ -33,23 +33,23 @@ ATTENTION: This requires JDK 1.8 to run
 ATTENTION: Due to port 80 being the default, Linux restricts this to super user. Use the instructions below.

 ```
-java -jar ha-bridge-4.1.0.jar
+java -jar ha-bridge-4.1.3.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

-Create the directory and make sure that ha-bridge-4.1.0.jar is in your /home/pi/habridge directory.
+Create the directory and make sure that ha-bridge-4.1.3.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/v4.1.0/ha-bridge-4.1.0.jar
-
-Create the directory and make sure that ha-bridge-4.1.0.jar is in your /home/pi/habridge directory.
+pi@raspberrypi:~/habridge $ wget https://github.com/bwssytems/ha-bridge/releases/download/v4.1.3/ha-bridge-4.1.3.jar
+```
+Create the directory and make sure that ha-bridge-4.1.3.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/v4.1.0/ha-bridge-4.1.0.jar
+pi@raspberrypi:~/habridge $ wget https://github.com/bwssytems/ha-bridge/releases/download/v4.1.3/ha-bridge-4.1.3.jar
 ```
 #### System Control Setup on a pi (preferred)
 For next gen Linux systems (this includes the Raspberry Pi), here is a systemctl unit file that you can install. Here is a link on how to do this: https://www.digitalocean.com/community/tutorials/how-to-use-systemctl-to-manage-systemd-services-and-units
@@ -69,7 +69,7 @@ After=network.target
 [Service]
 Type=simple

-ExecStart=/usr/bin/java -jar -Dconfig.file=/home/pi/habridge/data/habridge.config /home/pi/habridge/ha-bridge-4.1.0.jar
+ExecStart=/usr/bin/java -jar -Dconfig.file=/home/pi/habridge/data/habridge.config /home/pi/habridge/ha-bridge-4.1.3.jar

 [Install]
 WantedBy=multi-user.target
@@ -104,7 +104,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 -Dconfig.file=/home/pi/habridge/data/habridge.config /home/pi/habridge/ha-bridge-4.1.0.jar > /home/pi/habridge/habridge-log.txt 2>&1 &
+nohup java -jar -Dconfig.file=/home/pi/habridge/data/habridge.config /home/pi/habridge/ha-bridge-4.1.3.jar > /home/pi/habridge/habridge-log.txt 2>&1 &

 chmod 777 /home/pi/habridge/habridge-log.txt
 ```
@@ -217,7 +217,7 @@ location /api/ {
 }
 ```
 ## Available Arguments
-Arguments are now deprecated. The ha-bridge will use the old -D arguments and populate the configuration screen, Brisge Control Tab, which can now be saved to a file and will not be needed. There is only one optional argument that overrides and that is the location of the configuration file. The default is the relative path "data/habridge.config".
+Arguments are now deprecated. The ha-bridge will use the old -D arguments and populate the configuration screen, Bridge Control Tab, which can now be saved to a file and will not be needed. There is only one optional argument that overrides and that is the location of the configuration file. The default is the relative path "data/habridge.config".
 ### -Dconfig.file=`<filepath>`
 The default location for the configuration file to contain the settings for the bridge is the relative path from where the bridge is started in "data/habridge.config". If you would like a different filename or directory, specify -Dconfig.file=`<directory>/<filename>` explicitly. The command line example:
 ```
@@ -237,7 +237,7 @@ java -jar -Dserver.ip=192.168.1.1 ha-bridge-W.X.Y.jar
 ```
 ## 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
-favorite web interface by going to the http://<my ip address>:<port> or http://localhost:<port> with port you have assigned. The default quick link is http://localhost for yoru reference.
+favorite web interface by going to the http://<my ip address>:<port> or http://localhost:<port> with port you have assigned. The default quick link is http://localhost for your reference.
 ### The Bridge Devices Tab
 This screen allows you to see your devices you have configured for the ha-bridge to present to a controller, such as an Amazon Echo/Dot. It gives you a count of devices as there have been reports that the Echo only supports a limited number, but has been growing as of late, YMMV. You can test each device from this page as this calls the ha-bridge just as a controller would, i.e. the Echo. This is useful to make sure your configuration for each device is correct and for trouble shooting. You can also manages your devices as well by editing and making a new device copy as well as deleting it.

@@ -265,27 +265,27 @@ Provide IP Addresses of your Veras that you want to utilize with the bridge. Als
 #### Harmony Names and IP Addresses
 Provide IP Addresses of your Harmony Hubs that you want to utilize with the bridge. Also, give a meaningful name to each one so it is easy to decipher in the helper tab. When these names and IP's are given, the bridge will be able to control the activity or buttons by the call it receives and send it to the target Harmony Hub and activity/button you configure. 
 #### Harmony Username
-depracated
+deprecated
 #### Harmony Password
-depracated
+deprecated
 #### Hue Names and IP Addresses
 Provide IP Addresses of your Hue Bridges that you want to proxy through the bridge. Also, give a meaningful name to each one so it is easy to decipher in the helper tab. When these names and IP's are given, the bridge will passthru the call it receives to the target Hue and device you configure.

-Don't forget - You will need to push the link button when you got to the Hue Tab the first time ater the process comes up.  (The user name is not persistent when the process comes up.)
+Don't forget - You will need to push the link button when you got to the Hue Tab the first time after the process comes up.  (The user name is not persistent when the process comes up.)
 #### HAL Names and IP Addresses
 Provide IP Addresses of your HAL Systems that you want to utilize with the bridge. Also, give a meaningful name to each one so it is easy to decipher in the helper tab. When these names and IP's are given, the bridge will be able to control the devices or scenes by the call it receives and send it to the target HAL and device/scene you configure. 
 #### HAL Token
 The token you generate or give to a HAL and must be the same for all HAL's you have identified. This needs to be given if you are using the HAL features.
 #### MQTT Client IDs and IP Addresses	
-Provide Client ID and IP Addresses and ports of your MQTT Brokers that you want to utilize with the bridge. Also, you can provide the username and password if you have secured yourMQTT broker which is optional. When these Client ID and IP's are given, the bridge will be able to publish mqtt messages by the call it receives and send it to the target MQTT Broker you configure. The MQTT Messages Tab will become available to help you build messages.
+Provide Client ID and IP Addresses and ports of your MQTT Brokers that you want to utilize with the bridge. Also, you can provide the username and password if you have secured your MQTT broker which is optional. When these Client ID and IP's are given, the bridge will be able to publish MQTT messages by the call it receives and send it to the target MQTT Broker you configure. The MQTT Messages Tab will become available to help you build messages.
 #### Nest Username
 The user name of the home.nest.com account for the Nest user. This needs to be given if you are using the Nest features. There is no need to give any ip address or host information as this contacts your cloud account.
 #### Nest Password
 The password for the user name of the home.nest.com account for the Nest user. This needs to be given if you are using the Nest features.
-#### Nest Temp Farenheit
-This setting allows the value being sent into the bridge to be interpreted as Farenheit or Celsius. The default is to have Farenheit.
+#### Nest Temp Fahrenheit
+This setting allows the value being sent into the bridge to be interpreted as Fahrenheit or Celsius. The default is to have Fahrenheit.
 #### Button Press/Call Item Loop Sleep Interval (ms)
-This setting is the time used in between button presses when there is multple buttons in a button device. It also controls the time between multiple items in a custom device call. This is defaulted to 100ms and the number represnts milliseonds (1000 milliseconds = 1 second).
+This setting is the time used in between button presses when there is multiple buttons in a button device. It also controls the time between multiple items in a custom device call. This is defaulted to 100ms and the number represents milliseconds (1000 milliseconds = 1 second).
 #### Log Messages to Buffer
 This controls how many log messages will be kept and displayed on the log tab. This does not affect what is written to the standard output for logging. The default is 512. Changing this will incur more memory usage of the process.
 #### UPNP Strict Handling
@@ -299,7 +299,7 @@ This screen displays the last 512 or number of rows defined in the config screen

 The bottom part of the Logs Screen has configuration to change the logging levels as it is running. The ROOT is the basic setting and will turn on only top level logging. To set logging at a lower level, select the `Show All Loggers` checkbox and then you can set the explicit level on each of the processes components. The most helpful logger would be setting DEBUG for com.bwssystems.HABridge.hue.HueMulator component. Changing this and then selecting the `Update Log Levels` button applies the new log settings. 
 ### Bridge Device Additions
-You must configure devices before you will have any thing for the Echo or other controller that is connected to the ha-bridge to receive.
+You must configure devices before you will have anything for the Echo or other controller that is connected to the ha-bridge to receive.
 #### Helpers
 The easy way to get devices configured is with the use of the helpers for the Vera or Harmony, Nest and Hue to create devices that the bridge will present.

@@ -309,7 +309,7 @@ The helper tabs will also show you what you have already configured for that tar
 #### The Add/Edit Tab
 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, Harmony, Nest or other Hue.

-There is a new format for the on/dim/off URL areas. The new editor handles the intricasies of the components, but is broken down here for explanation.
+There is a new format for the on/dim/off URL areas. The new editor handles the intricacies of the components, but is broken down here for explanation.

 Here are the fields that can be put into the call item:
 Json Type | field name | What | Use
@@ -324,11 +324,13 @@ String | httpBody | Send this Body with a PUT or POST | Optional
 String | httpHeaders | Send these headers with the http call | Optional
 String | contentType | Define the type of content in the body | Optional

-Example:
+Example from device.db:
 ```
 [{"item":<a String that is quoted or another JSON object>,"type":"<atype>"."count":X."delay":X."filterIPs":"<comma separated list of IP addresses that are valid>"."httpVerb":"<GET,PUT,POST>","httpBody":"<body info>","httpHeaders":[{"name":"header name","value":"header value"},{"name":"another header","value":"another value"}],"contentType":"<http content type i.e application/json>"},{"item":<another item>,"type":"<aType>"}]
 ```

+The Add/Edit tab will show you the fields to fill in for the above in a form, when you hcae completed putting in the things you want, make sure to hit the `Add` button at the right.
+ 
 The format of the item can be the default HTTP request which executes the URLs formatted 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. Secure https is supported as well, just use `https://<your secure call here>`. When using POST and PUT, you have the ability to specify the body that will be sent with the request as well as the application type for the http call.

 The valid device types are: "custom", "veraDevice", "veraScene", "harmonyActivity", "harmonyButton", "nestHomeAway", "nestThermoSet", "hueDevice", "halDevice", 
@@ -373,7 +375,7 @@ Examples:
 ```

 #### Multiple Call Construct
-Also available is the ability to specify multiple commands in the On URL, Dim URL and Off URL areas by adding Json constructs listed here. This is only for the types of tcp, udp, http, https or a new exec type. Also within the item format you can specify delay in milliseconds and count per item. These new paramters work on device buttons for the Harmony as well.
+Also available is the ability to specify multiple commands in the On URL, Dim URL and Off URL areas by adding Json constructs listed here. This is only for the types of tcp, udp, http, https or a new exec type. Also within the item format you can specify delay in milliseconds and count per item. These new parameters work on device buttons for the Harmony as well.
 Format Example in the URL areas:
 ```
 [{"item":"http://192.168.1.1:8180/do/this/thing","type":"httpDevice"},
@@ -598,7 +600,7 @@ contentBodyOff | string | This is the content body that you would like to send w
 }
 ```
 ### 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. 
+Update an existing device using its 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. 

 **Note: You must supply all fields of the device in return as this is a replacement update for the given id.**
 ```
@@ -614,7 +616,7 @@ mapType | string | This identifies what type of source item was used from the he
 deviceType | string | This identifies what type of device entry this is. It is used by the system and should be the values of "switch", "scene", "custom", "activity", "button", "thermo", "passthru", "exec", "UDP", "TCP" or "custom". | Required
 targetDevice | string | A name given to the target when there are multiples of a given type in the configuration | Optional
 onUrl | string | This is the URL or Data Description that is executed for an "on" request. | Required
-dimUrl | string | This is the URL or Data Description that is executed for an "on" request when a intensity value is sent. | Optional
+dimUrl | string | This is the URL or Data Description that is executed for an "on" request when an intensity value is sent. | Optional
 offUrl | string | This is the URL or Data Description that is executed for an "off" request. | Optional
 headers | string | This is a header or list of headers that is used for http/https calls when given. | Optional
 httpVerb | string | This is used for "custom" calls that the user would like to execute. The values can only be "GET, "PUT", "POST". | Optional
@@ -840,7 +842,7 @@ Show the Harmony Hub's current activity.
 GET http://host:port/api/devices/harmony/show
 ```
 #### Response
-Only listing the relevant fields that are needed for identity of an activity. TThe example below is representative of an activity.
+Only listing the relevant fields that are needed for identity of an activity. The example below is representative of an activity.

 Name |	Type |	Description
 -----|-------|-------------
@@ -1004,7 +1006,7 @@ Allows the user to set the internal state of the light on and off, modify the br
 PUT	http://host:port/api/<username>/lights/<id>/bridgeupdatestate
 ```
 #### Body arguments
-These are examples that can be used in the control of items iwthin the bridge, but for HUE passthru devices, the complete state object is sent.
+These are examples that can be used in the control of items within the bridge, but for HUE passthru devices, the complete state object is sent.
 Name |	Type |	Description	 
 -----|-------|-------------
 on |	bool |	On/Off state of the light. On=true, Off=false. Optional
@@ -1176,7 +1178,7 @@ Note that `192.168.1.1` and `12345` are replaced with the actual IP address and


 ### 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.
+The bridge provides the description service which is used by the calling app to interrogate access details after it has decided the upnp multicast response is the correct device.
 #### Get Description
 ```
 GET http://host:80/description.xml
@@ -1231,7 +1233,7 @@ GET http://host:80/description.xml
 </root>\n
 ```
 ## Development Mode
-To turn on development mode so that it will not need an Harmony Hub for testing, use the following extra parm in the command line and the harmony ip and login info will not be needed:
+To turn on development mode so that it will not need a Harmony Hub for testing, use the following extra parameter in the command line and the harmony ip and login info will not be needed:
 ```
 java -jar -Ddev.mode=true ha-bridge-0.X.Y.jar
 ```
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@

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

 	<name>HA Bridge</name>
--- a/src/main/java/com/bwssystems/HABridge/dao/DeviceDescriptor.java
+++ b/src/main/java/com/bwssystems/HABridge/dao/DeviceDescriptor.java
@@ -220,19 +220,22 @@ public class DeviceDescriptor{
 	}

 	public boolean containsType(String aType) {
-		if(this.mapType.contains(aType))
+		if(aType == null)
+			return false;
+		
+		if(this.mapType != null && this.mapType.contains(aType))
 			return true;
 		
-		if(this.deviceType.contains(aType))
+		if(this.deviceType != null && this.deviceType.contains(aType))
 			return true;
 		
-		if(this.onUrl.contains(aType))
+		if(this.onUrl != null && this.onUrl.contains(aType))
 			return true;
 		
-		if(this.dimUrl.contains(aType))
+		if(this.dimUrl != null && this.dimUrl.contains(aType))
 			return true;
 		
-		if(this.offUrl.contains(aType))
+		if(this.offUrl != null && this.offUrl.contains(aType))
 			return true;
 		
 		return false;
--- a/src/main/java/com/bwssystems/HABridge/hue/HueMulator.java
+++ b/src/main/java/com/bwssystems/HABridge/hue/HueMulator.java
@@ -673,11 +673,24 @@ public class HueMulator {
 			deviceResponseMap = new HashMap<String, DeviceResponse>();
 			for (DeviceDescriptor device : deviceList) {
 				DeviceResponse deviceResponse = null;
-				// In the multi command context, this is not valid anymore
-//				if ((device.getMapType() != null && device.getMapType().equalsIgnoreCase(DeviceMapTypes.HUE_DEVICE[DeviceMapTypes.typeIndex]))) {
-//					HueDeviceIdentifier deviceId = aGsonHandler.fromJson(device.getOnUrl(), HueDeviceIdentifier.class);
-//					deviceResponse = myHueHome.getHueDeviceInfo(deviceId, device);
-//				}
+				if (device.containsType(DeviceMapTypes.HUE_DEVICE[DeviceMapTypes.typeIndex])) {
+					CallItem[] callItems = null;
+					try {
+						if(device.getOnUrl() != null)
+							callItems = aGsonHandler.fromJson(device.getOnUrl(), CallItem[].class);
+					} catch(JsonSyntaxException e) {
+						log.warn("Could not decode Json for url items to get Hue state for device: " + device.getName());
+						callItems = null;
+					}
+					
+					for (int i = 0; callItems != null && i < callItems.length; i++) {
+						if((callItems[i].getType() != null && callItems[i].getType().equals(DeviceMapTypes.HUE_DEVICE[DeviceMapTypes.typeIndex])) ||
+									(callItems[i].getItem().getAsString().contains("hueName"))) {
+							deviceResponse = myHueHome.getHueDeviceInfo(callItems[i], device);
+							i = callItems.length;
+						}
+					}
+				}

 				if (deviceResponse == null)
 					deviceResponse = DeviceResponse.createResponse(device);
@@ -772,10 +785,25 @@ public class HueMulator {
 			log.debug("found device named: " + device.getName());
 		}
 		DeviceResponse lightResponse = null;
-		if ((device.getMapType() != null && device.getMapType().equalsIgnoreCase(DeviceMapTypes.HUE_DEVICE[DeviceMapTypes.typeIndex]))) {
-			HueDeviceIdentifier deviceId = aGsonHandler.fromJson(device.getOnUrl(), HueDeviceIdentifier.class);
-			lightResponse = myHueHome.getHueDeviceInfo(deviceId, device);
-		} else
+		if (device.containsType(DeviceMapTypes.HUE_DEVICE[DeviceMapTypes.typeIndex])) {
+			CallItem[] callItems = null;
+			try {
+				if(device.getOnUrl() != null)
+					callItems = aGsonHandler.fromJson(device.getOnUrl(), CallItem[].class);
+			} catch(JsonSyntaxException e) {
+				log.warn("Could not decode Json for url items to get Hue state for device: " + device.getName());
+				callItems = null;
+			}
+			
+			for (int i = 0; callItems != null && i < callItems.length; i++) {
+				if((callItems[i].getType() != null && callItems[i].getType().equals(DeviceMapTypes.HUE_DEVICE[DeviceMapTypes.typeIndex])) || callItems[i].getItem().getAsString().startsWith("{\"ipAddress\":\"")) {
+					lightResponse = myHueHome.getHueDeviceInfo(callItems[i], device);
+					i = callItems.length;
+				}
+			}
+		}
+
+		if (lightResponse == null)
 			lightResponse = DeviceResponse.createResponse(device);

 		return lightResponse;
--- a/src/main/java/com/bwssystems/HABridge/plugins/domoticz/DeviceResult.java
+++ b/src/main/java/com/bwssystems/HABridge/plugins/domoticz/DeviceResult.java
@@ -1,209 +1,24 @@

 package com.bwssystems.HABridge.plugins.domoticz;

-import java.util.List;
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;

 public class DeviceResult {
-
-    @SerializedName("AddjMulti")
-    @Expose
-    private Integer addjMulti;
-    @SerializedName("AddjMulti2")
-    @Expose
-    private Integer addjMulti2;
-    @SerializedName("AddjValue")
-    @Expose
-    private Integer addjValue;
-    @SerializedName("AddjValue2")
-    @Expose
-    private Integer addjValue2;
-    @SerializedName("BatteryLevel")
-    @Expose
-    private Integer batteryLevel;
-    @SerializedName("CustomImage")
-    @Expose
-    private Integer customImage;
-    @SerializedName("Data")
-    @Expose
-    private String data;
    @SerializedName("Description")
    @Expose
    private String description;
-    @SerializedName("Favorite")
-    @Expose
-    private Integer favorite;
-    @SerializedName("HardwareID")
-    @Expose
-    private Integer hardwareID;
-    @SerializedName("HardwareName")
-    @Expose
-    private String hardwareName;
-    @SerializedName("HardwareType")
-    @Expose
-    private String hardwareType;
-    @SerializedName("HardwareTypeVal")
-    @Expose
-    private Integer hardwareTypeVal;
-    @SerializedName("HaveDimmer")
-    @Expose
-    private Boolean haveDimmer;
-    @SerializedName("HaveGroupCmd")
-    @Expose
-    private Boolean haveGroupCmd;
-    @SerializedName("HaveTimeout")
-    @Expose
-    private Boolean haveTimeout;
-    @SerializedName("ID")
-    @Expose
-    private String iD;
-    @SerializedName("Image")
-    @Expose
-    private String image;
-    @SerializedName("IsSubDevice")
-    @Expose
-    private Boolean isSubDevice;
-    @SerializedName("LastUpdate")
-    @Expose
-    private String lastUpdate;
-    @SerializedName("Level")
-    @Expose
-    private Integer level;
-    @SerializedName("LevelInt")
-    @Expose
-    private Integer levelInt;
-    @SerializedName("MaxDimLevel")
-    @Expose
-    private Integer maxDimLevel;
    @SerializedName("Name")
    @Expose
    private String name;
-    @SerializedName("Notifications")
-    @Expose
-    private String notifications;
-    @SerializedName("OffAction")
-    @Expose
-    private String offAction;
-    @SerializedName("OnAction")
-    @Expose
-    private String onAction;
-    @SerializedName("PlanID")
-    @Expose
-    private String planID;
-    @SerializedName("PlanIDs")
-    @Expose
-    private List<Integer> planIDs = null;
-    @SerializedName("Protected")
-    @Expose
-    private Boolean _protected;
-    @SerializedName("ShowNotifications")
-    @Expose
-    private Boolean showNotifications;
-    @SerializedName("SignalLevel")
-    @Expose
-    private String signalLevel;
-    @SerializedName("Status")
-    @Expose
-    private String status;
-    @SerializedName("StrParam1")
-    @Expose
-    private String strParam1;
-    @SerializedName("StrParam2")
-    @Expose
-    private String strParam2;
-    @SerializedName("SubType")
-    @Expose
-    private String subType;
-    @SerializedName("SwitchType")
-    @Expose
-    private String switchType;
-    @SerializedName("SwitchTypeVal")
-    @Expose
-    private Integer switchTypeVal;
-    @SerializedName("Timers")
-    @Expose
-    private String timers;
    @SerializedName("Type")
    @Expose
    private String type;
-    @SerializedName("TypeImg")
-    @Expose
-    private String typeImg;
-    @SerializedName("Unit")
-    @Expose
-    private Integer unit;
-    @SerializedName("Used")
-    @Expose
-    private Integer used;
-    @SerializedName("UsedByCamera")
-    @Expose
-    private Boolean usedByCamera;
-    @SerializedName("XOffset")
-    @Expose
-    private String xOffset;
-    @SerializedName("YOffset")
-    @Expose
-    private String yOffset;
    @SerializedName("idx")
    @Expose
    private String idx;

-    public Integer getAddjMulti() {
-        return addjMulti;
-    }

-    public void setAddjMulti(Integer addjMulti) {
-        this.addjMulti = addjMulti;
-    }
-
-    public Integer getAddjMulti2() {
-        return addjMulti2;
-    }
-
-    public void setAddjMulti2(Integer addjMulti2) {
-        this.addjMulti2 = addjMulti2;
-    }
-
-    public Integer getAddjValue() {
-        return addjValue;
-    }
-
-    public void setAddjValue(Integer addjValue) {
-        this.addjValue = addjValue;
-    }
-
-    public Integer getAddjValue2() {
-        return addjValue2;
-    }
-
-    public void setAddjValue2(Integer addjValue2) {
-        this.addjValue2 = addjValue2;
-    }
-
-    public Integer getBatteryLevel() {
-        return batteryLevel;
-    }
-
-    public void setBatteryLevel(Integer batteryLevel) {
-        this.batteryLevel = batteryLevel;
-    }
-
-    public Integer getCustomImage() {
-        return customImage;
-    }
-
-    public void setCustomImage(Integer customImage) {
-        this.customImage = customImage;
-    }
-
-    public String getData() {
-        return data;
-    }
-
-    public void setData(String data) {
-        this.data = data;
-    }

    public String getDescription() {
        return description;
@@ -213,126 +28,6 @@ public class DeviceResult {
        this.description = description;
    }

-    public Integer getFavorite() {
-        return favorite;
-    }
-
-    public void setFavorite(Integer favorite) {
-        this.favorite = favorite;
-    }
-
-    public Integer getHardwareID() {
-        return hardwareID;
-    }
-
-    public void setHardwareID(Integer hardwareID) {
-        this.hardwareID = hardwareID;
-    }
-
-    public String getHardwareName() {
-        return hardwareName;
-    }
-
-    public void setHardwareName(String hardwareName) {
-        this.hardwareName = hardwareName;
-    }
-
-    public String getHardwareType() {
-        return hardwareType;
-    }
-
-    public void setHardwareType(String hardwareType) {
-        this.hardwareType = hardwareType;
-    }
-
-    public Integer getHardwareTypeVal() {
-        return hardwareTypeVal;
-    }
-
-    public void setHardwareTypeVal(Integer hardwareTypeVal) {
-        this.hardwareTypeVal = hardwareTypeVal;
-    }
-
-    public Boolean getHaveDimmer() {
-        return haveDimmer;
-    }
-
-    public void setHaveDimmer(Boolean haveDimmer) {
-        this.haveDimmer = haveDimmer;
-    }
-
-    public Boolean getHaveGroupCmd() {
-        return haveGroupCmd;
-    }
-
-    public void setHaveGroupCmd(Boolean haveGroupCmd) {
-        this.haveGroupCmd = haveGroupCmd;
-    }
-
-    public Boolean getHaveTimeout() {
-        return haveTimeout;
-    }
-
-    public void setHaveTimeout(Boolean haveTimeout) {
-        this.haveTimeout = haveTimeout;
-    }
-
-    public String getID() {
-        return iD;
-    }
-
-    public void setID(String iD) {
-        this.iD = iD;
-    }
-
-    public String getImage() {
-        return image;
-    }
-
-    public void setImage(String image) {
-        this.image = image;
-    }
-
-    public Boolean getIsSubDevice() {
-        return isSubDevice;
-    }
-
-    public void setIsSubDevice(Boolean isSubDevice) {
-        this.isSubDevice = isSubDevice;
-    }
-
-    public String getLastUpdate() {
-        return lastUpdate;
-    }
-
-    public void setLastUpdate(String lastUpdate) {
-        this.lastUpdate = lastUpdate;
-    }
-
-    public Integer getLevel() {
-        return level;
-    }
-
-    public void setLevel(Integer level) {
-        this.level = level;
-    }
-
-    public Integer getLevelInt() {
-        return levelInt;
-    }
-
-    public void setLevelInt(Integer levelInt) {
-        this.levelInt = levelInt;
-    }
-
-    public Integer getMaxDimLevel() {
-        return maxDimLevel;
-    }
-
-    public void setMaxDimLevel(Integer maxDimLevel) {
-        this.maxDimLevel = maxDimLevel;
-    }
-
    public String getName() {
        return name;
    }
@@ -341,127 +36,6 @@ public class DeviceResult {
        this.name = name;
    }

-    public String getNotifications() {
-        return notifications;
-    }
-
-    public void setNotifications(String notifications) {
-        this.notifications = notifications;
-    }
-
-
-    public String getOffAction() {
-        return offAction;
-    }
-
-    public void setOffAction(String offAction) {
-        this.offAction = offAction;
-    }
-
-    public String getOnAction() {
-        return onAction;
-    }
-
-    public void setOnAction(String onAction) {
-        this.onAction = onAction;
-    }
-
-    public String getPlanID() {
-        return planID;
-    }
-
-    public void setPlanID(String planID) {
-        this.planID = planID;
-    }
-
-    public List<Integer> getPlanIDs() {
-        return planIDs;
-    }
-
-    public void setPlanIDs(List<Integer> planIDs) {
-        this.planIDs = planIDs;
-    }
-
-    public Boolean getProtected() {
-        return _protected;
-    }
-
-    public void setProtected(Boolean _protected) {
-        this._protected = _protected;
-    }
-
-    public Boolean getShowNotifications() {
-        return showNotifications;
-    }
-
-    public void setShowNotifications(Boolean showNotifications) {
-        this.showNotifications = showNotifications;
-    }
-
-    public String getSignalLevel() {
-        return signalLevel;
-    }
-
-    public void setSignalLevel(String signalLevel) {
-        this.signalLevel = signalLevel;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public String getStrParam1() {
-        return strParam1;
-    }
-
-    public void setStrParam1(String strParam1) {
-        this.strParam1 = strParam1;
-    }
-
-    public String getStrParam2() {
-        return strParam2;
-    }
-
-    public void setStrParam2(String strParam2) {
-        this.strParam2 = strParam2;
-    }
-
-    public String getSubType() {
-        return subType;
-    }
-
-    public void setSubType(String subType) {
-        this.subType = subType;
-    }
-
-    public String getSwitchType() {
-        return switchType;
-    }
-
-    public void setSwitchType(String switchType) {
-        this.switchType = switchType;
-    }
-
-    public Integer getSwitchTypeVal() {
-        return switchTypeVal;
-    }
-
-    public void setSwitchTypeVal(Integer switchTypeVal) {
-        this.switchTypeVal = switchTypeVal;
-    }
-
-    public String getTimers() {
-        return timers;
-    }
-
-    public void setTimers(String timers) {
-        this.timers = timers;
-    }
-
    public String getType() {
        return type;
    }
@@ -470,54 +44,6 @@ public class DeviceResult {
        this.type = type;
    }

-    public String getTypeImg() {
-        return typeImg;
-    }
-
-    public void setTypeImg(String typeImg) {
-        this.typeImg = typeImg;
-    }
-
-    public Integer getUnit() {
-        return unit;
-    }
-
-    public void setUnit(Integer unit) {
-        this.unit = unit;
-    }
-
-    public Integer getUsed() {
-        return used;
-    }
-
-    public void setUsed(Integer used) {
-        this.used = used;
-    }
-
-    public Boolean getUsedByCamera() {
-        return usedByCamera;
-    }
-
-    public void setUsedByCamera(Boolean usedByCamera) {
-        this.usedByCamera = usedByCamera;
-    }
-
-    public String getXOffset() {
-        return xOffset;
-    }
-
-    public void setXOffset(String xOffset) {
-        this.xOffset = xOffset;
-    }
-
-    public String getYOffset() {
-        return yOffset;
-    }
-
-    public void setYOffset(String yOffset) {
-        this.yOffset = yOffset;
-    }
-
    public String getIdx() {
        return idx;
    }
--- a/src/main/java/com/bwssystems/HABridge/plugins/hal/HalInfo.java
+++ b/src/main/java/com/bwssystems/HABridge/plugins/hal/HalInfo.java
@@ -149,8 +149,12 @@ public class HalInfo {
 			theData = httpClient.doHttpRequest(theUrl, null, null, null, null);
 			if (theData != null) {
 				log.debug("GET IrData for IR Device " + theHalDevice.getHaldevicename() + " HalApiResponse - data: " + theData);
-				theHalApiResponse = new Gson().fromJson(theData, DeviceElements.class);
-				if (theHalApiResponse.getDeviceElements() == null) {
+				try {
+					theHalApiResponse = new Gson().fromJson(theData, DeviceElements.class);
+				} catch (Exception e) {
+					theHalApiResponse = null;
+				}
+				if (theHalApiResponse == null || theHalApiResponse.getDeviceElements() == null) {
 					StatusDescription theStatus = new Gson().fromJson(theData, StatusDescription.class);
 					if (theStatus.getStatus() == null) {
 						log.warn("Cannot get buttons for IR Device " + theHalDevice.getHaldevicename() + " for hal "
--- a/src/main/java/com/bwssystems/HABridge/plugins/hass/HomeAssistant.java
+++ b/src/main/java/com/bwssystems/HABridge/plugins/hass/HomeAssistant.java
@@ -54,7 +54,7 @@ public class HomeAssistant {
 		if(aCommand.getState().equalsIgnoreCase("on")) {
 			aUrl = aUrl + "/turn_on";
 			if(aCommand.getBri() != null)
-				aBody = aBody + ",\"state\":\"on\",\"attributes\":{\"brightness\":" + aCommand.getBri() + "}}";
+				aBody = aBody + ",\"brightness\":" + aCommand.getBri() + "}";
 			else
 				aBody = aBody + "}";
 		}
--- a/src/main/java/com/bwssystems/HABridge/plugins/http/HTTPHandler.java
+++ b/src/main/java/com/bwssystems/HABridge/plugins/http/HTTPHandler.java
@@ -56,6 +56,7 @@ public class HTTPHandler {
 	// This function executes the url from the device repository against the
 	// target as http or https as defined
 	public String doHttpRequest(String url, String httpVerb, String contentType, String body, NameValue[] headers) {
+		log.debug("doHttpRequest with url: " + url + " with http command: " + httpVerb + " with body: " + body);
 		HttpUriRequest request = null;
 		String theContent = null;
 		URI theURI = null;
--- a/src/main/java/com/bwssystems/HABridge/plugins/hue/HueHome.java
+++ b/src/main/java/com/bwssystems/HABridge/plugins/hue/HueHome.java
@@ -65,9 +65,17 @@ public class HueHome implements Home {
 		return deviceList;
 	}

-	public DeviceResponse getHueDeviceInfo(HueDeviceIdentifier deviceId, DeviceDescriptor device) {
+	public DeviceResponse getHueDeviceInfo(CallItem anItem, DeviceDescriptor device) {
 		if(!validHue)
 			return null;
+		HueDeviceIdentifier deviceId = null;
+		if(anItem.getItem().isJsonObject())
+			deviceId = aGsonHandler.fromJson(anItem.getItem(), HueDeviceIdentifier.class);
+		else
+			deviceId = aGsonHandler.fromJson(anItem.getItem().getAsString(), HueDeviceIdentifier.class);
+		if(deviceId.getHueName() == null || deviceId.getHueName().isEmpty())
+			deviceId.setHueName(device.getTargetDevice());
+		
 		DeviceResponse deviceResponse = null;
 		HueInfo aHueInfo = hues.get(device.getTargetDevice());
 		deviceResponse = aHueInfo.getHueDeviceInfo(deviceId.getDeviceId(), device);
--- a/src/main/java/com/bwssystems/HABridge/plugins/tcp/TCPHome.java
+++ b/src/main/java/com/bwssystems/HABridge/plugins/tcp/TCPHome.java
@@ -49,11 +49,12 @@ public class TCPHome implements Home {
 			// noop
 		}

-		theUrlBody = BrightnessDecode.calculateReplaceIntensityValue(theUrlBody, intensity, targetBri, targetBriInc, true);
 		theUrlBody = TimeDecode.replaceTimeValue(theUrlBody);
 		if (theUrlBody.startsWith("0x")) {
+			theUrlBody = BrightnessDecode.calculateReplaceIntensityValue(theUrlBody, intensity, targetBri, targetBriInc, true);
 			sendData = DatatypeConverter.parseHexBinary(theUrlBody.substring(2));
 		} else {
+			theUrlBody = BrightnessDecode.calculateReplaceIntensityValue(theUrlBody, intensity, targetBri, targetBriInc, false);
 			sendData = theUrlBody.getBytes();
 		}

--- a/src/main/java/com/bwssystems/HABridge/plugins/udp/UDPHome.java
+++ b/src/main/java/com/bwssystems/HABridge/plugins/udp/UDPHome.java
@@ -51,11 +51,12 @@ public class UDPHome implements Home {
 			return null;
 		}

-		theUrlBody = BrightnessDecode.calculateReplaceIntensityValue(theUrlBody, intensity, targetBri, targetBriInc, true);
 		theUrlBody = TimeDecode.replaceTimeValue(theUrlBody);
 		if (theUrlBody.startsWith("0x")) {
+			theUrlBody = BrightnessDecode.calculateReplaceIntensityValue(theUrlBody, intensity, targetBri, targetBriInc, true);
 			sendData = DatatypeConverter.parseHexBinary(theUrlBody.substring(2));
 		} else {
+			theUrlBody = BrightnessDecode.calculateReplaceIntensityValue(theUrlBody, intensity, targetBri, targetBriInc, false);
 			sendData = theUrlBody.getBytes();
 		}
 		try {
--- a/src/main/resources/public/scripts/app.js
+++ b/src/main/resources/public/scripts/app.js
@@ -766,7 +766,7 @@ app.service ('bridgeService', function ($http, $window, ngToast) {
 		$http.put(testUrl, testBody).then(
 				function (response) {
 					if (typeof(response.data[0].success) !== 'undefined') {
-						msgDescription = "success " + angular.toJson(response.data[0].success);
+						msgDescription = "success " + angular.toJson(response.data);
 					}
 					if (typeof(response.data[0].error) !== 'undefined') {
 						msgDescription = "error " + angular.toJson(response.data[0].error);
--- a/src/main/resources/public/views/hassdevice.html
+++ b/src/main/resources/public/views/hassdevice.html
@@ -37,7 +37,7 @@
 			is already setup for your HomeAssitant.</p>
 		<p>
 			Also, use this select menu for which type of dim control you would
-			like to be generated: <select name="device-dim-control"
+			like to be generated, BUT for Home Assistant, the selection should be Pass-thru: <select name="device-dim-control"
 				id="device-dim-control" ng-model="device_dim_control">
 				<option value="">none</option>
 				<option value="${intensity.byte}">Pass-thru Value</option>
Author	SHA1	Message	Date
bwssystems	71258c7e52	Fix some bugs for brightness decode in tcp and udp plugins Fixes #434 Fixes #435	2017-02-04 18:40:13 -06:00
BWS Systems	0ce23c0f00	Update version	2017-02-01 11:38:41 -06:00
Admin	1c7260600a	Minor update for HAL decode issue Fixes #428	2017-02-01 11:31:04 -06:00
Admin	f1592a1998	Issue with not checking for null	2017-01-30 15:57:35 -06:00
Admin	24dd427fb4	Fixed immediate bugs for Fixes #129 Hue pass-thru always set to purple Fixes #406 Dimming with Home Assistant Fixes #414 Domoticz error retrieving devices	2017-01-30 15:40:58 -06:00
BWS Systems	f8de640f5d	added missed quotes	2017-01-27 15:50:00 -06:00