Index: sources/canbus/MessageInterpreter.cpp
===================================================================
diff -u -r161d1431cc3507cd430f54af6aa47dab5145d472 -r2d37cfe6593a90633a9db1fa5136f8fc43b56188
--- sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision 161d1431cc3507cd430f54af6aa47dab5145d472)
+++ sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision 2d37cfe6593a90633a9db1fa5136f8fc43b56188)
@@ -1,15 +1,15 @@
 /*!
  *
- * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+ * Copyright (c) 2020-2022 Diality Inc. - All Rights Reserved.
  * \copyright
  * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
  * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
  *
- * \file MessageInterpreter.cpp
- * \author (last) Peter Lucia
- * \date (last) 15-Oct-2020
- * \author (original) Behrouz NematiPour
- * \date (original) 26-Aug-2020
+ * \file    MessageInterpreter.cpp
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      17-Dec-2021
+ * \author  (original)  Behrouz NematiPour
+ * \date    (original)  26-Aug-2020
  *
  */
 #include "MessageInterpreter.h"
@@ -226,7 +226,8 @@
         if ( length ) { // this message has a variable length
             vPayload = Format::fromVariant(vData[0]);
         }
-        // DEBUG: LOG_EVENT_UI(QString("CheckIn"));
+        // DEBUG:
+        LOG_EVENT_UI(QString("CheckIn"));
         break;
 
     case Gui::GuiActionType::ID_RawData: // len: 255, can have any len
@@ -408,8 +409,8 @@
     case Gui::GuiActionType::ID_ShuttingDown                        : ok = true; LOG_EVENT("HD,ShuttingDown");                           break; // TODO : implement notify<>()
 
     // ----- POST
-    case Gui::GuiActionType::ID_HDPostSingleResultData              : ok = notify<Model::MHDPostSingleResult                        >(vMessage, vData, Gui::GuiActionType::ID_HDPostSingleResultData			); break;
-    case Gui::GuiActionType::ID_HDPostFinalResultData               : ok = notify<Model::MHDPostFinalResult                         >(vMessage, vData, Gui::GuiActionType::ID_HDPostFinalResultData				); break;
+    case Gui::GuiActionType::ID_HDPostSingleResultData              : ok = notify<Model::MHDPostSingleResult                        >(vMessage, vData, Gui::GuiActionType::ID_HDPostSingleResultData            ); break;
+    case Gui::GuiActionType::ID_HDPostFinalResultData               : ok = notify<Model::MHDPostFinalResult                         >(vMessage, vData, Gui::GuiActionType::ID_HDPostFinalResultData                ); break;
 
     // ----- Settings
     case Gui::GuiActionType::ID_AdjustVersionsHDReq                 : ok = notify<Model::MAdjustVersionsHDRequest                   >(vMessage, vData, Gui::GuiActionType::ID_AdjustVersionsHDReq               ); break;
@@ -428,6 +429,9 @@
     // ----- Datum
     case Gui::GuiActionType::ID_HDAccelerometerData                 : ok = notify<Model::MHDAccelerometer                           >(vMessage, vData, Gui::GuiActionType::ID_HDAccelerometerData               ); break;
     case Gui::GuiActionType::ID_HDSyringePumpData                   : ok = notify<Model::MHDSyringePump                             >(vMessage, vData, Gui::GuiActionType::ID_HDSyringePumpData                 ); break;
+    case Gui::GuiActionType::ID_HDAirBubbleData                     : ok = notify<Model::MHDAirBubbleData                           >(vMessage, vData, Gui::GuiActionType::ID_HDAirBubbleData                   ); break;
+    case Gui::GuiActionType::ID_HDAirTrapData                       : ok = notify<Model::MHDAirTrapData                             >(vMessage, vData, Gui::GuiActionType::ID_HDAirTrapData                     ); break;
+    case Gui::GuiActionType::ID_HDBloodLeakData                     : ok = notify<Model::MHDBloodLeakData                           >(vMessage, vData, Gui::GuiActionType::ID_HDBloodLeakData                   ); break;
 
     // ----- Datum - Treatment
     case Gui::GuiActionType::ID_TreatmentRanges                     : ok = notify<Model::MTreatmentRanges                           >(vMessage, vData, Gui::GuiActionType::ID_TreatmentRanges                   ); break;
@@ -545,6 +549,7 @@
     case Gui::GuiActionType::ID_DGDebugText                 : ok = notify<Model::MDGDebugText                   >(vMessage, vData, Gui::GuiActionType::ID_DGDebugText                   ); break;
     case Gui::GuiActionType::ID_DGGeneralEvent              : ok = notify<Model::MDGGeneralEvent                >(vMessage, vData, Gui::GuiActionType::ID_DGGeneralEvent                ); break;
     case Gui::GuiActionType::ID_DGAccelerometerData         : ok = notify<Model::MDGAccelerometer               >(vMessage, vData, Gui::GuiActionType::ID_DGAccelerometerData           ); break;
+    case Gui::GuiActionType::ID_DGConductivityData          : ok = notify<Model::MDGConductivityData            >(vMessage, vData, Gui::GuiActionType::ID_DGConductivityData            ); break;
     // ----- Datum - Pre-Treatment progress
     case Gui::GuiActionType::ID_DGFilterFlushData           : ok = notify<Model::MDGFilterFlush                 >(vMessage, vData, Gui::GuiActionType::ID_DGFilterFlushData             ); break;
     // ----- Datum - Disinfection
@@ -654,9 +659,9 @@
  */
 void MessageInterpreter::updateUnhandledMessages()
 {
-    qDebug() << _Settings.groups("messages/unhandled");
-    for(const auto group: _Settings.groups("messages/unhandled")) {
-        qDebug() << _Settings.keys(group);
+    // DEBUG: qDebug() << _Settings.groups("messages/unhandled");
+    for(const auto group: _Settings.groups("Messages/Unhandled")) {
+        // DEBUG: qDebug() << _Settings.keys(group);
         bool ok;
         quint16 id = QString(group).toUInt(&ok,16);
         if (!ok) continue;