Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -r9b54c54dbe75f2bd6d04ea73d48e1247682002e8 -rcf61c7736f11f4b75a4e2df803f29bdc7769db53 --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 9b54c54dbe75f2bd6d04ea73d48e1247682002e8) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision cf61c7736f11f4b75a4e2df803f29bdc7769db53) @@ -29,6 +29,7 @@ #define DISABLE_CHECKIN_LOG 0 #define DEBUG_SIGNAL(vID, vMODEL) // qDebug() << vID << vMODEL; +#define LOG_APPED_MSG(vID, vTEXT) LOG_APPED(QString("%1,%2").arg(QString("%1").arg(vID,4,16,QLatin1Char('0')).toUpper()).arg(vTEXT)) // a macro to simplify the transmit message // would be better later to be replaced by a template method @@ -37,7 +38,7 @@ if ( ! length ) { logInvalidLength(vActionId); return false; } \ vCanId = vMODEL::canid(); \ vPayload = Format::fromVariant(vData); \ - LOG_APPED(QString("%1,%2").arg(vActionId,4,16).arg(vMODEL::toString(vData))); \ + LOG_APPED_MSG(vActionId, vMODEL::toString(vData)); \ DEBUG_SIGNAL(0, typeid(vMODEL).name()) // another version of the INTERPRET_TRANSMIT_MESSAGE for empty messages @@ -46,7 +47,7 @@ if ( length ) { logInvalidLength(vActionId); return false; } \ vCanId = vMODEL::canid(); \ vPayload = Format::fromVariant(vData); \ - LOG_APPED(QString("%1,%2").arg(vActionId,4,16).arg(vMODEL::toString(vData))); \ + LOG_APPED_MSG(vActionId, vMODEL::toString(vData)); \ DEBUG_SIGNAL(0, typeid(vMODEL).name()) /*! @@ -82,7 +83,7 @@ if ( ! ok ) return false; // disabled coco end emit didActionReceive(tModel.data()); - LOG_APPED(QString("%1,%2").arg(vIdCheck,4,16).arg(tModel.toString())); + LOG_APPED_MSG(vIdCheck, tModel.toString()); DEBUG_SIGNAL(vIdCheck, typeid(TModel).name()) return ok; }