Index: leahi_dialin/fp/filtration_purification.py
===================================================================
diff -u -r9434135f30fdd9d073685bf5088bb5c58542c624 -rc9eb704f8f1837fcf8d28e1010e01e5c4b27f984
--- leahi_dialin/fp/filtration_purification.py	(.../filtration_purification.py)	(revision 9434135f30fdd9d073685bf5088bb5c58542c624)
+++ leahi_dialin/fp/filtration_purification.py	(.../filtration_purification.py)	(revision c9eb704f8f1837fcf8d28e1010e01e5c4b27f984)
@@ -17,15 +17,15 @@
 
 from .modules.conductivity_sensors import FPConductivitySensors
 from .modules.flow_sensors import FPFlowSensors
-from .modules.boost_pump import FPPumps
-from .modules.flow_sensors import FPFlowSensors
 from .modules.levels import FPLevels
 from .modules.pressure_sensors import FPPressureSensors
 from .modules.temperatures import FPTemperatureSensors
 from .modules.valves import FPValves
+from .modules.water_pumps import FPPumps
 
 
 from ..common.msg_defs import MsgIds, MsgFieldPositions
+from ..common.fp_defs import FPOpModes
 from ..protocols.CAN import DenaliMessage, DenaliCanMessenger, DenaliChannels
 from ..utils.base import AbstractSubSystem, publish, LogManager
 from ..utils.checks import check_broadcast_interval_override_ms
@@ -95,7 +95,7 @@
         self.fp_op_mode_timestamp = 0.0
         self.fp_debug_events_timestamp = 0.0
         self.ui_version_info_response_timestamp = 0.0
-
+        self.fp_operation_mode = FPOpModes.MODE_INIT.value
         self.fp_operation_sub_mode = 0
         self.fp_logged_in = False
         self.fp_set_logged_in_status(False)
@@ -116,7 +116,12 @@
 
     @publish(["fp_debug_events_timestamp","fp_debug_events"])
     def _handler_fp_debug_event_sync(self, message, timestamp = 0.0):
-
+        """
+        Callback for fp debug event messages
+        @param message:  published FP debug event message
+        @param timestamp: the timestamp in epoch time of the received message
+        @return: none
+        """
         payload = message['message']
         message_length = payload[self._FP_DEBUG_EVENT_MSG_LEN_INDEX]
         temp_message = ''