Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -ra16225ab0fc1c575ad857ccf1dcccdb7a3aa8eef -r3ca05094a51e41dfafa2dbc6bbb40df1971a8679
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision a16225ab0fc1c575ad857ccf1dcccdb7a3aa8eef)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 3ca05094a51e41dfafa2dbc6bbb40df1971a8679)
@@ -56,7 +56,6 @@
 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 BOOL disinfectCancelReqPending;                                                         ///< Flag indicates user has requested cancel disinfect mode.
 static U32  disinfectCancelReqID;                                                              ///< ID of requested cancel disinfect mode.
 static DG_DISINFECT_STATE_T dgDisinfectState;                                                  ///< DG disinfect state to be boadcast to UI.
 
@@ -66,6 +65,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 );
@@ -101,7 +102,6 @@
     dataPublishCounter            = 0;
     heatDisinfectStartReqReceived = FALSE;
     chemDisinfectStartReqReceived = FALSE;
-    disinfectCancelReqPending     = FALSE;
     disinfectCancelReqID          = 0;
     dgDisinfectState              = DG_DISINFECT_NOT_RUNNING_STATE;
 }
@@ -163,40 +163,9 @@
 U32 execStandbyMode( void )
 {
     BOOL stop = isStopButtonPressed();
-    CONFIRMATION_REQUEST_STATUS_T confirm_status;
 
-    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 )
-        {
-            // Send message to UI to indicate user request to cancel disinfect
-            disinfectCancelReqID = sendConfirmationRequest( CONFIRMATION_REQUEST_TYPE_OPEN, 0 );
-        }
-        else if ( 0 != disinfectCancelReqID )
-        {
-            confirm_status = checkConfirmationRequestStatus( disinfectCancelReqID );
-            switch ( confirm_status )
-            {
-                case CONFIRMATION_REQUEST_STATUS_ACCEPTED :
-                    // TODO cancel disinfect mode
-                    disinfectCancelReqPending = TRUE;
-                    disinfectCancelReqID = 0;
-                    break;
+    handleDisinfectCancel( stop );
 
-                case CONFIRMATION_REQUEST_STATUS_TIMEOUT :
-                    // send a cancel to UI
-                    break;
-
-                case CONFIRMATION_REQUEST_STATUS_REJECTED :
-                default :
-                    // nothing to do
-                    break;
-            }
-        }
-    }
-
 #ifndef RUN_WITHOUT_DG
     // State machine to get DG to prep a reservoir so we can start a treatment
     switch ( currentStandbyState )
