Index: firmware/App/Controllers/DialInFlow.c
===================================================================
diff -u -r0a61f7fa5ff6945ebc2e507d8ecb71a652c38eaa -r52412b5ae4d6087c1363676430942360f751dd7d
--- firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 0a61f7fa5ff6945ebc2e507d8ecb71a652c38eaa)
+++ firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 52412b5ae4d6087c1363676430942360f751dd7d)
@@ -8,7 +8,7 @@
 * @file    DialInFlow.c
 *
 * @author  (last)      Sean Nash
-* @date    (last)      08-Mar-2023
+* @date    (last)      28-Mar-2023
 *
 * @author  (original)  Sean
 * @date    (original)  16-Dec-2019
@@ -83,14 +83,12 @@
 static const U32 DIP_ROTOR_ERROR_PERSIST_ROTATION_MIN = 3;
 /// Persist time (task intervals) pump direction error condition.
 static const U32 DIP_DIRECTION_ERROR_PERSIST   = (250 / TASK_PRIORITY_INTERVAL);
-/// Persist time (task intervals) dialysate flow rate out of range error condition.
-static const U32 DIP_MAX_FLOW_RATE_OUT_OF_RANGE_PERSIST = (1 * MS_PER_SECOND);
 /// Time threshold to trigger an alarm if Dialysate flow data has not arrived within 3 seconds
 static const U32 DIP_DIALYSATE_FLOW_DATA_ALARM_THRESHOLD = ((3 * MS_PER_SECOND) / TASK_PRIORITY_INTERVAL);
 
 #define DIP_MAX_CURR_WHEN_STOPPED_MA         150.0F          ///< Motor controller current should not exceed this when pump should be stopped.
 #define DIP_MAX_CURR_WHEN_RUNNING_MA         2000.0F         ///< Motor controller current should not exceed this when pump should be running.
-#define DIP_MAX_CURR_ERROR_DURATION_MS       2000            ///< Motor controller current errors persisting beyond this duration will trigger an alarm.
+#define DIP_MAX_CURR_ERROR_DURATION_MS       5000            ///< Motor controller current errors persisting beyond this duration will trigger an alarm.
 
 #define DIAL_IN_PUMP_ADC_FULL_SCALE_V        3.0F            ///< BP analog signals are 0-3V (while int. ADC ref V may be different).
 #define DIAL_IN_PUMP_ADC_ZERO                1998            ///< Mid-point (zero) for ADC readings.
@@ -234,9 +232,9 @@
 static void updateDialInPumpSpeedAndDirectionFromHallSensors( void );
 static void checkDialInPumpRotor( void );
 static void checkDialInPumpDirection( void );
-static void checkDialInPumpSpeeds( void );
+static void checkDialInPumpSpeeds( void );
+static void checkDialInPumpFlowRate( void );
 static void checkDialInPumpMCCurrent( void );
-static void checkDialInPumpFlowRate( void );
 static F32  calcDialInFlow( void );
 static F32  dialysateInPumpRPMFromTargetFlowRate( F32 QdTarget );
 static F32  dialysateInPumpPWMFromTargetFlowRate( F32 QdTarget );
@@ -274,8 +272,7 @@
                             DIP_P_COEFFICIENT, DIP_I_COEFFICIENT,
                             MIN_DIAL_IN_PUMP_PWM_DUTY_CYCLE, MAX_DIAL_IN_PUMP_PWM_DUTY_CYCLE );
 
-    // Initialize persistent alarm for flow sensor signal strength too low
-    initPersistentAlarm( ALARM_ID_HD_DIAL_IN_FLOW_OUT_OF_RANGE, 0, DIP_MAX_FLOW_RATE_OUT_OF_RANGE_PERSIST );
+    // Initialize persistent alarms
     initPersistentAlarm( ALARM_ID_HD_DIAL_IN_FLOW_CHECK_FAILURE, 0, DIP_NO_FLOW_CHK_PERSIST );
     initTimeWindowedCount( TIME_WINDOWED_COUNT_DIP_COMMUTATION_ERROR, DIP_COMMUTATION_ERROR_MAX_CNT, DIP_COMMUTATION_ERROR_TIME_WIN_MS );
 }
