Index: dialin/dg/conductivity_sensors.py =================================================================== diff -u -rc9b3a20bb95ffeeb4f42989456557f4a537be236 -r485d4ea35ee9b62e746c9006152ecc1e81735878 --- dialin/dg/conductivity_sensors.py (.../conductivity_sensors.py) (revision c9b3a20bb95ffeeb4f42989456557f4a537be236) +++ dialin/dg/conductivity_sensors.py (.../conductivity_sensors.py) (revision 485d4ea35ee9b62e746c9006152ecc1e81735878) @@ -35,7 +35,6 @@ # Override message IDs MSG_ID_CONDUCTIVITY_OVERRIDE = 0xA015 MSG_ID_CONDUCTIVITY_PUBLISH_INTERVAL_OVERRIDE = 0xA016 - MSG_ID_RO_REJECTION_RATIO_OVERRIDE = 0xA022 # Conductivity sensor broadcast message field positions START_POS_RO_REJECTION_RATIO = DenaliMessage.PAYLOAD_START_INDEX @@ -175,39 +174,3 @@ self.logger.error("Timeout!!!!") return False - def cmd_ro_rejection_ratio_override(self, ratio, reset=NO_RESET): - """ - Constructs and sends the RO rejection ratio override command - - @param ratio: float - RO rejection ratio to override 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) - ratio_byte_array = float_to_bytearray(ratio) - payload = reset_byte_array + ratio_byte_array - - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, - message_id=self.MSG_ID_RO_REJECTION_RATIO_OVERRIDE, - payload=payload) - - self.logger.debug("override DG RO rejection ratio") - - # Send message - received_message = self.can_interface.send(message) - - # If there is content... - if received_message is not None: - if reset == RESET: - str_res = "reset back to normal: " - else: - str_res = str(ratio) + " : " - self.logger.debug("RO rejection ratio overridden to " + str_res + - str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) - # response payload is OK or not OK - return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] - else: - self.logger.error("Timeout!!!!") - return False -