[modbusmaster][reload config]: first prototype

extensions/ModbusMaster/MBTCPMaster.cc

@@ -37,9 +37,9 @@ MBTCPMaster::MBTCPMaster(uniset::ObjectId objId, uniset::ObjectId shmId,
 
     auto conf = uniset_conf();
 
-    // префикс для "свойств" - по умолчанию "tcp_";
-    prop_prefix = initPropPrefix("tcp_");
-    mbinfo << myname << "(init): prop_prefix=" << prop_prefix << endl;
+	// префикс для "свойств" - по умолчанию "tcp_";
+	mbconf->prop_prefix = initPropPrefix(mbconf->s_field, "tcp_");
+	mbinfo << myname << "(init): prop_prefix=" << mbconf->prop_prefix << endl;
 
     UniXML::iterator it(cnode);
 
@@ -61,23 +61,16 @@ MBTCPMaster::MBTCPMaster(uniset::ObjectId objId, uniset::ObjectId shmId,
     force_disconnect = conf->getArgInt("--" + prefix + "-persistent-connection", it.getProp("persistent_connection")) ? false : true;
     mbinfo << myname << "(init): persisten-connection=" << (!force_disconnect) << endl;
 
-    if( shm->isLocalwork() )
-    {
-        readConfiguration();
-
-        if( !noQueryOptimization )
-            rtuQueryOptimization(devices);
-
-        initDeviceList();
-    }
-    else
-        ic->addReadItem( sigc::mem_fun(this, &MBTCPMaster::readItem) );
+	if( shm->isLocalwork() )
+		mbconf->loadConfig(conf->getConfXML(), conf->getXMLSensorsSection());
+	else
+		ic->addReadItem( sigc::mem_fun(this, &MBTCPMaster::readItem) );
 
     pollThread = unisetstd::make_unique<ThreadCreator<MBTCPMaster>>(this, &MBTCPMaster::poll_thread);
     pollThread->setFinalAction(this, &MBTCPMaster::final_thread);
 
-    if( mblog->is_info() )
-        printMap(devices);
+	if( mblog->is_info() )
+		MBConfig::printMap(mbconf->devices);
 }
 // -----------------------------------------------------------------------------
 MBTCPMaster::~MBTCPMaster()
@@ -112,11 +105,11 @@ std::shared_ptr<ModbusClient> MBTCPMaster::initMB( bool reopen )
     mbtcp->connect(iaddr, port);
     mbtcp->setForceDisconnect(force_disconnect);
 
-    if( recv_timeout > 0 )
-        mbtcp->setTimeout(recv_timeout);
+	if( mbconf->recv_timeout > 0 )
+		mbtcp->setTimeout(mbconf->recv_timeout);
 
-    mbtcp->setSleepPause(sleepPause_msec);
-    mbtcp->setAfterSendPause(aftersend_pause);
+	mbtcp->setSleepPause(mbconf->sleepPause_msec);
+	mbtcp->setAfterSendPause(mbconf->aftersend_pause);
 
     mbinfo << myname << "(init): ipaddr=" << iaddr << " port=" << port
            << " connection=" << (mbtcp->isConnection() ? "OK" : "FAIL" ) << endl;
@@ -147,45 +140,45 @@ void MBTCPMaster::final_thread()
 // -----------------------------------------------------------------------------
 void MBTCPMaster::poll_thread()
 {
-    // ждём начала работы..(см. MBExchange::activateObject)
-    while( !isProcActive() && !canceled )
-    {
-        uniset::uniset_rwmutex_rlock l(mutex_start);
-    }
-
-    //  if( canceled )
-    //      return;
-
-    // работаем
-    while( isProcActive() )
-    {
-        try
-        {
-            if( sidExchangeMode != DefaultObjectId && force )
-                exchangeMode = shm->localGetValue(itExchangeMode, sidExchangeMode);
-        }
-        catch(...)
-        {
-            throw;
-        }
-
-        try
-        {
-            poll();
-        }
-        catch(...)
-        {
-            //            if( !checkProcActive() )
-            throw;
-        }
-
-        if( !isProcActive() )
-            break;
-
-        msleep(polltime);
-    }
-
-    dinfo << myname << "(poll_thread): thread finished.." << endl;
+	// ждём начала работы..(см. MBExchange::activateObject)
+	while( !isProcActive() && !canceled )
+	{
+		uniset::uniset_rwmutex_rlock l(mutex_start);
+	}
+
+	//	if( canceled )
+	//		return;
+
+	// работаем
+	while( isProcActive() )
+	{
+		try
+		{
+			if( sidExchangeMode != DefaultObjectId && force )
+				exchangeMode = shm->localGetValue(itExchangeMode, sidExchangeMode);
+		}
+		catch(...)
+		{
+			throw;
+		}
+
+		try
+		{
+			poll();
+		}
+		catch(...)
+		{
+			//            if( !checkProcActive() )
+			throw;
+		}
+
+		if( !isProcActive() )
+			break;
+
+		msleep(mbconf->polltime);
+	}
+
+	dinfo << myname << "(poll_thread): thread finished.." << endl;
 }
 // -----------------------------------------------------------------------------
 bool MBTCPMaster::deactivateObject()

extensions/ModbusMaster/Makefile.am

@@ -4,7 +4,7 @@ libMBMaster_la_LIBADD	= $(top_builddir)/lib/libUniSet2.la \
 								$(top_builddir)/extensions/lib/libUniSet2Extensions.la \
 								$(SIGC_LIBS)
 libMBMaster_la_CXXFLAGS	= -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS)
