Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r4e4ab946c0bc4b668cf5b197c7f841355814ccf5 -re8053e6bdafd0638102e01c4250dfd74c0850ba1
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 4e4ab946c0bc4b668cf5b197c7f841355814ccf5)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision e8053e6bdafd0638102e01c4250dfd74c0850ba1)
@@ -8,7 +8,7 @@
 * @file    SystemCommMessages.h
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      03-Aug-2022
+* @date    (last)      18-Oct-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:
@@ -395,6 +395,15 @@
 // MSG_ID_DG_START_STOP_CHEM_DISINFECT
 BOOL sendDGStartChemicalDisinfectModeCommand( BOOL start );
 
+// MSG_ID_HD_RESPONSE_SERVICE_MODE_REQUEST
+void sendUIServiceModeResponse( BOOL accepted, U32 rejCode );
+
+// MSG_ID_HD_REQUEST_DG_SERVICE_MODE
+BOOL sendDGServiceModeRequest( void );
+
+// MSG_ID_UI_REQUEST_SERVICE_MODE
+void handleUIServiceModeRequest( MESSAGE_T *message );
+
 // MSG_ID_ALARM_STATUS
 BOOL broadcastAlarmStatus( COMP_ALARM_STATUS_T almStatus );
 
@@ -422,13 +431,30 @@
 // MSG_ID_HD_SET_SW_CONFIG_RECORD
 void handleSetHDSoftwareConfigRecord( MESSAGE_T *message );
 
-// MSG_ID_UI_REQUEST_SERVICE_MODE
-void handleUIServiceModeRequest( MESSAGE_T *message );
-void sendUIServiceModeResponse( BOOL accepted, U32 rejCode );
+// 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
@@ -807,6 +833,15 @@
 // MSG_ID_HD_SEND_ALARMS_COMMAND
 void handleResendAllAlarmsCommand(  MESSAGE_T* message );
 
+// MSG_ID_HD_BLOOD_PUMP_SET_PWM
+void handleTestBloodPumpSetPWM( MESSAGE_T* message );
+
+// MSG_ID_HD_DIAL_IN_SET_PWM
+void handleTestDialInSetPWM( MESSAGE_T* message );
+
+// MSG_ID_HD_DIAL_OUT_SET_PWM
+void handleTestDialOutSetPWM( MESSAGE_T* message );
+
 /**@}*/
 
 #endif