Index: firmware/App/Modes/BloodPrime.c
===================================================================
diff -u -rec348bf3bbbe48b5a5e25d563a0aa5686bfcd237 -re45524455c005d4fa1734efcbaf7ed0499302670
--- firmware/App/Modes/BloodPrime.c	(.../BloodPrime.c)	(revision ec348bf3bbbe48b5a5e25d563a0aa5686bfcd237)
+++ firmware/App/Modes/BloodPrime.c	(.../BloodPrime.c)	(revision e45524455c005d4fa1734efcbaf7ed0499302670)
@@ -36,17 +36,9 @@
 
 // ********** private definitiions ***********
 
-// TODO - get from Systems when available
 #define TARGET_BLOOD_PRIME_VOLUME_ML               300.0                    ///< Target blood prime volume to prime the blood side circuit (in mL).
 #define MIN_RAMP_TIME_SEC                          60                       ///< Minimum ramp time for blood prime (in seconds).
 
-#ifndef DISABLE_PUMP_FLOW_CHECKS
-/// Maximum blood prime volume measured by independent means (as % of target).
-static const F32 MAX_BLOOD_PRIME_SAFETY_VOLUME_ML = ( TARGET_BLOOD_PRIME_VOLUME_ML * 1.2 );
-/// Minimum blood prime volume measured by independent means (as % of target).
-static const F32 MIN_BLOOD_PRIME_SAFETY_VOLUME_ML = ( TARGET_BLOOD_PRIME_VOLUME_ML * 0.8 );
-#endif
-
 /// Initial flow rate for blood pump when starting blood prime operation.
 #define BLOOD_PRIME_INIT_BP_FLOW_RATE_ML_MIN       100
 
@@ -72,15 +64,11 @@
 static OVERRIDE_U32_T bloodPrimePublishInterval = { BLOOD_PRIME_DATA_PUBLISH_INTERVAL, BLOOD_PRIME_DATA_PUBLISH_INTERVAL, BLOOD_PRIME_DATA_PUBLISH_INTERVAL, 0 };
 
 static OVERRIDE_F32_T  cumulativeBloodPrimeVolume_mL = { 0.0, 0.0, 0.0, 0 };    ///< Total cumulative blood prime volume (in mL).
-static OVERRIDE_F32_T  bloodPrimeVolumeDelivered_Safety = { 0.0, 0.0, 0.0, 0 }; ///< The cumulative independent blood prime volume (in mL) calculated so far.
-static S32  bloodPrimeMotorCount;                                               ///< The cumulative sum of BP motor encoder counts used for independent blood prime volume check.
-static U32  bloodPrimeLastMotorCount;                                           ///< The last BP motor encoder count read for independent blood prime volume check.
 
 // ********** private function prototypes **********
 
 static void resetBloodPrimeFlags( void );
 static F32 getBloodPrimeVolume( void );
-static F32 getBloodPrimeSafetyVolume( void );
 static BLOOD_PRIME_STATE_T handleBloodPrimeRampState( void );
 static void publishBloodPrimeData( void );
 
@@ -100,9 +88,6 @@
     bloodPrimeRampControlTimerCtr = 0;
     bloodPrimePublishTimerCtr = BLOOD_PRIME_DATA_PUBLISH_INTERVAL;
     cumulativeBloodPrimeVolume_mL.data = 0.0;
-    bloodPrimeVolumeDelivered_Safety.data = 0.0;
-    bloodPrimeMotorCount = 0;
-    bloodPrimeLastMotorCount = getBloodPumpMotorCount();
     resetBloodPrimeFlags();
 
     bloodPrimeRampFlowRate_mL_min = (F32)BLOOD_PRIME_INIT_BP_FLOW_RATE_ML_MIN;
