diff --git a/Configuration/ZT.cfg b/Configuration/ZT.cfg index fb3f7a6..faffee3 100644 --- a/Configuration/ZT.cfg +++ b/Configuration/ZT.cfg @@ -81,13 +81,13 @@ ENGLOG=3 #STATION=HONORE_BEAUGRAND #STATION=ANGRIGNON -#STATION=HENRI_BOURASSA +STATION=HENRI_BOURASSA #STATION=COTE_VERTU #STATION=BERRI_UQAM #STATION=LONGUEIL #STATION=SAINT_MICHEL #STATION=SNOWDON_L5 -STATION=MONTMORENCY +#STATION=MONTMORENCY #STATION=MONTMORENCY_10_12 #STATION=MONTMORENCY_10_22 #STATION=DU_COLLEGE diff --git a/sources/Modbus/ModbusBackend.cpp b/sources/Modbus/ModbusBackend.cpp index 0b2eaeb..5c86495 100644 --- a/sources/Modbus/ModbusBackend.cpp +++ b/sources/Modbus/ModbusBackend.cpp @@ -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; diff --git a/sources/Modbus/ModbusSEIMgr.cpp b/sources/Modbus/ModbusSEIMgr.cpp index 0a2809c..d90a79a 100644 --- a/sources/Modbus/ModbusSEIMgr.cpp +++ b/sources/Modbus/ModbusSEIMgr.cpp @@ -3,6 +3,7 @@ #include "ModbusCCDefs.h" #include "ModbusSEIDefs.h" #include "GlobalDefine.h" +#include 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() diff --git a/sources/Zonetest.cpp b/sources/Zonetest.cpp index 976ead8..715581a 100644 --- a/sources/Zonetest.cpp +++ b/sources/Zonetest.cpp @@ -1223,6 +1223,8 @@ void CZoneTest::ApplySEISettings(QHostAddress SEIHostAdd) mZTSettings->mSEIModbusHostAddress = SEIHostAdd; mZTSettingsFileMgr.SaveSettings(mZTSettings); + mModbusSEIMgr->SEISettingsChanged(SEIHostAdd,CZTConfigMgr::instance()->GetModbusSEIPort(),CZTConfigMgr::instance()->GetModbusSEIDevID()); + //TODO: apply changes and reconnect. }