Index: firmware/App/Controllers/DialOutFlow.c
===================================================================
diff -u -rf2fc3885d55b51a6201c8f4f38e57cf7bcf3ee46 -r15f9827c863812cfd1f891d22342103fe9a72abc
--- firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision f2fc3885d55b51a6201c8f4f38e57cf7bcf3ee46)
+++ firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision 15f9827c863812cfd1f891d22342103fe9a72abc)
@@ -109,6 +109,7 @@
 #define DOP_PWM_TO_MOTOR_SPEED_RPM(pwm)         ( ((pwm) - DOP_PWM_ZERO_OFFSET) * 4000.0 )
 
 #define PUMP_DIR_ERROR_COUNT_MASK                0x3F           ///< Bit mask for pump direction error counter.
+#define DATA_PUBLISH_COUNTER_START_COUNT         6              ///< Data publish counter start count.
 
 /// Enumeration of dialysate outlet pump controller states.
 typedef enum DialOutPump_States
@@ -140,7 +141,7 @@
 // ********** private data **********
 
 static DIAL_OUT_PUMP_STATE_T dialOutPumpState = DIAL_OUT_PUMP_OFF_STATE;                    ///< Current state of the dialysate outlet pump controller state machine.
-static U32 dialOutFlowDataPublicationTimerCounter = 6;                                      ///< Timer counter controlling when to publish dialysate outlet data.  Set non-zero to phase data publication to CAN bus.
+static U32 dialOutFlowDataPublicationTimerCounter;                                          ///< Timer counter controlling when to publish dialysate outlet data.  Set non-zero to phase data publication to CAN bus.
 static BOOL isDialOutPumpOn = FALSE;                                                        ///< Flag set to TRUE when dialysate outlet pump is running.
 static U32 lastGivenRate = 0;                                                               ///< Remembers the last given set point rate for the dialysate outlet pump.
 static F32 dialOutPumpPWMDutyCyclePct = 0.0;                                                ///< Requested PWM duty cycle for dialysate outlet pump (based on given rate).
@@ -216,13 +217,15 @@
  * @brief
  * The initDialOutFlow function initializes the DialOutFlow module.
  * @details Inputs: none
- * @details Outputs: DialOutFlow module initialized.
+ * @details Outputs: dialOutFlowDataPublicationTimerCounter
  * @return none
  *************************************************************************/
 void initDialOutFlow( void )
 {
     U32 i;
 
+    dialOutFlowDataPublicationTimerCounter = DATA_PUBLISH_COUNTER_START_COUNT;
+
     signalDialOutPumpHardStop();
     setDialOutPumpDirection( MOTOR_DIR_FORWARD );
 
@@ -931,21 +934,19 @@
         // Check set direction vs. direction from hall sensors
         if ( dialOutPumpDirectionSet != dopDir )
         {
-            if ( ++errorDialOutPumpDirectionPersistTimerCtr >= DOP_DIRECTION_ERROR_PERSIST )
+            if ( ( ++errorDialOutPumpDirectionPersistTimerCtr >= DOP_DIRECTION_ERROR_PERSIST ) &&
+                 ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PUMP_DIRECTION_CHECKS ) != SW_CONFIG_ENABLE_VALUE ) )
             {
-#ifndef DISABLE_PUMP_DIRECTION_CHECKS
                 SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DIAL_OUT_PUMP_MC_DIRECTION_CHECK, (U32)dialOutPumpDirectionSet, (U32)dopDir )
-#endif
             }
         }
         // Check set direction vs. direction from sign of motor controller speed
         else if ( dialOutPumpDirectionSet != dopMCDir )
         {
-            if ( ++errorDialOutPumpDirectionPersistTimerCtr >= DOP_DIRECTION_ERROR_PERSIST )
+            if ( ( ++errorDialOutPumpDirectionPersistTimerCtr >= DOP_DIRECTION_ERROR_PERSIST ) &&
+                 ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PUMP_DIRECTION_CHECKS ) != SW_CONFIG_ENABLE_VALUE ) )
             {
-#ifndef DISABLE_PUMP_DIRECTION_CHECKS
                 SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DIAL_OUT_PUMP_MC_DIRECTION_CHECK, (U32)dialOutPumpDirectionSet, (U32)dopMCDir )
-#endif
             }
         }
         else
