Index: HDDefs.h
===================================================================
diff -u -rc2184390be04c9af7ed207d76a7632a18700a42a -re74fe5cf83768c09b81b7d72717ad6bcc3bc2755
--- HDDefs.h	(.../HDDefs.h)	(revision c2184390be04c9af7ed207d76a7632a18700a42a)
+++ HDDefs.h	(.../HDDefs.h)	(revision e74fe5cf83768c09b81b7d72717ad6bcc3bc2755)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2020-2023 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2020-2024 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
 * @file    HDDefs.h
 *
 * @author  (last)      Sean Nash
-* @date    (last)      19-Jul-2023
+* @date    (last)      30-Sep-2023
 *
 * @author  (original)  Sean Nash
 * @date    (original)  29-May-2020
@@ -185,7 +185,7 @@
 /**@}*/
 
 /**
- *  @addtogroup SelfTestConsumable
+ *  @addtogroup ConsumableSelfTest
  *  @{
  */
 
@@ -232,7 +232,8 @@
     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_PRESSURE_SENSORS_NORMAL_SETUP_STATE,     ///< Pressure sensor setup 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
@@ -312,7 +313,7 @@
     PRE_TREATMENT_RECIRC_STOPPED_STATE,                             ///< Pre-treatment recirculate stopped state
     NUM_OF_PRE_TREATMENT_RECIRC_STATES                              ///< Number of pre-treatment recirculate states
 };
-///< Type for HD pre-treatment recirculate sub-mode states enumeration
+/// Type for HD pre-treatment recirculate sub-mode states enumeration
 typedef enum HD_Pre_Treatment_Recirc_States HD_PRE_TREATMENT_RECIRC_STATE_T;
 
 /**@}*/
@@ -331,7 +332,7 @@
     PRE_TREATMENT_PAT_CONN_WAIT_FOR_TREATMENT_START_STATE,          ///< Pre-treatment patient connect wait for treatment start state
     NUM_OF_PRE_TREATMENT_PAT_CONN_STATES                            ///< Number of pre-treatment patient connect states
 };
-///< Type for HD pre-treatment recirculate sub-mode states enumeration
+/// Type for HD pre-treatment patient connect sub-mode states enumeration
 typedef enum HD_Pre_Treatment_Pat_Conn_States HD_PRE_TREATMENT_PAT_CONN_STATE_T;
 
 /**@}*/
@@ -696,7 +697,7 @@
 typedef enum HD_Pumps HD_PUMP_T;                                        ///< Type for HD pump enumeration
 
 /**
- *  @addtogroup HDTreatmentLog
+ *  @addtogroup HDTreatmentMode
  *  @{
  */
 
@@ -763,6 +764,10 @@
     HD_EVENT_RSRVR_UF_VOLUME_AND_TIME,                                  ///< HD ultrafiltration volume and time for a reservoir use
     HD_EVENT_RSRVR_UF_RATE,                                             ///< HD ultrafiltration measured and expected rates
     HD_EVENT_OPERATION_STATUS,                                          ///< HD aggregated opmode, submode, and substate event.
+    HD_EVENT_AIR_TRAP_FILL,                                             ///< HD initiated an air trap fill (opened VBT briefly).
+    HD_EVENT_AIR_PUMP_ON_OFF,                                           ///< HD turned air pump on or off.
+    HD_EVENT_BLOOD_LEAK_SELF_TEST_RESULT,                               ///< HD blood leak self tests result.
+    HD_EVENT_BLOOD_LEAK_NUM_OF_SET_POINT_CHECK_FAILURES,                ///< HD blood leak number of set point check failures
     NUM_OF_EVENT_IDS                                                    ///< Total number of HD events
 };
 typedef enum HD_Event_List HD_EVENT_ID_T;                               ///< Type for HD event list enumeration
@@ -781,7 +786,7 @@
 /**@}*/
 
 /**
- *  @addtogroup UIUserConfirm
+ *  @addtogroup HDOperationModes
  *  @{
  */