Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r35246359c5a9080c704e0a6f1563e99a337e2e91 -r666d17245e2873e847cdf0b1da07abfe0702523e
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 35246359c5a9080c704e0a6f1563e99a337e2e91)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 666d17245e2873e847cdf0b1da07abfe0702523e)
@@ -18,9 +18,10 @@
 #ifndef __SYSTEM_COMM_MESSAGES_H__
 #define __SYSTEM_COMM_MESSAGES_H__
 
-#include "DrainPump.h"
 #include "DGCommon.h"
+#include "Fans.h"
 #include "MsgQueues.h"
+#include "Thermistors.h"
 
 /**
  *  @defgroup SystemCommMessages SystemCommMessages
@@ -58,8 +59,11 @@
 // MSG_ID_DG_VALVES_STATES
 BOOL broadcastValvesStates( U16 valvesStates );
 
+// MSG_ID_RO_PUMP_DATA
+BOOL broadcastROPumpData( U32 tgtPressure, F32 measFlow, F32 setPWM );
+
 // MSG_ID_DRAIN_PUMP_DATA
-BOOL broadcastDrainPumpData( DRAIN_PUMP_DATA_T *drainPumpData );
+BOOL broadcastDrainPumpData( U32 tgtSpeed, U32 dac );
 
 // MSG_ID_DG_CONCENTRATE_PUMP_DATA
 BOOL broadcastConcentratePumpData( void * concentratePumpDataPtr );
@@ -79,6 +83,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 );
 
@@ -163,7 +173,7 @@
 void handleTestROPumpDataBroadcastIntervalOverrideRequest( MESSAGE_T *message );
 
 // MSG_ID_DRAIN_PUMP_SET_PT_OVERRIDE:
-void handleTestDrainPumpRPMOverrideRequest( MESSAGE_T *message );
+void handleTestDrainPumpSetPointOverrideRequest( MESSAGE_T *message );
 
 // MSG_ID_DRAIN_PUMP_SEND_INTERVAL_OVERRIDE:
 void handleTestDrainPumpDataBroadcastIntervalOverrideRequest( MESSAGE_T *message );
@@ -213,6 +223,15 @@
 // 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 );
+
 /**@}*/
 
 #endif