Index: leahi_dialin/common/test_config_defs.py =================================================================== diff -u -r2f742ca8bb2c860dfd2835a3cef5815b4ae0a3ae -rfc66ce51dca2af3afb1de1426f3eb1cf5285d66f --- leahi_dialin/common/test_config_defs.py (.../test_config_defs.py) (revision 2f742ca8bb2c860dfd2835a3cef5815b4ae0a3ae) +++ leahi_dialin/common/test_config_defs.py (.../test_config_defs.py) (revision fc66ce51dca2af3afb1de1426f3eb1cf5285d66f) @@ -44,5 +44,6 @@ TEST_CONFIG_ENABLE_BETA_1_HW = 0 # Test configuration using Beta 1 Hardware TEST_CONFIG_SKIP_BLOOD_PRIME = 1 # Test configuration to skip blood priming TEST_CONFIG_TD_NO_CARTRIDGE = 2 # Test configuration to operate without cartridge - NUM_OF_TEST_CONFIGS = 3 # Number of Test Configs + TEST_CONFIG_TD_DISABLE_FAULT_MODE_FROM_DD_FP = 3 # Test configuration to disable TD going to Fault mode because of alarms from other subsystems + NUM_OF_TEST_CONFIGS = 4 # Number of Test Configs TDTestConfigOptions._str_list = {} Index: leahi_dialin/fp/filtration_purification.py =================================================================== diff -u -r3501d505c3226190e8556ab67a608846fba755e1 -rfc66ce51dca2af3afb1de1426f3eb1cf5285d66f --- leahi_dialin/fp/filtration_purification.py (.../filtration_purification.py) (revision 3501d505c3226190e8556ab67a608846fba755e1) +++ leahi_dialin/fp/filtration_purification.py (.../filtration_purification.py) (revision fc66ce51dca2af3afb1de1426f3eb1cf5285d66f) @@ -77,8 +77,7 @@ self.callback_id = None # register handler for FP operation mode broadcast messages if self.can_interface is not None: - channel_id = DenaliChannels.fp_sync_broadcast_ch_id - self.can_interface.register_receiving_publication_function(channel_id, + self.can_interface.register_receiving_publication_function(DenaliChannels.fp_sync_broadcast_ch_id, MsgIds.MSG_ID_FP_OP_MODE_DATA.value, self._handler_fp_op_mode_sync) @@ -87,14 +86,14 @@ MsgIds.MSG_ID_DD_VERSION_RESPONSE.value, self._handler_fp_version_response_sync) - self.can_interface.register_receiving_publication_function(channel_id, + self.can_interface.register_receiving_publication_function(DenaliChannels.fp_sync_broadcast_ch_id, MsgIds.MSG_ID_FP_DEBUG_EVENT.value, self._handler_fp_debug_event_sync) - self.can_interface.register_receiving_publication_function(channel_id, + self.can_interface.register_receiving_publication_function(DenaliChannels.dd_to_dialin_ch_id, MsgIds.MSG_ID_FP_DEF_STATUS_RESPONSE.value, self._handler_fp_defeatured_response) - self.can_interface.register_receiving_publication_function(channel_id, + self.can_interface.register_receiving_publication_function(DenaliChannels.dd_to_dialin_ch_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 @@ -232,8 +231,8 @@ @param message: defeatured response from FP @return: None """ - self.fp_defeatured = struct.unpack('?', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])) + self.fp_defeatured = True if struct.unpack('I', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0] == 1 else False self.fp_defeatured_timestamp = timestamp @@ -246,8 +245,8 @@ @param message: defeatured response from FP @return: None """ - self.fp_p40_installed = struct.unpack('?', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])) + self.fp_p40_installed = True if struct.unpack('I', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0] == 1 else False self.fp_p40_installed_timestamp = timestamp