Index: sources/canbus/MessageInterpreter.cpp
===================================================================
diff -u -r4a67c01045f365be38f1a12a8572c0070d343e1e -rb5afbc61af03dd2e84acf8439cb6be1f022a2921
--- sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision 4a67c01045f365be38f1a12a8572c0070d343e1e)
+++ sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision b5afbc61af03dd2e84acf8439cb6be1f022a2921)
@@ -7,7 +7,7 @@
  *
  * \file    MessageInterpreter.cpp
  * \author  (last)      Behrouz NematiPour
- * \date    (last)      09-Mar-2022
+ * \date    (last)      18-Apr-2022
  * \author  (original)  Behrouz NematiPour
  * \date    (original)  26-Aug-2020
  *
@@ -227,9 +227,9 @@
         if ( length ) { // this message has a variable length
             vPayload = Format::fromVariant(vData[0]);
         }
-#if DISABLE_CHECKIN_LOG == 0
-        LOG_EVENT_UI(QString("CheckIn"));
-#endif
+        if ( ! gDisableCheckInLog )
+            LOG_EVENT_UI(QString("CheckIn"));
+
         break;
 
     case Gui::GuiActionType::ID_RawData: // len: 255, can have any len
@@ -238,16 +238,18 @@
         }
         LOG_EVENT_UI(QString("RawData"));
         break;
-
+    // Generic Confirm
+    case Gui::GuiActionType::ID_DuetConfirmUIr                          : INTERPRET_TRANSMIT_MESSAGE(DuetConfirmUIrData                             ); break;
     case Gui::GuiActionType::ID_PowerOff                                : INTERPRET_TRANSMIT_MESSAGE(AdjustPowerOffRequestData                      ); break;
     // POST
     case Gui::GuiActionType::ID_UIPostFinalResultData                   : INTERPRET_TRANSMIT_MESSAGE(AdjustUIPostFinalResultRequestData             ); break;
     // Settings
+    case Gui::GuiActionType::ID_AdjustServiceModeReq                    : INTERPRET_TRSMT_MT_MESSAGE(AdjustServiceModeRequestData                   ); break;
     case Gui::GuiActionType::ID_AdjustVersionsUIRsp                     : INTERPRET_TRANSMIT_MESSAGE(AdjustVersionsResponseData                     ); break;
     case Gui::GuiActionType::ID_AdjustVersionsUIReq                     : INTERPRET_TRANSMIT_MESSAGE(AdjustVersionsRequestData                      ); break;
     case Gui::GuiActionType::ID_AdjustHDDateTimeReq                     : INTERPRET_TRANSMIT_MESSAGE(AdjustHDDateTimeRequestData                    ); break;
     case Gui::GuiActionType::ID_AdjustDGDateTimeReq                     : INTERPRET_TRANSMIT_MESSAGE(AdjustDGDateTimeRequestData                    ); break;
-    case Gui::GuiActionType::ID_AdjustServiceReq                        : INTERPRET_TRSMT_MT_MESSAGE(AdjustServiceRequestData                       ); break;
+    case Gui::GuiActionType::ID_AdjustServiceDatesReq                   : INTERPRET_TRSMT_MT_MESSAGE(AdjustServiceDatesRequestData                  ); break;
     // Pre-Treatment
     case Gui::GuiActionType::ID_AdjustInitTreatmentReq                  : INTERPRET_TRANSMIT_MESSAGE(AdjustInitTreatmentRequestData                 ); break;
     case Gui::GuiActionType::ID_AdjustParametersValidationReq           : INTERPRET_TRANSMIT_MESSAGE(AdjustParametersValidationRequestData          ); break;
@@ -433,15 +435,18 @@
     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_DuetConfirmHDi                      : ok = notify<Model::MDuetConfirmHDi                            >(vMessage, vData, Gui::GuiActionType::ID_DuetConfirmHDi                    ); break;
+
     // ----- 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;
 
     // ----- Settings
+    case Gui::GuiActionType::ID_AdjustServiceModeRsp                : ok = notify<Model::MAdjustServiceModeResponse                 >(vMessage, vData, Gui::GuiActionType::ID_AdjustServiceModeRsp              ); break;
     case Gui::GuiActionType::ID_AdjustVersionsHDReq                 : ok = notify<Model::MAdjustVersionsHDRequest                   >(vMessage, vData, Gui::GuiActionType::ID_AdjustVersionsHDReq               ); break;
     case Gui::GuiActionType::ID_AdjustVersionsHDRsp                 : ok = notify<Model::MAdjustVersionsHDResponse                  >(vMessage, vData, Gui::GuiActionType::ID_AdjustVersionsHDRsp               ); break;
     case Gui::GuiActionType::ID_AdjustSerialHDRsp                   : ok = notify<Model::MAdjustSerialNumberHDResponse              >(vMessage, vData, Gui::GuiActionType::ID_AdjustSerialHDRsp                 ); break;
-    case Gui::GuiActionType::ID_AdjustServiceHDRsp                  : ok = notify<Model::MAdjustServiceHDResponse                   >(vMessage, vData, Gui::GuiActionType::ID_AdjustServiceHDRsp                ); break;
+    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;
 
 
@@ -584,7 +589,7 @@
     // 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;
-    case Gui::GuiActionType::ID_AdjustServiceDGRsp          : ok = notify<Model::MAdjustServiceDGResponse       >(vMessage, vData, Gui::GuiActionType::ID_AdjustServiceDGRsp            ); break;
+    case Gui::GuiActionType::ID_AdjustServiceDatesDGRsp     : ok = notify<Model::MAdjustServiceDatesDGResponse  >(vMessage, vData, Gui::GuiActionType::ID_AdjustServiceDatesDGRsp       ); break;
     case Gui::GuiActionType::ID_AdjustDGDateTimeRsp         : ok = notify<Model::MAdjustDGDateTimeResponse      >(vMessage, vData, Gui::GuiActionType::ID_AdjustDGDateTimeRsp           ); break;
 
     // unhandled messages: these will only be logged as received message