Index: sources/canbus/messagehandler.cpp =================================================================== diff -u -r25cb66f0126963addc781f161dbfb8b0ea58f547 -rde2f87e15fa05b1c45581cfedd8f1af0c47c2b48 --- sources/canbus/messagehandler.cpp (.../messagehandler.cpp) (revision 25cb66f0126963addc781f161dbfb8b0ea58f547) +++ sources/canbus/messagehandler.cpp (.../messagehandler.cpp) (revision de2f87e15fa05b1c45581cfedd8f1af0c47c2b48) @@ -30,7 +30,7 @@ SINGLETON_INIT(MessageHandler) /*! - * \brief MessageHandler::MessageHandler + * \brief MessageHandler Constructor * \param parent */ MessageHandler::MessageHandler(QObject *parent) : QObject(parent) @@ -56,7 +56,7 @@ // From GUI connect(_ApplicationController, SIGNAL(didActionPerform(GuiActionType,GuiActionInfo)), this , SLOT( onActionPerform(GuiActionType, GuiActionInfo))); - + // From HD/DG connect(_CanInterface , SIGNAL(didRead(QCanBusFrame)), this , SLOT( onRead(QCanBusFrame))); @@ -71,14 +71,13 @@ void MessageHandler::onActionRequest(GuiActionType vAction) { // TODO : Test Code - qDebug() << "MessageHandler.actionRequested : " << vAction; QCanBusFrame mFrame; - QByteArray mPayload; + QString mPayload; switch (vAction) { case GuiActionType::PowerOff: - mFrame.setFrameId(2); - mPayload.append("\x01\x00\x01\x01\x00\x00\x00\x00"); - mFrame.setPayload(mPayload); + mFrame.setFrameId(eChlid_UI); + mPayload = "A5 01 00 00 00 00 00 00"; + mFrame.setPayload(QByteArray::fromHex(mPayload.remove(QLatin1Char(' ')).toLatin1())); break; default: break; @@ -96,12 +95,11 @@ void MessageHandler::onActionPerform(GuiActionType vAction, GuiActionInfo vInfo) { // TODO : Test Code - qDebug() << "MessageHandler.actionPerformed : " << vAction << vInfo; QCanBusFrame mFrame; QString mPayload; switch (vAction) { case GuiActionType::PowerOff: - mFrame.setFrameId(256); + mFrame.setFrameId(eChlid_UI); if (vInfo == GuiActionInfo::Accepted) { mPayload = "A5 01 00 01 01 00 00 00"; } @@ -124,14 +122,24 @@ { // TODO : Test Code bool isCommand = true; + bool isUnknown = false; + + // TODO : For test + if (vFrame.toString() != " 020 [8] A5 01 00 00 00 00 00 00") { + isUnknown = true; + } + switch (vFrame.frameId()) { - case 20: - qDebug() << "HD Command:" << vFrame.payload(); + case eChlid_HD: + // qDebug() << "<=HD"; break; default: break; } + if (isUnknown) return; + if (isCommand) { + //qDebug() << vFrame.toString(); emit didActionCommand(GuiActions::PowerOff); } else {