Index: TDDefs.h
===================================================================
diff -u -rda175684273b1709b2ea70334cb7af7c3698d558 -ra1ab6c3189d4b8c67340f12a7b4ed8835614a473
--- TDDefs.h	(.../TDDefs.h)	(revision da175684273b1709b2ea70334cb7af7c3698d558)
+++ TDDefs.h	(.../TDDefs.h)	(revision a1ab6c3189d4b8c67340f12a7b4ed8835614a473)
@@ -1,17 +1,17 @@
 /**************************************************************************
 *
-* Copyright (c) 2024-2024 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2024-2025 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    TDDefs.h
 *
-* @author  (last)      Sean
-* @date    (last)      30-Jul-2024
+* @author  (last)      Dara Navaei
+* @date    (last)      29-Jul-2025
 *
-* @author  (original)  Sean
-* @date    (original)  30-Jul-2024
+* @author  (original)  Sean Nash
+* @date    (original)  01-Aug-2024
 *
 ***************************************************************************/
 
@@ -84,9 +84,8 @@
 /// Enumeration of fault mode states.
 enum TD_Fault_States
 {
-    TD_FAULT_STATE_START = 0,                           ///< TD fault start state
-    TD_FAULT_STATE_RUN_NV_POSTS,                        ///< TD fault run NV posts state
-    TD_FAULT_STATE_COMPLETE,                            ///< TD fault run complete state
+    TD_FAULT_ENERGIZED_STATE = 0,                       ///< Fault mode energized state.
+    TD_FAULT_DEENERGIZED_STATE,                         ///< Fault mode deenergized state.
     NUM_OF_TD_FAULT_STATES                              ///< Number of fault mode states
 };
 typedef enum TD_Fault_States TD_FAULT_STATE_T;          ///< Type for TD fault states enumeration
@@ -409,7 +408,6 @@
     SALINE_BOLUS_STATE_IDLE = 0,                        ///< No saline bolus delivery is in progress
     SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP,             ///< Wait for pumps to stop before starting bolus
     SALINE_BOLUS_STATE_IN_PROGRESS,                     ///< A saline bolus delivery is in progress
-    SALINE_BOLUS_STATE_MAX_DELIVERED,                   ///< Maximum saline bolus volume reached - no more saline bolus deliveries allowed
     NUM_OF_SALINE_BOLUS_STATES                          ///< Number of saline bolus states
 };
 typedef enum Saline_Bolus_States SALINE_BOLUS_STATE_T;  ///< Type for saline bolus state enumeration
@@ -618,12 +616,15 @@
     TREATMENT_PARAM_DIALYSATE_FLOW,                                     ///< Dialysate flow rate (in mL/min)
     TREATMENT_PARAM_TREATMENT_DURATION,                                 ///< Treatment duration (in minutes)
     TREATMENT_PARAM_SALINE_BOLUS_VOLUME,                                ///< Saline bolus volume (in mL)
+    TREATMENT_PARAM_HEPARIN_STOP_TIME,                                  ///< Heparin stop time (in minutes)
+    TREATMENT_PARAM_HEPARIN_TYPE,                                       ///< Heparin type (enum)
     TREATMENT_PARAM_ACID_CONCENTRATE,                                   ///< Acid concentrate type (enum)
     TREATMENT_PARAM_BICARB_CONCENTRATE,                                 ///< Bicarbonate concentrate type (enum)
     TREATMENT_PARAM_DIALYZER_TYPE,                                      ///< Dialysate type (enum)
     TREATMENT_PARAM_BP_MEAS_INTERVAL,                                   ///< Blood pressure measurement interval (in minutes)
     TREATMENT_PARAM_RINSEBACK_FLOW_RATE,                                ///< Rinseback flow rate (in mL/min)
-    TREATMENT_PARAM_LAST_UINT = TREATMENT_PARAM_RINSEBACK_FLOW_RATE,    ///< Last unsigned integer treatment parameter
+    TREATMENT_PARAM_RINSEBACK_VOLUME,                                   ///< Rinseback volume (in mL)
+    TREATMENT_PARAM_LAST_UINT = TREATMENT_PARAM_RINSEBACK_VOLUME,       ///< Last unsigned integer treatment parameter
     TREATMENT_PARAM_ART_PRES_LIMIT_WINDOW,                              ///< Arterial pressure alarm limit window (in mmHg)
     TREATMENT_PARAM_FIRST_INT = TREATMENT_PARAM_ART_PRES_LIMIT_WINDOW,  ///< First integer treatment parameter
     TREATMENT_PARAM_VEN_PRES_LIMIT_WINDOW,                              ///< Venous pressure alarm limit window (in mmHg)
@@ -632,6 +633,8 @@
     TREATMENT_PARAM_LAST_INT = TREATMENT_PARAM_TMP_PRES_LIMIT_WINDOW,   ///< Last integer treatment parameter
     TREATMENT_PARAM_DIALYSATE_TEMPERATURE,                              ///< Dialysate temperature (in degC)
     TREATMENT_PARAM_FIRST_F32 = TREATMENT_PARAM_DIALYSATE_TEMPERATURE,  ///< First floating point treatment parameter
+    TREATMENT_PARAM_HEPARIN_DISPENSE_RATE,                              ///< Heparin dispense rate (in mL/hr)
+    TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME,                               ///< Heparin bolus volume (in mL)
     TREATMENT_PARAM_UF_VOLUME,                                          ///< Ultrafiltration volume (in liters) - provided separately by UI
     NUM_OF_TREATMENT_PARAMS                                             ///< Total number of treatment parameters
 };
@@ -646,6 +649,7 @@
     DIALYZER_TYPE_FRESENIUS_OPTIFLUX_F160NRE,                           ///< Fresenius Optiflux F160NRe
     DIALYZER_TYPE_FRESENIUS_OPTIFLUX_F180NRE,                           ///< Fresenius Optiflux F180NRe
     DIALYZER_TYPE_FRESENIUS_OPTIFLUX_F200NRE,                           ///< Fresenius Optiflux F200NRe
+    DIALYZER_TYPE_FRESENIUS_OPTIFLUX_F250NRE,                           ///< Fresenius Optiflux F250NRe
     NUM_OF_DIALYZER_TYPES                                               ///< Number of dialyzer types
 };
 typedef enum Dialyzer_Types DIALYZER_TYPE_T;                            ///< Type for dialyzer types enumeration
@@ -668,6 +672,14 @@
 };
 typedef enum Bicarb_Concentrates BICARB_CONCENTRATE_TYPE_T;             ///< Type for bicarbonate concentrates enumeration
 
+/// Enumeration of Heparin types.
+enum Heparin_Types
+{
+    HEPARIN_TYPE_FRESENIUS_CENTRISOL = 0,                               ///< Unfractionated 1,000 IU/mL
+    NUM_OF_HEPARIN_TYPES                                                ///< Number of bicarbonate concentrates
+};
+typedef enum Heparin_Types HEPARIN_TYPE_T;                              ///< Type for Heparins enumeration
+
 /**@}*/
 
 /**