Index: leahi_dialin/fp/filtration_purification.py =================================================================== diff -u -r1ca63288b87154587f2e9df7624359fc8c419b9c -r2ab9451fb7f8a2df8179db9691655199b80f6fbc --- leahi_dialin/fp/filtration_purification.py (.../filtration_purification.py) (revision 1ca63288b87154587f2e9df7624359fc8c419b9c) +++ leahi_dialin/fp/filtration_purification.py (.../filtration_purification.py) (revision 2ab9451fb7f8a2df8179db9691655199b80f6fbc) @@ -105,6 +105,7 @@ self.can_interface.send(message, 0, is_ack=True) # create properties + self.fp_defeaturized = False self.fp_defeatured_timestamp = 0.0 self.fp_op_mode_timestamp = 0.0 self.fp_debug_events_timestamp = 0.0 @@ -134,7 +135,7 @@ self.temperatures = FPTemperatureSensors(self.can_interface, self.logger) self.test_configs = FPTestConfig(self.can_interface, self.logger) self.valves = FPValves(self.can_interface, self.logger) - self.dd_proxy = DDProxy(self.can_interface, self.logger) + self.dd_proxy = DDProxy(self.can_interface, self.logger, fp = self) @publish(["msg_id_fp_debug_event", "fp_debug_events_timestamp","fp_debug_events"]) @@ -255,24 +256,17 @@ @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_op_mode_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: """ Constructs and sends the measured op mode broadcast interval override command