Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -re0265b8fad80add7a5d54db11ecc72fd6b1665a8 -r9ce06772b2f651c57144327e6cbf886e2bc22dee
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision e0265b8fad80add7a5d54db11ecc72fd6b1665a8)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 9ce06772b2f651c57144327e6cbf886e2bc22dee)
@@ -24,6 +24,7 @@
 #include "Heaters.h"
 #include "ModeHeatDisinfect.h"
 #include "MsgQueues.h"
+#include "Reservoirs.h"
 #include "ROPump.h"
 #include "Thermistors.h"
 #include "UVReactors.h"
@@ -47,8 +48,11 @@
 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 );
 
@@ -94,6 +98,12 @@
 // 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_COMMAND_RESPONSE
+void sendCommandResponseMsg( DG_CMD_RESPONSE_T *cmdResponsePtr );
+
 // MSG_ID_POWER_OFF_WARNING
 void handlePowerOffWarning( MESSAGE_T *message );
 
@@ -103,13 +113,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