Index: firmware/App/Services/CommBuffers.h
===================================================================
diff -u -r5e0cd9b5be11ff4b2acaadbdcafc4ffe05172aa1 -r7d4711edd7b40cd3e29f43e766f79a8a09586fe9
--- firmware/App/Services/CommBuffers.h	(.../CommBuffers.h)	(revision 5e0cd9b5be11ff4b2acaadbdcafc4ffe05172aa1)
+++ firmware/App/Services/CommBuffers.h	(.../CommBuffers.h)	(revision 7d4711edd7b40cd3e29f43e766f79a8a09586fe9)
@@ -1,17 +1,17 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2024 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
-* @file CommBuffers.h
+* @file    CommBuffers.h
 *
-* @author (last) Sean Nash
-* @date (last) 23-Jul-2020
+* @author  (last)      Sean Nash
+* @date    (last)      02-Dec-2021
 *
-* @author (original) Dara Navaei
-* @date (original) 05-Nov-2019
+* @author  (original)  Dara Navaei
+* @date    (original)  05-Nov-2019
 *
 ***************************************************************************/
 
@@ -41,16 +41,13 @@
     COMM_BUFFER_IN_CAN_HD_2_DG,                                 ///< Receiving buffer for HD to DG communication via CAN
     COMM_BUFFER_OUT_CAN_DG_2_HD,                                ///< Transmitting buffer for DG to HD communication via CAN
     COMM_BUFFER_IN_CAN_HD_BROADCAST,                            ///< Receiving buffer for HD broadcast communication via CAN
+    COMM_BUFFER_OUT_CAN_DG_2_UI,                                ///< Transmitting buffer for DG to UI communication via CAN
     COMM_BUFFER_OUT_CAN_DG_BROADCAST,                           ///< Transmitting buffer for DG broadcast communication via CAN
-    COMM_BUFFER_IN_CAN_UI_BROADCAST,                            ///< Receiving buffer for UI broadcast communication via CAN
-    COMM_BUFFER_IN_CAN_PC,                                      ///< Receiving buffer for PC communication via CAN
+    COMM_BUFFER_IN_CAN_UI_2_DG,                                 ///< Receiving buffer for UI to DG communication via CAN
+    COMM_BUFFER_IN_CAN_UI_BROADCAST,                            ///< Receiving buffer for UI broadcast communication via CAN
+    COMM_BUFFER_IN_CAN_PC,                                      ///< Receiving buffer for PC communication via CAN
     COMM_BUFFER_OUT_CAN_PC,                                     ///< Transmitting buffer for PC communication via CAN
-    COMM_BUFFER_OUT_CAN_DG_2_UI,                                ///< Transmitting buffer for DG to UI communication via CAN
-    COMM_BUFFER_LAST_CAN_BUFFER = COMM_BUFFER_OUT_CAN_DG_2_UI,  ///< Last CAN communication buffer
-#ifdef DEBUG_ENABLED
-    COMM_BUFFER_IN_UART_PC,                                     ///< Receiving buffer for PC communication via UART
-    COMM_BUFFER_OUT_UART_PC,                                    ///< Transmitting buffer for PC communication via UART
-#endif
+    COMM_BUFFER_LAST_CAN_BUFFER = COMM_BUFFER_OUT_CAN_PC,       ///< Last CAN communication buffer
     NUM_OF_COMM_BUFFERS                                         ///< The number of communication buffers
 } COMM_BUFFER_T;