Index: TDDefs.h
===================================================================
diff -u -r3b70414bfb8e8cc3a5648305b3f09ca740c1cb60 -r1ebd6f2a4f4b1c9d3edd0727422495b471c9429f
--- TDDefs.h	(.../TDDefs.h)	(revision 3b70414bfb8e8cc3a5648305b3f09ca740c1cb60)
+++ TDDefs.h	(.../TDDefs.h)	(revision 1ebd6f2a4f4b1c9d3edd0727422495b471c9429f)
@@ -8,7 +8,7 @@
 * @file    TDDefs.h
 *
 * @author  (last)      Praneeth Bunne
-* @date    (last)      04-Jun-2026
+* @date    (last)      26-Jun-2026
 *
 * @author  (original)  Sean Nash
 * @date    (original)  01-Aug-2024
@@ -137,14 +137,12 @@
 /// Enumeration of pre-treatment mode states (sub-mode).
 enum TD_Pre_Treatment_Mode_States
 {
-    TD_PRE_TREATMENT_WATER_SAMPLE_STATE = 0,                                ///< Water sample state
-    TD_PRE_TREATMENT_SELF_TEST_CONSUMABLE_STATE,                            ///< Consumable self-tests state
-    TD_PRE_TREATMENT_SELF_TEST_NO_CART_STATE,                               ///< No cartridge self-tests state
-    TD_PRE_TREATMENT_TUBING_SET_INSTALL_STATE,                              ///< Tube set install state
+    TD_PRE_TREATMENT_TUBING_SET_INSTALL_STATE = 0,                          ///< Tube set install state
     TD_PRE_TREATMENT_SELF_TEST_DRY_STATE,                                   ///< Self-tests when the cartridge is dry state
     TD_PRE_TREATMENT_PRIME_STATE,                                           ///< Prime blood and dialysate circuits and run wet self-tests state
     TD_PRE_TREATMENT_RECIRCULATE_STATE,                                     ///< Re-circulate blood and dialysate circuits state
     TD_PRE_TREATMENT_CONFIRM_RX_STATE,                                      ///< User reviews and confirms prescription ( Confirm Rx )
+    TD_PRE_TREATMENT_HEPARIN_SETUP_STATE,                                   ///< Heparin setup state
     TD_PRE_TREATMENT_PATIENT_CONNECTION_STATE,                              ///< Patient connection state
     NUM_OF_TD_PRE_TREATMENT_STATES                                          ///< Number of pre-treatment mode states
 };
@@ -412,8 +410,7 @@
 {
     FLUID_BOLUS_IDLE_STATE = 0,                        ///< No fluid bolus delivery is in progress
     FLUID_BOLUS_WAIT_FOR_PUMPS_STOP_STATE,             ///< Wait for pumps to stop before starting bolus
-    FLUID_BOLUS_SALINE_IN_PROGRESS_STATE,              ///< A saline bolus delivery is in progress
-    FLUID_BOLUS_SUBSITUTE_IN_PROGRESS_STATE,           ///< A substitute bolus delivery is in progress
+    FLUID_BOLUS_IN_PROGRESS_STATE,                     ///< A fluid bolus delivery is in progress
     NUM_OF_FLUID_BOLUS_STATES                          ///< Number of fluid bolus states
 };
 typedef enum Fluid_Bolus_States FLUID_BOLUS_STATE_T;   ///< Type for fluid bolus state enumeration
@@ -684,8 +681,8 @@
 enum System_Config_Treatment_Params
 {
     TREATMENT_PARAM_ART_PRES_LIMIT_WINDOW = 0,                          ///< Arterial pressure alarm limit window (in mmHg)
-    TREATMENT_PARAM_VEN_PRES_LIMIT_WINDOW,                              ///< Venous pressure alarm limit window (in mmHg)
-    TREATMENT_PARAM_VEN_PRES_LIMIT_ASYMMETRIC,                          ///< Venous pressure alarm limit asymmetric (in mmHg)
+    TREATMENT_PARAM_VEN_PRES_HIGH_LIMIT_WINDOW,                         ///< Venous high pressure alarm limit window (in mmHg)
+    TREATMENT_PARAM_VEN_PRES_LOW_LIMIT_WINDOW,                          ///< Venous low pressure alarm limit asymmetric window (in mmHg)
     TREATMENT_PARAM_TMP_PRES_LIMIT_WINDOW,                              ///< TMP pressure alarm limit window (in mmHg)
     TREATMENT_PARAM_RINSEBACK_FLOW_RATE,                                ///< Rinseback flow rate (in mL/min)
     TREATMENT_PARAM_PRIME_DISCARD_VOLUME,                               ///< Prime discard volume (in mL)
@@ -701,8 +698,9 @@
 /// Enumeration of treatment modality type
 enum Treatment_Modality_Types
 {
-    TREATMENT_MODALITY_HD = 0,                                          ///< Treatment modality Hemodialysis
-    TREATMENT_MODALITY_HDF,                                             ///< Treatment modality Hemodiafiltration
+    TREATMENT_MODALITY_HD_SALINE_FLUID = 0,                             ///< Treatment modality Hemodialysis with saline fluid
+    TREATMENT_MODALITY_HDF_ONLINE_FLUID,                                ///< Treatment modality Hemodiafiltration online fluid
+    TREATMENT_MODALITY_HD_ONLINE_FLUID,                                 ///< Treatment modality Hemodialysis with online fluid
 //    TREATMENT_MODALITY_ISOLATED_UF,                                     ///< Treatment modality Isolated UF  // TODO uncomment in phase 3 when ISO UF feature is required
     NUM_OF_TREATMENT_MODALITY_TYPES                                     ///< Total number of treatment modality types
 };
@@ -880,6 +878,28 @@
 };
 typedef enum Confirmation_Status CONFIRMATION_REQUEST_STATUS_T;
 
+///< Enumeration of tube set types.
+enum Tube_Set_Types
+{
+    TUBE_SET_TYPE_UNKNOWN = 0,                                          ///< Unknown tube set type
+    TUBE_SET_TYPE_HD,                                                   ///< HD tubing set
+    TUBE_SET_TYPE_HDF,                                                  ///< HDF tubing set
+    NUM_OF_TUBE_SET_TYPES                                               ///< Number of tube set types
+};
+///< Type for tube set types enumeration
+typedef enum Tube_Set_Types TUBE_SET_TYPE_T;
+
+///< Enumeration of fluid types
+enum Fluid_Types
+{
+    FLUID_TYPE_UNKNOWN = 0,                                             ///< Unknown fluid type
+    FLUID_TYPE_SALINE,                                                  ///< Saline fluid type
+    FLUID_TYPE_SUBSTITUTE,                                              ///< Substitution fluid type
+    NUM_OF_FLUID_TYPES
+};
+///< Type for fluid types enumeration
+typedef enum Fluid_Types FLUID_TYPE_T;
+
 /**@}*/
 
 #endif