Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r54f45c387430e440ab4607451fc84dea61f273f1 -rab304e2ca6e3e40ed8cb12650e9855ae0b9649d8
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 54f45c387430e440ab4607451fc84dea61f273f1)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision ab304e2ca6e3e40ed8cb12650e9855ae0b9649d8)
@@ -58,10 +58,10 @@
 BOOL broadcastValvesStates( U16 valvesStates );
 
 // MSG_ID_RO_PUMP_DATA
-BOOL broadcastROPumpData( U32 tgtPressure, F32 measFlow, F32 setPWM );
+BOOL broadcastROPumpData( F32 tgtPressure, F32 measFlow, F32 setPWM, U32 pumpState );
 
 // MSG_ID_DRAIN_PUMP_DATA
-BOOL broadcastDrainPumpData( U32 tgtSpeed, U32 dac );
+BOOL broadcastDrainPumpData( U32 tgtSpeed, U32 dac, F32 deltaP, U32 drainPumpState );
 
 // MSG_ID_DG_PRESSURES_DATA
 BOOL broadcastPressureSensorsData( F32 measROIn, F32 measROOut, F32 measDrainIn, F32 measDrainOut );
@@ -107,7 +107,16 @@
 
 // MSG_ID_DG_START_STOP_TRIMMER_HEATER_CMD
 void handleStartStopTrimmerHeaterCmd( MESSAGE_T *message );
+
+// MSG_ID_HEATERS_READINGS
+BOOL broadcastHeatersData ( U32 mainPrimaryDC, U32 smallPrimaryDC, U32 trimmerDC );
 
+// MSG_ID_TEMPERATURE_SENSORS_READINGS
+BOOL broadcastTemperatureSensorsData ( U08 *sensorsValue, U32 byteLength );
+
+//MSG_ID_DG_HEAT_DISINFECT_DATA
+BOOL broadcastHeatDisinfectData( U32 internalState, F32 minutesElapsed, U32 currentCycle );
+
 // *********** public test support message functions **********
 
 #ifdef DEBUG_ENABLED
@@ -174,6 +183,35 @@
 void handleTestValvesStatesPublishIntervalOverrideRequest( MESSAGE_T *message );
 
 // MSG_ID_DG_SAFETY_SHUTDOWN_OVERRIDE:
+void handleTestDGSafetyShutdownOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_START_STOP_PRIMARY_HEATER
+BOOL handleStartStopPrimaryHeater( MESSAGE_T *message );
+
+// MSG_ID_START_STOP_DG_HEAT_DISINFECT
+BOOL handleStartStopDGHeatDisinfect( MESSAGE_T *message );
+
+// MSG_ID_SET_RO_PUMP_PWM
+BOOL handleSetROPumpPWM( MESSAGE_T * message );
+
+// MSG_ID_DRAIN_PUMP_SET_DELTA_PRESSURE_OVERRIDE
+void handleSetDrainPumpDeltaPressureOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_HEAT_DISINFECT_RECIRC_PATH_DURATION_MINS
+void handleSetHeatDisinfectRecircStateDurationOverrideRequest( MESSAGE_T *message );
+
+//MSG_ID_HEAT_DISINFECT_RSRVR1_TO_RSRVR2_DURATION_MINS
+void handleSetHeatDisinfectRSVR1ToRSVR2StateDurationOverrideRequest( MESSAGE_T *message );
+
+//MSG_ID_HEAT_DISINFECT_RSRVR2_TO_RSRVR1_DURATION_MINS
+void handleSetHeatDisinfectRSVR2ToRSVR1StateDurationOverrideRequest( MESSAGE_T *message );
+
+//MSG_ID_HEAT_DISINFECT_NO_OF_CYCLES_TO_RUN
+void handleSetHeatDisinfectNoOfCyclesStateDurationOverrideRequest( MESSAGE_T *message );
+
+//MSG_ID_HEAT_DISINFECT_PUBLISH_INTERVAL_OVERRIDE
+void handleSetHeatDisinfectionPublishDataIntervalOverrideRequest( MESSAGE_T *message );
+
 void handleTestDGSafetyShutdownOverrideRequest( MESSAGE_T *message );
 
 // MSG_ID_CONDUCTIVITY_OVERRIDE