Index: leahi_dialin/fp/filtration_purification.py =================================================================== diff -u -r11a9e42c4afdf426ead4997817f7d817be554266 -rc93ef62631552b2ba3ffb77006d29f902e7a1128 --- leahi_dialin/fp/filtration_purification.py (.../filtration_purification.py) (revision 11a9e42c4afdf426ead4997817f7d817be554266) +++ leahi_dialin/fp/filtration_purification.py (.../filtration_purification.py) (revision c93ef62631552b2ba3ffb77006d29f902e7a1128) @@ -94,10 +94,9 @@ self.can_interface.register_receiving_publication_function(channel_id, MsgIds.MSG_ID_FP_DEF_STATUS_RESPONSE.value, self._handler_fp_defeatured_response) - # ToDo: Enable and update the msg id when FW part of LDT-3779 is implemented - # 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_BOOST_PUMP_INSTALL_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() @@ -239,7 +238,7 @@ self.fp_defeatured_timestamp = timestamp - @publish(["msg_id_fp_def_status_response", "fp_defeatured"]) + @publish(["msg_id_fp_boost_pump_installed_status_response", "fp_p40_installed"]) def _handler_fp_boost_pump_installed_response(self, message, timestamp = 0.0): """ Handler for response from FP regarding its boost pump installation status. @@ -250,7 +249,7 @@ self.fp_p40_installed = struct.unpack('?', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])) - self.fp_defeatured_timestamp = timestamp + self.fp_p40_installed_timestamp = timestamp def cmd_request_defeatured_status(self) -> int: @@ -280,12 +279,11 @@ @return: 1 if successful, zero otherwise """ - # ToDo: Update the msg id when FW part of LDT-3779 is implemented 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, + msg_id = MsgIds.MSG_ID_FP_BOOST_PUMP_INSTALL_STATUS_REQUEST, entity_name = 'FP P40 Boost Pump installed status', override_text = '', logger = self.logger,