(Modbus): сделана предварительная реализация запроса и ответа на функцию 43/14 (0x2B/0x0E)

Utilities/MBTester/MBSlave.cc

@@ -3,8 +3,9 @@
 //#include <string.h>
 //#include <errno.h>
 #include <sstream>
-#include <UniSetTypes.h>
+#include "UniSetTypes.h"
 #include "MBSlave.h"
+#include "config.h"
 // -------------------------------------------------------------------------
 using namespace std;
 using namespace UniSetTypes;
@@ -48,6 +49,7 @@ 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);
@@ -467,3 +469,36 @@ 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 == rdiVendorName )
+	{
+		reply.mf = 0;
+		reply.conformity = 0;
+		reply.addData(rdiVendorName,"etersoft");
+		reply.addData(rdiProductCode, PACKAGE_NAME);
+		reply.addData(rdiMajorMinorRevision,PACKAGE_VERSION);
+		return erNoError;
+	}
+	else if( query.devID == rdiProductCode )
+	{
+		reply.mf = 0;
+		reply.conformity = 0;
+		reply.addData(rdiProductCode,PACKAGE_NAME);
+		return erNoError;
+	}
+	else if( query.devID == rdiMajorMinorRevision )
+	{
+		reply.mf = 0;
+		reply.conformity = 0;
+		reply.addData(rdiMajorMinorRevision,PACKAGE_VERSION);
+		return erNoError;
+	}
+
+	return ModbusRTU::erOperationFailed;
+}
+// -------------------------------------------------------------------------

Utilities/MBTester/MBSlave.h

@@ -94,6 +94,9 @@ class MBSlave
 		ModbusRTU::mbErrCode read4314( ModbusRTU::MEIMessageRDI& query, 
 														ModbusRTU::MEIMessageRetRDI& reply );
 
+		ModbusRTU::mbErrCode read4314( ModbusRTU::MEIMessageRDI& query,
+														ModbusRTU::MEIMessageRetRDI& reply );
+
 		/*! интерфейс ModbusRTUSlave для обмена по RS */
 		ModbusRTUSlaveSlot* rscomm;
 		ModbusRTU::ModbusAddr addr;			/*!< адрес данного узла */

Utilities/MBTester/MBTCPServer.h

@@ -80,6 +80,9 @@ class MBTCPServer
 		ModbusRTU::mbErrCode read4314( ModbusRTU::MEIMessageRDI& query, 
 														ModbusRTU::MEIMessageRetRDI& reply );
 
+		ModbusRTU::mbErrCode read4314( ModbusRTU::MEIMessageRDI& query,
+														ModbusRTU::MEIMessageRetRDI& reply );
+
 		/*! обработка запросов на чтение ошибок */
 		ModbusRTU::mbErrCode journalCommand( ModbusRTU::JournalCommandMessage& query,
 															ModbusRTU::JournalCommandRetMessage& reply );

configure.ac

@@ -147,7 +147,7 @@ fi
 AC_SUBST(UNISET_CODEGEN)
 echo "UNISET_CODEGEN: $UNISET_CODEGEN"
 
-UNISET_CFLAGS="-I \$(top_builddir)/include"
+UNISET_CFLAGS="-I \$(top_builddir) -I \$(top_builddir)/include"
 AC_SUBST(UNISET_CFLAGS)
 UNISET_LIBS="\$(top_builddir)/lib/libUniSet.la"
 AC_SUBST(UNISET_LIBS)

include/modbus/ModbusRTUSlaveSlot.h

@@ -60,6 +60,9 @@ class ModbusRTUSlaveSlot:
 		virtual ModbusRTU::mbErrCode diagnostics( ModbusRTU::DiagnosticMessage& query,
 														ModbusRTU::DiagnosticRetMessage& reply );
 
+		virtual ModbusRTU::mbErrCode read4314( ModbusRTU::MEIMessageRDI& query,
+														ModbusRTU::MEIMessageRetRDI& reply );
+
 		virtual ModbusRTU::mbErrCode journalCommand( ModbusRTU::JournalCommandMessage& query,
 														ModbusRTU::JournalCommandRetMessage& reply );
 

