Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -rbb80dbac26147ab08413efa91007f7ffed43c38f -r4179eaf9c16e3607ce8abd961f154c2aaab2dffd
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision bb80dbac26147ab08413efa91007f7ffed43c38f)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 4179eaf9c16e3607ce8abd961f154c2aaab2dffd)
@@ -26,7 +26,8 @@
 #include "DialInFlow.h"
 #include "DialOutFlow.h"
 #include "Dialysis.h"
-#include "Prime.h"
+#include "Prime.h"
+#include "ModePreTreat.h"
 #include "ModeTreatment.h"
 #include "MsgQueues.h"
 #include "NVDataMgmt.h"
@@ -94,11 +95,11 @@
 // MSG_ID_DG_RESERVOIR_DATA:
 void handleDGReservoirData( MESSAGE_T *message );
 
-// MSG_ID_UI_START_TREATMENT
-void handleUIStartTreatmentMsg( MESSAGE_T *message );
+// MSG_ID_UI_INITIATE_TREATMENT_REQUEST
+void handleInitiateTreatmentRequest( MESSAGE_T *message );
 
-// MSG_ID_HD_START_TREATMENT_RESPONSE
-BOOL sendTreatmentStartResponseMsg( BOOL accepted, U32 reason );
+// MSG_ID_UI_INITIATE_TREATMENT_RESPONSE
+BOOL sendInitiateTreatmentResponseMsg( BOOL accepted, U32 reason );
 
 // MSG_ID_UI_NEW_TREATMENT_PARAMS
 void handleTreatmentParametersFromUI( MESSAGE_T *message );
@@ -187,6 +188,47 @@
 // MSG_ID_HD_RECIRC_CMD_RESPONSE
 BOOL sendTreatmentEndCmdResponse( BOOL accepted, U32 rejReason );
 
+// MSG_ID_UI_SAMPLE_WATER_CMD
+void handleSampleWaterCmd( MESSAGE_T *message );
+
+// MSG_ID_HD_SAMPLE_WATER_CMD_RESPONSE
+BOOL sendSampleWaterCmdResponse( BOOL accepted, U32 reason );
+
+// MSG_ID_UI_SAMPLE_WATER_RESULT
+void handleSampleWaterResult( MESSAGE_T *message );
+
+// MSG_ID_UI_CONSUMABLE_INSTALL_CONFIRM
+void handleConsumableInstallConfirm( MESSAGE_T *message );
+
+// MSG_ID_UI_INSTALLATION_CONFIRM
+void handleInstallationConfirm( MESSAGE_T *message );
+
+// MSG_ID_UI_START_PRIME_REQUEST
+void handleStartPrimeCmd( MESSAGE_T *message );
+
+// MSG_ID_HD_START_PRIME_RESPONSE
+BOOL sendStartPrimeCmdResponse( BOOL accepted, U32 reason );
+
+// MSG_ID_UI_CONTINUE_TO_TREATMENT_REQUEST
+void handleContinueToTreatmentCmd( MESSAGE_T *message );
+
+// MSG_ID_HD_CONTINUE_TO_TREATMENT_RESPONSE
+BOOL sendContinueToTreatmentCmdResponse( BOOL accepted, U32 reason );
+
+// MSG_ID_UI_PATIENT_CONNECTION_CONFIRM
+void handlePatientConnectionConfirmCmd( MESSAGE_T *message );
+
+// MSG_ID_HD_PATIENT_CONNECTION_CONFIRM_RESPONSE
+BOOL sendPatientConnectionConfirmCmdResponse( BOOL accepted, U32 reason );
+
+// MSG_ID_UI_START_TREATMENT_REQUEST
+void handleStartTreatmentRequest( MESSAGE_T *message );
+
+// MSG_ID_HD_START_TREATMENT_RESPONSE
+BOOL sendStartTreatmentResponse( BOOL accepted, U32 reason );
+
+// *********** public DG command functions **********
+
 // MSG_ID_SET_DG_DIALYSATE_TEMP_TARGETS
 BOOL sendDialysateTempTargetsToDG( F32 primary, F32 trimmer );
 
@@ -197,7 +239,7 @@
 BOOL sendDGChangeValveSettingCommand( U32 valveSettingCmd );
 
 // MSG_ID_DG_FILL_CMD
-BOOL sendDGFillCommand( U32 fillToVolumeMl );
+BOOL sendDGFillCommand( U32 cmd, U32 fillToVolumeMl );
 
 // MSG_ID_DG_DRAIN_CMD
 BOOL sendDGDrainCommand( DRAIN_RESERVOIR_CMD_PAYLOAD_T *drainCmdPtr );
@@ -209,14 +251,16 @@
 BOOL sendDGStartStopTrimmerHeaterCommand( BOOL start, F32 trimmerHtrTemp );
 
 // MSG_ID_DG_SAMPLE_WATER_CMD
-BOOL sendDGSampleWaterCommand( void );
+BOOL sendDGSampleWaterCommand( SAMPLE_WATER_CMD_T cmd );
 
 // MSG_ID_DG_COMMAND_RESPONSE
 void handleDGCmdResp( MESSAGE_T *messagePtr );
 
 // MSG_ID_DG_OP_MODE
 void handleDGOpMode( MESSAGE_T *message );
 
+// *********** public data broad cast functions **********
+
 // MSG_ID_HD_ACCELEROMETER_DATA
 BOOL broadcastAccelData( F32 x, F32 y, F32 z, F32 xm, F32 ym, F32 zm, F32 xt, F32 yt, F32 zt );
 
@@ -242,7 +286,7 @@
 BOOL broadcastDialInFlowData( DIALIN_PUMP_STATUS_PAYLOAD_T *dialInData );
 
 // MSG_ID_DIALYSATE_OUT_FLOW_DATA
-BOOL broadcastDialOutFlowData( DIAL_OUT_FLOW_DATA_T *dialOutFlowData );
+BOOL broadcastDialOutFlowData( DIAL_OUT_FLOW_DATA_T *dialOutFlowData );
 
 // MSG_ID_HD_SYRINGE_PUMP_DATA
 BOOL broadcastSyringePumpData( SYRINGE_PUMP_DATA_PAYLOAD_T data );
@@ -261,6 +305,9 @@
 
 // MSG_ID_TREATMENT_STATE
 BOOL broadcastTreatmentState( TREATMENT_STATE_DATA_T payload );
+
+// MSG_ID_PRE_TREATMENT_STATE
+BOOL broadcastPreTreatmentState( PRE_TREATMENT_STATE_DATA_T *preTreatmentDataPtr );
 
 // MSG_ID_POWER_OFF_WARNING
 BOOL broadcastPowerOffWarning( void );
@@ -289,6 +336,12 @@
 // MSG_ID_HD_AIR_TRAP_DATA
 BOOL broadcastAirTrapData( AIR_TRAP_LEVELS_T lowerLevel, AIR_TRAP_LEVELS_T upperLevel );
 
+// MSG_ID_HD_NO_CART_SELF_TEST_PROGRESS
+BOOL broadcastNoCartSelfTestTime( U32 timeout, U32 countdown );
+
+// MSG_ID_HD_DRY_SELF_TEST_PROGRESS
+BOOL broadcastDrySelfTestTime( U32 timeout, U32 countdown );
+
 // MSG_ID_HD_PRIMING_STATUS_DATA
 BOOL broadcastPrimeData( PRIMING_DATA_PAYLOAD_T *primeDataPtr );