Index: sources/canbus/MessageInterpreter.cpp
===================================================================
diff -u -r6c6f1f5d466badd9b4fd67be7c907234c342b2a2 -r38ae7b93679d05a54fc460dac68891562d7da72d
--- sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision 6c6f1f5d466badd9b4fd67be7c907234c342b2a2)
+++ sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision 38ae7b93679d05a54fc460dac68891562d7da72d)
@@ -1,13 +1,13 @@
 /*!
  *
- * Copyright (c) 2020-2023 Diality Inc. - All Rights Reserved.
+ * Copyright (c) 2020-2024 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)      Behrouz NematiPour
- * \date    (last)      31-May-2023
+ * \author  (last)      Dara Navaei
+ * \date    (last)      06-May-2024
  * \author  (original)  Behrouz NematiPour
  * \date    (original)  26-Aug-2020
  *
@@ -29,8 +29,6 @@
 #define DISABLE_CHECKIN_LOG 0
 #define DEBUG_SIGNAL(vID, vMODEL) // qDebug() << vID << vMODEL;
 
-#define LOG_APPED_MSG(vID, vTEXT) LOG_APPED(QString("%1,%2").arg(QString("%1").arg(vID,4,16,QLatin1Char('0')).toUpper()).arg(vTEXT))
-
 // a macro to simplify the transmit message
 // would be better later to be replaced by a template method
 // like the notify method of received messages
@@ -239,6 +237,8 @@
     case Gui::GuiActionType::ID_AdjustHDDateTimeReq                     : INTERPRET_TRANSMIT_MESSAGE(AdjustHDDateTimeRequestData                    ); break;
     case Gui::GuiActionType::ID_AdjustDGDateTimeReq                     : INTERPRET_TRANSMIT_MESSAGE(AdjustDGDateTimeRequestData                    ); break;
     case Gui::GuiActionType::ID_AdjustServiceDatesReq                   : INTERPRET_TRSMT_MT_MESSAGE(AdjustServiceDatesRequestData                  ); break;
+    case Gui::GuiActionType::ID_HDUsageInfoReq                          : INTERPRET_TRSMT_MT_MESSAGE(HDUsageInfoRequestData                         ); break;
+    case Gui::GuiActionType::ID_AdjustInstitutionalRecordReq            : INTERPRET_TRSMT_MT_MESSAGE(AdjustInstitutionalRequestData                 ); break;
     // Pre-Treatment
     case Gui::GuiActionType::ID_AdjustInitTreatmentReq                  : INTERPRET_TRANSMIT_MESSAGE(AdjustInitTreatmentRequestData                 ); break;
     case Gui::GuiActionType::ID_AdjustParametersValidationReq           : INTERPRET_TRANSMIT_MESSAGE(AdjustParametersValidationRequestData          ); break;
@@ -267,7 +267,8 @@
     case Gui::GuiActionType::ID_AdjustRecirculateReq                    : INTERPRET_TRANSMIT_MESSAGE(AdjustRecirculateRequestData                   ); break;
     case Gui::GuiActionType::ID_AdjustTreatmentEndReq                   : INTERPRET_TRANSMIT_MESSAGE(AdjustTreatmentEndRequestData                  ); break;
     // Post-Treatment
-    case Gui::GuiActionType::ID_AdjustPatientDisconnectionConfirmReq    : INTERPRET_TRSMT_MT_MESSAGE(AdjustPatientDisconnectionConfirmRequestData   ); break;
+    case Gui::GuiActionType::ID_AdjustPatientDisconnectNotifyReq        : INTERPRET_TRSMT_MT_MESSAGE(AdjustPatientDisconnectionNotifyRequestData    ); break;
+    case Gui::GuiActionType::ID_AdjustPatientDisconnectConfirmReq       : INTERPRET_TRSMT_MT_MESSAGE(AdjustPatientDisconnectionConfirmRequestData   ); break;
     case Gui::GuiActionType::ID_AdjustDisposablesRemovalConfirmReq      : INTERPRET_TRSMT_MT_MESSAGE(AdjustDisposablesRemovalConfirmRequestData     ); break;
     case Gui::GuiActionType::ID_AdjustTreatmentLogReq                   : INTERPRET_TRSMT_MT_MESSAGE(AdjustTreatmentLogRequestData                  ); break;
     // Disinfection
@@ -284,6 +285,10 @@
     case Gui::GuiActionType::ID_AlarmClearedConditionReq                : INTERPRET_TRANSMIT_MESSAGE(AlarmClearedConditionRequestData               ); break;
     case Gui::GuiActionType::ID_AlarmActiveListReq                      : INTERPRET_TRSMT_MT_MESSAGE(AlarmActiveListRequestData                     ); break;
     case Gui::GuiActionType::ID_AlarmTriggered                          : INTERPRET_TRANSMIT_MESSAGE(AlarmTriggeredRequestData                      ); break;
+
+    // HD reset in service mode
+    case Gui::GuiActionType::ID_ResetHDInServiceModeReq                 : INTERPRET_TRSMT_MT_MESSAGE(AdjustHDResetInSrvcRequestData                 ); break;
+
     // disabled coco end
     default:
         QString mActionIdHexString = Format::toHexString(vActionId);
@@ -433,6 +438,7 @@
     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;
+    case Gui::GuiActionType::ID_HDRTCEpochData                      : ok = notify<Model::MHDRTCEpochData                            >(vMessage, vData, Gui::GuiActionType::ID_HDRTCEpochData                    ); break;
 
     // ----- Settings
     case Gui::GuiActionType::ID_AdjustServiceModeRsp                : ok = notify<Model::MAdjustServiceModeResponse                 >(vMessage, vData, Gui::GuiActionType::ID_AdjustServiceModeRsp              ); break;
@@ -441,8 +447,8 @@
     case Gui::GuiActionType::ID_AdjustSerialHDRsp                   : ok = notify<Model::MAdjustSerialNumberHDResponse              >(vMessage, vData, Gui::GuiActionType::ID_AdjustSerialHDRsp                 ); 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;
-
-
+    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;
     // ----- 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;
@@ -498,7 +504,8 @@
     case Gui::GuiActionType::ID_AdjustTreatmentEndRsp               : ok = notify<Model::MAdjustTreatmentEndResponse                >(vMessage, vData, Gui::GuiActionType::ID_AdjustTreatmentEndRsp             ); break;
 
     // ----- Post-Treatment Adjust
-    case Gui::GuiActionType::ID_AdjustDisposableRemovalConfirmRsp   : ok = notify<Model::MAdjustDisposablesRemovalConfirmResponse   >(vMessage, vData, Gui::GuiActionType::ID_AdjustDisposableRemovalConfirmRsp ); break;
+    case Gui::GuiActionType::ID_AdjustPatientDisconnectConfirmRsp   : ok = notify<Model::MAdjustPatientDisconnectionConfirmResponse >(vMessage, vData, Gui::GuiActionType::ID_AdjustPatientDisconnectConfirmRsp ); break;
+    case Gui::GuiActionType::ID_AdjustDisposablesRemovalConfirmRsp  : ok = notify<Model::MAdjustDisposablesRemovalConfirmResponse   >(vMessage, vData, Gui::GuiActionType::ID_AdjustDisposablesRemovalConfirmRsp); break;
     case Gui::GuiActionType::ID_AdjustTreatmentLogRsp               : ok = notify<Model::MAdjustTreatmentLogResponse                >(vMessage, vData, Gui::GuiActionType::ID_AdjustTreatmentLogRsp             ); break;
     // ----- Treatment Log
     case Gui::GuiActionType::ID_TreatmentLogAvrgeData               : ok = notify<Model::MTreatmentLogAvrgeData                     >(vMessage, vData, Gui::GuiActionType::ID_TreatmentLogAvrgeData             ); break;