Index: leahi_dialin/fp/filtration_purification.py
===================================================================
diff -u -rf5ff90469cd1520361a823923ad0b58ab4a23a45 -r68422d08c4141999a13496343264483a32314d37
--- leahi_dialin/fp/filtration_purification.py	(.../filtration_purification.py)	(revision f5ff90469cd1520361a823923ad0b58ab4a23a45)
+++ leahi_dialin/fp/filtration_purification.py	(.../filtration_purification.py)	(revision 68422d08c4141999a13496343264483a32314d37)
@@ -15,15 +15,18 @@
 ############################################################################
 import struct
 
+from .modules.boost_pump import FPBoostPump
 from .modules.conductivity_sensors import FPConductivitySensors
 from .modules.constants import NO_RESET, RESET
 from .modules.flow_sensors import FPFlowSensors
 from .modules.levels import FPLevels
 from .modules.pressure_sensors import FPPressureSensors
+from .modules.ro_pump import FPROPump
 from .modules.temperatures import FPTemperatureSensors
 from .modules.valves import FPValves
 from .modules.water_pumps import FPPumps
 
+from .proxies.dd_proxy import DDProxy
 
 from ..common.msg_defs import MsgIds, MsgFieldPositions
 from ..common.fp_defs import FPOpModes
@@ -84,12 +87,12 @@
         # register handler for FP operation mode broadcast messages
         if self.can_interface is not None:
             channel_id = DenaliChannels.fp_sync_broadcast_ch_id
-            msg_id = MsgIds.MSG_ID_RO_OP_MODE_DATA.value
+            msg_id = MsgIds.MSG_ID_FP_OP_MODE_DATA.value
             self.can_interface.register_receiving_publication_function(channel_id, msg_id,
                                                                        self._handler_fp_op_mode_sync)
 
             self.can_interface.register_receiving_publication_function(channel_id,
-                                                                       MsgIds.MSG_ID_RO_DEBUG_EVENT.value,
+                                                                       MsgIds.MSG_ID_FP_DEBUG_EVENT.value,
                                                                        self._handler_fp_debug_event_sync)
 
         # create properties
@@ -106,15 +109,18 @@
         self.fp_last_debug_event = ''
 
         # Create command groups
+        self.boost_pump = FPBoostPump(self.can_interface, self.logger)
         self.conductivity = FPConductivitySensors(self.can_interface, self.logger)
         self.flows = FPFlowSensors(self.can_interface, self.logger)
         self.pumps = FPPumps(self.can_interface, self.logger)
-        self.flows = FPFlowSensors(self.can_interface, self.logger)
         self.levels = FPLevels(self.can_interface, self.logger)
         self.pressures = FPPressureSensors(self.can_interface, self.logger)
+        self.ro_pump = FPROPump(self.can_interface, self.logger)
         self.temperatures = FPTemperatureSensors(self.can_interface, self.logger)
         self.valves = FPValves(self.can_interface, self.logger)
 
+        self.dd_proxy = DDProxy(self.can_interface, self.logger)
+
     @publish(["fp_debug_events_timestamp","fp_debug_events"])
     def _handler_fp_debug_event_sync(self, message, timestamp = 0.0):
         """
@@ -179,7 +185,7 @@
         """
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id,
-                                              message_id=MsgIds.MSG_ID_RO_TESTER_LOGIN_REQUEST.value,
+                                              message_id=MsgIds.MSG_ID_FP_TESTER_LOGIN_REQUEST.value,
                                               payload=list(map(int, map(ord, self.FP_LOGIN_PASSWORD))))
 
         self.logger.debug("Logging in...")
@@ -217,7 +223,7 @@
         payload = integer_to_bytearray(new_mode)
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id,
-                                              message_id=MsgIds.MSG_ID_RO_SET_OP_MODE_REQUEST.value,
+                                              message_id=MsgIds.MSG_ID_FP_SET_OP_MODE_REQUEST.value,
                                               payload=payload)
 
         self.logger.debug("Requesting FP mode change to " + str(new_mode))
@@ -246,7 +252,7 @@
         """
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id,
-                                              message_id=MsgIds.MSG_ID_RO_SOFTWARE_RESET_REQUEST.value)
+                                              message_id=MsgIds.MSG_ID_FP_SOFTWARE_RESET_REQUEST.value)
 
         self.logger.debug("requesting FP software reset")
 
@@ -275,7 +281,7 @@
         payload = rst + mis
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id,
-                                              message_id=MsgIds.MSG_ID_RO_OPERATION_MODE_PUBLISH_INTERVAL_OVERRIDE_REQUEST.value,
+                                              message_id=MsgIds.MSG_ID_FP_OPERATION_MODE_PUBLISH_INTERVAL_OVERRIDE_REQUEST.value,
                                               payload=payload)
 
         self.logger.debug("override op mode broadcast interval")