Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -rf89cac0c61f0068c045411504925373c3731c874 -rd4bc221d9817b488c2dcd00868386d7036a5c9a1
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision f89cac0c61f0068c045411504925373c3731c874)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision d4bc221d9817b488c2dcd00868386d7036a5c9a1)
@@ -7,8 +7,8 @@
 *
 * @file    SystemCommMessages.h
 *
-* @author  (last)      Michael Garthwaite
-* @date    (last)      08-Aug-2022
+* @author  (last)      Dara Navaei
+* @date    (last)      22-Sep-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 );
@@ -432,11 +432,9 @@
 void handleSetHDSoftwareConfigRecord( MESSAGE_T *message );
 
 
-#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
@@ -810,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 );
+
 // MSG_ID_HD_BLOOD_PUMP_SET_PWM
 void handleTestBloodPumpSetPWM( MESSAGE_T* message );