Index: sources/canbus/MessageInterpreter.cpp
===================================================================
diff -u -r54c4136d95375116e6daf23b7d4179159cf13d0c -rfec49d1a8016d25cedff4cf2fefb4c4cd1c7c259
--- sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision 54c4136d95375116e6daf23b7d4179159cf13d0c)
+++ sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision fec49d1a8016d25cedff4cf2fefb4c4cd1c7c259)
@@ -227,7 +227,7 @@
         if ( length ) { // this message has a variable length
             vPayload = Format::fromVariant(vData[0]);
         }
-        if ( ! gDisableCheckInLog )
+        if ( gEnableCheckInLog )
             LOG_EVENT_UI(QString("CheckIn"));
 
         break;
@@ -281,8 +281,8 @@
     case Gui::GuiActionType::ID_AdjustDisposablesRemovalConfirmReq      : INTERPRET_TRSMT_MT_MESSAGE(AdjustDisposablesRemovalConfirmRequestData     ); break;
     case Gui::GuiActionType::ID_AdjustTreatmentLogReq                   : INTERPRET_TRSMT_MT_MESSAGE(AdjustTreatmentLogRequestData                  ); break;
     // Disinfection
-    case Gui::GuiActionType::ID_AdjustDisinfectReq                      : INTERPRET_TRANSMIT_MESSAGE(AdjustDisinfectRequestData                     ); break;
-    case Gui::GuiActionType::ID_AdjustChemicalConfirmReq                : INTERPRET_TRSMT_MT_MESSAGE(AdjustChemicalConfirmRequestData               ); break;
+    case Gui::GuiActionType::ID_AdjustDisinfectModeReq                  : INTERPRET_TRANSMIT_MESSAGE(AdjustDisinfectModeRequestData                 ); break;
+    case Gui::GuiActionType::ID_AdjustDisinfectStartReq                 : INTERPRET_TRANSMIT_MESSAGE(AdjustDisinfectStartRequestData                ); break;
     // alarms
     case Gui::GuiActionType::ID_AlarmSilenceReq                         : INTERPRET_TRANSMIT_MESSAGE(AlarmSilenceRequestData                        ); break;
     case Gui::GuiActionType::ID_AlarmUserActionReq                      : INTERPRET_TRANSMIT_MESSAGE(AlarmUserActionRequestData                     ); break;
@@ -437,6 +437,7 @@
     // ----- 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_UIPostFinalResultHDReq              : ok = notify<Model::MUIPostFinalResultHDRequest                >(vMessage, vData, Gui::GuiActionType::ID_UIPostFinalResultHDReq            ); break;
 
     // ----- Settings
     case Gui::GuiActionType::ID_AdjustServiceModeRsp                : ok = notify<Model::MAdjustServiceModeResponse                 >(vMessage, vData, Gui::GuiActionType::ID_AdjustServiceModeRsp              ); break;
@@ -508,13 +509,9 @@
     case Gui::GuiActionType::ID_TreatmentLogAvrgeData               : ok = notify<Model::MTreatmentLogAvrgeData                     >(vMessage, vData, Gui::GuiActionType::ID_TreatmentLogAvrgeData             ); break;
     case Gui::GuiActionType::ID_TreatmentLogAlarmData               : ok = notify<Model::MTreatmentLogAlarmData                     >(vMessage, vData, Gui::GuiActionType::ID_TreatmentLogAlarmData             ); break;
     case Gui::GuiActionType::ID_TreatmentLogEventData               : ok = notify<Model::MTreatmentLogEventData                     >(vMessage, vData, Gui::GuiActionType::ID_TreatmentLogEventData             ); break;
-
-    // ----- Disinfect - States
-    case Gui::GuiActionType::ID_DisinfectStates                     : ok = notify<Model::MDisinfectStates                           >(vMessage, vData, Gui::GuiActionType::ID_DisinfectStates                   ); break;
     // ----- Disinfection - Adjust
