(Modbus): Исправил ошибку (сдвиг не единицу) в обработке количества возвращаемых…

Utilities/MBTester/MBSlave.cc

@@ -3,27 +3,20 @@
 //#include <string.h>
 //#include <errno.h>
 #include <sstream>
-#include "UniSetTypes.h"
+#include <UniSetTypes.h>
 #include "MBSlave.h"
-#include "uniset-config.h"
-// -------------------------------------------------------------------------
-#ifndef PACKAGE_URL
-#define PACKAGE_URL "http://git.etersoft.ru/projects/?p=asu/uniset.git;a=summary"
-#endif
 // -------------------------------------------------------------------------
 using namespace std;
 using namespace UniSetTypes;
 using namespace ModbusRTU;
 // -------------------------------------------------------------------------
-MBSlave::MBSlave( ModbusRTU::ModbusAddr addr, const std::string& dev, const std::string& speed, bool use485 ):
+MBSlave::MBSlave( ModbusRTU::ModbusAddr addr, const std::string dev, const std::string speed, bool use485 ):
 	rscomm(NULL),
 	addr(addr),
 //	prev(ModbusRTU::erNoError),
 //	askCount(0),
 	verbose(false),
-	replyVal(-1),
-	replyVal2(-1),
-	replyVal3(-1)
+	replyVal(-1)
 {
 //	int replyTimeout = uni_atoi( conf->getArgParam("--reply-timeout",it.getProp("reply_timeout")).c_str() );
 //	if( replyTimeout <= 0 )
@@ -53,7 +46,6 @@ MBSlave::MBSlave( ModbusRTU::ModbusAddr addr, const std::string& dev, const std:
 	rscomm->connectRemoteService( sigc::mem_fun(this, &MBSlave::remoteService) );
 	rscomm->connectFileTransfer( sigc::mem_fun(this, &MBSlave::fileTransfer) );
 	rscomm->connectDiagnostics( sigc::mem_fun(this, &MBSlave::diagnostics) );
-	rscomm->connectMEIRDI( sigc::mem_fun(this, &MBSlave::read4314) );
 
 
 	rscomm->setRecvTimeout(2000);
@@ -161,15 +153,8 @@ ModbusRTU::mbErrCode MBSlave::readInputStatus( ReadInputStatusMessage& query,
 			bcnt++;
 
 		for( int i=0; i<bcnt; i++ )
-		{
-			if( i == 1 )
-				reply.addData(replyVal2);
-			else if( i == 2 )
-				reply.addData(replyVal3);
-			else
 			reply.addData(replyVal);
 	}
-	}
 
 	return ModbusRTU::erNoError;
 }
@@ -195,14 +180,7 @@ mbErrCode MBSlave::readInputRegisters( ReadInputMessage& query,
 	for( ; num<query.count; num++, reg++ )
 	{
 		if( replyVal != -1 )
-		{
-			if( num == 1 && replyVal2 != -1  )
-				reply.addData(replyVal2);
-			else if( num == 2 && replyVal3 != -1 )
-				reply.addData(replyVal3);
-			else
 			reply.addData(replyVal);
-		}
 		else
 			reply.addData(reg);
 	}
@@ -239,14 +217,7 @@ ModbusRTU::mbErrCode MBSlave::readOutputRegisters(
 	for( ; num<query.count; num++, reg++ )
 	{
 		if( replyVal != -1 )
-		{
-			if( num == 1 && replyVal2 != -1  )
-				reply.addData(replyVal2);
-			else if( num == 2 && replyVal3 != -1 )
-				reply.addData(replyVal3);
-			else
 			reply.addData(replyVal);
-		}
 		else
 			reply.addData(reg);
 	}
@@ -473,68 +444,3 @@ ModbusRTU::mbErrCode MBSlave::diagnostics( ModbusRTU::DiagnosticMessage& query,
 	return ModbusRTU::erOperationFailed;
 }
 // -------------------------------------------------------------------------
-ModbusRTU::mbErrCode MBSlave::read4314( ModbusRTU::MEIMessageRDI& query, 
-								ModbusRTU::MEIMessageRetRDI& reply )
-{
-	if( verbose )
-		cout << "(read4314): " << query << endl;
-
-	if( query.devID <= rdevMinNum || query.devID >= rdevMaxNum )
-		return erOperationFailed;
-
-	if( query.objID == rdiVendorName )
-	{
-		reply.mf = 0xFF;
-		reply.conformity = rdevBasicDevice;
-		reply.addData(query.objID,"etersoft");
-//		reply.addData(rdiProductCode, PACKAGE_NAME);
-//		reply.addData(rdiMajorMinorRevision,PACKAGE_VERSION);
-		return erNoError;
-	}
-	else if( query.objID == rdiProductCode )
-	{
-		reply.mf = 0xFF;
-		reply.conformity = rdevBasicDevice;
-		reply.addData(query.objID,PACKAGE_NAME);
-		return erNoError;
-	}
-	else if( query.objID == rdiMajorMinorRevision )
-	{
-		reply.mf = 0xFF;
-		reply.conformity = rdevBasicDevice;
-		reply.addData(query.objID,PACKAGE_VERSION);
-		return erNoError;
-	}
-	else if( query.objID == rdiVendorURL )
-	{
-		reply.mf = 0xFF;
-		reply.conformity = rdevRegularDevice;
-		reply.addData(query.objID,PACKAGE_URL);
-		return erNoError;
-	}
-	else if( query.objID == rdiProductName )
-	{
-		reply.mf = 0xFF;
-		reply.conformity = rdevRegularDevice;
-		reply.addData(query.objID,PACKAGE_NAME);
-		return erNoError;
-	}
-	else if( query.objID == rdiModelName )
-	{
-		reply.mf = 0xFF;
-		reply.conformity = rdevRegularDevice;
-		reply.addData(query.objID,"MBSlaveEcho");
-		return erNoError;
-	}
-	else if( query.objID == rdiUserApplicationName )
-	{
-		reply.mf = 0xFF;
-		reply.conformity = rdevRegularDevice;
-		reply.addData(query.objID,"uniset-mbrtuslave-echo");
-		return erNoError;
-	}
-	return ModbusRTU::erBadDataAddress; 
-}
-// -------------------------------------------------------------------------
-
-

Utilities/MBTester/mbrtutester.cc

@@ -20,7 +20,6 @@ static struct option longopts[] = {
 	{ "write0F", required_argument, 0, 'm' },
 	{ "write10", required_argument, 0, 'w' },
 	{ "diag08", required_argument, 0, 'o' },
-	{ "read4314", required_argument, 0, 'e' },
 //	{ "readfile14", required_argument, 0, 'g' },
 //	{ "writefile15", required_argument, 0, 'p' },
 	{ "filetransfer66", required_argument, 0, 'u' },
@@ -32,7 +31,7 @@ static struct option longopts[] = {
 	{ "myaddr", required_argument, 0, 'a' },
 	{ "speed", required_argument, 0, 's' },
 	{ "use485F", no_argument, 0, 'y' },
-	{ "num-cycles", required_argument, 0, 'l' },
+	{ "num-cycles", required_argument, 0, 'q' },
 	{ NULL, 0, 0, 0 }
 };
 // --------------------------------------------------------------------------
@@ -48,7 +47,6 @@ static void print_help()
 	printf("[--read03] slaveaddr reg count   - read from reg (from slaveaddr). Default: count=1\n");
 	printf("[--read04] slaveaddr reg count   - read from reg (from slaveaddr). Default: count=1\n");
 	printf("[--diag08] slaveaddr subfunc [dat] - diagnostics request\n");
-	printf("[--read4314] slaveaddr devID objID - (0x2B/0x0E): read device identification (devID=[1...4], objID=[0..255])\n");
 //	printf("[--readfile14] slaveaddr fileID  - read file from slaveaddr).\n");
 //	printf("[--writefile15] slaveaddr id filename  - write file to slaveaddr).\n");
 	printf("[--filetransfer66] slaveaddr fileID [filename] - get file from slaveaddr. Default save to 'fileID.transfer'\n");
@@ -58,7 +56,7 @@ static void print_help()
 	printf("          fn - function of test [0x01,0x02,0x03,0x04]. Default: 0x04\n");
 	printf("[--autodetect-slave] [beg end reg fn]  - find slave\n");
 	printf("          beg - start addres Default: 0\n");
-	printf("          end - end addres Default: 254\n");
+	printf("          end - end addres Default: 255\n");
 	printf("          reg - register of test. Default: 0\n");
 	printf("          fn - function of test [0x01,0x02,0x03,0x04]. Default: 0x04\n");
 	printf("[-y|--use485F]                    - use RS485 Fastwel.\n");
@@ -77,8 +75,6 @@ enum Command
 	cmdRead02,
 	cmdRead03,
 	cmdRead04,
-	cmdRead43_13,
-	cmdRead43_14,
 	cmdWrite05,
 	cmdWrite06,
 	cmdWrite0F,
@@ -109,7 +105,7 @@ int main( int argc, char **argv )
 	ModbusRTU::ModbusAddr slaveaddr = 0x00;
 	ModbusRTU::SlaveFunctionCode fn = ModbusRTU::fnReadInputRegisters;
 	ModbusRTU::ModbusAddr beg = 0;
-	ModbusRTU::ModbusAddr end = 254;
+	ModbusRTU::ModbusAddr end = 255;
 	ModbusRTU::DiagnosticsSubFunction subfunc = ModbusRTU::subEcho;
 	ModbusRTU::ModbusData dat = 0;
 	int tout = 2000;
@@ -117,12 +113,10 @@ int main( int argc, char **argv )
 	string tofile("");
 	int use485 = 0;
 	int ncycles = -1;
-	ModbusRTU::ModbusByte devID = 0;
-	ModbusRTU::ModbusByte objID = 0;
 
 	try
 	{
-		while( (opt = getopt_long(argc, argv, "hva:w:z:m:r:x:c:b:d:s:t:qn:u:yl:t:o:e:",longopts,&optindex)) != -1 ) 
+		while( (opt = getopt_long(argc, argv, "hva:w:z:m:r:x:c:b:d:s:t:qn:u:yl:t:o:",longopts,&optindex)) != -1 )
 		{
 			switch (opt)
 			{
@@ -154,7 +148,7 @@ int main( int argc, char **argv )
 						reg = ModbusRTU::str2mbData(argv[optind]);
 					
 					if( checkArg(optind+1,argc,argv) )
-						count = ModbusRTU::str2mbData(argv[optind+1]);
+						dat = uni_atoi(argv[optind+1]);
 				break;
 
 				case 'o':
@@ -173,26 +167,7 @@ int main( int argc, char **argv )
 					if( checkArg(optind+1,argc,argv) )
 						dat = uni_atoi(argv[optind+1]);
 				break;
-				case 'e':
-                {
-					if( cmd == cmdNOP )
-						cmd = cmdRead43_14;
 
-					slaveaddr = ModbusRTU::str2mbAddr( optarg );
-					
-					if( optind > argc )
-					{
-						cerr << "read command error: bad or no arguments..." << endl;
-						return 1;
-					}
-
-					if( checkArg(optind,argc,argv) )
-						devID = ModbusRTU::str2mbData(argv[optind]);
-					
-					if( checkArg(optind+1,argc,argv) )
-						objID = uni_atoi(argv[optind+1]);
-				}
-				break;
 				case 'f':
 					cmd = cmdWrite05;
 				case 'z':
@@ -484,24 +459,6 @@ int main( int argc, char **argv )
 				}
 				break;
 
-				case cmdRead43_14:
-				{
-					if( verb )
-					{
-						cout << "read4314: slaveaddr=" << ModbusRTU::addr2str(slaveaddr)
-							 << " devID=" << ModbusRTU::dat2str(devID) 
-							 << " objID=" << ModbusRTU::dat2str(objID) 
-							 << endl;
-					}
-
-					ModbusRTU::MEIMessageRetRDI ret = mb.read4314(slaveaddr,devID,objID);
-					if( verb )
-						cout << "(reply): " << ret << endl;
-					else	
-						cout << "(reply): devID='" << (int)ret.devID << "' objNum='" << (int)ret.objNum << "'" << endl << ret.dlist << endl;
-				}
-				break;
-
 				case cmdWrite05:
 				{
 					if( verb )
@@ -676,7 +633,7 @@ int main( int argc, char **argv )
             catch( ModbusRTU::mbException& ex )
 			{
 				if( ex.err != ModbusRTU::erTimeOut )
-            		throw;
+			throw ex;
 
 		cout << "timeout..." << endl;
             }

Utilities/MBTester/mbtcptester.cc

@@ -14,8 +14,6 @@ static struct option longopts[] = {
 	{ "read02", required_argument, 0, 'b' },
 	{ "read03", required_argument, 0, 'r' },
 	{ "read04", required_argument, 0, 'x' },
-//	{ "read4313", required_argument, 0, 'u' },
-	{ "read4314", required_argument, 0, 'e' },
 	{ "write05", required_argument, 0, 'f' }, 
 	{ "write06", required_argument, 0, 'z' }, 
 	{ "write0F", required_argument, 0, 'm' },
@@ -43,8 +41,6 @@ static void print_help()
 	printf("[--read03] slaveaddr reg count   - read from reg (from slaveaddr). Default: count=1\n");
 	printf("[--read04] slaveaddr reg count   - read from reg (from slaveaddr). Default: count=1\n");
 	printf("[--diag08] slaveaddr subfunc [dat] - diagnostics request\n");
-	printf("[--read4314] slaveaddr devID objID - (0x2B/0x0E): read device identification (devID=[1...4], objID=[0..254])\n");
-//	printf("[--read43-13] slaveaddr ...     - (0x2B/0x0D):  CANopen General Reference Request and Response PDU \n");
 	printf("[-i|--iaddr] ip                 - Modbus server ip. Default: 127.0.0.1\n");
 	printf("[-a|--myaddr] addr                - Modbus address for master. Default: 0x01.\n");
 	printf("[-p|--port] port                  - Modbus server port. Default: 502.\n");
@@ -61,8 +57,6 @@ enum Command
 	cmdRead02,
 	cmdRead03,
 	cmdRead04,
-	cmdRead43_13,
-	cmdRead43_14,
 	cmdWrite05,
 	cmdWrite06,
 	cmdWrite0F,
@@ -92,12 +86,10 @@ int main( int argc, char **argv )
 	int tout = 2000;
 	DebugStream dlog;
 	int ncycles = -1;
-	ModbusRTU::ModbusByte devID = 0;
-	ModbusRTU::ModbusByte objID = 0;
 
 	try
 	{
-		while( (opt = getopt_long(argc, argv, "hva:w:z:r:x:c:b:d:s:t:p:i:ol:d:e:u:",longopts,&optindex)) != -1 ) 
+		while( (opt = getopt_long(argc, argv, "hva:w:z:r:x:c:b:d:s:t:p:i:ol:d:",longopts,&optindex)) != -1 )
 		{
 			switch (opt)
 			{
@@ -115,7 +107,7 @@ int main( int argc, char **argv )
 					if( cmd == cmdNOP )
 						cmd = cmdRead03;
 				case 'x':
-                {
+
 					if( cmd == cmdNOP )
 						cmd = cmdRead04;
 					slaveaddr = ModbusRTU::str2mbAddr( optarg );
@@ -130,29 +122,8 @@ int main( int argc, char **argv )
 					
 					if( checkArg(optind+1,argc,argv) )
 						count = uni_atoi(argv[optind+1]);
-				}
 				break;
 
-				case 'e':
-                {
-					if( cmd == cmdNOP )
-						cmd = cmdRead43_14;
-					
-					slaveaddr = ModbusRTU::str2mbAddr( optarg );
-					
-					if( optind > argc )
-					{
-						cerr << "read command error: bad or no arguments..." << endl;
-						return 1;
-					}
-
-					if( checkArg(optind,argc,argv) )
-						devID = ModbusRTU::str2mbData(argv[optind]);
-					
-					if( checkArg(optind+1,argc,argv) )
-						objID = uni_atoi(argv[optind+1]);
-				}
-				break;
 				case 'f':
 					cmd = cmdWrite05;
 				case 'z':
@@ -251,7 +222,7 @@ int main( int argc, char **argv )
 		if( verb )
 		{
 			cout << "(init): ip=" << iaddr << ":" << port
-					<< " mbaddr=" << ModbusRTU::addr2str(myaddr)
+					<< ModbusRTU::addr2str(myaddr)
 					<< " timeout=" << tout << " msec "
 					<< endl;
 
@@ -383,24 +354,6 @@ int main( int argc, char **argv )
 				}
 				break;
 
-				case cmdRead43_14:
-				{
-					if( verb )
-					{
-						cout << "read4314: slaveaddr=" << ModbusRTU::addr2str(slaveaddr)
-							 << " devID=" << ModbusRTU::dat2str(devID) 
-							 << " objID=" << ModbusRTU::dat2str(objID) 
-							 << endl;
-					}
-
-					ModbusRTU::MEIMessageRetRDI ret = mb.read4314(slaveaddr,devID,objID);
-					if( verb )
-						cout << "(reply): " << ret << endl;
-					else	
-						cout << "(reply): devID='" << (int)ret.devID << "' objNum='" << (int)ret.objNum << "'" << endl << ret.dlist << endl;
-				}
-				break;
-
 				case cmdWrite05:
 				{
 					if( verb )
@@ -507,7 +460,7 @@ int main( int argc, char **argv )
             catch( ModbusRTU::mbException& ex )
             {
             	if( ex.err != ModbusRTU::erTimeOut )
-            		throw;
+            		throw ex;
 
             	cout << "timeout..." << endl;
             }

conf/libuniset.spec

@@ -3,7 +3,7 @@
 
 Name: libuniset
 Version: 1.0
-Release: alt55
+Release: alt56
 Summary: UniSet - library for building distributed industrial control systems
 License: GPL
 Group: Development/C++
@@ -212,6 +212,9 @@ rm -f %buildroot%_libdir/*.la
 
 
 %changelog
+* Sat Nov 26 2011 Pavel Vainerman <pv@altlinux.ru> 1.0-alt56
+- (modbus): fixed bug (again) in ModbusSlave::readInputStatus(0x02)
+
 * Sat Nov 26 2011 Pavel Vainerman <pv@altlinux.ru> 1.0-alt55
 - (modbus): fixed bug in ModbusSlave::readInputStatus(0x02)
 

extensions/ModbusSlave/MBSlave.cc

@@ -125,7 +125,9 @@ prefix(prefix)
 	if( findArgParam("--" + prefix + "-allow-setdatetime",conf->getArgc(),conf->getArgv())!=-1 )
 		mbslot->connectSetDateTime( sigc::mem_fun(this, &MBSlave::setDateTime) );
 
+	mbslot->connectDiagnostics( sigc::mem_fun(this, &MBSlave::diagnostics) );
 	mbslot->connectFileTransfer( sigc::mem_fun(this, &MBSlave::fileTransfer) );	
+
 //	mbslot->connectJournalCommand( sigc::mem_fun(this, &MBSlave::journalCommand) );
 //	mbslot->connectRemoteService( sigc::mem_fun(this, &MBSlave::remoteService) );
 	// -------------------------------
@@ -608,7 +610,31 @@ void MBSlave::sensorInfo( UniSetTypes::SensorMessage* sm )
 				uniset_spin_lock lock(p->val_lock);
 				p->value = sm->value;
 			}
-			break;
+
+			int sz = VTypes::wsize(p->vtype);
+			if( sz < 1 )
+				return;
+
+			// если размер больше одного слова
+			// то надо обновить значение "везде"
+			// они если "всё верно инициализировано" идут подряд
+			int i=0;
+			for( ;i<sz && it!=iomap.end(); i++,it++ )
+			{
+				p  = &it->second;
+				if( p->si.id == sm->id )
+					p->value = sm->value;
+			}
+
+			if( dlog.debugging(Debug::CRIT) )
+			{
+				// вообще этого не может случиться
+				// потому-что корректность проверяется при загрузке
+				if( i != sz )
+					dlog[Debug::CRIT] << myname << "(sensorInfo): update failed for sid=" << sm->id
+						<< " (i=" << i << " sz=" << sz << ")" << endl;
+			}
+			return;
 		}
 	}
 }
@@ -889,7 +915,12 @@ ModbusRTU::mbErrCode MBSlave::writeOutputSingleRegister( ModbusRTU::WriteSingleO
 // -------------------------------------------------------------------------
 ModbusRTU::mbErrCode MBSlave::much_real_write( ModbusRTU::ModbusData reg, ModbusRTU::ModbusData* dat, 
 						int count )
-{
+{	if( dlog.debugging(Debug::INFO) )
+	{
+		dlog[Debug::INFO] << myname << "(much_real_write): read mbID="
+			<< ModbusRTU::dat2str(reg) << " count=" << count << endl;
+	}
+
 	int i=0;
 	IOMap::iterator it = iomap.end();
 	for( ; i<count; i++ )
@@ -1053,7 +1084,7 @@ ModbusRTU::mbErrCode MBSlave::much_real_read( ModbusRTU::ModbusData reg, ModbusR
 {
 	if( dlog.debugging(Debug::INFO) )
 	{
-		dlog[Debug::INFO] << myname << "(mush_real_read): read mbID="
+		dlog[Debug::INFO] << myname << "(much_real_read): read mbID="
 			<< ModbusRTU::dat2str(reg) << " count=" << count << endl;
 	}
 	
@@ -1297,10 +1328,9 @@ ModbusRTU::mbErrCode MBSlave::readInputStatus( ReadInputStatusMessage& query,
 			ModbusRTU::ModbusData d = 0;
 			ModbusRTU::mbErrCode ret = real_read(query.start,d);
 			if( ret == ModbusRTU::erNoError )
-				reply.addData(d);
+				reply.setBit(0,0,d);
 			else
-				reply.addData(0);
-
+				reply.setBit(0,0,0);
 			
 			pingOK = true;
 			return ret;
@@ -1308,29 +1338,15 @@ ModbusRTU::mbErrCode MBSlave::readInputStatus( ReadInputStatusMessage& query,
 
 		// Фомирование ответа:
 		much_real_read(query.start,buf,query.count);
-		for( int i=0; i<query.count; i++ )
-			reply.addData( buf[i] );
-/*
-		int num=0; // добавленное количество данных
-		ModbusRTU::ModbusData d = 0;
-		ModbusRTU::ModbusData reg = query.start;
-		for( ; num<query.count; num++, reg++ )
+		int bnum = 0;
+		int i=0;
+		while( i<query.count )
 		{
-			ModbusRTU::mbErrCode ret = real_read(reg,d);
-			if( ret == ModbusRTU::erNoError )
-				reply.addData(d);
-			else
 			reply.addData(0);
+			for( int nbit=0; nbit<BitsPerByte && i<query.count; nbit++,i++ )
+				reply.setBit(bnum,nbit,buf[i]);
+			bnum++;
 		}
-*/
-		// Если мы в начале проверили, что запрос входит в разрешёный диапазон
-		// то теоретически этой ситуации возникнуть не может...
-//		if( reply.bcnt < query.count )
-//		{
-//			dlog[Debug::WARN] << myname
-//				<< "(readInputStatus): query.count=" << query.count
-//					<< " > reply.count=" << reply.count << endl;
-//		}
 
 		pingOK = true;
 		return ModbusRTU::erNoError;
@@ -1375,3 +1391,46 @@ ModbusRTU::mbErrCode MBSlave::forceSingleCoil( ModbusRTU::ForceSingleCoilMessage
 	return ModbusRTU::erOperationFailed;
 }
 // -------------------------------------------------------------------------
+ModbusRTU::mbErrCode MBSlave::diagnostics( ModbusRTU::DiagnosticMessage& query,
+											ModbusRTU::DiagnosticRetMessage& reply )
+{
+	if( query.subf == ModbusRTU::subEcho )
+	{
+		reply = query;
+		return ModbusRTU::erNoError;
+	}
+
+	if( query.subf == ModbusRTU::dgBusErrCount )
+	{
+		reply = query;
+		reply.data[0] = errmap[ModbusRTU::erBadCheckSum];
+		return ModbusRTU::erNoError;
+	}
+
+	if( query.subf == ModbusRTU::dgMsgSlaveCount || query.subf == ModbusRTU::dgBusMsgCount )
+	{
+		reply = query;
+		reply.data[0] = askCount;
+		return ModbusRTU::erNoError;
+	}
+
+	if( query.subf == ModbusRTU::dgSlaveNAKCount )
+	{
+		reply = query;
+		reply.data[0] = errmap[erOperationFailed];
+		return ModbusRTU::erNoError;
+	}
+
+	if( query.subf == ModbusRTU::dgClearCounters )
+	{
+		askCount = 0;
+		errmap[erOperationFailed] = 0;
+		errmap[ModbusRTU::erBadCheckSum] = 0;
+		// другие счётчики пока не сбрасываем..
+		reply = query;
+		return ModbusRTU::erNoError;
+	}
+
+	return ModbusRTU::erOperationFailed;
+}
+// -------------------------------------------------------------------------