Index: firmware/App/Services/SystemCommDD.c
===================================================================
diff -u -r573a26b2a0273a4983b1de1cbff5bed63e01dce0 -r5f1b50a1d9a7bd6ea17bb666e28ccfeafe56432c
--- firmware/App/Services/SystemCommDD.c	(.../SystemCommDD.c)	(revision 573a26b2a0273a4983b1de1cbff5bed63e01dce0)
+++ firmware/App/Services/SystemCommDD.c	(.../SystemCommDD.c)	(revision 5f1b50a1d9a7bd6ea17bb666e28ccfeafe56432c)
@@ -1,17 +1,17 @@
 /**************************************************************************
 *
-* Copyright (c) 2024-2024 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2024-2026 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    SystemCommDD.c
 *
-* @author  (last)      Vinayakam Mani
-* @date    (last)      05-Aug-2024
+* @author  (last)      Dara Navaei
+* @date    (last)      27-May-2026
 *
 * @author  (original)  Vinayakam Mani
-* @date    (original)  05-Aug-2024
+* @date    (original)  07-Aug-2024
 *
 ***************************************************************************/
 
@@ -51,24 +51,26 @@
 const COMM_BUFFER_T CAN_OUT_BUFFERS[ NUM_OF_CAN_OUT_BUFFERS ] =
 {
     COMM_BUFFER_OUT_CAN_DD_ALARM,
+    COMM_BUFFER_OUT_CAN_FP_ALARM,
     COMM_BUFFER_OUT_CAN_DD_2_TD,
-    COMM_BUFFER_OUT_CAN_DD_2_RO,
+    COMM_BUFFER_OUT_CAN_DD_2_UI,
     COMM_BUFFER_OUT_CAN_DD_BROADCAST,
-    COMM_BUFFER_OUT_CAN_PC
+    COMM_BUFFER_OUT_CAN_FP_BROADCAST,
+    COMM_BUFFER_OUT_DD_CAN_PC,
+    COMM_BUFFER_OUT_FP_CAN_PC,
 };
 
 /// Array of in-coming CAN buffers.
 const COMM_BUFFER_T CAN_IN_BUFFERS[ NUM_OF_CAN_IN_BUFFERS ] =
 {
     COMM_BUFFER_IN_CAN_TD_ALARM,
     COMM_BUFFER_IN_CAN_UI_ALARM,
-    COMM_BUFFER_IN_CAN_RO_ALARM,
     COMM_BUFFER_IN_CAN_TD_2_DD,
+    COMM_BUFFER_IN_CAN_UI_2_DD,
     COMM_BUFFER_IN_CAN_TD_BROADCAST,
-    COMM_BUFFER_IN_CAN_RO_2_DD,
-    COMM_BUFFER_IN_CAN_RO_BROADCAST,
     COMM_BUFFER_IN_CAN_UI_BROADCAST,
-    COMM_BUFFER_IN_CAN_PC,
+    COMM_BUFFER_IN_DD_CAN_PC,
+    COMM_BUFFER_IN_FP_CAN_PC,
 };
 
 static volatile BOOL ddIsOnlyCANNode = TRUE;                                ///< flag indicating whether DG is alone on CAN bus.
@@ -91,8 +93,11 @@
     // Initialize common system comm unit
     initSystemComm();
 
+    //TODO: Restore this as this was system specific
+#ifndef __BAD_MSG_CRC_ALARM_DISABLED__
     // initialize bad message CRC time windowed count
     initTimeWindowedCount( TIME_WINDOWED_COUNT_BAD_MSG_CRC, MAX_COMM_CRC_FAILURES, MAX_COMM_CRC_FAILURE_WINDOW_MS );
+#endif
 
     // initialize FPGA clock speed error time windowed count
     initTimeWindowedCount( TIME_WINDOWED_COUNT_FPGA_CLOCK_SPEED_ERROR, MAX_FPGA_CLOCK_SPEED_ERRORS, MAX_FPGA_CLOCK_SPEED_ERROR_WINDOW_MS);
@@ -268,10 +273,13 @@
  *************************************************************************/
 void checkTooManyBadMsgCRCs( void )
 {
+    //TODO: Remove this as this was my current system specific.
+#ifndef __BAD_MSG_CRC_ALARM_DISABLED__
     if ( TRUE == incTimeWindowedCount( TIME_WINDOWED_COUNT_BAD_MSG_CRC ) )
     {
         SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DD_COMM_TOO_MANY_BAD_CRCS, 2 );  // 2 for DD
     }
+#endif
 }
 
 /*********************************************************************//**