Index: leahi_dialin/common/dd_defs.py
===================================================================
diff -u -ra291930ba38e329e2b373f6d2b2a7564a6b7a09a -r5f783280400baab74941d3fd4d3e3d5a97bd06ee
--- leahi_dialin/common/dd_defs.py	(.../dd_defs.py)	(revision a291930ba38e329e2b373f6d2b2a7564a6b7a09a)
+++ leahi_dialin/common/dd_defs.py	(.../dd_defs.py)	(revision 5f783280400baab74941d3fd4d3e3d5a97bd06ee)
@@ -292,14 +292,10 @@
     D87_PRES                            = 5     # D87 Pressure sensor
     NUM_OF_PRESSURE_SENSORS             = 6     # 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
 
-@unique
 class DDTemperaturesNames(DialinEnum):
     D1_TEMP                             = 0     # Heat exchanger Inlet temperature sensor
     D78_TEMP                            = 1     # Heat exchanger Outlet temperature sensor
@@ -324,6 +320,12 @@
     D41_TEMP                            = 20    # D41 Pressure sensor temperature value
     D87_TEMP                            = 21    # D87 Pressure sensor temperature value
     NUM_OF_TEMP_SENSORS                 = 22    # Number of Temperature Sensors
+    FIRST_PRESSURE_SENSOR = D9_TEMP              # First Pressure Sensor
+    LAST_PRESSURE_SENSOR = D87_TEMP              # Last Pressure Sensor
+    FIRST_CONDUCTIVITY_SENSOR = D16_TEMP         # First Conductivity Sensor
+    LAST_CONDUCTIVITY_SENSOR = D99_TEMP          # Last Conductivity Sensor
+    FIRST_TEMPERATURE_SENSOR = D1_TEMP           # First Pre Sensor
+    LAST_TEMPERATURE_SENSOR = BRD_TEMP           # Last Flow Sensor
 
 @unique
 class DDValveStates(DialinEnum):