[Satel Integra] Fix for common blind roller

szczukot · szczukot · commit 246050de382a · 2016-10-13T20:20:26.000+02:00
diff --git a/hardware/SatelIntegra.cpp b/hardware/SatelIntegra.cpp
@@ -759,7 +759,7 @@ void SatelIntegra::ReportOutputState(const int Idx, const bool state)
 {
 	m_outputsLastState[Idx - 1] = state;
 
-	if (m_isOutputSwitch[Idx - 1])
+	if ((Idx > 1024) || m_isOutputSwitch[Idx - 1])
 	{
 		SendGeneralSwitchSensor(Idx, 255, state ? gswitch_sOn : gswitch_sOff, NULL, 1);
 	}
@@ -1027,6 +1027,12 @@ void SatelIntegra::UpdateOutputName(const int Idx, const unsigned char* name, co
 	sprintf(szTmp, "%08X", (int)Idx);
 
 	std::string shortName((char*)name, 16);
+
+	if (Idx > 1024)
+	{
+		shortName = "Common " + shortName; // for common roller blind
+	}
+
 	std::string::size_type pos = shortName.find_last_not_of(' ');
 	shortName.erase(pos + 1);
 	shortName = ISO2UTF8(shortName);

Original file line number	Diff line number	Diff line change
`@@ -759,7 +759,7 @@ void SatelIntegra::ReportOutputState(const int Idx, const bool state)`
`759`	`759`	`{`
`760`	`760`	`m_outputsLastState[Idx - 1] = state;`
`761`	`761`
`762`		`- if (m_isOutputSwitch[Idx - 1])`
	`762`	`+ if ((Idx > 1024) \|\| m_isOutputSwitch[Idx - 1])`
`763`	`763`	`{`
`764`	`764`	`SendGeneralSwitchSensor(Idx, 255, state ? gswitch_sOn : gswitch_sOff, NULL, 1);`
`765`	`765`	`}`
`@@ -1027,6 +1027,12 @@ void SatelIntegra::UpdateOutputName(const int Idx, const unsigned char* name, co`
`1027`	`1027`	`sprintf(szTmp, "%08X", (int)Idx);`
`1028`	`1028`
`1029`	`1029`	`std::string shortName((char*)name, 16);`
	`1030`	`+`
	`1031`	`+ if (Idx > 1024)`
	`1032`	`+ {`
	`1033`	`+ shortName = "Common " + shortName; // for common roller blind`
	`1034`	`+ }`
	`1035`	`+`
`1030`	`1036`	`std::string::size_type pos = shortName.find_last_not_of(' ');`
`1031`	`1037`	`shortName.erase(pos + 1);`
`1032`	`1038`	`shortName = ISO2UTF8(shortName);`