Merge pull request #289 from algernon2/master

LightwaveRF inline relay

Author: gizmocuz

main/RFXNames.cpp

@@ -2221,12 +2221,21 @@ bool GetLightCommand(
 		else if (dSubType!=sTypeLightwaveRF)
 		{
 			//Only LightwaveRF devices have a set-level
-			if (switchcmd=="Set Level")
-				switchcmd="On";
-		}
-
-		if (switchtype==STYPE_Doorbell)
-		{
+ 			if (switchcmd=="Set Level")
+ 				switchcmd="On";
+ 		}
+			// The LightwaveRF inline relay has to be controlled by Venetian blinds logic as it has a stop setting
+		else if ((dSubType==sTypeLightwaveRF)&&(switchtype==STYPE_VenetianBlindsEU)){
+				if (switchcmd=="On")
+					switchcmd="Close inline relay";
+				else if (switchcmd=="Off")
+					switchcmd="Open inline relay";
+				else if (switchcmd=="Stop")
+					switchcmd="Stop inline relay";
+		}
+ 
+ 		if (switchtype==STYPE_Doorbell)
+ 		{
 			if ((switchcmd=="On")||(switchcmd=="Group On"))
 			{
 				cmd=light5_sGroupOn;
@@ -2270,10 +2279,25 @@ bool GetLightCommand(
 			return true;
 		}
 		else if (switchcmd=="Group On")
+ 		{
+ 			cmd=light5_sGroupOn;
+			return true;
+		}
+		else if (switchcmd=="Close inline relay")
+		{
+			cmd=light5_sClose;
+			return true;
+		}
+		else if (switchcmd=="Stop inline relay")
 		{
-			cmd=light5_sGroupOn;
+			cmd=light5_sStop;
 			return true;
 		}
+		else if (switchcmd=="Open inline relay")
+		{
+			cmd=light5_sOpen;
+ 			return true;
+		}
 		else
 			return false;
 		break;

main/WebServer.cpp

@@ -7797,10 +7797,10 @@ namespace http {
 							)
 						{
 							root["result"][ii]["TypeImg"] = "blinds";
-							if (lstatus == "On") {
+							if ((lstatus == "On")||(lstatus=="Close inline relay")) {
 								lstatus = "Closed";
 							}
-							else if (lstatus == "Stop") {
+							else if ((lstatus == "Stop")||(lstatus=="Stop inline relay")) {
 								lstatus = "Stopped";
 							}
 							else {