@@ -507,6 +476,76 @@
 
 /*********************************************************************//**
  * @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;
+    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 ) && ( disinfectCancelReqID == 0 ) )
+        {
+            // Send message to UI to indicate user request to cancel disinfect
+            disinfectCancelReqID = sendConfirmationRequest( CONFIRMATION_REQUEST_TYPE_OPEN, 0 );
+        }
+        else if ( 0 != disinfectCancelReqID )
+        {
+            confirm_status = checkConfirmationRequestStatus( disinfectCancelReqID );
+            switch ( confirm_status )
+            {
+                case CONFIRMATION_REQUEST_STATUS_ACCEPTED :
+                    disinfectCancelReqID = 0;
+                    // send a accept close to UI, don't save request id because there will be no response
+                    sendConfirmationRequest( CONFIRMATION_REQUEST_TYPE_CLOSE_ACCEPT, 0 );
+
+                    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:
+                            // TODO should not be here alarm
+                            break;
+                    }
+                    break;
+
+                case CONFIRMATION_REQUEST_STATUS_TIMEOUT :
+                    // send a cancel to UI, don't save request id because there will be no response
+                    sendConfirmationRequest( CONFIRMATION_REQUEST_TYPE_CLOSE_TIMEOUT, 0 );
+                    disinfectCancelReqID = 0;
+                    break;
+
+                case CONFIRMATION_REQUEST_STATUS_REJECTED :
+                    // UI rejected, cancel pending request
+                    disinfectCancelReqID = 0;
+                    break;
+
+                default :
+                    // TODO alarm?
+                    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.
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -ra16225ab0fc1c575ad857ccf1dcccdb7a3aa8eef -r3ca05094a51e41dfafa2dbc6bbb40df1971a8679
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision a16225ab0fc1c575ad857ccf1dcccdb7a3aa8eef)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 3ca05094a51e41dfafa2dbc6bbb40df1971a8679)
@@ -70,10 +70,10 @@
 /// List of message IDs that are requested not to be transmitted.
 static BLOCKED_MSGS_DATA_T blockedMessagesForXmit = { 0, 0, 0, 0, 0, 0, 0, 0 };
 static CONFIRMATION_REQUEST_T confirmRequests[NUM_CONFIRM_REQUESTS] =
-                                                   { 0, 0, CONFIRMATION_REQUEST_STATUS_UNUSED,
-                                                     0, 0, CONFIRMATION_REQUEST_STATUS_UNUSED,
-                                                     0, 0, CONFIRMATION_REQUEST_STATUS_UNUSED,
-                                                     0, 0, CONFIRMATION_REQUEST_STATUS_UNUSED, };
+                                                   { 0, CONFIRMATION_REQUEST_TYPE_OPEN, 0, CONFIRMATION_REQUEST_STATUS_UNUSED,
+                                                     0, CONFIRMATION_REQUEST_TYPE_OPEN, 0, CONFIRMATION_REQUEST_STATUS_UNUSED,
+                                                     0, CONFIRMATION_REQUEST_TYPE_OPEN, 0, CONFIRMATION_REQUEST_STATUS_UNUSED,
+                                                     0, CONFIRMATION_REQUEST_TYPE_OPEN, 0, CONFIRMATION_REQUEST_STATUS_UNUSED, };
 
 // ********** private function prototypes **********
 
@@ -83,93 +83,6 @@
 
 /*********************************************************************//**
  * @brief
- * The checkConfrimRequestStatus function checks the status of a confirmation request
- * @details Inputs: confirmRequests[]
- * @details Outputs: confirmRequests[] cleared if read.
- * @param request ID
- * @return CONFIRMATION_REQUEST_STATUS_T
- *************************************************************************/
-CONFIRMATION_REQUEST_STATUS_T checkConfirmationRequestStatus( U32 request_id )
-{
-    U08 i;
-    CONFIRMATION_REQUEST_STATUS_T status = CONFIRMATION_REQUEST_STATUS_PENDING;
-
-    for ( i=0; i<NUM_CONFIRM_REQUESTS; i++ )
-    {
-        if ( confirmRequests[ i ].requestID == request_id )
-        {
-            if ( TRUE == didTimeout( confirmRequests[ i ].timeStamp, CONFIRMATION_REQUEST_TIMEOUT_MS ) )
-            {
-                status = CONFIRMATION_REQUEST_STATUS_TIMEOUT;
-            }
-            else
-            {
-                status = confirmRequests[ i ].status;
-            }
-            if ( CONFIRMATION_REQUEST_STATUS_PENDING != status)
-            {
-                // Clear the confirmation request
-                confirmRequests[ i ].requestID = 0;
-                confirmRequests[ i ].timeStamp = 0;
-                confirmRequests[ i ].status = CONFIRMATION_REQUEST_STATUS_UNUSED;
-            }
-        }
-    }
-
-    return status;
-}
-
-/*********************************************************************//**
- * @brief
- * The sendConfirmationRequest function sends a confirmation request to UI
- * @details Inputs:
- * @details Outputs: confirmRequests[].
- * @param
- * @return request ID - will be non-zero if sent
- *************************************************************************/
-U32 sendConfirmationRequest( CONFIRMATION_REQUEST_TYPE_T request_type, U32 reject_reason )
-{
-    MESSAGE_T msg;
-    U08 *payloadPtr = msg.payload;
-    U08 i;
-    static U32 request_id = 0;
-    U32 new_id = 0;
-
-    for ( i=0; i<NUM_CONFIRM_REQUESTS; i++ )
-    {
-        if ( confirmRequests[ i ].status == CONFIRMATION_REQUEST_STATUS_UNUSED )
-        {
-            request_id++;
-            // Save the confirmation request info
-            confirmRequests[ i ].requestID = request_id;
-            confirmRequests[ i ].timeStamp = getMSTimerCount();
-            confirmRequests[ i ].status = CONFIRMATION_REQUEST_STATUS_PENDING;
-            new_id = request_id;
-
-            // Create a message record
-            blankMessage( &msg );
-            msg.hdr.msgID = MSG_ID_HD_REQUEST_UI_CONFIRMATION;
-            // The payload length is U32 Request ID, U32 Type, U32 Reject Reason
-            msg.hdr.payloadLen = 3 * sizeof( U32 );
-
-            memcpy( payloadPtr, &request_id, sizeof( U32 ) );
-            payloadPtr += sizeof( U32 );
-            memcpy( payloadPtr, &request_type, sizeof( U32 ) );
-            payloadPtr += sizeof( U32 );
-            memcpy( payloadPtr, &reject_reason, sizeof( U32 ) );
-
-            // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
-            serializeMessage( msg, COMM_BUFFER_OUT_CAN_HD_2_UI, ACK_NOT_REQUIRED );
-
-            break;
-        }
-    }
-
-    return new_id;
-}
-
-/*********************************************************************//**
- * @brief
  * The serializeMessage function serializes a given message into a given
  * array of bytes.  A sequence # is added to the message here and the ACK
  * bit of the sequence # is set if ACK is required per parameter.  A sync byte
@@ -7462,4 +7375,93 @@
     sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, result );
 }
 
+/*********************************************************************//**
+ * @brief
+ * The checkConfrimRequestStatus function checks the status of a confirmation request
+ * @details Inputs: confirmRequests[]
+ * @details Outputs: confirmRequests[] cleared if read.
+ * @param request ID
+ * @return CONFIRMATION_REQUEST_STATUS_T
+ *************************************************************************/
+CONFIRMATION_REQUEST_STATUS_T checkConfirmationRequestStatus( U32 request_id )
+{
+    U08 i;
+    CONFIRMATION_REQUEST_STATUS_T status = CONFIRMATION_REQUEST_STATUS_PENDING;
+
+    for ( i=0; i<NUM_CONFIRM_REQUESTS; i++ )
+    {
+        if ( confirmRequests[ i ].requestID == request_id )
+        {
+            if ( TRUE == didTimeout( confirmRequests[ i ].timeStamp, CONFIRMATION_REQUEST_TIMEOUT_MS ) )
+            {
+                status = CONFIRMATION_REQUEST_STATUS_TIMEOUT;
+            }
+            else
+            {
+                status = confirmRequests[ i ].status;
+            }
+            if ( CONFIRMATION_REQUEST_STATUS_PENDING != status)
+            {
+                // Clear the confirmation request
+                confirmRequests[ i ].requestID = 0;
+                confirmRequests[ i ].requestType = CONFIRMATION_REQUEST_TYPE_OPEN;
+                confirmRequests[ i ].timeStamp = 0;
+                confirmRequests[ i ].status = CONFIRMATION_REQUEST_STATUS_UNUSED;
+            }
+        }
+    }
+
+    return status;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The sendConfirmationRequest function sends a confirmation request to UI
+ * @details Inputs:
+ * @details Outputs: confirmRequests[].
+ * @param
+ * @return request ID - will be non-zero if sent
+ *************************************************************************/
+U32 sendConfirmationRequest( CONFIRMATION_REQUEST_TYPE_T request_type, U32 reject_reason )
+{
+    MESSAGE_T msg;
+    U08 *payloadPtr = msg.payload;
+    U08 i;
+    static U32 request_id = 0;
+    U32 new_id = 0;
+
+    for ( i=0; i<NUM_CONFIRM_REQUESTS; i++ )
+    {
+        if ( confirmRequests[ i ].status == CONFIRMATION_REQUEST_STATUS_UNUSED )
+        {
+            request_id++;
+            // Save the confirmation request info
+            confirmRequests[ i ].requestID = request_id;
+            confirmRequests[ i ].requestType = request_type;
+            confirmRequests[ i ].timeStamp = getMSTimerCount();
+            confirmRequests[ i ].status = CONFIRMATION_REQUEST_STATUS_PENDING;
+            new_id = request_id;
+
+            // Create a message record
+            blankMessage( &msg );
+            msg.hdr.msgID = MSG_ID_HD_REQUEST_UI_CONFIRMATION;
+            // The payload length is U32 Request ID, U32 Type, U32 Reject Reason
+            msg.hdr.payloadLen = 3 * sizeof( U32 );
+
+            memcpy( payloadPtr, &request_id, sizeof( U32 ) );
+            payloadPtr += sizeof( U32 );
+            memcpy( payloadPtr, &request_type, sizeof( U32 ) );
+            payloadPtr += sizeof( U32 );
+            memcpy( payloadPtr, &reject_reason, sizeof( U32 ) );
+
+            // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
+            serializeMessage( msg, COMM_BUFFER_OUT_CAN_HD_2_UI, ACK_NOT_REQUIRED );
+
+            break;
+        }
+    }
+
+    return new_id;
+}
+
 /**@}*/
Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -ra16225ab0fc1c575ad857ccf1dcccdb7a3aa8eef -r3ca05094a51e41dfafa2dbc6bbb40df1971a8679
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision a16225ab0fc1c575ad857ccf1dcccdb7a3aa8eef)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 3ca05094a51e41dfafa2dbc6bbb40df1971a8679)
@@ -63,9 +63,6 @@
 #define ACK_REQUIRED                    TRUE                ///< Macro for functions that want to know if an outgoing message requires acknowledgement from receiver.
 #define ACK_NOT_REQUIRED                FALSE               ///< Macro for functions that want to know if an outgoing message requires acknowledgement from receiver.
 
