Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -ra6bf8a0785fba2986292aeff04e1aa944ff07195 -re4b79bd0d31e779619a787f9ce4352d0fd3d4dce
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision a6bf8a0785fba2986292aeff04e1aa944ff07195)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision e4b79bd0d31e779619a787f9ce4352d0fd3d4dce)
@@ -512,36 +512,31 @@
     return result;
 }
 
-/*********************************************************************//**
- * @brief
- * The broadcastDrainPumpData function sends out drain pump data.
- * @details Inputs: none
- * @details Outputs: Drain pump data msg constructed and queued
- * @param tgtSpeed target speed for drain pump in RPM
- * @param dac set DAC value
- * @return TRUE if msg successfully queued for transmit, FALSE if not
- *************************************************************************/
-BOOL broadcastDrainPumpData( U32 tgtSpeed, U32 dac )
-{
-    BOOL result;
-    MESSAGE_T msg;
-    U08 *payloadPtr = msg.payload;
-    DRAIN_PUMP_DATA_T payload;
-
-    // create a message record
-    blankMessage( &msg );
-    msg.hdr.msgID = MSG_ID_DRAIN_PUMP_DATA;
-    msg.hdr.payloadLen = sizeof( DRAIN_PUMP_DATA_T );
-
-    payload.setDrainPumpSpeed = tgtSpeed;
-    payload.dacValue = dac;
-
-    memcpy( payloadPtr, &payload, sizeof( DRAIN_PUMP_DATA_T ) );
-
-    // serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
-    result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_DG_BROADCAST, ACK_NOT_REQUIRED );
-
-    return result;
+/*********************************************************************//**
+ * @brief
+ * The broadcastDrainPumpData function sends out the drain pump data.
+ * @details Inputs : none
+ * @details Outputs : Drain pump data msg constructed and queued
+ * @param drain pump data structure pointer
+ * @return TRUE if msg successfully queued for transmit, FALSE if not
+ *************************************************************************/
+BOOL broadcastDrainPumpData( DRAIN_PUMP_DATA_T *drainPumpData )
+{
+    BOOL result;
+    MESSAGE_T msg;
+    U08 *payloadPtr = msg.payload;
+
+    // create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID = MSG_ID_DRAIN_PUMP_DATA;
+    msg.hdr.payloadLen = sizeof( DRAIN_PUMP_DATA_T );
+
+    memcpy( payloadPtr, drainPumpData, sizeof( DRAIN_PUMP_DATA_T ) );
+
+    // serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
+    result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_DG_BROADCAST, ACK_NOT_REQUIRED );
+
+    return result;
 }
 
 /*********************************************************************//**
@@ -1510,56 +1505,52 @@
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }
 
-/*********************************************************************//**
- * @brief
- * The handleTestDrainPumpSetPointOverrideRequest function handles a request to
- * override the drain pump speed set point (in RPM).
- * @details Inputs: none
- * @details Outputs: message handled
- * @param message a pointer to the message to handle
- * @return none
- *************************************************************************/
-void handleTestDrainPumpSetPointOverrideRequest( MESSAGE_T *message )
+/*********************************************************************//**
+ * @brief
+ * The handleTestDrainPumpSetPointOverrideRequest function handles a request to
+ * override the drain pump speed set point (in RPM).
+ * @details
+ * Inputs : none
+ * Outputs : message handled
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleTestDrainPumpRPMOverrideRequest( MESSAGE_T *message )
 {
     TEST_OVERRIDE_PAYLOAD_T payload;
     BOOL result = FALSE;
 
     // verify payload length
-    if ( sizeof( TEST_OVERRIDE_PAYLOAD_T ) == message->hdr.payloadLen )
+    if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen )
     {
-        memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) );
-        if ( FALSE == payload.reset )
-        {
-            result = testSetTargetDrainPumpSpeedOverride( payload.state.u32 );
-        }
-        else
-        {
-            result = testResetTargetDrainPumpSpeedOverride();
-        }
+        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
+
+        result = testSetTargetDrainPumpRPM( payload.state.u32 );
     }
 
     // respond to request
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }
 
-/*********************************************************************//**
- * @brief
- * The handleTestDrainPumpDataBroadcastIntervalOverrideRequest function handles
- * a request to override the broadcast interval for drain pump data.
- * @details Inputs: none
- * @details Outputs: message handled
- * @param message a pointer to the message to handle
- * @return none
- *************************************************************************/
+/*********************************************************************//**
+ * @brief
+ * The handleTestDrainPumpDataBroadcastIntervalOverrideRequest function handles
+ * a request to override the broadcast interval for drain pump data.
+ * @details
+ * Inputs : none
+ * Outputs : message handled
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
 void handleTestDrainPumpDataBroadcastIntervalOverrideRequest( MESSAGE_T *message )
 {
     TEST_OVERRIDE_PAYLOAD_T payload;
     BOOL result = FALSE;
 
     // verify payload length
-    if ( sizeof( TEST_OVERRIDE_PAYLOAD_T ) == message->hdr.payloadLen )
+    if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen )
     {
-        memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) );
+        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
         if ( FALSE == payload.reset )
         {
             result = testSetDrainPumpDataPublishIntervalOverride( payload.state.u32 );
@@ -1670,6 +1661,30 @@
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }
 
+/*************************************************************************
+ * @brief
+ * The handleSetDrainPumpDeltaPressureOverrideRequest function handles a
+ * request to override the delta pressure for the drain pump.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleSetDrainPumpDeltaPressureOverrideRequest( MESSAGE_T *message )
+{
+    TEST_OVERRIDE_PAYLOAD_T payload;
+    BOOL result = 0;
+    /* verify payload length */
+    if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
+
+        result = testSetTargetDrainPumpDeltaPressure( (U32)(payload.state.u32) );
+    }
+    /* respond to request */
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
 /*********************************************************************//**
  * @brief
  * The handleTestDGAccelOverrideRequest function handles a request to