Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -r68115981be5fff762a3ef52340f69c28d5d3a5c4 -r67697eb4ca0296ad472b19b4534bea0aea1e759a
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 68115981be5fff762a3ef52340f69c28d5d3a5c4)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 67697eb4ca0296ad472b19b4534bea0aea1e759a)
@@ -7,8 +7,8 @@
 *
 * @file    ModeTreatment.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      24-Jul-2023
+* @author  (last)      Sean Nash
+* @date    (last)      30-Sep-2023
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -89,6 +89,7 @@
 static U32 treatmentTimeBroadcastTimerCtr;                      ///< Treatment time data broadcast timer counter used to schedule when to transmit data.
 static U32 treatmentStateBroadcastTimerCtr;                     ///< Treatment state data broadcast timer counter used to schedule when to transmit data.
 static U32 treatmentParamsRangesBroadcastTimerCtr;              ///< Treatment parameter ranges broadcast timer counter used to schedule when to transmit updated ranges.
+
 /// Interval (in task intervals) at which to publish alarm status to CAN bus.
 static OVERRIDE_U32_T treatmentTimePublishInterval = { TREATMENT_TIME_DATA_PUB_INTERVAL, TREATMENT_TIME_DATA_PUB_INTERVAL, TREATMENT_TIME_DATA_PUB_INTERVAL, 0 };
 /// Interval (in task intervals) at which to publish alarm status to CAN bus.
@@ -790,7 +791,6 @@
         // Handle alarm stoppage
         if ( TRUE == doesAlarmStatusIndicateStop() )
         {
-            stopDialysis();
             transitionToTreatmentStop();
             result = TREATMENT_STOP_STATE;
         }
@@ -816,6 +816,10 @@
     if ( TRUE == resumeTreatmentAlarmResponseRequest )
     {
         resumeTreatmentAlarmResponseRequest = FALSE;
+        // Hard stop the pumps so they will ramp up from zero together on resume
+        signalDialInPumpHardStop();
+        signalDialOutPumpHardStop();
+
         if ( TRUE == getBloodIsPrimed() )
         {
             lastTreatmentTimeStamp = getMSTimerCount();
@@ -827,7 +831,7 @@
             transitionToBloodPrime();
             result = TREATMENT_BLOOD_PRIME_STATE;
         }
-        signalInitiatePressureStabilization();
+        signalInitiatePressureStabilization( USE_NORMAL_STABILIZATION_PERIOD );
     }
     // If user requests rinseback, go to rinseback
     else if ( TRUE == initiateRinsebackAlarmResponseRequest )
@@ -976,11 +980,7 @@
     {
         signalTreatmentEndAlarmEndTxUserAction();
     }
-    // Handle alarm response from user to resume slow blood flow while waiting for rinseback request
-    else if ( TRUE == resumeTreatmentAlarmResponseRequest )
-    {
-        signalTreatmentEndAlarmResumeUserAction();
-    }
+    // End treatment state does not allow resume
 
     // Execute treatment end sub-mode
     execTreatmentEnd();
@@ -1035,6 +1035,7 @@
             setTreatmentParameterF32( TREATMENT_PARAM_UF_VOLUME, ( presMaxUFVolumeML / (F32)ML_PER_LITER ) );
             setTreatmentParameterU32( TREATMENT_PARAM_TREATMENT_DURATION, ( presTreatmentTimeSecs / SEC_PER_MIN ) );
             setDialysisParams( getTreatmentParameterU32( TREATMENT_PARAM_BLOOD_FLOW ), getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW ), presMaxUFVolumeML, presUFRate );
+            signalInitiatePressureStabilization( USE_NORMAL_STABILIZATION_PERIOD );
         }
         else
         {
@@ -1090,7 +1091,7 @@
  * @details Inputs: current operating mode, treatment states and parameters
  * @details Outputs: response message sent
  * @param uFVolume New ultrafiltration volume requested by the user
- * @return TRUE if new UF voluem is valid, FALSE if not.
+ * @return TRUE if new UF volume is valid, FALSE if not.
  *************************************************************************/
 BOOL verifyUFSettingsChange( F32 uFVolume )
 {
@@ -1102,6 +1103,7 @@
     S32 txSecRem = CALC_TREAT_TIME_REMAINING_IN_SECS();
     S32 txMinEla = CALC_ELAPSED_TREAT_TIME_IN_SECS() / SEC_PER_MIN;
     F32 txMinRem = (F32)txSecRem / (F32)SEC_PER_MIN;
+    F32 colUFVol = getUltrafiltrationReferenceVolume();                                          // How much UF volume have we taken so far?
 
     // Reset pending UF/time settings changes to current values in case request is rejected
     pendingUFVolumeChange = presMaxUFVolumeML;
@@ -1111,12 +1113,11 @@
     // 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 <= MAX_UF_VOLUME_ML ) && ( uFVolume > colUFVol ) &&
          ( CALC_TREAT_TIME_REMAINING_IN_SECS() >= PREVENT_UF_VOL_CHANGE_IF_NEARLY_DONE_SEC ) )
     {
         DIALYSIS_STATE_T currDialysisState = getDialysisState();
         UF_STATE_T currUFState = getUltrafiltrationState();
-        F32 colUFVol = getUltrafiltrationReferenceVolume();                                          // How much UF volume have we taken so far?
         F32 remUFVol = uFVolume - colUFVol;                                                          // What would remaining UF volume be after subtracting UF volume already taken
         F32 remUFVolCap = RANGE( remUFVol, 0.0F, (F32)MAX_UF_VOLUME_ML );                            // Enforce valid range on remaining UF volume
         F32 uFRate = remUFVolCap / txMinRem;                                                         // What UF rate would be if user selected to adjust it
@@ -1165,7 +1166,9 @@
         {
             rejectReason = REQUEST_REJECT_REASON_INVALID_TREATMENT_STATE;
         }
-        else if ( uFVolume > MAX_UF_VOLUME_ML )
+        // UF volume cannot be set lower than the UF volume that has already been collected
+        else if ( ( uFVolume > MAX_UF_VOLUME_ML ) ||
+                  ( uFVolume <= colUFVol ) )
         {
             rejectReason = REQUEST_REJECT_REASON_UF_VOLUME_OUT_OF_RANGE;
         }
@@ -1214,7 +1217,7 @@
         {
             sendTreatmentLogEventData( UF_RATE_CHANGE_EVENT, presUFRate, pendingUFRateChange );
             presUFRate = pendingUFRateChange;
-            signalInitiatePressureStabilization();
+            signalInitiatePressureStabilization( USE_NORMAL_STABILIZATION_PERIOD );
         }
         setDialysisParams( getTreatmentParameterU32( TREATMENT_PARAM_BLOOD_FLOW ), getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW ),
                            presMaxUFVolumeML, presUFRate );
@@ -1281,7 +1284,7 @@
             if ( ( bloodRate != (U32)getTreatmentParameterU32( TREATMENT_PARAM_BLOOD_FLOW ) ) ||
                  ( dialRate != (U32)getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW ) ) )
             {
-                signalInitiatePressureStabilization();
+                signalInitiatePressureStabilization( USE_NORMAL_STABILIZATION_PERIOD );
             }
             // Set to new rates
             setTreatmentParameterU32( TREATMENT_PARAM_BLOOD_FLOW, bloodRate );