Index: leahi_dialin/td/modules/treatment.py
===================================================================
diff -u -r8c823851a48f72a6ac2a26cc691063d214288231 -r08bfaacc0c7423ae525995a7e9152f36c65596b3
--- leahi_dialin/td/modules/treatment.py	(.../treatment.py)	(revision 8c823851a48f72a6ac2a26cc691063d214288231)
+++ leahi_dialin/td/modules/treatment.py	(.../treatment.py)	(revision 08bfaacc0c7423ae525995a7e9152f36c65596b3)
@@ -27,7 +27,6 @@
 @unique
 class TDTreatmentParameters(DialinEnum):
     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 = 1                                      # Dialysate flow rate (in mL/min)
     TREATMENT_PARAM_TREATMENT_DURATION = 2                                  # Treatment duration (in minutes)
     TREATMENT_PARAM_SALINE_BOLUS_VOLUME = 3                                 # Saline bolus volume (in mL)
@@ -39,15 +38,11 @@
     TREATMENT_PARAM_BP_MEAS_INTERVAL = 9                                    # Blood pressure measurement interval (in minutes)
     TREATMENT_PARAM_RINSEBACK_FLOW_RATE = 10                                # Rinseback flow rate (in mL/min)
     TREATMENT_PARAM_RINSEBACK_VOLUME = 11                                   # Rinseback volume (in mL)
-    TREATMENT_PARAM_LAST_UINT = TREATMENT_PARAM_RINSEBACK_VOLUME            # Last unsigned integer treatment parameter
     TREATMENT_PARAM_ART_PRES_LIMIT_WINDOW = 12                              # 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 = 13                              # Venous pressure alarm limit window (in mmHg)
     TREATMENT_PARAM_VEN_PRES_LIMIT_ASYMMETRIC = 14                          # Venous pressure alarm limit asymmetric (in mmHg)
     TREATMENT_PARAM_TMP_PRES_LIMIT_WINDOW = 15                              # TMP alarm limit window (in mmHg)
-    TREATMENT_PARAM_LAST_INT = TREATMENT_PARAM_TMP_PRES_LIMIT_WINDOW        # Last integer treatment parameter
     TREATMENT_PARAM_DIALYSATE_TEMPERATURE = 16                              # Dialysate temperature (in degC)
-    TREATMENT_PARAM_FIRST_F32 = TREATMENT_PARAM_DIALYSATE_TEMPERATURE       # First floating point treatment parameter
     TREATMENT_PARAM_HEPARIN_DISPENSE_RATE = 17                              # Heparin dispense rate (in mL/hr)
     TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME = 18                               # Heparin bolus volume (in mL)
     TREATMENT_PARAM_UF_VOLUME = 19                                          # Ultrafiltration volume (in liters) - provided separately by UI
@@ -335,10 +330,10 @@
         """
         idx = integer_to_bytearray(tx_param_id)
 
-        if tx_param_id <= TDTreatmentParameters.TREATMENT_PARAM_LAST_UINT.value:
+        if tx_param_id <= TDTreatmentParameters.TREATMENT_PARAM_RINSEBACK_VOLUME.value:
             tpv = integer_to_bytearray(tx_param_value)
 
-        elif tx_param_id >= TDTreatmentParameters.TREATMENT_PARAM_FIRST_F32.value:
+        elif tx_param_id >= TDTreatmentParameters.TREATMENT_PARAM_DIALYSATE_TEMPERATURE.value:
             tpv = float_to_bytearray(tx_param_value)
 
         else: