Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r6818dafc0839d6e8585f5e6f35013f539ad5a0ed -r7838caf7aff7f6a3d890d21c13a4a695782c97bd
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 6818dafc0839d6e8585f5e6f35013f539ad5a0ed)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 7838caf7aff7f6a3d890d21c13a4a695782c97bd)
@@ -23,13 +23,15 @@
 #include "Fans.h"
 #include "FluidLeak.h"
 #include "Heaters.h"
+#include "LoadCell.h"
 #include "ModeChemicalDisinfect.h"
 #include "ModeFlush.h"
 #include "ModeHeatDisinfect.h"
 #include "MsgQueues.h"
 #include "NVDataMgmt.h"
 #include "Reservoirs.h"
 #include "ROPump.h"
+#include "Switches.h"
 #include "TemperatureSensors.h"
 #include "Thermistors.h"
 #include "UVReactors.h"
@@ -69,7 +71,7 @@
 BOOL broadcastDGOperationMode( U32 mode, U32 subMode );
 
 // MSG_ID_LOAD_CELL_READINGS
-BOOL broadcastLoadCellData( F32 loadCellA1, F32 loadCellA2, F32 loadCellB1, F32 loadCellB2 );
+BOOL broadcastLoadCellData( LOAD_CELL_DATA_T *loadCell );
 
 // MSG_ID_DG_VALVES_STATES
 BOOL broadcastValvesStates( U16 valvesStates );
@@ -107,6 +109,9 @@
 // MSG_ID_DG_UV_REACTORS_DATA
 BOOL broadcastUVReactorsData( UV_REACTORS_DATA_T *uvReactorsData );
 
+// MSG_ID_DG_HEAT_DISINFECT_DATA
+BOOL broadcastHeatDisinfectData( MODE_HEAT_DISINFECT_DATA_T *heatDisinfectData );
+
 // MSG_ID_DG_FILTER_FLUSH_PROGRESS
 BOOL broadcastFilterFlushData( U32 timeout, U32 countdown );
 
@@ -128,6 +133,9 @@
 // MSG_ID_DG_HEAT_DISINFECT_TO_UI_DATA_PUBLISH
 BOOL broadcastHeatDisinfectData2UI( MODE_HEAT_DISINFECT_UI_DATA_T *heatDisinfectUIData );
 
+// MSG_ID_DG_SWITCHES_DATA
+BOOL broadcastSwitchesData( SWITCHES_DATA_T *switchesData );
+
 // MSG_ID_DG_COMMAND_RESPONSE
 void sendCommandResponseMsg( DG_CMD_RESPONSE_T *cmdResponsePtr );
 
@@ -143,6 +151,12 @@
 // MSG_ID_REQUEST_FW_VERSIONS
 void handleFWVersionCmd( MESSAGE_T *message );
 
+// MSG_ID_REQUEST_FW_VERSIONS
+void handleDGSerialNumberRequest( void );
+
+// MSG_ID_UI_REQUEST_SERVICE_INFO
+void handleDGServiceScheduleRequest( MESSAGE_T *message );
+
 // MSG_ID_DG_SWITCH_RESERVOIR_CMD
 void handleSwitchReservoirCmd( MESSAGE_T *message );
 
@@ -167,12 +181,6 @@
 // MSG_ID_DG_START_STOP_TRIMMER_HEATER_CMD
 void handleStartStopTrimmerHeaterCmd( MESSAGE_T *message );
 
-// MSG_ID_DG_UV_REACTORS_DATA
-BOOL broadcastUVReactorsData( UV_REACTORS_DATA_T *uvReactorsData );
-
-// MSG_ID_DG_HEAT_DISINFECT_DATA
-BOOL broadcastHeatDisinfectData( MODE_HEAT_DISINFECT_DATA_T *heatDisinfectData );
-
 // MSG_ID_DG_SEND_CALIBRATION_DATA
 BOOL sendDGCalibrationRecord( U32 payloadCurrNum, U32 payloadTotalNum, U32 length, U08* calRcrdAddress );
 
@@ -259,6 +267,12 @@
 // MSG_ID_DRAIN_PUMP_SET_DELTA_PRESSURE_OVERRIDE
 void handleSetDrainPumpDeltaPressureOverrideRequest( MESSAGE_T *message );
 
+// MSG_ID_DG_SWITCHES_STATUS_OVERRIDE
+void handleSetSwitchesStatusOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_DG_SWITCHES_PUBLISH_INTERVAL_OVERRIDE
+void handleTestSwitchesPublishIntervalOverrideRequest( MESSAGE_T *message );
+
 // MSG_ID_CONDUCTIVITY_OVERRIDE
 void handleTestSetConductivityOverrideRequest( MESSAGE_T *message );
 
@@ -370,6 +384,9 @@
 // MSG_ID_DG_START_STOP_CHEM_DSINFECT
 BOOL handleStartStopDGChemicalDisinfect( MESSAGE_T *message );
 
+// MSG_ID_FILTER_FLUSH_TIME_PERIOD_OVERRIDE
+void handleFilterFlushTimePeriodOverride( MESSAGE_T *message );
+
 // MSG_ID_DG_OP_MODE_PUBLISH_INTERVAL_OVERRIDE
 BOOL handleSetDGOpModeBroadcastIntervalOverrideRequest( MESSAGE_T *message );