(ModbusMaster): перенёс реализацию ModbusMaster TCP и RTU в один каталог ModbusMaster

configure.ac

@@ -179,13 +179,11 @@ AC_CONFIG_FILES([Makefile
 				 extensions/DBServer-MySQL/libUniSetMySQL.pc
 				 extensions/IOControl/Makefile
 				 extensions/IOControl/libUniSetIOControl.pc
-				 extensions/RTUExchange/Makefile
-				 extensions/RTUExchange/libUniSetRTU.pc
 				 extensions/ModbusMaster/Makefile
+				 extensions/ModbusMaster/libUniSetRTU.pc
+				 extensions/ModbusMaster/libUniSetMBTCPMaster.pc
 				 extensions/ModbusSlave/Makefile
 				 extensions/ModbusSlave/libUniSetMBSlave.pc
-				 extensions/MBTCPMaster/Makefile
-				 extensions/MBTCPMaster/libUniSetMBTCPMaster.pc
 				 extensions/LogicProcessor/Makefile
 				 extensions/LogicProcessor/libUniSetLogicProcessor.pc
 				 extensions/SMViewer/Makefile

extensions/MBTCPMaster/Makefile.am

-bin_PROGRAMS 			= @PACKAGE@-mbtcpmaster
-
-# не забывайте править версию в pc-файле
-UMBTCP_VER=1:2:1
-
-lib_LTLIBRARIES 				= libUniSetMBTCPMaster.la
-libUniSetMBTCPMaster_la_LDFLAGS  = -version-info $(UMBTCP_VER)
-libUniSetMBTCPMaster_la_LIBADD		= $(top_builddir)/lib/libUniSet.la \
-								$(top_builddir)/extensions/SharedMemory/libUniSetSharedMemory.la \
-								$(top_builddir)/extensions/lib/libUniSetExtensions.la \
-								$(top_builddir)/extensions/ModbusMaster/libMBMaster.la \
-								$(SIGC_LIBS)
-libUniSetMBTCPMaster_la_CXXFLAGS	= -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory -I$(top_builddir)/extensions/ModbusMaster $(SIGC_CFLAGS)
-libUniSetMBTCPMaster_la_SOURCES 	= MBTCPMaster.cc
-
-@PACKAGE@_mbtcpmaster_SOURCES 	= main.cc
-@PACKAGE@_mbtcpmaster_LDADD 	= libUniSetMBTCPMaster.la $(top_builddir)/lib/libUniSet.la \
-									$(top_builddir)/extensions/SharedMemory/libUniSetSharedMemory.la \
-									$(top_builddir)/extensions/lib/libUniSetExtensions.la \
-									$(top_builddir)/extensions/ModbusMaster/libMBMaster.la \
-									$(SIGC_LIBS)
-@PACKAGE@_mbtcpmaster_CXXFLAGS	= -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory -I$(top_builddir)/extensions/ModbusMaster $(SIGC_CFLAGS)
-
-# install
-devel_include_HEADERS = *.h
-devel_includedir = $(pkgincludedir)/extensions
-
-pkgconfigdir 	= $(libdir)/pkgconfig
-pkgconfig_DATA 	= libUniSetMBTCPMaster.pc
-
-all-local:
-	ln -sf ../MBTCPMaster/$(devel_include_HEADERS) ../include

extensions/MBTCPMaster/create_links.sh

-#!/bin/sh
-
-ln -s -f ../../Utilities/scripts/uniset-start.sh 
-ln -s -f ../../Utilities/scripts/uniset-stop.sh stop.sh
-ln -s -f ../../Utilities/scripts/uniset-functions.sh 
-ln -s -f ../../conf/test.xml test.xml
-

extensions/Makefile.am

@@ -3,8 +3,8 @@
 ############################################################################
 
 if HAVE_EXTENTIONS
-SUBDIRS = lib include ModbusMaster SharedMemory IOControl RTUExchange LogicProcessor \
-	ModbusSlave MBTCPMaster SMViewer UniNetwork UNet2 DBServer-MySQL tests
+SUBDIRS = lib include SharedMemory IOControl LogicProcessor \
+	ModbusMaster ModbusSlave SMViewer UniNetwork UNet2 DBServer-MySQL tests
 #SMDBServer
 #SharedMemoryPlus
 #UDPExchange

extensions/ModbusMaster/MBExchange.cc

@@ -55,10 +55,10 @@ pollActivated(false)
 	if( stat_time > 0 )
 		ptStatistic.setTiming(stat_time*1000);
 
-//	recv_timeout = conf->getArgPInt("--" + prefix + "-recv-timeout",it.getProp("recv_timeout"), 500);
-//
-//	int tout = conf->getArgPInt("--" + prefix + "-timeout",it.getProp("timeout"), 5000);
-//	ptTimeout.setTiming(tout);
+	recv_timeout = conf->getArgPInt("--" + prefix + "-recv-timeout",it.getProp("recv_timeout"), 500);
+
+	int tout = conf->getArgPInt("--" + prefix + "-timeout",it.getProp("timeout"), 5000);
+	ptTimeout.setTiming(tout);
 
 	noQueryOptimization = conf->getArgInt("--" + prefix + "-no-query-optimization",it.getProp("no_query_optimization"));
 
@@ -148,6 +148,21 @@ void MBExchange::help_print( int argc, const char* const* argv )
 // -----------------------------------------------------------------------------
 MBExchange::~MBExchange()
 {
+	for( RTUDeviceMap::iterator it1=rmap.begin(); it1!=rmap.end(); ++it1 )
+	{
+		if( it1->second->rtu )
+		{
+			delete it1->second->rtu;
+			it1->second->rtu = 0;
+		}
+
+		RTUDevice* d(it1->second);
+		for( RegMap::iterator it=d->regmap.begin(); it!=d->regmap.end(); ++it )
+			delete it->second;
+
+		delete it1->second;
+	}
+
 	delete shm;
 }
 // -----------------------------------------------------------------------------
@@ -2613,3 +2628,34 @@ void MBExchange::poll()
 //	printMap(rmap);
 }
 // -----------------------------------------------------------------------------
+bool MBExchange::RTUDevice::checkRespond()
+{
+	bool prev = resp_state;
+
+	if( resp_ptTimeout.getInterval() <= 0 )
+	{
+		resp_state = resp_real;
+		return (prev != resp_state);
+	}
+
+	if( resp_trTimeout.hi(resp_state && !resp_real) )
+		resp_ptTimeout.reset();
+
+	if( resp_real )
+		resp_state = true;
+	else if( resp_state && !resp_real && resp_ptTimeout.checkTime() )
+		resp_state = false;
+
+	// если ещё не инициализировали значение в SM
+	// то возвращаем true, чтобы оно принудительно сохранилось
+	if( !resp_init )
+	{
+		resp_state = resp_real;
+		resp_init = true;
+		prev = resp_state;
+		return true;
+	}
+
+	return ( prev != resp_state );
+}
+// -----------------------------------------------------------------------------

extensions/ModbusMaster/MBExchange.h

@@ -308,6 +308,7 @@ class MBExchange:
 		// определение timeout для соединения
 		PassiveTimer ptTimeout;
 		bool pollActivated;
+		int recv_timeout;
 
 	 private:
 		MBExchange();

extensions/MBTCPMaster/MBTCPMaster.cc → extensions/ModbusMaster/MBTCPMaster.cc

@@ -59,15 +59,6 @@ pollThread(0)
 // -----------------------------------------------------------------------------
 MBTCPMaster::~MBTCPMaster()
 {
-	for( MBTCPMaster::RTUDeviceMap::iterator it1=rmap.begin(); it1!=rmap.end(); ++it1 )
-	{
-		RTUDevice* d(it1->second);
-		for( MBTCPMaster::RegMap::iterator it=d->regmap.begin(); it!=d->regmap.end(); ++it )
-			delete it->second;
-
-		delete it1->second;
-	}
-
 	delete pollThread;
 	delete mbtcp;
 }
@@ -202,37 +193,6 @@ void MBTCPMaster::poll_thread()
 	}
 }
 // -----------------------------------------------------------------------------
