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]