jfmartel/ZT
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Modbus Dev...

Browse Source
This commit is contained in:
jfmartel
2019-09-25 13:45:03 -04:00
parent 6f596a9f1e
commit 9ef96c5db5
4 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/Modbus/ModbusBackend.cpp
+3 -3
View File
@@ -403,8 +403,8 @@ int CModbusBackend::AnalyzeModbusResponse(CModbusTransaction Transaction)
return RET_ERROR;
}
qDebug("Master Rx Write Multiple Registers response. Address: %d, Nb Reg: %d",StartAdress, NbRegisters);
qDebug("Data: %s",Transaction.mPDU.mData.toHex().data());
// qDebug("Master Rx Write Multiple Registers response. Address: %d, Nb Reg: %d",StartAdress, NbRegisters);
// qDebug("Data: %s",Transaction.mPDU.mData.toHex().data());
//All is good.
@@ -440,7 +440,7 @@ int CModbusBackend::SendModbusRequest(CModbusRequest *Request)
ModbusPacket.append(Request->mPDU.mData);
qDebug("Request packet: %s",ModbusPacket.toHex().data());
// qDebug("Request packet: %s",ModbusPacket.toHex().data());
mModbusTCPSocketHandle->write(ModbusPacket);
delete PacketDataStrm;
sources/Modbus/ModbusSEIMgr.cpp
+8 -10
View File
@@ -3,6 +3,7 @@
#include "ModbusCCDefs.h"
#include "ModbusSEIDefs.h"
#include "GlobalDefine.h"
#include <ZTLog.h>
CModbusSEIMgr::CModbusSEIMgr(CModbusRepository *SEIRepo, CModbusRepository *CCRepo, QHostAddress ServerIP, int ModbusPort, int DevID):
CModbusBackend(SEIRepo)
@@ -71,22 +72,17 @@ int CModbusSEIMgr::ConnectToSlave(QHostAddress SlaveIP, int SlavePort)
int CModbusSEIMgr::DisconnectFromSlave()
{
if(mModbusTCPSocketHandle->state() != QAbstractSocket::ConnectedState)
{
mModbusTCPSocketHandle->disconnectFromHost();
mConnectionTimer->start();
return 0;
}
qDebug("Requesting Disconnection from NetTrac...");
mModbusTCPSocketHandle->disconnectFromHost();
mConnectionTimer->start();
return 1;
}
void CModbusSEIMgr::SocketConnected()
{
emit ModbusMasterConnected(mModbusTCPSocketHandle->localAddress().toIPv4Address(),mModbusTCPSocketHandle->peerAddress().toIPv4Address());
qDebug("Master: Connection established with NetTrac");
// qDebug("Master: Connection established with NetTrac");
CZTLog::instance()->AddLogString("Connection Modbus (Ethernet) avec NetTrac établi",true);
mConnectionTimer->stop();
mSEIModbusUpdateTimer->start();
}
@@ -97,7 +93,9 @@ void CModbusSEIMgr::SocketDisconnected()
emit ModbusMasterDisconnected();
mConnectionTimer->start();
mSEIModbusUpdateTimer->stop();
qDebug("Disconnected from NetTrac");
// qDebug("Disconnected from NetTrac");
// CZTLog::instance()->AddLogString("Connexion avec NetTrac établi",true);
CZTLog::instance()->AddLogString("Connection Modbus (Ethernet) avec NetTrac rompue",true);
}
int CModbusSEIMgr::ReadModbusRegisters()