Switch from RFXtrx.h constants to hardwaretypes.h

Author: dnpwwo

hardware/Kodi.cpp

@@ -7,7 +7,7 @@
 #include "../main/WebServer.h"
 #include "../main/mainworker.h"
 #include "../main/EventSystem.h"
-
+#include "../hardware/hardwaretypes.h"
 #include <boost/algorithm/string.hpp>
 
 #include <iostream>
@@ -824,10 +824,10 @@ bool CKodi::WriteToHardware(const char *pdata, const unsigned char length)
 			case light2_sOff:
 			case light2_sGroupOff:
 				return (*itt)->SendShutdown();
-			case light2_sStop:
+			case gswitch_sStop:
 				(*itt)->SendCommand("stop");
 				return true;
-			case light2_sPause:
+			case gswitch_sPause:
 				(*itt)->SendCommand("playpause");
 				return true;
 			default:

hardware/hardwaretypes.h

@@ -134,7 +134,7 @@
 #define gswitch_sSound8				0x10
 #define gswitch_sStop				0x11
 #define gswitch_sProgram			0x12
-
+#define gswitch_sPause				0x13
 //--------------
 
 #define pTypeLux		0xF6

main/RFXNames.cpp

@@ -1991,12 +1991,12 @@ bool GetLightCommand(
 		}
 		else if (switchcmd == "Stop")
 		{
-			cmd = light2_sStop;
+			cmd = gswitch_sStop;
 			return true;
 		}
 		else if (switchcmd == "Paused")
 		{
-			cmd = light2_sPause;
+			cmd = gswitch_sPause;
 			return true;
 		}
 		else

main/RFXtrx.h

@@ -417,8 +417,6 @@ SDK version 4.9
 #define light2_sGroupOff 0x3
 #define light2_sGroupOn 0x4
 #define light2_sSetGroupLevel 0x5
-#define light2_sStop 0x6
-#define light2_sPause 0x7
 
 #define pTypeLighting3 0x12
 #define sTypeKoppla 0x0