Index: firmware/App/Controllers/DrainPump.c
===================================================================
diff -u -r7fe3d2932b501e323a6fb0eb47964b32da6798d9 -r4b37115aead2565979d889518c492389757a6346
--- firmware/App/Controllers/DrainPump.c	(.../DrainPump.c)	(revision 7fe3d2932b501e323a6fb0eb47964b32da6798d9)
+++ firmware/App/Controllers/DrainPump.c	(.../DrainPump.c)	(revision 4b37115aead2565979d889518c492389757a6346)
@@ -350,9 +350,14 @@
     if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_DRAIN_PUMP_MONITOR ) != SW_CONFIG_ENABLE_VALUE )
 #endif
     {
-        if ( ( getHardwareConfigStatus() != HW_CONFIG_BETA ) && ( getCurrentOperationMode() != DG_MODE_INIT ) )
+#ifndef _RELEASE_
+        if ( getHardwareConfigStatus() != HW_CONFIG_BETA )
+#endif
         {
-            checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_DRAIN_PUMP_DIR_HALL_SENSOR, dirHallSensorErrorCount );
+            if ( getCurrentOperationMode() != DG_MODE_INIT )
+            {
+                checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_DRAIN_PUMP_DIR_HALL_SENSOR, dirHallSensorErrorCount );
+            }
         }
 
         switch( drainPumpState )
@@ -374,10 +379,15 @@
                     activateSafetyShutdown();
                 }
 
-                if ( ( getHardwareConfigStatus() != HW_CONFIG_BETA ) && ( getCurrentOperationMode() != DG_MODE_INIT ) )
+#ifndef _RELEASE_
+                if ( getHardwareConfigStatus() != HW_CONFIG_BETA )
+#endif
                 {
-                    checkPersistentAlarm( ALARM_ID_DG_DRAIN_PUMP_CURRENT_OUT_OF_RANGE, isOffCurrentOut, currentA, DRAIN_PUMP_MAX_CURRENT_WHEN_OFF_A );
-                    checkPersistentAlarm( ALARM_ID_DG_DRAIN_PUMP_DIRECTION_INVALID, FALSE, getFPGADrainPumpDirection(), DRAIN_PUMP_FORWARD_DIR );
+                    if ( getCurrentOperationMode() != DG_MODE_INIT )
+                    {
+                        checkPersistentAlarm( ALARM_ID_DG_DRAIN_PUMP_CURRENT_OUT_OF_RANGE, isOffCurrentOut, currentA, DRAIN_PUMP_MAX_CURRENT_WHEN_OFF_A );
+                        checkPersistentAlarm( ALARM_ID_DG_DRAIN_PUMP_DIRECTION_INVALID, FALSE, getFPGADrainPumpDirection(), DRAIN_PUMP_FORWARD_DIR );
+                    }
                 }
             }
             break;
@@ -395,7 +405,9 @@
 
                 isRPMOutOfRange |= ( rpmHallDiff > MAX_ALLOWED_OPEN_LOOP_RPM_OUT_OF_RANGE ? TRUE : FALSE );
 
+#ifndef _RELEASE_
                 if ( getHardwareConfigStatus() != HW_CONFIG_BETA )
+#endif
                 {
                     isRPMOutOfRange |= ( rpmMaxonDiff > MAX_ALLOWED_OPEN_LOOP_RPM_OUT_OF_RANGE ? TRUE : FALSE );
                 }
@@ -415,9 +427,14 @@
                 U32 direction     = getDrainPumpMeasuredDirection();
                 BOOL isDirInvalid = ( direction != DRAIN_PUMP_FORWARD_DIR ? TRUE : FALSE );
 
-                if ( ( getHardwareConfigStatus() != HW_CONFIG_BETA ) && ( getCurrentOperationMode() != DG_MODE_INIT ) )
+#ifndef _RELEASE_
+                if ( getHardwareConfigStatus() != HW_CONFIG_BETA )
+#endif
                 {
-                    checkPersistentAlarm( ALARM_ID_DG_DRAIN_PUMP_DIRECTION_INVALID, isDirInvalid, (F32)direction, DRAIN_PUMP_FORWARD_DIR );
+                    if ( getCurrentOperationMode() != DG_MODE_INIT )
+                    {
+                        checkPersistentAlarm( ALARM_ID_DG_DRAIN_PUMP_DIRECTION_INVALID, isDirInvalid, (F32)direction, DRAIN_PUMP_FORWARD_DIR );
+                    }
                 }
             }
             break;
@@ -430,12 +447,17 @@
                 break;
         }
 
-        if ( ( getHardwareConfigStatus() != HW_CONFIG_BETA ) && ( getCurrentOperationMode() != DG_MODE_INIT ) )
+#ifndef _RELEASE_
+        if ( getHardwareConfigStatus() != HW_CONFIG_BETA )
+#endif
         {
-            // Check the persistent alarm for the maximum drain pump current
-            BOOL isCurrentOutOfRange = ( currentA > DRAIN_PUMP_MAX_CURRENT_A ? TRUE : FALSE );
+            if ( getCurrentOperationMode() != DG_MODE_INIT )
+            {
+                // Check the persistent alarm for the maximum drain pump current
+                BOOL isCurrentOutOfRange = ( currentA > DRAIN_PUMP_MAX_CURRENT_A ? TRUE : FALSE );
 
-            checkPersistentAlarm( ALARM_ID_DG_DRAIN_PUMP_CURRENT_OUT_OF_RANGE, isCurrentOutOfRange, currentA, DRAIN_PUMP_MAX_CURRENT_A );
+                checkPersistentAlarm( ALARM_ID_DG_DRAIN_PUMP_CURRENT_OUT_OF_RANGE, isCurrentOutOfRange, currentA, DRAIN_PUMP_MAX_CURRENT_A );
+            }
         }
     }
 
