Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -r2f68e3a96bb03d12141a84f1da6df83e66fed72d -r5a6f0b9a41702cf284db0a356261da21f06c0bfc
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 2f68e3a96bb03d12141a84f1da6df83e66fed72d)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 5a6f0b9a41702cf284db0a356261da21f06c0bfc)
@@ -1028,22 +1028,24 @@
 
         // Always adjust UF volume to accommodate treatment time change (not UF rate)
         uFVolume = ( (F32)( treatmentTime - CALC_ELAPSED_TREAT_TIME_IN_MIN() ) * presUFRate ) + getUltrafiltrationReferenceVolume();
-        if ( ( treatmentTime <= MAX_TREATMENT_TIME_MINUTES ) &&
+        if ( ( treatmentTime >= getU32TreatmentParamLowerRangeLimit( TREATMENT_PARAM_TREATMENT_DURATION ) ) &&
+             ( treatmentTime <= getU32TreatmentParamUpperRangeLimit( TREATMENT_PARAM_TREATMENT_DURATION ) ) &&
              ( dialVolume <= MAX_DIALYSATE_VOLUME_ML ) &&
              ( uFVolume <= MAX_UF_VOLUME_ML ) )
         {
             result = TRUE;
             sendTreatmentLogEventData( TREATMENT_DURATION_CHANGE_EVENT, ( presTreatmentTimeSecs / SEC_PER_MIN ), treatmentTime );
             presMaxUFVolumeML = uFVolume;
             presTreatmentTimeSecs = treatmentTime * SEC_PER_MIN;
-            setTreatmentParameterF32( TREATMENT_PARAM_UF_VOLUME, ( presMaxUFVolumeML / (F32)ML_PER_LITER ) );
-            setTreatmentParameterU32( TREATMENT_PARAM_TREATMENT_DURATION, ( presTreatmentTimeSecs / SEC_PER_MIN ) );
+            result &= setTreatmentParameterF32( TREATMENT_PARAM_UF_VOLUME, ( presMaxUFVolumeML / (F32)ML_PER_LITER ) );
+            result &= setTreatmentParameterU32( TREATMENT_PARAM_TREATMENT_DURATION, ( presTreatmentTimeSecs / SEC_PER_MIN ) );
             setDialysisDialInFlowAndUFRate( getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW ), presMaxUFVolumeML, presUFRate );
             signalInitiatePressureStabilization( USE_NORMAL_STABILIZATION_PERIOD );
         }
         else
         {
-            if ( treatmentTime > MAX_TREATMENT_TIME_MINUTES )
+            if ( ( treatmentTime < getU32TreatmentParamLowerRangeLimit( TREATMENT_PARAM_TREATMENT_DURATION ) ) ||
+                 ( treatmentTime > getU32TreatmentParamUpperRangeLimit( TREATMENT_PARAM_TREATMENT_DURATION ) ) )
             {
                 rejectReason = REQUEST_REJECT_REASON_TREATMENT_TIME_OUT_OF_RANGE;
             }
@@ -1117,7 +1119,9 @@
     // Check if we are in an appropriate treatment state for settings adjustment
     if ( ( MODE_TREA == currMode ) &&
          ( currentTreatmentState > TREATMENT_START_STATE ) && ( currentTreatmentState < TREATMENT_END_STATE ) &&
-         ( uFVolume <= MAX_UF_VOLUME_ML ) && ( uFVolume > colUFVol ) &&
+         ( uFVolume >= ( getF32TreatmentParamLowerRangeLimit( TREATMENT_PARAM_UF_VOLUME ) * ML_PER_LITER ) ) &&
+         ( uFVolume <= ( getF32TreatmentParamUpperRangeLimit( TREATMENT_PARAM_UF_VOLUME ) * ML_PER_LITER ) ) &&
+         ( uFVolume > colUFVol ) &&
          ( CALC_TREAT_TIME_REMAINING_IN_SECS() >= PREVENT_UF_VOL_CHANGE_IF_NEARLY_DONE_SEC ) )
     {
         DIALYSIS_STATE_T currDialysisState = getDialysisState();
@@ -1170,7 +1174,7 @@
             rejectReason = REQUEST_REJECT_REASON_INVALID_TREATMENT_STATE;
         }
         // UF volume cannot be set lower than the UF volume that has already been collected
-        else if ( ( uFVolume > MAX_UF_VOLUME_ML ) ||
+        else if ( ( uFVolume > ( getF32TreatmentParamUpperRangeLimit( TREATMENT_PARAM_UF_VOLUME ) * ML_PER_LITER ) ) ||
                   ( uFVolume <= colUFVol ) )
         {
             rejectReason = REQUEST_REJECT_REASON_UF_VOLUME_OUT_OF_RANGE;
@@ -1211,9 +1215,8 @@
         UF_STATE_T currUFState = getUltrafiltrationState();
 
         sendTreatmentLogEventData( UF_VOLUME_CHANGE_EVENT, presMaxUFVolumeML, pendingUFVolumeChange );
-        result = TRUE;
         presMaxUFVolumeML = pendingUFVolumeChange;
-        setTreatmentParameterF32( TREATMENT_PARAM_UF_VOLUME, ( presMaxUFVolumeML / (F32)ML_PER_LITER ) );
+        result = setTreatmentParameterF32( TREATMENT_PARAM_UF_VOLUME, ( presMaxUFVolumeML / (F32)ML_PER_LITER ) );
 
         // User should only allow UF rate adjustment to achieve UF volume change
         if ( UF_ADJ_UF_RATE == adjustment )
@@ -1276,8 +1279,10 @@
         U32 dialVolume = dialRate * ( (U32)( (F32)presTreatmentTimeSecs / (F32)SEC_PER_MIN ) + 1 );   // In mL
 
         // Validate new rates
-        if ( ( bloodRate >= MIN_SET_BLOOD_FLOW_RATE ) && ( bloodRate <= MAX_SET_BLOOD_FLOW_RATE ) &&
-             ( dialRate >= MIN_DIAL_IN_FLOW_RATE ) && ( dialRate <= MAX_DIAL_IN_FLOW_RATE ) &&
+        if ( ( bloodRate >= getU32TreatmentParamLowerRangeLimit( TREATMENT_PARAM_BLOOD_FLOW ) ) &&
+             ( bloodRate <= getU32TreatmentParamUpperRangeLimit( TREATMENT_PARAM_BLOOD_FLOW ) ) &&
+             ( dialRate >= getU32TreatmentParamLowerRangeLimit( TREATMENT_PARAM_DIALYSATE_FLOW ) ) &&
+             ( dialRate <= getU32TreatmentParamUpperRangeLimit( TREATMENT_PARAM_DIALYSATE_FLOW ) ) &&
              ( dialVolume <= MAX_DIALYSATE_VOLUME_ML ) )
         {
             result = TRUE;
@@ -1287,7 +1292,7 @@
                 sendTreatmentLogEventData( BLOOD_FLOW_RATE_CHANGE_EVENT, getTreatmentParameterU32( TREATMENT_PARAM_BLOOD_FLOW ), bloodRate );
                 signalInitiatePressureStabilization( USE_NORMAL_STABILIZATION_PERIOD );
                 // Set to new rate
-                setTreatmentParameterU32( TREATMENT_PARAM_BLOOD_FLOW, bloodRate );
+                result &= setTreatmentParameterU32( TREATMENT_PARAM_BLOOD_FLOW, bloodRate );
                 setDialysisBloodPumpFlowRate( getTreatmentParameterU32( TREATMENT_PARAM_BLOOD_FLOW ) );
             }
 
@@ -1297,17 +1302,19 @@
                 sendTreatmentLogEventData( DIALYSATE_FLOW_RATE_CHANGE_EVENT, getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW ), dialRate );
                 signalInitiatePressureStabilization( USE_NORMAL_STABILIZATION_PERIOD );
                 // Set to new rate
-                setTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW, dialRate );
+                result &= setTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW, dialRate );
                 setDialysisDialInFlowAndUFRate( getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW ), presMaxUFVolumeML, presUFRate );
             }
         }
         else
         {
-            if ( ( bloodRate < MIN_SET_BLOOD_FLOW_RATE ) || ( bloodRate > MAX_SET_BLOOD_FLOW_RATE ) )
+            if ( ( bloodRate < getU32TreatmentParamLowerRangeLimit( TREATMENT_PARAM_BLOOD_FLOW ) ) ||
+                 ( bloodRate > getU32TreatmentParamUpperRangeLimit( TREATMENT_PARAM_BLOOD_FLOW ) ) )
             {
                 rejectReason = REQUEST_REJECT_REASON_BLOOD_FLOW_OUT_OF_RANGE;
             }
-            else if ( ( dialRate < MIN_DIAL_IN_FLOW_RATE ) || ( dialRate > MAX_DIAL_IN_FLOW_RATE ) )
+            else if ( ( dialRate < getU32TreatmentParamLowerRangeLimit( TREATMENT_PARAM_DIALYSATE_FLOW ) ) ||
+                      ( dialRate > getU32TreatmentParamUpperRangeLimit( TREATMENT_PARAM_DIALYSATE_FLOW ) ) )
             {
                 rejectReason = REQUEST_REJECT_REASON_DIAL_FLOW_OUT_OF_RANGE;
             }