@@ -981,12 +982,11 @@
     {
         if ( measMotorSpeed > DOP_MAX_MOTOR_SPEED_WHILE_OFF_RPM )
         {
-            if ( ++errorDialOutMotorOffPersistTimerCtr >= DOP_OFF_ERROR_PERSIST )
+            if ( ( ++errorDialOutMotorOffPersistTimerCtr >= DOP_OFF_ERROR_PERSIST ) &&
+                 ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PUMP_SPEED_CHECKS ) != SW_CONFIG_ENABLE_VALUE ) )
             {
-#ifndef DISABLE_PUMP_SPEED_CHECKS
                 SET_ALARM_WITH_1_F32_DATA( ALARM_ID_DIAL_OUT_PUMP_OFF_CHECK, measMotorSpeed );
                 activateSafetyShutdown();
-#endif
             }
         }
         else
@@ -1011,11 +1011,10 @@
         // Check measured motor speed vs. commanded motor speed while controlling to target
         if ( ( deltaMotorSpeed > DOP_MAX_MOTOR_SPEED_ERROR_RPM ) || ( deltaMCMotorSpeed > DOP_MAX_MOTOR_SPEED_ERROR_RPM ) )
         {
-            if ( ++errorDialOutMotorSpeedPersistTimerCtr >= DOP_MOTOR_SPEED_ERROR_PERSIST )
+            if ( ( ++errorDialOutMotorSpeedPersistTimerCtr >= DOP_MOTOR_SPEED_ERROR_PERSIST ) &&
+                 ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PUMP_SPEED_CHECKS ) != SW_CONFIG_ENABLE_VALUE ) )
             {
-#ifndef DISABLE_PUMP_SPEED_CHECKS
                 SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DIAL_OUT_PUMP_MOTOR_SPEED_CHECK, cmdMotorSpeed, measMotorSpeed );
-#endif
             }
         }
         else
@@ -1026,11 +1025,10 @@
         // Check measured rotor speed vs. measured motor speed while controlling to target
         if ( deltaRotorSpeed > DOP_MAX_ROTOR_VS_MOTOR_DIFF_RPM )
         {
-            if ( ++errorDialOutRotorSpeedPersistTimerCtr >= DOP_ROTOR_SPEED_ERROR_PERSIST )
+            if ( ( ++errorDialOutRotorSpeedPersistTimerCtr >= DOP_ROTOR_SPEED_ERROR_PERSIST ) &&
+                 ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PUMP_SPEED_CHECKS ) != SW_CONFIG_ENABLE_VALUE ) )
             {
-#ifndef DISABLE_PUMP_SPEED_CHECKS
                 SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DIAL_OUT_PUMP_ROTOR_SPEED_CHECK, measRotorSpeed, measMotorSpeed );
-#endif
             }
         }
         else
@@ -1064,11 +1062,10 @@
         if ( dopCurr > DOP_MAX_CURR_WHEN_STOPPED_MA )
         {
             dopCurrErrorDurationCtr += TASK_PRIORITY_INTERVAL;
-            if ( dopCurrErrorDurationCtr > DOP_MAX_CURR_ERROR_DURATION_MS )
+            if ( ( dopCurrErrorDurationCtr > DOP_MAX_CURR_ERROR_DURATION_MS ) &&
+                 ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_MOTOR_CURRNT_CHECKS ) != SW_CONFIG_ENABLE_VALUE ) )
             {
-#ifndef DISABLE_MOTOR_CURRENT_CHECKS
                 SET_ALARM_WITH_1_F32_DATA( ALARM_ID_DIAL_OUT_PUMP_MC_CURRENT_CHECK, getMeasuredDialOutPumpMCCurrent() );
-#endif
             }
         }
         else
@@ -1083,11 +1080,10 @@
         if ( dopCurr > DOP_MAX_CURR_WHEN_RUNNING_MA )
         {
             dopCurrErrorDurationCtr += TASK_PRIORITY_INTERVAL;
-            if ( dopCurrErrorDurationCtr > DOP_MAX_CURR_ERROR_DURATION_MS )
+            if ( ( dopCurrErrorDurationCtr > DOP_MAX_CURR_ERROR_DURATION_MS ) &&
+                 ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_MOTOR_CURRNT_CHECKS ) != SW_CONFIG_ENABLE_VALUE ) )
             {
-#ifndef DISABLE_MOTOR_CURRENT_CHECKS
                 SET_ALARM_WITH_1_F32_DATA( ALARM_ID_DIAL_OUT_PUMP_MC_CURRENT_CHECK, getMeasuredDialOutPumpMCCurrent() );
-#endif
             }
         }
         else