Applamp bug fixes

Author: sijones

hardware/Limitless.cpp

@@ -303,7 +303,7 @@ bool CLimitLess::WriteToHardware(const char *pdata, const unsigned char length)
 					sleep_milliseconds(100);
 				}
 				else if (pLed->dunit==4) {
-					sendto(m_RemoteSocket,(const char*)&RGBWGroup4AllOn,4,0,(struct sockaddr*)&m_stRemoteDestAddr, sizeof(sockaddr_in));
+					sendto(m_RemoteSocket,(const char*)&RGBWGroup4AllOn,3,0,(struct sockaddr*)&m_stRemoteDestAddr, sizeof(sockaddr_in));
 					sleep_milliseconds(100);
 				}
 				//The Hue is inverted/swifted 90 degrees
@@ -313,12 +313,18 @@ bool CLimitLess::WriteToHardware(const char *pdata, const unsigned char length)
 			}
 			break;
 		case Limitless_DiscoSpeedSlower:
+			sendto(m_RemoteSocket, (const char*)&RGBWOn, 3, 0, (struct sockaddr*)&m_stRemoteDestAddr, sizeof(sockaddr_in));
+			sleep_milliseconds(100);
 			pCMD=(unsigned char*)&RGBWDiscoSpeedSlower;
 			break;
 		case Limitless_DiscoSpeedFaster:
+			sendto(m_RemoteSocket, (const char*)&RGBWOn, 3, 0, (struct sockaddr*)&m_stRemoteDestAddr, sizeof(sockaddr_in));
+			sleep_milliseconds(100);
 			pCMD=(unsigned char*)&RGBWDiscoSpeedFaster;
 			break;
 		case Limitless_DiscoMode:
+			sendto(m_RemoteSocket, (const char*)&RGBWOn, 3, 0, (struct sockaddr*)&m_stRemoteDestAddr, sizeof(sockaddr_in));
+			sleep_milliseconds(100);
 			pCMD=(unsigned char*)&RGBWDiscoMode;
 			break;
 		case Limitless_SetColorToWhite:
@@ -344,7 +350,7 @@ bool CLimitLess::WriteToHardware(const char *pdata, const unsigned char length)
 				pCMD=(unsigned char*)&RGBWSetColorToWhiteGroup3;
 			}
 			else if (pLed->dunit==4) {
-				sendto(m_RemoteSocket,(const char*)&RGBWGroup4AllOn,4,0,(struct sockaddr*)&m_stRemoteDestAddr, sizeof(sockaddr_in));
+				sendto(m_RemoteSocket,(const char*)&RGBWGroup4AllOn,3,0,(struct sockaddr*)&m_stRemoteDestAddr, sizeof(sockaddr_in));
 				sleep_milliseconds(100);
 				pCMD=(unsigned char*)&RGBWSetColorToWhiteGroup4;
 			}
@@ -369,7 +375,7 @@ bool CLimitLess::WriteToHardware(const char *pdata, const unsigned char length)
 					sleep_milliseconds(100);
 				}
 				else if (pLed->dunit==4) {
-					sendto(m_RemoteSocket,(const char*)&RGBWGroup4AllOn,4,0,(struct sockaddr*)&m_stRemoteDestAddr, sizeof(sockaddr_in));
+					sendto(m_RemoteSocket,(const char*)&RGBWGroup4AllOn,3,0,(struct sockaddr*)&m_stRemoteDestAddr, sizeof(sockaddr_in));
 					sleep_milliseconds(100);
 				}
 				//convert brightness (0-100) to (0-50) to 0-59
@@ -407,24 +413,50 @@ bool CLimitLess::WriteToHardware(const char *pdata, const unsigned char length)
 			}
 			break;
 		case Limitless_SetBrightUp:
+			//First send ON , sleep 100ms, then the command
+			sendto(m_RemoteSocket, (const char*)&RGBOn, 3, 0, (struct sockaddr*)&m_stRemoteDestAddr, sizeof(sockaddr_in));
+			sleep_milliseconds(100);
 			pCMD = (unsigned char*)&RGBBrightnessUp;
 			break;
 		case Limitless_SetBrightDown:
