Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r402885eda2ed755a079c854d1228ac5f76cbec7c -re8053e6bdafd0638102e01c4250dfd74c0850ba1
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 402885eda2ed755a079c854d1228ac5f76cbec7c)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision e8053e6bdafd0638102e01c4250dfd74c0850ba1)
@@ -7,8 +7,8 @@
 *
 * @file    ModeStandby.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      22-Sep-2022
+* @author  (last)      Darren Cox
+* @date    (last)      12-Oct-2022
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -57,6 +57,7 @@
 static BOOL flushStartReqReceived;                                                             ///< Flag indicates user has requested initiation of flush mode.
 static BOOL heatDisinfectStartReqReceived;                                                     ///< Flag indicates user has requested initiation of heat disinfect mode.
 static BOOL chemDisinfectStartReqReceived;                                                     ///< Flag indicates user has requested initiation of chemical disinfect mode.
+static GENERIC_CONFIRM_ID_T  disinfectCancelReqID;                                             ///< ID of requested cancel disinfect mode.
 static DG_DISINFECT_STATE_T dgDisinfectState;                                                  ///< DG disinfect state to be boadcast to UI.
 
 static U32 dataPublishCounter = 0;                                                             ///< Disinfects data publish counter.
@@ -67,6 +68,8 @@
 
 // ********** private function prototypes **********
 
+static void handleDisinfectCancel( BOOL stop );
+
 static HD_STANDBY_STATE_T handleStandbyModeStartState( void );
 static HD_STANDBY_STATE_T handleStandbyModeWaitForTreatmentState( void );
 static HD_STANDBY_STATE_T handleStandbyModeWaitForDisinfectState( void );
@@ -104,6 +107,7 @@
     dataPublishCounter            = 0;
     heatDisinfectStartReqReceived = FALSE;
     chemDisinfectStartReqReceived = FALSE;
+    disinfectCancelReqID          = GENERIC_CONFIRM_ID_NONE;
     dgDisinfectState              = DG_DISINFECT_NOT_RUNNING_STATE;
 }
 
@@ -168,6 +172,8 @@
 {
     BOOL stop = isStopButtonPressed();
 
+    handleDisinfectCancel( stop );
+
 #ifndef RUN_WITHOUT_DG
     // State machine to get DG to prep a reservoir so we can start a treatment
     switch ( currentStandbyState )
@@ -491,6 +497,87 @@
 
 /*********************************************************************//**
  * @brief
+ * The handleDisinfectCancel function handles
+ * DG disinfect cancel UI interaction.
+ * @details Inputs: none
+ * @details Outputs: none
+ * @param stop button status
+ * @return none
+ *************************************************************************/
+static void handleDisinfectCancel( BOOL stop )
+{
+    CONFIRMATION_REQUEST_STATUS_T confirm_status;
+    GENERIC_CONFIRM_ID_T confirm_id;
+
+    if ( ( STANDBY_DG_FLUSH_IN_PROGRESS_STATE == currentStandbyState ) ||
+         ( STANDBY_DG_HEAT_DISINFECT_IN_PROGRESS_STATE == currentStandbyState ) ||
+         ( STANDBY_DG_CHEM_DISINFECT_IN_PROGRESS_STATE == currentStandbyState ) )
+    {
+        if ( ( TRUE == stop ) && ( GENERIC_CONFIRM_ID_NONE == disinfectCancelReqID ) )
+        {
+            if ( STANDBY_DG_FLUSH_IN_PROGRESS_STATE == currentStandbyState )
+            {
+                confirm_id = GENERIC_CONFIRM_ID_DISINFECT_STOP_WATERFLUSH;
+            }
+            else if ( STANDBY_DG_HEAT_DISINFECT_IN_PROGRESS_STATE == currentStandbyState )
+            {
+                confirm_id = GENERIC_CONFIRM_ID_DISINFECT_STOP_HEAT;
+            }
+            else if ( STANDBY_DG_CHEM_DISINFECT_IN_PROGRESS_STATE == currentStandbyState )
+            {
+                confirm_id = GENERIC_CONFIRM_ID_DISINFECT_STOP_CHEMICAL;
+            }
+            // Send message to UI to indicate user request to cancel disinfect
+            disinfectCancelReqID = addConfirmationRequest( confirm_id, GENERIC_CONFIRM_CMD_REQUEST_OPEN, 0 );
+        }
+        else if ( GENERIC_CONFIRM_ID_NONE != disinfectCancelReqID )
+        {
+            // Get the confirmation request.  It consumes the request if completed and responds to UI.
+            confirm_status = getConfirmationRequestStatus( disinfectCancelReqID );
+            switch ( confirm_status )
+            {
+                case CONFIRMATION_REQUEST_STATUS_ACCEPTED :
+                    // Clear request active status
+                    disinfectCancelReqID = GENERIC_CONFIRM_ID_NONE;
+
+                    switch ( currentStandbyState )
+                    {
+                        case STANDBY_DG_FLUSH_IN_PROGRESS_STATE:
+                            cmdStopDGFlush();
+                            break;
+
+                        case STANDBY_DG_HEAT_DISINFECT_IN_PROGRESS_STATE:
+                            cmdStopDGHeatDisinfect();
+                            break;
+
+                        case STANDBY_DG_CHEM_DISINFECT_IN_PROGRESS_STATE:
+                            cmdStopDGChemicalDisinfect();
+                            break;
+
+                        default:
+                            // UI Confirm already closed.  Nothing to do.
+                            break;
+                    }
+                    break;
+
+                case CONFIRMATION_REQUEST_STATUS_TIMEOUT :
+                case CONFIRMATION_REQUEST_STATUS_REJECTED :
+                    // Clear request active status
+                    disinfectCancelReqID = GENERIC_CONFIRM_ID_NONE;
+                    break;
+
+                case CONFIRMATION_REQUEST_STATUS_PENDING:
+                case CONFIRMATION_REQUEST_STATUS_UNUSED:
+                default :
+                    // Nothing to do
+                    break;
+            }
+        }
+    }
+}
+
+/*********************************************************************//**
+ * @brief
  * The handleStandbyModeStartState function handles the standby start state.
  * This state waits for the door to be closed and then initiates homing of
  * pumps and valves and transitions to the wait for treatment state.