(RSExchange): попытка исправить задержку возникающую при обмене.

4fab1e66 · Pavel Vainerman · ed152269 · 4fab1e66 · 4fab1e66
Commit 4fab1e66 authored Aug 06, 2013 by Pavel Vainerman
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 5 deletions

MBTCPMaster.cc extensions/ModbusMaster/MBTCPMaster.cc +1 -1

RTUExchange.cc extensions/ModbusMaster/RTUExchange.cc +1 -4

No files found.
--- a/extensions/ModbusMaster/MBTCPMaster.cc
+++ b/extensions/ModbusMaster/MBTCPMaster.cc
@@ -145,7 +145,7 @@ void MBTCPMaster::poll_thread()
 	{
 		try
 		{
-			if( sidExchangeMode != DefaultObjectId && force_out )
+			if( sidExchangeMode != DefaultObjectId && force )
 				exchangeMode = shm->localGetValue(aitExchangeMode,sidExchangeMode);
 		}
 		catch(...){}

--- a/extensions/ModbusMaster/RTUExchange.cc
+++ b/extensions/ModbusMaster/RTUExchange.cc
@@ -157,15 +157,12 @@ void RTUExchange::step()
 {
 	try
 	{
-		if( sidExchangeMode != DefaultObjectId && force_out )
+		if( sidExchangeMode != DefaultObjectId && force )
 			exchangeMode = shm->localGetValue(aitExchangeMode,sidExchangeMode);
 	}
 	catch(...){}

-	{
-		uniset_mutex_lock l(pollMutex,2000);
 	poll();
-	}

 	MBExchange::step();
 }