-libMBMaster_la_SOURCES 	= MBExchange.cc RTUStorage.cc
+libMBMaster_la_SOURCES 	= MBExchange.cc MBConfig.cc RTUStorage.cc
 
 bin_PROGRAMS 		= @PACKAGE@-mbtcpmaster @PACKAGE@-mbtcpmultimaster @PACKAGE@-rtuexchange @PACKAGE@-mtr-conv @PACKAGE@-rtu188-state @PACKAGE@-vtconv @PACKAGE@-mtr-setup @PACKAGE@-mtr-read
 lib_LTLIBRARIES 	= libUniSet2MBTCPMaster.la libUniSet2RTU.la

extensions/ModbusMaster/RTUExchange.h

@@ -53,9 +53,7 @@ namespace uniset
 
             virtual void step() override;
             virtual bool poll() override;
-
-            virtual std::shared_ptr<ModbusClient> initMB( bool reopen = false ) override;
-            virtual bool initDeviceInfo( RTUDeviceMap& m, ModbusRTU::ModbusAddr a, UniXML::iterator& it ) override;
+			virtual std::shared_ptr<ModbusClient> initMB( bool reopen = false ) override;
 
         private:
             RTUExchange();

extensions/ModbusMaster/start_fg_mbtcp.sh

@@ -16,6 +16,7 @@
 --mbtcp-persistent-connection 1 \
 --ulog-add-levels system \
 --mbtcp-run-logserver \
+--mbtcp-log-add-levels any \
 $*
 
 #--mbtcp-log-add-levels level4,level3 \

extensions/ModbusMaster/tests/MBTCPTestServer.h

