(ModbusMaster): отключил лишнее в тестах

conf/test.xml

@@ -246,10 +246,12 @@
 			<item id="58" iotype="AO" name="Lamp58_C" textname="Lamp 58" rrd="1" rrd1_ds="GAUGE:20:U:U"/>
 			<item id="62" iotype="AI" name="LogLevel_S" textname="LogLevel control"/>
 			<item id="63" iotype="AI" name="SVU_AskCount_AS" textname="svu asl count"/>
-			<item id="64" iotype="AI" name="AI64_AS" textname="AI64" mbaddr="0x01" mbfunc="0x03" mbreg="64" mbtype="rtu" rs="5"/>
+			<item id="64" iotype="AI" name="AI64_AS" textname="AI64" mbaddr="0x01" mbfunc="0x03" mbreg="64" mbtype="rtu" rs="5" tcp="6"/>
 			<item id="66" iotype="DI" name="DI66_AS" textname="DI66" mbaddr="0x01" mbfunc="0x01" mbreg="66" mbtype="rtu" rs="5"/>
 			<item id="65" iotype="DI" name="D65_S" textname="D65" threshold_aid="AI64_AS" lowlimit="3" hilimit="5" threshold_invert="1" rs="5" />
 			<item id="100" iotype="AI" name="AI100_AS" textname="AI100" mbaddr="0x01" mbfunc="0x03" mbreg="100" mbtype="rtu" tcp="6" vtype="F2"/>
+			<item id="101" iotype="AI" name="AI101_AS" textname="AI101" mbaddr="0x01" mbfunc="0x03" mbreg="102" mbtype="rtu" tcp="6"/>
+			<item id="102" iotype="AI" name="AI102_AS" textname="AI102" mbaddr="0x01" mbfunc="0x03" mbreg="99" mbtype="rtu" tcp="6"/>
 		</sensors>
 		<thresholds name="thresholds">
 			<sensor iotype="AI" name="AI_AS">

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

@@ -107,6 +107,10 @@
 			<item id="1025" mb="1" mbtype="rtu" mbaddr="0x01" mbreg="39" mbfunc="0x0F" iotype="DO" name="TestWrite0F_2" textname="Тестовый регистр для 0x0F"/>
 			<item id="1026" mb="1" mbtype="rtu" mbaddr="0x01" mbreg="40" mbfunc="0x0F" iotype="DO" name="TestWrite0F_3" textname="Тестовый регистр для 0x0F"/>
 
+<!--			<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="10000" iotype="DI" name="TestMode_S" textname="Тестовый датчик"/>
 

extensions/ModbusMaster/tests/run_test_mbtcpmaster.sh

@@ -15,8 +15,7 @@ cd -
 --mbtcp-filter-value 1 \
 --mbtcp-gateway-iaddr localhost \
 --mbtcp-gateway-port 20048 \
---mbtcp-polltime 50 --mbtcp-recv-timeout 500 \
-$*
+--mbtcp-polltime 50 --mbtcp-recv-timeout 500
 #--mbtcp-default-mbinit-ok 1
 #--dlog-add-levels any
 

extensions/ModbusMaster/tests/test_mbtcpmaster.cc

@@ -571,3 +571,41 @@ TEST_CASE("MBTCPMaster: 0x66 (file transfer)", "[modbus][0x66][mbmaster][mbtcpma
 	WARN("Test of '0x66'..not yet.. ");
 }
 // -----------------------------------------------------------------------------
+#if 0
+TEST_CASE("MBTCPMaster: 0x10 (F2)", "[modbus][0x10][F2][mbmaster][mbtcpmaster]")
+{
+	InitTest();
+
+	ui->setValue(1027, 100);
+	REQUIRE( ui->getValue(1027) == 100 );
+	msleep(polltime + 200);
+	ModbusRTU::WriteOutputMessage q = mbs->getLastWriteOutput();
+	REQUIRE( q.addr == slaveADDR );
+	REQUIRE( q.start == 41 );
+	REQUIRE( q.quant == 2 );
+
+	VTypes::F2 f2(q.data,VTypes::F2::wsize());
+	float f = f2;
+	REQUIRE( f == 100 );
+}
+// -----------------------------------------------------------------------------
+TEST_CASE("MBTCPMaster: 0x10 (F4)", "[modbus][0x10][F4][mbmaster][mbtcpmaster]")
+{
+	InitTest();
+
+	long v = 10000000;
+
+	ui->setValue(1028, v);
+	REQUIRE( ui->getValue(1028) == v );
+	msleep(polltime + 200);
+	ModbusRTU::WriteOutputMessage q = mbs->getLastWriteOutput();
+	REQUIRE( q.addr == slaveADDR );
+	REQUIRE( q.start == 45 );
+	REQUIRE( q.quant == 4 );
+
+	VTypes::F4 f4(q.data,VTypes::F4::wsize());
+	float f = f4;
+	REQUIRE( f == v );
+}
+#endif
+// -----------------------------------------------------------------------------