Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -ra4e044315bbfaaeff11cb9391485897458a48a5f -rd7b793881e8414f2daf75825d5de4e25a25d10ac
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision a4e044315bbfaaeff11cb9391485897458a48a5f)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision d7b793881e8414f2daf75825d5de4e25a25d10ac)
@@ -7,8 +7,8 @@
 *
 * @file    SystemCommMessages.h
 *
-* @author  (last)      Michael Garthwaite
-* @date    (last)      28-Sep-2022
+* @author  (last)      Dara Navaei
+* @date    (last)      03-Nov-2022
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -63,9 +63,6 @@
 #define ACK_REQUIRED                    TRUE                ///< Macro for functions that want to know if an outgoing message requires acknowledgement from receiver.
 #define ACK_NOT_REQUIRED                FALSE               ///< Macro for functions that want to know if an outgoing message requires acknowledgement from receiver.
 
-#define ACK_REQUIRED                    TRUE                ///< Macro for functions that want to know if an outgoing message requires acknowledgement from receiver.
-#define ACK_NOT_REQUIRED                FALSE               ///< Macro for functions that want to know if an outgoing message requires acknowledgement from receiver.
-
 // ********** public function prototypes **********
 
 // Serialize message
@@ -139,15 +136,18 @@
 void handleUIPOSTFinalResult( MESSAGE_T *message );
 
 // MSG_ID_LOAD_CELL_READINGS
-void handleLoadCellReadingsFromDG( MESSAGE_T *message );
+void handleLoadCellReadingsFromDG( MESSAGE_T *message );
+
+// MSG_ID_DG_HEATERS_DATA
+void handleDGHeatersData( MESSAGE_T *message );
 
 // MSG_ID_DG_TEMPERATURE_DATA:
 void handleDGTemperatureData( MESSAGE_T *message );
 
 // MSG_ID_RO_PUMP_DATA:
 void handleROPumpData( MESSAGE_T *message );
 
-// MSG_ID_DG_DIALYSATE_FLOW_METER_DATA:
+// MSG_ID_DG_FLOW_SENSORS_DATA
 void handleDialysateFlowData( MESSAGE_T *message );
 
 // MSG_ID_DRAIN_PUMP_DATA:
@@ -357,7 +357,7 @@
 BOOL sendDialysateHeatingParamsToDG( DG_CMD_DIALYSATE_HEATING_PARAMS_T *params );
 
 // MSG_ID_DG_SWITCH_RESERVOIR_CMD
-BOOL sendDGSwitchReservoirCommand( U32 activeReservoir );
+BOOL sendDGSwitchReservoirCommand( DG_SWITCH_RSRVRS_CMD_T *cmd );
 
 // MSG_ID_DG_CHANGE_VALVE_SETTING_CMD
 BOOL sendDGChangeValveSettingCommand( U32 valveSettingCmd );
@@ -431,10 +431,30 @@
 // MSG_ID_HD_SET_SW_CONFIG_RECORD
 void handleSetHDSoftwareConfigRecord( MESSAGE_T *message );
 
+// MSG_ID_HD_SEND_ALARMS_COMMAND
+void handleResendAllAlarmsCommand(  MESSAGE_T* message );
 
+// MSG_ID_UI_CONFIRMATION_RESULT
+void handleUIConfirmationResponse( MESSAGE_T *message );
+
+// MSG_ID_HD_REQUEST_UI_CONFIRMATION
+void sendConfirmationRequest( GENERIC_CONFIRM_ID_T request_id, GENERIC_CONFIRM_COMMAND_T request_type, U32 reject_reason );
+
 // MSG_ID_HD_REQUEST_DG_ALARMS
 BOOL sendRequestForDGResendAlarms( void );
 
+// MSG_ID_HD_REQUEST_DG_USAGE_INFO
+BOOL sendDGUsageInfoRequestToDG( void );
+
+// MSG_ID_HD_REQUEST_DG_SERVICE_INFO
+BOOL sendDGServiceRequestToDG( void );
+
+// MSG_ID_DG_SERVICE_SCHEDULE_DATA
+void handleDGServiceScheduleData( MESSAGE_T *message );
+
+// MSG_ID_DG_USAGE_DATA
+void handleDGUsageInfoData( MESSAGE_T *message );
+
 // *********** public test support message functions **********
 
 // MSG_TESTER_LOG_IN
@@ -468,6 +488,9 @@
 // MSG_ID_BLOOD_ROTOR_COUNT_OVERRIDE
 void handleHDBloodPumpRotorCountOverrideRequest( MESSAGE_T *message );
 
+// MSG_ID_DIALYSATE_INLET_PUMP_ROTOR_COUNT_OVERRIDE
+void handleHDDialInPumpRotorCountOverrideRequest( MESSAGE_T *message );
+
 // MSG_ID_BLOOD_PUMP_MC_MEAS_SPEED_OVERRIDE
 void handleTestBloodPumpMCMeasuredSpeedOverrideRequest( MESSAGE_T *message );