Index: sources/canbus/messageinterpreter.cpp =================================================================== diff -u -re58b907a69d4ca7daa77d69791593b886d1b80e8 -r8c69137f18382bdc55a5678e6ed44a7683fe4dea --- sources/canbus/messageinterpreter.cpp (.../messageinterpreter.cpp) (revision e58b907a69d4ca7daa77d69791593b886d1b80e8) +++ sources/canbus/messageinterpreter.cpp (.../messageinterpreter.cpp) (revision 8c69137f18382bdc55a5678e6ed44a7683fe4dea) @@ -24,7 +24,9 @@ /*! * \brief MessageInterpreter::MessageInterpreter - * \param parent + * \details Constructor + * \param parent - QObject parent owner object. + * Qt handles the children destruction by their parent objects life-cycle. */ MessageInterpreter::MessageInterpreter(QObject *parent) : QObject(parent) { } @@ -94,11 +96,15 @@ { bool ok = false; switch (vMessage.can_id) { - case eChlid_HD: + case eChlid_HD_UI: case eChlid_HD_Alarm: case eChlid_HD_Sync: ok = interpretMessage_HD(vMessage, vData); break; + case eChlid_DG_UI: + //case eChlid_DG_Alarm: + //case eChlid_DG_Sync: + ok = interpretMessage_DG(vMessage, vData); default: break; } @@ -189,10 +195,9 @@ * \return true if the message CANBUS channel is in the range which can be interpreted, false otherwise. * This return value will be used later to emit MessageDispatcher::didActionReceive signal or not */ -bool MessageInterpreter::interpretMessage_DG(const Message &vMessage, Gui::GuiActionType vActionId, QVariantList &vData) +bool MessageInterpreter::interpretMessage_DG(const Message &vMessage, QVariantList &vData) { Q_UNUSED(vMessage ); - Q_UNUSED(vActionId); Q_UNUSED(vData ); // No data have been interpreted from DG yet return false; @@ -412,7 +417,7 @@ * \param vState - Alarm Priority value of type unsigned int as 4 bytes extracted out * \param vTop - Top value of type unsigned int as 4 bytes extracted out * \param vMuteTimeout - MuteTimeout value of type unsigned int as 4 bytes extracted out - * \param vEscalateTo - EscalateTo value of type unsigned int as 4 bytes extracted out + * \param vEscalatesIn - EscalatesIn value of type unsigned int as 4 bytes extracted out * \param vFlags - Flags value of type unsigned int as 1 byte extracted out * \return true if the data can be extracted as defined for PowerOff Message ID */