Merge branch 'master' of git.set:packages/uniset2

conf/test.xml

@@ -246,7 +246,7 @@
 			<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" />
 		</sensors>

extensions/ModbusSlave/MBSlave.cc

@@ -902,6 +902,9 @@ bool MBSlave::initItem( UniXML::iterator& it )
 
 	int mbfunc = IOBase::initIntProp(it, "mbfunc", prop_prefix, false, default_mbfunc);
 
+	if( !checkMBFunc )
+		mbfunc = default_mbfunc;
+
 	p.regID = ModbusRTU::genRegID(p.mbreg, mbfunc);
 
 	p.amode = MBSlave::amRW;
@@ -1636,10 +1639,15 @@ ModbusRTU::mbErrCode MBSlave::much_real_read( const ModbusRTU::ModbusData reg, M
 // -------------------------------------------------------------------------
 ModbusRTU::mbErrCode MBSlave::real_read( const ModbusRTU::ModbusData reg, ModbusRTU::ModbusData& val, const int fn )
 {
+	ModbusRTU::RegID regID = checkMBFunc ? genRegID(reg, fn) : genRegID(reg, default_mbfunc);
+
 	dinfo << myname << "(real_read): read mbID="
-		  << ModbusRTU::dat2str(reg) << "(" << (int)reg << ")"  << " fn=" << fn << endl;
+		  << ModbusRTU::dat2str(reg) << "(" << (int)reg << ")"  << " fn=" << fn
+		  << " regID=" << regID
+		  << " default_mbfunc=" << default_mbfunc
+		  << " checkMBFunc=" << checkMBFunc
+		  << endl;
 
-	ModbusRTU::RegID regID = checkMBFunc ? genRegID(reg, fn) : genRegID(reg, default_mbfunc);
 
 	auto it = iomap.find(regID);
 	return real_read_it(it, val);