Index: firmware/App/Modes/BloodPrime.c
===================================================================
diff -u -rb03a3ed91ebe15cfb419e34018f8fe600e744b4b -rb20421d84b9049977c04f4752f4fc5697425f25c
--- firmware/App/Modes/BloodPrime.c	(.../BloodPrime.c)	(revision b03a3ed91ebe15cfb419e34018f8fe600e744b4b)
+++ firmware/App/Modes/BloodPrime.c	(.../BloodPrime.c)	(revision b20421d84b9049977c04f4752f4fc5697425f25c)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2021-2022 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
 * @file    BloodPrime.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      04-Jan-2022
+* @date    (last)      01-Sep-2022
 *
 * @author  (original)  Sean Nash
 * @date    (original)  06-Feb-2021
@@ -36,8 +36,9 @@
 
 // ********** private definitiions ***********
 
-#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 TUBING_BLOOD_PRIME_VOLUME_ML                80.0F                   ///< Target blood prime volume to prime the blood side circuit (in mL).
+#define DEFAULT_BLOOD_PRIME_VOLUME_ML               300.0F                  ///< Default blood prime volume (in mL).
+#define MAX_BLOOD_PRIME_VOLUME_ERROR_ML             60.0F                   ///< 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).
 
 /// Initial flow rate for blood pump when starting blood prime operation.
@@ -50,15 +51,15 @@
 #define BLOOD_PRIME_DATA_PUBLISH_INTERVAL          ( MS_PER_SECOND / TASK_GENERAL_INTERVAL )
 
 /// Multiplier to convert flow (mL/min) into volume (mL) for period of general task interval.
-static const F32 BLOOD_PRIME_FLOW_INTEGRATOR = 1.0 / (F32)( SEC_PER_MIN * ( MS_PER_SECOND / TASK_GENERAL_INTERVAL ) );
+static const F32 BLOOD_PRIME_FLOW_INTEGRATOR = 1.0F / (F32)( SEC_PER_MIN * ( MS_PER_SECOND / TASK_GENERAL_INTERVAL ) );
 
 // ********** private data **********
 
 static BLOOD_PRIME_STATE_T bloodPrimeState;                                     ///< Current state of the blood prime sub-mode.
 
 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 = 300.0;                                  ///< Calculated target blood prime volume (based on selected dialyzer and fixed tubing volume).
+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.
@@ -90,9 +91,10 @@
 
     bloodPrimeState = BLOOD_PRIME_RAMP_STATE;
     bloodPrimeRampControlTimerCtr = 0;
-    bloodPrimePublishTimerCtr = BLOOD_PRIME_DATA_PUBLISH_INTERVAL;
+    bloodPrimePublishTimerCtr = BLOOD_PRIME_DATA_PUBLISH_INTERVAL - 2;  // setup so publish will occur time after next
     cumulativeBloodPrimeVolume_mL.data = 0.0;
     expectedBloodPrimeVolume_mL = 0.0;
+    bloodPrimeTargetVolume_mL = DEFAULT_BLOOD_PRIME_VOLUME_ML;
     resetBloodPrimeFlags();
 
     bloodPrimeTargetVolume_mL = (F32)TUBING_BLOOD_PRIME_VOLUME_ML + (F32)getDialyzerBloodVolume();
@@ -127,6 +129,8 @@
  *************************************************************************/
 void transitionToBloodPrime( void )
 {
+    doorClosedRequired( TRUE, TRUE );
+
     // Set valves
     setValvePosition( VDI, VALVE_POSITION_C_CLOSE );
     setValvePosition( VDO, VALVE_POSITION_C_CLOSE );
@@ -233,15 +237,18 @@
         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
+        //cmdStopDGTrimmerHeater();       // Stop trimmer heater - dialysis sub-mode will restart as appropriate // TODO un-comment in DEN-13834
     }
-#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 )
     {
-        activateAlarmNoData( ALARM_ID_BLOOD_PRIME_VOLUME_CHECK_FAILURE );
-    }
+#ifndef _RELEASE_
+        if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PUMP_FLOW_CHECKS ) != SW_CONFIG_ENABLE_VALUE )
 #endif
+        {
+            activateAlarmNoData( ALARM_ID_BLOOD_PRIME_VOLUME_CHECK_FAILURE );
+        }
+    }
     else
     {
         // ramp blood pump on ramp interval
@@ -290,8 +297,7 @@
 
         bloodPrimePublishTimerCtr = 0;
         data.targetBloodPrimeVolumeMl = bloodPrimeTargetVolume_mL;
-        data.deliveredBloodPrimeVolumeMl = getBloodPrimeVolume();
-        data.unused = 0.0; // TODO - remove later when UI no longer looking for this field.
+        data.deliveredBloodPrimeVolumeMl = MAX( 0.0, getBloodPrimeVolume() );
         broadcastData( MSG_ID_HD_BLOOD_PRIME_PROGRESS, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( BLOOD_PRIME_DATA_PAYLOAD_T ) );
     }
 }