Index: firmware/App/Controllers/DialInFlow.c
===================================================================
diff -u -r1ffe793b3a3557a408b0f5d30539e8f0f499e559 -r7b823539be3fde41aa676263188d1af679b2f411
--- firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 1ffe793b3a3557a408b0f5d30539e8f0f499e559)
+++ firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 7b823539be3fde41aa676263188d1af679b2f411)
@@ -57,7 +57,7 @@
 #define DIP_SPEED_CALC_INTERVAL              ( MS_PER_SECOND / TASK_PRIORITY_INTERVAL )  ///< interval (ms/task time) at which the dialysate inlet pump speed is calculated.
 #define DIP_HALL_EDGE_COUNTS_PER_REV         48              ///< number of hall sensor edge counts per motor revolution.
 
-#define DIP_MAX_FLOW_VS_SPEED_DIFF_ML_MIN    50.0            ///< maximum difference between measured flow and flow implied by measured motor speed.
+#define DIP_MAX_FLOW_VS_SPEED_DIFF_RPM       200.0           ///< maximum difference between measured motor speed and speed implied by measured flow.
 #define DIP_MAX_MOTOR_SPEED_WHILE_OFF_RPM    100.0           ///< maximum motor speed (RPM) while motor is commanded off.
 #define DIP_MAX_ROTOR_VS_MOTOR_DIFF_RPM      5.0             ///< maximum difference in speed between motor and rotor (in rotor RPM).
 #define DIP_MAX_MOTOR_SPEED_ERROR_RPM        300.0           ///< maximum difference in speed between measured and commanded RPM.
@@ -75,7 +75,7 @@
 #define DIP_SPEED_ADC_TO_RPM_FACTOR          1.280938        ///< conversion factor from ADC counts to RPM for dialIn pump motor.
 #define DIP_CURRENT_ADC_TO_MA_FACTOR         3.002           ///< conversion factor from ADC counts to mA for dialIn pump motor.
 
-#define DIP_REV_PER_LITER                    150.24          ///< rotor revolutions per liter.
+#define DIP_REV_PER_LITER                    150.0           ///< rotor revolutions per liter.
 /// Macro converts flow rate to motor RPM.
 #define DIP_ML_PER_MIN_TO_PUMP_RPM_FACTOR    ( DIP_REV_PER_LITER / ML_PER_LITER )
 #define DIP_GEAR_RATIO                       32.0            ///< dialIn pump motor to dialIn pump gear ratio.
@@ -195,6 +195,7 @@
 static void checkDialInPumpSpeeds( void );
 static void checkDialInPumpFlowAgainstSpeed( void );
 static void checkDialInPumpMCCurrent( void );
+static void checkDialInFlowSensorSignalStrength( void );
 static DATA_GET_PROTOTYPE( U32, getPublishDialInFlowDataInterval );
 
 /*********************************************************************//**
@@ -409,21 +410,11 @@
         checkDialInPumpSpeeds();
         checkDialInPumpFlowAgainstSpeed();
         // check for home position, zero/low speed
-        checkDialInPumpRotor();
+        checkDialInPumpRotor();
+        // check flow sensor signal strength
+        checkDialInFlowSensorSignalStrength();
     }
 
-#ifndef DISABLE_PUMP_FLOW_CHECKS
-    // check flow sensor signal strength when appropriate   TODO - in pre-treatment, must be far enough along for fluid to be in tubing
-    if ( MODE_TREA == opMode ||
-         ( MODE_PRET == opMode && FALSE ) )
-    {
-        F32  sigStrength = getMeasuredDialInFlowSignalStrength();
-        BOOL outOfRange = ( sigStrength < MIN_FLOW_SIG_STRENGTH ? TRUE : FALSE );
-
-        checkPersistentAlarm( PERSISTENT_ALARM_DIALYSATE_FLOW_SIGNAL_STRENGTH, outOfRange, sigStrength );
-    }
-#endif
-
     // publish dialIn flow data on interval
     publishDialInFlowData();
 }
@@ -1127,15 +1118,15 @@
     {
         F32 flow = getMeasuredDialInFlowRate();
         F32 speed = getMeasuredDialInPumpSpeed();
-        F32 impliedFlow = ( ( speed / DIP_GEAR_RATIO ) / DIP_REV_PER_LITER ) * (F32)ML_PER_LITER;
-        F32 delta = fabs( flow - impliedFlow );
+        F32 impliedSpeed = ( flow / (F32)ML_PER_LITER ) * DIP_REV_PER_LITER * DIP_GEAR_RATIO;
+        F32 delta = fabs( speed - impliedSpeed );
 
-        if ( delta > DIP_MAX_FLOW_VS_SPEED_DIFF_ML_MIN )
+        if ( delta > DIP_MAX_FLOW_VS_SPEED_DIFF_RPM )
         {
             if ( ++errorDialInFlowVsMotorSpeedPersistTimerCtr >= DIP_FLOW_VS_SPEED_PERSIST )
             {
 #ifndef DISABLE_PUMP_FLOW_CHECKS
-                SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DIAL_IN_PUMP_FLOW_VS_MOTOR_SPEED_CHECK, flow, impliedFlow );
+                SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DIAL_IN_PUMP_FLOW_VS_MOTOR_SPEED_CHECK, flow, speed );
 #endif
             }
         }
@@ -1201,6 +1192,29 @@
             dipCurrErrorDurationCtr = 0;
         }
     }
+}
+
+/*********************************************************************//**
+ * @brief
+ * The checkDialInFlowSensorSignalStrength function checks the measured
+ * dialysate flow sensor signal strength is sufficient for accurate flow sensing.
+ * @details Inputs:
+ * @details Outputs:
+ * @return none
+ *************************************************************************/
+static void checkDialInFlowSensorSignalStrength( void )
+{
+#ifndef DISABLE_PUMP_FLOW_CHECKS
+    // check flow sensor signal strength when appropriate   TODO - in pre-treatment, must be far enough along for fluid to be in tubing
+    if ( MODE_TREA == opMode || ( MODE_PRET == opMode && FALSE ) )
+    {
+        F32  sigStrength = getMeasuredDialInFlowSignalStrength();
+        BOOL outOfRange = ( sigStrength < MIN_FLOW_SIG_STRENGTH ? TRUE : FALSE );
+
+        checkPersistentAlarm( PERSISTENT_ALARM_DIALYSATE_FLOW_SIGNAL_STRENGTH, outOfRange, sigStrength );
+    }
+#endif
+
 }
 
 /*********************************************************************//**