-bool MBTCPMaster::RTUDevice::checkRespond()
-{
-	bool prev = resp_state;
-
-	if( resp_ptTimeout.getInterval() <= 0 )
-	{
-		resp_state = resp_real;
-		return (prev != resp_state);
-	}
-
-	if( resp_trTimeout.hi(resp_state && !resp_real) )
-		resp_ptTimeout.reset();
-
-	if( resp_real )
-		resp_state = true;
-	else if( resp_state && !resp_real && resp_ptTimeout.checkTime() )
-		resp_state = false;
-
-	// если ещё не инициализировали значение в SM
-	// то возвращаем true, чтобы оно принудительно сохранилось
-	if( !resp_init )
-	{
-		resp_state = resp_real;
-		resp_init = true;
-		prev = resp_state;
-		return true;
-	}
-
-	return ( prev != resp_state );
-}
-// -----------------------------------------------------------------------------
 void MBTCPMaster::sigterm( int signo )
 {
 	dlog[Debug::WARN] << myname << ": ********* SIGTERM(" << signo <<") ********" << endl;

extensions/ModbusMaster/Makefile.am

@@ -6,9 +6,71 @@ libMBMaster_la_LIBADD	= $(top_builddir)/lib/libUniSet.la \
 libMBMaster_la_CXXFLAGS	= -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS)
 libMBMaster_la_SOURCES 	= MBExchange.cc RTUStorage.cc
 
