Index: firmware/App/Controllers/BloodFlow.c
===================================================================
diff -u -r27f3db92495948d4c1192421c1b0c20338c4a034 -rd3b7ae356aae29c99cb039713a2e120fdbce5a9c
--- firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 27f3db92495948d4c1192421c1b0c20338c4a034)
+++ firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision d3b7ae356aae29c99cb039713a2e120fdbce5a9c)
@@ -20,10 +20,6 @@
 #include "can.h"
 #include "etpwm.h"
 
-// TODO - Test includes - remove later
-#include "DialInFlow.h"
-#include "PresOccl.h"
-
 #include "BloodFlow.h"
 #include "FPGA.h"
 #include "InternalADC.h"
@@ -35,7 +31,8 @@
 #include "SystemCommMessages.h"
 #include "TaskGeneral.h"
 #include "TaskPriority.h"
-#include "Timers.h"
+#include "Timers.h"
+#include "Utilities.h"
 
 /**
  *  @addtogroup BloodFlow
@@ -63,7 +60,6 @@
 #define BP_SPEED_CALC_INTERVAL              ( 40 / TASK_PRIORITY_INTERVAL )
 /// Number of hall sensor counts kept in buffer to hold last 1 second of count data.
 #define BP_SPEED_CALC_BUFFER_LEN            ( 1000 / BP_SPEED_CALC_INTERVAL / TASK_PRIORITY_INTERVAL )
-#define BP_HALL_EDGE_COUNTS_PER_REV         48              ///< Number of hall sensor edge counts per motor revolution.
 #define BP_MAX_ROTOR_SPEED_RPM              100.0           ///< Maximum rotor speed allowed for blood pump.
 
 #define BP_MAX_FLOW_VS_SPEED_DIFF_RPM       200.0           ///< Maximum difference between measured speed and speed implied by measured flow.
@@ -389,7 +385,7 @@
  *************************************************************************/
 U32 getBloodPumpMotorCount( void )
 {
-    return bloodPumpMotorEdgeCount / BP_HALL_EDGE_COUNTS_PER_REV;
+    return bloodPumpMotorEdgeCount;
 }
 
 /*********************************************************************//**
@@ -938,25 +934,28 @@
     if ( ++bpMotorSpeedCalcTimerCtr >= BP_SPEED_CALC_INTERVAL )
     {
         U16 bpMotorHallSensorCount = getFPGABloodPumpHallSensorCount();
-        U32 nextIdx = INC_WRAP( bpMotorSpeedCalcIdx, 0, BP_SPEED_CALC_BUFFER_LEN - 1 );
-        U16 incDelta = ( bpMotorHallSensorCount >= bpLastMotorHallSensorCounts[ nextIdx ] ? \
-                         bpMotorHallSensorCount - bpLastMotorHallSensorCounts[ nextIdx ] : \
-                         ( HEX_64_K - bpLastMotorHallSensorCounts[ nextIdx ] ) + bpMotorHallSensorCount );
+        U16 last = bpLastMotorHallSensorCounts[ bpMotorSpeedCalcIdx ];
+        U32 nextIdx = INC_WRAP( bpMotorSpeedCalcIdx, 0, BP_SPEED_CALC_BUFFER_LEN - 1 );
+        U16 incDelta = u16DiffWithWrap( bpLastMotorHallSensorCounts[ nextIdx ], bpMotorHallSensorCount );
         U16 decDelta = HEX_64_K - incDelta;
-        U16 delta;
-
+        U16 spdDelta;
+        S16 delta;
+
         // Determine blood pump speed/direction from delta hall sensor count since last interval
         if ( incDelta < decDelta )
         {
-            delta = incDelta;
-            bloodPumpSpeedRPM.data = ( (F32)delta / (F32)BP_HALL_EDGE_COUNTS_PER_REV ) * (F32)SEC_PER_MIN;
+            spdDelta = incDelta;
+            bloodPumpSpeedRPM.data = ( (F32)spdDelta / (F32)BP_HALL_EDGE_COUNTS_PER_REV ) * (F32)SEC_PER_MIN;
         }
         else
         {
-            delta = decDelta;
-            bloodPumpSpeedRPM.data = ( (F32)delta / (F32)BP_HALL_EDGE_COUNTS_PER_REV ) * (F32)SEC_PER_MIN * -1.0;
+            spdDelta = decDelta;
+            bloodPumpSpeedRPM.data = ( (F32)spdDelta / (F32)BP_HALL_EDGE_COUNTS_PER_REV ) * (F32)SEC_PER_MIN * -1.0;
         }
-        bloodPumpMotorEdgeCount += delta;
+
+        // Keep a running 32-bit edge count used for safety check on volume in some functions
+        delta = u16BiDiffWithWrap( last, bpMotorHallSensorCount );
+        bloodPumpMotorEdgeCount += (U16)delta;
 
         // Update last count for next time
         bpLastMotorHallSensorCounts[ nextIdx ] = bpMotorHallSensorCount;
@@ -1272,12 +1271,16 @@
     CALIBRATION_DATA_T cal;
 
     // Retrieve blood flow sensor calibration data and check for sensor connected status
+#ifndef SKIP_CALIBRATION_TESTS
     if ( ( TRUE == getCalibrationData( &cal ) ) && ( BFM_SENSOR_PARAM_CORRUPT_STATUS != getFPGABloodFlowMeterStatus() ) )
     {
         bloodFlowCalGain = cal.bloodFlowGain;
         bloodFlowCalOffset = cal.bloodFlowOffset_mL_min;
         result = SELF_TEST_STATUS_PASSED;
     }
+#else
+    result = SELF_TEST_STATUS_PASSED;
+#endif
 
     return result;
 }