Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r108abddcbf729f7435073116191cd3903261df8f -r04334ed8d1e927939718b1d62fb01afef0a2b9a9
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 108abddcbf729f7435073116191cd3903261df8f)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 04334ed8d1e927939718b1d62fb01afef0a2b9a9)
@@ -42,6 +42,12 @@
 
 // MSG_ID_USER_UF_PAUSE_RESUME_REQUEST
 void handleUFPauseResumeRequest( MESSAGE_T *message );
+// MSG_ID_USER_UF_SETTINGS_CHANGE_REQUEST
+void handleChangeUFSettingsRequest( MESSAGE_T *message );
+// MSG_ID_USER_UF_SETTINGS_CHANGE_RESPONSE
+BOOL sendChangeUFSettingsResponse( BOOL accepted, U32 volume_mL, U32 time_min, F32 ufRate_mL_min, U32 timeDiff, F32 rateDiff );
+// MSG_ID_USER_CONFIRM_UF_SETTINGS_CHANGE
+void handleChangeUFSettingsConfirmation( MESSAGE_T *message );
 
 // MSG_ID_ALARM_STATUS
 BOOL broadcastAlarmStatus( COMP_ALARM_STATUS_T almStatus );
@@ -68,14 +74,12 @@
 // MSG_ID_TREATMENT_TIME
 BOOL broadcastTreatmentTime( U32 secsTotTreatment, U32 secsElapsed, U32 secsRemaining );
 
+// MSG_ID_TREATMENT_STATE
+BOOL broadcastTreatmentState( U32 subMode, U32 uFState, BOOL salineBolusState );
+
 // MSG_ID_POWER_OFF_WARNING
 BOOL broadcastPowerOffWarning( void );
 
-#ifdef CAN_TEST
-// MSG_ID_HD_CAN_TEST_1_LARGE_FREQ
-void broadcastCANTest1LargeFrequentMessage();
-#endif
-
 // *********** public test support message functions **********
 
 #ifdef DEBUG_ENABLED