Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -rf89cac0c61f0068c045411504925373c3731c874 -r5ce7985577e93071cd4c361efe2342cdcd7004dd
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision f89cac0c61f0068c045411504925373c3731c874)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 5ce7985577e93071cd4c361efe2342cdcd7004dd)
@@ -139,15 +139,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:
@@ -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,21 @@
 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 );
+
+// 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
@@ -810,8 +823,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 );