added global function to detect if sensor is a light/switch

Author: gizmocuz

hardware/MQTT.cpp

@@ -499,9 +499,7 @@ void MQTT::SendDeviceInfo(const int m_HwdID, const unsigned long long DeviceRowI
 		root["dtype"] = RFX_Type_Desc(dType,1);
 		root["stype"] = RFX_Type_SubType_Desc(dType, dSubType);
 
-		// only devices appearing on the 'lights' page have a switch type
-		// where can we find if a device is a 'light' ?
-		if (dType == pTypeLighting2) {
+		if (IsLightOrSwitch(dType, dSubType) == true) {
 			root["switchType"] = Switch_Type_Desc(switchType);
 		}
 

main/Helper.cpp

@@ -14,6 +14,9 @@
 #include "../msbuild/WindowsHelper.h"
 #endif
 
+#include "RFXtrx.h"
+#include "../hardware/hardwaretypes.h"
+
 void StringSplit(std::string str, const std::string &delim, std::vector<std::string> &results)
 {
 	results.clear();
@@ -541,3 +544,33 @@ void padLeft(std::string &str, const size_t num, const char paddingChar)
 	if (num > str.size())
 		str.insert(0, num - str.size(), paddingChar);
 }
+
+bool IsLightOrSwitch(const int devType, const int subType)
+{
+	bool bIsLightSwitch = false;
+	switch (devType)
+	{
+	case pTypeLighting1:
+	case pTypeLighting2:
+	case pTypeLighting3:
+	case pTypeLighting4:
+	case pTypeLighting5:
+	case pTypeLighting6:
+	case pTypeLimitlessLights:
+	case pTypeSecurity1:
+	case pTypeSecurity2:
+	case pTypeCurtain:
+	case pTypeBlinds:
+	case pTypeRFY:
+	case pTypeThermostat2:
+	case pTypeThermostat3:
+	case pTypeRemote:
+	case pTypeGeneralSwitch:
+		bIsLightSwitch = true;
+		break;
+	case pTypeRadiator1:
+		bIsLightSwitch = (subType == sTypeSmartwaresSwitchRadiator);
+		break;
+	}
+	return bIsLightSwitch;
+}

main/Helper.h

@@ -34,3 +34,5 @@ std::string GenerateMD5Hash(const std::string &InputString, const std::string &S
 void hue2rgb(const float hue, int &outR, int &outG, int &outB, const double maxValue = 100.0);
 bool is_number(const std::string& s);
 void padLeft(std::string &str, const size_t num, const char paddingChar = '0');
+
+bool IsLightOrSwitch(const int devType, const int subType);

main/SQLHelper.cpp

@@ -2324,33 +2324,10 @@ unsigned long long CSQLHelper::UpdateValue(const int HardwareID, const char* ID,
 	if (devRowID == -1)
 		return -1;
 
-	bool bIsLightSwitch=false;
-	switch (devType)
+	if (!IsLightOrSwitch(devType, subType))
 	{
-	case pTypeLighting1:
-	case pTypeLighting2:
-	case pTypeLighting3:
-	case pTypeLighting4:
-	case pTypeLighting5:
-	case pTypeLighting6:
-	case pTypeLimitlessLights:
-	case pTypeSecurity1:
-	case pTypeSecurity2:
-	case pTypeCurtain:
-	case pTypeBlinds:
-	case pTypeRFY:
-	case pTypeThermostat2:
-	case pTypeThermostat3:
-	case pTypeRemote:
-	case pTypeGeneralSwitch:
-		bIsLightSwitch = true;
-		break;
-	case pTypeRadiator1:
-		bIsLightSwitch = (subType == sTypeSmartwaresSwitchRadiator);
-		break;
-	}
-	if (!bIsLightSwitch)
 		return devRowID;
+	}
 
 	//Get the ID of this device
 	std::vector<std::vector<std::string> > result,result2;