Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -re961fc7bcdeba8ffab9c96da20244b07405f8f99 -rcedf17d9edc7e3f0f08e2877e702aaf4f94d4202 --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision e961fc7bcdeba8ffab9c96da20244b07405f8f99) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision cedf17d9edc7e3f0f08e2877e702aaf4f94d4202) @@ -37,7 +37,7 @@ if ( ! length ) { logInvalidLength(vActionId); return false; } \ vCanId = vMODEL::canid(); \ vPayload = Format::fromVariant(vData); \ - LOG_APPED(vMODEL::toString(vData)); \ + LOG_APPED(QString("%1,%2").arg(vActionId,4,16).arg(vMODEL::toString(vData))); \ DEBUG_SIGNAL(0, typeid(vMODEL).name()) // another version of the INTERPRET_TRANSMIT_MESSAGE for empty messages @@ -46,7 +46,7 @@ if ( length ) { logInvalidLength(vActionId); return false; } \ vCanId = vMODEL::canid(); \ vPayload = Format::fromVariant(vData); \ - LOG_APPED(vMODEL::toString(vData)); \ + LOG_APPED(QString("%1,%2").arg(vActionId,4,16).arg(vMODEL::toString(vData))); \ DEBUG_SIGNAL(0, typeid(vMODEL).name()) /*! @@ -82,7 +82,7 @@ if ( ! ok ) return false; // disabled coco end emit didActionReceive(tModel.data()); - LOG_APPED(tModel.toString()); + LOG_APPED(QString("%1,%2").arg(vIdCheck,4,16).arg(tModel.toString())); DEBUG_SIGNAL(vIdCheck, typeid(TModel).name()) return ok; } @@ -209,7 +209,7 @@ case Gui::GuiActionType::ID_KeepAlive: // len: 255, can have any len if ( length ) { // this message has a variable length - vPayload = Format::fromVariant(vData[0]); + vPayload = Format::fromVariant(vData.first()); } if ( gEnableCheckInLog ) LOG_APPED_UI(QString("CheckIn")); @@ -218,7 +218,7 @@ case Gui::GuiActionType::ID_RawData: // len: 255, can have any len if ( length ) { // this message has a variable length - vPayload = Format::fromVariant(vData[0]); + vPayload = Format::fromVariant(vData.first()); } LOG_APPED_UI(QString("RawData")); break; @@ -667,7 +667,7 @@ QString category = Storage::Settings_Category_MessagesUnhandled; QStringList groups = _Settings.groups(category); // DEBUG: qDebug() << groups; - for(const auto group: groups) { + for(const auto &group: qAsConst(groups)) { bool ok; quint16 id = QString(group).toUInt(&ok,16); if (!ok) continue;