Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r195f895cd5f580b448db5a251ab7a7f40ba0f40f -ra79db345deaaeef0f1b619dc49d031fdae22d7e6
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 195f895cd5f580b448db5a251ab7a7f40ba0f40f)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision a79db345deaaeef0f1b619dc49d031fdae22d7e6)
@@ -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 );
@@ -131,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 );
 
@@ -146,6 +151,12 @@
 // MSG_ID_REQUEST_FW_VERSIONS
 void handleFWVersionCmd( MESSAGE_T *message );
 
+// MSG_ID_REQUEST_FW_VERSIONS
+void handleDGSerialNumberRequest( MESSAGE_T *message );
+
+// MSG_ID_UI_REQUEST_SERVICE_INFO
+void handleDGServiceScheduleRequest( MESSAGE_T *message );
+
 // MSG_ID_DG_SWITCH_RESERVOIR_CMD
 void handleSwitchReservoirCmd( MESSAGE_T *message );
 
@@ -256,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 );