Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -rdbcbd145954ef52510ac929a412e0dba42f0941b -r1fb58baf6e7e3d1f054b2a3634e233da7609dad9
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision dbcbd145954ef52510ac929a412e0dba42f0941b)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 1fb58baf6e7e3d1f054b2a3634e233da7609dad9)
@@ -8,7 +8,7 @@
 * @file SystemCommMessages.h
 *
 * @author (last) Sean Nash
-* @date (last) 07-Jul-2020
+* @date (last) 28-Aug-2020
 *
 * @author (original) Dara Navaei
 * @date (original) 05-Nov-2019
@@ -24,6 +24,15 @@
 #include "DGInterface.h"
 #include "Valves.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 **********
@@ -66,8 +75,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 );
 
@@ -153,7 +183,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 );
@@ -334,6 +364,10 @@
 // MSG_ID_HD_VALVES_SET_PWM_OVERRIDE
 void handleSetHDValvePWMOverrideRequest( MESSAGE_T *message );
 #endif
+
+// MSG_ID_HD_SET_PARAMETER_TREATMENT_PARAMETER
+void handleTestSetTreatmentParameter( MESSAGE_T *message );
 
+/**@}*/
+
 #endif
-