Index: leahi_dialin/fp/modules/conductivity_sensors.py =================================================================== diff -u -r6ce1aaaa1c5ce4ef44d51d7c805c81e34cdb2499 -r7f15dd8f390b87b8b93d8118ee1ddb9fd49b0449 --- leahi_dialin/fp/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision 6ce1aaaa1c5ce4ef44d51d7c805c81e34cdb2499) +++ leahi_dialin/fp/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision 7f15dd8f390b87b8b93d8118ee1ddb9fd49b0449) @@ -209,9 +209,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] @@ -235,9 +236,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] @@ -288,9 +290,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]