Index: leahi_dialin/common/fp_defs.py
===================================================================
diff -u -r144020fa422bc5d0db1bd62647c29022a887206e -r14adcf33a5a509f27095a3a61cf45af61cd2baff
--- leahi_dialin/common/fp_defs.py	(.../fp_defs.py)	(revision 144020fa422bc5d0db1bd62647c29022a887206e)
+++ leahi_dialin/common/fp_defs.py	(.../fp_defs.py)	(revision 14adcf33a5a509f27095a3a61cf45af61cd2baff)
@@ -103,6 +103,13 @@
     NUM_OF_FP_PRES_SENSORS              = 5     # Number of Pressure Sensors
 
 @unique
+class FPPressureSensorAttributesEnum(DialinEnum):
+    PRES = 0                                    # Pressure attribute for FP Pressure Sensors
+    TEMP = 1                                    # Temperature attribute for FP Pressure Sensors
+    NUM_OF_FP_PRES_ATTRIBUTES = 2               # Number of FP Pressure Sensor attributes
+
+
+@unique
 class ROPumpNames(DialinEnum):
     P12_PUMP = 0                # P12 RO Pump
     NUM_OF_RO_PUMPS = 1         # Number of RO Pumps
@@ -122,16 +129,11 @@
 
 @unique
 class FPTemperaturesNames(DialinEnum):
-    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
+    P10_TEMP                            = 1     # P10 temperature from inlet conductivity sensor.
+    P19_TEMP                            = 2     # P19 temperature from outlet conductivity sensor.
+    P7_TEMP                             = 3     # Temperature at p7 flow meter
+    P16_TEMP                            = 4     # Temperature at p16 flow meter
+    NUM_OF_TEMPERATURE_SENSORS          = 5     # Number of Temperature Sensors
 
 @unique
 class FPValveStates(DialinEnum):