@@ -10,133 +10,127 @@
 /*! Реализация MBTCPTestServer для тестирования */
 class MBTCPTestServer
 {
-    public:
-        MBTCPTestServer( const std::unordered_set<uniset::ModbusRTU::ModbusAddr>& vaddr, const std::string& inetaddr, int port = 502, bool verbose = false );
-        ~MBTCPTestServer();
-
-        inline void setVerbose( bool state )
-        {
-            verbose = state;
-        }
-
-        inline void setReply( uint32_t val )
-        {
-            replyVal = val;
-        }
-
-        inline void setIgnoreAddrMode( bool state )
-        {
-            if( sslot )
-                sslot->setIgnoreAddrMode(state);
-        }
-
-        void execute();    /*!< основной цикл работы */
-        void setLog( std::shared_ptr<DebugStream> dlog );
-
-        inline bool isRunning()
-        {
-            return ( sslot && sslot->isActive() );
-        }
-
-        inline void disableExchange( bool set = true )
-        {
-            disabled = set;
-        }
-
-        inline bool getForceSingleCoilCmd()
-        {
-            return forceSingleCoilCmd;
-        }
-        inline int16_t getLastWriteOutputSingleRegister()
-        {
-            return lastWriteOutputSingleRegister;
-        }
-        inline uniset::ModbusRTU::ForceCoilsMessage getLastForceCoilsQ()
-        {
-            return lastForceCoilsQ;
-        }
-        inline uniset::ModbusRTU::WriteOutputMessage getLastWriteOutput()
-        {
-            return lastWriteOutputQ;
-        }
-
-        friend std::ostream& operator<<(std::ostream& os, const MBTCPTestServer* m );
-
-        inline float getF2TestValue()
-        {
-            return f2_test_value;
-        }
-
-    protected:
-        // действия при завершении работы
-        void sigterm( int signo );
-
-        /*! обработка 0x01 */
-        uniset::ModbusRTU::mbErrCode readCoilStatus( uniset::ModbusRTU::ReadCoilMessage& query,
-                uniset::ModbusRTU::ReadCoilRetMessage& reply );
-        /*! обработка 0x02 */
-        uniset::ModbusRTU::mbErrCode readInputStatus( uniset::ModbusRTU::ReadInputStatusMessage& query,
-                uniset::ModbusRTU::ReadInputStatusRetMessage& reply );
-
-        /*! обработка 0x03 */
-        uniset::ModbusRTU::mbErrCode readOutputRegisters( uniset::ModbusRTU::ReadOutputMessage& query,
-                uniset::ModbusRTU::ReadOutputRetMessage& reply );
-
-        /*! обработка 0x04 */
-        uniset::ModbusRTU::mbErrCode readInputRegisters( uniset::ModbusRTU::ReadInputMessage& query,
-                uniset::ModbusRTU::ReadInputRetMessage& reply );
-
-        /*! обработка 0x05 */
-        uniset::ModbusRTU::mbErrCode forceSingleCoil( uniset::ModbusRTU::ForceSingleCoilMessage& query,
-                uniset::ModbusRTU::ForceSingleCoilRetMessage& reply );
-
-        /*! обработка 0x0F */
-        uniset::ModbusRTU::mbErrCode forceMultipleCoils( uniset::ModbusRTU::ForceCoilsMessage& query,
-                uniset::ModbusRTU::ForceCoilsRetMessage& reply );
-
-
-        /*! обработка 0x10 */
-        uniset::ModbusRTU::mbErrCode writeOutputRegisters( uniset::ModbusRTU::WriteOutputMessage& query,
-                uniset::ModbusRTU::WriteOutputRetMessage& reply );
-
-        /*! обработка 0x06 */
-        uniset::ModbusRTU::mbErrCode writeOutputSingleRegister( uniset::ModbusRTU::WriteSingleOutputMessage& query,
-                uniset::ModbusRTU::WriteSingleOutputRetMessage& reply );
-
-
-        uniset::ModbusRTU::mbErrCode diagnostics( uniset::ModbusRTU::DiagnosticMessage& query,
-                uniset::ModbusRTU::DiagnosticRetMessage& reply );
-
-        uniset::ModbusRTU::mbErrCode read4314( uniset::ModbusRTU::MEIMessageRDI& query,
-                                               uniset::ModbusRTU::MEIMessageRetRDI& reply );
-
-        /*! обработка запросов на чтение ошибок */
-        uniset::ModbusRTU::mbErrCode journalCommand( uniset::ModbusRTU::JournalCommandMessage& query,
-                uniset::ModbusRTU::JournalCommandRetMessage& reply );
-
-        /*! обработка запроса на установку времени */
-        uniset::ModbusRTU::mbErrCode setDateTime( uniset::ModbusRTU::SetDateTimeMessage& query,
-                uniset::ModbusRTU::SetDateTimeRetMessage& reply );
-
-        /*! обработка запроса удалённого сервиса */
-        uniset::ModbusRTU::mbErrCode remoteService( uniset::ModbusRTU::RemoteServiceMessage& query,
-                uniset::ModbusRTU::RemoteServiceRetMessage& reply );
-
-        uniset::ModbusRTU::mbErrCode fileTransfer( uniset::ModbusRTU::FileTransferMessage& query,
-                uniset::ModbusRTU::FileTransferRetMessage& reply );
-
-
-        /*! интерфейс ModbusSlave для обмена по RS */
-        uniset::ModbusTCPServerSlot* sslot;
-        std::unordered_set<uniset::ModbusRTU::ModbusAddr> vaddr; /*!< адреса данного узла */
-
-        bool verbose;
-        uint32_t replyVal;
-        bool forceSingleCoilCmd;
-        int16_t lastWriteOutputSingleRegister;
-        uniset::ModbusRTU::ForceCoilsMessage lastForceCoilsQ;
-        uniset::ModbusRTU::WriteOutputMessage lastWriteOutputQ;
-        float f2_test_value = {0.0};
+	public:
+		MBTCPTestServer( const std::unordered_set<uniset::ModbusRTU::ModbusAddr>& vaddr, const std::string& inetaddr, int port = 502, bool verbose = false );
+		~MBTCPTestServer();
+
+		inline void setVerbose( bool state )
+		{
+			verbose = state;
+		}
+
+		inline void setReply( uint32_t val )
+		{
+			replyVal = val;
+		}
+
+		void execute();    /*!< основной цикл работы */
+		void setLog( std::shared_ptr<DebugStream> dlog );
+
+		inline bool isRunning()
+		{
+			return ( sslot && sslot->isActive() );
+		}
+
+		inline void disableExchange( bool set = true )
+		{
+			disabled = set;
+		}
+
+		inline bool getForceSingleCoilCmd()
+		{
+			return forceSingleCoilCmd;
+		}
+		inline int16_t getLastWriteOutputSingleRegister()
+		{
+			return lastWriteOutputSingleRegister;
+		}
+		inline uniset::ModbusRTU::ForceCoilsMessage getLastForceCoilsQ()
+		{
+			return lastForceCoilsQ;
+		}
+		inline uniset::ModbusRTU::WriteOutputMessage getLastWriteOutput()
+		{
+			return lastWriteOutputQ;
+		}
+
+		friend std::ostream& operator<<(std::ostream& os, const MBTCPTestServer* m );
+
+		inline float getF2TestValue()
+		{
+			return f2_test_value;
+		}
+
+	protected:
+		// действия при завершении работы
+		void sigterm( int signo );
+
+		/*! обработка 0x01 */
+		uniset::ModbusRTU::mbErrCode readCoilStatus( uniset::ModbusRTU::ReadCoilMessage& query,
+				uniset::ModbusRTU::ReadCoilRetMessage& reply );
+		/*! обработка 0x02 */
+		uniset::ModbusRTU::mbErrCode readInputStatus( uniset::ModbusRTU::ReadInputStatusMessage& query,
+				uniset::ModbusRTU::ReadInputStatusRetMessage& reply );
+
+		/*! обработка 0x03 */
+		uniset::ModbusRTU::mbErrCode readOutputRegisters( uniset::ModbusRTU::ReadOutputMessage& query,
+				uniset::ModbusRTU::ReadOutputRetMessage& reply );
+
+		/*! обработка 0x04 */
+		uniset::ModbusRTU::mbErrCode readInputRegisters( uniset::ModbusRTU::ReadInputMessage& query,
+				uniset::ModbusRTU::ReadInputRetMessage& reply );
+
+		/*! обработка 0x05 */
+		uniset::ModbusRTU::mbErrCode forceSingleCoil( uniset::ModbusRTU::ForceSingleCoilMessage& query,
+				uniset::ModbusRTU::ForceSingleCoilRetMessage& reply );
+
+		/*! обработка 0x0F */
+		uniset::ModbusRTU::mbErrCode forceMultipleCoils( uniset::ModbusRTU::ForceCoilsMessage& query,
+				uniset::ModbusRTU::ForceCoilsRetMessage& reply );
+
+
+		/*! обработка 0x10 */
+		uniset::ModbusRTU::mbErrCode writeOutputRegisters( uniset::ModbusRTU::WriteOutputMessage& query,
+				uniset::ModbusRTU::WriteOutputRetMessage& reply );
+
+		/*! обработка 0x06 */
+		uniset::ModbusRTU::mbErrCode writeOutputSingleRegister( uniset::ModbusRTU::WriteSingleOutputMessage& query,
+				uniset::ModbusRTU::WriteSingleOutputRetMessage& reply );
+
+
+		uniset::ModbusRTU::mbErrCode diagnostics( uniset::ModbusRTU::DiagnosticMessage& query,
+				uniset::ModbusRTU::DiagnosticRetMessage& reply );
+
+		uniset::ModbusRTU::mbErrCode read4314( uniset::ModbusRTU::MEIMessageRDI& query,
+											   uniset::ModbusRTU::MEIMessageRetRDI& reply );
+
+		/*! обработка запросов на чтение ошибок */
+		uniset::ModbusRTU::mbErrCode journalCommand( uniset::ModbusRTU::JournalCommandMessage& query,
+				uniset::ModbusRTU::JournalCommandRetMessage& reply );
+
+		/*! обработка запроса на установку времени */
+		uniset::ModbusRTU::mbErrCode setDateTime( uniset::ModbusRTU::SetDateTimeMessage& query,
+				uniset::ModbusRTU::SetDateTimeRetMessage& reply );
+
+		/*! обработка запроса удалённого сервиса */
+		uniset::ModbusRTU::mbErrCode remoteService( uniset::ModbusRTU::RemoteServiceMessage& query,
+				uniset::ModbusRTU::RemoteServiceRetMessage& reply );
+
+		uniset::ModbusRTU::mbErrCode fileTransfer( uniset::ModbusRTU::FileTransferMessage& query,
+				uniset::ModbusRTU::FileTransferRetMessage& reply );
+
+
+		/*! интерфейс ModbusSlave для обмена по RS */
+		uniset::ModbusTCPServerSlot* sslot;
+		std::unordered_set<uniset::ModbusRTU::ModbusAddr> vaddr; /*!< адреса данного узла */
+
+		bool verbose;
+		uint32_t replyVal;
+		bool forceSingleCoilCmd;
+		int16_t lastWriteOutputSingleRegister;
+		uniset::ModbusRTU::ForceCoilsMessage lastForceCoilsQ;
+		uniset::ModbusRTU::WriteOutputMessage lastWriteOutputQ;
+		float f2_test_value = {0.0};
 
 #if 0
         typedef std::map<uniset::ModbusRTU::mbErrCode, unsigned int> ExchangeErrorMap;

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

@@ -124,15 +124,17 @@
 			<item id="1054" safeval="1" mb="1" mbtype="rtu" mbaddr="0x02" mbreg="11" mbfunc="0x02" iotype="DI" name="SafeMode2_TestRead02" textname="(safemode): Тестовый регистр для 0x02"/>
 
             <!-- query optimization test -->
-            <item id="1060" mb="1" mbtype="rtu" mbaddr="0x01" mbreg="200" mbfunc="0x03" vtype="F2" iotype="AI" name="TestQueryOptimization1_F2" textname="F2: Тестовый регистр для 0x03"/>
-            <item id="1061" mb="1" mbtype="rtu" mbaddr="0x01" mbreg="202" mbfunc="0x03" vtype="F2" iotype="AI" name="TestQueryOptimization2_F2" textname="F2: Тестовый регистр для 0x03"/>
-            <item id="1062" mb="1" mbtype="rtu" mbaddr="0x01" mbreg="204" mbfunc="0x03" vtype="F2" iotype="AI" name="TestQueryOptimization3_F2" textname="F2: Тестовый регистр для 0x03"/>
-            <item id="1063" mb="1" mbtype="rtu" mbaddr="0x01" mbreg="206" mbfunc="0x03" vtype="F2" iotype="AI" name="TestQueryOptimization4_F2" textname="F2: Тестовый регистр для 0x03"/>
-            <item id="1064" mb="1" mbtype="rtu" mbaddr="0x01" mbreg="208" mbfunc="0x03" vtype="F2" iotype="AI" name="TestQueryOptimization5_F2" textname="F2: Тестовый регистр для 0x03"/>
-            <item id="1065" mb="1" mbtype="rtu" mbaddr="0x01" mbreg="210" mbfunc="0x03" vtype="F2" iotype="AI" name="TestQueryOptimization6_F2" textname="F2: Тестовый регистр для 0x03"/>
+			<item id="1060" mb="1" mbtype="rtu" mbaddr="0x01" mbreg="200" mbfunc="0x03" vtype="F2" iotype="AI" name="TestQueryOptimization1_F2" textname="F2: Тестовый регистр для 0x03"/>
+			<item id="1061" mb="1" mbtype="rtu" mbaddr="0x01" mbreg="202" mbfunc="0x03" vtype="F2" iotype="AI" name="TestQueryOptimization2_F2" textname="F2: Тестовый регистр для 0x03"/>
+			<item id="1062" mb="1" mbtype="rtu" mbaddr="0x01" mbreg="204" mbfunc="0x03" vtype="F2" iotype="AI" name="TestQueryOptimization3_F2" textname="F2: Тестовый регистр для 0x03"/>
+			<item id="1063" mb="1" mbtype="rtu" mbaddr="0x01" mbreg="206" mbfunc="0x03" vtype="F2" iotype="AI" name="TestQueryOptimization4_F2" textname="F2: Тестовый регистр для 0x03"/>
+			<item id="1064" mb="1" mbtype="rtu" mbaddr="0x01" mbreg="208" mbfunc="0x03" vtype="F2" iotype="AI" name="TestQueryOptimization5_F2" textname="F2: Тестовый регистр для 0x03"/>
+			<item id="1065" mb="1" mbtype="rtu" mbaddr="0x01" mbreg="210" mbfunc="0x03" vtype="F2" iotype="AI" name="TestQueryOptimization6_F2" textname="F2: Тестовый регистр для 0x03"/>
 
             <!-- undefined state -->
-            <item id="1070" mb="1" mbtype="rtu" mbaddr="0x01" mbreg="240" mbfunc="0x03" default="150" undefined_value="65535" breaklim="100" name="UndefinedState_FS" iotype="AI" textname="Тестирование неопределённого состояния"/>
+			<item id="1070" mb="1" mbtype="rtu" mbaddr="0x01" mbreg="240" mbfunc="0x03" default="150" undefined_value="65535" breaklim="100" name="UndefinedState_FS" iotype="AI" textname="Тестирование неопределённого состояния"/>
+
+			<item id="1080" default="1080" name="Reload1_FS" iotype="AI" textname="Тестирование перезагрузки конфига"/>
 
 			<item id="10000" iotype="DI" name="TestMode_S" textname="Тестовый датчик"/>
 

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

+<?xml version="1.0" encoding="utf-8"?>
+<UNISETPLC xmlns:xi="http://www.w3.org/2001/XInclude">
+	<UserData/>
+	<!-- Общие(стартовые) параметры по UniSet -->
+	<UniSet>
+		<NameService host="localhost" port="2809"/>
+		<LocalNode name="LocalhostNode"/>
+		<RootSection name="UNISET_PLC"/>
+		<CountOfNet name="1"/>
+		<RepeatCount name="3"/>
+		<RepeatTimeoutMS name="50"/>
+		<WatchDogTime name="0"/>
+		<PingNodeTime name="0"/>
+		<AutoStartUpTime name="1"/>
+		<DumpStateTime name="10"/>
+		<SleepTickMS name="500"/>
+		<UniSetDebug levels="" name="ulog"/>
+		<ConfDir name="./"/>
+		<DataDir name="./"/>
+		<BinDir name="./"/>
+		<LogDir name="./"/>
+		<DocDir name="./"/>
+		<LockDir name="./"/>
+		<Services></Services>
+	</UniSet>
+	<dlog name="dlog"/>
+
+	<settings>
+	    <SharedMemory name="SharedMemory" shmID="SharedMemory"/>
+	    <MBTCPMaster1 name="MBTCPMaster1" exchangeModeID="MBTCPMaster_Mode_AS">
+            <DeviceList>
+                <item addr="0x01" timeout="1000" invert="1" respondSensor="Slave_Not_Respond_S" safemodeSensor="Slave1_SafemodeSensor_S" safemodeValue="42"/>
+                <item addr="0x02" timeout="1000" safemodeResetIfNotRespond="1"/>
+                <item addr="0x03" timeout="500"/>
+            </DeviceList>
+        </MBTCPMaster1>
+        <MBTCPMultiMaster1 name="MBTCPMultiMaster1" poll_time="200" reply_timeout="60">
+            <DeviceList>
+                <item addr="0x01" invert="1" respondSensor="Slave_Not_Respond_S" timeout="1000" safemodeSensor="Slave1_SafemodeSensor_S" safemodeValue="42" />
+                <item addr="0x02" timeout="1000" safemodeResetIfNotRespond="1"/>
+            </DeviceList>
+            <GateList>
+                <item ip="127.0.0.1" port="20053" recv_timeout="200" invert="1" respondSensor="Slave1_Not_Respond_S"/>
+                <item ip="127.0.0.1" port="20055" recv_timeout="200" invert="1" respondSensor="Slave2_Not_Respond_S"/>
+            </GateList>
+        </MBTCPMultiMaster1>
+	</settings>
+	<ObjectsMap idfromfile="1">
+		<!--
+	Краткие пояснения к полям секции 'sensors'
+	==========================================
+	node 		- узел на котором физически находится данный датчик
+	iotype 		- тип датчика
+	priority 	- приоритет сообщения об изменении данного датчика
+	textname 	- текстовое имя датчика
+-->
+		<nodes port="2809">
+			<item id="3000" infserver="InfoServer" ip="127.0.0.1" name="LocalhostNode" textname="Локальный узел"/>
+		</nodes>
+		<!-- ************************ Датчики ********************** -->
+		<sensors name="Sensors">
+			<!-- reload conf -->
+			<item id="1080" mb="1" mbtype="rtu" mbaddr="0x03" mbreg="340" mbfunc="0x03" name="Reload1_FS" iotype="AI" textname="Тестирование перезагрузки конфига"/>
+		</sensors>
+		<thresholds/>
+		<controllers name="Controllers">
+			<item id="5000" name="SharedMemory"/>
+		</controllers>
+		<!-- ******************* Идентификаторы сервисов ***************** -->
+		<services name="Services">
+		</services>
+		<!-- ******************* Идентификаторы объектов ***************** -->
+		<objects name="UniObjects">
+			<item id="6000" name="TestProc"/>
+			<item id="6004" name="MBTCPMaster1"/>
+			<item id="6005" name="MBTCPMultiMaster1"/>
+		</objects>
+	</ObjectsMap>
+	<messages idfromfile="1" name="messages"/>
+</UNISETPLC>

extensions/ModbusMaster/tests/run_test_mbtcpmaster.cc

@@ -15,6 +15,7 @@ using namespace uniset;
 using namespace uniset::extensions;
 // --------------------------------------------------------------------------
 std::shared_ptr<SharedMemory> shm;
+std::shared_ptr<MBTCPMaster> mbm;
 // --------------------------------------------------------------------------
 int main( int argc, const char* argv[] )
 {
@@ -46,15 +47,14 @@ int main( int argc, const char* argv[] )
         if( !shm )
             return 1;
 
-        auto mb = MBTCPMaster::init_mbmaster(argc, argv, shm->getId(), (apart ? nullptr : shm ));
+		mbm = MBTCPMaster::init_mbmaster(argc, argv, shm->getId(), (apart ? nullptr : shm ));
 
-        if( !mb )
-            return 1;
+		if( !mbm )
+			return 1;
 
         auto act = UniSetActivator::Instance();
-
-        act->add(shm);
-        act->add(mb);
+		act->add(shm);
+		act->add(mbm);
 
         SystemMessage sm(SystemMessage::StartUp);
         act->broadcast( sm.transport_msg() );

extensions/ModbusMaster/tests/run_test_mbtcpmaster.sh

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

extensions/include/UObject_SK.h

@@ -187,7 +187,7 @@ class UObject_SK:
         virtual void httpGetUserData( Poco::JSON::Object::Ptr& jdata ) {} /*!<  для пользовательских данных в httpGet() */
         virtual Poco::JSON::Object::Ptr httpDumpIO();
         virtual Poco::JSON::Object::Ptr httpRequestLog( const Poco::URI::QueryParameters& p );
-        virtual Poco::JSON::Object::Ptr request_conf_set( const std::string& req, const Poco::URI::QueryParameters& p );
+        virtual Poco::JSON::Object::Ptr request_conf_set( const std::string& req, const Poco::URI::QueryParameters& p ) override;
 #endif
 
         // Выполнение очередного шага программы

extensions/lib/UObject_SK.cc

@@ -705,12 +705,47 @@ Poco::JSON::Object::Ptr UObject_SK::httpRequestLog( const Poco::URI::QueryParame
 Poco::JSON::Object::Ptr UObject_SK::request_conf_set( const std::string& req, const Poco::URI::QueryParameters& params )
 {
     Poco::JSON::Object::Ptr jret = new Poco::JSON::Object();
+    Poco::JSON::Array::Ptr jupdated = uniset::json::make_child_array(jret, "updated");
+    
     for( const auto& p: params )
     {
+        if( p.first == "sleep_msec" )
+        {
+            int val = uni_atoi(p.second);
+            if( val > 0 )
+            {
+                sleep_msec = uni_atoi(p.second);
+                jupdated->add(p.first);
+            }
+            continue;
+        }
+
+        if( p.first == "resetMsgTime" )
+        {
+            int val = uni_atoi(p.second);
+            if( val > 0 )
+            {
+                resetMsgTime = uni_atoi(p.second);
+                jupdated->add(p.first);
+            }
+            continue;
+        }
+
+        if( p.first == "forceOut" )
+        {
+            int val = uni_atoi(p.second);
+            if( val > 0 )
+            {
+                forceOut = uni_atoi(p.second);
+                jupdated->add(p.first);
+            }
+            continue;
+        }
+
         
     }
 
-    jret->set("Result","OK");
+    jret->set("Result", (jupdated->size() > 0 ? "OK" : "FAIL") );
     return jret;
 }
 #endif

include/modbus/ModbusTCPServer.h

@@ -60,15 +60,12 @@ namespace uniset
             /*! текущее количество подключений */
             size_t getCountSessions() const noexcept;
 
-            void setIgnoreAddrMode( bool st );
-            bool getIgnoreAddrMode() const noexcept;
+			// Сбор статистики по соединениям...
+			struct SessionInfo
+			{
+				SessionInfo( const std::string& a, size_t ask ): iaddr(a), askCount(ask) {}
 
-            // Сбор статистики по соединениям...
-            struct SessionInfo
-            {
-                SessionInfo( const std::string& a, size_t ask ): iaddr(a), askCount(ask) {}
-
-                std::string iaddr;
+				std::string iaddr;
                 size_t askCount;
             };
 

src/Communications/Modbus/ModbusTCPServer.cc

@@ -81,16 +81,6 @@ namespace uniset
 		return sessCount;
 	}
 	// -------------------------------------------------------------------------
-	void ModbusTCPServer::setIgnoreAddrMode(bool st)
-	{
-		ignoreAddr = st;
-	}
-	// -------------------------------------------------------------------------
-	bool ModbusTCPServer::getIgnoreAddrMode() const noexcept
-	{
-		return ignoreAddr;
-	}
-	// -------------------------------------------------------------------------
 	void ModbusTCPServer::setSessionTimeout( timeout_t msec )
 	{
 		sessTimeout = msec;

uniset2.files

-./cov-int/emit/pvbook.localdomain/config/130ac2dc34760443befdd3f2a25f8d40/g++cc-config-0/coverity-compiler-compat.h
-./cov-int/emit/pvbook.localdomain/config/130ac2dc34760443befdd3f2a25f8d40/gcc-config-0/coverity-compiler-compat.h
-./cov-int/emit/pvbook.localdomain/config/130ac2dc34760443befdd3f2a25f8d40/g++cc-config-0/coverity-macro-compat.h
-./cov-int/emit/pvbook.localdomain/config/130ac2dc34760443befdd3f2a25f8d40/gcc-config-0/coverity-macro-compat.h
-./cov-int/emit/pvbook.localdomain/config/130ac2dc34760443befdd3f2a25f8d40/g++cc-config-1/coverity-compiler-compat.h
-./cov-int/emit/pvbook.localdomain/config/130ac2dc34760443befdd3f2a25f8d40/g++cc-config-1/coverity-macro-compat.h
-./cov-int/emit/pvbook.localdomain/config/130ac2dc34760443befdd3f2a25f8d40/g++-config-0/coverity-compiler-compat.h
-./cov-int/emit/pvbook.localdomain/config/130ac2dc34760443befdd3f2a25f8d40/g++-config-0/coverity-macro-compat.h
-./cov-int/emit/pvbook.localdomain/config/130ac2dc34760443befdd3f2a25f8d40/g++-config-1/coverity-compiler-compat.h
-./cov-int/emit/pvbook.localdomain/config/130ac2dc34760443befdd3f2a25f8d40/g++-config-1/coverity-macro-compat.h
-./cov-int/emit/pvbook.localdomain/config/30c6834cc1e9802742e33de4efa3917c/g++cc-config-0/coverity-compiler-compat.h
-./cov-int/emit/pvbook.localdomain/config/30c6834cc1e9802742e33de4efa3917c/g++cc-config-0/coverity-macro-compat.h
-./cov-int/emit/pvbook.localdomain/config/30c6834cc1e9802742e33de4efa3917c/g++-config-0/coverity-compiler-compat.h
-./cov-int/emit/pvbook.localdomain/config/30c6834cc1e9802742e33de4efa3917c/g++-config-0/coverity-macro-compat.h
-./cov-int/emit/pvbook.localdomain/config/4d02eb73c555e8f07e4124fe33c80de2/g++cc-config-0/coverity-compiler-compat.h
-./cov-int/emit/pvbook.localdomain/config/4d02eb73c555e8f07e4124fe33c80de2/g++cc-config-0/coverity-macro-compat.h
-./cov-int/emit/pvbook.localdomain/config/4d02eb73c555e8f07e4124fe33c80de2/g++-config-0/coverity-compiler-compat.h
-./cov-int/emit/pvbook.localdomain/config/4d02eb73c555e8f07e4124fe33c80de2/g++-config-0/coverity-macro-compat.h
-./cov-int/emit/pvbook.localdomain/config/4db70a7a9c958929fa315f4c9243d800/g++cc-config-0/coverity-compiler-compat.h
-./cov-int/emit/pvbook.localdomain/config/4db70a7a9c958929fa315f4c9243d800/g++cc-config-0/coverity-macro-compat.h
-./cov-int/emit/pvbook.localdomain/config/4db70a7a9c958929fa315f4c9243d800/g++-config-0/coverity-compiler-compat.h
-./cov-int/emit/pvbook.localdomain/config/4db70a7a9c958929fa315f4c9243d800/g++-config-0/coverity-macro-compat.h
 ./docs/Makefile.am
 ./extensions/Backend-OpenTSDB/BackendOpenTSDB.cc
 ./extensions/Backend-OpenTSDB/BackendOpenTSDB.h
@@ -132,6 +110,8 @@
 ./extensions/Makefile.am
 ./extensions/ModbusMaster/main.cc
 ./extensions/ModbusMaster/Makefile.am
+./extensions/ModbusMaster/MBConfig.cc
+./extensions/ModbusMaster/MBConfig.h
 ./extensions/ModbusMaster/MBExchange.cc
 ./extensions/ModbusMaster/MBExchange.h
 ./extensions/ModbusMaster/mb-perf-test.cc