Небольщая правка типов. Исравлена ошибка в ModbusMaster "nbit"

extensions/ModbusMaster/MBExchange.h

@@ -92,10 +92,10 @@ class MBExchange:
 			public IOBase
 		{
 			// only for RTU
-			unsigned short nbit;             /*!< bit number) */
+			short nbit;				/*!< bit number (-1 - not used) */
 			VTypes::VType vType;    /*!< type of value */
-			unsigned short rnum;             /*!< count of registers */
-			unsigned short nbyte;            /*!< byte number (1-2) */
+			unsigned short rnum;    /*!< count of registers */
+			unsigned short nbyte;   /*!< byte number (1-2) */
 
 			RSProperty():
 				nbit(-1), vType(VTypes::vtUnknown),
@@ -152,8 +152,8 @@ class MBExchange:
 			MTR::MTRType mtrType;    /*!< тип регистра (согласно спецификации на MTR) */
 
 			// optimization
-			unsigned int q_num;      /*!< number in query */
-			unsigned int q_count;    /*!< count registers for query */
+			size_t q_num;      /*!< number in query */
+			size_t q_count;    /*!< count registers for query */
 
 			RegMap::iterator rit;
 

extensions/ModbusMaster/start_fg_mbtcp.sh

@@ -4,7 +4,7 @@
 --confile test.xml \
 --mbtcp-name MBMaster1 \
 --smemory-id SharedMemory \
---mbtcp-log-add-levels level4 \
+--mbtcp-log-add-levels level4,level3 \
 --mbtcp-set-prop-prefix \
 --mbtcp-filter-field rs \
 --mbtcp-filter-value 5 \
@@ -13,8 +13,8 @@
 --mbtcp-recv-timeout 900 \
 --mbtcp-polltime 200 \
 --mbtcp-polltime 200 \
---mbtcp-force-disconnect 1 \
 --mbtcp-force-out 1 \
+--mbtcp-persistent-connection 1 \
 --ulog-add-levels system \
 --mbtcp-run-logserver \
 $*

include/LT_Object.h

@@ -22,6 +22,7 @@
 #define Object_LT_H_
 //--------------------------------------------------------------------------
 #include <deque>
+#include <time.h>
 #include "UniSetTypes.h"
 #include "MessageType.h"
 #include "PassiveTimer.h"
@@ -138,7 +139,7 @@ class LT_Object
 		struct TimerInfo
 		{
 			TimerInfo(): id(0), curTimeMS(0), priority(UniSetTypes::Message::High) {};
-			TimerInfo(UniSetTypes::TimerId id, timeout_t timeMS, short cnt, UniSetTypes::Message::Priority p):
+			TimerInfo(UniSetTypes::TimerId id, timeout_t timeMS, clock_t cnt, UniSetTypes::Message::Priority p):
 				id(id),
 				curTimeMS(timeMS),
 				priority(p),

uniset2.includes

@@ -23,4 +23,4 @@ Utilities/codegen
 Utilities/codegen/tests
 Utilities/MBTester
 Utilities/NullController
-/usr/include/sigc++-2.0/
+/usr/include/sigc++-2.0