Index: sources/canbus/MessageInterpreter.cpp
===================================================================
diff -u -r4097b4775f2562893b50f5309bc0b83d09640c04 -r8a4eeed968ffbce08a7470da8c101c96d00546da
--- sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision 4097b4775f2562893b50f5309bc0b83d09640c04)
+++ sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision 8a4eeed968ffbce08a7470da8c101c96d00546da)
@@ -26,7 +26,6 @@
 using namespace Can;
 using namespace Model;
 
-#define BYPASS_TO_UNHANDLED 1
 #define DISABLE_CHECKIN_LOG 0
 #define DEBUG_SIGNAL(vID, vMODEL) // qDebug() << vID << vMODEL;
 
@@ -397,16 +396,17 @@
 {
     bool ok = false;
 
-#ifndef BYPASS_TO_UNHANDLED
-    switch (identifySource(vMessage.can_id)) {
-    case Can_Source::eCan_HD: ok = interpretMessage_HD(vMessage, vData); break;
-    case Can_Source::eCan_DG: ok = interpretMessage_DG(vMessage, vData); break;
-    default                 :      printUnhandled     (vMessage       ); break; // ok is false, the individual interpreters for ?HD/DG should not be called, and it should be done here.
+    if ( ! gLogUnhandledOnly ) {
+        switch (identifySource(vMessage.can_id)) {
+        case Can_Source::eCan_HD: ok = interpretMessage_HD(vMessage, vData); break;
+        case Can_Source::eCan_DG: ok = interpretMessage_DG(vMessage, vData); break;
+        default                 :      printUnhandled     (vMessage       ); break; // ok is false, the individual interpreters for ?HD/DG should not be called, and it should be done here.
+        }
     }
-#else
-    Q_UNUSED(vData);
-    printUnhandled     (vMessage       );
-#endif
+    else {
+        Q_UNUSED         (vData          );
+        printUnhandled   (vMessage       );
+    }
     return ok;
 }
 
@@ -454,7 +454,7 @@
     case Gui::GuiActionType::ID_AdjustServiceDatesHDRsp             : ok = notify<Model::MAdjustServiceDatesHDResponse              >(vMessage, vData, Gui::GuiActionType::ID_AdjustServiceDatesHDRsp           ); break;
     case Gui::GuiActionType::ID_AdjustHDDateTimeRsp                 : ok = notify<Model::MAdjustHDDateTimeResponse                  >(vMessage, vData, Gui::GuiActionType::ID_AdjustHDDateTimeRsp               ); break;
     case Gui::GuiActionType::ID_HDUsageInfoRsp                      : ok = notify<Model::MHDUsageInfoResponse                       >(vMessage, vData, Gui::GuiActionType::ID_HDUsageInfoRsp                    ); break;
-    case Gui::GuiActionType::ID_AdjustInstitutionalRecordRsp       : ok = notify<Model::MAdjustInstitutionalRecordResponse         >(vMessage, vData, Gui::GuiActionType::ID_AdjustInstitutionalRecordRsp     ); break;
+    case Gui::GuiActionType::ID_AdjustInstitutionalRecordRsp        : ok = notify<Model::MAdjustInstitutionalRecordResponse         >(vMessage, vData, Gui::GuiActionType::ID_AdjustInstitutionalRecordRsp      ); break;
     // ----- States
     case Gui::GuiActionType::ID_HDOperationModeData                 : ok = notify<Model::MHDOperationMode                           >(vMessage, vData, Gui::GuiActionType::ID_HDOperationModeData               ); break;
     case Gui::GuiActionType::ID_PreTreatmentStates                  : ok = notify<Model::MPreTreatmentStates                        >(vMessage, vData, Gui::GuiActionType::ID_PreTreatmentStates                ); break;