+bin_PROGRAMS 		= @PACKAGE@-mbtcpmaster @PACKAGE@-rtuexchange @PACKAGE@-mtr-conv @PACKAGE@-rtu188-state @PACKAGE@-vtconv @PACKAGE@-mtr-setup
+lib_LTLIBRARIES 	= libUniSetMBTCPMaster.la libUniSetRTU.la
+
+# -------------------- Mobus TCP -------------------
+# не забывайте править версию в pc-файле
+UMBTCP_VER=1:2:1
+
+
+libUniSetMBTCPMaster_la_LDFLAGS  = -version-info $(UMBTCP_VER)
+libUniSetMBTCPMaster_la_LIBADD	 = libMBMaster.la $(top_builddir)/lib/libUniSet.la \
+								$(top_builddir)/extensions/SharedMemory/libUniSetSharedMemory.la \
+								$(top_builddir)/extensions/lib/libUniSetExtensions.la \
+								$(SIGC_LIBS)
+libUniSetMBTCPMaster_la_CXXFLAGS	= -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS)
+libUniSetMBTCPMaster_la_SOURCES 	= MBTCPMaster.cc
+
+@PACKAGE@_mbtcpmaster_SOURCES 	= main.cc
+@PACKAGE@_mbtcpmaster_LDADD 	= libUniSetMBTCPMaster.la libMBMaster.la $(top_builddir)/lib/libUniSet.la \
+									$(top_builddir)/extensions/SharedMemory/libUniSetSharedMemory.la \
+									$(top_builddir)/extensions/lib/libUniSetExtensions.la \
+									$(SIGC_LIBS)
+@PACKAGE@_mbtcpmaster_CXXFLAGS	= -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS)
+
+# -------------------- Mobus RTU -------------------
+# не забывайте править версию в pc-файле
+URTU_VER=2:0:0
+
+libUniSetRTU_la_LDFLAGS  = -version-info $(URTU_VER)
+libUniSetRTU_la_LIBADD		= libMBMaster.la $(top_builddir)/lib/libUniSet.la \
+								$(top_builddir)/extensions/SharedMemory/libUniSetSharedMemory.la \
+								$(top_builddir)/extensions/lib/libUniSetExtensions.la \
+								$(SIGC_LIBS)
+libUniSetRTU_la_CXXFLAGS	= -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS)
+libUniSetRTU_la_SOURCES 	= RTUExchange.cc
+
+@PACKAGE@_rtuexchange_SOURCES 	= rtuexchange.cc
+@PACKAGE@_rtuexchange_LDADD 	= libUniSetRTU.la libMBMaster.la $(top_builddir)/lib/libUniSet.la \
+									$(top_builddir)/extensions/SharedMemory/libUniSetSharedMemory.la \
+									$(top_builddir)/extensions/lib/libUniSetExtensions.la \
+									$(SIGC_LIBS)
+@PACKAGE@_rtuexchange_CXXFLAGS	= -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS)
+
+@PACKAGE@_mtr_conv_SOURCES	= mtrconv.cc
+@PACKAGE@_mtr_conv_LDADD	= $(top_builddir)/extensions/lib/libUniSetExtensions.la $(top_builddir)/lib/libUniSet.la
+@PACKAGE@_mtr_conv_CXXFLAGS = -I$(top_builddir)/extensions/include
+
+@PACKAGE@_mtr_setup_SOURCES	= mtr-setup.cc
+@PACKAGE@_mtr_setup_LDADD	= $(top_builddir)/extensions/lib/libUniSetExtensions.la $(top_builddir)/lib/libUniSet.la
+@PACKAGE@_mtr_setup_CXXFLAGS = -I$(top_builddir)/extensions/include
+
+@PACKAGE@_vtconv_SOURCES	= vtconv.cc
+@PACKAGE@_vtconv_LDADD	= $(top_builddir)/extensions/lib/libUniSetExtensions.la $(top_builddir)/lib/libUniSet.la
+@PACKAGE@_vtconv_CXXFLAGS = -I$(top_builddir)/extensions/include
+
+@PACKAGE@_rtu188_state_LDADD 		= libUniSetRTU.la libMBMaster.la \
+		$(top_builddir)/extensions/lib/libUniSetExtensions.la $(top_builddir)/lib/libUniSet.la
+@PACKAGE@_rtu188_state_CXXFLAGS	= -I$(top_builddir)/extensions/include
+@PACKAGE@_rtu188_state_SOURCES		= rtustate.cc
+
 # install
 devel_include_HEADERS = *.h
 devel_includedir = $(pkgincludedir)/extensions
 
