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):
Index: leahi_dialin/dd/modules/temperature_sensors.py
===================================================================
diff -u -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df -r5f783280400baab74941d3fd4d3e3d5a97bd06ee
--- leahi_dialin/dd/modules/temperature_sensors.py	(.../temperature_sensors.py)	(revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df)
+++ leahi_dialin/dd/modules/temperature_sensors.py	(.../temperature_sensors.py)	(revision 5f783280400baab74941d3fd4d3e3d5a97bd06ee)
@@ -18,7 +18,7 @@
 from logging import Logger
 
 from leahi_dialin.common.constants import NO_RESET
-from leahi_dialin.common.dd_defs import COND_SENSOR_INDEX_OFFSET, PRES_SENSOR_INDEX_OFFSET, DDTemperaturesNames
+from leahi_dialin.common.dd_defs import DDTemperaturesNames
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
 from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override
 from leahi_dialin.protocols.CAN import DenaliChannels
@@ -180,18 +180,21 @@
         @returns 1 if successful, zero otherwise
         """
         # DD Conductivity Sensors' Temperature Reading Override
-        if DDTemperaturesNames.D16_TEMP.value <= sensor_index <= DDTemperaturesNames.D99_TEMP.value:
-            index = integer_to_bytearray((sensor_index - COND_SENSOR_INDEX_OFFSET))
+        if DDTemperaturesNames.FIRST_CONDUCTIVITY_SENSOR.value <= sensor_index <= DDTemperaturesNames.LAST_CONDUCTIVITY_SENSOR.value:
+            modified_index= sensor_index - DDTemperaturesNames.FIRST_CONDUCTIVITY_SENSOR.value
             message_id = MsgIds.MSG_ID_DD_CONDUCTIVITY_SENSOR_TEMPERATURE_OVERRIDE_REQUEST
+
         # DD Pressure Sensors' Temperature Reading Override
-        elif DDTemperaturesNames.D9_TEMP.value <= sensor_index < DDTemperaturesNames.NUM_OF_TEMP_SENSORS.value:
-            index = integer_to_bytearray((sensor_index - PRES_SENSOR_INDEX_OFFSET))
+        elif DDTemperaturesNames.FIRST_PRESSURE_SENSOR.value <= sensor_index <= DDTemperaturesNames.LAST_PRESSURE_SENSOR.value:
+            modified_index= sensor_index - DDTemperaturesNames.FIRST_PRESSURE_SENSOR.value
             message_id = MsgIds.MSG_ID_DD_PRESSURE_SENSOR_TEMPERATURE_OVERRIDE_REQUEST
+
         # DD Temperature Sensors' Temperature Reading Override
         else:
-            index = integer_to_bytearray(sensor_index)
+            modified_index= sensor_index
             message_id = MsgIds.MSG_ID_DD_TEMPERATURE_SENSOR_MEASURED_TEMPERATURE_OVERRIDE_REQUEST
 
+        index = integer_to_bytearray(modified_index)
         rst = integer_to_bytearray(reset)
         value = float_to_bytearray(sensor_value)
         payload = rst + value + index
@@ -293,7 +296,7 @@
         """
         rst = integer_to_bytearray(reset)
         tmp = float_to_bytearray(temperature)
-        idx = integer_to_bytearray(sensor - PRES_SENSOR_INDEX_OFFSET)
+        idx = integer_to_bytearray(sensor - DDTemperaturesNames.FIRST_PRESSURE_SENSOR.value)
         payload = rst + tmp + idx
 
         sensor_name = DDTemperaturesNames(sensor).name.split('_')[0]
Index: leahi_dialin/fp/modules/temperatures.py
===================================================================
diff -u -r914620537399ff9ecc4925fc56f8b8be567d184e -r5f783280400baab74941d3fd4d3e3d5a97bd06ee
--- leahi_dialin/fp/modules/temperatures.py	(.../temperatures.py)	(revision 914620537399ff9ecc4925fc56f8b8be567d184e)
+++ leahi_dialin/fp/modules/temperatures.py	(.../temperatures.py)	(revision 5f783280400baab74941d3fd4d3e3d5a97bd06ee)
@@ -124,15 +124,13 @@
         @param reset: (int) whether to reset the override value. The default is NO_RESET
         @returns 1 if successful, zero otherwise
         """
-        
-
         # FP Conductivity Sensors' Temperature Override
         if FPTemperaturesNames.FIRST_CONDUCTIVITY_SENSOR.value <= sensor_index <= FPTemperaturesNames.LAST_CONDUCTIVITY_SENSOR.value:
             modified_index = sensor_index - FPTemperaturesNames.FIRST_CONDUCTIVITY_SENSOR.value + BETA_IOFP_COND_SENSOR_OFFSET
             msg_id = MsgIds.MSG_ID_FP_CONDUCTIVITY_TEMP_OVERRIDE_REQUEST
 
         # FP Flow Sensors' Temperature Override
-        elif FPTemperaturesNames.FIRST_FLOW_SENSOR.value <= sensor_index < FPTemperaturesNames.LAST_FLOW_SENSOR.value:
+        elif FPTemperaturesNames.FIRST_FLOW_SENSOR.value <= sensor_index <= FPTemperaturesNames.LAST_FLOW_SENSOR.value:
             modified_index = sensor_index - FPTemperaturesNames.FIRST_FLOW_SENSOR.value
             msg_id = MsgIds.MSG_ID_FP_FLOW_TEMP_OVERRIDE_REQUEST