From 4e31b27857a29834bab9132c865b8778b9e14856 Mon Sep 17 00:00:00 2001
From: zonetest <jean-francois.martel@stm.info>
Date: Tue, 11 Jul 2017 15:05:57 -0400
Subject: [PATCH] Bug fix

---
 sources/Modbus/ModbusBackend.cpp     | 28 ++++++++++++++--------------
 sources/Modbus/ModbusTKTransport.cpp |  4 ++--
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/sources/Modbus/ModbusBackend.cpp b/sources/Modbus/ModbusBackend.cpp
index ccd5b95..54f6aef 100644
--- a/sources/Modbus/ModbusBackend.cpp
+++ b/sources/Modbus/ModbusBackend.cpp
@@ -35,14 +35,14 @@ void CModbusBackend::ModbusDataReady()
     *TransactionDataStrm >> Transaction.mPDU.mFunctionCode;
     Transaction.mPDU.mData = InData.right(Transaction.mHeader.mMessageLength - 2);    //-2 to remove Device ID and Function Code.
 
-    qDebug("modbus data received %s",InData.toHex().data());
-    qDebug("Transaction ID 0x%X",Transaction.mHeader.mTransactionID);
-    qDebug("Message Length %d",Transaction.mHeader.mMessageLength);
-    qDebug("Protocol ID 0x%X",Transaction.mHeader.mProtocolID);
-    qDebug("Unit ID 0x%X",Transaction.mHeader.mUnitID);
+  //  qDebug("modbus data received %s",InData.toHex().data());
+  //  qDebug("Transaction ID 0x%X",Transaction.mHeader.mTransactionID);
+ //   qDebug("Message Length %d",Transaction.mHeader.mMessageLength);
+  //  qDebug("Protocol ID 0x%X",Transaction.mHeader.mProtocolID);
+  //  qDebug("Unit ID 0x%X",Transaction.mHeader.mUnitID);
 
-    qDebug("Function Code 0x%X",Transaction.mPDU.mFunctionCode);
-    qDebug("Data %s",Transaction.mPDU.mData.toHex().data());
+ //  qDebug("Function Code 0x%X",Transaction.mPDU.mFunctionCode);
+ //   qDebug("Data %s",Transaction.mPDU.mData.toHex().data());
 
     if(mModbusMode == MODBUS_MASTER_MODE)
     {
@@ -108,8 +108,8 @@ int CModbusBackend::AnalyzeModbusRequest(CModbusTransaction Transaction)
 
             QByteArray data = mModbusRepo->GetHRData(StartAdress,NbRegisters,&ok);
 
-            qDebug("Slave Rx Read Holding Registers.  Address: %d, Nb Reg: %d",StartAdress, NbRegisters);
-            qDebug("Data: %s",data.toHex().data());
+   //         qDebug("Slave Rx Read Holding Registers.  Address: %d, Nb Reg: %d",StartAdress, NbRegisters);
+   //         qDebug("Data: %s",data.toHex().data());
 
             //The response to a HR reading needs the byte count before the data.
             quint8 ByteCount = data.size();
@@ -144,8 +144,8 @@ int CModbusBackend::AnalyzeModbusRequest(CModbusTransaction Transaction)
             //Write register data
             mModbusRepo->WriteHRData(StartAdress,1,data);
 
-            qDebug("Slave Rx Write Single Register.  Address: %d, Value: 0x%s",StartAdress, data.toHex().data());
-            qDebug("Data: %s",data.toHex().data());
+   //         qDebug("Slave Rx Write Single Register.  Address: %d, Value: 0x%s",StartAdress, data.toHex().data());
+    //        qDebug("Data: %s",data.toHex().data());
 
             data = Transaction.mPDU.mData.left(4);   //The response corresponds to the Reg. Address & the value.  Which is the first 4 bytes of the initial request.
             SendModbusResponse(Transaction, data);
@@ -192,8 +192,8 @@ int CModbusBackend::AnalyzeModbusRequest(CModbusTransaction Transaction)
             //Write register data
             mModbusRepo->WriteHRData(StartAdress,NbRegisters,data);
 
-            qDebug("Slave Rx Write Multiple Registers.  Address: %d, Nb Reg: %d",StartAdress, NbRegisters);
-            qDebug("Data: %s",data.toHex().data());
+     //       qDebug("Slave Rx Write Multiple Registers.  Address: %d, Nb Reg: %d",StartAdress, NbRegisters);
+    //        qDebug("Data: %s",data.toHex().data());
 
             data = Transaction.mPDU.mData.left(4);   //The response corresponds to the Start Adress and Nb of Regs.  Which is the first 4 bytes of the initial request.
             SendModbusResponse(Transaction, data);
@@ -237,7 +237,7 @@ int CModbusBackend::SendModbusResponse(CModbusTransaction RequestTransaction, QB
     ModbusPacket.append(Data);
 
 
-    qDebug("Response packet: %s",ModbusPacket.toHex().data());
+ //   qDebug("Response packet: %s",ModbusPacket.toHex().data());
 
     mModbusTCPSocketHandle->write(ModbusPacket);
 
diff --git a/sources/Modbus/ModbusTKTransport.cpp b/sources/Modbus/ModbusTKTransport.cpp
index 3d0c97b..1cc51ea 100644
--- a/sources/Modbus/ModbusTKTransport.cpp
+++ b/sources/Modbus/ModbusTKTransport.cpp
@@ -670,9 +670,9 @@ void CModbusTKTransport::ExecZT2SM()
             else if(mZT2CDVState == false && mMaintenanceMode == false)
             {
                 //The train has left... clear the alarms...
-                CZTLog::instance()->AddLogString("Libération du CDV de quai ZT2.  Acquitement automatique des alarmes ZT2 au PCC",true);
+                CZTLog::instance()->AddLogString("Libération du CDV N+1 ZT2.  Acquitement automatique des alarmes ZT2 au PCC",true);
                 ClearTK(ZT2_TYPE_ID);
-                mModbusTKZT1SMState = MODBUS_ZT2_TK_STANDBY_STATE;
+                mModbusTKZT2SMState = MODBUS_ZT2_TK_STANDBY_STATE;
             }
 
             break;