Index: sources/canbus/messageinterpreter.cpp =================================================================== diff -u -r2fdeb1c461dde1b7b8bffcc5b814736190f98988 -r5963f00ffd2c557d3ae06a5deea05032a3a3bd68 --- sources/canbus/messageinterpreter.cpp (.../messageinterpreter.cpp) (revision 2fdeb1c461dde1b7b8bffcc5b814736190f98988) +++ sources/canbus/messageinterpreter.cpp (.../messageinterpreter.cpp) (revision 5963f00ffd2c557d3ae06a5deea05032a3a3bd68) @@ -16,6 +16,7 @@ // Qt // Project +#include "logger.h" #include "format.h" @@ -53,7 +54,7 @@ vPayload += tmp; } else { QString mActionIdHexString = Format::toHexString(vActionId); - qDebug() << "ERROR :" << tr("Incorrect data for Message ID (UI) '%1'").arg(mActionIdHexString); + LOG_ERROR(tr("Incorrect data for Message ID (UI) '%1'").arg(mActionIdHexString)); ok = false; } break; @@ -69,7 +70,7 @@ default: QString mActionIdHexString = Format::toHexString(vActionId); - qDebug() << "ERROR :" << tr("Unknown Message ID (UI) '%1'").arg(mActionIdHexString); + LOG_ERROR(tr("Unknown Message ID (UI) '%1'").arg(mActionIdHexString)); ok = false; break; } @@ -130,6 +131,7 @@ if (ok) { vData += mShowHide; } + LOG_DATUM(QString("Power Off (%1)").arg(mShowHide)); break; } @@ -142,6 +144,15 @@ types::F32 mMotorCtlCurrent ; types::F32 mPWMDtCycle ; ok = getBloodFlowData(vMessage, mFlowSetPoint, mMeasuredFlow, mRotorSpeed, mMotorSpeed, mMotorCtlSpeed, mMotorCtlCurrent, mPWMDtCycle); + LOG_DATUM(QString("Blood Flow(%1, %2, %3, %4, %5, %6, %7)") + .arg(mFlowSetPoint .value) + .arg(mMeasuredFlow .value) + .arg(mRotorSpeed .value) + .arg(mMotorSpeed .value) + .arg(mMotorCtlSpeed .value) + .arg(mMotorCtlCurrent .value) + .arg(mPWMDtCycle .value) + ); if (ok) { vData += mFlowSetPoint .value; vData += mMeasuredFlow .value; @@ -220,7 +231,7 @@ } if ( vMessage.data.length() < payloadLen[GuiActionType::BloodFlow] ) { QString mActionIdHexString = Format::toHexString(vMessage.actionId); - qDebug() << "ERROR :" << tr("Incorrect data for Message ID (HD) '%1'").arg(mActionIdHexString); + LOG_ERROR(tr("Incorrect data for Message ID (HD) '%1'").arg(mActionIdHexString)); return false; } int i = 0; @@ -306,7 +317,7 @@ vShowHide = tmp; } else { QString mActionIdHexString = Format::toHexString(vMessage.actionId); - qDebug() << "ERROR :" << tr("Incorrect data for Message ID (HD) '%1'").arg(mActionIdHexString); + LOG_ERROR(tr("Incorrect data for Message ID (HD) '%1'").arg(mActionIdHexString)); ok = false; } return ok;