Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r34d0843fa73e79ba3b085dd4aaa393a1ec126fd4 -rc429cf7f50851acbaca6e800957ef44cc1fa2162
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 34d0843fa73e79ba3b085dd4aaa393a1ec126fd4)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision c429cf7f50851acbaca6e800957ef44cc1fa2162)
@@ -48,6 +48,7 @@
 
 #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 FLUSH_TIME_INTERVAL_S                 ( 30 * SEC_PER_MIN * MS_PER_SECOND )             ///< Flush time interval in seconds.
 
 // ********** private data **********
 
@@ -958,27 +959,43 @@
 static BOOL isDGDisinfectValid( void )
 {
     DG_SERVICE_AND_USAGE_DATA_T data;
-    BOOL status = TRUE;
+    BOOL status = FALSE;
 
     getHDVersionDGServiceAndUsageData( &data );
 
     if ( TRUE == data.isDGUsageInfoAviable )
     {
-        if ( TRUE == data.dgUsageInfo.isDisinfected )
-        {
-            U32 chemDisElapsedTimeS    = getRTCTimestamp() - data.dgUsageInfo.lastChemicalDisDateEpoch;
-            BOOL hasChemDisBeenExpired = ( chemDisElapsedTimeS > DISINFECTS_TIME_INTERVAL_S ? TRUE : FALSE );
-            U32 heatDisElapsedTimeS    = getRTCTimestamp() - data.dgUsageInfo.lastHeatDisDateEpoch;
-            BOOL hasHeatDisBeenExpired = ( heatDisElapsedTimeS > DISINFECTS_TIME_INTERVAL_S ? TRUE : FALSE );
+        HD_USAGE_INFO_RECORD_T usageRecord;
+        getNVRecord2Driver( GET_USAGE_RECORD, (U08*)&usageRecord, sizeof( HD_USAGE_INFO_RECORD_T ), 0, ALARM_ID_NO_ALARM );
 
-            if ( ( TRUE == hasChemDisBeenExpired ) && ( TRUE == hasHeatDisBeenExpired ) )
-            {
-                status = FALSE;
-            }
-        }
-        else
+        U32 lastChemCompleteDate      = data.dgUsageInfo.lastChemDisCompleteDateEpoch;
+        U32 lastChemFlushCompleteDate = data.dgUsageInfo.lastChemDisFlushCompleteDateEpoch;
+        U32 lastHeatCompleteDate      = data.dgUsageInfo.lastHeatDisCompleteDateEpoch;
+        U32 lastFlushCompleteDate     = data.dgUsageInfo.lastBasicFlushCompleteDateEpoch;
+        U32 lastStartTxTimeDate       = usageRecord.txLastStartTimeEpoch;
+
+        // Last Treatment Start > Last Heat Disinfect Complete AND Last Treatment Start > Last Chem Disinfect Complete
+        BOOL hasDisBeenDone = ( ( ( lastStartTxTimeDate > lastChemCompleteDate ) && ( lastStartTxTimeDate > lastHeatCompleteDate ) ) ? FALSE : TRUE );
+
+        // Last Chem Disinfect Complete < Current Time – Chem Disinfect Interval
+        BOOL isChemDisValid = ( lastChemCompleteDate < ( getRTCTimestamp() - DISINFECTS_TIME_INTERVAL_S ) ? TRUE : FALSE );
+
+        // Last Heat Disinfect Complete < Current Time – Heat Disinfect Interval
+        BOOL isHeatDisValid = ( lastHeatCompleteDate < ( getRTCTimestamp() - DISINFECTS_TIME_INTERVAL_S ) ? TRUE : FALSE );
+
+        // Last Chem Flush Complete < Last Chem Disinfect Start
+        BOOL isChemFlushComplete = ( lastChemFlushCompleteDate < lastChemCompleteDate ? FALSE : TRUE );
+
+        // Last Basic Flush Complete < Current Time – Flush Interval AND Last Heat Disinfect Complete < Current Time – Flush Interval
+        // AND Last Chem Flush Complete < Current Time – Flush Interval
+        BOOL isBasicFlushValid   = ( lastFlushCompleteDate     < ( getRTCTimestamp() - FLUSH_TIME_INTERVAL_S ) ? TRUE : FALSE );
+        BOOL isHeatDisFlushValid = ( lastHeatCompleteDate      < ( getRTCTimestamp() - FLUSH_TIME_INTERVAL_S ) ? TRUE : FALSE );
+        BOOL isChemFlushValid    = ( lastChemFlushCompleteDate < ( getRTCTimestamp() - FLUSH_TIME_INTERVAL_S ) ? TRUE : FALSE );
+        BOOL isFlushValid        = ( isBasicFlushValid | isHeatDisFlushValid | isChemFlushValid );
+
+        if ( ( TRUE == hasDisBeenDone ) && ( TRUE == isChemDisValid ) && ( TRUE == isHeatDisValid ) && ( TRUE == isChemFlushComplete ) && ( TRUE == isFlushValid ) )
         {
-            status = FALSE;
+            status = TRUE;
         }
     }
 
@@ -1005,7 +1022,7 @@
 
     if ( TRUE == dgData.isDGServiceRecordAvailable )
     {
-        U32 dgSrvcElapsedTimeS    = getRTCTimestamp() - dgData.dgServiceRecord.lastServiceDateEpoch;
+        U32 dgSrvcElapsedTimeS    = getRTCTimestamp() - dgData.dgServiceRecord.lastServiceEpochDate;
         BOOL hasDGSrvcBeenExpired = ( dgSrvcElapsedTimeS > SERVICE_TIME_INTERVAL_S ? TRUE : FALSE );
         U32 hdSrvcElapsedTimeS    = getRTCTimestamp() - hdServiceRecord.lastServiceEpochDate;
         BOOL hasHDSrvcBeenExpied  = ( hdSrvcElapsedTimeS > SERVICE_TIME_INTERVAL_S ? TRUE : FALSE );