Index: firmware/App/Modes/Prime.c
===================================================================
diff -u -r874d279bf969199988c7ab6ca2891eec6a6c1bb0 -r556668d4ef26ad4afbc438cc28d397a898459084
--- firmware/App/Modes/Prime.c	(.../Prime.c)	(revision 874d279bf969199988c7ab6ca2891eec6a6c1bb0)
+++ firmware/App/Modes/Prime.c	(.../Prime.c)	(revision 556668d4ef26ad4afbc438cc28d397a898459084)
@@ -7,8 +7,8 @@
 *
 * @file    Prime.c
 *
-* @author  (last)      Michael Garthwaite
-* @date    (last)      14-Jun-2023
+* @author  (last)      Sean Nash
+* @date    (last)      10-Jul-2023
 *
 * @author  (original)  Quang Nguyen
 * @date    (original)  08-Dec-2020
@@ -57,12 +57,12 @@
 
 #define NO_AIR_DETECTED_COUNT                               ( 40 * MS_PER_SECOND )                             ///< No air detected time period count.
 #define PURGE_AIR_TIME_OUT_COUNT                            ( 240 * MS_PER_SECOND )                            ///< Time period count for purge air time out.
-#define PRIME_SALINE_DIALYZER_TIME_OUT_COUNT                ( 60 * MS_PER_SECOND )                             ///< Time period count for prime saline dialyzer time out.
 #define LOAD_CELL_STEADY_VOLUME_SAMPLING_TIME               (  1 * MS_PER_SECOND )                             ///< Time load cell reading steady state detection sampling time in seconds.
 #define PRIME_DIALYSATE_BYPASS_TIME_LIMIT                   ( 8 * MS_PER_SECOND )                              ///< Time limit for priming dialysate bypass circuit.
 #define STEADY_VOLUME_COUNT_SEC                             ( 10000 / LOAD_CELL_STEADY_VOLUME_SAMPLING_TIME )  ///< Counter must be greater than 10 seconds before steady volume is true.
-#define STEADY_VOLUME_DIALYSATE_PRIME_TIME_LIMIT_MS         ( 55 * MS_PER_SECOND )                             ///< Time in msec for the reservoir volume to stabilize during dialysate prime state.
+#define STEADY_VOLUME_DIALYSATE_PRIME_TIME_LIMIT_MS         ( 90 * MS_PER_SECOND )                             ///< Time in msec for the reservoir volume to stabilize during dialysate prime state.
 #define STEADY_VOLUME_BYPASS_PRIME_TIME_LIMIT_MS            ( 62 * MS_PER_SECOND )                             ///< Time in msec for the reservoir volume to stabilize during bypass dialysate prime state.
+#define STEADY_VOLUME_DIALYSATE_PRIME_HISTERESIS_ML         ( 0.3F )                                           ///< mL of histeresis for the steady state check that determines when bypass line is primed.
 #define STEADY_VOLUME_BYPASS_PRIME_HISTERESIS_ML            ( 0.3F )                                           ///< mL of histeresis for the steady state check that determines when bypass line is primed.
 
 #define VENOUS_PRESSURE_BUBBLE_CLEAR_MAX_MMHG               ( 200.0F )                                         ///< Maximum venous pressure reading (in mmHg) for bubble clear.
@@ -550,7 +550,7 @@
 
 /*********************************************************************//**
  * @brief
- * The handlePrimeSalineSetupState function checks user's request to start
+ * The handlePrimeWaitForUserStartState function checks user's request to start
  * priming.
  * @details Inputs: primeStartReqReceived
  * @details Outputs: control valves to purge air
@@ -562,6 +562,8 @@
 
     // Keep updating start time until the user requested priming
     primeStartTime = getMSTimerCount();
+    signalAllowDGFillRes1();
+    signalAllowDGFillRes2();
 
 #ifndef _RELEASE_
     if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_INTERACTION ) )
@@ -605,6 +607,7 @@
     purgeAirValvesBloodPumpControl();
     purgeAirTimeOutStartTime = getMSTimerCount();
     primeSalineDialyzerBubbleClearStartTime = getMSTimerCount();
+
     if ( getTestConfigStatus( TEST_CONFIG_USE_WET_CARTRIDGE ) != TRUE )
     {
         primeDialyzerBubbleClearState = PRIME_BUBBLE_CLEAR_READY_STATE;
@@ -764,8 +767,10 @@
  * @brief
  * The handlePrimeDialysateDialyzerState function handles priming for
  * dialysate dialyzer fluid path.
- * @details Inputs: reservoir 1 filtered weight
- * @details Outputs: primed dialysate dialyzer fluid path
+ * @details Inputs: reservoir 1 filtered weight, minimumReservoirVolume,
+ * steadyVolumeCount
+ * @details Outputs: primed dialysate dialyzer fluid path, minimumReservoirVolume,
+ * steadyVolumeCount
  * @return current state
  *************************************************************************/
 static HD_PRE_TREATMENT_PRIME_STATE_T handlePrimeDialysateDialyzerState( void )
@@ -779,7 +784,7 @@
         {
             F32 const currentReservoirVolume = getLoadCellWeight( LOAD_CELL_RESERVOIR_1_PRIMARY );
 
-            if ( currentReservoirVolume >= minimumReservoirVolume )
+            if ( currentReservoirVolume >= ( minimumReservoirVolume - STEADY_VOLUME_DIALYSATE_PRIME_HISTERESIS_ML ) )
             {
                 if ( ++steadyVolumeCount >= STEADY_VOLUME_COUNT_SEC )
                 {
@@ -788,9 +793,12 @@
             }
             else
             {
-                minimumReservoirVolume = currentReservoirVolume;
                 steadyVolumeCount = 0; // required 10 seconds continuous steady volume to transition to next state
             }
+            if ( currentReservoirVolume < minimumReservoirVolume )
+            {
+                minimumReservoirVolume = currentReservoirVolume;
+            }
 
             steadyVolumeSamplingStartTime = getMSTimerCount();       // re-armed the timer for the next dVolume/dt check
         }
@@ -866,11 +874,6 @@
     {
         state = HD_PRIME_RESERVOIR_TWO_FILL_COMPLETE_STATE;
     }
-    // TODO: Rework alarm and timeout logic here. PRIME_SALINE_DIALYZER_TIME_OUT_COUNT may not be reached.
-    if ( TRUE == didTimeout( primeSalineDialyzerStartTime, PRIME_SALINE_DIALYZER_TIME_OUT_COUNT ) )
-    {
-        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_PRIME_SALINE_DIALYZER_TIME_OUT, PRIME_SALINE_DIALYZER_TIME_OUT_COUNT );  // Trigger HD prime saline dialyzer time out alarm.
-    }
 
     if ( TRUE == doesAlarmStatusIndicateStop() )
     {