Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -ra6587c2ba0a40bdf12b5fdcf2ba8dec0cd958cfa -r876a1cdab00a28265349cec424f77709a101db5c
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision a6587c2ba0a40bdf12b5fdcf2ba8dec0cd958cfa)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 876a1cdab00a28265349cec424f77709a101db5c)
@@ -48,7 +48,7 @@
 // ********** private definitions **********
 
 #define DISINFECTS_DATA_PUB_INTERVAL          ( 1 * MS_PER_SECOND / TASK_GENERAL_INTERVAL )    ///< Disinfects data publish interval in counts.
-#define DISINFECTS_TIME_INTERVAL_S            ( 2 * SECONDS_IN_A_DAY )                         ///< HD/DG 2-day service interval in seconds.
+#define DISINFECTS_TIME_INTERVAL_S            ( 3 * SECONDS_IN_A_DAY )                         ///< HD/DG 2-day service interval in seconds.
 #define FLUSH_TIME_INTERVAL_S                 ( 30 * SEC_PER_MIN * MS_PER_SECOND )             ///< Flush time interval in seconds.
 #define MAX_ALLOWED_RO_FILTER_TEMP_FOR_TX_C   44.0F                                            ///< Maximum allowed temperature to start a treatment in C.
 
@@ -1204,29 +1204,27 @@
         U32 lastChemFlushCompleteDate = data.dgUsageInfo.lastChemDisFlushCompleteDateEpoch;
         U32 lastHeatCompleteDate      = data.dgUsageInfo.lastHeatDisCompleteDateEpoch;
         U32 lastFlushCompleteDate     = data.dgUsageInfo.lastBasicFlushCompleteDateEpoch;
+        U32 lastHeatCoolCompleteDate  = data.dgUsageInfo.lastHeatActiveCoolCompleteDateEpoch;
         U32 lastStartTxTimeDate       = usageRecord.txLastStartTimeEpoch;
 
         // Last Treatment Start < Last Heat Disinfect Complete or Last Treatment Start < Last Chem Disinfect Complete so it means at least a heat disinfect
         // or a chemical disinfect has been done since the last treatment
         BOOL hasDisBeenDone = ( ( ( lastStartTxTimeDate < lastChemCompleteDate ) || ( lastStartTxTimeDate < lastHeatCompleteDate ) ) ? TRUE : FALSE );
 
-        // Last Chem Disinfect Complete < Current Time – Chem Disinfect Interval, so the chemical disinfect that has been done has not been expired
-        BOOL isChemDisValid = ( lastChemCompleteDate < ( getRTCTimestamp() - DISINFECTS_TIME_INTERVAL_S ) ? TRUE : FALSE );
-
         // Last Heat Disinfect Complete < Current Time – Heat Disinfect Interval, so the heat disinfect that has been done has not been expired
         BOOL isHeatDisValid = ( lastHeatCompleteDate < ( getRTCTimestamp() - DISINFECTS_TIME_INTERVAL_S ) ? TRUE : FALSE );
 
         // Last Chem Flush Complete < Last Chem Disinfect Start, so after running a chemical disinfect, a chemical disinfect flush has been done
         BOOL isChemFlushComplete = ( lastChemFlushCompleteDate > lastChemCompleteDate ? TRUE : FALSE );
 
         // If either of the basic flush, heat disinfect, or chemical disinfect flush have been done within the interval, it means the filters have been flushed
-        BOOL isBasicFlushValid   = ( lastFlushCompleteDate     < ( getRTCTimestamp() - FLUSH_TIME_INTERVAL_S ) ? TRUE : TRUE );
-        BOOL isHeatDisFlushValid = ( lastHeatCompleteDate      < ( getRTCTimestamp() - FLUSH_TIME_INTERVAL_S ) ? TRUE : TRUE );
-        BOOL isChemFlushValid    = ( lastChemFlushCompleteDate < ( getRTCTimestamp() - FLUSH_TIME_INTERVAL_S ) ? TRUE : TRUE );
-        BOOL isFlushValid        = ( isBasicFlushValid || isHeatDisFlushValid || isChemFlushValid );
+        BOOL isBasicFlushValid       = ( lastFlushCompleteDate     < ( getRTCTimestamp() - FLUSH_TIME_INTERVAL_S ) ? TRUE : TRUE );
+        BOOL isChemFlushValid        = ( lastChemFlushCompleteDate < ( getRTCTimestamp() - FLUSH_TIME_INTERVAL_S ) ? TRUE : TRUE );
+        BOOL isHeatDisCoolFlushValid = ( lastHeatCoolCompleteDate < ( getRTCTimestamp() - FLUSH_TIME_INTERVAL_S ) ? TRUE : TRUE );
+        BOOL isFlushValid            = ( isBasicFlushValid || isChemFlushValid || isHeatDisCoolFlushValid );
 
         // If all of the above conditions are true, it means we can start a treatment
-        if ( ( TRUE == hasDisBeenDone ) && ( TRUE == isChemDisValid ) && ( TRUE == isHeatDisValid ) && ( TRUE == isChemFlushComplete ) && ( TRUE == isFlushValid ) )
+        if ( ( TRUE == hasDisBeenDone ) && ( TRUE == isHeatDisValid ) && ( TRUE == isChemFlushComplete ) && ( TRUE == isFlushValid ) )
         {
             status = TRUE;
         }