Index: firmware/App/Controllers/DialOutFlow.c
===================================================================
diff -u -rc282822f36836a8127f447c8ac5b8a50e851be63 -r6419179374edcd65da462de84e8aeaefb7e20320
--- firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision c282822f36836a8127f447c8ac5b8a50e851be63)
+++ firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision 6419179374edcd65da462de84e8aeaefb7e20320)
@@ -51,7 +51,8 @@
 #define MAX_DIAL_OUT_PUMP_PWM_DUTY_CYCLE        0.88            ///< Controller will error if PWM duty cycle > 90%, so set max to 88%.
 #define MIN_DIAL_OUT_PUMP_PWM_DUTY_CYCLE        0.12            ///< Controller will error if PWM duty cycle < 10%, so set min to 12%.
 
-#define DOP_CONTROL_INTERVAL                    ( 2000 / TASK_GENERAL_INTERVAL ) ///< Interval (ms/task time) at which the dialysate outlet pump is controlled.
+/// Interval (ms/task time) at which the dialysate outlet pump is controlled.
+static const U32 DOP_CONTROL_INTERVAL         = ( 2000 / TASK_GENERAL_INTERVAL );
 #define DOP_P_COEFFICIENT                       0.0050          ///< P term for dialysate outlet pump control.
 #define DOP_I_COEFFICIENT                       0.0001          ///< I term for dialysate outlet pump control.
 
@@ -66,13 +67,17 @@
 #define DOP_MAX_MOTOR_SPEED_WHILE_OFF_RPM       100.0           ///< Maximum motor speed (RPM) while motor is commanded off.
 #define DOP_MAX_ROTOR_VS_MOTOR_DIFF_RPM         5.0             ///< Maximum difference in speed between motor and rotor (in rotor RPM).
 #define DOP_MAX_MOTOR_SPEED_ERROR_RPM           300.0           ///< Maximum difference in speed between measured and commanded RPM.
-#define DOP_OFF_ERROR_PERSIST                   ((5 * MS_PER_SECOND) / TASK_PRIORITY_INTERVAL)  ///< Persist time (task intervals) for motor off error condition.
-#define DOP_MOTOR_SPEED_ERROR_PERSIST           ((5 * MS_PER_SECOND) / TASK_PRIORITY_INTERVAL)  ///< Persist time (task intervals) motor speed error condition.
-#define DOP_ROTOR_SPEED_ERROR_PERSIST           ((12 * MS_PER_SECOND) / TASK_PRIORITY_INTERVAL) ///< Persist time (task intervals) rotor speed error condition.
-#define DOP_DIRECTION_ERROR_PERSIST             (250 / TASK_PRIORITY_INTERVAL)                  ///< Persist time (task intervals) pump direction error condition.
 
+/// Persist time (task intervals) for motor off error condition.
+static const U32 DOP_OFF_ERROR_PERSIST          = ((5 * MS_PER_SECOND) / TASK_PRIORITY_INTERVAL);
+/// Persist time (task intervals) motor speed error condition.
+static const U32 DOP_MOTOR_SPEED_ERROR_PERSIST  = ((5 * MS_PER_SECOND) / TASK_PRIORITY_INTERVAL);
+/// Persist time (task intervals) rotor speed error condition.
+static const U32 DOP_ROTOR_SPEED_ERROR_PERSIST  = ((12 * MS_PER_SECOND) / TASK_PRIORITY_INTERVAL);
+/// Persist time (task intervals) pump direction error condition.
+static const U32 DOP_DIRECTION_ERROR_PERSIST    = (250 / TASK_PRIORITY_INTERVAL);
+
 #define DOP_MAX_CURR_WHEN_STOPPED_MA            150.0           ///< Motor controller current should not exceed this when pump should be stopped.
-#define DOP_MIN_CURR_WHEN_RUNNING_MA            150.0           ///< Motor controller current should always exceed this when pump should be running.
 #define DOP_MAX_CURR_WHEN_RUNNING_MA            2000.0          ///< Motor controller current should not exceed this when pump should be running.
 #define DOP_MAX_CURR_ERROR_DURATION_MS          2000            ///< Motor controller current errors persisting beyond this duration will trigger an alarm.
 
@@ -934,7 +939,7 @@
     else
     {
         dopCurr = fabs( getMeasuredDialOutPumpMCCurrent() );
-        if ( ( dopCurr < DOP_MIN_CURR_WHEN_RUNNING_MA ) || ( dopCurr > DOP_MAX_CURR_WHEN_RUNNING_MA ) )
+        if ( dopCurr > DOP_MAX_CURR_WHEN_RUNNING_MA )
         {
             dopCurrErrorDurationCtr += TASK_PRIORITY_INTERVAL;
             if ( dopCurrErrorDurationCtr > DOP_MAX_CURR_ERROR_DURATION_MS )