Index: leahi_dialin/common/msg_ids.py =================================================================== diff -u -r5da31bc941a76297a8285323af9ff5d497ebe230 -rc93ef62631552b2ba3ffb77006d29f902e7a1128 --- leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision 5da31bc941a76297a8285323af9ff5d497ebe230) +++ leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision c93ef62631552b2ba3ffb77006d29f902e7a1128) @@ -430,6 +430,9 @@ MSG_ID_FP_DEF_STATUS_REQUEST = 0xB044 MSG_ID_FP_DEF_STATUS_RESPONSE = 0xB045 MSG_ID_FP_SET_OP_SUB_MODE_REQUEST = 0xB046 + + MSG_ID_FP_BOOST_PUMP_INSTALL_STATUS_REQUEST = 0xB049 + MSG_ID_FP_BOOST_PUMP_INSTALL_STATUS_RESPONSE = 0xB04A MSG_ID_FP_CONDUCTIVITY_SENSOR_RESISTANCE_OVERRIDE_REQUEST = 0xB100 Index: leahi_dialin/dd/modules/temperature_sensors.py =================================================================== diff -u -rfc671af6d1a18c900812e68c42ca14da3280e4f1 -rc93ef62631552b2ba3ffb77006d29f902e7a1128 --- leahi_dialin/dd/modules/temperature_sensors.py (.../temperature_sensors.py) (revision fc671af6d1a18c900812e68c42ca14da3280e4f1) +++ leahi_dialin/dd/modules/temperature_sensors.py (.../temperature_sensors.py) (revision c93ef62631552b2ba3ffb77006d29f902e7a1128) @@ -61,6 +61,7 @@ dd_enum_repository.DDTemperatureSensorNames.D99_AVG_TEMP.name: 0.0, dd_enum_repository.DDTemperatureSensorNames.D28_AVG_TEMP.name: 0.0, dd_enum_repository.DDTemperatureSensorNames.D30_AVG_TEMP.name: 0.0, + dd_enum_repository.DDTemperatureSensorNames.D78_AVG_TEMP.name: 0.0, dd_enum_repository.DDTemperatureSensorNames.D9_TEMP.name: 0.0, dd_enum_repository.DDTemperatureSensorNames.D66_TEMP.name: 0.0, dd_enum_repository.DDTemperatureSensorNames.D51_TEMP.name: 0.0, @@ -95,6 +96,7 @@ sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D99_AVG_TEMP, 'f')) sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D28_AVG_TEMP, 'f')) sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D30_AVG_TEMP, 'f')) + sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D78_AVG_TEMP, 'f')) sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D9_TEMP, 'f')) sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D66_TEMP, 'f')) sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D51_TEMP, 'f')) 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, Index: leahi_dialin/protocols/CAN.py =================================================================== diff -u -r38e8dd31728056dbb7f9304c98ab16d7147b75a2 -rc93ef62631552b2ba3ffb77006d29f902e7a1128 --- leahi_dialin/protocols/CAN.py (.../CAN.py) (revision 38e8dd31728056dbb7f9304c98ab16d7147b75a2) +++ leahi_dialin/protocols/CAN.py (.../CAN.py) (revision c93ef62631552b2ba3ffb77006d29f902e7a1128) @@ -29,7 +29,7 @@ from logging import Logger import struct from .. import common -from ..common import MsgIds +from ..common import MsgIds, msg_defs from ..utils import SingletonMeta, IntervalTimer from concurrent.futures import ThreadPoolExecutor Index: leahi_dialin/td/modules/ejector.py =================================================================== diff -u -rfc671af6d1a18c900812e68c42ca14da3280e4f1 -rc93ef62631552b2ba3ffb77006d29f902e7a1128 --- leahi_dialin/td/modules/ejector.py (.../ejector.py) (revision fc671af6d1a18c900812e68c42ca14da3280e4f1) +++ leahi_dialin/td/modules/ejector.py (.../ejector.py) (revision c93ef62631552b2ba3ffb77006d29f902e7a1128) @@ -53,7 +53,7 @@ #: The TD Ejector data in dictionary format self.h5_motor = { td_enum_repository.TDEjectorNames.H5_MOTOR.name: { - td_enum_repository.TDEjectorAttributes.STATE.name: 0, + td_enum_repository.TDEjectorAttributes.STATE.name: td_enum_repository.TDEjectorStates.EJECTOR_STATE_INIT.value, td_enum_repository.TDEjectorAttributes.SET_SPEED.name: 0.0, td_enum_repository.TDEjectorAttributes.OPT_SNSR_RETRACT: 0, # H25 Optical Sensor td_enum_repository.TDEjectorAttributes.OPT_SNSR_ENGAGE: 0 # H24 Optical Sensor