Index: firmware/App/Modes/BloodPrime.c
===================================================================
diff -u -r3d72b777cf1ceb673d118341c46e2d6d5b7b75f5 -r6c1d6a3eaf065c2b2d537d9fef793d73ea328359
--- firmware/App/Modes/BloodPrime.c	(.../BloodPrime.c)	(revision 3d72b777cf1ceb673d118341c46e2d6d5b7b75f5)
+++ firmware/App/Modes/BloodPrime.c	(.../BloodPrime.c)	(revision 6c1d6a3eaf065c2b2d537d9fef793d73ea328359)
@@ -8,7 +8,7 @@
 * @file    BloodPrime.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      04-Jan-2022
+* @date    (last)      03-Mar-2022
 *
 * @author  (original)  Sean Nash
 * @date    (original)  06-Feb-2021
@@ -36,7 +36,7 @@
 
 // ********** private definitiions ***********
 
-#define TARGET_BLOOD_PRIME_VOLUME_ML               300.0                    ///< Target blood prime volume to prime the blood side circuit (in mL).
+#define TUBING_BLOOD_PRIME_VOLUME_ML                80.0                    ///< Target blood prime volume to prime the blood side circuit (in mL).
 #define MAX_BLOOD_PRIME_VOLUME_ERROR_ML             60.0                    ///< Maximum error in total additional blood prime volume (20% of total).
 #define MIN_RAMP_TIME_SEC                           60                      ///< Minimum ramp time for blood prime (in seconds).
 
@@ -58,6 +58,7 @@
 
 static F32  bloodPrimeRampFlowRate_mL_min;                                      ///< Current blood pump ramp flow rate.
 static F32  bloodPrimeRampStep_mL;                                              ///< Blood pump volume step size for ramping.
+static F32  bloodPrimeTargetVolume_mL;                                          ///< Calculated target blood prime volume (based on selected dialyzer and fixed tubing volume).
 
 static U32  bloodPrimeRampControlTimerCtr;                                      ///< Timer counter for determining interval for controlling BP ramp.
 static U32  bloodPrimePublishTimerCtr;                                          ///< Timer counter for determining interval for blood prime status to be published.
@@ -92,8 +93,10 @@
     bloodPrimePublishTimerCtr = BLOOD_PRIME_DATA_PUBLISH_INTERVAL;
     cumulativeBloodPrimeVolume_mL.data = 0.0;
     expectedBloodPrimeVolume_mL = 0.0;
+    bloodPrimeTargetVolume_mL = 300.0;
     resetBloodPrimeFlags();
 
+    bloodPrimeTargetVolume_mL = (F32)TUBING_BLOOD_PRIME_VOLUME_ML + (F32)getDialyzerBloodVolume();
     bloodPrimeRampFlowRate_mL_min = (F32)BLOOD_PRIME_INIT_BP_FLOW_RATE_ML_MIN;
     // Calculate BP ramp step size
     if ( setBPRate <= BLOOD_PRIME_INIT_BP_FLOW_RATE_ML_MIN )
@@ -103,7 +106,7 @@
     else
     {
         F32 rampRateSpan = (F32)( setBPRate - BLOOD_PRIME_INIT_BP_FLOW_RATE_ML_MIN );
-        F32 estRampSeconds = ( ( TARGET_BLOOD_PRIME_VOLUME_ML / (F32)setBPRate + TARGET_BLOOD_PRIME_VOLUME_ML / (F32)BLOOD_PRIME_INIT_BP_FLOW_RATE_ML_MIN ) / 2.0 ) * (F32)SEC_PER_MIN;
+        F32 estRampSeconds = ( ( bloodPrimeTargetVolume_mL / (F32)setBPRate + bloodPrimeTargetVolume_mL / (F32)BLOOD_PRIME_INIT_BP_FLOW_RATE_ML_MIN ) / 2.0 ) * (F32)SEC_PER_MIN;
 
         if ( estRampSeconds < (F32)MIN_RAMP_TIME_SEC )
         {
@@ -225,21 +228,20 @@
     expectedBloodPrimeVolume_mL += ( (F32)getTargetBloodFlowRate() * BLOOD_PRIME_FLOW_INTEGRATOR );
 
     // Has blood prime completed?
-    if ( getBloodPrimeVolume() >= TARGET_BLOOD_PRIME_VOLUME_ML )
+    if ( getBloodPrimeVolume() >= bloodPrimeTargetVolume_mL )
     {
         initBloodPrime();               // Reset blood prime so that we start anew next time we transition to this sub-mode
         setBloodIsPrimed( TRUE );       // Signal treatment mode that blood prime is completed
         signalDialInPumpHardStop();     // Stop dialysate recirculation - dialysis sub-mode will restart dialysate pumps
         signalBloodPrimeToDialysis();   // Signal treatment mode that it's time to start dialysis
         cmdStopDGTrimmerHeater();       // Stop trimmer heater - dialysis sub-mode will restart as appropriate
     }
-#ifndef DISABLE_PUMP_FLOW_CHECKS
     // Is blood prime taking too long based on set BP rate?
-    else if ( fabs( expectedBloodPrimeVolume_mL - getBloodPrimeVolume() ) > MAX_BLOOD_PRIME_VOLUME_ERROR_ML )
+    else if ( ( fabs( expectedBloodPrimeVolume_mL - getBloodPrimeVolume() ) > MAX_BLOOD_PRIME_VOLUME_ERROR_ML ) &&
+              ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PUMP_FLOW_CHECKS ) != SW_CONFIG_ENABLE_VALUE ) )
     {
         activateAlarmNoData( ALARM_ID_BLOOD_PRIME_VOLUME_CHECK_FAILURE );
     }
-#endif
     else
     {
         // ramp blood pump on ramp interval
@@ -287,7 +289,7 @@
         BLOOD_PRIME_DATA_PAYLOAD_T data;
 
         bloodPrimePublishTimerCtr = 0;
-        data.targetBloodPrimeVolumeMl = TARGET_BLOOD_PRIME_VOLUME_ML;
+        data.targetBloodPrimeVolumeMl = bloodPrimeTargetVolume_mL;
         data.deliveredBloodPrimeVolumeMl = getBloodPrimeVolume();
         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 ) );