Index: leahi_dialin/fp/filtration_purification.py =================================================================== diff -u -rc6b28ca8a6aae3f70458f05b5bf445069e2fe457 -rc93ef62631552b2ba3ffb77006d29f902e7a1128 --- leahi_dialin/fp/filtration_purification.py (.../filtration_purification.py) (revision c6b28ca8a6aae3f70458f05b5bf445069e2fe457) +++ leahi_dialin/fp/filtration_purification.py (.../filtration_purification.py) (revision c93ef62631552b2ba3ffb77006d29f902e7a1128) @@ -260,22 +260,17 @@ @return: 1 if successful, zero otherwise """ - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id, - message_id=MsgIds.MSG_ID_FP_DEF_STATUS_REQUEST.value) + 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) - 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 @@ -284,24 +279,17 @@ @return: 1 if successful, zero otherwise """ - # ToDo: Update the msg id when FW part of LDT-3779 is implemented - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id, - message_id=MsgIds.MSG_ID_FP_BOOST_PUMP_INSTALL_STATUS_REQUEST.value) + return cmd_generic_override( + payload = None, + reset = NO_RESET, + channel_id = DenaliChannels.dialin_to_fp_ch_id, + msg_id = MsgIds.MSG_ID_FP_BOOST_PUMP_INSTALL_STATUS_REQUEST, + entity_name = 'FP P40 Boost Pump installed status', + override_text = '', + logger = self.logger, + can_interface = self.can_interface) - self.logger.debug('Getting FP P40 Boost Pump installed 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 P40 Boost Pump installed 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_op_mode_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: """ Constructs and sends the measured op mode broadcast interval override command