Index: leahi_dialin/fp/filtration_purification.py =================================================================== diff -u -rfd6f015b1ff68a2ee15187722ec21b8898fce10c -r39190f5b592ef515e19ae1b5455a32b84f853cf5 --- leahi_dialin/fp/filtration_purification.py (.../filtration_purification.py) (revision fd6f015b1ff68a2ee15187722ec21b8898fce10c) +++ leahi_dialin/fp/filtration_purification.py (.../filtration_purification.py) (revision 39190f5b592ef515e19ae1b5455a32b84f853cf5) @@ -94,9 +94,9 @@ self.can_interface.register_receiving_publication_function(channel_id, MsgIds.MSG_ID_FP_DEF_STATUS_RESPONSE.value, self._handler_fp_defeatured_response) - self.can_interface.register_receiving_publication_function(channel_id, - MsgIds.MSG_ID_FP_DEF_STATUS_RESPONSE.value, - self._handler_fp_boost_pump_installed_response) + # self.can_interface.register_receiving_publication_function(channel_id, + # MsgIds.MSG_ID_FP_DEF_STATUS_RESPONSE.value, + # self._handler_fp_boost_pump_installed_response) # Dialin will send a login message during construction. This is for the leahi subsystems to start # publishing CAN data when there is no UI connected as the UI typically does this job. self.cmd_log_in_to_fp() @@ -260,23 +260,16 @@ @return: 1 if successful, zero otherwise """ + return cmd_generic_override( + payload = None, + reset = NO_RESET, + channel_id = DenaliChannels.dialin_to_fp_ch_id, + msg_id = MsgIds.MSG_ID_FP_DEF_STATUS_REQUEST, + entity_name = 'FP Defeatured Status', + override_text = '', + logger = self.logger, + can_interface = self.can_interface) - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id, - message_id=MsgIds.MSG_ID_FP_DEF_STATUS_REQUEST.value) - - self.logger.debug('Getting FP defeatured status') - received_message = self.can_interface.send(message) - - # If there is content... - if received_message is not None: - self.logger.debug("Received FW ACK after requesting FP defeatured configuration record.") - # response payload is OK or not OK - return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] - else: - self.logger.debug("Timeout!!!!") - return False - - def cmd_request_boost_pump_install_status(self) -> int: """ Constructs and sends the FP defeatured status request