Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -rfbc0a281b094ff309dcbf83db1878818a9b384f1 -rf7292cd3376119210980f14e8bdb0ec5e0cf5df5
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision fbc0a281b094ff309dcbf83db1878818a9b384f1)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision f7292cd3376119210980f14e8bdb0ec5e0cf5df5)
@@ -19,8 +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"
 
 /**
  *  @defgroup SystemCommMessages SystemCommMessages
@@ -62,7 +65,7 @@
 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 +85,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 );
 
@@ -156,12 +165,18 @@
 // 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_SEND_INTERVAL_OVERRIDE:
 void handleTestDrainPumpDataBroadcastIntervalOverrideRequest( MESSAGE_T *message );
 
@@ -174,6 +189,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 );
 
@@ -207,6 +225,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 );
+
 // MSG_ID_DG_RO_PUMP_DUTY_CYCLE_OVERRIDE
 void handleTestROPumpDutyCycleOverride( MESSAGE_T *message );