Index: leahi_dialin/common/fp_defs.py
===================================================================
diff -u -r77740bc2ccace473a471515cadd4bc1353360cd6 -re7d16bd6881619e5fc2a0bc1a7fd578a9978498e
--- leahi_dialin/common/fp_defs.py	(.../fp_defs.py)	(revision 77740bc2ccace473a471515cadd4bc1353360cd6)
+++ leahi_dialin/common/fp_defs.py	(.../fp_defs.py)	(revision e7d16bd6881619e5fc2a0bc1a7fd578a9978498e)
@@ -60,20 +60,34 @@
 class FPConductivitySensorsEnum(DialinEnum):
     P9_COND = 0         # CPi (P9) conductivity sensor value
     P18_COND = 1         # CPo (P18) conductivity sensor value
+    NUM_OF_FP_CONDUCTIVITY = 2
 
 @unique
 class FPFlowSensorNames(DialinEnum):
     P7_FLOW = 0         # Water inlet flow sensor (FMS P7)
     P16_FLOW = 1        # RO outlet flow sensor (FMP P16)
+    NUM_OF_FP_FLOW_SENSORS = 2
 
 @unique
+class FPFlowSensorAttributesEnum(DialinEnum):
+    FLOW = 0
+    TEMP = 1
+    NUM_OF_FP_FLOW_ATTRIBUTES = 2
+
+@unique
 class FPFloaterLevels(DialinEnum):
     LEVEL_STATE_LOW = 0
     LEVEL_STATE_MEDIUM = 1
     LEVEL_STATE_HIGH = 2
     LEVEL_STATE_ILLEGAL = 3
+    NUM_OF_LEVEL_STATES = 4
 
 @unique
+class FPFloaterLevelSensorNames(DialinEnum):
+    P25_LEVEL = 0
+    NUM_OF_FP_LEVEL_SENSORS = 1
+
+@unique
 class FPPressureSensorNames(DialinEnum):
     M1_PRES = 0
     M3_PRES = 1
@@ -84,8 +98,27 @@
     X2_PRES = 6
     X3_PRES = 7
     X4_PRES = 8
+    NUM_OF_FP_PRES_SENSORS = 9
 
 @unique
+class ROPumpNames(DialinEnum):
+    P12_PUMP = 0
+    NUM_OF_RO_PUMPS = 1
+
+@unique
+class ROPumpAttributes(DialinEnum):
+    STATE = 0
+    DUTY_CYCLE = 1
+    FB_DUTY_CYCLE = 2
+    SPEED = 3
+    TARGET_PRES = 4
+    TARGET_FLOW = 5
+    TARGET_DUTY_CYCLE = 6
+    DUTY_CYCLE_PCT = 7
+    FB_DUTY_CYCLE_PCT = 8
+    NUM_OF_RO_PUMP_ATTRIBUTES = 9
+
+@unique
 class FPTemperaturesNames(DialinEnum):
     P10_TEMP = 0                         # P10 temperature from inlet conductivity sensor.
     P19_TEMP = 1                         # P19 temperature from outlet conductivity sensor.