Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -ra6bf8a0785fba2986292aeff04e1aa944ff07195 -rc31c6e4340c28577df4d146165ccbfc8f0a47134
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision a6bf8a0785fba2986292aeff04e1aa944ff07195)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision c31c6e4340c28577df4d146165ccbfc8f0a47134)
@@ -61,7 +61,7 @@
 // ********** private data **********
 
 static BOOL testerLoggedIn = FALSE;                 ///< Flag indicates whether tester logged in or not.
-static volatile U16 nextSeqNo = 1;                  ///< Next sequence number.
+static volatile U16 nextSeqNo = 1;                  ///< Next sequence number.
 
 // ********** private function prototypes **********
 
@@ -478,38 +478,31 @@
     return result;
 }
 
-/*********************************************************************//**
- * @brief
- * The broadcastROPumpData function sends out RO pump data.
- * @details Inputs: none
- * @details Outputs: RO pump data msg constructed and queued
- * @param tgtPressure target pressure for RO pump in PSI
- * @param measFlow measure RO flow rate in LPM
- * @param setPWM set PWM duty cycle in %
- * @return TRUE if msg successfully queued for transmit, FALSE if not
- *************************************************************************/
-BOOL broadcastROPumpData( U32 tgtPressure, F32 measFlow, F32 setPWM )
-{
-    BOOL result;
-    MESSAGE_T msg;
-    U08 *payloadPtr = msg.payload;
-    RO_PUMP_DATA_T payload;
-
-    // create a message record
-    blankMessage( &msg );
-    msg.hdr.msgID = MSG_ID_RO_PUMP_DATA;
-    msg.hdr.payloadLen = sizeof( RO_PUMP_DATA_T );
-
-    payload.setROPumpPressure = tgtPressure;
-    payload.measROFlowRate = measFlow;
-    payload.roPumpPWM = setPWM;
-
-    memcpy( payloadPtr, &payload, sizeof( RO_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 broadcastROPumpData function sends out RO pump data.
+ * @details Inputs: none
+ * @details Outputs: RO pump data msg constructed and queued
+ * @param pumpData which is the msg constructed and queued
+ * @return TRUE if msg successfully queued for transmit, FALSE if not
+ *************************************************************************/
+BOOL broadcastROPumpData( RO_PUMP_DATA_T *pumpData )
+{
+    BOOL result;
+    MESSAGE_T msg;
+    U08 *payloadPtr = msg.payload;
+
+    // create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID = MSG_ID_RO_PUMP_DATA;
+    msg.hdr.payloadLen = sizeof( RO_PUMP_DATA_T );
+
+    memcpy( payloadPtr, pumpData, sizeof( RO_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;
 }
 
 /*********************************************************************//**
@@ -1416,38 +1409,6 @@
 
 /*********************************************************************//**
  * @brief
- * The handleTestROPumpSetPointOverrideRequest function handles a request to
- * override the RO pump pressure set point (in PSI).
- * @details Inputs: none
- * @details Outputs: message handled
- * @param message a pointer to the message to handle
- * @return none
- *************************************************************************/
-void handleTestROPumpSetPointOverrideRequest( MESSAGE_T *message )
-{
-    TEST_OVERRIDE_PAYLOAD_T payload;
-    BOOL result = FALSE;
-
-    // verify payload length
-    if ( sizeof( TEST_OVERRIDE_PAYLOAD_T ) == message->hdr.payloadLen )
-    {
-        memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) );
-        if ( FALSE == payload.reset )
-        {
-            result = testSetTargetROPumpPressureOverride( payload.state.u32 );
-        }
-        else
-        {
-            result = testResetTargetROPumpPressureOverride();
-        }
-    }
-
-    // respond to request
-    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
-}
-
-/*********************************************************************//**
- * @brief
  * The handleTestROMeasuredFlowOverrideRequest function handles a request to
  * override the RO flow rate.
  * @details Inputs: none
@@ -1512,38 +1473,6 @@
 
 /*********************************************************************//**
  * @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 )
-{
-    TEST_OVERRIDE_PAYLOAD_T payload;
-    BOOL result = FALSE;
-
-    // verify payload length
-    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();
-        }
-    }
-
-    // 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
@@ -2007,4 +1936,116 @@
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }
 
+/*********************************************************************//**
+* @brief
+* The handleTestROPumpDutyCycleOverride function handles a request to override
+* the RO pumps duty cycle.
+* @details Inputs: none
+* @details Outputs: message handled
+* @param message a pointer to the message to handle
+* @return none
+*************************************************************************/
+void handleTestROPumpDutyCycleOverride( MESSAGE_T *message )
+{
+     BOOL result = FALSE;
+
+     // verify payload length
+     if ( sizeof( F32 ) == message->hdr.payloadLen )
+     {
+         F32 payLoad;
+
+         memcpy( &payLoad, message->payload, sizeof( F32 ) );
+
+         result = testSetTargetDutyCycle( payLoad );
+     }
+
+     // respond to request
+     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+* @brief
+* The handleTestROFlowRateOverride function handles a request to override
+* the RO flow rate.
+* @details Inputs: none
+* @details Outputs: message handled
+* @param message a pointer to the message to handle
+* @return none
+*******************************************************************/
+void handleTestMeasuredROFlowRateOverride( MESSAGE_T *message )
+{
+    TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
+    BOOL result = FALSE;
+
+    // verify payload length
+    if ( sizeof( TEST_OVERRIDE_ARRAY_PAYLOAD_T ) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_ARRAY_PAYLOAD_T ) );
+        if ( FALSE == payload.reset )
+        {
+            result = testSetMeasuredROFlowRateOverride( payload.state.f32 );
+        }
+        else
+        {
+            result = testResetMeasuredROFlowRateOverride();
+        }
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+* @brief
+* The handleTestROPumpTargetFlowOverride function handles a request to
+* override the RO pump target flow rate.
+* @details Inputs: none
+* @details Outputs: message handled
+* @param message a pointer to the message to handle
+* @return none
+*******************************************************************/
+void handleTestROPumpTargetFlowOverride( MESSAGE_T *message )
+{
+    BOOL result = FALSE;
+
+    // verify payload length
+    if ( sizeof( F32 ) == message->hdr.payloadLen )
+    {
+        F32 payload;
+
+        memcpy( &payload, message->payload, sizeof( F32 ) );
+        result = testSetTargetROPumpFlow( payload );
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+* @brief
+* The handleROPumpTargetPressureOverride function handles a request to
+* override the RO pump target pressure.
+* @details Inputs: none
+* @details Outputs: message handled
+* @param message a pointer to the message to handle
+* @return none
+*******************************************************************/
+void handleROPumpTargetPressureOverride( MESSAGE_T *message )
+{
+    BOOL result = FALSE;
+
+    // verify payload length
+    if ( sizeof( U32 ) == message->hdr.payloadLen )
+    {
+        U32 payload;
+
+        memcpy( &payload, message->payload, sizeof( U32 ) );
+
+        result = testSetTargetROPumpPressure( payload );
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
 /**@}*/