Merge remote-tracking branch 'origin/master' into secure_message_decoding

Author: gaudryc

hardware/RFLinkBase.cpp

@@ -73,7 +73,10 @@ const _tRFLinkStringIntHelper rfswitches[] =
 	{ "RTS", sSwitchTypeRTS },               // p..
 	{ "ElroDB", sSwitchTypeElroDB },         // p..
 	{ "AOK", sSwitchTypeAOK },               // p..
-	{ "Unitec", sSwitchTypeUnitec },               // p..
+	{ "Unitec", sSwitchTypeUnitec },         // p..
+	{ "Maclean", sSwitchTypeMaclean },		 // p..
+	{ "R546", sSwitchTypeR546 },	         // p..
+	{ "Diya", sSwitchTypeDiya },	         // p..
 	{ "", -1 }
 };
 

hardware/hardwaretypes.h

@@ -122,7 +122,9 @@
 #define sSwitchTypeAOK				0x3c
 #define sSwitchTypeUnitec			0x3d
 #define sSwitchTypeSelector			0x3e
-
+#define sSwitchTypeMaclean			0x3f
+#define sSwitchTypeR546				0x40
+#define sSwitchTypeDiya				0x41
 
 //Switch commands
 #define gswitch_sOff				0x00

main/RFXNames.cpp

@@ -744,6 +744,9 @@ const char *RFX_Type_SubType_Desc(const unsigned char dType, const unsigned char
 		{ pTypeGeneralSwitch, sSwitchTypeAOK, "AOK" },
 		{ pTypeGeneralSwitch, sSwitchTypeUnitec, "Unitec" },
 		{ pTypeGeneralSwitch, sSwitchTypeSelector, "Selector Switch" },
+		{ pTypeGeneralSwitch, sSwitchTypeMaclean, "Maclean" },
+		{ pTypeGeneralSwitch, sSwitchTypeR546, "R546" },
+		{ pTypeGeneralSwitch, sSwitchTypeDiya, "Diya" },
 		{  0,0,NULL }
 	};
 	return findTableID1ID2(Table, dType, sType);

main/WebServer.cpp

@@ -12005,7 +12005,7 @@ namespace http {
 							}
 						}
 					}
-					else if ((dType == pTypeENERGY) || (dType == pTypePOWER) || ((dType == pTypeGeneral) && (dSubType == sTypeKwh)))
+					else if ((dType == pTypeENERGY) || (dType == pTypePOWER) || (dType == pTypeYouLess) || ((dType == pTypeGeneral) && (dSubType == sTypeKwh)))
 					{
 						root["status"] = "OK";
 						root["title"] = "Graph " + sensor + " " + srange;
@@ -12058,6 +12058,9 @@ namespace http {
 						if (bHaveUsage == false)
 							method = 0;
 
+						if (dType == pTypeYouLess)
+							method = 1;
+
 						int iDisplayInPower = 1;
 						m_sql.GetPreferencesVar("DisplayPowerUsageInkWhGraph", iDisplayInPower);
 						if (!iDisplayInPower)