Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r787312bd901f9c4c9d9e91591ecadca9f22fbeb6 -rbbd5ac2589c8093f681f2284367975ddd220b553
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 787312bd901f9c4c9d9e91591ecadca9f22fbeb6)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision bbd5ac2589c8093f681f2284367975ddd220b553)
@@ -21,8 +21,10 @@
 #include "DGCommon.h"
 #include "DrainPump.h"
 #include "Fans.h"
+#include "FluidLeak.h"
 #include "MsgQueues.h"
 #include "NVDataMgmt.h"
+#include "Reservoirs.h"
 #include "ROPump.h"
 #include "Thermistors.h"
 #include "UVReactors.h"
@@ -43,11 +45,14 @@
 BOOL sendACKMsg( MESSAGE_T *message );
 
 // MSG_ID_ALARM_TRIGGERED
-BOOL broadcastAlarmTriggered( U16 alarm, ALARM_DATA_T almData1, ALARM_DATA_T almData2 );
+BOOL broadcastAlarmTriggered( U32 alarm, ALARM_DATA_T almData1, ALARM_DATA_T almData2 );
 
 // MSG_ID_ALARM_CLEARED
-BOOL broadcastAlarmCleared( U16 alarm );
+BOOL broadcastAlarmCleared( U32 alarm );
 
+// MSG_ID_ALARM_CONDITION_CLEARED
+BOOL broadcastAlarmConditionCleared( U32 alarm );
+
 // MSG_ID_DG_ACCELEROMETER_DATA
 BOOL broadcastAccelData( F32 x, F32 y, F32 z, F32 xm, F32 ym, F32 zm, F32 xt, F32 yt, F32 zt );
 
@@ -93,6 +98,15 @@
 // MSG_ID_DG_FANS_DATA
 BOOL broadcastFansData( FANS_DATA_T * fansData );
 
+// MSG_ID_DG_UV_REACTORS_DATA
+BOOL broadcastUVReactorsData( UV_REACTORS_DATA_T *uvReactorsData );
+
+// MSG_ID_DG_FLUID_LEAK_STATE
+BOOL broadcastFluidLeakState( FLUID_LEAK_STATES_T state);
+
+// MSG_ID_DG_COMMAND_RESPONSE
+void sendCommandResponseMsg( DG_CMD_RESPONSE_T *cmdResponsePtr );
+
 // MSG_ID_POWER_OFF_WARNING
 void handlePowerOffWarning( MESSAGE_T *message );
 
@@ -102,13 +116,16 @@
 // MSG_ID_REQUEST_FW_VERSIONS
 void handleFWVersionCmd( MESSAGE_T *message );
 
-// MSG_ID_DG_SWITCH_RESERVOIR
+// MSG_ID_DG_SWITCH_RESERVOIR_CMD
 void handleSwitchReservoirCmd( MESSAGE_T *message );
 
-// MSG_ID_DG_FILL
+// MSG_ID_DG_CHANGE_VALVE_SETTING_CMD
+void handleChangeValveSettingCmd( MESSAGE_T *message );
+
+// MSG_ID_DG_FILL_CMD
 void handleFillCmd( MESSAGE_T *message );
 
-// MSG_ID_DG_DRAIN
+// MSG_ID_DG_DRAIN_CMD
 void handleDrainCmd( MESSAGE_T *message );
 
 // MSG_ID_STARTING_STOPPING_TREATMENT
@@ -224,9 +241,15 @@
 // MSG_ID_DG_START_STOP_INLET_UV_REACTOR
 void handleStartStopUVReactors( MESSAGE_T *message );
 
-//MSG_ID_UV_REACTORS_DATA_PUBLISH_INTERVAL_OVERRIDE
+// MSG_ID_UV_REACTORS_DATA_PUBLISH_INTERVAL_OVERRIDE
 void handleTestUVReactorsDataPublishIntervalOverride( MESSAGE_T *message );
 
+// MSG_ID_DG_FLUID_LEAK_SEND_INTERVAL_OVERRIDE
+void handleSetFluidLeakBroadcastIntervalOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_HD_FLUID_LEAK_STATE_DETECTOR_OVERRIDE
+void handleSetFluidLeakStateDetectorOverrideRequest( MESSAGE_T *message);
+
 // MSG_ID_DG_SOFTWARE_RESET_REQUEST
 void handleDGSoftwareResetRequest( MESSAGE_T *message);