Index: firmware/App/Controllers/DialInFlow.c
===================================================================
diff -u -rf2fc3885d55b51a6201c8f4f38e57cf7bcf3ee46 -r15f9827c863812cfd1f891d22342103fe9a72abc
--- firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision f2fc3885d55b51a6201c8f4f38e57cf7bcf3ee46)
+++ firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 15f9827c863812cfd1f891d22342103fe9a72abc)
@@ -116,6 +116,8 @@
 
 #define PUMP_DIR_ERROR_COUNT_MASK            0x3F            ///< Bit mask for pump direction error counter.
 
+#define DATA_PUBLISH_COUNTER_START_COUNT     5               ///< Data publish counter start count.
+
 /// Enumeration of dialysate inlet pump states.
 typedef enum DialInPump_States
 {
@@ -147,7 +149,7 @@
 // ********** private data **********
 
 static DIAL_IN_PUMP_STATE_T dialInPumpState = DIAL_IN_PUMP_OFF_STATE;               ///< Current state of dialIn flow controller state machine
-static U32 dialInFlowDataPublicationTimerCounter = 5;                               ///< Used to schedule dialIn flow data publication to CAN bus
+static U32 dialInFlowDataPublicationTimerCounter;                                   ///< Used to schedule dialIn flow data publication to CAN bus
 static BOOL isDialInPumpOn = FALSE;                                                 ///< DialIn pump is currently running
 static F32 dialInPumpPWMDutyCyclePct = 0.0;                                         ///< Initial dialIn pump PWM duty cycle
 static F32 dialInPumpPWMDutyCyclePctSet = 0.0;                                      ///< Currently set dialIn pump PWM duty cycle
@@ -222,6 +224,8 @@
 void initDialInFlow( void )
 {
     U32 i;
+
+    dialInFlowDataPublicationTimerCounter = DATA_PUBLISH_COUNTER_START_COUNT;
 
     signalDialInPumpHardStop();
     setDialInPumpDirection( MOTOR_DIR_FORWARD );
@@ -999,38 +1003,35 @@
         MOTOR_DIR_T dipMCDir, dipDir;
         U08 dirErrorCnt = getFPGADialInPumpHallSensorStatus() & PUMP_DIR_ERROR_COUNT_MASK;
 
-#ifndef DISABLE_PUMP_DIRECTION_CHECKS
         // Check pump direction error count
-        if ( lastDialInPumpDirectionCount != dirErrorCnt )
+        if ( ( lastDialInPumpDirectionCount != dirErrorCnt ) &&
+             ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PUMP_DIRECTION_CHECKS ) != SW_CONFIG_ENABLE_VALUE ) )
         {
             lastDialInPumpDirectionCount = dirErrorCnt;
 #ifndef DISABLE_PUMP_DIRECTION_CHECKS
             SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_PUMP_DIRECTION_STATUS_ERROR, (U32)HD_PUMP_DIALYSATE_INLET_PUMP )
 #endif
         }
-#endif
 
         dipMCDir = ( getMeasuredDialInPumpMCSpeed() >= 0.0 ? MOTOR_DIR_FORWARD : MOTOR_DIR_REVERSE );
         dipDir = ( getMeasuredDialInPumpSpeed() >= 0.0 ? MOTOR_DIR_FORWARD : MOTOR_DIR_REVERSE );
 
         // Check set direction vs. direction from hall sensors
         if ( dialInPumpDirectionSet != dipDir )
         {
-            if ( ++errorDialInPumpDirectionPersistTimerCtr >= DIP_DIRECTION_ERROR_PERSIST )
+            if ( ( ++errorDialInPumpDirectionPersistTimerCtr >= DIP_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_IN_PUMP_MC_DIRECTION_CHECK, (U32)dialInPumpDirectionSet, (U32)dipDir )
-#endif
             }
         }
         // Check set direction vs. direction from sign of motor controller speed
         else if ( dialInPumpDirectionSet != dipMCDir )
         {
-            if ( ++errorDialInPumpDirectionPersistTimerCtr >= DIP_DIRECTION_ERROR_PERSIST )
+            if ( ( ++errorDialInPumpDirectionPersistTimerCtr >= DIP_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_IN_PUMP_MC_DIRECTION_CHECK, (U32)dialInPumpDirectionSet, (U32)dipMCDir )
-#endif
             }
         }
         else
