Index: leahi_dialin/common/dd_defs.py
===================================================================
diff -u -ra2aad87f17d5f85922b458ca2b73d20fb4f49c3a -r4624fb54ac9685092a25a11ab417e363b46fa0cd
--- leahi_dialin/common/dd_defs.py	(.../dd_defs.py)	(revision a2aad87f17d5f85922b458ca2b73d20fb4f49c3a)
+++ leahi_dialin/common/dd_defs.py	(.../dd_defs.py)	(revision 4624fb54ac9685092a25a11ab417e363b46fa0cd)
@@ -290,36 +290,35 @@
     D41_PRES                            = 4     # Transmembrane pressure (Ptm)
     NUM_OF_PRESSURE_SENSORS             = 5     # Number of pressure sensors
 
+COND_SENSOR_INDEX_OFFSET = 6                # Conductivity Sensor Index Offset for the Temperature Readings
+PRES_SENSOR_INDEX_OFFSET = 15               # Pressure Sensors Offset for Temperature Readings
+
 @unique
 class DDROPermeateStates(DialinEnum):
     NUM_OF_RO_PERMEATE_STATES = 0           # TODO: populate with RO Permeate states
 
-COND_SENSOR_INDEX_OFFSET = 6                # Conductivity Sensor Index Offset for the Temperature Readings
-PRES_SENSOR_INDEX_OFFSET = 15               # Pressure Sensors Offset for Temperature Readings
-
 @unique
 class DDTemperaturesNames(DialinEnum):
     D1_TEMP                             = 0     # Heat exchanger Inlet temperature sensor
     D78_TEMP                            = 1     # Heat exchanger Outlet temperature sensor
     D4_TEMP                             = 2     # Hydraulics primary heater temperature sensor
     D50_TEMP                            = 3     # Trimmer heater temperature sensor
     BRD_TEMP                            = 4     # Barometric temperature sensor
-    BARO_TEMP                           = 5     # DD board temperature sensor ( thermistor )
-    D16_TEMP                            = 6     # D16 Conductivity sensor temperature value
-    D28_TEMP                            = 7     # D28 Conductivity sensor temperature value
-    D30_TEMP                            = 8     # D30 Conductivity sensor temperature value
-    D44_TEMP                            = 9     # D44 Conductivity sensor temperature value
-    D75_TEMP                            = 10    # D75 Conductivity sensor temperature value
-    D4_AVG_TEMP                         = 11    # D4 Filtered value
-    D50_AVG_TEMP                        = 12    # D50 Filtered value
-    D28_AVG_TEMP                        = 13    # D28 Filtered value
-    D30_AVG_TEMP                        = 14    # D30 Filtered value
-    D9_TEMP                             = 15    # D9 Pressure sensor temperature value
-    D66_TEMP                            = 16    # D66 Pressure sensor temperature value
-    D51_TEMP                            = 17    # D51 Pressure sensor temperature value
-    D18_TEMP                            = 18    # D18 Pressure sensor temperature value
-    D41_TEMP                            = 19    # D41 Pressure sensor temperature value
-    NUM_OF_TEMP_SENSORS                 = 20    # Number of Temperature Sensors
+    D16_TEMP                            = 5     # D16 Conductivity sensor temperature value
+    D28_TEMP                            = 6     # D28 Conductivity sensor temperature value
+    D30_TEMP                            = 7     # D30 Conductivity sensor temperature value
+    D44_TEMP                            = 8     # D44 Conductivity sensor temperature value
+    D75_TEMP                            = 9    # D75 Conductivity sensor temperature value
+    D4_AVG_TEMP                         = 10    # D4 Filtered value
+    D50_AVG_TEMP                        = 11    # D50 Filtered value
+    D28_AVG_TEMP                        = 12    # D28 Filtered value
+    D30_AVG_TEMP                        = 13    # D30 Filtered value
+    D9_TEMP                             = 14    # D9 Pressure sensor temperature value
+    D66_TEMP                            = 15    # D66 Pressure sensor temperature value
+    D51_TEMP                            = 16    # D51 Pressure sensor temperature value
+    D18_TEMP                            = 17    # D18 Pressure sensor temperature value
+    D41_TEMP                            = 18    # D41 Pressure sensor temperature value
+    NUM_OF_TEMP_SENSORS                 = 19    # Number of Temperature Sensors
 
 @unique
 class DDValveStates(DialinEnum):
@@ -360,7 +359,15 @@
     SPARE5_VALV                         = 29    # Spare Valve 5
     SPARE6_VALV                         = 30    # Spare Valve 6
     SPARE7_VALV                         = 31    # Spare Valve 7
-    NUM_OF_DD_VALVES                    = 32    # Number of Valves for the DD
+    M4_VALV                             = 32    # First IO valve (M4)
+    M12_VALV                            = 33    # Last IO valve IO valve (M12)
+    P11_VALV                            = 34    # First FP Valve (P11)
+    P33_VALV                            = 35    # FP Valve (P33)
+    P34_VALV                            = 36    # FP Valve (P34)
+    P37_VALV                            = 37    # FP Valve (P37)
+    P39_VALV                            = 38    # FP Valve (P39)
+    P6_VALV                             = 39    # Last FP Valve (P6)
+    NUM_OF_DD_VALVES                    = 40    # Number of Valves for the DD
 
 @unique
 class DDNotLegalStates(DialinEnum):