Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -rd4f40c48a728c866c24bf44a59ff8ddd1e244ca1 -rffdb4e555df649ae73c30005e19b90c17c8aad2e
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision d4f40c48a728c866c24bf44a59ff8ddd1e244ca1)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision ffdb4e555df649ae73c30005e19b90c17c8aad2e)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2023 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2025 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)      Dara Navaei
-* @date    (last)      26-Apr-2023
+* @date    (last)      23-May-2025
 *
 * @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 **********
@@ -99,7 +100,7 @@
 void handleDGSerialNumberRequest( void );
 
 // MSG_ID_HD_REQUEST_DG_SERVICE_RECORD
-void handleDGServiceScheduleRequest( MESSAGE_T *message );
+void handleDGServiceScheduleRequestToUI( MESSAGE_T *message );
 
 // MSG_ID_HD_REQUEST_DG_CONCENTRATE_RATIOS
 void handleDGSendConcentrateMixingRatios( MESSAGE_T *message );
@@ -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 );
 
@@ -188,6 +192,27 @@
 // MSG_ID_DG_REQUEST_RO_MODE_ONLY_STATUS
 void requestROOnlyModeStatusFromUI( void );
 
+// MSG_ID_DG_START_STOP_RO_PERMEATE_SAMPLE_MODE_CMD_REQUEST
+void handleStartStopDGROPermeateSample( MESSAGE_T* message );
+
+// MSG_ID_HD_SEND_RO_PERMEATE_SAMPLE_DISPENSE_REQUEST
+void handleReceiveROPermeatSampleDispenseRequest( MESSAGE_T* message );
+
+// MSG_ID_DG_SEND_RO_PERMEATE_SAMPLE_DISPENSE_READY_TO_HD
+void sendROPermeateSampleDispenseReadyToHD( void );
+
+// 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 );
+
+// MSG_ID_DG_INSTIT_VALUES_FROM_HD_INSTIT_RECORD_REQUEST
+void sendDGInstitutionalValuesRequestToHD( void );
+
+// MSG_ID_DG_INSTIT_VALUES_FROM_HD_INSTIT_RECORD_RESPONSE
+void handleDGInstitutionalValuesResponseFromHDInstitRecord( MESSAGE_T* message );
+
 // *********** public test support message functions **********
 
 // MSG_TESTER_LOG_IN
@@ -231,9 +256,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 );
 
@@ -321,9 +343,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 );
 
@@ -334,7 +353,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 );
@@ -399,20 +418,16 @@
 // MSG_ID_DG_SET_FANS_RPM_ALARM_START_TIME_OFFSET
 void handleTestFansRPMAlarmStartTimeOffsetRequest( MESSAGE_T *message );
 
-// MSG_ID_DG_USED_ACID_VOLUME_ML_OVERRIDE
-void handleTestUsedAcidVolumeMLOverrideRequest(MESSAGE_T *message);
-
-// MSG_ID_DG_USED_BICARB_VOLUME_ML_OVERRIDE
-void handleTestUsedBicarbVolumeMLOverrideRequest(MESSAGE_T *message);
-
 // MSG_ID_DG_FANS_DUTY_CYCLE_OVERRIDE
 void handleSetFansDutyCycleOverrideRequest( MESSAGE_T *message );
 
+#ifndef _RELEASE_
 // MSG_ID_DG_GET_SW_CONFIG_RECORD
 void handleGetDGSoftwareConfigRecord( MESSAGE_T *message );
 
 // MSG_ID_DG_SET_SW_CONFIG_RECORD
 void handleSetDGSoftwareConfigRecord( MESSAGE_T *message );
+#endif
 
 // MSG_ID_HD_REQUEST_DG_ALARMS
 void handleResendAllAlarmsCommand( MESSAGE_T *message );
@@ -515,6 +530,39 @@
 // MSG_ID_DG_SET_COND_SENSOR_CAL_TABLE
 void handleTestDGSetConductivitySensorCalTable( MESSAGE_T* message );
 
+// MSG_ID_DG_SIGNAL_RECOVER_FROM_FAULT_MODE
+void handleTestDGSetRecoverFromFaultModeSignal( MESSAGE_T* message );
+
+// MSG_ID_DG_DRAIN_MODE_BROADCAST_INTERVAL_OVERRIDE
+void handleTestDGDrainModeBroadcastOverrideRequest( MESSAGE_T* message );
+
+// MSG_ID_DG_DIALIN_RO_ONLY_MODE_STATUS_REQUEST
+void handleDGROStatusRequest( MESSAGE_T* message );
+
+// MSG_ID_DG_RAM_STATUS_OVERRIDE
+void handleTestDGRAMStatusOverrideRequest( MESSAGE_T* message );
+
+// 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 );
+
+// MSG_ID_DG_MODE_FILL_ENABLE_CHEMS_TEST
+void handleTestEnableModeFillChemsTest( MESSAGE_T* message );
+
 /**@}*/
 
 #endif