Index: firmware/App/Controllers/DialInFlow.c
===================================================================
diff -u -r88a641b7b0185e0bad77e21e6d438e1d7283fd28 -re23087e0c17f6ea81d60641fdb52121a8dd5a099
--- firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 88a641b7b0185e0bad77e21e6d438e1d7283fd28)
+++ firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision e23087e0c17f6ea81d60641fdb52121a8dd5a099)
@@ -48,8 +48,9 @@
 #define MAX_DIAL_IN_PUMP_PWM_STEP_DN_CHANGE   0.02            ///< Max duty cycle change when ramping down ~ 300 mL/min/s.
 #define MAX_DIAL_IN_PUMP_PWM_DUTY_CYCLE       0.88            ///< Controller will error if PWM duty cycle > 90%, so set max to 88%.
 #define MIN_DIAL_IN_PUMP_PWM_DUTY_CYCLE       0.12            ///< Controller will error if PWM duty cycle < 10%, so set min to 12%.
-
-#define DIP_CONTROL_INTERVAL                 ( 10000 / TASK_GENERAL_INTERVAL ) ///< Interval (ms/task time) at which the dialIn pump is controlled
+
+/// Interval (ms/task time) at which the dialIn pump is controlled.
+static const U32 DIP_CONTROL_INTERVAL      = ( 10000 / TASK_GENERAL_INTERVAL );
 #define DIP_P_COEFFICIENT                    0.00035         ///< P term for dialIn pump control.
 #define DIP_I_COEFFICIENT                    0.00035         ///< I term for dialIn pump control.
 
@@ -64,12 +65,18 @@
 #define DIP_MAX_FLOW_VS_SPEED_DIFF_RPM       200.0           ///< Maximum difference between measured motor speed and speed implied by measured flow.
 #define DIP_MAX_MOTOR_SPEED_WHILE_OFF_RPM    100.0           ///< Maximum motor speed (RPM) while motor is commanded off.
 #define DIP_MAX_ROTOR_VS_MOTOR_DIFF_RPM      5.0             ///< Maximum difference in speed between motor and rotor (in rotor RPM).
-#define DIP_MAX_MOTOR_SPEED_ERROR_RPM        300.0           ///< Maximum difference in speed between measured and commanded RPM.
-#define DIP_FLOW_VS_SPEED_PERSIST            ((5 * MS_PER_SECOND) / TASK_PRIORITY_INTERVAL)  ///< Persist time (task intervals) for flow vs. motor speed error condition.
-#define DIP_OFF_ERROR_PERSIST                ((5 * MS_PER_SECOND) / TASK_PRIORITY_INTERVAL)  ///< Persist time (task intervals) for motor off error condition.
-#define DIP_MOTOR_SPEED_ERROR_PERSIST        ((5 * MS_PER_SECOND) / TASK_PRIORITY_INTERVAL)  ///< Persist time (task intervals) motor speed error condition.
-#define DIP_ROTOR_SPEED_ERROR_PERSIST        ((12 * MS_PER_SECOND) / TASK_PRIORITY_INTERVAL) ///< Persist time (task intervals) rotor speed error condition.
-#define DIP_DIRECTION_ERROR_PERSIST          (250 / TASK_PRIORITY_INTERVAL)                  ///< Persist time (task intervals) pump direction error condition.
+#define DIP_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 DIP_FLOW_VS_SPEED_PERSIST     = ((5 * MS_PER_SECOND) / TASK_PRIORITY_INTERVAL);
+/// Persist time (task intervals) for motor off error condition.
+static const U32 DIP_OFF_ERROR_PERSIST         = ((5 * MS_PER_SECOND) / TASK_PRIORITY_INTERVAL);
+/// Persist time (task intervals) motor speed error condition.
+static const U32 DIP_MOTOR_SPEED_ERROR_PERSIST = ((5 * MS_PER_SECOND) / TASK_PRIORITY_INTERVAL);
+/// Persist time (task intervals) rotor speed error condition.
+static const U32 DIP_ROTOR_SPEED_ERROR_PERSIST = ((12 * MS_PER_SECOND) / TASK_PRIORITY_INTERVAL);
+/// Persist time (task intervals) pump direction error condition.
+static const U32 DIP_DIRECTION_ERROR_PERSIST   = (250 / TASK_PRIORITY_INTERVAL);
 
 
 #define DIP_MAX_CURR_WHEN_STOPPED_MA         150.0           ///< Motor controller current should not exceed this when pump should be stopped.