Index: leahi_dialin/fp/modules/conductivity_sensors.py
===================================================================
diff -u -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 -re45b20cdc5d4c5dcff8cef530b173ca94cb2e422
--- leahi_dialin/fp/modules/conductivity_sensors.py	(.../conductivity_sensors.py)	(revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6)
+++ leahi_dialin/fp/modules/conductivity_sensors.py	(.../conductivity_sensors.py)	(revision e45b20cdc5d4c5dcff8cef530b173ca94cb2e422)
@@ -22,7 +22,8 @@
 from leahi_dialin.common import fp_enum_repository
 from leahi_dialin.common.fp_defs import BETA_IOFP_COND_SENSOR_OFFSET
 from leahi_dialin.common.generic_defs import DataTypes
-from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
+from leahi_dialin.common.msg_defs import MsgFieldPositions
+from leahi_dialin.common.msg_ids import MsgIds
 from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override
 from leahi_dialin.protocols.CAN import CanMessenger, CanChannels
 from leahi_dialin.utils.abstract_classes import AbstractSubSystem
@@ -192,9 +193,10 @@
         @param reset:  integer - 1 to reset a previous override, 0 to override
         @return: 1 if successful, zero otherwise
         """
+        modified_index = sensor + BETA_IOFP_COND_SENSOR_OFFSET
         reset_byte_array = integer_to_bytearray(reset)
         read_byte_array = integer_to_bytearray(counter)
-        sensor_byte_array = integer_to_bytearray(sensor)
+        sensor_byte_array = integer_to_bytearray(modified_index)
         payload = reset_byte_array + read_byte_array + sensor_byte_array
 
         sensor_name = fp_enum_repository.FPConductivitySensorNames(sensor).name.split('_')[0]
@@ -218,9 +220,10 @@
         @param reset:  integer - 1 to reset a previous override, 0 to override
         @return: 1 if successful, zero otherwise
         """
+        modified_index = sensor + BETA_IOFP_COND_SENSOR_OFFSET
         reset_byte_array = integer_to_bytearray(reset)
         error_byte_array = integer_to_bytearray(counter)
-        sensor_byte_array = integer_to_bytearray(sensor)
+        sensor_byte_array = integer_to_bytearray(modified_index)
         payload = reset_byte_array + error_byte_array + sensor_byte_array
 
         sensor_name = fp_enum_repository.FPConductivitySensorNames(sensor).name.split('_')[0]
@@ -271,9 +274,10 @@
         @param reset:  integer - 1 to reset a previous override, 0 to override
         @return: 1 if successful, zero otherwise
         """
+        modified_index = sensor_index + BETA_IOFP_COND_SENSOR_OFFSET
         reset_byte_array = integer_to_bytearray(reset)
         cond_byte_array = float_to_bytearray(conductivity)
-        sensor_byte_array = integer_to_bytearray(sensor_index)
+        sensor_byte_array = integer_to_bytearray(modified_index)
         payload = reset_byte_array + cond_byte_array + sensor_byte_array
 
         sensor_name = fp_enum_repository.FPConductivitySensorNames(sensor_index).name.split('_')[0]