Fix message parsing

Author: fabiopaolini

hardware/Comm5TCP.cpp

@@ -41,7 +41,6 @@ m_szIPAddress(IPAddress)
 	m_usIPPort=usIPPort;
 	lastKnownSensorState = 0;
 	initSensorData = true;
-	reqState = Idle;
 	notificationEnabled = false;
 	m_bReceiverStarted = false;
 }
@@ -95,6 +94,7 @@ void Comm5TCP::OnDisconnect()
 void Comm5TCP::Do_Work()
 {
 	bool bFirstTime = true;
+	int count = 0;
 	while (!m_stoprequested)
 	{
 		m_LastHeartbeat = mytime(NULL);
@@ -111,6 +111,10 @@ void Comm5TCP::Do_Work()
 		{
 			sleep_milliseconds(40);
 			update();
+			if (count++ >= 100) {
+				count = 0;
+				querySensorState();
+			}
 		}
 	}
 	_log.Log(LOG_STATUS, "Comm5 MA-5XXX: TCP/IP Worker stopped...");
@@ -131,7 +135,6 @@ void Comm5TCP::processSensorData(const std::string& line)
 	}
 	lastKnownSensorState = sensorbitfield;
 	initSensorData = false;
-	reqState = Idle;
 }
 
 void Comm5TCP::ParseData(const unsigned char* data, const size_t len)
@@ -153,13 +156,8 @@ void Comm5TCP::ParseData(const unsigned char* data, const size_t len)
 				bool on = (relaybitfield & (1 << i)) != 0 ? true : false;
 				SendSwitch(i + 1, 1, 255, on, 0, "Relay " + boost::lexical_cast<std::string>(i + 1));
 			}
-			reqState = Idle;
-		} else if (reqState == QuerySensorState && startsWith(line, "210")) {
-			processSensorData(line);
-		} else if (startsWith(line, "210 OK")) {
-			// Command executed
-			reqState = Idle;
-		} else if (notificationEnabled && startsWith(line, "210")) {
+		}
+		else if (startsWith(line, "210") && (!startsWith(line, "210 OK"))) {
 			processSensorData(line);
 		} 
 	}
@@ -171,13 +169,11 @@ void Comm5TCP::ParseData(const unsigned char* data, const size_t len)
 void Comm5TCP::queryRelayState()
 {
 	write("OUTPUTS\n");
-	reqState = QueryRelayState;
 }
 
 void Comm5TCP::querySensorState()
 {
 	write("QUERY\n");
-	reqState = QuerySensorState;
 }
 
 void Comm5TCP::enableNotifications()

hardware/Comm5TCP.h

@@ -21,12 +21,6 @@ class Comm5TCP : public CDomoticzHardwareBase, ASyncTCP
 
 	bool Connect();
 
-	enum RequestState {
-		Idle,
-		QueryRelayState,
-		QuerySensorState
-	} reqState;
-
 protected:
 	void OnConnect();
 	void OnDisconnect();
@@ -50,7 +44,7 @@ class Comm5TCP : public CDomoticzHardwareBase, ASyncTCP
 
 	std::string buffer;
 	bool initSensorData;
-	int lastKnownSensorState;
+	unsigned int lastKnownSensorState;
 
 	bool notificationEnabled;