Index: sources/canbus/messagedispatcher.cpp =================================================================== diff -u -re58b907a69d4ca7daa77d69791593b886d1b80e8 -r8c69137f18382bdc55a5678e6ed44a7683fe4dea --- sources/canbus/messagedispatcher.cpp (.../messagedispatcher.cpp) (revision e58b907a69d4ca7daa77d69791593b886d1b80e8) +++ sources/canbus/messagedispatcher.cpp (.../messagedispatcher.cpp) (revision 8c69137f18382bdc55a5678e6ed44a7683fe4dea) @@ -25,8 +25,10 @@ using namespace Can; /*! - * \brief MessageDispatcher Constructor - * \param parent + * \brief MessageDispatcher::MessageDispatcher + * \details Constructor + * \param parent - QObject parent owner object. + * Qt handles the children destruction by their parent objects life-cycle. */ MessageDispatcher::MessageDispatcher(QObject *parent) : QObject(parent) { } @@ -125,20 +127,21 @@ * Upon completion of collected all the required frames * on successful interpretation of the message, emits didActionReceived signal. * The message will be removed from list of the channel vCan_Id messages. - * \param vCanId - CANBUS channel of the frame + * \param vCan_Id - CANBUS channel of the frame * \param vPayload - Payload of the frame */ -void MessageDispatcher::onFrameReceive(Can_Id vCanId, const QByteArray &vPayload) +void MessageDispatcher::onFrameReceive(Can_Id vCan_Id, const QByteArray &vPayload) { // Append a message to the list - if (_messageList[vCanId].isEmpty() || _messageList[vCanId].last().isComplete()) { - _messageList[vCanId].append(Message()); + if (_messageList[vCan_Id].isEmpty() || _messageList[vCan_Id].last().isComplete()) { + _messageList[vCan_Id].append(Message()); } // build the message and check. - if (! buildMessage(vCanId, vPayload)) + if (! buildMessage(vCan_Id, vPayload)) { return; - Message mMessage = _messageList[vCanId].last(); + } + Message mMessage = _messageList[vCan_Id].last(); // TODO : must be moved to a MessageModel class if (mMessage.isComplete()) { @@ -166,7 +169,7 @@ * \param vActionId - The ActionID of the message * \param vData - The data of the Message */ -void MessageDispatcher::actionTransmit(GuiActionType vActionId, const QVariantList &vData) +void MessageDispatcher::actionTransmit(GuiActionType vActionId, const QVariantList &vData, Sequence /*vSequence*/) { QByteArray mData; if (! _interpreter.interpretMessage(vActionId, vData, mData)) { @@ -180,25 +183,25 @@ return; } for (const auto &frame : frameList) { - emit didFrameTransmit(eChlid_UI, frame); + emit didFrameTransmit(eChlid_UI_HD, frame); } } /*! * \brief MessageDispatcher::buildMessage * \details Calls the messageBuilder buildMessage method. - * \param vCanId - CANBUS channel of the frame + * \param vCan_Id - CANBUS channel of the frame * \param vPayload - Payload of the frame * \return false on error */ -bool MessageDispatcher::buildMessage(Can_Id vCanId, const QByteArray &vPayload) +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())); return false; } - if (! _builder.buildMessage(vPayload, _messageList[vCanId].last(), vCanId)) { - _messageList[vCanId].removeLast(); + if (! _builder.buildMessage(vPayload, _messageList[vCan_Id].last(), vCan_Id)) { + _messageList[vCan_Id].removeLast(); return false; } return true; @@ -221,11 +224,11 @@ GuiActionType mActionId = vMessage.actionId; switch (mActionId) { case GuiActionType::Acknow: - emit didAcknowReceive(mData); + emit didAcknowReceive(vMessage.sequence); break; default: if (vMessage.sequence < 0) { - // actionTransmit(-vMessage.sequence, GuiActionType::Acknow,{}); + //actionTransmit(-vMessage.sequence, GuiActionType::Acknow,{}); } emit didActionReceive(mActionId, mData); break;