Index: TDDefs.h
===================================================================
diff -u -rda175684273b1709b2ea70334cb7af7c3698d558 -rcb3c2c24f170876cae0d874daff5c0d10443e3d7
--- TDDefs.h	(.../TDDefs.h)	(revision da175684273b1709b2ea70334cb7af7c3698d558)
+++ TDDefs.h	(.../TDDefs.h)	(revision cb3c2c24f170876cae0d874daff5c0d10443e3d7)
@@ -618,12 +618,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 +635,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 +651,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 +674,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
+
 /**@}*/
 
 /**