Index: leahi_dialin/fp/filtration_purification.py =================================================================== diff -u -rdd2124b8278268117cb37bc49d5fc32cd461c416 -rc6b28ca8a6aae3f70458f05b5bf445069e2fe457 --- leahi_dialin/fp/filtration_purification.py (.../filtration_purification.py) (revision dd2124b8278268117cb37bc49d5fc32cd461c416) +++ leahi_dialin/fp/filtration_purification.py (.../filtration_purification.py) (revision c6b28ca8a6aae3f70458f05b5bf445069e2fe457) @@ -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: @@ -287,7 +286,7 @@ """ # 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_DEF_STATUS_REQUEST.value) + message_id=MsgIds.MSG_ID_FP_BOOST_PUMP_INSTALL_STATUS_REQUEST.value) self.logger.debug('Getting FP P40 Boost Pump installed status') received_message = self.can_interface.send(message)