Index: TDDefs.h
===================================================================
diff -u -rf3717038f64ab1c8c0b1a01b473601d2f8680283 -r1d366a71d59d0a3084853a85820c291d6f06a975
--- TDDefs.h	(.../TDDefs.h)	(revision f3717038f64ab1c8c0b1a01b473601d2f8680283)
+++ TDDefs.h	(.../TDDefs.h)	(revision 1d366a71d59d0a3084853a85820c291d6f06a975)
@@ -604,38 +604,6 @@
  *  @{
  */
 
-///// 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_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_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)
-//    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_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
-//};
-//typedef enum Treatment_Params TREATMENT_PARAM_T;                        ///< Type for treatment parameters enumeration
-
 /// Enumeration of treatment parameters.
 enum Treatment_Params
 {
@@ -653,7 +621,6 @@
     TREATMENT_PARAM_DIALYZER_TYPE,                                      ///< Dialysate type (enum)
     TREATMENT_PARAM_FLUID_BOLUS_VOLUME,                                 ///< Fluid bolus volume (in mL)
     TREATMENT_PARAM_BP_MEAS_INTERVAL,                                   ///< Blood pressure measurement interval (in minutes)
-    TREATMENT_PARAM_PRIME_DISCARD_VOLUME,                               ///< Prime discard volume (in mL)
     TREATMENT_PARAM_PRIME_RINSEBACK_VOLUME,                             ///< Prime rinseback volume (in mL)
     TREATMENT_PARAM_HEPATITIS_B,                                        ///< Hepatitis B status (enum)
     TREATMENT_PARAM_ACID_CONCENTRATE,                                   ///< Acid concentrate type (enum)
@@ -679,6 +646,7 @@
     TREATMENT_PARAM_VEN_PRES_LIMIT_ASYMMETRIC,                          ///< Venous pressure alarm limit asymmetric (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)
     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)