fixed bug in MTR

conf/libuniset.spec

@@ -3,7 +3,7 @@
 
 Name: libuniset
 Version: 0.96
-Release: eter50
+Release: eter52
 Summary: UniSet - library for building distributed industrial control systems
 License: GPL
 Group: Development/C++
@@ -175,6 +175,9 @@ rm -f %buildroot%_libdir/*.la
 %exclude %_pkgconfigdir/libUniSet.pc
 
 %changelog
+* Fri Aug 21 2009 Pavel Vainerman <pv@etersoft.ru> 0.96-eter51
+- minor fixes in RTUExchange
+
 * Wed Aug 19 2009 Pavel Vainerman <pv@etersoft.ru> 0.96-eter50
 - fixed bug in IOControl (blink mechanic)
 

extensions/include/MTR.h

@@ -36,18 +36,18 @@ namespace MTR
 	int wsize( MTRType t ); 					/*!<     */
 	// -------------------------------------------------------------------------
 	// 
-	const ModbusRTU::ModbusData regModelNumber	= 30001;
-	const ModbusRTU::ModbusData regSerialNumber	= 30009;
+	const ModbusRTU::ModbusData regModelNumber	= 0x01;
+	const ModbusRTU::ModbusData regSerialNumber	= 0x09;
 	
 	std::string getModelNumber( ModbusRTUMaster* mb, ModbusRTU::ModbusAddr addr );
 	std::string getSerialNumber( ModbusRTUMaster* mb, ModbusRTU::ModbusAddr addr );
 	// -------------------------------------------------------------------------
-	//  
-	const ModbusRTU::ModbusData regAddress		= 40055;
-	const ModbusRTU::ModbusData regBaudRate		= 40056;
-	const ModbusRTU::ModbusData regStopBit		= 40057; /* 0 - Stop bit, 1 - Stop bits */
-	const ModbusRTU::ModbusData regParity		= 40058;
-	const ModbusRTU::ModbusData regDataBits		= 40059;
+	//   ( - read03,  - write06)
+	const ModbusRTU::ModbusData regAddress		= 55;
+	const ModbusRTU::ModbusData regBaudRate		= 56;
+	const ModbusRTU::ModbusData regStopBit		= 57; /* 0 - Stop bit, 1 - Stop bits */
+	const ModbusRTU::ModbusData regParity		= 58;
+	const ModbusRTU::ModbusData regDataBits		= 59;
 
 	enum mtrBaudRate
 	{
@@ -497,7 +497,11 @@ namespace MTR
 			T_Str16( const ModbusRTU::ReadInputRetMessage& ret )
 			{
 				char c[16];
-				memcpy(c,&ret.data,sizeof(c));
+				ModbusRTU::ModbusData data[8];
+				for( int i=0; i<8; i++ )
+					data[i] = ModbusRTU::SWAPSHORT(ret.data[i]);
+
+				memcpy(c,&data,sizeof(c));
 				sval = std::string(c);
 			}
 
@@ -511,6 +515,7 @@ namespace MTR
 			std::string sval;
 	};
 	// --------------------------------------------------------------------------
+
 	class T_Str8
 	{
 		public:
@@ -520,7 +525,10 @@ namespace MTR
 			T_Str8( const ModbusRTU::ReadInputRetMessage& ret )
 			{
 				char c[8];
-				memcpy(c,&ret.data,sizeof(c));
+				ModbusRTU::ModbusData data[4];
+				for( int i=0; i<4; i++ )
+					data[i] = ModbusRTU::SWAPSHORT(ret.data[i]);
+				memcpy(c,&data,sizeof(c));
 				sval = std::string(c);
 			}
 

include/modbus/ModbusTypes.h

@@ -59,6 +59,8 @@ namespace ModbusRTU
 	const unsigned char MBErrMask = 0x80;
 
 	// ---------------------------------------------------------------------
+	static unsigned short SWAPSHORT(unsigned short x) { return ((((x)>>8)&0xff)|(((x)<<8)&0xff00)); }
+	// ---------------------------------------------------------------------
 	/*! ޣ   */
 	ModbusCRC checkCRC( ModbusByte* start, int len );
 	const int szCRC = sizeof(ModbusCRC); /*!<      */

src/Communications/Modbus/ModbusTypes.cc

@@ -11,8 +11,6 @@
 using namespace ModbusRTU;
 using namespace std;
 // -------------------------------------------------------------------------
-#define SWAPSHORT(x) ((((x)>>8)&0xff)|(((x)<<8)&0xff00))
-// -------------------------------------------------------------------------
 #define USE_CRC_TAB 1 //  ޣ   
 // -------------------------------------------------------------------------
 // Lav:  , .