Index: leahi_dialin/common/fp_defs.py
===================================================================
diff -u -r57aed15d5b38f236deaea49daba706ce352162d2 -r99f9233b24e6115bb1384ec8f5a077aefc37ab4b
--- leahi_dialin/common/fp_defs.py	(.../fp_defs.py)	(revision 57aed15d5b38f236deaea49daba706ce352162d2)
+++ leahi_dialin/common/fp_defs.py	(.../fp_defs.py)	(revision 99f9233b24e6115bb1384ec8f5a077aefc37ab4b)
@@ -444,6 +444,24 @@
 
 # ================================================== Enum Creators: Support ==================================================
 @unique
+class FPBoostPumpStates(DialinEnum):
+    PUMP_OFF_STATE                          = 0,                # Pump Offline State
+    PUMP_CONTROL_TO_TARGET_FLOW_STATE       = 1,                # Boost pump control to target flow state
+    PUMP_CONTROL_TO_TARGET_PRESSURE_STATE   = 2,                # Boost pump control to max pressure state.
+    PUMP_OPEN_LOOP_STATE                    = 3,                # Boost pump open loop state.
+    NUM_OF_BOOST_PUMP_STATES                = 4                 # Number of Boost pump states
+
+FPBoostPumpStates._str_list = {
+    # Official Name :       Accepted strings
+    'PUMP_OFF_STATE': ['closed', 'off', 'inactive', 'offline'],
+    'PUMP_CONTROL_TO_TARGET_FLOW_STATE': ['flow', 'target to flow', 'to flow'],
+    'PUMP_CONTROL_TO_TARGET_PRESSURE_STATE': ['pressure', 'target to pressure', 'to pressure', 'pres'],
+    'PUMP_OPEN_LOOP_STATE': ['open', 'open loop'],
+    'NUM_OF_BOOST_PUMP_STATES': [],
+}
+
+
+@unique
 class FPFloaterLevels(DialinEnum):
     LEVEL_STATE_EMPTY       = 0                                 # Empty level for the FP Floater Level Sensors
     LEVEL_STATE_LOW         = 1                                 # Low level for the FP Floater Level Sensors
@@ -492,16 +510,38 @@
 
 
 @unique
-class FPPumpStates(DialinEnum):
-    PUMP_OFF_STATE      = 0                                     # Pump Offline State
-    PUMP_ON_STATE       = 1                                     # Pump Online State
-    NUM_OF_PUMP_STATES  = 2                                     # Number of pump states
+class FPRecoveryOptions(DialinEnum):
+    NO_RECOVERY         = 0                                     # NO recoverye
+    LOW_RECOVERY        = 1                                     # LOW recovery
+    MEDIUM_RECOVERY     = 2                                     # MEDIUM recovery
+    HIGH_RECOVERY       = 3                                     # HIGH recovery
+    NUM_OF_VALVE_STATES = 4                                     # Number of recovery options
 
-FPPumpStates._str_list = {
+FPRecoveryOptions._str_list = {
     # Official Name :       Accepted strings
+    'NO_RECOVERY': ['no', 'no ro'],
+    'LOW_RECOVERY': ['low', 'low ro'],
+    'MEDIUM_RECOVERY': ['med', 'med ro', 'medium', 'medium ro'],
+    'HIGH_RECOVERY': ['high', 'high ro'],
+    'NUM_OF_VALVE_STATES': [],
+}
+
+
+@unique
+class FPROPumpStates(DialinEnum):
+    PUMP_OFF_STATE                              = 0,            # Pump Offline State
+    PUMP_CONTROL_TO_TARGET_FLOW_STATE           = 1,            # RO pump control to target flow state
+    PUMP_CONTROL_TO_TARGET_PRESSURE_STATE       = 2,            # RO pump control to max pressure state.
+    PUMP_OPEN_LOOP_STATE                        = 3,            # RO pump open loop state.
+    NUM_OF_PUMP_STATES                          = 4             # Number of RO pump states
+
+FPROPumpStates._str_list = {
+    # Official Name :       Accepted strings
     'PUMP_OFF_STATE': ['closed', 'off', 'inactive', 'offline'],
-    'PUMP_ON_STATE': ['open', 'on', 'active', 'online'],
-    'NUM_OF_PUMP_STATES': [],
+    'PUMP_CONTROL_TO_TARGET_FLOW_STATE': ['flow', 'target to flow', 'to flow'],
+    'PUMP_CONTROL_TO_TARGET_PRESSURE_STATE': ['pressure', 'target to pressure', 'to pressure', 'pres'],
+    'PUMP_OPEN_LOOP_STATE': ['open', 'open loop'],
+    'NUM_OF_RO_PUMP_STATES': [],
 }