+			//First send ON , sleep 100ms, then the command
+			sendto(m_RemoteSocket, (const char*)&RGBOn, 3, 0, (struct sockaddr*)&m_stRemoteDestAddr, sizeof(sockaddr_in));
+			sleep_milliseconds(100);
 			pCMD = (unsigned char*)&RGBBrightnessDown;
 			break;
 		case Limitless_DiscoSpeedSlower:
+			//First send ON , sleep 100ms, then the command
+			sendto(m_RemoteSocket, (const char*)&RGBOn, 3, 0, (struct sockaddr*)&m_stRemoteDestAddr, sizeof(sockaddr_in));
+			sleep_milliseconds(100);
 			pCMD=(unsigned char*)&RGBDiscoSpeedSlower;
 			break;
 		case Limitless_DiscoSpeedFaster:
+			//First send ON , sleep 100ms, then the command
+			sendto(m_RemoteSocket, (const char*)&RGBOn, 3, 0, (struct sockaddr*)&m_stRemoteDestAddr, sizeof(sockaddr_in));
+			sleep_milliseconds(100);
 			pCMD=(unsigned char*)&RGBDiscoSpeedFaster;
 			break;
 		case Limitless_DiscoSpeedFasterLong:
+			//First send ON , sleep 100ms, then the command
+			sendto(m_RemoteSocket, (const char*)&RGBOn, 3, 0, (struct sockaddr*)&m_stRemoteDestAddr, sizeof(sockaddr_in));
+			sleep_milliseconds(100);
 			pCMD = (unsigned char*)&RGBDiscoSpeedFasterLong;
 			break;
+		case Limitless_DiscoMode:
+			sendto(m_RemoteSocket, (const char*)&RGBOn, 3, 0, (struct sockaddr*)&m_stRemoteDestAddr, sizeof(sockaddr_in));
+			sleep_milliseconds(100);
+			pCMD = (unsigned char*)&RGBWDiscoMode;
+			break;
 		case Limitless_RGBDiscoNext:
+			//First send ON , sleep 100ms, then the command
+			sendto(m_RemoteSocket, (const char*)&RGBOn, 3, 0, (struct sockaddr*)&m_stRemoteDestAddr, sizeof(sockaddr_in));
+			sleep_milliseconds(100);
 			pCMD=(unsigned char*)&RGBDiscoNext;
 			break;
 		case Limitless_RGBDiscoPrevious:
+			//First send ON , sleep 100ms, then the command
+			sendto(m_RemoteSocket, (const char*)&RGBOn, 3, 0, (struct sockaddr*)&m_stRemoteDestAddr, sizeof(sockaddr_in));
+			sleep_milliseconds(100);
 			pCMD=(unsigned char*)&RGBDiscoPrevious;
 			break;
 		}

main/WebServer.cpp

@@ -5755,6 +5755,22 @@ namespace http {
 
 				m_mainworker.SwitchLight(ID, "Bright Down", 0, -1,false,0);
 			}
+			else if (cparam == "discomode")
+			{
+				std::string idx = request::findValue(&req, "idx");
+
+				if (idx == "")
+				{
+					return;
+				}
+
+				unsigned long long ID;
+				std::stringstream s_strid;
+				s_strid << idx;
+				s_strid >> ID;
+
+				m_mainworker.SwitchLight(ID, "Disco Mode", 0, -1, false, 0);
+			}
 			else if (cparam == "discoup")
 			{
 				std::string idx = request::findValue(&req, "idx");

msbuild/domoticz.vcxproj

@@ -57,6 +57,7 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;PTW32_STATIC_LIB;WITH_OPENZWAVE;OPENZWAVE_USEDLL;NS_ENABLE_SSL;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>./Windows Libraries/Boost/boost_1_59_0;./libusb;..\hardware\openzwave;./Windows Libraries/openssl;./Windows Libraries/Curl;./Windows Libraries/pthread;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

www/app/LightsController.js

@@ -1032,7 +1032,7 @@ define(['app'], function (app) {
 			else {
 				$("#lightcontent #LedColor").hide();
 			}
-			if ($.bIsRGB==true) {
+			if ($.bIsRGB==true || $.bIsRGBW==true) {
 				$("#lightcontent #optionsRGB").show();
 			}
 			else {