Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r0c296cef29037819be204c45a23d4d38a52b2718 -r1e34d32fcfac88792ed72e55953dee721bacd9d5
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 0c296cef29037819be204c45a23d4d38a52b2718)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 1e34d32fcfac88792ed72e55953dee721bacd9d5)
@@ -22,6 +22,7 @@
 #include "MessageSupport.h"
 #include "ModeFault.h"
 #include "ModeStandby.h"
+#include "NVDataMgmt.h"
 #include "OperationModes.h"
 #include "Pressures.h"
 #include "Reservoirs.h"
@@ -414,7 +415,10 @@
     if ( ( DG_MODE_STAN == getCurrentOperationMode() ) && ( DG_STANDBY_MODE_STATE_IDLE == standbyState ) || ( DG_MODE_SOLO == getCurrentOperationMode() ) )
     {
         DG_CMD_RESPONSE_T cmdResponse;
+        DG_USAGE_INFO_RECORD_T usageInfo;
 
+        getNVRecord2Driver( GET_USAGE_RECORD, (U08*)&usageInfo, sizeof( DG_USAGE_INFO_RECORD_T ), 0, ALARM_ID_NO_ALARM );
+
         OPN_CLS_STATE_T concCap = getSwitchStatus( CONCENTRATE_CAP );
         OPN_CLS_STATE_T diaCap  = getSwitchStatus( DIALYSATE_CAP );
         cmdResponse.commandID   = DG_CMD_START_FLUSH;
@@ -426,6 +430,9 @@
         {
             concCap = STATE_CLOSED;
             diaCap  = STATE_CLOSED;
+            // Using the caps switch to disable the chemical disinfect date checks
+            usageInfo.lastChemDisFlushCompleteDateEpoch = 40;
+            usageInfo.lastChemDisCompleteDateEpoch      = 32;
         }
 #endif
 
@@ -435,6 +442,11 @@
             cmdResponse.rejectCode = ( STATE_OPEN == getSwitchStatus( DIALYSATE_CAP ) ? REQUEST_REJECT_REASON_DG_DIALYSATE_CAP_OPEN :
                                                                                         REQUEST_REJECT_REASON_DG_CONCENTRATE_CAP_OPEN );
         }
+        else if ( usageInfo.lastChemDisFlushCompleteDateEpoch < usageInfo.lastChemDisCompleteDateEpoch )
+        {
+            cmdResponse.rejected   = TRUE;
+            cmdResponse.rejectCode = REQUEST_REJECT_REASON_DG_CHEM_FLUSH_NOT_COMPLETED;
+        }
         else
         {
             pendingStartDGFlushRequest = TRUE;
@@ -462,7 +474,10 @@
     if ( ( DG_MODE_STAN == getCurrentOperationMode() ) && ( DG_STANDBY_MODE_STATE_IDLE == standbyState ) || ( DG_MODE_SOLO == getCurrentOperationMode() ) )
     {
         DG_CMD_RESPONSE_T cmdResponse;
+        DG_USAGE_INFO_RECORD_T usageInfo;
 
+        getNVRecord2Driver( GET_USAGE_RECORD, (U08*)&usageInfo, sizeof( DG_USAGE_INFO_RECORD_T ), 0, ALARM_ID_NO_ALARM );
+
         cmdResponse.commandID   = DG_CMD_START_HEAT_DISINFECT;
         cmdResponse.rejected    = FALSE;
         cmdResponse.rejectCode  = DG_CMD_REQUEST_REJECT_REASON_NONE;
@@ -474,6 +489,9 @@
         {
             concCap = STATE_CLOSED;
             diaCap  = STATE_CLOSED;
+            // Using the caps switch to disable the chemical disinfect date checks
+            usageInfo.lastChemDisFlushCompleteDateEpoch = 40;
+            usageInfo.lastChemDisCompleteDateEpoch      = 32;
         }
 #endif
 
@@ -483,6 +501,11 @@
             cmdResponse.rejectCode = ( STATE_OPEN == getSwitchStatus( DIALYSATE_CAP ) ? REQUEST_REJECT_REASON_DG_DIALYSATE_CAP_OPEN :
                                                                                         REQUEST_REJECT_REASON_DG_CONCENTRATE_CAP_OPEN );
         }
+        else if ( usageInfo.lastChemDisFlushCompleteDateEpoch < usageInfo.lastChemDisCompleteDateEpoch )
+        {
+            cmdResponse.rejected   = TRUE;
+            cmdResponse.rejectCode = REQUEST_REJECT_REASON_DG_CHEM_FLUSH_NOT_COMPLETED;
+        }
         else
         {
             pendingStartDGHeatDisinfectRequest = TRUE;