@@ -570,20 +592,14 @@
 {
     U32 rpm = 0;
 
-    switch ( sensor )
+    if ( DRAIN_PUMP_HALL_SNSR_FB == sensor )
     {
-        case DRAIN_PUMP_HALL_SNSR_FB:
-            rpm = getU32OverrideValue( &drainPumpHallMeasuredRPM );
-            break;
-
-        case DRAIN_PUMP_MAXON_SNSR_FB:
-            rpm = getU32OverrideValue( &drainPumpMaxonMeasuredRPM );
-            break;
-
-        default:
-            // Do nothing. Software fault?
-            break;
+        rpm = getU32OverrideValue( &drainPumpHallMeasuredRPM );
     }
+    else if ( DRAIN_PUMP_MAXON_SNSR_FB == sensor )
+    {
+        rpm = getU32OverrideValue( &drainPumpMaxonMeasuredRPM );
+    }
 
     return rpm;
 }
@@ -973,20 +989,18 @@
     // Check if the user is logged in
     if ( ( TRUE == isTestingActivated() ) && ( (DRAIN_PUMP_SPEED_FB_SNSR_T)sensor < NUM_OF_DRAIN_PUMP_SNSR_FB ) )
     {
-        switch( (DRAIN_PUMP_SPEED_FB_SNSR_T)sensor )
+        if ( DRAIN_PUMP_HALL_SNSR_FB == (DRAIN_PUMP_SPEED_FB_SNSR_T)sensor )
         {
-            case DRAIN_PUMP_HALL_SNSR_FB:
-                drainPumpHallMeasuredRPM.ovData     = value;
-                drainPumpHallMeasuredRPM.override   = OVERRIDE_KEY;
-                drainPumpHallMeasuredRPM.ovInitData = drainPumpHallMeasuredRPM.data;
-                break;
-
-            case DRAIN_PUMP_MAXON_SNSR_FB:
-                drainPumpMaxonMeasuredRPM.ovData     = value;
-                drainPumpMaxonMeasuredRPM.override   = OVERRIDE_KEY;
-                drainPumpMaxonMeasuredRPM.ovInitData = drainPumpMaxonMeasuredRPM.data;
-                break;
+            drainPumpHallMeasuredRPM.ovData     = value;
+            drainPumpHallMeasuredRPM.override   = OVERRIDE_KEY;
+            drainPumpHallMeasuredRPM.ovInitData = drainPumpHallMeasuredRPM.data;
         }
+        else if ( DRAIN_PUMP_MAXON_SNSR_FB == (DRAIN_PUMP_SPEED_FB_SNSR_T)sensor )
+        {
+            drainPumpMaxonMeasuredRPM.ovData     = value;
+            drainPumpMaxonMeasuredRPM.override   = OVERRIDE_KEY;
+            drainPumpMaxonMeasuredRPM.ovInitData = drainPumpMaxonMeasuredRPM.data;
+        }
 
         status = TRUE;
     }
@@ -1010,18 +1024,16 @@
     // Check if the user is logged in
     if ( ( TRUE == isTestingActivated() ) && ( (DRAIN_PUMP_SPEED_FB_SNSR_T)sensor < NUM_OF_DRAIN_PUMP_SNSR_FB ) )
     {
-        switch( (DRAIN_PUMP_SPEED_FB_SNSR_T)sensor )
+        if ( DRAIN_PUMP_HALL_SNSR_FB == (DRAIN_PUMP_SPEED_FB_SNSR_T)sensor )
         {
-            case DRAIN_PUMP_HALL_SNSR_FB:
-                drainPumpHallMeasuredRPM.ovData   = drainPumpHallMeasuredRPM.ovInitData;
-                drainPumpHallMeasuredRPM.override = OVERRIDE_RESET;
-                break;
-
-            case DRAIN_PUMP_MAXON_SNSR_FB:
-                drainPumpMaxonMeasuredRPM.ovData   = drainPumpMaxonMeasuredRPM.ovInitData;
-                drainPumpMaxonMeasuredRPM.override = OVERRIDE_RESET;
-                break;
+            drainPumpHallMeasuredRPM.ovData   = drainPumpHallMeasuredRPM.ovInitData;
+            drainPumpHallMeasuredRPM.override = OVERRIDE_RESET;
         }
+        else if ( DRAIN_PUMP_MAXON_SNSR_FB == (DRAIN_PUMP_SPEED_FB_SNSR_T)sensor )
+        {
+            drainPumpMaxonMeasuredRPM.ovData   = drainPumpMaxonMeasuredRPM.ovInitData;
+            drainPumpMaxonMeasuredRPM.override = OVERRIDE_RESET;
+        }
 
         status = TRUE;
     }