Index: sources/canbus/messagehandler.cpp =================================================================== diff -u -ra288f091fb21c6cfccf7f7d2c500df1773ef083e -r2085b749d1d0aafe823e840f5aa0bc88a340798a --- sources/canbus/messagehandler.cpp (.../messagehandler.cpp) (revision a288f091fb21c6cfccf7f7d2c500df1773ef083e) +++ sources/canbus/messagehandler.cpp (.../messagehandler.cpp) (revision 2085b749d1d0aafe823e840f5aa0bc88a340798a) @@ -34,16 +34,14 @@ * \brief MessageHandler Constructor * \param parent */ -MessageHandler::MessageHandler(QObject *parent) : QObject(parent) -{ -} +MessageHandler::MessageHandler(QObject *parent) : QObject(parent) { } /*! * \brief Message Handler initializer */ void MessageHandler::init() { - connection(); + initConnections(); checked_in(); //startTimer(1000); } @@ -53,26 +51,27 @@ * \details Initializes the required signal/slot connection between this class and other objects\n * to be able to communicate. */ -void MessageHandler::connection() +void MessageHandler::initConnections() { // From GUI - connect(_ApplicationController, SIGNAL(didActionRequest(GuiActionType)), - this , SLOT( onActionRequest(GuiActionType))); - // From GUI - connect(_ApplicationController, SIGNAL(didActionPerform(GuiActionType,GuiActionData)), - this , SLOT( onActionPerform(GuiActionType, GuiActionData))); + connect(_ApplicationController, SIGNAL(didActionTransmit(GuiActionType, GuiActionData)), + this , SLOT( onActionTransmit(GuiActionType, GuiActionData))); // From HD/DG - connect(_CanInterface , SIGNAL(didRead(QCanBusFrame)), - this , SLOT( onRead(QCanBusFrame))); - + connect(_CanInterface , SIGNAL( didRead(QCanBusFrame)), + this , SLOT(onFrameReceive (QCanBusFrame))); } void MessageHandler::checked_in() { + transmitFrame(eChlid_UI, GuiActions::Check_In); +} + +void MessageHandler::transmitFrame(MessageHandler::Can_Id vCan_Id, GuiActionType vAction, GuiActionData vData) +{ QCanBusFrame mFrame; - mFrame.setFrameId(eChlid_UI); - mFrame.setPayload(buildMessage(GuiActions::Check_In)); - emit didActionPerform(mFrame); + mFrame.setFrameId(vCan_Id); + mFrame.setPayload(buildMessage(vAction,vData)); + emit didFrameTransmit(mFrame); } QByteArray MessageHandler::buildMessage(GuiActionType vAction, GuiActionData vData) @@ -186,38 +185,17 @@ * \details Processes the requested action * \param vAction - User requested Action */ -void MessageHandler::onActionRequest(GuiActionType vAction) +void MessageHandler::onActionTransmit(GuiActionType vAction, GuiActionData vData) { - // TODO : Test Code - QCanBusFrame mFrame; - mFrame.setFrameId(eChlid_UI); - mFrame.setPayload(buildMessage(vAction)); - emit didActionRequest(mFrame); + transmitFrame(eChlid_UI, vAction, vData); } /*! - * \brief Process the performed action - * \details An action which has been commanded by HD has been performed by GUI.\n - * GUI notifies that the action has been performed - * \param vAction - * \param vData - */ -void MessageHandler::onActionPerform(GuiActionType vAction, GuiActionData vData) -{ - // TODO : Test Code - QCanBusFrame mFrame; - mFrame.setFrameId(eChlid_UI); - mFrame.setPayload(buildMessage(vAction, vData)); - emit didActionPerform(mFrame); -} - -/*! * \brief MessageHandler::onRead * \param vFrame */ -void MessageHandler::onRead(const QCanBusFrame &vFrame) +void MessageHandler::onFrameReceive(const QCanBusFrame &vFrame) { - bool isCommand = true ; bool isUnknown = false; bool isIgnored = false; @@ -263,11 +241,7 @@ if (isUnknown || isIgnored) return; - if (isCommand) { - emit didActionCommand(message.actionId); - } else { - emit didActionConfirm(message.actionId, GuiActionData::Accepted); - } + emit didActionReceive (message.actionId, GuiActionData::Accepted); } void MessageHandler::timerEvent(QTimerEvent *event)