Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -rc14a0220256e92a6339a444a3e1bc85e159ccce3 -r5d13922ee2e8c851bc5db67ef4d0120b47de6f07
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision c14a0220256e92a6339a444a3e1bc85e159ccce3)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 5d13922ee2e8c851bc5db67ef4d0120b47de6f07)
@@ -29,6 +29,7 @@
 #include "FluidLeak.h"
 #include "Prime.h"
 #include "ModePostTreat.h"
+#include "ModePreTreat.h"
 #include "ModeTreatment.h"
 #include "MsgQueues.h"
 #include "NVDataMgmt.h"
@@ -96,14 +97,11 @@
 // MSG_ID_DG_RESERVOIR_DATA:
 void handleDGReservoirData( MESSAGE_T *message );
 
-// MSG_ID_UI_START_TREATMENT_REQUEST
-void handleStartTreatmentRequest( 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 );
@@ -174,6 +172,45 @@
 // MSG_ID_HD_HEPARIN_PAUSE_RESUME_RESPONSE
 BOOL sendHeparinCommandResponse( U32 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 );
+
 // MSG_ID_UI_RINSEBACK_CMD
 void handlRinsebackCmd( MESSAGE_T *message );
 
@@ -207,6 +244,8 @@
 // MSG_ID_HD_TREATMENT_LOG_DATA_RESPONSE
 BOOL sendTreatmentLogData( BOOL accepted, U32 reason, TREATMENT_LOG_DATA_PAYLOAD_T *logDataPtr );
 
+// *********** public DG command functions **********
+
 // MSG_ID_SET_DG_DIALYSATE_TEMP_TARGETS
 BOOL sendDialysateTempTargetsToDG( F32 primary, F32 trimmer );
 
@@ -229,14 +268,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 );
 
@@ -284,6 +325,9 @@
 
 // MSG_ID_HD_POST_TREATMENT_STATE
 BOOL broadcastPostTreatmentState( U32 postTreatmentSubMode );
+
+// MSG_ID_PRE_TREATMENT_STATE
+BOOL broadcastPreTreatmentState( PRE_TREATMENT_STATE_DATA_T *preTreatmentDataPtr );
 
 // MSG_ID_POWER_OFF_WARNING
 BOOL broadcastPowerOffWarning( void );
@@ -312,6 +356,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_FLUID_LEAK_STATE
 BOOL broadcastFluidLeakState( FLUID_LEAK_STATES_T state );