Index: sources/canbus/messagedispatcher.cpp =================================================================== diff -u -r44a85c96ab55e424866ec4cca0270aa218355f82 -rd2035a8728794afeefaa244bf8d1597926d945f5 --- sources/canbus/messagedispatcher.cpp (.../messagedispatcher.cpp) (revision 44a85c96ab55e424866ec4cca0270aa218355f82) +++ sources/canbus/messagedispatcher.cpp (.../messagedispatcher.cpp) (revision d2035a8728794afeefaa244bf8d1597926d945f5) @@ -45,10 +45,10 @@ if ( _init ) return false; _init = true; - // runs in USBWatcher thread + // runs in DriveWatcher thread initConnections(); - LOG_EVENT(QObject::tr("%1 Initialized").arg(metaObject()->className())); + LOG_EVENT("UI," + tr("%1 Initialized").arg(metaObject()->className())); return true; } @@ -103,9 +103,6 @@ connect(&_MessageAcknowModel , SIGNAL(didFailedTransmit( Sequence )), this , SLOT( onFailedTransmit( Sequence ))); - // From HD -> Message interpreter -// ACTION_RECEIVE_INTERPRETER_CONNECTIONS - // ---- Signal/Slots ADJUST_TRANSMT_MODEL_BRIDGE_CONNECTIONS(_ApplicationController) ACTION_RECEIVE_MODEL_BRIDGE_CONNECTIONS(_interpreter ) @@ -228,7 +225,7 @@ QVariantList mData; mData += vData.bloodFlow; mData += vData.dialysateFlow; - onActionTransmit(GuiActionType::AdjustBloodDialysateReq, mData); + onActionTransmit(GuiActionType::ID_AdjustBloodDialysateReq, mData); } /*! @@ -241,7 +238,7 @@ { QVariantList mData; mData += vData.duration; - onActionTransmit(GuiActionType::AdjustDurationReq, mData); + onActionTransmit(GuiActionType::ID_AdjustDurationReq, mData); } /*! @@ -254,7 +251,7 @@ { QVariantList mData; mData += vData.requestedState; - actionTransmit(GuiActionType::AdjustUltrafiltrationStateReq, mData); + actionTransmit(GuiActionType::ID_AdjustUltrafiltrationStateReq, mData); } /*! @@ -267,7 +264,7 @@ { QVariantList mData; mData += vData.volume; - onActionTransmit(GuiActionType::AdjustUltrafiltrationEditReq, mData); + onActionTransmit(GuiActionType::ID_AdjustUltrafiltrationEditReq, mData); } /*! @@ -281,7 +278,7 @@ QVariantList mData; mData += vData.volume; mData += vData.option; - onActionTransmit(GuiActionType::AdjustUltrafiltrationConfirmReq, mData); + onActionTransmit(GuiActionType::ID_AdjustUltrafiltrationConfirmReq, mData); } @@ -305,7 +302,7 @@ QByteArray mData; if (! _interpreter.interpretMessage(vActionId, vData, mData)) { - LOG_ERROR(tr("Incorrect Message, can't be interpreted")); + LOG_DEBUG(QString("Incorrect Message, can't be interpreted, %1").arg(Format::toHexString(vActionId))); // TODO : LOGGINF IMPROVEMENT return; } @@ -315,14 +312,14 @@ bool mNeedsAcknow = needsAcknow(vActionId); if (mNeedsAcknow) { mSequence = -mSequence; - LOG_EVENT(tr("UI Ack Req %1").arg(mSequence)); + LOG_EVENT(tr("UI,Ack Req, Sq:%1, ID:%2").arg(mSequence).arg(Format::toHexString(vActionId))); #ifdef DEBUG_ACKBACK_HD_TO_UI qDebug() << tr(" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ UI AckReq : %1 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ").arg(mSequence); #endif } if ( ! _builder.buildFrames(vActionId, mData, frameList, mSequence) ) { - LOG_ERROR(tr("Incorrect Message can't be built")); + LOG_DEBUG(QString("Incorrect Message can't be built")); // TODO : LOGGINF IMPROVEMENT return; } if (mNeedsAcknow) { @@ -359,7 +356,8 @@ bool MessageDispatcher::buildMessage(Can_Id vCan_Id, const QByteArray &vPayload) { if (vPayload.length() < eLenCanFrame) { - LOG_ERROR(tr("Incorrect frame length. Exp:%1,got:%2").arg(eLenCanFrame).arg(vPayload.length())); + // Each frame has to have exactly 8 (eLenCanFrame) bytes of data and not used bytes should be passed as 00. + LOG_DEBUG(QString("Incorrect frame length. Exp:%1,got:%2").arg(eLenCanFrame).arg(vPayload.length())); return false; } if (! _builder.buildMessage(vPayload, _messageList[vCan_Id].last(), vCan_Id)) { @@ -388,8 +386,8 @@ ok = true; GuiActionType mActionId = vMessage.actionId; switch (mActionId) { - case GuiActionType::Acknow: - LOG_EVENT(tr("HD Ack Bak %1").arg(mSequence)); + case GuiActionType::ID_Acknow: + LOG_EVENT(tr("HD,Ack Bak, Sq:%1").arg(mSequence)); #ifdef DEBUG_ACKBACK_HD_TO_UI qDebug() << tr(" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ HD AckBak : %1 %2 ~~~~~~~~~~~~~~~~~~~~~~~~~~~ ").arg(mSequence).arg(vMessage.actionId); #endif @@ -398,12 +396,13 @@ default: if (mSequence < 0) { - LOG_EVENT(tr("HD Ack Req %1").arg(mSequence)); + LOG_EVENT(tr("HD,Ack Req, Sq:%1, ID:%2").arg(mSequence).arg(Format::toHexString(mActionId))); #ifdef DEBUG_ACKBACK_HD_TO_UI qDebug() << tr(" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ HD AckReq : %1 %2 ~~~~~~~~~~~~~~~~~~~~~~~~~~~ ").arg(mSequence).arg(vMessage.actionId); #endif // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ UI AckBak is immediately handled at the same place. - actionTransmit(GuiActionType::Acknow, {}, -mSequence); + actionTransmit(GuiActionType::ID_Acknow, {}, -mSequence); + LOG_EVENT(tr("UI,Ack Bak, Sq:%1").arg(-mSequence)); #ifdef DEBUG_ACKBACK_HD_TO_UI qDebug() << tr(" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ UI AckBak : %1 %2 ~~~~~~~~~~~~~~~~~~~~~~~~~~~ ").arg(-mSequence).arg(vMessage.actionId); #endif