Merge remote-tracking branch 'ilyap/master'

Utilities/codegen/uniset-codegen.in

@@ -28,7 +28,7 @@ Valid options are:
   -n, --name        - filename for *_SK files (base class implementation). Default: xmlfilename_SK
   --ask             - Use 'ask' templates. See the documentation.
   --alone           - Use 'alone' templates. See the documentation.
-  --no-main         - Don`t generate main.cc
+  --no-main         - Don't generate main.cc
   
   --make-skel name  - generate process skeleton (name.src.xml, Name.cc, Name.hh, Makefile.am, main.cc)
                       Additional arguments: --no-main, --no-makefile

extensions/DBServer-MySQL/Makefile.am

@@ -7,6 +7,7 @@ UMYSQL_VER=@LIBVER@
 lib_LTLIBRARIES 			= libUniSet-mysql.la
 libUniSet_mysql_la_LDFLAGS  = -version-info $(UMYSQL_VER) 
 libUniSet_mysql_la_SOURCES	= DBInterface.cc DBServer_MySQL.cc
+libUniSet_mysql_la_CXXFLAGS = -L/usr/lib/mysql
 libUniSet_mysql_la_LIBADD	= $(top_builddir)/lib/libUniSet.la -lmysqlclient
 
 bin_PROGRAMS 					= uniset-mysql-dbserver

extensions/IOControl/Makefile.am

@@ -8,7 +8,8 @@ libUniSetIOControl_la_LDFLAGS  = -version-info $(UIO_VER)
 libUniSetIOControl_la_LIBADD		= $(COMEDI_LIBS) $(SIGC_LIBS) \
 	$(top_builddir)/extensions/lib/libUniSetExtensions.la \
 	$(top_builddir)/lib/libUniSet.la \
-	$(top_builddir)/extensions/SharedMemory/libUniSetSharedMemory.la
+	$(top_builddir)/extensions/SharedMemory/libUniSetSharedMemory.la \
+	-lm
 
 libUniSetIOControl_la_CXXFLAGS 	= $(COMEDI_CFLAGS) $(SIGC_CFLAGS) \
 	-I$(top_builddir)/extensions/include \
@@ -18,20 +19,21 @@ libUniSetIOControl_la_SOURCES 	= ComediInterface.cc IOControl.cc
 
 @PACKAGE@_iocontrol_LDADD 	= libUniSetIOControl.la \
 	$(top_builddir)/lib/libUniSet.la \
-	$(top_builddir)/extensions/lib/libUniSetExtensions.la $(COMEDI_LIBS)
+	$(top_builddir)/extensions/lib/libUniSetExtensions.la $(COMEDI_LIBS) -lm
 @PACKAGE@_iocontrol_CXXFLAGS 	= $(COMEDI_CFLAGS) $(SIGC_CFLAGS) \
 	-I$(top_builddir)/extensions/include \
 	-I$(top_builddir)/extensions/SharedMemory
 @PACKAGE@_iocontrol_SOURCES 	= iocontrol.cc
 
 @PACKAGE@_iotest_CXXFLAGS = $(COMEDI_CFLAGS)
-@PACKAGE@_iotest_LDADD 	= $(COMEDI_LIBS)
+@PACKAGE@_iotest_LDADD 	= $(COMEDI_LIBS) -lm
 @PACKAGE@_iotest_SOURCES 	= iotest.cc
 
 @PACKAGE@_iocalibr_CXXFLAGS 	= $(COMEDI_CFLAGS)
 @PACKAGE@_iocalibr_LDADD 		= $(COMEDI_LIBS) \
 	$(top_builddir)/lib/libUniSet.la \
-	$(top_builddir)/extensions/lib/libUniSetExtensions.la
+	$(top_builddir)/extensions/lib/libUniSetExtensions.la \
+	-lm
 @PACKAGE@_iocalibr_SOURCES 	= iocalibr.cc
 
 # install

extensions/include/MTR.h

@@ -663,12 +663,13 @@ namespace MTR
 			T_Str16():sval(""){}
 			T_Str16( const ModbusRTU::ReadInputRetMessage& ret )
 			{
-				char c[16];
+				char c[17];
 				ModbusRTU::ModbusData data[8];
 				for( int i=0; i<8; i++ )
 					data[i] = ModbusRTU::SWAPSHORT(ret.data[i]);
 
-				memcpy(c,&data,sizeof(c));
+				memcpy(c,&data,16);
+				c[16] = '\0';
 				sval = std::string(c);
 			}
 
@@ -692,11 +693,12 @@ namespace MTR
 			T_Str8():sval(""){}
 			T_Str8( const ModbusRTU::ReadInputRetMessage& ret )
 			{
-				char c[8];
+				char c[9];
 				ModbusRTU::ModbusData data[4];
 				for( int i=0; i<4; i++ )
 					data[i] = ModbusRTU::SWAPSHORT(ret.data[i]);
-				memcpy(c,&data,sizeof(c));
+				memcpy(c,&data,8);
+                c[8] = '\0';
 				sval = std::string(c);
 			}
 

extensions/lib/MTR.cc

@@ -412,7 +412,7 @@ bool send_param( ModbusRTUMaster* mb, DataMap& dmap, ModbusRTU::ModbusAddr addr,
 				catch( ModbusRTU::mbException& ex )
 				{
 					/* if speed is changed we receive a timeout error */
-					if( reg == 56 && it->first == ModbusRTU::erTimeOut )
+					if( reg == 56 && ex.err == ModbusRTU::erTimeOut )
 					{
 						update_communication_params(reg, *it1, mb, addr, verb);
 //						ok = true;
@@ -431,7 +431,11 @@ bool send_param( ModbusRTUMaster* mb, DataMap& dmap, ModbusRTU::ModbusAddr addr,
 //		if( !ok )
 //			return false;
 	}
-	
+    
+    ModbusRTU::WriteSingleOutputRetMessage ret = mb->write06(addr,53,1);
+    if( verb )
+      cout << "(mtr-setup): save parameters " << endl;
+    
 	return true;
 }
 // ------------------------------------------------------------------------------------------