Index: leahi_dialin/dd/modules/conductivity_sensors.py =================================================================== diff -u -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863 -r7c0309a22098e7c4b0ef1599fc737f6f8929b9ac --- leahi_dialin/dd/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863) +++ leahi_dialin/dd/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision 7c0309a22098e7c4b0ef1599fc737f6f8929b9ac) @@ -155,7 +155,7 @@ str_res = "reset back to normal" else: str_res = str(conductivity) + " microsiemens/cm" - self.logger.debug("override conductivity sensor value for sensor " + DDConductivitySensorsEnum[str(sensor_index)].name + self.logger.debug("override conductivity sensor value for sensor " + DDConductivitySensorsEnum(sensor_index).name + ": " + str_res) # Send message @@ -169,47 +169,6 @@ self.logger.error("Timeout!!!!") return False - def cmd_conductivity_sensor_temperature_override(self, sensor_index: int, temperature: float, reset: int = NO_RESET) -> int: - """ - Constructs and sends the conductivity temperature override command - Constraints: - Must be logged into DD. - Given sensor_index must be one of the sensors defined in ConductivitySensorsEnum - - @param sensor_index: unsigned int - index of the sensor - @param temperature: float - temperature value to override sensor with - @param reset: integer - 1 to reset a previous override, 0 to override - @return: 1 if successful, zero otherwise - - """ - - reset_byte_array = integer_to_bytearray(reset) - temp_byte_array = float_to_bytearray(temperature) - sensor_byte_array = integer_to_bytearray(sensor_index) - payload = reset_byte_array + temp_byte_array + sensor_byte_array - - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dd_ch_id, - message_id=MsgIds.MSG_ID_DD_CONDUCTIVITY_SENSOR_TEMPERATURE_OVERRIDE_REQUEST.value, - payload=payload) - - if reset == RESET: - str_res = "reset back to normal" - else: - str_res = str(temperature) - self.logger.debug("override temperature value for conductivity sensor " + DDConductivitySensorsEnum[str(sensor_index)].name - + ": " + str_res) - - # Send message - received_message = self.can_interface.send(message) - - # If there is content... - if received_message is not None: - # response payload is OK or not OK - return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] - else: - self.logger.error("Timeout!!!!") - return False - def cmd_conductivity_sensor_read_counter_override(self, sensor_index: int, counter: int, reset: int = NO_RESET) -> int: """ Constructs and sends the conductivity read counter override command