Index: leahi_dialin/common/fp_defs.py
===================================================================
diff -u -rbac0a2d09d57dc27cfa2f2a596d57fdcbed392ee -r79697500614904bafb56f3d33e368b954ba78f7d
--- leahi_dialin/common/fp_defs.py	(.../fp_defs.py)	(revision bac0a2d09d57dc27cfa2f2a596d57fdcbed392ee)
+++ leahi_dialin/common/fp_defs.py	(.../fp_defs.py)	(revision 79697500614904bafb56f3d33e368b954ba78f7d)
@@ -153,16 +153,12 @@
 
 @unique
 class FPPressureSensorNames(DialinEnum):
-    M1_PRES = 0                             # Water inlet pressure before regulator
-    M3_PRES = 1                             # Water inlet pressure after regulator
-    P8_PRES = 2                             # Water inlet pressure before the conductivity sensor
-    P13_PRES = 3                            # Pressure before the RO filter
-    P17_PRES = 4                            # Pressure after the RO filter
-    X1_PRES = 5                             # Pressure before RO pump
-    X2_PRES = 6                             # Pressure of RO Concentrate
-    X3_PRES = 7                             # Pressure after P32, concentrate drop
-    X4_PRES = 8                             # Pressure Drain Drop
-    NUM_OF_FP_PRES_SENSORS = 9              # Number of Pressure Sensors
+    M1_PRES                             = 0     # Water inlet pressure before regulator
+    M3_PRES                             = 1     # Water inlet pressure after regulator
+    P8_PRES                             = 2     # Water inlet pressure before the conductivity sensor
+    P13_PRES                            = 3     # Pressure before the RO filter
+    P17_PRES                            = 4     # Pressure after the RO filter
+    NUM_OF_FP_PRES_SENSORS              = 5     # Number of Pressure Sensors
 
 @unique
 class ROPumpNames(DialinEnum):
@@ -184,20 +180,16 @@
 
 @unique
 class FPTemperaturesNames(DialinEnum):
-    P10_TEMP = 0                         # P10 temperature from inlet conductivity sensor.
-    P19_TEMP = 1                         # P19 temperature from outlet conductivity sensor.
-    M1_TEMP = 2                          # Temperature before pressure regulator (M1)
-    M3_TEMP = 3                          # Temperature after pressure regulator (M3)
-    P8_TEMP = 4                          # Temperature before inlet conductivity sensor (P8)
-    P13_TEMP = 5                         # Temperature before RO filter (P13)
-    P17_TEMP = 6                         # Temperature after RO filter (P17)
-    X1_TEMP = 7                          # Temperature before RO pump (X1)
-    X2_TEMP = 8                          # Temperature RO Concentrate
-    X3_TEMP = 9                          # Temperature RO Concentrate drop
-    X4_TEMP = 10                         # Temperature drain drop
-    P7_TEMP = 11                         # Temperature at p7 flow meter
-    P16_TEMP = 12                        # Temperature at p16 flow meter
-    NUM_OF_TEMPERATURE_SENSORS = 13      # Number of Temperature Sensors
+    M1_TEMP                             = 0     # Temperature before pressure regulator (M1)
+    M3_TEMP                             = 1     # Temperature after pressure regulator (M3)
+    P10_TEMP                            = 2     # P10 temperature from inlet conductivity sensor.
+    P19_TEMP                            = 3     # P19 temperature from outlet conductivity sensor.
+    P8_TEMP                             = 4     # Temperature before inlet conductivity sensor (P8)
+    P13_TEMP                            = 5     # Temperature before RO filter (P13)
+    P17_TEMP                            = 6     # Temperature after RO filter (P17)
+    P7_TEMP                             = 7     # Temperature at p7 flow meter
+    P16_TEMP                            = 8     # Temperature at p16 flow meter
+    NUM_OF_TEMPERATURE_SENSORS          = 9     # Number of Temperature Sensors
 
 @unique
 class FPValveStates(DialinEnum):
@@ -206,17 +198,15 @@
 
 @unique
 class FPValveNames(DialinEnum):
-    M4_VALV = 0                         # Valve (M4 VWi)
-    P39_VALV = 1                        # Valve (P39 VROd)
-    P6_VALV = 2                         # Valve (P6 VFF)
-    P11_VALV = 3                        # Valve (P11 VPi)
-    P33_VALV = 4                        # Valve (P33 VCr)
-    P34_VALV = 5                        # Valve (P34 VCb)
-    P37_VALV = 6                        # Valve (P37 VCd)
-    M7_VALV = 7                         # Valve (M7)
-    P20_VALV = 8                        # Valve (P20)
-    P43_VALV = 9                        # Valve (P43)
-    NUM_OF_VALVES = 10                  # Number of valves
+    M4_VALV                             = 0     # Valve (M4 VWi)
+    P11_VALV                            = 1     # Valve (P11 VPi)
+    P33_VALV                            = 2     # Valve (P33 VCr)
+    P34_VALV                            = 3     # Valve (P34 VCb)
+    P37_VALV                            = 4     # Valve (P37 VCd)
+    P39_VALV                            = 5     # Valve (P39 VROd)
+    P43_VALV                            = 6     # Valve (P43)
+    P6_VALV                             = 7     # Valve (P6 VFF)
+    NUM_OF_FP_VALVES                    = 8     # Number of valves
 
 @unique
 class FPPumpNames(DialinEnum):