Index: firmware/App/Controllers/DrainPump.c
===================================================================
diff -u -r38c28a43b71d21d72906b07e9d60107b84bffb37 -rbcf9339af8a725054a8c936ae572bb95e2bcd3f0
--- firmware/App/Controllers/DrainPump.c	(.../DrainPump.c)	(revision 38c28a43b71d21d72906b07e9d60107b84bffb37)
+++ firmware/App/Controllers/DrainPump.c	(.../DrainPump.c)	(revision bcf9339af8a725054a8c936ae572bb95e2bcd3f0)
@@ -324,18 +324,9 @@
  *************************************************************************/
 void execDrainPumpMonitor( void )
 {
-    U16 fpgaADCSpeedCount = getFPGADrainPumpSpeed();
+    U16 fpgaADCSpeedCount     = getFPGADrainPumpSpeed();
+    drainPumpMeasuredRPM.data = ( DRAIN_PUMP_OFF_RPM_ADC_COUNT == fpgaADCSpeedCount ? 0 : ( CONVERSION_COEFF / fpgaADCSpeedCount ) );
 
-    if ( DRAIN_PUMP_OFF_RPM_ADC_COUNT == fpgaADCSpeedCount )
-    {
-        drainPumpMeasuredRPM.data = 0;
-    }
-    else
-    {
-        // Convert speed ADC to RPM
-        drainPumpMeasuredRPM.data = CONVERSION_COEFF / getFPGADrainPumpSpeed();
-    }
-
 #ifndef _RELEASE_
     if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_DRAIN_PUMP_MONITOR ) != SW_CONFIG_ENABLE_VALUE )
 #endif
@@ -346,9 +337,7 @@
             BOOL isRPMTooHigh = ( getDrainPumpMeasuredRPM() > MIN_DRAIN_PUMP_RPM ? TRUE : FALSE );
 
             checkPersistentAlarm( ALARM_ID_DRAIN_PUMP_RPM_OUT_OF_RANGE, FALSE, getDrainPumpMeasuredRPM(), MAX_ALLOWED_OPEN_LOOP_RPM_OUT_OF_RANGE );
-#ifndef ENABLE_DVT_BOARD
-            checkPersistentAlarm( ALARM_ID_DRAIN_PUMP_OFF_FAULT, isRPMTooHigh, getDrainPumpMeasuredRPM(), MIN_DRAIN_PUMP_RPM ); // TODO DVT
-#endif
+            checkPersistentAlarm( ALARM_ID_DRAIN_PUMP_OFF_FAULT, isRPMTooHigh, getDrainPumpMeasuredRPM(), MIN_DRAIN_PUMP_RPM );
 
             // If the off fault alarm has become active, trigger the safety shutdown
             if ( TRUE == isAlarmActive( ALARM_ID_DRAIN_PUMP_OFF_FAULT ) )
@@ -360,21 +349,17 @@
         else if ( DRAIN_PUMP_OPEN_LOOP_STATE == drainPumpState )
         {
             // Using abs since the read RPM can be above or below the target
-            U32 rpmDiff = abs( getDrainPumpTargetRPM() - getDrainPumpMeasuredRPM() );
-
-            // Check if RPM is out of range
+            U32 rpmDiff          = abs( getDrainPumpTargetRPM() - getDrainPumpMeasuredRPM() );
             BOOL isRPMOutOfRange = ( rpmDiff > MAX_ALLOWED_OPEN_LOOP_RPM_OUT_OF_RANGE ? TRUE : FALSE );
 
-#ifndef ENABLE_DVT_BOARD
             checkPersistentAlarm( ALARM_ID_DRAIN_PUMP_RPM_OUT_OF_RANGE, isRPMOutOfRange, getDrainPumpMeasuredRPM(), MAX_ALLOWED_OPEN_LOOP_RPM_OUT_OF_RANGE );
-            checkPersistentAlarm( ALARM_ID_DRAIN_PUMP_OFF_FAULT, FALSE, getDrainPumpMeasuredRPM(), MIN_DRAIN_PUMP_RPM ); // TODO DVT
-#endif
+            checkPersistentAlarm( ALARM_ID_DRAIN_PUMP_OFF_FAULT, FALSE, getDrainPumpMeasuredRPM(), MIN_DRAIN_PUMP_RPM );
         }
         else
         {
             // There are not out of range conditions, clear the alarms
             checkPersistentAlarm( ALARM_ID_DRAIN_PUMP_RPM_OUT_OF_RANGE, FALSE, getDrainPumpMeasuredRPM(), MAX_ALLOWED_OPEN_LOOP_RPM_OUT_OF_RANGE );
-            checkPersistentAlarm( ALARM_ID_DRAIN_PUMP_OFF_FAULT, FALSE, getDrainPumpMeasuredRPM(), MIN_DRAIN_PUMP_RPM ); // TODO DVT
+            checkPersistentAlarm( ALARM_ID_DRAIN_PUMP_OFF_FAULT, FALSE, getDrainPumpMeasuredRPM(), MIN_DRAIN_PUMP_RPM );
         }
     }