Index: firmware/App/Controllers/DrainPump.c
===================================================================
diff -u -r94b2082ddcec6ccb947e67714dc85ae005a2c7b6 -r5c967dc311b485769e50e5e4f122be21079b5ae9
--- firmware/App/Controllers/DrainPump.c	(.../DrainPump.c)	(revision 94b2082ddcec6ccb947e67714dc85ae005a2c7b6)
+++ firmware/App/Controllers/DrainPump.c	(.../DrainPump.c)	(revision 5c967dc311b485769e50e5e4f122be21079b5ae9)
@@ -256,10 +256,11 @@
      * This part of code is commented out until the RPM is calculated from ADC correctly.
      * There will be a story to address the RPM conversion.
      */
+#ifndef IGNORE_DRAIN_PUMP_MONITOR
     // The RPM is only checked in open loop state that the pump is run at a fixed RPM.
     // The persistent alarm waits for a couple of seconds before raising an alarm, this is supposed to cover
     // when the pump is turned on and it takes a while to ramp up to target RPM.
-    /*if( drainPumpControlModeSet == PUMP_CONTROL_MODE_OPEN_LOOP )
+    if( drainPumpControlModeSet == PUMP_CONTROL_MODE_OPEN_LOOP )
     {
         U32 targetRPM = getTargetDrainPumpRPM();
         F32 threshold = OPEN_LOOP_RPM_OUT_OF_RANGE * targetRPM;
@@ -283,7 +284,8 @@
             //activateSafetyShutdown();
             BOOL test = FALSE;
         }
-    }*/
+    }
+#endif
 
     // Publish drain pump data on interval
     publishDrainPumpData();
@@ -448,7 +450,7 @@
     DRAIN_PUMP_STATE_T state = DRAIN_PUMP_OPEN_LOOP_STATE;
 
     // Check if the RPM is 0, and if it is turn off the pump
-    if ( getTargetDrainPumpRPM() == 0 )
+    if ( 0 == getTargetDrainPumpRPM() )
     {
         state = DRAIN_PUMP_OFF_STATE;
         signalDrainPumpHardStop();