Index: TDDefs.h
===================================================================
diff -u -r622c6745b1adaeff233e57a3779757b12d60b08c -r0c69056085d4fbbfc3c42652cc68656c97cf4d34
--- TDDefs.h	(.../TDDefs.h)	(revision 622c6745b1adaeff233e57a3779757b12d60b08c)
+++ TDDefs.h	(.../TDDefs.h)	(revision 0c69056085d4fbbfc3c42652cc68656c97cf4d34)
@@ -595,35 +595,60 @@
 /// Enumeration of treatment parameters.
 enum Treatment_Params
 {
-    TREATMENT_PARAM_BLOOD_FLOW = 0,                                     ///< Blood flow rate (in mL/min)
-    TREATMENT_PARAM_FIRST_UINT = TREATMENT_PARAM_BLOOD_FLOW,            ///< First unsigned integer treatment parameter
+    TREATMENT_PARAM_TREATMENT_MODALITY = 0,                             ///< Treatment modality type (enum)
+    TREATMENT_PARAM_FIRST_UINT = TREATMENT_PARAM_TREATMENT_MODALITY,    ///< First unsigned integer treatment parameter
+    TREATMENT_PARAM_HDF_TREATMENT_MODE,                                 ///< HDF treatment mode (enum)
+    TREATMENT_PARAM_BLOOD_FLOW,                                         ///< Blood flow rate (in mL/min)
     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_DELIVERY_DURATION,                          ///< Heparin delivery duration (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_DRY_BICARB_CART,                                    ///< Dry bicarb cartrideg size (enum)
+    TREATMENT_PARAM_SODIUM,                                             ///< Sodium concentrate (mEq/L)
+    TREATMENT_PARAM_BICARBONATE,                                        ///< Bicarbonate concentrate (mEq/L)
     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_RINSEBACK_VOLUME,                                   ///< Rinseback volume (in mL)
-    TREATMENT_PARAM_LAST_UINT = TREATMENT_PARAM_RINSEBACK_VOLUME,       ///< Last unsigned integer treatment parameter
+    TREATMENT_PARAM_FLUID_BOLUS_VOLUME,                                 ///< Fluid bolus volume (in mL)
     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)
     TREATMENT_PARAM_VEN_PRES_LIMIT_ASYMMETRIC,                          ///< Venous pressure alarm limit asymmetric (in mmHg)
     TREATMENT_PARAM_TMP_PRES_LIMIT_WINDOW,                              ///< TMP alarm limit window (in mmHg)
-    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_BP_MEAS_INTERVAL,                                   ///< Blood pressure measurement interval (in minutes)
+    TREATMENT_PARAM_PRIME_DISCARD_VOLUME,                               ///< Prime discard volume (in mL)
+    TREATMENT_PARAM_RINSEBACK_VOLUME,                                   ///< Prime rinseback volume (in mL)
+    TREATMENT_PARAM_RINSEBACK_FLOW_RATE,                                ///< Rinseback flow rate (in mL/min)
+    TREATMENT_PARAM_HEPATITIS_B,                                        ///< Hepatitis B status (enum)
+    TREATMENT_PARAM_SYSTOLIC_BP_LOW_ALARM_LIMIT,                        ///< Systolic BP low alarm limit (in mmHg)
+    TREATMENT_PARAM_SYSTOLIC_BP_HIGH_ALARM_LIMIT,                       ///< Systolic BP high alarm limit (in mmHg)
+    TREATMENT_PARAM_HEART_RATE_LOW_ALARM_LIMIT,                         ///< Heart rate low alarm limit (BPM)
+    TREATMENT_PARAM_HEART_RATE_HIGH_ALARM_LIMIT,                        ///< Heart rate high alarm limit (in mmHg)
+    TREATMENT_PARAM_PRES_ALARM_PERSISTENCE,                             ///< Pressure alarms persistence (seconds)
+    TREATMENT_PARAM_LAST_UINT = TREATMENT_PARAM_PRES_ALARM_PERSISTENCE, ///< Last unsigned integer treatment parameter
+    TREATMENT_PARAM_ACID_CONCENTRATE,                                   ///< TODO remove after handling the states where these are used
+    TREATMENT_PARAM_BICARB_CONCENTRATE,
+    TREATMENT_PARAM_FIRST_INT,
+    TREATMENT_PARAM_LAST_INT,
+    TREATMENT_PARAM_SUBST_FLUID_VOLUME,                                 ///< Substitution fluid volume (in liters)
+    TREATMENT_PARAM_FIRST_F32 = TREATMENT_PARAM_SUBST_FLUID_VOLUME,     ///< First floating point treatment parameter
     TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME,                               ///< Heparin bolus volume (in mL)
+    TREATMENT_PARAM_HEPARIN_DISPENSE_RATE,                              ///< Heparin dispense rate (in mL/hr)
+    TREATMENT_PARAM_DIALYSATE_TEMPERATURE,                              ///< Dialysate temperature (in degC)
+    TREATMENT_PARAM_ACID_K_PLUS,                                        ///< Acid concentration for Potassium (K+) (mEq/L)
+    TREATMENT_PARAM_ACID_CA2_PLUS,                                      ///< Acid concentration for Calcium (Ca2+) (mEq/L)
     TREATMENT_PARAM_UF_VOLUME,                                          ///< Ultrafiltration volume (in liters) - provided separately by UI
     NUM_OF_TREATMENT_PARAMS                                             ///< Total number of treatment parameters
 };
 typedef enum Treatment_Params TREATMENT_PARAM_T;                        ///< Type for treatment parameters enumeration
 
+/// Enumeration of Treatment Modality type
+enum Treatment_Modality_Types
+{
+    TREATMENT_MODALITY_HD = 0,                                          ///< Treatment modality Hemodialysis
+    TREATMENT_MODALITY_HDF,                                             ///< Treatment modality Hemodiafiltration
+    TREATMENT_MODALITY_ISOLATED_UF,                                     ///< Treatment modality Isolated UF
+    NUM_OF_TREATMENT_MODALITY_TYPES                                     ///< Total number of treatment modality types
+};
+typedef enum Treatment_Modality_Types TREATMENT_TYPE_T;
+
 /// Enumeration of dialyzer types.
 enum Dialyzer_Types
 {