Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r7334590e610cd1543e128ad2dbc0de17e824b619 -r7a5747d1e8d741ae72aa20787e0867d95e2e1455
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 7334590e610cd1543e128ad2dbc0de17e824b619)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 7a5747d1e8d741ae72aa20787e0867d95e2e1455)
@@ -22,6 +22,7 @@
 #include "BloodFlow.h"
 #include "BloodLeak.h"
 #include "BloodPrime.h"
+#include "Bubble.h"
 #include "DGInterface.h"
 #include "DialInFlow.h"
 #include "DialOutFlow.h"
@@ -162,6 +163,9 @@
 // MSG_ID_TREATMENT_PARAM_CHANGE_RANGES
 BOOL sendTreatmentParamsRangesToUI( U32 minTime, U32 maxTime, F32 minUFVol, F32 maxUFVol, U32 minDialRate, U32 maxDialRate );
 
+// MSG_ID_HD_TREATMENT_LOG_PERIODIC_DATA
+BOOL sendTreatmentPeriodicDataToUI( TREATMENT_LOG_DATA_PERIODIC_T * periodDataPtr );
+
 // MSG_ID_USER_BLOOD_DIAL_RATE_CHANGE_REQUEST
 void handleChangeBloodDialysateRateChangeRequest( MESSAGE_T *message );
 
@@ -264,6 +268,12 @@
 // MSG_ID_HD_TREATMENT_LOG_DATA_RESPONSE
 BOOL sendTreatmentLogData( BOOL accepted, U32 reason, TREATMENT_LOG_DATA_PAYLOAD_T *logDataPtr );
 
+// MSG_ID_UI_ACTIVE_ALARMS_LIST_REQUEST
+void handleUIActiveAlarmsListRequest( MESSAGE_T *message );
+
+// MSG_ID_HD_ACTIVE_ALARMS_LIST_REQUEST_RESPONSE
+BOOL sendActiveAlarmsList( BOOL accepted, U32 reason, U32 *alarmList, U32 size );
+
 // *********** public DG command functions **********
 
 // MSG_ID_SET_DG_DIALYSATE_TEMP_TARGETS
@@ -397,6 +407,9 @@
 // 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 );
 
@@ -607,6 +620,15 @@
 // 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 );