-#define ACK_REQUIRED                    TRUE                ///< Macro for functions that want to know if an outgoing message requires acknowledgement from receiver.
-#define ACK_NOT_REQUIRED                FALSE               ///< Macro for functions that want to know if an outgoing message requires acknowledgement from receiver.
-
 /// TODO - should this be in HDDefs? MsgDefs or other common?.
 #define CONFIRMATION_REQUEST_TIMEOUT_MS    ( SEC_PER_MIN * MS_PER_SECOND )
 /// List of confirmation status.
@@ -83,15 +80,17 @@
 typedef enum Confirmation_Request_Type
 {
     CONFIRMATION_REQUEST_TYPE_OPEN = 0,                ///< Confirmation type open
-    CONFIRMATION_REQUEST_TYPE_CLOSE,                   ///< Confirmation type close
-    CONFIRMATION_REQUEST_TYPE_REJECT,                  ///< Confirmation type cancel
+    CONFIRMATION_REQUEST_TYPE_CLOSE_TIMEOUT,           ///< Confirmation type close due to timeout
+    CONFIRMATION_REQUEST_TYPE_REJECT,                  ///< Confirmation type reject
+    CONFIRMATION_REQUEST_TYPE_CLOSE_ACCEPT,            ///< Confirmation type close due to accepted confirm
     NUM_OF_CONFIRMATION_TYPE                           ///< Number of confirmation types
 } CONFIRMATION_REQUEST_TYPE_T;
 
 /// Structure for confirmation request.
 typedef struct
 {
     U32 requestID;                                      ///< Request ID
+    CONFIRMATION_REQUEST_TYPE_T requestType;            ///< Request Type
     U32 timeStamp;                                      ///< Timestamp for request
     CONFIRMATION_REQUEST_STATUS_T status;               ///< Request status (pending, accepted, rejected)
 } CONFIRMATION_REQUEST_T;