+pkgconfigdir 	= $(libdir)/pkgconfig
+pkgconfig_DATA 	= libUniSetMBTCPMaster.pc libUniSetRTU.pc
+
 all-local:
 	ln -sf ../ModbusMaster/$(devel_include_HEADERS) ../include

extensions/RTUExchange/RTUExchange.cc → extensions/ModbusMaster/RTUExchange.cc

@@ -39,8 +39,6 @@ allNotRespond(false)
 	transmitCtl = conf->getArgInt("--"+prefix+"-transmit-ctl",it.getProp("transmitCtl"));
 	defSpeed = ComPort::getSpeed(speed);
 
-	recv_timeout = conf->getArgPInt("--"+prefix+"-recv-timeout",it.getProp("recv_timeout"), 50);
-
 	int alltout = conf->getArgPInt("--"+prefix+"-all-timeout",it.getProp("all_timeout"), 2000);
 	ptAllNotRespond.setTiming(alltout);
 
@@ -67,21 +65,6 @@ allNotRespond(false)
 // -----------------------------------------------------------------------------
 RTUExchange::~RTUExchange()
 {
-	for( MBExchange::RTUDeviceMap::iterator it1=rmap.begin(); it1!=rmap.end(); ++it1 )
-	{
-		if( it1->second->rtu )
-		{
-			delete it1->second->rtu;
-			it1->second->rtu = 0;
-		}
-		
-		RTUDevice* d(it1->second);
-		for( RTUExchange::RegMap::iterator it=d->regmap.begin(); it!=d->regmap.end(); ++it )
-			delete it->second;
-
-		delete it1->second;
-	}
-
 	delete mbrtu;
 }
 // -----------------------------------------------------------------------------
@@ -271,33 +254,6 @@ void RTUExchange::poll()
 //	printMap(rmap);
 }
 // -----------------------------------------------------------------------------
