Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r4638fd77792d0c7ecbeca3c84369cbed6c2ecee1 -r88f28230d288947ba84840b967e95b32e3deffaa
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 4638fd77792d0c7ecbeca3c84369cbed6c2ecee1)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 88f28230d288947ba84840b967e95b32e3deffaa)
@@ -19,7 +19,11 @@
 #define __SYSTEM_COMM_MESSAGES_H__
 
 #include "DGCommon.h"
+#include "DrainPump.h"
+#include "Fans.h"
 #include "MsgQueues.h"
+#include "ROPump.h"
+#include "Thermistors.h"
 #include "UVReactors.h"
 
 /**
@@ -59,10 +63,10 @@
 BOOL broadcastValvesStates( U16 valvesStates );
 
 // MSG_ID_RO_PUMP_DATA
-BOOL broadcastROPumpData( U32 tgtPressure, F32 measFlow, F32 setPWM );
+BOOL broadcastROPumpData( RO_PUMP_DATA_T *pumpData );
 
 // MSG_ID_DRAIN_PUMP_DATA
-BOOL broadcastDrainPumpData( U32 tgtSpeed, U32 dac );
+BOOL broadcastDrainPumpData( DRAIN_PUMP_DATA_T *drainPumpData );
 
 // MSG_ID_DG_CONCENTRATE_PUMP_DATA
 BOOL broadcastConcentratePumpData( void * concentratePumpDataPtr );
@@ -82,6 +86,12 @@
 // MSG_ID_DG_CONDUCTIVITY_DATA
 BOOL broadcastConductivityData( void * conductivityDataPtr );
 
+// MSG_ID_DG_THERMISTORS_DATA
+BOOL broadcastThermistorsData( THERMISTORS_DATA_T *thermistorsData );
+
+// MSG_ID_DG_FANS_DATA
+BOOL broadcastFansData( FANS_DATA_T * fansData );
+
 // MSG_ID_POWER_OFF_WARNING
 void handlePowerOffWarning( MESSAGE_T *message );
 
@@ -112,8 +122,10 @@
 // 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 );
+
 // *********** public test support message functions **********
 
 #ifdef DEBUG_ENABLED
@@ -158,17 +170,14 @@
 // MSG_ID_PRESSURE_SEND_INTERVAL_OVERRIDE:
 void handleTestPressureDataBroadcastIntervalOverrideRequest( MESSAGE_T *message );
 
-// MSG_ID_RO_PUMP_SET_PT_OVERRIDE:
-void handleTestROPumpSetPointOverrideRequest( MESSAGE_T *message );
-
 // MSG_ID_RO_MEASURED_FLOW_OVERRIDE:
 void handleTestROMeasuredFlowOverrideRequest( MESSAGE_T *message );
 
 // MSG_ID_RO_PUMP_SEND_INTERVAL_OVERRIDE:
 void handleTestROPumpDataBroadcastIntervalOverrideRequest( MESSAGE_T *message );
 
-// MSG_ID_DRAIN_PUMP_SET_PT_OVERRIDE:
-void handleTestDrainPumpSetPointOverrideRequest( MESSAGE_T *message );
+// MSG_ID_DRAIN_PUMP_SET_RPM_OVERRIDE
+void handleTestDrainPumpRPMOverrideRequest( MESSAGE_T *message );
 
 // MSG_ID_DRAIN_PUMP_SEND_INTERVAL_OVERRIDE:
 void handleTestDrainPumpDataBroadcastIntervalOverrideRequest( MESSAGE_T *message );
@@ -182,6 +191,9 @@
 // MSG_ID_DG_SAFETY_SHUTDOWN_OVERRIDE:
 void handleTestDGSafetyShutdownOverrideRequest( MESSAGE_T *message );
 
+// MSG_ID_DRAIN_PUMP_SET_DELTA_PRESSURE_OVERRIDE
+void handleSetDrainPumpDeltaPressureOverrideRequest( MESSAGE_T *message );
+
 // MSG_ID_CONDUCTIVITY_OVERRIDE
 void handleTestSetConductivityOverrideRequest( MESSAGE_T *message );
 
@@ -224,6 +236,27 @@
 // MSG_ID_CONCENTRATE_PUMP_PUBLISH_INTERVAL_OVERRIDE
 void handleConcentratePumpPublishIntervalOverride( MESSAGE_T *message );
 
+// MSG_ID_DG_THERMISTORS_DATA_PUBLISH_INTERVAL_OVERRIDE
+void handleTestThermistorsDataPublishIntervalOverride( MESSAGE_T *message );
+
+// MSG_ID_DG_THERMISTORS_VALUE_OVERRIDE
+void handleTestThermistorsValueOverride( MESSAGE_T *message );
+
+// MSG_ID_DG_FANS_DATA_PUBLISH_INTERVAL_OVERRIDE
+void handleTestFansDataPublishIntervalOverride( MESSAGE_T *message );
+
+// MSG_ID_DG_RO_PUMP_DUTY_CYCLE_OVERRIDE
+void handleTestROPumpDutyCycleOverride( MESSAGE_T *message );
+
+// MSG_ID_DG_RO_FLOW_RATE_OVERRIDE
+void handleTestMeasuredROFlowRateOverride( MESSAGE_T *message );
+
+// MSG_ID_DG_RO_PUMP_TARGET_FLOW_OVERRIDE
+void handleTestROPumpTargetFlowOverride( MESSAGE_T *message );
+
+// MSG_ID_DG_RO_PUMP_TARGET_PRESSURE_OVERRIDE
+void handleROPumpTargetPressureOverride( MESSAGE_T *message );
+
 /**@}*/
 
 #endif