Fixed more immediate issues

Fixes #272
Fixes #384
Fixes #387
Fixes #389

README.md

@@ -31,16 +31,16 @@ 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.0.0.jar
+java -jar ha-bridge-4.0.1.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.0.0.jar is in your /home/pi/habridge directory.
+Create the directory and make sure that ha-bridge-4.0.1.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.0.0/ha-bridge-4.0.0.jar
+pi@raspberrypi:~/habridge $ wget https://github.com/bwssytems/ha-bridge/releases/download/v4.0.1/ha-bridge-4.0.1.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
@@ -59,7 +59,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.0.0.jar
+ExecStart=/usr/bin/java -jar -Dconfig.file=/home/pi/habridge/data/habridge.config /home/pi/habridge/ha-bridge-4.0.1.jar
 
 [Install]
 WantedBy=multi-user.target
@@ -94,7 +94,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.0.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.0.1.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:

pom.xml

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

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

@@ -26,7 +26,7 @@ public class BrightnessDecode {
 		} else if (targetBriInc != null) {
 			if ((setIntensity + targetBriInc) <= 0)
 				setIntensity = targetBriInc;
-			else if ((setIntensity + targetBriInc) > 255)
+			else if ((setIntensity + targetBriInc) > 254)
 				setIntensity = targetBriInc;
 			else
 				setIntensity = setIntensity + targetBriInc;
@@ -38,7 +38,7 @@ public class BrightnessDecode {
 	 * light weight templating here, was going to use free marker but it was a
 	 * bit too heavy for what we were trying to do.
 	 *
-	 * currently provides: intensity.byte : 0-255 brightness. this is raw from
+	 * currently provides: intensity.byte : 0-254 brightness. this is raw from
 	 * the echo intensity.percent : 0-100, adjusted for the vera
 	 * intensity.math(X*1) : where X is the value from the interface call and
 	 * can use net.java.dev.eval math

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

@@ -276,7 +276,7 @@ public class HueMulator {
 			}
 			if (deviceState != null) {
 				deviceState.setOn(stateChanges.isOn());
-				if(!deviceState.isOn() && deviceState.getBri() == 255)
+				if(!deviceState.isOn() && deviceState.getBri() == 254)
 					deviceState.setBri(0);
 			}
 			notFirstChange = true;
@@ -416,7 +416,7 @@ public class HueMulator {
 		}
 
 		if(deviceState.isOn() && deviceState.getBri() <= 0)
-			deviceState.setBri(255);
+			deviceState.setBri(254);
 		
 		if(!deviceState.isOn() && (targetBri != null || targetBriInc != null))
 			deviceState.setOn(true);
@@ -734,7 +734,7 @@ public class HueMulator {
 			if(url == null)
 				url = device.getOnUrl();
 		}
-		if (url != null) {
+		if (url != null && !url.equals("")) {
 			if (!url.startsWith("[")) {
 				if (url.startsWith("{\"item"))
 					url = "[" + url + "]";

src/main/java/com/bwssystems/HABridge/plugins/NestBridge/NestHome.java

@@ -111,10 +111,18 @@ public class NestHome implements com.bwssystems.HABridge.Home {
 					+ "\",\"description\": \"Should not get here, no Nest available\", \"parameter\": \"/lights/"
 					+ lightId + "state\"}}]";
 		} else if (anItem.getType() != null && anItem.getType().trim().equalsIgnoreCase(DeviceMapTypes.NEST_HOMEAWAY[DeviceMapTypes.typeIndex])) {
-			NestInstruction homeAway = aGsonHandler.fromJson(anItem.getItem().toString(), NestInstruction.class);
+			NestInstruction homeAway = null;
+			if(anItem.getItem().isJsonObject())
+				homeAway = aGsonHandler.fromJson(anItem.getItem(), NestInstruction.class);
+			else
+				homeAway = aGsonHandler.fromJson(anItem.getItem().getAsString(), NestInstruction.class);
 			theNest.getHome(homeAway.getName()).setAway(homeAway.getAway());
 		} else if (anItem.getType() != null && anItem.getType().trim().equalsIgnoreCase(DeviceMapTypes.NEST_THERMO_SET[DeviceMapTypes.typeIndex])) {
-				NestInstruction thermoSetting = aGsonHandler.fromJson(anItem.getItem().toString(), NestInstruction.class);
+			NestInstruction thermoSetting = null;
+			if(anItem.getItem().isJsonObject())
+				thermoSetting = aGsonHandler.fromJson(anItem.getItem(), NestInstruction.class);
+			else
+				thermoSetting = aGsonHandler.fromJson(anItem.getItem().getAsString(), NestInstruction.class);
 			if (thermoSetting.getControl().equalsIgnoreCase("temp")) {
 				if (targetBri != null) {
 					if (isFarenheit)

src/main/java/com/bwssystems/HABridge/plugins/exec/CommandHome.java

@@ -26,7 +26,7 @@ public class CommandHome implements Home {
 		String responseString = null;
 		String intermediate;
 		if (anItem.getItem().toString().contains("exec://"))
-			intermediate = anItem.getItem().getAsString().substring(anItem.getItem().toString().indexOf("://") + 3);
+			intermediate = anItem.getItem().getAsString().substring(anItem.getItem().getAsString().indexOf("://") + 3);
 		else
 			intermediate = anItem.getItem().getAsString();
 		String anError = doExecRequest(intermediate,

src/main/java/com/bwssystems/HABridge/plugins/harmony/HarmonyHome.java

@@ -135,7 +135,11 @@ public class HarmonyHome implements Home {
 		} else {
 			if(anItem.getType().trim().equalsIgnoreCase(DeviceMapTypes.HARMONY_ACTIVITY[DeviceMapTypes.typeIndex]))
 			{
-				RunActivity anActivity = aGsonHandler.fromJson(anItem.getItem(), RunActivity.class);
+				RunActivity anActivity = null;
+				if(anItem.getItem().isJsonObject())
+					anActivity = aGsonHandler.fromJson(anItem.getItem(), RunActivity.class);
+				else
+					anActivity = aGsonHandler.fromJson(anItem.getItem().getAsString(), RunActivity.class);
 				if(anActivity.getHub() == null || anActivity.getHub().isEmpty())
 					anActivity.setHub(device.getTargetDevice());
 				HarmonyHandler myHarmony = getHarmonyHandler(anActivity.getHub());

src/main/java/com/bwssystems/HABridge/plugins/hass/HassHome.java

@@ -125,7 +125,11 @@ public class HassHome implements Home {
 					+ lightId + "state\"}}]";
 
 		} else {
-			HassCommand hassCommand = aGsonHandler.fromJson(anItem.getItem(), HassCommand.class);
+			HassCommand hassCommand = null;
+			if(anItem.getItem().isJsonObject())
+				hassCommand = aGsonHandler.fromJson(anItem.getItem(), HassCommand.class);
+			else
+				hassCommand = aGsonHandler.fromJson(anItem.getItem().getAsString(), HassCommand.class);
 			hassCommand.setBri(BrightnessDecode.replaceIntensityValue(hassCommand.getBri(),
 								BrightnessDecode.calculateIntensity(intensity, targetBri, targetBriInc), false));
 			HomeAssistant homeAssistant = getHomeAssistant(hassCommand.getHassName());

src/main/java/com/bwssystems/HABridge/plugins/hue/HueHome.java

@@ -80,7 +80,11 @@ public class HueHome implements Home {
 		if(!validHue)
 			return null;
 		String responseString = null;
-		HueDeviceIdentifier deviceId = aGsonHandler.fromJson(anItem.getItem(), HueDeviceIdentifier.class);
+		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());
 		

src/main/java/com/bwssystems/HABridge/plugins/mqtt/MQTTHome.java

@@ -79,7 +79,12 @@ public class MQTTHome implements Home {
 		String responseString = null;
 		log.debug("executing HUE api request to send message to MQTT broker: " + anItem.getItem().toString());
 		if (validMqtt) {
-			String mqttObject = BrightnessDecode.calculateReplaceIntensityValue(anItem.getItem().toString(),
+			String mqttObject = null;
+			if(anItem.getItem().isJsonObject())
+				mqttObject = BrightnessDecode.calculateReplaceIntensityValue(anItem.getItem().getAsString(),
+					intensity, targetBri, targetBriInc, false);
+			else
+				mqttObject = BrightnessDecode.calculateReplaceIntensityValue(anItem.getItem().toString(),
 						intensity, targetBri, targetBriInc, false);
 			if (mqttObject.substring(0, 1).equalsIgnoreCase("{"))
 				mqttObject = "[" + mqttObject + "]";

src/main/resources/public/index.html

@@ -37,9 +37,15 @@
 				<ul class="nav navbar-nav">
 					<li class="active"><a href="#">Home</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>
+						<a id="dLabel1" href="" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Help <span class="caret"></span></a>
+						<ul class="dropdown-menu" aria-labelledby="dLabel">
+							<li><a href="https://github.com/bwssytems/ha-bridge/blob/master/README.md" target="_blank">Readme</a></li>
+							<li><a href="https://github.com/bwssytems/ha-bridge/wiki/HA-Bridge-FAQs" target="_blank">FAQ</a></li>
+						</ul>
+					</li>
+					<li class="dropdown">
+						<a id="dLabel2" href="" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">About <span class="caret"></span></a>
 						<ul class="dropdown-menu" aria-labelledby="dLabel">
 							<li><a href="http://www.bwssystems.com" target="_blank">Developed by BWS Systems</a></li>
 							<li><a href="http://www.amazon.com/echo" target="_blank">Amazon Echo</a></li>

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

@@ -705,6 +705,10 @@ app.service ('bridgeService', function ($http, $window, ngToast) {
 		self.state.olddevicename = device.name;
 	};
 
+	this.editNewDevice = function (device) {
+		self.state.device = device;
+	};
+
 	this.testUrl = function (device, type, value) {
 		var msgDescription = "unknown";
 		var testUrl = this.state.huebase + "/test/lights/" + device.id + "/state";
@@ -1163,7 +1167,7 @@ app.controller('VeraController', function ($scope, $location, $http, bridgeServi
 
 			bridgeService.buildUrls(onpayload, dimpayload, offpayload, false, veradevice.id, veradevice.name, veradevice.veraname, "switch", "veraDevice", null, null);
 			$scope.device = bridgeService.state.device;
-			bridgeService.editDevice($scope.device);
+			bridgeService.editNewDevice($scope.device);
 			$location.path('/editdevice');
 	};
 
@@ -1177,7 +1181,7 @@ app.controller('VeraController', function ($scope, $location, $http, bridgeServi
 
 		bridgeService.buildUrls(onpayload, null, offpayload, false, verascene.id, verascene.name, verascene.veraname, "scene", "veraScene", null, null);
 		$scope.device = bridgeService.state.device;
-		bridgeService.editDevice($scope.device);
+		bridgeService.editNewDevice($scope.device);
 		$location.path('/editdevice');
 	};
 
@@ -1297,7 +1301,7 @@ app.controller('HarmonyController', function ($scope, $location, $http, bridgeSe
 
 		bridgeService.buildUrls(onpayload, null, offpayload, true, harmonyactivity.activity.id,  harmonyactivity.activity.label, harmonyactivity.hub, "activity", "harmonyActivity", null, null);
 		$scope.device = bridgeService.state.device;
-		bridgeService.editDevice($scope.device);
+		bridgeService.editNewDevice($scope.device);
 		$location.path('/editdevice');
 	};
 
@@ -1309,7 +1313,7 @@ app.controller('HarmonyController', function ($scope, $location, $http, bridgeSe
 
 		bridgeService.buildUrls(onpayload, null, offpayload, true, actionOn.command,  harmonydevice.device.label, harmonydevice.hub, "button", "harmonyButton", null, null);
 		$scope.device = bridgeService.state.device;
-		bridgeService.editDevice($scope.device);
+		bridgeService.editNewDevice($scope.device);
 		$location.path('/editdevice');
 	};
 
@@ -1353,7 +1357,7 @@ app.controller('NestController', function ($scope, $location, $http, bridgeServi
 		offpayload = "{\"name\":\"" + nestitem.id + "\",\"away\":true,\"control\":\"status\"}";
 		bridgeService.buildUrls(onpayload, null, offpayload, true, nestitem.id,  nestitem.name, nestitem.name, "home", "nestHomeAway", null, null);
 		$scope.device = bridgeService.state.device;
-		bridgeService.editDevice($scope.device);
+		bridgeService.editNewDevice($scope.device);
 		$location.path('/editdevice');
 	};
 
@@ -1363,7 +1367,7 @@ app.controller('NestController', function ($scope, $location, $http, bridgeServi
 		offpayload = "{\"name\":\"" + nestitem.id + "\",\"control\":\"off\"}";
 		bridgeService.buildUrls(onpayload, dimpayload, offpayload, true, nestitem.id + "-SetTemp",  nestitem.name.substr(0, nestitem.name.indexOf("(")) + " Temperature", nestitem.location, "thermo", "nestThermoSet", null, null);
 		$scope.device = bridgeService.state.device;
-		bridgeService.editDevice($scope.device);
+		bridgeService.editNewDevice($scope.device);
 		$location.path('/editdevice');
 	};
 
@@ -1373,7 +1377,7 @@ app.controller('NestController', function ($scope, $location, $http, bridgeServi
 		offpayload = "{\"name\":\"" + nestitem.id + "\",\"control\":\"off\"}";
 		bridgeService.buildUrls(onpayload, dimpayload, offpayload, true, nestitem.id + "-SetHeat",  nestitem.name.substr(0, nestitem.name.indexOf("(")) + " Heat", nestitem.location, "thermo", "nestThermoSet", null, null);
 		$scope.device = bridgeService.state.device;
-		bridgeService.editDevice($scope.device);
+		bridgeService.editNewDevice($scope.device);
 		$location.path('/editdevice');
 	};
 
@@ -1383,7 +1387,7 @@ app.controller('NestController', function ($scope, $location, $http, bridgeServi
 		offpayload = "{\"name\":\"" + nestitem.id + "\",\"control\":\"off\"}";
 		bridgeService.buildUrls(onpayload,dimpayload, offpayload, true, nestitem.id + "-SetCool",  nestitem.name.substr(0, nestitem.name.indexOf("(")) + " Cool", nestitem.location, "thermo", "nestThermoSet", null, null);
 		$scope.device = bridgeService.state.device;
-		bridgeService.editDevice($scope.device);
+		bridgeService.editNewDevice($scope.device);
 		$location.path('/editdevice');
 	};
 
@@ -1392,7 +1396,7 @@ app.controller('NestController', function ($scope, $location, $http, bridgeServi
 		offpayload = "{\"name\":\"" + nestitem.id + "\",\"control\":\"off\"}";
 		bridgeService.buildUrls(onpayload, null, offpayload, true, nestitem.id + "-SetRange",  nestitem.name.substr(0, nestitem.name.indexOf("(")) + " Range", nestitem.location, "thermo", "nestThermoSet", null, null);
 		$scope.device = bridgeService.state.device;
-		bridgeService.editDevice($scope.device);
+		bridgeService.editNewDevice($scope.device);
 		$location.path('/editdevice');
 	};
 
@@ -1401,7 +1405,7 @@ app.controller('NestController', function ($scope, $location, $http, bridgeServi
 		offpayload = "{\"name\":\"" + nestitem.id + "\",\"control\":\"off\"}";
 		bridgeService.buildUrls(onpayload, null, offpayload, true, nestitem.id + "-TurnOff",  nestitem.name.substr(0, nestitem.name.indexOf("(")) + " Thermostat", nestitem.location, "thermo", "nestThermoSet", null, null);
 		$scope.device = bridgeService.state.device;
-		bridgeService.editDevice($scope.device);
+		bridgeService.editNewDevice($scope.device);
 		$location.path('/editdevice');
 	};
 
@@ -1410,7 +1414,7 @@ app.controller('NestController', function ($scope, $location, $http, bridgeServi
 		offpayload = "{\"name\":\"" + nestitem.id + "\",\"control\":\"fan-auto\"}";
 		bridgeService.buildUrls(onpayload, null, offpayload, true, nestitem.id + "-SetFan",  nestitem.name.substr(0, nestitem.name.indexOf("(")) + " Fan", nestitem.location, "thermo", "nestThermoSet", null, null);
 		$scope.device = bridgeService.state.device;
-		bridgeService.editDevice($scope.device);
+		bridgeService.editNewDevice($scope.device);
 		$location.path('/editdevice');
 	};
 
@@ -1456,7 +1460,7 @@ app.controller('HueController', function ($scope, $location, $http, bridgeServic
 		offpayload = "{\"ipAddress\":\"" + huedevice.hueaddress + "\",\"deviceId\":\"" + huedevice.huedeviceid +"\",\"hueName\":\"" + huedevice.huename + "\"}";
 		bridgeService.buildUrls(onpayload, null, offpayload, true, huedevice.device.uniqueid,  huedevice.device.name, huedevice.huename, "passthru",  "hueDevice", null, null);
 		$scope.device = bridgeService.state.device;
-		bridgeService.editDevice($scope.device);
+		bridgeService.editNewDevice($scope.device);
 		$location.path('/editdevice');
 	};
 
@@ -1624,7 +1628,7 @@ app.controller('HalController', function ($scope, $location, $http, bridgeServic
 		+ postCmd;
 		bridgeService.buildUrls(onpayload, dimpayload, offpayload, false, haldevice.haldevicename + "-" + haldevice.halname,  haldevice.haldevicename, haldevice.halname, aDeviceType,  "halDevice", null, null);
 		$scope.device = bridgeService.state.device;
-		bridgeService.editDevice($scope.device);
+		bridgeService.editNewDevice($scope.device);
 		$location.path('/editdevice');
 	};
 
@@ -1636,7 +1640,7 @@ app.controller('HalController', function ($scope, $location, $http, bridgeServic
 
 		bridgeService.buildUrls(onpayload, null, offpayload, false, haldevice.haldevicename + "-" + haldevice.halname + "-" + actionOn.DeviceName,  haldevice.haldevicename, haldevice.halname, "button",  "halButton", null, null);
 		$scope.device = bridgeService.state.device;
-		bridgeService.editDevice($scope.device);
+		bridgeService.editNewDevice($scope.device);
 		$location.path('/editdevice');
 	};
 
@@ -1645,7 +1649,7 @@ app.controller('HalController', function ($scope, $location, $http, bridgeServic
 		offpayload = "http://" + haldevice.haladdress	+ "/ModeService!ModeCmd=Set!ModeName=Away?Token=" + $scope.bridge.settings.haltoken;
 		bridgeService.buildUrls(onpayload, null, offpayload, false, haldevice.haldevicename + "-" + haldevice.halname + "-HomeAway",  haldevice.haldevicename, haldevice.halname, "home",  "halHome", null, null);
 		$scope.device = bridgeService.state.device;
-		bridgeService.editDevice($scope.device);
+		bridgeService.editNewDevice($scope.device);
 		$location.path('/editdevice');
 	};
 
@@ -1667,7 +1671,7 @@ app.controller('HalController', function ($scope, $location, $http, bridgeServic
 		+ $scope.bridge.settings.haltoken;
 		bridgeService.buildUrls(onpayload, dimpayload, offpayload, false, haldevice.haldevicename + "-" + haldevice.halname + "-SetHeat",  haldevice.haldevicename + " Heat", haldevice.halname, "thermo",  "halThermoSet", null, null);
 		$scope.device = bridgeService.state.device;
-		bridgeService.editDevice($scope.device);
+		bridgeService.editNewDevice($scope.device);
 		$location.path('/editdevice');
 	};
 
@@ -1689,7 +1693,7 @@ app.controller('HalController', function ($scope, $location, $http, bridgeServic
 		+ $scope.bridge.settings.haltoken;
 		bridgeService.buildUrls(onpayload, dimpayload, offpayload, false, haldevice.haldevicename + "-" + haldevice.halname + "-SetCool",  haldevice.haldevicename + " Cool", haldevice.halname, "thermo",  "halThermoSet", null, null);
 		$scope.device = bridgeService.state.device;
-		bridgeService.editDevice($scope.device);
+		bridgeService.editNewDevice($scope.device);
 		$location.path('/editdevice');
 	};
 
@@ -1705,7 +1709,7 @@ app.controller('HalController', function ($scope, $location, $http, bridgeServic
 		+ "!HVACMode=Off?Token="
 		bridgeService.buildUrls(onpayload, null, offpayload, false, haldevice.haldevicename + "-" + haldevice.halname + "-SetAuto",  haldevice.haldevicename + " Auto", haldevice.halname, "thermo",  "halThermoSet", null, null);
 		$scope.device = bridgeService.state.device;
-		bridgeService.editDevice($scope.device);
+		bridgeService.editNewDevice($scope.device);
 		$location.path('/editdevice');
 	};
 
@@ -1722,7 +1726,7 @@ app.controller('HalController', function ($scope, $location, $http, bridgeServic
 		$scope.device.offUrl = "http://" + haldevice.haladdress 
 		bridgeService.buildUrls(onpayload, null, offpayload, false, haldevice.haldevicename + "-" + haldevice.halname + "-TurnOff",  haldevice.haldevicename + " Thermostat", haldevice.halname, "thermo",  "halThermoSet", null, null);
 		$scope.device = bridgeService.state.device;
-		bridgeService.editDevice($scope.device);
+		bridgeService.editNewDevice($scope.device);
 		$location.path('/editdevice');
 	};
 
@@ -1739,7 +1743,7 @@ app.controller('HalController', function ($scope, $location, $http, bridgeServic
 			+ $scope.bridge.settings.haltoken;
 		bridgeService.buildUrls(onpayload, null, offpayload, false, haldevice.haldevicename + "-" + haldevice.halname + "-SetFan",  haldevice.haldevicename + " Fan", haldevice.halname, "thermo",  "halThermoSet", null, null);
 		$scope.device = bridgeService.state.device;
-		bridgeService.editDevice($scope.device);
+		bridgeService.editNewDevice($scope.device);
 		$location.path('/editdevice');
 	};
 
@@ -1859,7 +1863,7 @@ app.controller('MQTTController', function ($scope, $location, $http, bridgeServi
 
 		bridgeService.buildUrls(onpayload, null, offpayload, true, mqttbroker.clientId + "-" + mqtttopic, mqttbroker.clientId + mqtttopic, mqttbroker.clientId, "mqtt",  "mqttMessage", null, null);
 		$scope.device = bridgeService.state.device;
-		bridgeService.editDevice($scope.device);
+		bridgeService.editNewDevice($scope.device);
 		$location.path('/editdevice');
 	};
 
@@ -1911,7 +1915,7 @@ app.controller('HassController', function ($scope, $location, $http, bridgeServi
 
 		bridgeService.buildUrls(onpayload, dimpayload, offpayload, true, hassdevice.hassname + "-" + hassdevice.deviceState.entity_id, hassdevice.deviceState.entity_id, hassdevice.hassname, hassdevice.domain,  "hassDevice", null, null);
 		$scope.device = bridgeService.state.device;
-		bridgeService.editDevice($scope.device);
+		bridgeService.editNewDevice($scope.device);
 		$location.path('/editdevice');
 	};
 
@@ -1925,7 +1929,7 @@ app.controller('HassController', function ($scope, $location, $http, bridgeServi
 
 		bridgeService.buildUrls(onpayload, dimpayload, offpayload, true, hassdevice.hassname + "-" + hassdevice.deviceState.entity_id, hassdevice.deviceState.entity_id, hassdevice.hassname, hassdevice.domain,  "hassDevice", null, null);
 		$scope.device = bridgeService.state.device;
-		bridgeService.editDevice($scope.device);
+		bridgeService.editNewDevice($scope.device);
 		$location.path('/editdevice');
 	};
 
@@ -1939,7 +1943,7 @@ app.controller('HassController', function ($scope, $location, $http, bridgeServi
 
 		bridgeService.buildUrls(onpayload, dimpayload, offpayload, true, hassdevice.hassname + "-" + hassdevice.deviceState.entity_id, hassdevice.deviceState.entity_id, hassdevice.hassname, hassdevice.domain,  "hassDevice", null, null);
 		$scope.device = bridgeService.state.device;
-		bridgeService.editDevice($scope.device);
+		bridgeService.editNewDevice($scope.device);
 		$location.path('/editdevice');
 	};
 
@@ -1953,7 +1957,7 @@ app.controller('HassController', function ($scope, $location, $http, bridgeServi
 
 		bridgeService.buildUrls(onpayload, dimpayload, offpayload, true, hassdevice.hassname + "-" + hassdevice.deviceState.entity_id, hassdevice.deviceState.entity_id, hassdevice.hassname, hassdevice.domain,  "hassDevice", null, null);
 		$scope.device = bridgeService.state.device;
-		bridgeService.editDevice($scope.device);
+		bridgeService.editNewDevice($scope.device);
 		$location.path('/editdevice');
 	};
 
@@ -1967,7 +1971,7 @@ app.controller('HassController', function ($scope, $location, $http, bridgeServi
 
 		bridgeService.buildUrls(onpayload, dimpayload, offpayload, true, hassdevice.hassname + "-" + hassdevice.deviceState.entity_id, hassdevice.deviceState.entity_id, hassdevice.hassname, hassdevice.domain,  "hassDevice", null, null);
 		$scope.device = bridgeService.state.device;
-		bridgeService.editDevice($scope.device);
+		bridgeService.editNewDevice($scope.device);
 		$location.path('/editdevice');
 	};
 
@@ -1981,7 +1985,7 @@ app.controller('HassController', function ($scope, $location, $http, bridgeServi
 
 		bridgeService.buildUrls(onpayload, dimpayload, offpayload, true, hassdevice.hassname + "-" + hassdevice.deviceState.entity_id, hassdevice.deviceState.entity_id, hassdevice.hassname, hassdevice.domain,  "hassDevice", null, null);
 		$scope.device = bridgeService.state.device;
-		bridgeService.editDevice($scope.device);
+		bridgeService.editNewDevice($scope.device);
 		$location.path('/editdevice');
 	};
 
@@ -2120,10 +2124,12 @@ app.controller('EditController', function ($scope, $location, $http, bridgeServi
 	$scope.editDevice = function (copy) {
 		if($scope.device.name === "" && $scope.device.onUrl === "") {
 			$scope.clearDevice();
+			bridgeService.displayWarn("Error adding/editing device. Name has not been given.", null);
 			return;
 		}
 		if(($scope.device.name === $scope.bridge.olddevicename) && copy) {
 			$scope.clearDevice();
+			bridgeService.displayWarn("Error adding device. Name has not been changed from original.", null);
 			return;
 		}
 		if (copy)