Index: firmware/App/Controllers/DialOutFlow.c
===================================================================
diff -u -rd33ae635eb38ae8f2647f68304be74e8e4f78cfd -r667feab319b14681a0330a715da7a1ba930b518d
--- firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision d33ae635eb38ae8f2647f68304be74e8e4f78cfd)
+++ firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision 667feab319b14681a0330a715da7a1ba930b518d)
@@ -935,9 +935,7 @@
             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
@@ -946,9 +944,7 @@
             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
@@ -987,10 +983,8 @@
             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
@@ -1018,9 +1012,7 @@
             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
@@ -1034,9 +1026,7 @@
             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
@@ -1073,9 +1063,7 @@
             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
@@ -1093,9 +1081,7 @@
             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