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;