Index: firmware/App/Controllers/DrainPump.c
===================================================================
diff -u -rcff72ec53660ec3ff6775c0508e3c721240ffba2 -r6f2991204047ccbceeb5461f7c35af6d8f5dfd0b
--- firmware/App/Controllers/DrainPump.c	(.../DrainPump.c)	(revision cff72ec53660ec3ff6775c0508e3c721240ffba2)
+++ firmware/App/Controllers/DrainPump.c	(.../DrainPump.c)	(revision 6f2991204047ccbceeb5461f7c35af6d8f5dfd0b)
@@ -33,6 +33,7 @@
 #include "TaskGeneral.h"
 #include "TaskPriority.h"
 #include "Timers.h"
+#include "Utilities.h"
 #include "Valves.h"
 
 /**
@@ -365,7 +366,7 @@
 #endif
     {
 #ifndef _RELEASE_
-        if ( ( getSoftwareConfigStatus( SW_CONFIG_ENABLE_V3_SYSTEM ) != SW_CONFIG_ENABLE_VALUE ) && ( getCurrentOperationMode() != DG_MODE_INIT ) )
+        if ( ( getHardwareConfigStatus() != HW_CONFIG_BETA ) && ( getCurrentOperationMode() != DG_MODE_INIT ) )
 #endif
         {
             checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_DRAIN_PUMP_DIR_HALL_SENSOR, dirHallSensorErrorCount );
@@ -388,7 +389,7 @@
                 }
 
 #ifndef _RELEASE_
-                if ( ( getSoftwareConfigStatus( SW_CONFIG_ENABLE_V3_SYSTEM ) != SW_CONFIG_ENABLE_VALUE ) && ( getCurrentOperationMode() != DG_MODE_INIT ) )
+                if ( ( getHardwareConfigStatus() != HW_CONFIG_BETA ) && ( getCurrentOperationMode() != DG_MODE_INIT ) )
 #endif
                 {
                     checkPersistentAlarm( ALARM_ID_DG_DRAIN_PUMP_CURRENT_OUT_OF_RANGE, isOffCurrentOut, currentA, DRAIN_PUMP_MAX_CURRENT_WHEN_OFF_A );
@@ -409,7 +410,7 @@
                 checkPersistentAlarm( ALARM_ID_DRAIN_PUMP_OFF_FAULT, FALSE, getDrainPumpMeasuredRPM(), MIN_DRAIN_PUMP_RPM );
 
 #ifndef _RELEASE_
-                if ( ( getSoftwareConfigStatus( SW_CONFIG_ENABLE_V3_SYSTEM ) != SW_CONFIG_ENABLE_VALUE ) && ( getCurrentOperationMode() != DG_MODE_INIT ) )
+                if ( ( getHardwareConfigStatus() != HW_CONFIG_BETA ) && ( getCurrentOperationMode() != DG_MODE_INIT ) )
 #endif
                 {
                     checkPersistentAlarm( ALARM_ID_DG_DRAIN_PUMP_DIRECTION_INVALID, isDirInvalid, (F32)direction, DRAIN_PUMP_FORWARD_DIR );
@@ -423,7 +424,7 @@
                 BOOL isDirInvalid = ( direction != DRAIN_PUMP_FORWARD_DIR ? TRUE : FALSE );
 
 #ifndef _RELEASE_
-                if ( ( getSoftwareConfigStatus( SW_CONFIG_ENABLE_V3_SYSTEM ) != SW_CONFIG_ENABLE_VALUE ) && ( getCurrentOperationMode() != DG_MODE_INIT ) )
+                if ( ( getHardwareConfigStatus() != HW_CONFIG_BETA ) && ( getCurrentOperationMode() != DG_MODE_INIT ) )
 #endif
                 {
                     checkPersistentAlarm( ALARM_ID_DG_DRAIN_PUMP_DIRECTION_INVALID, isDirInvalid, (F32)direction, DRAIN_PUMP_FORWARD_DIR );
@@ -440,7 +441,7 @@
         }
 
 #ifndef _RELEASE_
-        if ( ( getSoftwareConfigStatus( SW_CONFIG_ENABLE_V3_SYSTEM ) != SW_CONFIG_ENABLE_VALUE ) && ( getCurrentOperationMode() != DG_MODE_INIT ) )
+        if ( ( getHardwareConfigStatus() != HW_CONFIG_BETA ) && ( getCurrentOperationMode() != DG_MODE_INIT ) )
 #endif
         {
             // Check the persistent alarm for the maximum drain pump current