@@ -194,26 +179,6 @@
 
 /*********************************************************************//**
  * @brief
- * The getBloodPrimeSafetyVolume function gets the calculated independent
- * blood prime volume delivered.
- * @details Inputs: bloodPrimeVolumeDelivered_Safety
- * @details Outputs: none
- * @return the current blood prime safety volume delivered (in mL).
- *************************************************************************/
-static F32 getBloodPrimeSafetyVolume( void )
-{
-    F32 result = bloodPrimeVolumeDelivered_Safety.data;
-
-    if ( OVERRIDE_KEY == bloodPrimeVolumeDelivered_Safety.override )
-    {
-        result = bloodPrimeVolumeDelivered_Safety.ovData;
-    }
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
  * The execBloodPrime function executes the Blood Prime sub-mode state machine.
  * @details Inputs: bloodPrimeState
  * @details Outputs: bloodPrimeState
@@ -253,33 +218,20 @@
 
     // Update blood prime volume delivered so far
     cumulativeBloodPrimeVolume_mL.data += ( getMeasuredBloodFlowRate() * BLOOD_PRIME_FLOW_INTEGRATOR );
-    // Update independent calculated safety volume delivered so far
-    bloodPrimeMotorCount = u32BiDiffWithWrap( bloodPrimeLastMotorCount, getBloodPumpMotorCount() ) / BP_HALL_EDGE_COUNTS_PER_REV;
-    bloodPrimeVolumeDelivered_Safety.data = ( (F32)bloodPrimeMotorCount * VOLUME_PER_BP_MOTOR_REV_ML );  // TODO - include upstream pressure compensation to this calc
 
     // Has blood prime completed?
     if ( getBloodPrimeVolume() >= TARGET_BLOOD_PRIME_VOLUME_ML )
     {
-#ifndef DISABLE_PUMP_FLOW_CHECKS
-        // check for under-delivery
-        if ( getBloodPrimeSafetyVolume() < MIN_BLOOD_PRIME_SAFETY_VOLUME_ML )
-        {
-            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_BLOOD_PRIME_VOLUME_CHECK_FAILURE, TARGET_BLOOD_PRIME_VOLUME_ML, getBloodPrimeSafetyVolume() );
-        }
-        else
-#endif
-        {
-            setBloodIsPrimed( TRUE );
-            signalDialInPumpHardStop();
-            signalBloodPrimeToDialysis();
-            cmdStopDGTrimmerHeater();
-        }
+        setBloodIsPrimed( TRUE );
+        signalDialInPumpHardStop();
+        signalBloodPrimeToDialysis();
+        cmdStopDGTrimmerHeater();
     }
 #ifndef DISABLE_PUMP_FLOW_CHECKS
-    // Has independent safety volume exceeded safety limit?
-    else if ( getBloodPrimeSafetyVolume() > MAX_BLOOD_PRIME_SAFETY_VOLUME_ML )
+    // Is blood prime taking too long based on set BP rate?
+    else if ( TBD )
     {
-        SET_ALARM_WITH_2_F32_DATA( ALARM_ID_BLOOD_PRIME_VOLUME_CHECK_FAILURE, TARGET_BLOOD_PRIME_VOLUME_ML, getBloodPrimeSafetyVolume() );
+        activateAlarmNoData( ALARM_ID_BLOOD_PRIME_VOLUME_CHECK_FAILURE );
     }
 #endif
     else
@@ -331,7 +283,7 @@
         bloodPrimePublishTimerCtr = 0;
         data.targetBloodPrimeVolumeMl = TARGET_BLOOD_PRIME_VOLUME_ML;
         data.deliveredBloodPrimeVolumeMl = getBloodPrimeVolume();
-        data.indDeliveredBloodPrimeVolumeMl = getBloodPrimeSafetyVolume();
+        data.unused = 0.0; // TODO - remove later when UI no longer looking for this field.
         broadcastData( MSG_ID_HD_BLOOD_PRIME_PROGRESS, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( BLOOD_PRIME_DATA_PAYLOAD_T ) );
     }
 }
@@ -389,51 +341,6 @@
 
 /*********************************************************************//**
  * @brief
- * The testSetBloodPrimeSafetyVolumeOverride function overrides the calculated
- * blood prime volume.
- * @details Inputs: none
- * @details Outputs: bloodPrimeVolumeDelivered_Safety
- * @param vol override calculated blood prime safety volume (in mL)
- * @return TRUE if override successful, FALSE if not
- *************************************************************************/
-BOOL testSetBloodPrimeSafetyVolumeOverride( F32 vol )
-{
-    BOOL result = FALSE;
-
-    if ( TRUE == isTestingActivated() )
-    {
-        result = TRUE;
-        bloodPrimeVolumeDelivered_Safety.ovData = vol;
-        bloodPrimeVolumeDelivered_Safety.override = OVERRIDE_KEY;
-    }
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
- * The testResetBloodPrimeSafetyVolumeOverride function resets the override of the
- * calculated blood prime safety volume.
- * @details Inputs: none
- * @details Outputs: bloodPrimeVolumeDelivered_Safety
- * @return TRUE if reset successful, FALSE if not
- *************************************************************************/
-BOOL testResetBloodPrimeSafetyVolumeOverride( void )
-{
-    BOOL result = FALSE;
-
-    if ( TRUE == isTestingActivated() )
-    {
-        result = TRUE;
-        bloodPrimeVolumeDelivered_Safety.override = OVERRIDE_RESET;
-        bloodPrimeVolumeDelivered_Safety.ovData = bloodPrimeVolumeDelivered_Safety.ovInitData;
-    }
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
  * The testSetBloodPrimePublishIntervalOverride function sets the override of the
  * blood prime data publication interval.
  * @details Inputs: none