Index: sources/canbus/messageinterpreter.cpp =================================================================== diff -u -r246bf68b01c9249f2a74dddbba67f49807937fa2 -r3aab84456cfbdc4c4f495975ba9b8968eb844309 --- sources/canbus/messageinterpreter.cpp (.../messageinterpreter.cpp) (revision 246bf68b01c9249f2a74dddbba67f49807937fa2) +++ sources/canbus/messageinterpreter.cpp (.../messageinterpreter.cpp) (revision 3aab84456cfbdc4c4f495975ba9b8968eb844309) @@ -25,13 +25,13 @@ #define DEBUG_RECEIVE_SIGNAL(vID, vMODEL) // Debug() << #vID << #vMODEL; -// This define helps to prevent having multiple overloaded function for each model +// This define helps to prevent having multiple overloaded functions for each model #define EMIT_RECEIVE_SIGNAL(vID, vMODEL) { \ vMODEL mModel; \ ok = prepareData(vMessage, vID, mModel, vData); \ if ( ! ok ) return false; \ emit didActionReceive(mModel.data()); \ - LOG_BASIC(mModel.toString()); \ + logReceived(mModel); \ DEBUG_RECEIVE_SIGNAL(vID, vMODEL) \ } @@ -73,11 +73,11 @@ { QString mActionIdHexString = Format::toHexString(vMessage.actionId); if ( ! payloadLen.contains(vType) ) { - LOG_ERROR(tr("Undefined data length for received Message with ID '%1'").arg(mActionIdHexString)); + LOG_DEBUG(QString("Undefined data length for received Message with ID '%1'").arg(mActionIdHexString)); return false; } if ( vMessage.data.length() < payloadLen[vType] ) { - LOG_ERROR(tr("Incorrect data length for received Message with ID '%1'").arg(mActionIdHexString)); + LOG_DEBUG(QString("Incorrect data length for received Message with ID '%1'").arg(mActionIdHexString)); return false; } return true; @@ -87,7 +87,7 @@ { if (vData.count() == 0) { QString mActionIdHexString = Format::toHexString(vActionId); - LOG_ERROR(tr("Incorrect data for transmit Message with ID '%1'").arg(mActionIdHexString)); + LOG_DEBUG(QString("Incorrect data for transmit Message with ID '%1'").arg(mActionIdHexString)); return false; } return true; @@ -122,7 +122,7 @@ .arg(int(vMessage.can_id), 3, 16, QChar('0')) .arg(mActionIdHexString) .arg(QString(vMessage.data.toHex('.'))); - LOG_ERROR(logMessage); + LOG_DEBUG(logMessage); } /*! @@ -144,6 +144,23 @@ } /*! + * \brief MessageInterpreter::logReceived + * \details Regarding the type of message logs the message recived. + * \param vModel - the MAbstract model type + */ +void MessageInterpreter::logReceived(const Model::MAbstract &vModel) +{ + switch (vModel.typeText()) { + case Model::MAbstract::Type_Enum::eDatum: + LOG_DATUM(vModel.toString()); + break; + case Model::MAbstract::Type_Enum::eEvent: + LOG_EVENT(vModel.toString()); + break; + } +} + +/*! * \brief MessageInterpreter::interpretMessage * \details This method will be called * to interpret messages from UI regarding vActionId. @@ -220,7 +237,7 @@ default: QString mActionIdHexString = Format::toHexString(vActionId); - LOG_ERROR(mSenderID + tr("Unknown transmit Message with ID '%1'").arg(mActionIdHexString)); + LOG_DEBUG(mSenderID + tr("Unknown transmit Message with ID '%1'").arg(mActionIdHexString)); ok = false; break;