Index: TDDefs.h
===================================================================
diff -u -r413aa187b32921babc077451fb7c98578707497b -r8f4c7a14f0ed74c238c7c72a316a026e50dc3cec
--- TDDefs.h	(.../TDDefs.h)	(revision 413aa187b32921babc077451fb7c98578707497b)
+++ TDDefs.h	(.../TDDefs.h)	(revision 8f4c7a14f0ed74c238c7c72a316a026e50dc3cec)
@@ -206,24 +206,26 @@
 /// Enumeration of dry self-tests sub-mode states.
 enum TD_Pre_Treatment_Dry_Self_Tests_States
 {
-    DRY_SELF_TESTS_START_STATE = 0,                         ///< Dry self-tests starting state
-    DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE,               ///< Wait for door to close before executing self-tests
-    DRY_SELF_TESTS_USED_CARTRIDGE_CHECK_STATE,              ///< Used cartridge check dry self-test state
-    DRY_SELF_TESTS_CARTRIDGE_LOADED_CHECK_STATE,            ///< Cartridge loaded check dry self-test state
-    DRY_SELF_TESTS_SYRINGE_PUMP_SEEK_STATE,                 ///< Seek syringe pumps state
-    DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_SETUP_STATE,     ///< Pressure sensor setup state
-    DRY_SELF_TESTS_PRESSURE_SENSORS_VENOUS_SETUP_STATE,     ///< Venous pressure sensor dry self-test setup valves and pump state
-    DRY_SELF_TESTS_PRESSURE_SENSORS_VENOUS,                 ///< Venous pressure sensor dry self-test
-    DRY_SELF_TESTS_PRESSURE_SENSORS_ARTERIAL_SETUP_STATE,   ///< Arterial pressure sensor dry self-test setup valves and pump state
-    DRY_SELF_TESTS_PRESSURE_SENSORS_ARTERIAL,               ///< Arterial pressure sensor dry self-test
-    DRY_SELF_TESTS_PRESSURE_SENSORS_DECAY_STATE,            ///< Pressure sensors verify pressure loss state
-    DRY_SELF_TESTS_PRESSURE_SENSORS_STABILITY_STATE,        ///< Pressure sensors verify pressure stability state
-    DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_STATE,           ///< Pressure sensors verify normal pressure readings state
-    DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE,                ///< Prime syringe pump state
-    DRY_SELF_TESTS_SYRINGE_PUMP_OCCLUSION_DETECTION_STATE,  ///< Occlusion detection state
-    DRY_SELF_TESTS_STOPPED_STATE,                           ///< Dry self-test stopped state
-    DRY_SELF_TESTS_COMPLETE_STATE,                          ///< Dry self-test complete state
-    NUM_OF_DRY_SELF_TESTS_STATES                            ///< Number of dry self-tests states
+    DRY_SELF_TESTS_START_STATE = 0,                            ///< Dry self-tests start state
+    DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE,                  ///< Wait for door close state
+    DRY_SELF_TESTS_USED_CARTRIDGE_CHECK_STATE,                 ///< Used cartridge check state
+    DRY_SELF_TESTS_CARTRIDGE_LOADED_CHECK_STATE,               ///< Cartridge loaded check state
+    DRY_SELF_TESTS_TUBE_SET_AUTHENTICATION_STATE,              ///< Tube set authentication state
+    DRY_SELF_TESTS_SYRINGE_PUMP_SEEK_STATE,                    ///< Syringe pump seek state
+    DRY_SELF_TESTS_PRESSURE_SENSOR_NORMAL_SETUP_STATE,         ///< Pressure sensor normal setup state
+    DRY_SELF_TESTS_PRESSURE_VENOUS_SETUP_STATE,                ///< Pressure venous setup state
+    DRY_SELF_TESTS_VENOUS_PRESSURE_STABILIZATION_STATE,        ///< Venous pressure stabilization state
+    DRY_SELF_TESTS_VENOUS_PRESSURE_LEAK_CHECK_STATE,           ///< Venous pressure leak check state
+    DRY_SELF_TESTS_VENOUS_PRESSURE_RELIEF_STATE,               ///< Venous pressure relief state
+    DRY_SELF_TESTS_PRESSURE_ARTERIAL_SETUP_STATE,              ///< Pressure arterial setup state
+    DRY_SELF_TESTS_ARTERIAL_PRESSURE_STABILIZATION_STATE,      ///< Arterial pressure stabilization state
+    DRY_SELF_TESTS_ARTERIAL_PRESSURE_LEAK_CHECK_STATE,         ///< Arterial pressure leak check state
+    DRY_SELF_TESTS_ARTERIAL_PRESSURE_RELIEF_STATE,             ///< Arterial pressure relief state
+    DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE,                        ///< Syringe prime state
+    DRY_SELF_TESTS_SYRINGE_PUMP_OCCLUSION_CHECK_STATE,         ///< Syringe pump occlusion check state
+    DRY_SELF_TESTS_COMPLETE_STATE,                             ///< Complete state
+    DRY_SELF_TESTS_STOPPED_STATE,                              ///< Stopped state
+    NUM_OF_DRY_SELF_TESTS_STATES                               ///< Number of dry self-tests states
 };
 /// Type for dry self-tests enumeration.
 typedef enum TD_Pre_Treatment_Dry_Self_Tests_States DRY_SELF_TESTS_STATE_T;
@@ -719,6 +721,8 @@
     TD_EVENT_OP_MODE_CHANGE,                                            ///< TD Op mode change event
     TD_EVENT_SUB_MODE_CHANGE,                                           ///< TD Op sub-mode change event
     TD_EVENT_DRY_SELF_TEST_CARTRIDGE_RESULT,                            ///< TD dry self test cartridge result
+    TD_EVENT_TUBING_SET_BARCODE_SCAN_REQUEST,                           ///< TD tubing set barcode scan request
+    TD_EVENT_TUBING_SET_BARCODE_SCAN_AUTHENTICATED,                     ///< TD tubing set barcode scan authenticated
     TD_EVENT_DRY_SELF_TEST_PRESSURE_RESULT,                             ///< TD dry self test pressure result
     TD_EVENT_WET_SELF_TEST_DISPLACEMENT_RESULT,                         ///< TD wet self test displacement result
     TD_EVENT_CPU_RAM_ERROR_STATUS,                                      ///< TD CPU RAM error status
@@ -735,7 +739,6 @@
     TD_EVENT_AIR_TRAP_FILL,                                             ///< TD started/stopped an air trap fill operation.
     TD_EVENT_AIR_TRAP_LOWER,                                            ///< TD started/stopped an air trap lower level operation.
     TD_EVENT_AIR_PUMP_ON_OFF,                                           ///< TD turned air pump on/off.
-    TD_EVENT_DRY_SELF_TEST_PRESSURE_DECAY_WAIT_PERIOD,                  ///< TD dry self test pressure decay waiting period.
     TD_EVENT_INSTIT_RECORD_UPDATE,                                      ///< TD new institutional record has been updated.
     TD_EVENT_VALVE_POS_CHANGE,                                          ///< TD pinch valve position change
     TD_EVENT_VALVE_HOMED_POS_SETTING,                                   ///< TD pinch valve homed encoder positions for A/B/C.