Index: leahi_dialin/common/td_defs.py =================================================================== diff -u -rc6b28ca8a6aae3f70458f05b5bf445069e2fe457 -r3ca042a93b178bc02327efec6cf08dd2348f9a8e --- leahi_dialin/common/td_defs.py (.../td_defs.py) (revision c6b28ca8a6aae3f70458f05b5bf445069e2fe457) +++ leahi_dialin/common/td_defs.py (.../td_defs.py) (revision 3ca042a93b178bc02327efec6cf08dd2348f9a8e) @@ -327,39 +327,45 @@ DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE = 1 # Wait for door to close before executing self-tests DRY_SELF_TESTS_USED_CARTRIDGE_CHECK_STATE = 2 # Used cartridge check dry self-test state DRY_SELF_TESTS_CARTRIDGE_LOADED_CHECK_STATE = 3 # Cartridge loaded check dry self-test state - DRY_SELF_TESTS_SYRINGE_PUMP_SEEK_STATE = 4 # Seek syringe pumps state - DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_SETUP_STATE = 5 # Pressure sensor setup state - DRY_SELF_TESTS_PRESSURE_SENSORS_VENOUS_SETUP_STATE = 6 # Venous pressure sensor dry self-test setup valves and pump state - DRY_SELF_TESTS_PRESSURE_SENSORS_VENOUS = 7 # Venous pressure sensor dry self-test - DRY_SELF_TESTS_PRESSURE_SENSORS_ARTERIAL_SETUP_STATE = 8 # Arterial pressure sensor dry self-test setup valves and pump state - DRY_SELF_TESTS_PRESSURE_SENSORS_ARTERIAL = 9 # Arterial pressure sensor dry self-test - DRY_SELF_TESTS_PRESSURE_SENSORS_DECAY_STATE = 10 # Pressure sensors verify pressure loss state - DRY_SELF_TESTS_PRESSURE_SENSORS_STABILITY_STATE = 11 # Pressure sensors verify pressure stability state - DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_STATE = 12 # Pressure sensors verify normal pressure readings state - DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE = 13 # Prime syringe pump state - DRY_SELF_TESTS_SYRINGE_PUMP_OCCLUSION_DETECTION_STATE = 14 # Occlusion detection state - DRY_SELF_TESTS_STOPPED_STATE = 15 # Dry self-test stopped state - DRY_SELF_TESTS_COMPLETE_STATE = 16 # Dry self-test complete state - NUM_OF_DRY_SELF_TESTS_STATES = 17 # Number of dry self-tests states + DRY_SELF_TESTS_TUBE_SET_AUTHENTICATION_STATE = 4 # Tube set authentication state + DRY_SELF_TESTS_SYRINGE_PUMP_SEEK_STATE = 5 # Syringe pump seek state + DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_SETUP_STATE = 6 # Pressure sensor normal setup state + DRY_SELF_TESTS_PRESSURE_VENOUS_SETUP_STATE = 7 # Venous pressure sensor dry self-test setup valves and pump state + DRY_SELF_TESTS_VENOUS_PRESSURE_STABILIZATION_STATE = 8 # Venous pressure verify pressure stability state + DRY_SELF_TESTS_VENOUS_PRESSURE_LEAK_CHECK_STATE = 9 # Venous pressure leak check state + DRY_SELF_TESTS_VENOUS_PRESSURE_RELIEF_STATE = 10 # Venous pressure relief state + DRY_SELF_TESTS_PRESSURE_ARTERIAL_SETUP_STATE = 11 # Arterial pressure sensor dry self-test setup valves and pump state + DRY_SELF_TESTS_ARTERIAL_PRESSURE_STABILIZATION_STATE = 12 # Arterial pressure verify pressure stability state + DRY_SELF_TESTS_ARTERIAL_PRESSURE_LEAK_CHECK_STATE = 13 # Arterial pressure leak check state + DRY_SELF_TESTS_ARTERIAL_PRESSURE_RELIEF_STATE = 14 # Arterial pressure relief state + DRY_SELF_TESTS_SYRINGE_PRIME_STATE = 15 # Prime syringe pump state + DRY_SELF_TESTS_SYRINGE_PUMP_OCCLUSION_CHECK_STATE = 16 # Occlusion detection state + DRY_SELF_TESTS_COMPLETE_STATE = 17 # Dry self-test complete state + DRY_SELF_TESTS_STOPPED_STATE = 18 # Dry self-test stopped state + NUM_OF_DRY_SELF_TESTS_STATES = 19 # Number of dry self-tests states TDPreTreaDrySelfTestStates._str_list = { # Official Name : Accepted strings 'DRY_SELF_TESTS_START_STATE': ['start'], 'DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE': ['wait for front door to close', 'wait for door close'], 'DRY_SELF_TESTS_USED_CARTRIDGE_CHECK_STATE': ['used cartridge check'], 'DRY_SELF_TESTS_CARTRIDGE_LOADED_CHECK_STATE': ['cartridge loaded check'], + 'DRY_SELF_TESTS_TUBE_SET_AUTHENTICATION_STATE': ['tube set authentication', 'tube authentication'], 'DRY_SELF_TESTS_SYRINGE_PUMP_SEEK_STATE': ['srynge pump seek', 'pump seek'], 'DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_SETUP_STATE': ['pressure sensors normal setup'], - 'DRY_SELF_TESTS_PRESSURE_SENSORS_VENOUS_SETUP_STATE': ['pressure sensors venous setup'], - 'DRY_SELF_TESTS_PRESSURE_SENSORS_VENOUS': ['pressure sensors normal setup'], - 'DRY_SELF_TESTS_PRESSURE_SENSORS_ARTERIAL_SETUP_STATE': ['pressure sensors arterial setup'], - 'DRY_SELF_TESTS_PRESSURE_SENSORS_ARTERIAL': ['pressure sensors normal setup'], - 'DRY_SELF_TESTS_PRESSURE_SENSORS_DECAY_STATE': ['pressure decay', 'pressure loss'], - 'DRY_SELF_TESTS_PRESSURE_SENSORS_STABILITY_STATE': ['pressure stability'], + 'DRY_SELF_TESTS_PRESSURE_VENOUS_SETUP_STATE': ['pressure venous setup', 'venous setup'], + 'DRY_SELF_TESTS_VENOUS_PRESSURE_STABILIZATION_STATE': ['venous pressure stabilization'], + 'DRY_SELF_TESTS_VENOUS_PRESSURE_LEAK_CHECK_STATE': ['venous pressure leak check'], + 'DRY_SELF_TESTS_VENOUS_PRESSURE_RELIEF_STATE': ['venous pressure relief'], + 'DRY_SELF_TESTS_PRESSURE_ARTERIAL_SETUP_STATE': ['pressure arterial setup', 'arterial setup'], + 'DRY_SELF_TESTS_ARTERIAL_PRESSURE_STABILIZATION_STATE': ['arterial pressure stabilization'], + 'DRY_SELF_TESTS_ARTERIAL_PRESSURE_LEAK_CHECK_STATE': ['arterial pressure leak check'], + 'DRY_SELF_TESTS_ARTERIAL_PRESSURE_RELIEF_STATE': ['arterial pressure relief'], 'DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_STATE': ['presusre normal', 'pressure readings'], - 'DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE': ['srynge pump prime', 'pump prime'], - 'DRY_SELF_TESTS_STOPPED_STATE': ['stop'], + 'DRY_SELF_TESTS_SYRINGE_PRIME_STATE': ['srynge prime'], + 'DRY_SELF_TESTS_SYRINGE_PUMP_OCCLUSION_CHECK_STATE': ['srynge pump occlusion check', 'srynge pump check'], 'DRY_SELF_TESTS_COMPLETE_STATE': ['complete', 'done'], + 'DRY_SELF_TESTS_STOPPED_STATE': ['stop'], 'NUM_OF_DRY_SELF_TESTS_STATES': [], }