Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -raa1367aa813db6acc52013795a8c6e58405bb10e -re6c60e07b450ec8d58e87bf13d45f96efab54d8b
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision aa1367aa813db6acc52013795a8c6e58405bb10e)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision e6c60e07b450ec8d58e87bf13d45f96efab54d8b)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2023 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2024 Diality Inc. - All Rights Reserved.
 *
 * 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    SystemCommMessages.h
 *
-* @author  (last)      Michael Garthwaite
-* @date    (last)      15-Aug-2023
+* @author  (last)      Dara Navaei
+* @date    (last)      12-Jul-2024
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -53,6 +53,7 @@
 {
     BOOL accepted;                                  ///< Accepted/Rejected
     U32 rejectionReason;                            ///< Rejection reason if not accepted.
+    U32 fwValue;                                    ///< Value in the firmware.
 } UI_RESPONSE_PAYLOAD_T;
 
 // ********** public function prototypes **********
@@ -131,6 +132,9 @@
 // MSG_ID_DG_START_STOP_TRIMMER_HEATER_CMD
 BOOL handleDGStartStopTrimmerHeater( MESSAGE_T *message );
 
+//MSG_ID_DG_PARK_CONCENTRATE_PUMPS
+void handleParkConecentratePumpsCmd( MESSAGE_T *message );
+
 // MSG_ID_HD_START_STOP_TRIMMER_HEATER_CMD
 void handleHDStartStopTrimmerHeaterCmd( MESSAGE_T *message );
 
@@ -194,6 +198,9 @@
 // MSG_ID_HD_REQUEST_SERVICE_RECORD_FROM_HD
 void handleSendDGServiceRecordToHD( MESSAGE_T* message );
 
+// MSG_ID_DG_START_STOP_NOCTURNAL_HEAT_DISINFECT
+void handleStartStopDGPassiveCoolHeatDisifnect( MESSAGE_T* message );
+
 // *********** public test support message functions **********
 
 // MSG_TESTER_LOG_IN
@@ -237,9 +244,6 @@
 // MSG_ID_DIALYSATE_FLOW_SEND_INTERVAL_OVERRIDE:
 void handleTestFlowSensorsDataBroadcastIntervalOverrideRequest( MESSAGE_T *message );
 
-// MSG_ID_DRAIN_PUMP_SET_RPM_OVERRIDE
-void handleTestDrainPumpRPMOverrideRequest( MESSAGE_T *message );
-
 // MSG_ID_DRAIN_PUMP_SET_RPM
 void handleTestSetDrainPumpRPM( MESSAGE_T *message );
 
@@ -327,9 +331,6 @@
 // MSG_ID_DG_RO_PUMP_DUTY_CYCLE_OVERRIDE
 void handleTestROPumpDutyCycleOverride( MESSAGE_T *message );
 
-// MSG_ID_DG_RO_FLOW_RATE_OVERRIDE
-void handleTestMeasuredROFlowRateOverride( MESSAGE_T *message );
-
 // MSG_ID_DG_SET_RO_PUMP_TARGET_FLOW
 void handleTestROPumpTargetFlowOverride( MESSAGE_T *message );
 
@@ -340,7 +341,7 @@
 BOOL handleStartStopDGFlush( MESSAGE_T *message );
 
 // MSG_ID_DG_START_STOP_HEAT_DISINFECT
-BOOL handleStartStopDGHeatDisinfect( MESSAGE_T *message );
+BOOL handleStartStopDGActiveCoolHeatDisinfect( MESSAGE_T *message );
 
 // MSG_ID_UI_DG_SET_RTC_REQUEST
 void handleUIClockSyncRequest( MESSAGE_T *message );
@@ -526,6 +527,21 @@
 // MSG_ID_DG_CAN_RECEIVE_ACK_MESSAGE_OVERRIDE
 void handleTestDGPendingACKOverrideRequest( MESSAGE_T* message );
 
+// MSG_ID_DG_RESERVOIR_BROADCAST_INTERVAL_OVERRIDE
+void handleTestDGReservoirOverrideRequest( MESSAGE_T* message );
+
+// MSG_ID_DG_STATE_TIMER_77C_OVERRIDE
+void handleTestDG77CStateTimerOverride( MESSAGE_T* message );
+
+// MSG_ID_DG_STATE_TIMER_82C_OVERRIDE
+void handleTestDG82CStateTimerOverride( MESSAGE_T* message );
+
+// MSG_ID_DG_CHEM_DISINFECT_ACID_OVERRIDE
+void handleTestChemDisinfectAcidOverride( MESSAGE_T* message );
+
+// MSG_ID_DG_RUN_MODE_FILL_FOR_CAL_CHECK
+void handleTestRunModeFillForCalibrationCheck( MESSAGE_T* message );
+
 /**@}*/
 
 #endif