Index: firmware/App/Controllers/BloodFlow.c
===================================================================
diff -u -r358e32a9fb25a6929fc5bbd7ee1d8ed2c4b69920 -r4ddbff03c9143b0ece158d927152050d4ae26539
--- firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 358e32a9fb25a6929fc5bbd7ee1d8ed2c4b69920)
+++ firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 4ddbff03c9143b0ece158d927152050d4ae26539)
@@ -69,7 +69,10 @@
 #define BP_MAX_MOTOR_SPEED_WHILE_OFF_RPM    100.0           ///< Maximum motor speed (RPM) while motor is commanded off.
 #define BP_MAX_ROTOR_VS_MOTOR_DIFF_RPM      5.0             ///< Maximum difference in speed between motor and rotor (in rotor RPM).
 #define BP_MAX_MOTOR_SPEED_ERROR_RPM        300.0           ///< Maximum difference in speed between measured and commanded RPM.
+#define BP_MAX_FLOW_VS_SPEED_DIFF_RPM       200.0           ///< Maximum difference between measured speed and speed implied by measured flow.
 
+/// Persist time (task intervals) for flow vs. motor speed error condition.
+static const U32 BP_FLOW_VS_SPEED_PERSIST         = ( 5 * MS_PER_SECOND );
 /// Persist time (task intervals) for motor off error condition.
 static const U32 BP_OFF_ERROR_PERSIST             = ( 5 * MS_PER_SECOND );
 /// Persist time (task intervals) motor speed error condition.
@@ -244,6 +247,7 @@
     initPersistentAlarm( ALARM_ID_BLOOD_PUMP_MC_DIRECTION_CHECK, 0, BP_DIRECTION_ERROR_PERSIST );
     initPersistentAlarm( ALARM_ID_BLOOD_PUMP_ROTOR_SPEED_TOO_HIGH, 0, BP_MAX_ROTOR_SPEED_ERROR_PERSIST );
     initPersistentAlarm( ALARM_ID_BLOOD_PUMP_MC_CURRENT_CHECK, 0, BP_MAX_CURR_ERROR_DURATION_MS );
+    initPersistentAlarm( ALARM_ID_BLOOD_PUMP_FLOW_VS_MOTOR_SPEED_CHECK, 0, BP_FLOW_VS_SPEED_PERSIST );
     initPersistentAlarm( ALARM_ID_HD_BLOOD_FLOW_OUT_OF_RANGE, 0, BP_MAX_FLOW_RATE_OUT_OF_RANGE_PERSIST );
 }
 
@@ -1147,14 +1151,31 @@
  *************************************************************************/
 static void checkBloodPumpFlowRate( void )
 {
+#ifndef DISABLE_PUMP_FLOW_CHECKS
     F32 flow = getMeasuredBloodFlowRate();
 
     // Range check on measure BP flow rate.
-#ifndef DISABLE_PUMP_FLOW_CHECKS
     if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_BLOOD_FLOW_OUT_OF_RANGE, ( flow > BP_MAX_FLOW_RATE ) || ( flow < BP_MIN_FLOW_RATE ) ) )
     {
         SET_ALARM_WITH_1_F32_DATA( ALARM_ID_HD_BLOOD_FLOW_OUT_OF_RANGE, flow );
     }
+
+    // Flow vs. speed check only performed while in treatment mode and while we are in control to target state
+    if ( ( MODE_TREA == getCurrentOperationMode() ) && ( BLOOD_PUMP_CONTROL_TO_TARGET_STATE == bloodPumpState ) )
+    {
+        F32 speed = getMeasuredBloodPumpSpeed();
+        F32 impliedSpeed = ( (F32)targetBloodFlowRate / (F32)ML_PER_LITER ) * BP_REV_PER_LITER * BP_GEAR_RATIO;
+        F32 delta = fabs( speed - impliedSpeed );
+
+        if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_BLOOD_PUMP_FLOW_VS_MOTOR_SPEED_CHECK, delta > BP_MAX_FLOW_VS_SPEED_DIFF_RPM ) )
+        {
+            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_BLOOD_PUMP_FLOW_VS_MOTOR_SPEED_CHECK, flow, speed );
+        }
+    }
+    else
+    {
+        resetPersistentAlarmTimer( ALARM_ID_BLOOD_PUMP_FLOW_VS_MOTOR_SPEED_CHECK );
+    }
 #endif
 }