Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -rb631516f8159c25ba2ffd215afa696795d97a28c -r9301b9ec99beedbb49076dc03526622d313bd8cf
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision b631516f8159c25ba2ffd215afa696795d97a28c)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 9301b9ec99beedbb49076dc03526622d313bd8cf)
@@ -41,7 +41,7 @@
 #ifndef DEBUG_ENABLED
     #define NUM_OF_MSG_IN_BUFFERS       6                                   ///< Number of Msg buffers for receiving
 #else
-    #define NUM_OF_MSG_IN_BUFFERS       7
+    #define NUM_OF_MSG_IN_BUFFERS       8
     #define SCI1_RECEIVE_DMA_REQUEST    30
     #define SCI1_TRANSMIT_DMA_REQUEST   31
 #endif
@@ -81,9 +81,9 @@
 {
     COMM_BUFFER_OUT_CAN_DG_ALARM,
     COMM_BUFFER_OUT_CAN_DG_2_HD,
+    COMM_BUFFER_OUT_CAN_DG_2_UI,
     COMM_BUFFER_OUT_CAN_DG_BROADCAST,
-    COMM_BUFFER_OUT_CAN_PC,
-    COMM_BUFFER_OUT_CAN_DG_2_UI
+    COMM_BUFFER_OUT_CAN_PC
 };
 
 /// Array of in-coming CAN buffers.
@@ -93,6 +93,7 @@
     COMM_BUFFER_IN_CAN_UI_ALARM,
     COMM_BUFFER_IN_CAN_HD_2_DG,
     COMM_BUFFER_IN_CAN_HD_BROADCAST,
+    COMM_BUFFER_IN_CAN_UI_2_DG,
     COMM_BUFFER_IN_CAN_UI_BROADCAST,
     COMM_BUFFER_IN_CAN_PC,
 #ifdef DEBUG_ENABLED