Merge branch 'master' of git.eter:/projects/uniset

conf/libuniset.spec

@@ -3,7 +3,7 @@
 
 Name: libuniset
 Version: 0.97
-Release: eter51
+Release: eter53
 Summary: UniSet - library for building distributed industrial control systems
 License: GPL
 Group: Development/C++
@@ -183,6 +183,9 @@ rm -f %buildroot%_libdir/*.la
 %exclude %_pkgconfigdir/libUniSet.pc
 
 %changelog
+* Tue Feb 02 2010 Larik Ishkulov <gentro@etersoft.ru> 0.97-eter52
+- new build
+
 * Fri Jan 29 2010 Pavel Vainerman <pv@altlinux.ru> 0.97-eter50
 - add simitator
 

include/modbus/ModbusRTUMaster.h

@@ -29,7 +29,11 @@ class ModbusRTUMaster:
 		void setSpeed( ComPort::Speed s );
 		void setSpeed( const std::string s );
 		ComPort::Speed getSpeed();
-		
+
+		void setParity( ComPort::Parity parity );
+		void setCharacterSize( ComPort::CharacterSize csize );
+		void setStopBits( ComPort::StopBits sBit );
+
 		int getTimeout();
 
 	protected:

src/Communications/Modbus/ModbusRTUMaster.cc

@@ -82,7 +82,24 @@ ComPort::Speed ModbusRTUMaster::getSpeed()
 	
 	return port->getSpeed();
 }
-
+// -------------------------------------------------------------------------
+void ModbusRTUMaster::setParity( ComPort::Parity parity )
+{
+	if( port != NULL)
+		port->setParity(parity);
+}
+// -------------------------------------------------------------------------
+void ModbusRTUMaster::setCharacterSize( ComPort::CharacterSize csize )
+{
+	if( port != NULL)
+		port->setCharacterSize(csize);
+}
+// -------------------------------------------------------------------------
+void ModbusRTUMaster::setStopBits( ComPort::StopBits sBit )
+{
+	if( port != NULL)
+		port->setStopBits(sBit);
+}
 // -------------------------------------------------------------------------
 int ModbusRTUMaster::getTimeout()
 {