Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r410afd26b3ae5e372310c696c82f58c59235e10d -r1cf11f4c1f6a1f1fd40270889723fbec040fc7ec
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 410afd26b3ae5e372310c696c82f58c59235e10d)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 1cf11f4c1f6a1f1fd40270889723fbec040fc7ec)
@@ -1,7 +1,8 @@
 
-#include <ModePreGenPermeate.h>
+
 #include <string.h>        // for memcpy()
 
+#include "BoostPump.h"
 #include "Compatible.h"
 #include "Conductivity.h"
 #include "DDInterface.h"
@@ -10,6 +11,7 @@
 #include "Level.h"
 #include "Messaging.h"
 #include "ModeGenPermeate.h"
+#include "ModePreGenPermeate.h"
 #include "OperationModes.h"
 #include "PAL.h"
 #include "Pressure.h"
@@ -71,10 +73,10 @@
 {  MSG_ID_FP_VALVE_PUBLISH_INTERVAL_OVERRIDE_REQUEST,              &testValvesStatesPublishIntervalOverride },
 {  MSG_ID_FP_VALVE_CMD_STATE_OVERRIDE_REQUEST,                     &testValveStateOverride },
 {  MSG_ID_FP_VALVE_SENSED_STATE_OVERRIDE_REQUEST,                  &testValveSensedStateOverride },
-{  MSG_ID_FP_BOOST_PUMP_SET_PWM_REQUEST,                           &testSetFluidPumpPWM },
-{  MSG_ID_FP_BOOST_PUMP_READ_PWM_OVERRIDE_REQUEST,                 &testFluidPumpPWMOverride },
-{  MSG_ID_FP_BOOST_PUMP_SPEED_OVERRIDE_REQUEST,                    &testFluidPumpRPMOverride },
-{  MSG_ID_FP_BOOST_PUMPS_PUBLISH_INTERVAL_OVERRIDE_REQUEST,        &testROPumpDataPublishIntervalOverride },
+{  MSG_ID_FP_FLUID_PUMP_SET_PWM_REQUEST,                           &testSetFluidPumpPWM },
+{  MSG_ID_FP_FLUID_PUMP_READ_PWM_OVERRIDE_REQUEST,                 &testFluidPumpPWMOverride },
+{  MSG_ID_FP_FLUID_PUMP_SPEED_OVERRIDE_REQUEST,                    &testFluidPumpRPMOverride },
+{  MSG_ID_FP_RO_PUMP_PUBLISH_INTERVAL_OVERRIDE_REQUEST,            &testROPumpDataPublishIntervalOverride },
 {  MSG_ID_FP_PRESSURE_OVERRIDE_REQUEST,                            &testPressureSensorReadingsOverride },
 {  MSG_ID_FP_PRESSURE_TEMP_OVERRIDE_REQUEST,                       &testPressureSensorTemperatureReadingsOverride },
 {  MSG_ID_FP_PRESSURE_READ_COUNT_OVERRIDE_REQUEST,                 &testPressureSensorReadCounterOverride },
@@ -97,6 +99,13 @@
 {  MSG_ID_FP_PRE_GEN_PUBLISH_INTERVAL_OVERRIDE_REQUEST,            &testPreGenDataPublishIntervalOverride },
 {  MSG_ID_FP_SET_OPERATION_MODE_REQUEST,                           &testSetOperationMode },
 {  MSG_ID_FP_TEMPERATURE_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST, &testTemperatureSensorsDataPublishIntervalOverride },
+{  MSG_ID_FP_RO_PUMP_TARGET_PRESSURE_OVERRIDE_REQUEST,             &testROPumpTargetPressureOverride },
+{  MSG_ID_FP_RO_PUMP_TARGET_FLOW_OVERRIDE_REQUEST,                 &testROPumpTargetFlowOverride },
+{  MSG_ID_FP_RO_PUMP_TARGET_PWM_OVERRIDE_REQUEST,                  &testROPumpTargetDutyCycleOverride },
+{  MSG_ID_FP_BOOST_PUMP_PUBLISH_INTERVAL_OVERRIDE_REQUEST,         &testBoostPumpDataPublishIntervalOverride },
+{  MSG_ID_FP_BOOST_PUMP_TARGET_PRESSURE_OVERRIDE_REQUEST,          &testBoostPumpTargetPressureOverride },
+{  MSG_ID_FP_BOOST_PUMP_TARGET_FLOW_OVERRIDE_REQUEST,              &testBoostPumpTargetFlowOverride },
+{  MSG_ID_FP_BOOST_PUMP_TARGET_PWM_OVERRIDE_REQUEST,               &testBoostPumpTargetDutyCycleOverride },
 };
 
 #define NUM_OF_FUNCTION_HANDLERS (sizeof(MSG_FUNCTION_HANDLER_LOOKUP) / sizeof(MSG_HANDLER_LOOKUP_T))
@@ -516,6 +525,42 @@
     return status;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The handleVersionRequestMessage function handles a UI request for FP
+ * version information.
+ * @details \b Message \b Sent: MSG_ID_FP_VERSION_REPONSE
+ * @details \b Inputs: none
+ * @details \b Outputs: FP version info.
+ * @param message Pointer to the UI version request message which contains
+ * the UI version information as well.
+ * @return TRUE if request handled successfully, FALSE if not
+ *************************************************************************/
+//BOOL handleVersionRequestMessage( MESSAGE_T *message )
+//{
+//    BOOL result = FALSE;
+//
+//    if ( message->hdr.payloadLen == sizeof( UI_VERSIONS_T ) )
+//    {
+//        FP_VERSIONS_T fpVersionRecord;
+//
+//        // Record UI version information
+//        memcpy( (U08*)(&uiVersionRecord), &message->payload, sizeof( UI_VERSIONS_T ) );
+//
+//        // Build DD version record
+//        ddVersionRecord.major            = DD_VERSION_MAJOR;
+//        ddVersionRecord.minor            = DD_VERSION_MINOR;
+//        ddVersionRecord.micro            = DD_VERSION_MICRO;
+//        ddVersionRecord.build            = DD_VERSION_BUILD;
+//        getFPGAVersions( &ddVersionRecord.fpgaId, &ddVersionRecord.fpgaMajor, &ddVersionRecord.fpgaMinor, &ddVersionRecord.fpgaLab );
+//        ddVersionRecord.compatibilityRev = SW_COMPATIBILITY_REV;
+//
+//        // Send DD version information
+//        result = sendMessage( MSG_ID_DD_VERSION_RESPONSE, COMM_BUFFER_OUT_CAN_DD_BROADCAST, (U08*)&ddVersionRecord, sizeof( DD_VERSIONS_T ) );
+//    }
+//
+//    return result;
+//}
 /*************************************************************************
  *                       TEST SUPPORT FUNCTIONS
  *************************************************************************/