Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -rde5a0d43bdef611d963d11855bc958a8d8899a09 -r101bf85b0b425e919b01b4b7fabcbd15fd5bbde5
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision de5a0d43bdef611d963d11855bc958a8d8899a09)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 101bf85b0b425e919b01b4b7fabcbd15fd5bbde5)
@@ -23,6 +23,15 @@
 #include "DialOutFlow.h"
 #include "DGInterface.h"
 
+/**
+ *  @defgroup SystemCommMessages SystemCommMessages
+ *  @brief The system communication messages module provides helper functions
+ *  for sending outgoing system message and handling incoming system messages.
+ *
+ *  @addtogroup SystemCommMessages
+ *  @{
+ */
+
 // ********** public definitions **********
 
 // ********** public function prototypes **********
@@ -42,6 +51,12 @@
 // MSG_ID_OFF_BUTTON_PRESS
 BOOL sendOffButtonMsgToUI( U08 cmd );
 void handleOffButtonConfirmMsgFromUI( MESSAGE_T *message );
+
+// MSG_ID_ALARM_TRIGGERED
+void handleAlarmTriggered( MESSAGE_T *message );
+
+// MSG_ID_ALARM_CLEARED
+void handleAlarmCleared( MESSAGE_T *message );
 
 // MSG_ID_LOAD_CELL_READINGS
 void handleLoadCellReadingsFromDG( MESSAGE_T *message );
@@ -59,8 +74,29 @@
 void handleDGPressuresData( MESSAGE_T *message );
 
 // MSG_ID_DG_RESERVOIR_DATA:
-void handleDGReservoirData( MESSAGE_T *message );
+void handleDGReservoirData( MESSAGE_T *message );
+
+// MSG_ID_UI_START_TREATMENT
+void handleUIStartTreatmentMsg( MESSAGE_T *message );
+
+// 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 accepted, U08 *rejectReasons, U32 byteLength );
 
+// MSG_ID_UI_USER_CONFIRM_TREATMENT_PARAMS
+void handleUIUserConfirmTreatmentParameters( MESSAGE_T *message );
+
 // MSG_ID_USER_UF_PAUSE_RESUME_REQUEST
 void handleUFPauseResumeRequest( MESSAGE_T *message );
 
@@ -113,7 +149,10 @@
 BOOL sendDGStartStopTrimmerHeaterCommand( BOOL start );
 
 // MSG_ID_DG_OP_MODE:
-void handleDGOpMode( MESSAGE_T *message );
+void handleDGOpMode( MESSAGE_T *message );
+
+// 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 );
 
 // MSG_ID_ALARM_STATUS
 BOOL broadcastAlarmStatus( COMP_ALARM_STATUS_T almStatus );
@@ -143,7 +182,7 @@
 BOOL broadcastTreatmentTime( U32 secsTotTreatment, U32 secsElapsed, U32 secsRemaining );
 
 // MSG_ID_TREATMENT_STATE
-BOOL broadcastTreatmentState( U32 subMode, U32 uFState, BOOL salineBolusState );
+BOOL broadcastTreatmentState( U32 subMode, U32 uFState, U32 salineBolusState );
 
 // MSG_ID_POWER_OFF_WARNING
 BOOL broadcastPowerOffWarning( void );
@@ -159,17 +198,17 @@
 // *********** public test support message functions **********
 
 #ifdef DEBUG_ENABLED
-// DEBUG OUTPUT
-BOOL sendDebugData( U08 *dbgData, U32 len );
+// DEBUG OUTPUT to debug UART
+BOOL sendDebugData( U08 *dbgData, U32 len );
+
+// Debug message to UI for logging
+void sendDebugDataToUI( U08 *str );
 #endif
 
 // MSG_TESTER_LOG_IN
 void handleTesterLogInRequest( MESSAGE_T *message );
 BOOL isTestingActivated( void );
 
-// MSG_ID_HD_MESSAGE
-void handleTestHDMessageRequest( MESSAGE_T *message );
-
 // MSG_ID_OFF_BUTTON_STATE_OVERRIDE
 void handleTestOffButtonStateOverrideRequest( MESSAGE_T *message );
 
@@ -213,7 +252,10 @@
 void handleTestBloodPumpRotorMeasuredSpeedOverrideRequest( MESSAGE_T *message );
 
 // MSG_ID_DIAL_IN_FLOW_SET_PT_OVERRIDE
-void handleTestDialInFlowSetPointOverrideRequest( MESSAGE_T *message );
+void handleTestDialInFlowSetPointOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_DIAL_OUT_FLOW_SET_PT_OVERRIDE
+void handleTestDialOutFlowSetPointOverrideRequest( MESSAGE_T *message );
 
 // MSG_ID_DIAL_IN_FLOW_MEAS_OVERRIDE
 void handleTestDialInFlowMeasuredOverrideRequest( MESSAGE_T *message );
@@ -280,6 +322,28 @@
 
 // MSG_ID_HD_SAFETY_SHUTDOWN_OVERRIDE:
 void handleTestHDSafetyShutdownOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_HD_ACCEL_OVERRIDE:
+void handleTestHDAccelOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_HD_ACCEL_MAX_OVERRIDE:
+void handleTestHDAccelMaxOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_HD_ACCEL_SEND_INTERVAL_OVERRIDE:
+void handleTestHDAccelBroadcastIntervalOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_HD_ACCEL_SET_CALIBRATION:
+void handleSetAccelCalibration( MESSAGE_T *message );
+
+// MSG_ID_HD_BLOOD_FLOW_SET_CALIBRATION:
+void handleSetBloodFlowCalibration( MESSAGE_T *message );
+
+// MSG_ID_HD_DIALYSATE_FLOW_SET_CALIBRATION:
+void handleSetDialysateFlowCalibration( MESSAGE_T *message );
+
+// MSG_ID_HD_SET_PARAMETER_TREATMENT_PARAMETER
+void handleTestSetTreatmentParameter( MESSAGE_T *message );
 
+/**@}*/
+
 #endif
-