Index: firmware/App/Controllers/BloodFlow.c
===================================================================
diff -u -r1507b3d6f58c87107d96a9da744423d06a70057c -rf2fc3885d55b51a6201c8f4f38e57cf7bcf3ee46
--- firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 1507b3d6f58c87107d96a9da744423d06a70057c)
+++ firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision f2fc3885d55b51a6201c8f4f38e57cf7bcf3ee46)
@@ -119,11 +119,10 @@
 
 #define PUMP_DIR_ERROR_COUNT_MASK           0x3F            ///< Bit mask for pump direction error counter.
 
-#define BP_FLOW_ALPHA_Y_INTERCEPT           1.2163          ///< Y intercept used for alpha flow coefficient calculation.
-#define BP_FLOW_WEAR_A_TERM                 0.000000005665  ///< A term used for wear portion of alpha flow coefficient.
-#define BP_FLOW_WEAR_B_TERM                 0.0006125       ///< B term used for wear portion of alpha flow coefficient.
+#define BP_FLOW_ALPHA_Y_INTERCEPT           1.1050          ///< Y intercept used for alpha flow coefficient calculation.
+#define BP_FLOW_WEAR_A_TERM                 0.000000001     ///< A term used for wear portion of alpha flow coefficient.
+#define BP_FLOW_WEAR_B_TERM                 0.00055         ///< B term used for wear portion of alpha flow coefficient.
 #define BP_MAX_ROTOR_COUNT_FOR_WEAR         25000           ///< Maximum rotor count for determining wear of the cartridge (negligible affect beyond this threshold).
-#define BP_FLOW_CORRECTION_FACTOR           0.9             // TODO - why do we need this
 
 /// Enumeration of blood pump controller states.
 typedef enum BloodPump_States
@@ -193,6 +192,7 @@
 static U16 bpLastMotorHallSensorCounts[ BP_SPEED_CALC_BUFFER_LEN ];             ///< Last hall sensor readings for the blood pump motor
 static U32 bpMotorSpeedCalcIdx = 0;                                             ///< Index into 1 second buffer of motor speed hall sensor counts
 static U32 bpMotorSpeedCalcTimerCtr = 0;                                        ///< Counter determines interval for calculating blood pump motor speed from hall sensor count.
+static HD_PUMPS_CAL_RECORD_T bloodPumpCalRecord;                                ///< Blood pump calibration record.
 
 // ********** private function prototypes **********
 
@@ -358,7 +358,7 @@
     U32 rotCnt  = CAP( r, BP_MAX_ROTOR_COUNT_FOR_WEAR );
     F32 wear    = BP_FLOW_WEAR_A_TERM * (F32)rotCnt + BP_FLOW_WEAR_B_TERM;
     F32 alpha   = wear * artPres + BP_FLOW_ALPHA_Y_INTERCEPT;
-    F32 flow    = alpha * BP_ML_PER_ROTOR_REV * rotSpd * BP_FLOW_CORRECTION_FACTOR;
+    F32 flow    = alpha * BP_ML_PER_ROTOR_REV * rotSpd;
 
     return flow;
 }
@@ -478,6 +478,21 @@
 
 /*********************************************************************//**
  * @brief
+ * The isBloodPumpRampComplete function returns whether the blood pump has
+ * completed its ramp up and entered control state (closed or open loop).
+ * @details Inputs: bloodPumpState
+ * @details Outputs: none
+ * @return TRUE if pump is in control state, FALSE if not
+ *************************************************************************/
+BOOL isBloodPumpRampComplete( void )
+{
+    BOOL result = ( BLOOD_PUMP_CONTROL_TO_TARGET_STATE == bloodPumpState ? TRUE : FALSE );
+
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
  * The resetBloodPumpRotorCount function resets the blood pump rotor counter
  * that is a proxy for cartridge wear.  Call this function after a new cartridge
  * has been installed.
@@ -1055,7 +1070,9 @@
         if ( lastBloodPumpDirectionCount != dirErrorCnt )
         {
             lastBloodPumpDirectionCount = dirErrorCnt;
+#ifndef DISABLE_PUMP_DIRECTION_CHECKS
             SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_PUMP_DIRECTION_STATUS_ERROR, (U32)HD_PUMP_BLOOD_PUMP )
+#endif
         }
 #endif
         bpMCDir = ( getMeasuredBloodPumpMCSpeed() >= 0.0 ? MOTOR_DIR_FORWARD : MOTOR_DIR_REVERSE );
@@ -1192,15 +1209,25 @@
  * @brief
  * The execBloodFlowTest function executes the state machine for the
  * BloodFlow self-test.
- * @details Inputs: none
+ * @details Inputs: bloodPumpCalRecord
  * @details Outputs: none
  * @return the current state of the BloodFlow self-test.
  *************************************************************************/
 SELF_TEST_STATUS_T execBloodFlowTest( void )
 {
     SELF_TEST_STATUS_T result = SELF_TEST_STATUS_PASSED;
 
-    // TODO - anything to test here?
+    BOOL calStatus = getNVRecord2Driver( GET_CAL_PUMPS, (U08*)&bloodPumpCalRecord, sizeof( HD_PUMPS_CAL_RECORD_T ),
+                                         NUM_OF_CAL_DATA_HD_PUMPS, ALARM_ID_NO_ALARM );
+
+    if ( TRUE == calStatus )
+    {
+        result = SELF_TEST_STATUS_PASSED;
+    }
+    else
+    {
+        result = SELF_TEST_STATUS_FAILED;
+    }
 
     return result;
 }