Index: leahi_dialin/dd/modules/conductivity_sensors.py =================================================================== diff -u -rfd7a25d8f068bcba594c01410a02a03f6afbcd59 -recd89ae316cd2afa695dd4e93ac18b6004975efb --- leahi_dialin/dd/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision fd7a25d8f068bcba594c01410a02a03f6afbcd59) +++ leahi_dialin/dd/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision ecd89ae316cd2afa695dd4e93ac18b6004975efb) @@ -215,7 +215,7 @@ if reset == RESET: str_res = "reset back to normal" else: - str_res = str(conductivity) + " microsiemens/cm" + str_res = str(temperature) self.logger.debug("override conductivity sensor value for sensor " + str(sensor) + ": " + str_res) # Send message @@ -229,7 +229,7 @@ self.logger.error("Timeout!!!!") return False - def cmd_conductivity_sensor_read_counter_override(self, sensor: int, counter: float, reset: int = NO_RESET) -> int: + def cmd_conductivity_sensor_read_counter_override(self, sensor: int, counter: int, reset: int = NO_RESET) -> int: """ Constructs and sends the conductivity value override command @@ -241,7 +241,7 @@ """ reset_byte_array = integer_to_bytearray(reset) - read_byte_array = float_to_bytearray(counter) + read_byte_array = integer_to_bytearray(counter) sensor_byte_array = integer_to_bytearray(sensor) payload = reset_byte_array + read_byte_array + sensor_byte_array @@ -252,7 +252,7 @@ if reset == RESET: str_res = "reset back to normal" else: - str_res = str(conductivity) + " microsiemens/cm" + str_res = str(counter) self.logger.debug("override conductivity sensor value for sensor " + str(sensor) + ": " + str_res) # Send message @@ -266,7 +266,7 @@ self.logger.error("Timeout!!!!") return False - def cmd_conductivity_sensor_error_counter_override(self, sensor: int, counter: float, reset: int = NO_RESET) -> int: + def cmd_conductivity_sensor_error_counter_override(self, sensor: int, counter: int, reset: int = NO_RESET) -> int: """ Constructs and sends the conductivity value override command @@ -278,7 +278,7 @@ """ reset_byte_array = integer_to_bytearray(reset) - error_byte_array = float_to_bytearray(counter) + error_byte_array = integer_to_bytearray(counter) sensor_byte_array = integer_to_bytearray(sensor) payload = reset_byte_array + error_byte_array + sensor_byte_array @@ -289,7 +289,7 @@ if reset == RESET: str_res = "reset back to normal" else: - str_res = str(conductivity) + " microsiemens/cm" + str_res = str(counter) self.logger.debug("override conductivity sensor value for sensor " + str(sensor) + ": " + str_res) # Send message