Index: sources/model/MModel.h
===================================================================
diff -u -r7f976c0ffdc727ddb89c1fe11ad250cb724cc4ce -r38ae7b93679d05a54fc460dac68891562d7da72d
--- sources/model/MModel.h	(.../MModel.h)	(revision 7f976c0ffdc727ddb89c1fe11ad250cb724cc4ce)
+++ sources/model/MModel.h	(.../MModel.h)	(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    MModel.h
- * \author  (last)      Behrouz NematiPour
- * \date    (last)      25-Jul-2023
+ * \author  (last)      Dara Navaei
+ * \date    (last)      06-May-2024
  * \author  (original)  Behrouz NemaiPour
  * \date    (original)  02-Jul-2020
  *
@@ -64,6 +64,7 @@
 #include "MHDBloodLeakData.h"
 #include "MHDAirBubbleData.h"
 #include "MHDRTCEpochData.h"
+#include "MHDUsageInfoResponse.h"
 
 // Debugging Messages
 #include "MHDDebugText.h"
@@ -85,6 +86,7 @@
 #include "MAdjustHDDateTimeResponse.h"
 #include "MAdjustDGDateTimeResponse.h"
 #include "MDuetRoWaterDG.h"
+#include "MAdjustHDInstitutionalRecordResponse.h"
 
 // DG Data Messages
 #include "MDGDrainPumpData.h"
@@ -326,6 +328,8 @@
     REGISTER_METATYPE(                                                        HDBloodLeakData ) \
     REGISTER_METATYPE(                                                          HDAirTrapData ) \
     REGISTER_METATYPE(                                                        HDAirBubbleData ) \
+    REGISTER_METATYPE(                                                HDUsageInfoResponseData ) \
+    REGISTER_METATYPE(                                                 HDUsageInfoRequestData ) \
     /*                                      Treatment Log                                    */ \
     REGISTER_METATYPE(                                                  TreatmentLogAvrgeData ) \
     REGISTER_METATYPE(                                                  TreatmentLogAlarmData ) \
@@ -453,9 +457,12 @@
     /*                                      Alarms - Active List Response                    */ \
     REGISTER_METATYPE(                                            AlarmActiveListResponseData ) \
     REGISTER_METATYPE(                                        AdjustHDAlarmVolumeResponseData ) \
+    REGISTER_METATYPE(                                        AdjustInstitutionalRequestData  ) \
+    REGISTER_METATYPE(                                 AdjustInstitutionalRecordResponseData  ) \
+    /*                                 HD reset in service mode                              */ \
+    REGISTER_METATYPE(                                         AdjustHDResetInSrvcRequestData ) \
 
 
-
 //===============================================================================//
 /*!
  \def       ACTION_RECEIVE_MODEL_BRIDGE_CONNECTIONS
@@ -584,8 +591,10 @@
     /*                                      Alarms - Active List Response                    */ \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                     AlarmActiveListResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                 AdjustHDAlarmVolumeResponseData ) \
+    /*                                     Settings - HD Data Response                       */ \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                         HDUsageInfoResponseData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,           AdjustInstitutionalRecordResponseData ) \
 
-
 //  /*   Request    */  ---------------------------------------------------------//
 #define ADJUST_TRANSMT_MODEL_BRIDGE_CONNECTIONS(vSOURCE)                                        \
     /*                                     CONFIRM                                           */ \
@@ -640,6 +649,13 @@
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                         AlarmSilenceRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                      AlarmUserActionRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                      AlarmActiveListRequestData ) \
+    /*                                         Settings - HD Info                            */ \
+    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                          HDUsageInfoRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                  AdjustInstitutionalRequestData ) \
+    /*                                      HD reset in service mode                         */ \
+    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                  AdjustHDResetInSrvcRequestData ) \
+
+
     /* disabled coco begin validated: Manually tested. This model class is a placeholder and there is no use case for this now.
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                AlarmClearedConditionRequestData ) \
     disabled coco end */                                                                                 \
@@ -775,6 +791,9 @@
     /*                                      Alarms - Active List Response                    */ \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                             AlarmActiveListResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                         AdjustHDAlarmVolumeResponseData ) \
+    /*                                      Settings - HD Data Response                      */ \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                                 HDUsageInfoResponseData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                   AdjustInstitutionalRecordResponseData ) \
 
 
 #define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS                                                 \
@@ -831,6 +850,11 @@
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                                 AlarmSilenceRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                              AlarmUserActionRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                              AlarmActiveListRequestData ) \
+    /*                                         Settings - HD Info                            */ \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION(                                  HDUsageInfoRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION(                          AdjustInstitutionalRequestData ) \
+    /*                                      HD reset in service mode                         */ \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION(                          AdjustHDResetInSrvcRequestData ) \
     /* disabled coco begin validated: Manually tested. This model class is a placeholder and there is no use case for this now.
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                        AlarmClearedConditionRequestData ) \
     disabled coco end */                                                                                 \
@@ -889,6 +913,12 @@
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                          AlarmSilenceRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                       AlarmUserActionRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                       AlarmActiveListRequestData ) \
+    /*                                         Settings - HD Info                            */ \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                           HDUsageInfoRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                   AdjustInstitutionalRequestData ) \
+    /*                                        HD reset in service mode                       */ \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                   AdjustHDResetInSrvcRequestData ) \
+
     /* disabled coco begin validated: Manually tested. This model class is a placeholder and there is no use case for this now.
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                 AlarmClearedConditionRequestData ) \
     disabled coco end */                                                                                 \
@@ -947,6 +977,11 @@
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                          AlarmSilenceRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                       AlarmUserActionRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                       AlarmActiveListRequestData ) \
+    /*                                         Settings - HD Info                            */ \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                           HDUsageInfoRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                   AdjustInstitutionalRequestData ) \
+    /*                                      HD reset in service mode                         */ \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                   AdjustHDResetInSrvcRequestData ) \
     /* disabled coco begin validated: Manually tested. This model class is a placeholder and there is no use case for this now.
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                 AlarmClearedConditionRequestData ) \
     disabled coco end */                                                                        \
@@ -1065,7 +1100,11 @@
     /*                                      Alarms                                           */ \
     ACTION_RECEIVE_SIGNAL(                                        AlarmActiveListResponseData ) \
     ACTION_RECEIVE_SIGNAL(                                    AdjustHDAlarmVolumeResponseData ) \
+    /*                                      Settings - HD data response                      */ \
+    ACTION_RECEIVE_SIGNAL(                                            HDUsageInfoResponseData ) \
+    ACTION_RECEIVE_SIGNAL(                              AdjustInstitutionalRecordResponseData ) \
 
 
+
 //--------------------------------------------------------------------------------//
 //--------------------------------------------------------------------------------//