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

Bug fix

Browse Source
This commit is contained in:
zonetest 2017-07-11 15:05:57 -04:00
parent 630aab922a
commit 4e31b27857
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
sources/Modbus/ModbusBackend.cpp
View File

@ -35,14 +35,14 @@ void CModbusBackend::ModbusDataReady()
*TransactionDataStrm >> Transaction.mPDU.mFunctionCode; *TransactionDataStrm >> Transaction.mPDU.mFunctionCode;
Transaction.mPDU.mData = InData.right(Transaction.mHeader.mMessageLength - 2); //-2 to remove Device ID and Function Code. 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("modbus data received %s",InData.toHex().data());
qDebug("Transaction ID 0x%X",Transaction.mHeader.mTransactionID); // qDebug("Transaction ID 0x%X",Transaction.mHeader.mTransactionID);
qDebug("Message Length %d",Transaction.mHeader.mMessageLength); // qDebug("Message Length %d",Transaction.mHeader.mMessageLength);
qDebug("Protocol ID 0x%X",Transaction.mHeader.mProtocolID); // qDebug("Protocol ID 0x%X",Transaction.mHeader.mProtocolID);
qDebug("Unit ID 0x%X",Transaction.mHeader.mUnitID); // qDebug("Unit ID 0x%X",Transaction.mHeader.mUnitID);
qDebug("Function Code 0x%X",Transaction.mPDU.mFunctionCode); // qDebug("Function Code 0x%X",Transaction.mPDU.mFunctionCode);
qDebug("Data %s",Transaction.mPDU.mData.toHex().data()); // qDebug("Data %s",Transaction.mPDU.mData.toHex().data());
if(mModbusMode == MODBUS_MASTER_MODE) if(mModbusMode == MODBUS_MASTER_MODE)
{ {
@ -108,8 +108,8 @@ int CModbusBackend::AnalyzeModbusRequest(CModbusTransaction Transaction)
QByteArray data = mModbusRepo->GetHRData(StartAdress,NbRegisters,&ok); QByteArray data = mModbusRepo->GetHRData(StartAdress,NbRegisters,&ok);
qDebug("Slave Rx Read Holding Registers. Address: %d, Nb Reg: %d",StartAdress, NbRegisters); // qDebug("Slave Rx Read Holding Registers. Address: %d, Nb Reg: %d",StartAdress, NbRegisters);
qDebug("Data: %s",data.toHex().data()); // qDebug("Data: %s",data.toHex().data());
//The response to a HR reading needs the byte count before the data. //The response to a HR reading needs the byte count before the data.
quint8 ByteCount = data.size(); quint8 ByteCount = data.size();
@ -144,8 +144,8 @@ int CModbusBackend::AnalyzeModbusRequest(CModbusTransaction Transaction)
//Write register data //Write register data
mModbusRepo->WriteHRData(StartAdress,1,data); mModbusRepo->WriteHRData(StartAdress,1,data);
qDebug("Slave Rx Write Single Register. Address: %d, Value: 0x%s",StartAdress, data.toHex().data()); // qDebug("Slave Rx Write Single Register. Address: %d, Value: 0x%s",StartAdress, data.toHex().data());
qDebug("Data: %s",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. 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); SendModbusResponse(Transaction, data);
@ -192,8 +192,8 @@ int CModbusBackend::AnalyzeModbusRequest(CModbusTransaction Transaction)
//Write register data //Write register data
mModbusRepo->WriteHRData(StartAdress,NbRegisters,data); mModbusRepo->WriteHRData(StartAdress,NbRegisters,data);
qDebug("Slave Rx Write Multiple Registers. Address: %d, Nb Reg: %d",StartAdress, NbRegisters); // qDebug("Slave Rx Write Multiple Registers. Address: %d, Nb Reg: %d",StartAdress, NbRegisters);
qDebug("Data: %s",data.toHex().data()); // 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. 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); SendModbusResponse(Transaction, data);
@ -237,7 +237,7 @@ int CModbusBackend::SendModbusResponse(CModbusTransaction RequestTransaction, QB
ModbusPacket.append(Data); ModbusPacket.append(Data);
qDebug("Response packet: %s",ModbusPacket.toHex().data()); // qDebug("Response packet: %s",ModbusPacket.toHex().data());
mModbusTCPSocketHandle->write(ModbusPacket); mModbusTCPSocketHandle->write(ModbusPacket);

4
sources/Modbus/ModbusTKTransport.cpp
View File

@ -670,9 +670,9 @@ void CModbusTKTransport::ExecZT2SM()
else if(mZT2CDVState == false && mMaintenanceMode == false) else if(mZT2CDVState == false && mMaintenanceMode == false)
{ {
//The train has left... clear the alarms... //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); ClearTK(ZT2_TYPE_ID);
mModbusTKZT1SMState = MODBUS_ZT2_TK_STANDBY_STATE; mModbusTKZT2SMState = MODBUS_ZT2_TK_STANDBY_STATE;
} }
break; break;