-bool RTUExchange::RTUDevice::checkRespond()
-{
-	bool prev = resp_state;
-	if( resp_trTimeout.hi(resp_real) )
-	{	
-		if( resp_real )
-			resp_state = true;
-
-		resp_ptTimeout.reset();
-	}
-
-	if( resp_state && !resp_real && resp_ptTimeout.checkTime() )
-		resp_state = false; 
-	
-	// если ещё не инициализировали значение в SM
-	// то возвращаем true, чтобы оно принудительно сохранилось
-	if( !resp_init )
-	{
-		resp_state = resp_real;
-		resp_init = true;
-		prev = resp_state;
-		return true;
-	}
-
-	return ( prev != resp_state );
-}
-// -----------------------------------------------------------------------------
 void RTUExchange::help_print( int argc, const char* const* argv )
 {
 	cout << "Default: prefix='rs'" << endl;

extensions/RTUExchange/RTUExchange.h → extensions/ModbusMaster/RTUExchange.h

@@ -30,7 +30,6 @@ class RTUExchange:
 		UniSetTypes::uniset_mutex mbMutex;
 		std::string devname;
 		ComPort::Speed defSpeed;
-		int recv_timeout;
 		bool use485F;
 		bool transmitCtl;
 

extensions/MBTCPMaster/start_fg.sh → extensions/ModbusMaster/start_fg_mbtcp.sh

@@ -14,4 +14,3 @@
 --mbtcp-polltime 5000 \
 --mbtcp-exchange-mode-id MB1_Mode_AS
 #--mbtcp-filter-field mbtcp --mbtcp-filter-value 1
-

extensions/ModbusMaster/stop.sh

+../../Utilities/scripts/uniset-stop.sh
\ No newline at end of file

extensions/ModbusMaster/test.xml

+../../conf/test.xml
\ No newline at end of file

extensions/ModbusMaster/uniset-functions.sh

+../../Utilities/scripts/uniset-functions.sh
\ No newline at end of file

extensions/RTUExchange/Makefile.am

-bin_PROGRAMS 			= @PACKAGE@-rtuexchange @PACKAGE@-mtr-conv @PACKAGE@-rtu188-state @PACKAGE@-vtconv @PACKAGE@-mtr-setup
-
-# не забывайте править версию в pc-файле
-URTU_VER=2:0:0
-
-lib_LTLIBRARIES 			= libUniSetRTU.la
-libUniSetRTU_la_LDFLAGS  = -version-info $(URTU_VER) 
-libUniSetRTU_la_LIBADD		= $(top_builddir)/lib/libUniSet.la \
-								$(top_builddir)/extensions/SharedMemory/libUniSetSharedMemory.la \
-								$(top_builddir)/extensions/lib/libUniSetExtensions.la \
-								$(top_builddir)/extensions/ModbusMaster/libMBMaster.la \
-								$(SIGC_LIBS)
-libUniSetRTU_la_CXXFLAGS	= -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory -I$(top_builddir)/extensions/ModbusMaster $(SIGC_CFLAGS)
-libUniSetRTU_la_SOURCES 	= RTUExchange.cc
-
-@PACKAGE@_rtuexchange_SOURCES 	= rtuexchange.cc
-@PACKAGE@_rtuexchange_LDADD 	= libUniSetRTU.la $(top_builddir)/lib/libUniSet.la \
-									$(top_builddir)/extensions/SharedMemory/libUniSetSharedMemory.la \
-									$(top_builddir)/extensions/lib/libUniSetExtensions.la \
-									$(top_builddir)/extensions/ModbusMaster/libMBMaster.la \
-									$(SIGC_LIBS)
-@PACKAGE@_rtuexchange_CXXFLAGS	= -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory -I$(top_builddir)/extensions/ModbusMaster $(SIGC_CFLAGS)
-
-@PACKAGE@_mtr_conv_SOURCES	= mtrconv.cc
-@PACKAGE@_mtr_conv_LDADD	= $(top_builddir)/extensions/lib/libUniSetExtensions.la $(top_builddir)/lib/libUniSet.la
-@PACKAGE@_mtr_conv_CXXFLAGS = -I$(top_builddir)/extensions/include
-
-@PACKAGE@_mtr_setup_SOURCES	= mtr-setup.cc
-@PACKAGE@_mtr_setup_LDADD	= $(top_builddir)/extensions/lib/libUniSetExtensions.la $(top_builddir)/lib/libUniSet.la
-@PACKAGE@_mtr_setup_CXXFLAGS = -I$(top_builddir)/extensions/include
-
-@PACKAGE@_vtconv_SOURCES	= vtconv.cc
-@PACKAGE@_vtconv_LDADD	= $(top_builddir)/extensions/lib/libUniSetExtensions.la $(top_builddir)/lib/libUniSet.la
-@PACKAGE@_vtconv_CXXFLAGS = -I$(top_builddir)/extensions/include
-
-@PACKAGE@_rtu188_state_LDADD 		= libUniSetRTU.la \
-		$(top_builddir)/extensions/lib/libUniSetExtensions.la $(top_builddir)/lib/libUniSet.la \
-		$(top_builddir)/extensions/ModbusMaster/libMBMaster.la
-@PACKAGE@_rtu188_state_CXXFLAGS	= -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/ModbusMaster
-@PACKAGE@_rtu188_state_SOURCES		= rtustate.cc
-
-# install
-devel_include_HEADERS = *.h
-devel_includedir = $(pkgincludedir)/extensions
-
-pkgconfigdir 	= $(libdir)/pkgconfig
-pkgconfig_DATA 	= libUniSetRTU.pc
-
-all-local:
-	ln -sf ../RTUExchange/$(devel_include_HEADERS) ../include

extensions/RTUExchange/create_links.sh

-#!/bin/sh
-
-ln -s -f ../../Utilities/scripts/uniset-start.sh 
-ln -s -f ../../Utilities/scripts/uniset-stop.sh stop.sh
-ln -s -f ../../Utilities/scripts/uniset-functions.sh 
-ln -s -f ../../conf/test.xml test.xml
-

include/modbus/ModbusTCPMaster.h

@@ -7,8 +7,7 @@
 #include "ModbusTypes.h"
 #include "ModbusClient.h"
 // -------------------------------------------------------------------------
-/*!	Modbus TCP master interface 
-*/
+/*!	Modbus TCP master interface */
 class ModbusTCPMaster:
 	public ModbusClient
 {