Index: firmware/App/Controllers/DrainPump.c
===================================================================
diff -u -re0cdf49eb0f54239e5d765282e0952cea7ded1bd -r264d5853c97ab9550878609c9302e87464078734
--- firmware/App/Controllers/DrainPump.c	(.../DrainPump.c)	(revision e0cdf49eb0f54239e5d765282e0952cea7ded1bd)
+++ firmware/App/Controllers/DrainPump.c	(.../DrainPump.c)	(revision 264d5853c97ab9550878609c9302e87464078734)
@@ -73,7 +73,7 @@
 #define SET_DRAIN_PUMP_ENABLE()                {mibspiREG3->PC3 |= DRAIN_PUMP_ENABLE_SPI3_PORT_MASK;}           ///< Drain pump enable set macro.
 #define CLR_DRAIN_PUMP_ENABLE()                {mibspiREG3->PC3 &= ~DRAIN_PUMP_ENABLE_SPI3_PORT_MASK;}          ///< Drain pump enable clear macro.
 
-#define SAFETY_SHUTDOWN_TIMEOUT                MS_PER_SECOND                                                    ///< Drain pump safety shutdown activation timeout.
+#define SAFETY_SHUTDOWN_TIMEOUT                ( 1 * MS_PER_SECOND )                                            ///< Drain pump safety shutdown activation timeout.
 
 #define DRAIN_PUMP_OFF_RPM_ADC_COUNT           0xFFFF                                                           ///< ADC count value when pump is off.
 #define DATA_PUBLISH_COUNTER_START_COUNT       60                                                               ///< Data publish counter start count.
@@ -361,10 +361,12 @@
         BOOL isRPMOutOfRange = ( rpmDiff > MAX_ALLOWED_OPEN_LOOP_RPM_OUT_OF_RANGE ? TRUE : FALSE );
 
         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 );
     }
     else
     {
         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 );
     }
 #endif