include/modbus/ModbusServer.h

@@ -167,6 +167,14 @@ class ModbusServer
 		virtual ModbusRTU::mbErrCode diagnostics( ModbusRTU::DiagnosticMessage& query,
 														ModbusRTU::DiagnosticRetMessage& reply )=0;
 
+		/*! Обработка запроса 43(0x2B).
+			\param query - запрос
+			\param reply - ответ. Заполняется в обработчике.
+			\return Результат обработки
+		*/
+		virtual ModbusRTU::mbErrCode read4314( ModbusRTU::MEIMessageRDI& query,
+														ModbusRTU::MEIMessageRetRDI& reply )=0;
+
 
 		/*! Обработка запроса по журналу (0x65)
 			\param query - запрос

src/Communications/Modbus/ModbusTypes.cc

@@ -972,7 +972,7 @@ ModbusMessage ReadOutputRetMessage::transport_msg()
 	// копируем
 	memcpy(&(mm.data[ind]),dtmp,bcnt);
 
-	delete[] dtmp;
+	delete dtmp;
 
 	ind+=bcnt;
 
@@ -1183,7 +1183,7 @@ ModbusMessage ReadInputRetMessage::transport_msg()
 	// копируем
 	memcpy(&(mm.data[ind]),dtmp,bcnt);
 
-	delete[] dtmp;
+	delete dtmp;
 
 	ind+=bcnt;
 
@@ -1547,7 +1547,7 @@ ModbusMessage WriteOutputMessage::transport_msg()
 
 	// копируем данные
 	memcpy(&(mm.data[ind]),dtmp,bcnt);
-	delete[] dtmp;
+	delete dtmp;
 
 	ind+=bcnt;
 
@@ -2250,7 +2250,7 @@ ModbusMessage DiagnosticMessage::transport_msg()
 	// копируем
 	memcpy(&(mm.data[ind]),dtmp,sizeof(ModbusData)*count);
 
-	delete[] dtmp;
+	delete dtmp;
 
 	ind+=sizeof(ModbusData)*count;
 
@@ -2617,7 +2617,7 @@ std::ostream& ModbusRTU::operator<<(std::ostream& os, MEIMessageRetRDI& m )
 	{
 		os << endl;
 		for( RDIObjectList::iterator it=m.dlist.begin(); it!=m.dlist.end(); it++ )
-			os << "     " << rdi2str(it->id) << " : " << it->val << endl;
+			os << "     " << (int)(it->id) << " : " << it->val << endl;
 	}
 
 	return os;
@@ -2633,7 +2633,7 @@ std::ostream& ModbusRTU::operator<<(std::ostream& os,RDIObjectList& dlist )
 	if( !dlist.empty() )
 	{
 		for( RDIObjectList::iterator it=dlist.begin(); it!=dlist.end(); it++ )
-			os << "     " << rdi2str(it->id) << " : " << it->val << endl;
+			os << "     " << (int)(it->id) << " : " << it->val << endl;
 	}
 
 	return os;
@@ -2745,7 +2745,7 @@ ModbusMessage JournalCommandRetMessage::transport_msg()
 	// копируем
 	memcpy(&(mm.data[ind]),dtmp,bcnt);
 
-	delete[] dtmp;
+	delete dtmp;
 
 	ind += bcnt;
 
@@ -3493,31 +3493,3 @@ void ModbusTCP::MBAPHeader::swapdata()
 	len = SWAPSHORT(len);
 }
 // -----------------------------------------------------------------------
-std::string ModbusRTU::rdi2str( int id )
-{
-	if( id == rdiVendorName )
-		return "VendorName";
-
-	if( id == rdiProductCode )
-		return "ProductName";
-
-	if( id == rdiMajorMinorRevision )
-		return "MajorMinorRevision";
-
-	if( id == rdiVendorURL )
-		return "VendorURL";
-
-	if( id == rdiProductName )
-		return "ProductName";
-
-	if( id == rdiModelName )
-		return "ModelName";
-
-	if( id == rdiUserApplicationName )
-		return "UserApplicationName";
-
-	ostringstream s;
-	s << id;
-	return s.str();
-}
-// -----------------------------------------------------------------------