Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r326e3597e1555ef2ac4978f58786e7ce638b1287 -r1240b612f790f931825aba86ec37f37eccce9336
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 326e3597e1555ef2ac4978f58786e7ce638b1287)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 1240b612f790f931825aba86ec37f37eccce9336)
@@ -18,16 +18,19 @@
 #ifndef __SYSTEM_COMM_MESSAGES_H__
 #define __SYSTEM_COMM_MESSAGES_H__
 
-#include "HDCommon.h"
 #include "AirTrap.h"
 #include "BloodFlow.h"
+#include "BloodLeak.h"
 #include "BloodPrime.h"
+#include "Bubble.h"
 #include "DGInterface.h"
-#include "DialInFlow.h"
+#include "DialInFlow.h"
 #include "DialOutFlow.h"
-#include "Dialysis.h"
+#include "Dialysis.h"
 #include "FluidLeak.h"
-#include "Prime.h"
+#include "HDCommon.h"
+#include "Prime.h"
+#include "ModePostTreat.h"
 #include "ModePreTreat.h"
 #include "ModeTreatment.h"
 #include "MsgQueues.h"
@@ -247,6 +250,21 @@
 // MSG_ID_HD_RECIRC_CMD_RESPONSE
 BOOL sendTreatmentEndCmdResponse( BOOL accepted, U32 rejReason );
 
+// MSG_ID_UI_PATIENT_DISCONNECTION_CONFIRM
+void handlePatientDisconnectionConfirmCmd( MESSAGE_T *message );
+
+// MSG_ID_UI_DISPOSABLE_REMOVAL_CONFIRM
+void handleDisposableRemovalConfirmCmd( MESSAGE_T *message );
+
+// MSG_ID_HD_DISPOSABLE_REMOVAL_CONFIRM_RESPONSE
+BOOL sendDisposableRemovalConfirmResponse( BOOL accepted, U32 reason );
+
+// MSG_ID_UI_TREATMENT_LOG_DATA_REQUEST
+void handleUITreatmentLogDataRequest( MESSAGE_T *message );
+
+// 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
@@ -335,6 +353,9 @@
 // MSG_ID_TREATMENT_STATE
 BOOL broadcastTreatmentState( TREATMENT_STATE_DATA_T payload );
 
+// MSG_ID_HD_POST_TREATMENT_STATE
+BOOL broadcastPostTreatmentState( U32 postTreatmentSubMode );
+
 // MSG_ID_PRE_TREATMENT_STATE
 BOOL broadcastPreTreatmentState( PRE_TREATMENT_STATE_DATA_T *preTreatmentDataPtr );
 
@@ -374,6 +395,12 @@
 // MSG_ID_HD_FLUID_LEAK_STATE
 BOOL broadcastFluidLeakState( FLUID_LEAK_STATES_T state );
 
+// MSG_ID_HD_BLOOD_LEAK_DATA
+BOOL broadcastBloodLeakData( BLOOD_LEAK_STATUS_T status, U32 state );
+
+// MSG_ID_HD_BUBBLES_DATA
+BOOL broadcastBubblesData( U32 statusADA, U32 stateADA, U32 statusADV, U32 stateADV );
+
 // MSG_ID_HD_PRIMING_STATUS_DATA
 BOOL broadcastPrimeData( PRIMING_DATA_PAYLOAD_T *primeDataPtr );
 
@@ -572,9 +599,27 @@
 // MSG_ID_HD_FLUID_LEAK_SEND_INTERVAL_OVERRIDE
 void handleSetFluidLeakBroadcastIntervalOverrideRequest( MESSAGE_T *message );
 
-// MSG_ID_HD_FLUID_LEAK_STATE_DETECTOR_OVERRIDE
-void handleSetFluidLeakStateDetectorOverrideRequest( MESSAGE_T *message );
+// MSG_ID_HD_FLUID_LEAK_STATE_OVERRIDE
+void handleSetFluidLeakStateOverrideRequest( MESSAGE_T *message );
 
+// MSG_ID_HD_BLOOD_LEAK_DATA_SEND_INTERVAL_OVERRIDE
+void handleSetBloodLeakDataBroadcastIntervalOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_HD_BLOOD_LEAK_STATUS_OVERRIDE
+void handleSetBloodLeakStatusOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_HD_BLOOD_LEAK_ZERO_REQUEST
+void handleBloodLeakZeroRequest( MESSAGE_T *message );
+
+// MSG_ID_HD_BUBBLES_DATA_SEND_INTERVAL_OVERRIDE
+void handleSetBubblesDataBroadcastIntervalOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_HD_BUBBLE_STATUS_OVERRIDE
+void handleSetBubbleStatusOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_HD_BUBBLE_SELF_TEST_REQUEST
+void handleBubbleSelfTestRequest( MESSAGE_T *message );
+
 // MSG_ID_SUPER_CLEAR_ALARMS_CMD
 void handleTestSuperClearAlarmsRequest( MESSAGE_T *message );