Index: sources/canbus/MessageInterpreter.cpp
===================================================================
diff -u -r40c09957821fb3779fa06214a856c20cca110e56 -r16bd55822fa77e5bea6fdfa7b54abf123c1da8bb
--- sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision 40c09957821fb3779fa06214a856c20cca110e56)
+++ sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision 16bd55822fa77e5bea6fdfa7b54abf123c1da8bb)
@@ -37,7 +37,7 @@
     if ( ! length ) { logInvalidLength(vActionId); return false; }  \
     vCanId = vMODEL::canid();                                       \
     vPayload = Format::fromVariant(vData);                          \
-    LOG_EVENT(vMODEL::toString(vData));                             \
+    LOG_APPED(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_EVENT(vMODEL::toString(vData));                             \
+    LOG_APPED(vMODEL::toString(vData));                             \
     DEBUG_SIGNAL(0, typeid(vMODEL).name())
 
 /*!
@@ -82,7 +82,7 @@
     if ( ! ok ) return false;
     // disabled coco end
     emit didActionReceive(tModel.data());
-    logReceivedMessage(tModel);
+    LOG_APPED(tModel.toString());
     DEBUG_SIGNAL(vIdCheck, typeid(TModel).name())
     return ok;
 }
@@ -183,23 +183,6 @@
 }
 
 /*!
- * \brief   MessageInterpreter::logReceived
- * \details Regarding the type of message logs the message received.
- * \param   vModel - the MAbstract model type
- */
-void MessageInterpreter::logReceivedMessage(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.
@@ -229,15 +212,15 @@
             vPayload = Format::fromVariant(vData[0]);
         }
         if ( gEnableCheckInLog )
-            LOG_EVENT_UI(QString("CheckIn"));
+            LOG_APPED_UI(QString("CheckIn"));
 
         break;
 
     case Gui::GuiActionType::ID_RawData: // len: 255, can have any len
         if ( length ) { // this message has a variable length
             vPayload = Format::fromVariant(vData[0]);
         }
-        LOG_EVENT_UI(QString("RawData"));
+        LOG_APPED_UI(QString("RawData"));
         break;
     // Generic Confirm
     case Gui::GuiActionType::ID_DuetConfirmUIr                          : INTERPRET_TRANSMIT_MESSAGE(DuetConfirmUIrData                             ); break;
@@ -434,7 +417,7 @@
     // ----- Events
     case Gui::GuiActionType::ID_Acknow                              : ok = true;                                                                            /* TODO : implement notify<>() */                      break;
     case Gui::GuiActionType::ID_PowerOff                            : ok = notify<Model::MPowerOff                                  >(vMessage, vData, Gui::GuiActionType::ID_PowerOff                          ); break;
-    case Gui::GuiActionType::ID_ShuttingDown                        : ok = true; LOG_EVENT("HD,ShuttingDown");                                              /* TODO : implement notify<>() */                      break;
+    case Gui::GuiActionType::ID_ShuttingDown                        : ok = true; LOG_APPED("HD,ShuttingDown");                                              /* TODO : implement notify<>() */                      break;
 
     case Gui::GuiActionType::ID_DuetConfirmHDi                      : ok = notify<Model::MDuetConfirmHDi                            >(vMessage, vData, Gui::GuiActionType::ID_DuetConfirmHDi                    ); break;
 
@@ -558,7 +541,7 @@
     switch (vMessage.actionId) { // notice we are in receive mode
     case Gui::GuiActionType::ID_Acknow                      : ok = true;                                                                    /* TODO : implement notify<>() */              break;
     case Gui::GuiActionType::ID_DGCheckIn                   : ok = true;                                                                    /* TODO : implement notify<>() */
-        LOG_EVENT(QString("DG,CheckIn," + QVariant(vData).toStringList().join(',')));                                                                                                      break;
+        LOG_APPED(QString("DG,CheckIn," + QVariant(vData).toStringList().join(',')));                                                                                                      break;
     // ----- POST
     case Gui::GuiActionType::ID_DGPostSingleResultData      : ok = notify<Model::MDGPostSingleResult            >(vMessage, vData, Gui::GuiActionType::ID_DGPostSingleResultData        ); break;
     case Gui::GuiActionType::ID_DGPostFinalResultData       : ok = notify<Model::MDGPostFinalResult             >(vMessage, vData, Gui::GuiActionType::ID_DGPostFinalResultData         ); break;
@@ -640,7 +623,7 @@
 
     Model::MAdjustUltrafiltrationEditResponse mData;
     ok = mData.fromByteArray(vMessage.data);
-    LOG_EVENT("HD," + mData.toString()); // TODO : Not Standard
+    LOG_APPED("HD," + mData.toString()); // TODO : Not Standard
 
     mData.toVariantList(vData);
     emit didActionReceive(mData.data());
@@ -664,7 +647,7 @@
 
     Model::MAdjustUltrafiltrationConfirmResponse mData;
     ok = mData.fromByteArray(vMessage.data);
-    LOG_EVENT("HD," + mData.toString()); // TODO : Not Standard
+    LOG_APPED("HD," + mData.toString()); // TODO : Not Standard
 
     mData.toVariantList(vData);
     emit didActionReceive(mData.data());
@@ -756,7 +739,7 @@
                 }
             }
         }
-        LOG_DATUM(logString);
+        LOG_APPED(logString);
     }
     else {
         if ( gDisableUnhandledReport ) { // if the unhandled message error has been disabled, return.