Merge pull request #10 from domoticz/master

Update from original

Author: EddyK69

hardware/RFLink.cpp

@@ -28,7 +28,7 @@ const _tRFLinkStringIntHelper rfswitches[] =
 	{ "NewKaku", sSwitchTypeAC },            // p4
 	{ "Kaku", sSwitchTypeARC },              // p3
 	{ "HomeEasy", sSwitchTypeHEU },          // p15
-	{ "FA500", sSwitchTypePT2262 },          // p3
+	{ "PT2262", sSwitchTypePT2262 },         // p3
 	{ "Eurodomest", sSwitchTypeEurodomest }, // p5
 	{ "Blyss", sSwitchTypeBlyss },           // p6
 	{ "Conrad", sSwitchTypeRSL },            // p7
@@ -44,11 +44,11 @@ const _tRFLinkStringIntHelper rfswitches[] =
 	{ "MDRemote", sSwitchTypeMDREMOTE },     // p14
 	{ "Waveman", sSwitchTypeWaveman },       // p-
 	{ "AB400D", sSwitchTypeAB400D },         // p3
-	{ "Impuls", sSwitchTypeIMPULS },         // p11
+	{ "Impuls", sSwitchTypeIMPULS },         // p3
 	{ "Anslut", sSwitchTypeANSLUT },         // p17
 	{ "Lightwave", sSwitchTypeLightwaveRF }, // p18
 	{ "FA20RF", sSwitchTypeFA20 },           // p80
-	{ "GDR2", sSwitchTypeGDR2 },           // p80
+	{ "GDR2", sSwitchTypeGDR2 },             // p-
 	{ "RisingSun", sSwitchTypeRisingSun },   // p-
 	{ "Philips", sSwitchTypePhilips },       // p-
 	{ "Energenie", sSwitchTypeEnergenie },   // p-
@@ -59,6 +59,15 @@ const _tRFLinkStringIntHelper rfswitches[] =
 	{ "Livolo", sSwitchTypeLivolo },         // p-
 	{ "Livolo App", sSwitchTypeLivoloAppliance }, // p-
 	{ "Aoke", sSwitchTypeAoke },             // p-
+	{ "Powerfix", sSwitchTypePowerfix },     // p13
+	{ "TriState", sSwitchTypeTriState },     // p16
+    { "Deltronic", sSwitchTypeDeltronic },   // p73
+    { "FA500", sSwitchTypeFA500 },           // p12
+    { "Chuango", sSwitchTypeChuango },       // p62
+    { "Plieger", sSwitchTypePlieger },       // p71
+    { "SilverCrest", sSwitchTypeSilvercrest }, // p75
+    { "Mertik", sSwitchTypeMertik },         // p82
+    { "HomeConfort", sSwitchTypeHomeConfort }, // p11
     { "", -1 }
 };
 

main/RFXNames.cpp

@@ -693,7 +693,14 @@ const char *RFX_Type_SubType_Desc(const unsigned char dType, const unsigned char
 		{ pTypeGeneralSwitch, sSwitchTypeSelectPlus, "SelectPlus" },
 		{ pTypeGeneralSwitch, sSwitchTypeSelectPlus3, "SelectPlus3" },
 		{ pTypeGeneralSwitch, sSwitchTypeFA20, "FA20RF" },
-
+		{ pTypeGeneralSwitch, sSwitchTypePowerfix, "Powerfix" },
+		{ pTypeGeneralSwitch, sSwitchTypeTriState, "TriState" },
+		{ pTypeGeneralSwitch, sSwitchTypeDeltronic, "Deltronic" },
+		{ pTypeGeneralSwitch, sSwitchTypeChuango, "Chuango" },
+		{ pTypeGeneralSwitch, sSwitchTypePlieger, "Plieger" },
+		{ pTypeGeneralSwitch, sSwitchTypeSilvercrest, "SilverCrest" },
+		{ pTypeGeneralSwitch, sSwitchTypeMertik, "Mertik" },
+		{ pTypeGeneralSwitch, sSwitchTypeHomeConfort, "HomeConfort" },
 		{  0,0,NULL }
 	};
 	return findTableID1ID2(Table, dType, sType);