Index: sources/drydemo/StateControllerRecirc.cpp
===================================================================
diff -u -rfb3e70cb47f3d22f31f68358c1bda69cce9cd248 -rb9f4ddeb2dec3019b87c712bfe64b8df1d4b328c
--- sources/drydemo/StateControllerRecirc.cpp	(.../StateControllerRecirc.cpp)	(revision fb3e70cb47f3d22f31f68358c1bda69cce9cd248)
+++ sources/drydemo/StateControllerRecirc.cpp	(.../StateControllerRecirc.cpp)	(revision b9f4ddeb2dec3019b87c712bfe64b8df1d4b328c)
@@ -19,7 +19,7 @@
     quint32 acceptReject = REJECT_VALUE;
     quint32 recircCmd    = extractU32DataFromReceivedMessage(ID_UI_RECIRCULATE_RQST, 0);
 
-    if (_treatmentStatus.activeAlarm != ALARM_ID_NO_ALARM) {
+    if (_treatmentStatus.activeTopAlarm != ALARM_ID_NO_ALARM) {
         reason.append(REQUEST_REJECT_REASON_ALARM_IS_ACTIVE);
         handleUIResponseMessage(ID_TD_RECIRCULATE_RESP, acceptReject, reason);
         _treatmentRcvdMessages[ID_UI_RECIRCULATE_RQST].clear();
@@ -78,14 +78,12 @@
     quint32 warningTimeS       = _treatmentStatus.recircTimeoutS - (RECIRC_WARN_BEFORE_TIMEOUT_MIN * SECONDS_PER_MINUTE);
     Q_UNUSED(warningTimeS)
 
-    //if ((recircElapsedTimeS >= warningTimeS) && (_treatmentStatus.activeAlarm != ALARM_ID_TD_RECIRC_TIMEOUT_WARNING)) {
-    if ((recircElapsedTimeS >= 20) && !_treatmentStatus.hasRecircWarnAlarmBeenTrig) {
+    if ((recircElapsedTimeS >= warningTimeS) && (_treatmentStatus.activeTopAlarm != ALARM_ID_TD_RECIRC_TIMEOUT_WARNING)) {
         _treatmentStatus.hasRecircWarnAlarmBeenTrig = true;
         triggerAnAlarm(ALARM_ID_TD_RECIRC_TIMEOUT_WARNING);
     }
 
-    //if ((recircElapsedTimeS >= _treatmentStatus.recircTimeoutS) && (_treatmentStatus.activeAlarm != ALARM_ID_TD_RECIRC_TIMEOUT)) {
-    if ((recircElapsedTimeS >= 30) && !_treatmentStatus.hasRecircTimeoutAlarmBeenTrig) {
+    if ((recircElapsedTimeS >= _treatmentStatus.recircTimeoutS) && (_treatmentStatus.activeTopAlarm != ALARM_ID_TD_RECIRC_TIMEOUT)) {
         _treatmentStatus.hasRecircTimeoutAlarmBeenTrig = true;
         triggerAnAlarm(ALARM_ID_TD_RECIRC_TIMEOUT);
     }