(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

@@ -10,7 +10,7 @@ using namespace std;
 using namespace UniSetTypes;
 using namespace UniSetExtensions;
 // -----------------------------------------------------------------------------
-MBTCPMaster::MBTCPMaster( UniSetTypes::ObjectId objId, UniSetTypes::ObjectId shmId, 
+MBTCPMaster::MBTCPMaster( UniSetTypes::ObjectId objId, UniSetTypes::ObjectId shmId,
 							SharedMemory* ic, const std::string prefix ):
 MBExchange(objId,shmId,ic,prefix),
 force_disconnect(true),
@@ -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;
 }
@@ -78,7 +69,7 @@ ModbusClient* MBTCPMaster::initMB( bool reopen )
 	{
 		if( !reopen )
 			return mbtcp;
-		
+
 		delete mbtcp;
 		mb = 0;
 		mbtcp = 0;
@@ -88,7 +79,7 @@ ModbusClient* MBTCPMaster::initMB( bool reopen )
 	{
 		ost::Thread::setException(ost::Thread::throwException);
 		mbtcp = new ModbusTCPMaster();
-	
+
 		ost::InetAddress ia(iaddr.c_str());
 		mbtcp->connect(ia,port);
 		mbtcp->setForceDisconnect(force_disconnect);
@@ -99,7 +90,7 @@ ModbusClient* MBTCPMaster::initMB( bool reopen )
 		mbtcp->setSleepPause(sleepPause_usec);
 
 		dlog[Debug::INFO] << myname << "(init): ipaddr=" << iaddr << " port=" << port << endl;
-		
+
 		if( dlog.debugging(Debug::LEVEL9) )
 			mbtcp->setLog(dlog);
 	}
@@ -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;
 }
 // -----------------------------------------------------------------------------
@@ -150,13 +133,13 @@ void RTUExchange::poll()
 {
 	if( trAllNotRespond.hi(allNotRespond) )
 		ptAllNotRespond.reset();
-	
+
 	if( allNotRespond && mb && ptAllNotRespond.checkTime() )
 	{
 		ptAllNotRespond.reset();
 		initMB(true);
 	}
-	
+
 	if( !mb )
 	{
 		initMB(false);
@@ -170,20 +153,20 @@ void RTUExchange::poll()
 	}
 
 	ComPort::Speed s = mbrtu->getSpeed();
-	
+
 	for( MBExchange::RTUDeviceMap::iterator it1=rmap.begin(); it1!=rmap.end(); ++it1 )
 	{
 		RTUDevice* d(it1->second);
-	
+
 		if( d->speed != s )
 		{
 			s = d->speed;
 			mbrtu->setSpeed(d->speed);
 		}
-		
+
 		if( dlog.debugging(Debug::INFO) )
 			dlog[Debug::INFO] << myname << "(poll): ask addr=" << ModbusRTU::addr2str(d->mbaddr) << endl;
-	
+
 		if( d->dtype==RTUExchange::dtRTU188 )
 		{
 			if( !d->rtu )
@@ -205,19 +188,19 @@ void RTUExchange::poll()
 				d->resp_real = true;
 			}
 			catch( ModbusRTU::mbException& ex )
-			{ 
+			{
 				if( d->resp_real )
 				{
 					if( dlog.debugging(Debug::LEVEL3) )
 					{
-  						dlog[Debug::CRIT] << myname << "(poll): FAILED ask addr=" << ModbusRTU::addr2str(d->mbaddr)
+						dlog[Debug::CRIT] << myname << "(poll): FAILED ask addr=" << ModbusRTU::addr2str(d->mbaddr)
 							<< " -> " << ex << endl;
-					}					
+					}
 					d->resp_real = false;
 				}
 			}
 		}
-		else 
+		else
 		{
 			d->resp_real = false;
 			for( RTUExchange::RegMap::iterator it=d->regmap.begin(); it!=d->regmap.end(); ++it )
@@ -233,7 +216,7 @@ void RTUExchange::poll()
 					}
 				}
 				catch( ModbusRTU::mbException& ex )
-				{ 
+				{
 //					if( d->resp_real )
 //					{
 						if( dlog.debugging(Debug::LEVEL3) )
@@ -255,7 +238,7 @@ void RTUExchange::poll()
 
 	// update SharedMemory...
 	updateSM();
-	
+
 	// check thresholds
 	for( MBExchange::RTUDeviceMap::iterator it1=rmap.begin(); it1!=rmap.end(); ++it1 )
 	{
@@ -267,35 +250,8 @@ void RTUExchange::poll()
 				IOBase::processingThreshold( &(*i),shm,force);
 		}
 	}
-	
-//	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 );
+//	printMap(rmap);
 }
 // -----------------------------------------------------------------------------
 void RTUExchange::help_print( int argc, const char* const* argv )

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

@@ -16,7 +16,7 @@ class RTUExchange:
 		RTUExchange( UniSetTypes::ObjectId objId, UniSetTypes::ObjectId shmID,
 					  SharedMemory* ic=0, const std::string prefix="rs" );
 		virtual ~RTUExchange();
-	
+
 		/*! глобальная функция для инициализации объекта */
 		static RTUExchange* init_rtuexchange( int argc, const char* const* argv,
 											UniSetTypes::ObjectId shmID, SharedMemory* ic=0,
@@ -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/main.cc → extensions/ModbusMaster/main.cc

@@ -30,9 +30,9 @@ int main( int argc, const char** argv )
 		string logfilename(conf->getArgParam("--mbtcp-logfile"));
 		if( logfilename.empty() )
 			logfilename = "mbtcpmaster.log";
-	
+
 		conf->initDebug(dlog,"dlog");
-	
+
 		std::ostringstream logname;
 		string dir(conf->getLogDir());
 		logname << dir << logfilename;
@@ -62,7 +62,7 @@ int main( int argc, const char** argv )
 		ObjectsActivator act;
 		act.addObject(static_cast<class UniSetObject*>(mb));
 
-		SystemMessage sm(SystemMessage::StartUp); 
+		SystemMessage sm(SystemMessage::StartUp);
 		act.broadcast( sm.transport_msg() );
 
 		unideb(Debug::ANY) << "\n\n\n";

extensions/RTUExchange/mtr-setup.cc → extensions/ModbusMaster/mtr-setup.cc

@@ -72,7 +72,7 @@ enum Command
 static char* checkArg( int ind, int argc, char* argv[] );
 // --------------------------------------------------------------------------
 int main( int argc, char **argv )
-{   
+{
 	Command cmd = cmdNOP;
 	int optindex = 0;
 	int opt = 0;
@@ -94,15 +94,15 @@ int main( int argc, char **argv )
 	ComPort::Parity parity = ComPort::NoParity;
 
 //	ModbusRTU::ModbusAddr b=255;
-//	
+//
 //	cout << "b=" << (int)b << " b++=" << (int)(b++) << endl;
 //	return 0;
 
 	try
 	{
-		while( (opt = getopt_long(argc, argv, "hvw:r:x:d:s:t:l:n:yb:e:x:z:",longopts,&optindex)) != -1 ) 
+		while( (opt = getopt_long(argc, argv, "hvw:r:x:d:s:t:l:n:yb:e:x:z:",longopts,&optindex)) != -1 )
 		{
-			switch (opt) 
+			switch (opt)
 			{
 				case 'h':
 					print_help();
@@ -112,7 +112,7 @@ int main( int argc, char **argv )
 						cmd = cmdRead;
 						slaveaddr = ModbusRTU::str2mbAddr(optarg);
 				break;
-				
+
 				case 'w':
 					cmd = cmdSave;
 					slaveaddr = ModbusRTU::str2mbAddr( optarg );
@@ -134,7 +134,7 @@ int main( int argc, char **argv )
 						cmd = cmdGetSerial;
 						slaveaddr = ModbusRTU::str2mbAddr(optarg);
 				break;
-		
+
 				case 'y':
 					use485 = 1;
 				break;
@@ -168,7 +168,7 @@ int main( int argc, char **argv )
 				case 'b':
 					beg = atoi(optarg);
 				break;
-	
+
 				case 'e':
 					end = atoi(optarg);
 				break;
@@ -180,12 +180,12 @@ int main( int argc, char **argv )
 				case 'v':
 					verb = 1;
 				break;
-				
+
 				case 'l':
 				{
 					if( cmd == cmdNOP )
 						cmd = cmdDetectSlave;
-		
+
 					if( !checkArg(optind,argc,argv) )
 						break;
 					reg = ModbusRTU::str2mbData(argv[optind+2]);
@@ -200,9 +200,9 @@ int main( int argc, char **argv )
 				{
 					if( cmd == cmdNOP )
 						cmd = cmdDetectSpeed;
-		
+
 					slaveaddr = ModbusRTU::str2mbAddr(optarg);
-		
+
 					if( !checkArg(optind,argc,argv) )
 						break;
 
@@ -226,20 +226,20 @@ int main( int argc, char **argv )
 		{
 			cout << "(init): dev=" << dev << " speed=" << speed
 					<< " timeout=" << tout << " msec "
-					<< endl;					
-		}		
-		
+					<< endl;
+		}
+
 		ModbusRTUMaster mb(dev,use485);
 
 		if( verb )
 			dlog.addLevel( Debug::type(Debug::CRIT | Debug::WARN | Debug::INFO) );
-		
+
 		mb.setTimeout(tout);
 		mb.setSpeed(speed);
 		mb.setParity(parity);
 		mb.setStopBits(sbits);
 		mb.setLog(dlog);
-		
+
 		switch(cmd)
 		{
 			case cmdRead:
@@ -290,11 +290,11 @@ int main( int argc, char **argv )
 					cout << "(mtr-setup): autodetect slave: "
 						 << " beg=" << ModbusRTU::addr2str(beg)
 						 << " end=" << ModbusRTU::addr2str(end)
-						 << " reg=" << ModbusRTU::dat2str(reg) 
-						 << " fn=" << ModbusRTU::b2str(fn) 
+						 << " reg=" << ModbusRTU::dat2str(reg)
+						 << " fn=" << ModbusRTU::b2str(fn)
 						 << endl;
 				}
-				
+
 				try
 				{
 					ModbusRTU::ModbusAddr a = ModbusHelpers::autodetectSlave(&mb,beg,end,reg,fn);
@@ -312,20 +312,20 @@ int main( int argc, char **argv )
 				if( verb )
 				{
 					cout << "(mtr-setup): autodetect speed: slaveaddr=" << ModbusRTU::addr2str(slaveaddr)
-						 << " reg=" << ModbusRTU::dat2str(reg) 
-						 << " fn=" << ModbusRTU::b2str(fn) 
+						 << " reg=" << ModbusRTU::dat2str(reg)
+						 << " fn=" << ModbusRTU::b2str(fn)
 						 << endl;
 				}
-				
+
 				try
 				{
 					ComPort::Speed s = ModbusHelpers::autodetectSpeed(&mb,slaveaddr,reg,fn);
-					cout << "(mtr-setup): autodetect: slaveaddr=" << ModbusRTU::addr2str(slaveaddr) 
+					cout << "(mtr-setup): autodetect: slaveaddr=" << ModbusRTU::addr2str(slaveaddr)
 						<< " speed=" << ComPort::getSpeed(s) << endl;
 				}
 				catch( UniSetTypes::TimeOut )
 				{
-					cout << "(mtr-setup): speed not autodetect for slaveaddr=" 
+					cout << "(mtr-setup): speed not autodetect for slaveaddr="
 						<< ModbusRTU::addr2str(slaveaddr) << endl;
 				}
 			}
@@ -339,11 +339,11 @@ int main( int argc, char **argv )
 						 << " slaveaddr=" << ModbusRTU::addr2str(slaveaddr)
 						 << endl;
 				}
-				
+
 				cout << "model: " << MTR::getModelNumber(&mb,slaveaddr) << endl;
 			}
 			break;
-		
+
 			case cmdGetSerial:
 			{
 				if( verb )
@@ -352,17 +352,17 @@ int main( int argc, char **argv )
 						 << " slaveaddr=" << ModbusRTU::addr2str(slaveaddr)
 						 << endl;
 				}
-				
+
 				cout << "serial: " << MTR::getSerialNumber(&mb,slaveaddr) << endl;
 			}
 			break;
-		
+
 			case cmdNOP:
 			default:
 				cerr << "No command. Use -h for help." << endl;
 				return 1;
 		}
-		
+
 		return 0;
 	}
 	catch( ModbusRTU::mbException& ex )
@@ -389,7 +389,7 @@ char* checkArg( int i, int argc, char* argv[] )
 {
 	if( i<argc && (argv[i])[0]!='-' )
 		return argv[i];
-		
+
 	return 0;
 }
 // --------------------------------------------------------------------------

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

@@ -13,7 +13,7 @@ static void print_help()
 }
 // --------------------------------------------------------------------------
 int main( int argc, const char **argv )
-{   
+{
 	unsigned short v1 = 0;
 	unsigned short v2 = 0;
 	const char* type="";
@@ -22,11 +22,11 @@ int main( int argc, const char **argv )
 	{
 		print_help();
 		return 1;
-	} 
+	}
 
 	type = argv[1];
 	v1 = UniSetTypes::uni_atoi(argv[2]);
-	
+
 	if( argc>=4 )
 	{
 		v1 = UniSetTypes::uni_atoi(argv[3]);
@@ -63,23 +63,23 @@ int main( int argc, const char **argv )
 	else if( !strcmp(type,"T5") )
 	{
 		T5 t(v1,v2);
-		cout << "(T5): v1=" << t.raw.v[0] << " v2=" << t.raw.v[1] 
-			<< " --> " << t.raw.u2.val << " * 10^" << (int)t.raw.u2.exp 
+		cout << "(T5): v1=" << t.raw.v[0] << " v2=" << t.raw.v[1]
+			<< " --> " << t.raw.u2.val << " * 10^" << (int)t.raw.u2.exp
 			<< " ===> " << t.val << endl;
 	}
 	else if( !strcmp(type,"T6") )
 	{
 		T6 t(v1,v2);
-		cout << "(T6): v1=" << t.raw.v[0] << " v2=" << t.raw.v[1] 
-			<< " --> " << t.raw.u2.val << " * 10^" << (int)t.raw.u2.exp 
+		cout << "(T6): v1=" << t.raw.v[0] << " v2=" << t.raw.v[1]
+			<< " --> " << t.raw.u2.val << " * 10^" << (int)t.raw.u2.exp
 			<< " ===> " << t.val << endl;
 	}
 	else if( !strcmp(type,"T7") )
 	{
 		T7 t(v1,v2);
-		cout << "(T7): v1=" << t.raw.v[0] << " v2=" << t.raw.v[1] 
-//			<< " --> " << T7.val << " * 10^-4" 
-			<< " ===> " << t.val 
+		cout << "(T7): v1=" << t.raw.v[0] << " v2=" << t.raw.v[1]
+//			<< " --> " << T7.val << " * 10^-4"
+			<< " ===> " << t.val
 			<< " [" << ( t.raw.u2.ic == 0xFF ? "CAP" : "IND" ) << "|"
 			<< ( t.raw.u2.ie == 0xFF ? "EXP" : "IMP" ) << "]"
 			<< endl;
@@ -87,7 +87,7 @@ int main( int argc, const char **argv )
 	else if( !strcmp(type,"T8") )
 	{
 		T8 t(v1,v2);
-		cout << "(T8): v1=" << t.raw.v[0] << " v2=" << t.raw.v[1] 
+		cout << "(T8): v1=" << t.raw.v[0] << " v2=" << t.raw.v[1]
 			<< " ===> " << setfill('0') << hex
 			<< setw(2) << t.hour() << ":" << setw(2) << t.min()
 			<< " " << setw(2) << t.day() << "/" << setw(2) << t.mon()
@@ -105,7 +105,7 @@ int main( int argc, const char **argv )
 	else if( !strcmp(type,"T10") )
 	{
 		T10 t(v1,v2);
-		cout << "(T10): v1=" << t.raw.v[0] << " v2=" << t.raw.v[1] 
+		cout << "(T10): v1=" << t.raw.v[0] << " v2=" << t.raw.v[1]
 			<< " ===> " << setfill('0') << dec
 			<< setw(4) << t.year() << "/" << setw(2) << t.mon()
 			<< "/" << setw(2) << t.day()
@@ -117,7 +117,7 @@ int main( int argc, const char **argv )
 		cout << "(F1): v1=" << f.raw.v[0] << " v2=" << f.raw.v[1]
 			<< " ===> " << f.raw.val << endl;
 	}
-	else 
+	else
 	{
 		cout << " Unknown type: " << type << endl;
 		return 1;

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

@@ -28,9 +28,9 @@ int main( int argc, char** argv )
 		string logfilename(conf->getArgParam("--rs-logfile"));
 		if( logfilename.empty() )
 			logfilename = "rtuexchange.log";
-	
+
 		conf->initDebug(dlog,"dlog");
-	
+
 		std::ostringstream logname;
 		string dir(conf->getLogDir());
 		logname << dir << logfilename;
@@ -60,7 +60,7 @@ int main( int argc, char** argv )
 		ObjectsActivator act;
 		act.addObject(static_cast<class UniSetObject*>(rs));
 
-		SystemMessage sm(SystemMessage::StartUp); 
+		SystemMessage sm(SystemMessage::StartUp);
 		act.broadcast( sm.transport_msg() );
 
 		unideb(Debug::ANY) << "\n\n\n";

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

@@ -30,7 +30,7 @@ static void print_help()
 }
 // --------------------------------------------------------------------------
 int main( int argc, char **argv )
-{   
+{
 	int optindex = 0;
 	int opt = 0;
 	int verb = 0;
@@ -43,38 +43,38 @@ int main( int argc, char **argv )
 
 	try
 	{
-		while( (opt = getopt_long(argc, argv, "hva:d:s:t:q:",longopts,&optindex)) != -1 ) 
+		while( (opt = getopt_long(argc, argv, "hva:d:s:t:q:",longopts,&optindex)) != -1 )
 		{
-			switch (opt) 
+			switch (opt)
 			{
 				case 'h':
-					print_help();	
+					print_help();
 				return 0;
 
-				case 'd':	
+				case 'd':
 					dev = string(optarg);
 				break;
 
-				case 's':	
+				case 's':
 					speed = string(optarg);
 				break;
 
-				case 't':	
+				case 't':
 					tout = uni_atoi(optarg);
 				break;
 
-				case 'q':	
+				case 'q':
 					slaveaddr = ModbusRTU::str2mbAddr(optarg);
 				break;
 
-				case 'v':	
+				case 'v':
 					verb = 1;
 				break;
 
 				case 'y':
 					use485 = 1;
 				break;
-				
+
 				case '?':
 				default:
 					printf("? argumnet\n");
@@ -84,26 +84,26 @@ int main( int argc, char **argv )
 
 		if( verb )
 		{
-			cout << "(init): dev=" << dev 
+			cout << "(init): dev=" << dev
 					<< " speed=" << speed
 					<< " timeout=" << tout << " msec "
-					<< endl;					
-		}		
-		
+					<< endl;
+		}
+
 		ModbusRTUMaster mb(dev,use485);
 
 		if( verb )
 			dlog.addLevel( Debug::type(Debug::CRIT | Debug::WARN | Debug::INFO) );
-		
+
 		mb.setTimeout(tout);
 		mb.setSpeed(speed);
 		mb.setLog(dlog);
 
 		RTUStorage rtu(slaveaddr);
-		
+
 		rtu.poll(&mb);
 		cout << rtu << endl;
-		
+
 		for( int i=0; i<24; i++ )
 			cout << "UNIO1 AI" << i << ": " << rtu.getFloat( RTUStorage::nJ1, i, UniversalIO::AnalogInput ) << endl;
 		for( int i=0; i<24; i++ )

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/vtconv.cc → extensions/ModbusMaster/vtconv.cc

@@ -13,11 +13,11 @@ static void print_help()
 }
 // --------------------------------------------------------------------------
 int main( int argc, const char **argv )
-{   
+{
 /*
 	VTypes::F2 f2;
 	f2.raw.val = 2.345;
-	
+
 	cout << "Example(F2): float=" << f2.raw.val
 		<< " regs:"
 		<< " v[0]=" << f2.raw.v[0]
@@ -26,7 +26,7 @@ int main( int argc, const char **argv )
 
 	VTypes::F4 f4;
 	f4.raw.val = 2.345123123;
-	
+
 	cout << "Example(F4): float=" << f4.raw.val
 		<< " regs:"
 		<< " v[0]=" << f4.raw.v[0]
@@ -34,7 +34,7 @@ int main( int argc, const char **argv )
 		<< " v[2]=" << f4.raw.v[2]
 		<< " v[3]=" << f4.raw.v[3]
 		<< endl;
-	
+
 	cout << "-------------" << endl << endl;
 
 	VTypes::I2 i2;
@@ -44,7 +44,7 @@ int main( int argc, const char **argv )
 		<< " v[0]=" << i2.raw.v[0]
 		<< " v[1]=" << i2.raw.v[1]
 		<< endl;
-	
+
 	cout << "-------------" << endl << endl;
 
 	VTypes::U2 u2;
@@ -54,7 +54,7 @@ int main( int argc, const char **argv )
 		<< " v[0]=" << u2.raw.v[0]
 		<< " v[1]=" << u2.raw.v[1]
 		<< endl;
-	
+
 	cout << "-------------" << endl << endl;
 
 //	return 0;
@@ -68,11 +68,11 @@ int main( int argc, const char **argv )
 	{
 		print_help();
 		return 1;
-	} 
-	
+	}
+
 	type = argv[1];
 	v[0] = UniSetTypes::uni_atoi(argv[2]);
-	
+
 	if( argc>3 )
 		v[1] = UniSetTypes::uni_atoi(argv[3]);
 
@@ -85,14 +85,14 @@ int main( int argc, const char **argv )
 	if( !strcmp(type,"F2") )
 	{
 		VTypes::F2 f(v,sizeof(v));
-		cout << "(F2): v[0]=" << v[0] 
+		cout << "(F2): v[0]=" << v[0]
 			 << " v[1]=" << v[1]
 			<< " --> (float) " << (float)f << endl;
 	}
 	else if( !strcmp(type,"F4") )
 	{
 		VTypes::F4 f(v,sizeof(v));
-		cout << "(F4): v[0]=" << v[0] 
+		cout << "(F4): v[0]=" << v[0]
 			 << " v[1]=" << v[1]
 			 << " v[2]=" << v[2]
 			 << " v[3]=" << v[3]
@@ -101,18 +101,18 @@ int main( int argc, const char **argv )
 	else if( !strcmp(type,"I2") )
 	{
 		VTypes::I2 i(v,sizeof(v));
-		cout << "(I2): v[0]=" << v[0] 
+		cout << "(I2): v[0]=" << v[0]
 			 << " v[1]=" << v[1]
 			<< " --> (int) " << (int)i << endl;
 	}
 	else if( !strcmp(type,"U2") )
 	{
 		VTypes::U2 i(v,sizeof(v));
-		cout << "(U2): v[0]=" << v[0] 
+		cout << "(U2): v[0]=" << v[0]
 			 << " v[1]=" << v[1]
 			<< " --> (unsigned int) " << (unsigned int)i << endl;
 	}
-	else 
+	else
 	{
 		cout << " Unknown type: " << type << endl;
 	}

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
 {