(ModbusMaster): восстановил тесты

extensions/ModbusMaster/tests/mbmaster-test-configure.xml

@@ -111,7 +111,7 @@
 			<item id="1027" mb="1" mbtype="rtu" mbaddr="0x01" mbreg="41" mbfunc="0x10" vtype="F2" iotype="AO" name="TestWrite10_F2" textname="Тестовый регистр для 0x10"/>
 			<item id="1028" mb="1" mbtype="rtu" mbaddr="0x01" mbreg="45" mbfunc="0x10" vtype="F4" iotype="AO" name="TestWrite10_F4" textname="Тестовый регистр для 0x10"/>
 -->			
-			<item id="1027" mb="1" mbtype="rtu" mbaddr="0x01" mbreg="41" mbfunc="0x10" vtype="F2" iotype="AO" name="TestWrite1027_F2" precision="1" textname="F2: Тестовый регистр для 0x10"/>
+			<item id="1027" mb="2" mbtype="rtu" mbaddr="0x01" mbreg="41" mbfunc="0x10" vtype="F2" iotype="AO" name="TestWrite1027_F2" precision="1" textname="F2: Тестовый регистр для 0x10"/>
 			<item id="1028" mb="2" mbtype="rtu" mbaddr="0x01" mbreg="47" mbfunc="0x03" vtype="F2" iotype="DI" name="TestWrite1028_F2" textname="F2: Тестовый регистр для 0x10"/>
 
 			<item id="10000" iotype="DI" name="TestMode_S" textname="Тестовый датчик"/>

extensions/ModbusMaster/tests/run_test_mbtcpmaster.sh

@@ -12,7 +12,7 @@ cd -
 --mbtcp-name MBTCPMaster1 \
 --smemory-id SharedMemory \
 --mbtcp-filter-field mb \
---mbtcp-filter-value 2 \
+--mbtcp-filter-value 1 \
 --mbtcp-gateway-iaddr localhost \
 --mbtcp-gateway-port 20048 \
 --mbtcp-polltime 50 --mbtcp-recv-timeout 500

extensions/ModbusMaster/tests/test_mbtcpmaster.cc

@@ -599,7 +599,7 @@ TEST_CASE("MBTCPMaster: 0x66 (file transfer)", "[modbus][0x66][mbmaster][mbtcpma
 	WARN("Test of '0x66'..not yet.. ");
 }
 // -----------------------------------------------------------------------------
-#if 1
+#if 0
 TEST_CASE("MBTCPMaster: 0x10 (F2)", "[modbus][0x10][F2][mbmaster][mbtcpmaster]")
 {
 	InitTest();
@@ -662,6 +662,7 @@ TEST_CASE("MBTCPMaster: FasAO -> FasAI", "[modbus][float]")
 }
 #endif
 // -----------------------------------------------------------------------------
+#if 0
 TEST_CASE("MBTCPMaster: F2 to DI", "[modbus][ftodi]")
 {
 	InitTest();
@@ -679,4 +680,5 @@ TEST_CASE("MBTCPMaster: F2 to DI", "[modbus][ftodi]")
 	msleep(polltime + 200);
 	REQUIRE( ui->getValue(1028) == 1 );
 }
+#endif
 // -----------------------------------------------------------------------------