Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r54c46e24708461130e5c86c296e347f864d4f238 -r3633c7c348e95b11175dfb4a4a183bdb6cd24478
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 54c46e24708461130e5c86c296e347f864d4f238)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 3633c7c348e95b11175dfb4a4a183bdb6cd24478)
@@ -7,8 +7,8 @@
 *
 * @file    SystemCommMessages.h
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      13-Jul-2022
+* @author  (last)      Michael Garthwaite
+* @date    (last)      08-Aug-2022
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -372,7 +372,7 @@
 BOOL sendDGStartStopCommand( BOOL start );
 
 // MSG_ID_DG_START_STOP_TRIMMER_HEATER_CMD
-BOOL sendDGStartStopTrimmerHeaterCommand( BOOL start, F32 trimmerHtrTemp );
+BOOL sendDGStartStopTrimmerHeaterCommand( BOOL start );
 
 // MSG_ID_DG_SAMPLE_WATER_CMD
 BOOL sendDGSampleWaterCommand( SAMPLE_WATER_CMD_T cmd );
@@ -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,15 +431,10 @@
 // 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 );
 
-#ifdef EMC_TEST_BUILD
-// MSG_ID_CAN_ERROR_COUNT
-BOOL broadcastCANErrorCount( U32 count );
-#endif
-
+// MSG_ID_HD_REQUEST_DG_ALARMS
+BOOL sendRequestForDGResendAlarms( void );
+
 // *********** public test support message functions **********
 
 // MSG_TESTER_LOG_IN
@@ -804,8 +808,11 @@
 void handleSetBloodLeakEmbeddedModeCommand( MESSAGE_T* message );
 
 // MSG_ID_HD_SEND_BLOOD_LEAK_EMB_MODE_RESPONSE
-BOOL handleSendBloodLeakEmbeddedModeCommandResponse( U32 responseLen, U08* response );
+BOOL sendBloodLeakEmbeddedModeCommandResponse( U32 responseLen, U08* response );
 
+// MSG_ID_HD_SEND_ALARMS_COMMAND
+void handleResendAllAlarmsCommand(  MESSAGE_T* message );
+
 /**@}*/
 
 #endif