Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -r2cee3c28bf7565eeb55dcb033961fe6962f11d16 -r0b8e00869ef81ef0a834c03c13049f4c281870d2 --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 2cee3c28bf7565eeb55dcb033961fe6962f11d16) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 0b8e00869ef81ef0a834c03c13049f4c281870d2) @@ -33,6 +33,7 @@ // like the notify method of received messages #define INTERPRET_RECEIVED_MESSAGE(vMODEL) \ if ( ! length ) { logInvalidLength(vActionId); return false; } \ + vCanId = vMODEL::canid(); \ vPayload = Format::fromVariant(vData); \ LOG_EVENT(vMODEL::toString(vData)); \ DEBUG_RECEIVE_SIGNAL(0, typeid(vMODEL).name()) @@ -41,6 +42,7 @@ // same later improvements apply to this MACRO as well. #define INTERPRET_RECVD_MT_MESSAGE(vMODEL) \ if ( length ) { logInvalidLength(vActionId); return false; } \ + vCanId = vMODEL::canid(); \ vPayload = Format::fromVariant(vData); \ LOG_EVENT(vMODEL::toString(vData)); \ DEBUG_RECEIVE_SIGNAL(0, typeid(vMODEL).name()) @@ -202,11 +204,11 @@ * \return true if the vActionId is valid. * This return value will be used later for error handling. */ -bool MessageInterpreter::interpretMessage(const Gui::GuiActionType &vActionId, const QVariantList &vData, QByteArray &vPayload) +bool MessageInterpreter::interpretMessage(const Gui::GuiActionType &vActionId, const QVariantList &vData, QByteArray &vPayload, Can_Id &vCanId) { bool ok = true; QString mSenderID = "UI,"; - + vCanId = Can::Can_Id::eChlid_UI_HD; vPayload.clear(); int length = vData.length();