Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r92d1230313c92c7480b9ae80a37b7a594232f59d -r2bdae9629401e61c04fe84bb26c025fd689501c3
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 92d1230313c92c7480b9ae80a37b7a594232f59d)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 2bdae9629401e61c04fe84bb26c025fd689501c3)
@@ -23,7 +23,6 @@
 #include "DrainPump.h"
 #include "Fans.h"
 #include "FluidLeak.h"
-#include "Heaters.h"
 #include "LoadCell.h"
 #include "MessageSupport.h"
 #include "ModeChemicalDisinfect.h"
@@ -63,6 +62,9 @@
 // MSG_ID_DG_EVENT
 BOOL sendEvent( DG_EVENT_ID_T event, EVENT_DATA_T dat1, EVENT_DATA_T dat2 );
 
+// Serialize message
+U32 serializeMessage( MESSAGE_T msg, COMM_BUFFER_T buffer, BOOL ackReq );
+
 // MSG_ID_ALARM_TRIGGERED
 BOOL broadcastAlarmTriggered( U32 alarm, ALARM_DATA_T almData1, ALARM_DATA_T almData2 );
 
@@ -96,18 +98,12 @@
 // MSG_ID_DRAIN_PUMP_DATA
 BOOL broadcastDrainPumpData( DRAIN_PUMP_DATA_T *drainPumpData );
 
-// MSG_ID_DG_CONCENTRATE_PUMP_DATA
-BOOL broadcastConcentratePumpData( void * concentratePumpDataPtr );
-
 // MSG_ID_DG_PRESSURES_DATA
 BOOL broadcastPressureSensorsData( F32 measROIn, F32 measROOut, F32 measDrainIn, F32 measDrainOut );
 
 // MSG_ID_DG_RESERVOIR_DATA
 BOOL broadcastReservoirData( U32 resID, U32 fillToVol, U32 drainToVol );
 
-// MSG_ID_HEATERS_READINGS
-BOOL broadcastHeatersData( HEATERS_DATA_T *heatersData );
-
 // MSG_ID_TEMPERATURE_SENSORS_READINGS
 BOOL broadcastTemperatureSensorsData( TEMPERATURE_SENSORS_DATA_T* tempSensorsData );
 
@@ -269,8 +265,8 @@
 // MSG_ID_DIALYSATE_FLOW_SEND_INTERVAL_OVERRIDE:
 void handleTestDialysateFlowDataBroadcastIntervalOverrideRequest( MESSAGE_T *message );
 
-// MSG_ID_DRAIN_PUMP_SET_RPM_OVERRIDE
-void handleTestDrainPumpRPMOverrideRequest( MESSAGE_T *message );
+// MSG_ID_DRAIN_PUMP_SET_RPM
+void handleTestSetDrainPumpRPM( MESSAGE_T *message );
 
 // MSG_ID_DRAIN_PUMP_SEND_INTERVAL_OVERRIDE:
 void handleTestDrainPumpDataBroadcastIntervalOverrideRequest( MESSAGE_T *message );
@@ -285,7 +281,7 @@
 void handleTestDGSafetyShutdownOverrideRequest( MESSAGE_T *message );
 
 // MSG_ID_DRAIN_PUMP_SET_DELTA_PRESSURE_OVERRIDE
-void handleSetDrainPumpDeltaPressureOverrideRequest( MESSAGE_T *message );
+void handleSetDrainPumpTargetOutletPressure( MESSAGE_T *message );
 
 // MSG_ID_DG_SWITCHES_STATUS_OVERRIDE
 void handleSetSwitchesStatusOverrideRequest( MESSAGE_T *message );
@@ -413,6 +409,12 @@
 // MSG_ID_DG_BLOCK_MESSAGE_TRANSMISSION
 void handleTestBlockMessagesRequest( MESSAGE_T *message );
 
+// MSG_ID_DG_STOP_RTC_CLOCK
+void handleStopDGRTCClock( MESSAGE_T * message );
+
+// MSG_ID_DG_DRAIN_PUMP_MEASURED_RPM_OVERRIDE
+void handleSetDrainPumpMeasuredRPMOverrideRequest( MESSAGE_T *message );
+
 // MSG_ID_DG_SUPER_CLEAR_ALARMS_CMD
 void handleTestSuperClearAlarmsRequest( MESSAGE_T *message );