Доделал предварительную версию uniset-smemory-plus

conf/test.xml

@@ -100,7 +100,7 @@
 		<sensors name="Sensors">
 			<item db_ignore="1" default="1" id="1" iotype="DI" name="Input1_S" priority="Medium" textname="Команда 1"/>
 			<item id="2" iotype="DI" mbaddr="0x01" mbfunc="0x04" mbreg="0x02" mbtype="rtu" name="Input2_S" priority="Medium" rs="2" textname="Команда 2"/>
-			<item id="3" iotype="DI" mbtcp="1" mbtcp_mbaddr="0x02" mbtcp_mbfunc="0x03" mbtcp_mbreg="0x02" mbtcp_mbtype="rtu" mbtcp_preinit="1" name="Input3_S" priority="Medium" textname="Команда 3"/>
+			<item id="3" iotype="DI"  mbtcp="1" mbtcp_mbaddr="0x02" mbtcp_mbfunc="0x03" mbtcp_mbreg="0x02" mbtcp_mbtype="rtu" name="Input3_S" priority="Medium" textname="Команда 3"/>
 			<item id="4" iotype="DI" mbaddr="0x02" mbfunc="0x04" mbreg="0x02" mbtype="rtu" name="Input4_S" priority="Medium" rs="2" textname="Команда 4"/>
 			<item id="5" iotype="DI" name="Input5_S" priority="Medium" textname="Команда 5" udp="2"/>
 			<item id="6" iotype="DI" name="Input6_S" priority="Medium" textname="Команда 6" udp="2">
@@ -117,7 +117,7 @@
 					<consumer name="PLCProcessor" type="objects"/>
 				</consumers>
 			</item>
-			<item id="30044" iotype="DI" name="DI1_S" priority="Medium" rs="1" rs_mbaddr="0x01" rs_mbfunc="0x02" rs_mbreg="30044" rs_mbtype="rtu" textname="Test DI sensor"/>
+			<item id="30044" iotype="DI" depend="AlarmFuse2_AS" depend_value="3" name="DI1_S" priority="Medium" rs="1" rs_mbaddr="0x01" rs_mbfunc="0x02" rs_mbreg="30044" rs_mbtype="rtu" textname="Test DI sensor"/>
 			<item id="30045" iotype="DI" name="DI2_S" priority="Medium" rs="1" rs_mbaddr="0x01" rs_mbfunc="0x02" rs_mbreg="30045" rs_mbtype="rtu" textname="Test DI sensor"/>
 			<item id="13" iotype="DI" name="Threshold1_S" priority="Medium" textname="Порог"/>
 			<item id="14" iotype="DI" name="TestMode_S" priority="Medium" textname="test"/>

extensions/SharedMemoryPlus/Makefile.am

 bin_PROGRAMS 		= @PACKAGE@-smemory-plus
 
 @PACKAGE@_smemory_plus_LDADD 		= $(top_builddir)/lib/libUniSet.la \
-	$(top_builddir)/extensions/RTUExchange/libUniSetRTU.la \
+	$(top_builddir)/extensions/UNetUDP/libUniSetUNetUDP.la \
+	$(top_builddir)/extensions/ModbusMaster/libUniSetMBTCPMaster.la \
+	$(top_builddir)/extensions/ModbusMaster/libUniSetRTU.la \
 	$(top_builddir)/extensions/ModbusSlave/libUniSetMBSlave.la \
 	$(top_builddir)/extensions/IOControl/libUniSetIOControl.la \
 	$(top_builddir)/extensions/SharedMemory/libUniSetSharedMemory.la \
@@ -9,7 +11,8 @@ bin_PROGRAMS 		= @PACKAGE@-smemory-plus
 	$(SIGC_LIBS)
 
 @PACKAGE@_smemory_plus_CXXFLAGS	= -I$(top_builddir)/extensions/CanNetwork \
-	-I$(top_builddir)/extensions/RTUExchange \
+	-I$(top_builddir)/extensions/UNetUDP \
+	-I$(top_builddir)/extensions/ModbusMaster \
 	-I$(top_builddir)/extensions/ModbusSlave \
 	-I$(top_builddir)/extensions/IOControl \
 	-I$(top_builddir)/extensions/SharedMemory \

extensions/SharedMemoryPlus/start_fg.sh

@@ -5,7 +5,6 @@ START=uniset-start.sh
 
 ${START} -f ./uniset-smemory-plus --smemory-id SharedMemory  --confile test.xml \
 	 --unideb-add-levels info,crit,warn,level9,system,level3,level2,level1 \
-	 --add-io \
 	 --io-name IOControl \
 	 --io-polltime 100 \
 	 --io-s-filter-field io \
@@ -14,7 +13,15 @@ ${START} -f ./uniset-smemory-plus --smemory-id SharedMemory  --confile test.xml
 	 --iodev2 /dev/null \
 	 --io-test-lamp RS_Test9_S \
 	 --io-heartbeat-id AI_AS \
-	 --io-sm-ready-test-sid RS_Test9_S 
+	 --io-sm-ready-test-sid RS_Test9_S \
+     --add-mbmaster \
+     --mbtcp-name MBMaster1 \
+     --mbtcp-filter-field rs \
+     --mbtcp-filter-value 1 \
+     --mbtcp-gateway-iaddr localhost \
+     --mbtcp-gateway-port 2048 \
+     --mbtcp-recv-timeout 200 \
+     --mbtcp-force-out 1 \
 #	 --add-rtu \
 #	 --rs-dev /dev/cbsideA1 \
 #	 --rs-id RTUExchange \