Index: firmware/App/Controllers/DialInFlow.c
===================================================================
diff -u -r9e85e7ace1390d48587174a5bc6eb11d5185cea4 -rd33ae635eb38ae8f2647f68304be74e8e4f78cfd
--- firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 9e85e7ace1390d48587174a5bc6eb11d5185cea4)
+++ firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision d33ae635eb38ae8f2647f68304be74e8e4f78cfd)
@@ -1005,7 +1005,8 @@
 
 #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;
             SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_PUMP_DIRECTION_STATUS_ERROR, (U32)HD_PUMP_DIALYSATE_INLET_PUMP )
@@ -1018,7 +1019,8 @@
         // 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 )
@@ -1028,7 +1030,8 @@
         // 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 )
@@ -1068,7 +1071,8 @@
     {
         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 );
@@ -1099,7 +1103,8 @@
         // 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 );
@@ -1114,7 +1119,8 @@
         // 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 );
@@ -1148,7 +1154,8 @@
 
     // 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 );
     }
@@ -1164,7 +1171,8 @@
 
         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 );
@@ -1201,7 +1209,8 @@
         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() );
@@ -1220,7 +1229,8 @@
         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() );