-    case Gui::GuiActionType::ID_AdjustDisinfectRsp                  : ok = notify<Model::MAdjustDisinfectResponse                   >(vMessage, vData, Gui::GuiActionType::ID_AdjustDisinfectRsp                ); break;
-    case Gui::GuiActionType::ID_AdjustChemicalConfirmRsp            : ok = notify<Model::MAdjustChemicalConfirmResponse             >(vMessage, vData, Gui::GuiActionType::ID_AdjustChemicalConfirmRsp          ); break;
-
+    case Gui::GuiActionType::ID_AdjustDisinfectModeRsp              : ok = notify<Model::MAdjustDisinfectModeResponse               >(vMessage, vData, Gui::GuiActionType::ID_AdjustDisinfectModeRsp            ); break;
+    case Gui::GuiActionType::ID_AdjustDisinfectStartRsp             : ok = notify<Model::MAdjustDisinfectStartResponse              >(vMessage, vData, Gui::GuiActionType::ID_AdjustDisinfectStartRsp           ); break;
     // these need to be standard and use notify as well
     case Gui::GuiActionType::ID_AdjustUltrafiltrationEditRsp        : ok = adjustUltrafiltrationEdit                                 (vMessage, vData);     /* TODO : implement notify<>() */                      break;
     case Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmRsp     : ok = adjustUltrafiltrationConfirm                              (vMessage, vData);     /* TODO : implement notify<>() */                      break;
@@ -578,11 +575,6 @@
     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
-    case Gui::GuiActionType::ID_DisinfectDGFlushTimeData    : ok = notify<Model::MDisinfectDGFlushTime          >(vMessage, vData, Gui::GuiActionType::ID_DisinfectDGFlushTimeData      ); break;
-    case Gui::GuiActionType::ID_DisinfectDGHeatTimeData     : ok = notify<Model::MDisinfectDGHeatTime           >(vMessage, vData, Gui::GuiActionType::ID_DisinfectDGHeatTimeData       ); break;
-    case Gui::GuiActionType::ID_DisinfectDGChemicalTimeData : ok = notify<Model::MDisinfectDGChemicalTime       >(vMessage, vData, Gui::GuiActionType::ID_DisinfectDGChemicalTimeData   ); break;
-
     // DG Response Messages
     case Gui::GuiActionType::ID_AdjustVersionsDGRsp         : ok = notify<Model::MAdjustVersionsDGResponse      >(vMessage, vData, Gui::GuiActionType::ID_AdjustVersionsDGRsp           ); break;
     case Gui::GuiActionType::ID_AdjustSerialDGRsp           : ok = notify<Model::MAdjustSerialNumberDGResponse  >(vMessage, vData, Gui::GuiActionType::ID_AdjustSerialDGRsp             ); break;
@@ -678,20 +670,20 @@
 
 /*!
  * \brief   MessageInterpreter::updateUnhandledMessages
- * \return  this method is converting the general settings messages/unhandled group of settings to the message interpreter specific map structure.
+ * \return  this method is converting the general settings messages/unhandled (Storage::Settings_Category_MessagesUnhandled) group of settings to the message interpreter specific map structure.
  *          it is done for performance to keep the lookup table shorter and faster.
  *          This method is called by the chain of events when Application controller is done reading the settings and emits it didSettingsDone,
  *          which Message dispatcher is listening to will call this function in its signal handler slot.
  */
 void MessageInterpreter::updateUnhandledMessages()
 {
-    // DEBUG: qDebug() << _Settings.groups("messages/unhandled");
-    for(const auto group: _Settings.groups("Messages/Unhandled")) {
-        // DEBUG: qDebug() << _Settings.keys(group);
+    // DEBUG: qDebug() << _Settings.groups(Storage::Settings_Category_MessagesUnhandled);
+    for(const auto group: _Settings.groups(Storage::Settings_Category_MessagesUnhandled)) {
         bool ok;
         quint16 id = QString(group).toUInt(&ok,16);
         if (!ok) continue;
         _messageList[ id ] = _Settings.keys(group);
+        // DEBUG: qDebug() << _Settings.keys(group);
     }
 }
 
@@ -761,7 +753,9 @@
         LOG_DATUM(logString);
     }
     else {
-        LOG_DEBUG(QString("Undefined unhandled message [%1]").arg(id, 0, 16));
+        if ( gDisableUnhandledReport ) { // if the unhandled message error has been disabled, return.
+            LOG_DEBUG(QString("Undefined unhandled message [%1]").arg(id, 0, 16));
+        }
     }
     return ok;
 }