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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Configuration/ZT.cfg
View File

@ -81,13 +81,13 @@ ENGLOG=3
#STATION=HONORE_BEAUGRAND #STATION=HONORE_BEAUGRAND
#STATION=ANGRIGNON #STATION=ANGRIGNON
#STATION=HENRI_BOURASSA STATION=HENRI_BOURASSA
#STATION=COTE_VERTU #STATION=COTE_VERTU
#STATION=BERRI_UQAM #STATION=BERRI_UQAM
#STATION=LONGUEIL #STATION=LONGUEIL
#STATION=SAINT_MICHEL #STATION=SAINT_MICHEL
#STATION=SNOWDON_L5 #STATION=SNOWDON_L5
STATION=MONTMORENCY #STATION=MONTMORENCY
#STATION=MONTMORENCY_10_12 #STATION=MONTMORENCY_10_12
#STATION=MONTMORENCY_10_22 #STATION=MONTMORENCY_10_22
#STATION=DU_COLLEGE #STATION=DU_COLLEGE

6
sources/Modbus/ModbusBackend.cpp
View File

@ -403,8 +403,8 @@ int CModbusBackend::AnalyzeModbusResponse(CModbusTransaction Transaction)
return RET_ERROR; return RET_ERROR;
} }
qDebug("Master Rx Write Multiple Registers response. Address: %d, Nb Reg: %d",StartAdress, NbRegisters); // qDebug("Master Rx Write Multiple Registers response. Address: %d, Nb Reg: %d",StartAdress, NbRegisters);
qDebug("Data: %s",Transaction.mPDU.mData.toHex().data()); // qDebug("Data: %s",Transaction.mPDU.mData.toHex().data());
//All is good. //All is good.
@ -440,7 +440,7 @@ int CModbusBackend::SendModbusRequest(CModbusRequest *Request)
ModbusPacket.append(Request->mPDU.mData); ModbusPacket.append(Request->mPDU.mData);
qDebug("Request packet: %s",ModbusPacket.toHex().data()); // qDebug("Request packet: %s",ModbusPacket.toHex().data());
mModbusTCPSocketHandle->write(ModbusPacket); mModbusTCPSocketHandle->write(ModbusPacket);
delete PacketDataStrm; delete PacketDataStrm;

18
sources/Modbus/ModbusSEIMgr.cpp
View File

@ -3,6 +3,7 @@
#include "ModbusCCDefs.h" #include "ModbusCCDefs.h"
#include "ModbusSEIDefs.h" #include "ModbusSEIDefs.h"
#include "GlobalDefine.h" #include "GlobalDefine.h"
#include <ZTLog.h>
CModbusSEIMgr::CModbusSEIMgr(CModbusRepository *SEIRepo, CModbusRepository *CCRepo, QHostAddress ServerIP, int ModbusPort, int DevID): CModbusSEIMgr::CModbusSEIMgr(CModbusRepository *SEIRepo, CModbusRepository *CCRepo, QHostAddress ServerIP, int ModbusPort, int DevID):
CModbusBackend(SEIRepo) CModbusBackend(SEIRepo)
@ -71,22 +72,17 @@ int CModbusSEIMgr::ConnectToSlave(QHostAddress SlaveIP, int SlavePort)
int CModbusSEIMgr::DisconnectFromSlave() int CModbusSEIMgr::DisconnectFromSlave()
{ {
if(mModbusTCPSocketHandle->state() != QAbstractSocket::ConnectedState)
{
mModbusTCPSocketHandle->disconnectFromHost();
mConnectionTimer->start();
return 0;
}
qDebug("Requesting Disconnection from NetTrac...");
mModbusTCPSocketHandle->disconnectFromHost(); mModbusTCPSocketHandle->disconnectFromHost();
mConnectionTimer->start();
return 1; return 1;
} }
void CModbusSEIMgr::SocketConnected() void CModbusSEIMgr::SocketConnected()
{ {
emit ModbusMasterConnected(mModbusTCPSocketHandle->localAddress().toIPv4Address(),mModbusTCPSocketHandle->peerAddress().toIPv4Address()); 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(); mConnectionTimer->stop();
mSEIModbusUpdateTimer->start(); mSEIModbusUpdateTimer->start();
} }
@ -97,7 +93,9 @@ void CModbusSEIMgr::SocketDisconnected()
emit ModbusMasterDisconnected(); emit ModbusMasterDisconnected();
mConnectionTimer->start(); mConnectionTimer->start();
mSEIModbusUpdateTimer->stop(); 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() int CModbusSEIMgr::ReadModbusRegisters()

2
sources/Zonetest.cpp
View File

@ -1223,6 +1223,8 @@ void CZoneTest::ApplySEISettings(QHostAddress SEIHostAdd)
mZTSettings->mSEIModbusHostAddress = SEIHostAdd; mZTSettings->mSEIModbusHostAddress = SEIHostAdd;
mZTSettingsFileMgr.SaveSettings(mZTSettings); mZTSettingsFileMgr.SaveSettings(mZTSettings);
mModbusSEIMgr->SEISettingsChanged(SEIHostAdd,CZTConfigMgr::instance()->GetModbusSEIPort(),CZTConfigMgr::instance()->GetModbusSEIDevID());
//TODO: apply changes and reconnect. //TODO: apply changes and reconnect.
} }