@@ -1066,12 +1067,11 @@
     {
         if ( measMotorSpeed > DIP_MAX_MOTOR_SPEED_WHILE_OFF_RPM )
         {
-            if ( ++errorDialInMotorOffPersistTimerCtr >= DIP_OFF_ERROR_PERSIST )
+            if ( ( ++errorDialInMotorOffPersistTimerCtr >= DIP_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_IN_PUMP_OFF_CHECK, measMotorSpeed );
                 activateSafetyShutdown();
-#endif
             }
         }
         else
@@ -1097,11 +1097,10 @@
         // Check measured motor speed vs. commanded motor speed while controlling to target
         if ( ( deltaMotorSpeed > DIP_MAX_MOTOR_SPEED_ERROR_RPM ) || ( deltaMCMotorSpeed > DIP_MAX_MOTOR_SPEED_ERROR_RPM ) )
         {
-            if ( ++errorDialInMotorSpeedPersistTimerCtr >= DIP_MOTOR_SPEED_ERROR_PERSIST )
+            if ( ( ++errorDialInMotorSpeedPersistTimerCtr >= DIP_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_IN_PUMP_MOTOR_SPEED_CHECK, cmdMotorSpeed, measMotorSpeed );
-#endif
             }
         }
         else
@@ -1112,11 +1111,10 @@
         // Check measured rotor speed vs. measured motor speed while controlling to target
         if ( deltaRotorSpeed > DIP_MAX_ROTOR_VS_MOTOR_DIFF_RPM )
         {
-            if ( ++errorDialInRotorSpeedPersistTimerCtr >= DIP_ROTOR_SPEED_ERROR_PERSIST )
+            if ( ( ++errorDialInRotorSpeedPersistTimerCtr >= DIP_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_IN_PUMP_ROTOR_SPEED_CHECK, measRotorSpeed, measMotorSpeed );
-#endif
             }
         }
         else
@@ -1145,12 +1143,11 @@
     F32 flow = getMeasuredDialInFlowRate();
 
     // Range check on measure DPi flow rate.
-#ifndef DISABLE_PUMP_FLOW_CHECKS
-    if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_DIAL_IN_FLOW_OUT_OF_RANGE, ( flow > DIP_MAX_FLOW_RATE ) || ( flow < DIP_MIN_FLOW_RATE ) ) )
+    if ( ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_DIAL_IN_FLOW_OUT_OF_RANGE, ( flow > DIP_MAX_FLOW_RATE ) || ( flow < DIP_MIN_FLOW_RATE ) ) ) &&
+         ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PUMP_FLOW_CHECKS ) != SW_CONFIG_ENABLE_VALUE ) )
     {
         SET_ALARM_WITH_1_F32_DATA( ALARM_ID_HD_DIAL_IN_FLOW_OUT_OF_RANGE, flow );
     }
-#endif
 
     // Check only performed while in treatment mode and while we are in control to target state
     if ( ( MODE_TREA == getCurrentOperationMode() ) && ( DIAL_IN_PUMP_CONTROL_TO_TARGET_STATE == dialInPumpState ) )
@@ -1162,11 +1159,10 @@
 
         if ( delta > DIP_MAX_FLOW_VS_SPEED_DIFF_RPM )
         {
-            if ( ++errorDialInFlowVsMotorSpeedPersistTimerCtr >= DIP_FLOW_VS_SPEED_PERSIST )
+            if ( ( ++errorDialInFlowVsMotorSpeedPersistTimerCtr >= DIP_FLOW_VS_SPEED_PERSIST ) &&
+                 ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PUMP_FLOW_CHECKS ) != SW_CONFIG_ENABLE_VALUE ) )
             {
-#ifndef DISABLE_PUMP_FLOW_CHECKS
                 SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DIAL_IN_PUMP_FLOW_VS_MOTOR_SPEED_CHECK, flow, speed );
-#endif
             }
         }
         else
@@ -1199,11 +1195,10 @@
         if ( dipCurr > DIP_MAX_CURR_WHEN_STOPPED_MA )
         {
             dipCurrErrorDurationCtr += TASK_PRIORITY_INTERVAL;
-            if ( dipCurrErrorDurationCtr > DIP_MAX_CURR_ERROR_DURATION_MS )
+            if ( ( dipCurrErrorDurationCtr > DIP_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_IN_PUMP_MC_CURRENT_CHECK, getMeasuredDialInPumpMCCurrent() );
-#endif
             }
         }
         else
@@ -1218,11 +1213,10 @@
         if ( dipCurr > DIP_MAX_CURR_WHEN_RUNNING_MA )
         {
             dipCurrErrorDurationCtr += TASK_PRIORITY_INTERVAL;
-            if ( dipCurrErrorDurationCtr > DIP_MAX_CURR_ERROR_DURATION_MS )
+            if ( ( dipCurrErrorDurationCtr > DIP_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_IN_PUMP_MC_CURRENT_CHECK, getMeasuredDialInPumpMCCurrent() );
-#endif
             }
         }
         else