Index: firmware/App/Controllers/BloodFlow.c
===================================================================
diff -u -r30b1f6126c37f7b99cf699f63b4bcee9d1a1745f -r27f3db92495948d4c1192421c1b0c20338c4a034
--- firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 30b1f6126c37f7b99cf699f63b4bcee9d1a1745f)
+++ firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 27f3db92495948d4c1192421c1b0c20338c4a034)
@@ -53,7 +53,7 @@
 #define MIN_BLOOD_PUMP_PWM_DUTY_CYCLE       0.12            ///< Controller will error if PWM duty cycle < 10%, so set min to 12%
 
 /// Interval (ms/task time) at which the blood pump is controlled.
-#define BP_CONTROL_INTERVAL                 ( 10000 / TASK_GENERAL_INTERVAL )
+static const U32 BP_CONTROL_INTERVAL      = ( 10000 / TASK_GENERAL_INTERVAL );
 #define BP_P_COEFFICIENT                    0.00035         ///< P term for blood pump control
 #define BP_I_COEFFICIENT                    0.00035         ///< I term for blood pump control
 
@@ -69,13 +69,19 @@
 #define BP_MAX_FLOW_VS_SPEED_DIFF_RPM       200.0           ///< Maximum difference between measured speed and speed implied by measured flow.
 #define BP_MAX_MOTOR_SPEED_WHILE_OFF_RPM    100.0           ///< Maximum motor speed (RPM) while motor is commanded off.
 #define BP_MAX_ROTOR_VS_MOTOR_DIFF_RPM      5.0             ///< Maximum difference in speed between motor and rotor (in rotor RPM).
-#define BP_MAX_MOTOR_SPEED_ERROR_RPM        300.0           ///< Maximum difference in speed between measured and commanded RPM.
-#define BP_FLOW_VS_SPEED_PERSIST            ((5 * MS_PER_SECOND) / TASK_PRIORITY_INTERVAL)  ///< Persist time (task intervals) for flow vs. motor speed error condition.
-#define BP_OFF_ERROR_PERSIST                ((5 * MS_PER_SECOND) / TASK_PRIORITY_INTERVAL)  ///< Persist time (task intervals) for motor off error condition.
-#define BP_MOTOR_SPEED_ERROR_PERSIST        ((5 * MS_PER_SECOND) / TASK_PRIORITY_INTERVAL)  ///< Persist time (task intervals) motor speed error condition.
-#define BP_ROTOR_SPEED_ERROR_PERSIST        ((12 * MS_PER_SECOND) / TASK_PRIORITY_INTERVAL) ///< Persist time (task intervals) rotor speed error condition.
-#define BP_DIRECTION_ERROR_PERSIST          (250 / TASK_PRIORITY_INTERVAL)                  ///< Persist time (task intervals) pump direction error condition.
-#define BP_MAX_ROTOR_SPEED_ERROR_PERSIST    ((1 * MS_PER_SECOND) / TASK_PRIORITY_INTERVAL)  ///< Persist time (task intervals) blood pump rotor speed too fast error condition.
+#define BP_MAX_MOTOR_SPEED_ERROR_RPM        300.0           ///< Maximum difference in speed between measured and commanded RPM.
+/// Persist time (task intervals) for flow vs. motor speed error condition.
+static const U32 BP_FLOW_VS_SPEED_PERSIST         = ((5 * MS_PER_SECOND) / TASK_PRIORITY_INTERVAL);
+/// Persist time (task intervals) for motor off error condition.
+static const U32 BP_OFF_ERROR_PERSIST             = ((5 * MS_PER_SECOND) / TASK_PRIORITY_INTERVAL);
+/// Persist time (task intervals) motor speed error condition.
+static const U32 BP_MOTOR_SPEED_ERROR_PERSIST     = ((5 * MS_PER_SECOND) / TASK_PRIORITY_INTERVAL);
+/// Persist time (task intervals) rotor speed error condition.
+static const U32 BP_ROTOR_SPEED_ERROR_PERSIST     = ((12 * MS_PER_SECOND) / TASK_PRIORITY_INTERVAL);
+/// Persist time (task intervals) pump direction error condition.
+static const U32 BP_DIRECTION_ERROR_PERSIST       = (250 / TASK_PRIORITY_INTERVAL);
+/// Persist time (task intervals) blood pump rotor speed too fast error condition.
+static const U32 BP_MAX_ROTOR_SPEED_ERROR_PERSIST = ((1 * MS_PER_SECOND) / TASK_PRIORITY_INTERVAL);
 
 #define BP_MAX_CURR_WHEN_STOPPED_MA         150.0           ///< Motor controller current should not exceed this when pump should be stopped
 #define BP_MIN_CURR_WHEN_RUNNING_MA         150.0           ///< Motor controller current should always exceed this when pump should be running