@@ -611,6 +608,10 @@
         releaseDialInPumpStop();
         isDialInPumpOn = TRUE;
         result = DIAL_IN_PUMP_RAMPING_UP_STATE;
+    }
+    else
+    {
+        isDialInPumpOn = FALSE;
     }
 
     return result;
@@ -1402,26 +1403,26 @@
 {
     F32 flow = getMeasuredDialInFlowRate();
 
-    // Range check on measure DPi flow rate.
-    if ( ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_DIAL_IN_FLOW_OUT_OF_RANGE, ( flow > DIP_MAX_FLOW_RATE ) || ( flow < DIP_MIN_FLOW_RATE ) ) ) )
-    {
-#ifndef _RELEASE_
-        if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PUMP_FLOW_CHECKS ) != SW_CONFIG_ENABLE_VALUE )
-#endif
-        {
-            SET_ALARM_WITH_1_F32_DATA( ALARM_ID_HD_DIAL_IN_FLOW_OUT_OF_RANGE, flow );
-        }
-    }
-
     // Check DG Dialysate flow rate
     if ( ( TRUE == isDialInPumpRunning() ) && ( dialInPumpControlMode != PUMP_CONTROL_MODE_OPEN_LOOP ) )
     {
-        F32 measuredDialInFlow = getDGRawDialysateFlowRateLMin() * ML_PER_LITER;
+        HD_OP_MODE_T mode = getCurrentOperationMode();
+        U32 subMode = getCurrentSubMode();
 
-        if ( ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_DIAL_IN_FLOW_CHECK_FAILURE, measuredDialInFlow <  MIN_DG_DIAL_FLOW_RATE ) ) )
+        // Only check if in state where we would expect fluid in dialysate line to generate flow
+        if ( ( MODE_TREA == mode ) || ( ( MODE_PRET == mode ) && ( subMode > HD_PRE_TREATMENT_PRIME_STATE ) ) )
         {
-            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_DIAL_IN_FLOW_CHECK_FAILURE, measuredDialInFlow, (F32)targetDialInFlowRate );
+            F32 measuredDialInFlow = getDGRawDialysateFlowRateLMin() * ML_PER_LITER;
+
+            if ( ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_DIAL_IN_FLOW_CHECK_FAILURE, measuredDialInFlow <  MIN_DG_DIAL_FLOW_RATE ) ) )
+            {
+                SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_DIAL_IN_FLOW_CHECK_FAILURE, measuredDialInFlow, (F32)targetDialInFlowRate );
+            }
         }
+        else
+        {
+            isPersistentAlarmTriggered( ALARM_ID_HD_DIAL_IN_FLOW_CHECK_FAILURE, FALSE );
+        }
     }
     else
     {
@@ -1535,15 +1536,10 @@
  **************************************************************************/
 static BOOL setDialInPumpToFixedPWM( F32 pwm )
 {
-    MOTOR_DIR_T dir = MOTOR_DIR_FORWARD;
+    MOTOR_DIR_T dir = ( pwm < 0.0F ? MOTOR_DIR_REVERSE : MOTOR_DIR_FORWARD );
     BOOL result = FALSE;
     F32 pwmFabs = fabs(pwm);
 
-    if ( pwm < 0 )
-    {
-        dir = MOTOR_DIR_REVERSE;
-    }
-
     // Direction change while pump is running is not allowed unless we are turning off
     if ( ( FALSE == isDialInPumpOn ) && ( dir != dialInPumpDirectionSet ) )
     {
@@ -1927,14 +1923,12 @@
     BOOL result = FALSE;
     F32 absolutePWM = fabs( pwmPct );
 
-    if ( TRUE == isTestingActivated() )
+    // check for max of pump pwm for acceptance.            *** Function used in dialyzer re-prime, so no Dialin login required ***
+    if ( absolutePWM < MAX_DIAL_IN_PUMP_PWM_DUTY_CYCLE )
     {
-        // check for max of pump pwm for acceptance.
-        if ( absolutePWM < MAX_DIAL_IN_PUMP_PWM_DUTY_CYCLE )
-        {
-            result = setDialInPumpToFixedPWM( pwmPct );
-        }
+        result = setDialInPumpToFixedPWM( pwmPct );
     }
+
     return result;
 }