Index: firmware/App/Controllers/DialOutFlow.c
===================================================================
diff -u -r9e85e7ace1390d48587174a5bc6eb11d5185cea4 -rd33ae635eb38ae8f2647f68304be74e8e4f78cfd
--- firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision 9e85e7ace1390d48587174a5bc6eb11d5185cea4)
+++ firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision d33ae635eb38ae8f2647f68304be74e8e4f78cfd)
@@ -932,7 +932,8 @@
         // 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 )
@@ -942,7 +943,8 @@
         // 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 )
@@ -982,7 +984,8 @@
     {
         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 );
@@ -1012,7 +1015,8 @@
         // 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 );
@@ -1027,7 +1031,8 @@
         // 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 );
@@ -1065,7 +1070,8 @@
         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() );
@@ -1084,7 +1090,8 @@
         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() );