Index: leahi_dialin/common/td_defs.py =================================================================== diff -u -r6c90336ac2cd8cf34ac620cff431a847d9ddf557 -r4064308ce07e6e48ad62e9dececd4964af2288f9 --- leahi_dialin/common/td_defs.py (.../td_defs.py) (revision 6c90336ac2cd8cf34ac620cff431a847d9ddf557) +++ leahi_dialin/common/td_defs.py (.../td_defs.py) (revision 4064308ce07e6e48ad62e9dececd4964af2288f9) @@ -742,35 +742,39 @@ TD_EVENT_STARTUP = 0 # TD startup event TD_EVENT_OP_MODE_CHANGE = 1 # TD Op mode change event TD_EVENT_SUB_MODE_CHANGE = 2 # TD Op sub-mode change event - TD_EVENT_DRY_SELF_TEST_CARTRIDGE_RESULT = 3 # TD dry self test cartridge result - TD_EVENT_DRY_SELF_TEST_PRESSURE_RESULT = 4 # TD dry self test pressure result - TD_EVENT_WET_SELF_TEST_DISPLACEMENT_RESULT = 5 # TD wet self test displacement result - TD_EVENT_CPU_RAM_ERROR_STATUS = 6 # TD CPU RAM error status - TD_EVENT_CAL_RECORD_UPDATE = 7 # TD new calibration record updated - TD_EVENT_SYSTEM_RECORD_UPDATE = 8 # TD new system record has been updated - TD_EVENT_SERVICE_UPDATE = 9 # TD new service record has been updated - TD_EVENT_USAGE_INFO_UPDATE = 10 # TD new usage information has been updated - TD_EVENT_SW_CONFIG_UPDATE = 11 # TD new software configuration has been updated - TD_EVENT_BUTTON = 12 # TD button pressed/released - TD_EVENT_SAFETY_LINE = 13 # TD safety line pulled/released - TD_EVENT_SUB_STATE_CHANGE = 14 # TD Op sub-state change event - TD_EVENT_RSRVR_UF_RATE = 15 # TD ultrafiltration measured and expected rates - TD_EVENT_OPERATION_STATUS = 16 # TD operation status event. - TD_EVENT_AIR_TRAP_FILL = 17 # TD initiated an air trap fill (opened VBT briefly). - TD_EVENT_AIR_TRAP_LOWER = 18 # TD started/stopped an air trap lower level operation - TD_EVENT_AIR_PUMP_ON_OFF = 19 # TD turned air pump on or off. - TD_EVENT_DRY_SELF_TEST_PRESSURE_DECAY_WAIT_PERIOD = 20 # TD dry self test pressure decay wait period - TD_EVENT_INSTIT_RECORD_UPDATE = 21 # TD new institutional record has been updated. - TD_EVENT_VALVE_POS_CHANGE = 22 # TD pinch valve position change - TD_EVENT_VALVE_HOMED_POS_SETTING = 23 # TD pinch valve homed encoder positions for A/B/C - NUM_OF_EVENT_IDS = 24 # Total number of TD events + TD_EVENT_DRY_SELF_TEST_TUBESET_RESULT = 3 # TD dry self test cartridge result + TD_EVENT_TUBING_SET_BARCODE_SCAN_REQUEST = 4 # TD tubing set barcode scan request + TD_EVENT_TUBING_SET_BARCODE_SCAN_AUTHENTICATED = 5 # TD tubing set barcode scan authenticated + TD_EVENT_DRY_SELF_TEST_PRESSURE_RESULT = 6 # TD dry self test pressure result + TD_EVENT_WET_SELF_TEST_DISPLACEMENT_RESULT = 7 # TD wet self test displacement result + TD_EVENT_CPU_RAM_ERROR_STATUS = 8 # TD CPU RAM error status + TD_EVENT_CAL_RECORD_UPDATE = 9 # TD new calibration record updated + TD_EVENT_SYSTEM_RECORD_UPDATE = 10 # TD new system record has been updated + TD_EVENT_SERVICE_UPDATE = 11 # TD new service record has been updated + TD_EVENT_USAGE_INFO_UPDATE = 12 # TD new usage information has been updated + TD_EVENT_SW_CONFIG_UPDATE = 13 # TD new software configuration has been updated + TD_EVENT_BUTTON = 14 # TD button pressed/released + TD_EVENT_SAFETY_LINE = 15 # TD safety line pulled/released + TD_EVENT_SUB_STATE_CHANGE = 16 # TD Op sub-state change event + TD_EVENT_RSRVR_UF_RATE = 17 # TD ultrafiltration measured and expected rates + TD_EVENT_OPERATION_STATUS = 18 # TD aggregated opmode, submode, and substate event. + TD_EVENT_AIR_TRAP_FILL = 19 # TD started/stopped an air trap fill operation. + TD_EVENT_AIR_TRAP_LOWER = 20 # TD started/stopped an air trap lower level operation. + TD_EVENT_AIR_PUMP_ON_OFF = 21 # TD turned air pump on/off. + TD_EVENT_INSTIT_RECORD_UPDATE = 22 # TD new institutional record has been updated. + TD_EVENT_VALVE_POS_CHANGE = 23 # TD pinch valve position change + TD_EVENT_VALVE_HOMED_POS_SETTING = 24 # TD pinch valve homed encoder positions for A/B/C. + TD_EVENT_SYRINGE_PUMP_STATE = 25 # TD syringe pump state change event + NUM_OF_EVENT_IDS = 26 # Total number of TD events TDEventList._str_list = { # Official Name : Accepted strings 'TD_EVENT_STARTUP': ['startup'], 'TD_EVENT_OP_MODE_CHANGE': ['op mode change', 'operation mode change'], 'TD_EVENT_SUB_MODE_CHANGE': ['sub mode change'], - 'TD_EVENT_DRY_SELF_TEST_CARTRIDGE_RESULT': ['dry self test cartridge result'], + 'TD_EVENT_DRY_SELF_TEST_TUBESET_RESULT': ['dry self test tubeset result'], + 'TD_EVENT_TUBING_SET_BARCODE_SCAN_REQUEST': ['barcode authentication request'], + 'TD_EVENT_TUBING_SET_BARCODE_SCAN_AUTHENTICATED': ['barcode authentication result'], 'TD_EVENT_DRY_SELF_TEST_PRESSURE_RESULT': ['dry self test pressure result'], 'TD_EVENT_WET_SELF_TEST_DISPLACEMENT_RESULT': ['wet self test displacement result'], 'TD_EVENT_CPU_RAM_ERROR_STATUS': ['cpu ram error'], @@ -791,6 +795,7 @@ 'TD_EVENT_INSTIT_RECORD_UPDATE': ['instit record update', 'institutional record update'], 'TD_EVENT_VALVE_POS_CHANGE': ['valve position change', 'valve pos change'], 'TD_EVENT_VALVE_HOMED_POS_SETTING': ['valve homed to positions'], + 'TD_EVENT_SYRINGE_PUMP_STATE': ['syringe pump state'], 'NUM_OF_EVENT_IDS': [], } Index: leahi_dialin/td/modules/events.py =================================================================== diff -u -r8b54f610f3b5c0610bea0a481b892e8c70935765 -r4064308ce07e6e48ad62e9dececd4964af2288f9 --- leahi_dialin/td/modules/events.py (.../events.py) (revision 8b54f610f3b5c0610bea0a481b892e8c70935765) +++ leahi_dialin/td/modules/events.py (.../events.py) (revision 4064308ce07e6e48ad62e9dececd4964af2288f9) @@ -45,11 +45,11 @@ self.logger = logger if self.can_interface is not None: - self.can_interface.register_receiving_publication_function(channel_id = CanChannels.td_sync_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.td_to_ui_ch_id, message_id = MsgIds.MSG_ID_TD_EVENT.value, function = self._handler_events_sync) - self.can_interface.register_receiving_publication_function(channel_id = CanChannels.td_sync_broadcast_ch_id, + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.td_to_ui_ch_id, message_id = MsgIds.MSG_ID_TD_OP_MODE_DATA.value, function = self._handler_td_op_mode_sync)