Changed: MySensors, not ignoring switch change check for Scene On/Off types

gizmocuz · gizmocuz · commit ab17334dbc4e · 2016-07-14T08:43:32.000+02:00
diff --git a/hardware/MySensorsBase.cpp b/hardware/MySensorsBase.cpp
@@ -1104,7 +1104,10 @@ void MySensorsBase::UpdateSwitch(const _eSetType vType, const unsigned char Idx,
 	result = m_sql.safe_query("SELECT Name,nValue,sValue FROM DeviceStatus WHERE (HardwareID==%d) AND (DeviceID=='%q') AND (Unit==%d) AND (Type==%d) AND (Subtype==%d)", m_HwdID, szIdx, SubUnit, int(pTypeLighting2), int(sTypeAC));
 	if (!result.empty())
 	{
-		if ((vType != V_TRIPPED) || (!bOn))
+		if (
+			(((vType != V_TRIPPED) || (!bOn))) &&
+			((vType != V_SCENE_OFF) && (vType != V_SCENE_ON))
+			)
 		{
 			//check if we have a change, if not do not update it
 			int nvalue = atoi(result[0][1].c_str());

Original file line number	Diff line number	Diff line change
`@@ -1104,7 +1104,10 @@ void MySensorsBase::UpdateSwitch(const _eSetType vType, const unsigned char Idx,`
`1104`	`1104`	`result = m_sql.safe_query("SELECT Name,nValue,sValue FROM DeviceStatus WHERE (HardwareID==%d) AND (DeviceID=='%q') AND (Unit==%d) AND (Type==%d) AND (Subtype==%d)", m_HwdID, szIdx, SubUnit, int(pTypeLighting2), int(sTypeAC));`
`1105`	`1105`	`if (!result.empty())`
`1106`	`1106`	`{`
`1107`		`- if ((vType != V_TRIPPED) \|\| (!bOn))`
	`1107`	`+ if (`
	`1108`	`+ (((vType != V_TRIPPED) \|\| (!bOn))) &&`
	`1109`	`+ ((vType != V_SCENE_OFF) && (vType != V_SCENE_ON))`
	`1110`	`+ )`
`1108`	`1111`	`{`
`1109`	`1112`	`//check if we have a change, if not do not update it`
`1110`	`1113`	`int nvalue = atoi(result[0][1].c_str());`