Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r94dab74a6432263dc4569e0cf8f9fa0b01bf1917 -r80a6638b362f5f613c0665200023d181f614d1bc
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 94dab74a6432263dc4569e0cf8f9fa0b01bf1917)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 80a6638b362f5f613c0665200023d181f614d1bc)
@@ -139,7 +139,10 @@
 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 );
@@ -372,7 +375,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 +435,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 +811,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