Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r933a18d740285e70be9d00696ed0f5a5381bc8e4 -rc282822f36836a8127f447c8ac5b8a50e851be63
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 933a18d740285e70be9d00696ed0f5a5381bc8e4)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision c282822f36836a8127f447c8ac5b8a50e851be63)
@@ -24,7 +24,8 @@
 #include "DGInterface.h"
 #include "DialInFlow.h"
 #include "DialOutFlow.h"
-#include "Dialysis.h"
+#include "Dialysis.h"
+#include "Prime.h"
 #include "ModeTreatment.h"
 #include "MsgQueues.h"
 #include "NVDataMgmt.h"
@@ -66,6 +67,12 @@
 // MSG_ID_ALARM_CLEARED
 void handleAlarmCleared( MESSAGE_T *message );
 
+// MSG_ID_USER_REQUEST_ALARM_SILENCE
+void handleUIAlarmSilenceRequest( MESSAGE_T *message );
+
+// MSG_ID_ALARM_CONDITION_CLEARED
+void handleAlarmUserAction( MESSAGE_T *message );
+
 // MSG_ID_LOAD_CELL_READINGS
 void handleLoadCellReadingsFromDG( MESSAGE_T *message );
 
@@ -90,18 +97,18 @@
 // MSG_ID_HD_START_TREATMENT_RESPONSE
 BOOL sendTreatmentStartResponseMsg( BOOL accepted, U32 reason );
 
-// MSG_ID_UI_TREATMENT_END_REQUEST
-void handleUIUserEndTreatmentRequest( MESSAGE_T *message );
-
-// MSG_ID_HD_TREATMENT_END_RESPONSE
-BOOL sendTreatmentEndResponseMsg( BOOL accepted );
-
 // MSG_ID_UI_NEW_TREATMENT_PARAMS
 void handleTreatmentParametersFromUI( MESSAGE_T *message );
 
 // MSG_ID_HD_NEW_TREATMENT_PARAMS_RESPONSE
 BOOL sendTreatmentParametersResponseMsg( BOOL rejected, U08 *rejectReasons, U32 byteLength );
 
+// MSG_ID_UI_SET_UF_VOLUME_PARAMETER
+void handleUFVolumeSetRequest( MESSAGE_T *message );
+
+// MSG_ID_HD_SET_UF_VOLUME_PARAMETER_RESPONSE
+BOOL sendUFVolumeSetResponseMsg( BOOL accepted, U32 reason, F32 uFVolumeMl );
+
 // MSG_ID_UI_USER_CONFIRM_TREATMENT_PARAMS
 void handleUIUserConfirmTreatmentParameters( MESSAGE_T *message );
 
@@ -160,18 +167,21 @@
 BOOL sendDGFillCommand( U32 fillToVolumeMl );
 
 // MSG_ID_DG_DRAIN_CMD
-BOOL sendDGDrainCommand( U32 drainToVolumeMl );
+BOOL sendDGDrainCommand( DRAIN_RESERVOIR_CMD_PAYLOAD_T *drainCmdPtr );
 
 // MSG_ID_STARTING_STOPPING_TREATMENT_CMD
 BOOL sendDGStartStopCommand( BOOL start );
 
+// MSG_ID_DG_START_STOP_TRIMMER_HEATER_CMD
+BOOL sendDGStartStopTrimmerHeaterCommand( BOOL start, F32 trimmerHtrTemp );
+
 // MSG_ID_DG_SAMPLE_WATER_CMD
 BOOL sendDGSampleWaterCommand( void );
+
+// MSG_ID_DG_COMMAND_RESPONSE
+void handleDGCmdResp( MESSAGE_T *messagePtr );
 
-// MSG_ID_DG_START_STOP_TRIMMER_HEATER_CMD
-BOOL sendDGStartStopTrimmerHeaterCommand( BOOL start );
-
-// MSG_ID_DG_OP_MODE:
+// MSG_ID_DG_OP_MODE
 void handleDGOpMode( MESSAGE_T *message );
 
 // MSG_ID_HD_ACCELEROMETER_DATA
@@ -181,11 +191,17 @@
 BOOL broadcastAlarmStatus( COMP_ALARM_STATUS_T almStatus );
 
 // MSG_ID_ALARM_TRIGGERED
-BOOL broadcastAlarmTriggered( U16 alarm, ALARM_DATA_T almData1, ALARM_DATA_T almData2 );
+BOOL broadcastAlarmTriggered( U32 alarm, ALARM_DATA_T almData1, ALARM_DATA_T almData2 );
 
+// MSG_ID_ALARM_CONDITION_CLEARED
+BOOL broadcastAlarmConditionCleared( U32 alarm );
+
 // MSG_ID_ALARM_CLEARED
-BOOL broadcastAlarmCleared( U16 alarm );
+BOOL broadcastAlarmCleared( U32 alarm );
 
+// MSG_ID_ALARM_CONDITION_CLEARED
+BOOL broadcastAlarmConditionCleared( U32 alarm );
+
 // MSG_ID_BLOOD_FLOW_DATA
 BOOL broadcastBloodFlowData( BLOOD_PUMP_STATUS_PAYLOAD_T *bloodData );
 
@@ -222,6 +238,9 @@
 // MSG_ID_HD_AIR_TRAP_DATA
 BOOL broadcastAirTrapData( AIR_TRAP_LEVELS_T lowerLevel, AIR_TRAP_LEVELS_T upperLevel );
 
+// MSG_ID_HD_PRIMING_STATUS_DATA
+BOOL broadcastPrimeData( PRIMING_DATA_PAYLOAD_T *primeDataPtr );
+
 #ifdef EMC_TEST_BUILD
 // MSG_ID_CAN_ERROR_COUNT
 BOOL broadcastCANErrorCount( U32 count );
@@ -259,9 +278,6 @@
 // MSG_ID_ALARM_TIME_OVERRIDE
 void handleTestAlarmTimeOverrideRequest( MESSAGE_T *message );
 
-// MSG_ID_ALARM_STATUS_SEND_INTERVAL_OVERRIDE
-void handleTestAlarmStatusBroadcastIntervalOverrideRequest( MESSAGE_T *message );
-
 // MSG_ID_BLOOD_FLOW_SET_PT_OVERRIDE
 void handleTestBloodFlowSetPointOverrideRequest( MESSAGE_T *message );