Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r1a5aa1dff6978966ecda860b09c07a84e80399fe -r981de1f5228152ec6877aceae3d66ebf5efc7101
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 1a5aa1dff6978966ecda860b09c07a84e80399fe)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 981de1f5228152ec6877aceae3d66ebf5efc7101)
@@ -97,12 +97,6 @@
 // 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 );
 
@@ -168,6 +162,9 @@
 
 // MSG_ID_DG_SWITCH_RESERVOIR_CMD
 BOOL sendDGSwitchReservoirCommand( U32 activeReservoir );
+
+// MSG_ID_DG_CHANGE_VALVE_SETTING_CMD
+BOOL sendDGChangeValveSettingCommand( U32 valveSettingCmd );
 
 // MSG_ID_DG_FILL_CMD
 BOOL sendDGFillCommand( U32 fillToVolumeMl );
@@ -199,6 +196,9 @@
 // MSG_ID_ALARM_TRIGGERED
 BOOL broadcastAlarmTriggered( U32 alarm, ALARM_DATA_T almData1, ALARM_DATA_T almData2 );
 
+// MSG_ID_ALARM_CONDITION_CLEARED
+BOOL broadcastAlarmConditionCleared( U32 alarm );
+
 // MSG_ID_ALARM_CLEARED
 BOOL broadcastAlarmCleared( U32 alarm );