Index: leahi_dialin/fp/modules/conductivity_sensors.py =================================================================== diff -u -red3eb121e6f8b717386c77af4419df76f9fa2e19 -rc67b334aaf46d4b3568c93598df34ffcf14e4af4 --- leahi_dialin/fp/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision ed3eb121e6f8b717386c77af4419df76f9fa2e19) +++ leahi_dialin/fp/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision c67b334aaf46d4b3568c93598df34ffcf14e4af4) @@ -213,9 +213,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] @@ -239,9 +240,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] @@ -292,9 +294,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]