Index: leahi_dialin/common/fp_defs.py
===================================================================
diff -u -r70ede35f42770305f04b251b3372ef42a9cecbf5 -r9f947930678d5b13aa8f788f4e3d58cd1370a541
--- leahi_dialin/common/fp_defs.py	(.../fp_defs.py)	(revision 70ede35f42770305f04b251b3372ef42a9cecbf5)
+++ leahi_dialin/common/fp_defs.py	(.../fp_defs.py)	(revision 9f947930678d5b13aa8f788f4e3d58cd1370a541)
@@ -396,7 +396,6 @@
 }
 
 
-@unique
 class FPValveNames(DialinEnum):
     M4_VALV             = 0                                     # Valve (M4 VWi)
     M12_VALV            = 1                                     # Valve (M12)
@@ -408,6 +407,12 @@
     P6_VALV             = 7                                     # Valve (P6 VFF)
     NUM_OF_FP_VALVES    = 8                                     # Number of valves
 
+    # Aliases
+    FIRST_IO_VALVE = M4_VALV
+    LAST_IO_VALVE = M12_VALV
+    FIRST_FP_VALVE = P11_VALV
+    LAST_FP_VALVE = P6_VALV
+
 FPValveNames._str_list = {
     # Official Name :       Accepted strings
     'M4_VALV': ['m4'],
@@ -487,14 +492,28 @@
 
 
 @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
+
+FPPumpStates._str_list = {
+    # Official Name :       Accepted strings
+    'PUMP_OFF_STATE': ['closed', 'off', 'inactive', 'offline'],
+    'PUMP_ON_STATEOFF': ['open', 'on', 'active', 'online'],
+    'NUM_OF_PUMP_STATES': [],
+}
+
+
+@unique
 class FPValveStates(DialinEnum):
     VALVE_STATE_CLOSED  = 0                                     # Valve Closed State
     VALVE_STATE_OPEN    = 1                                     # Valve Open State
-    NUM_OF_VALVE_STATES = 2                                     # Valve Open State
+    NUM_OF_VALVE_STATES = 2                                     # Number of valve states
 
 FPValveStates._str_list = {
     # Official Name :       Accepted strings
-    'VALVE_STATE_CLOSED': ['closed'],
-    'VALVE_STATE_OPEN': ['open'],
+    'VALVE_STATE_CLOSED': ['closed', 'off'],
+    'VALVE_STATE_OPEN': ['open', 'on'],
     'NUM_OF_VALVE_STATES': [],
 }