Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r7d24ef2e6a4130b3a049e6106a0371fc6503271f -r88662452040aa91ce9a7da032e9ed1865517bdd5
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 7d24ef2e6a4130b3a049e6106a0371fc6503271f)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 88662452040aa91ce9a7da032e9ed1865517bdd5)
@@ -71,18 +71,18 @@
     COMM_BUFFER_NOT_USED,                                   ///< CAN message boxes start at 1 so we will not use this buffer
     COMM_BUFFER_OUT_CAN_DD_ALARM,                           ///< Buffer for responding to incoming TD alarm messages
     COMM_BUFFER_NOT_USED,                                   ///< Buffer for outgoing DD alarm messages so no response buffer
-    COMM_BUFFER_OUT_CAN_DD_ALARM,                           ///< Buffer for responding to incoming RO alarm messages
+    COMM_BUFFER_NOT_USED,                                   ///< Buffer for outgoing FP alarm messages so no response buffer
     COMM_BUFFER_OUT_CAN_DD_ALARM,                           ///< Buffer for responding to incoming UI alarm messages
     COMM_BUFFER_OUT_CAN_DD_2_TD,                            ///< Buffer for responding to incoming TD to DD messages
     COMM_BUFFER_NOT_USED,                                   ///< Buffer for outgoing DD to TD messages so no response buffer
-    COMM_BUFFER_NOT_USED,                                   ///< Buffer for outgoing DD to RO messages so no response buffer
-    COMM_BUFFER_OUT_CAN_DD_2_RO,                            ///< Buffer for responding to incoming RO to DD messages
     COMM_BUFFER_OUT_CAN_DD_BROADCAST,                       ///< Buffer for responding to incoming TD broadcast messages
     COMM_BUFFER_NOT_USED,                                   ///< Buffer for outgoing DD broadcast messages so no response buffer
-    COMM_BUFFER_OUT_CAN_DD_BROADCAST,                       ///< Buffer for responding to incoming RO broadcast messages
+    COMM_BUFFER_NOT_USED,                                   ///< Buffer for outgoing FP broadcast messages so no response buffer
     COMM_BUFFER_OUT_CAN_DD_BROADCAST,                       ///< Buffer for responding to incoming UI broadcast messages
-    COMM_BUFFER_OUT_CAN_PC,                                 ///< Buffer for responding to incoming PC to TD messages
-    COMM_BUFFER_NOT_USED,                                   ///< Buffer for outgoing HD to PC messages so no response buffer
+    COMM_BUFFER_OUT_DD_CAN_PC,                              ///< Buffer for responding to incoming PC to DD messages
+    COMM_BUFFER_NOT_USED,                                   ///< Buffer for outgoing DD to PC messages so no response buffer
+    COMM_BUFFER_OUT_FP_CAN_PC,                              ///< Buffer for responding to incoming PC to FP messages
+    COMM_BUFFER_NOT_USED,                                   ///< Buffer for outgoing FP to PC messages so no response buffer
 };
 
 typedef BOOL (*MsgFuncPtr)( MESSAGE_T* );
@@ -672,8 +672,17 @@
     msg.payload[ 0 ] = (U08)ack;
 
     // serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
-    result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_PC, ACK_NOT_REQUIRED );
+    // check msgID to determine what channel to use and default to DD's channels
+    if( ( MSG_ID_FIRST_FP_TESTER_MESSAGE <= msgID ) && ( MSG_ID_TD_DEBUG_EVENT > msgID ) )
+    {
+        result = serializeMessage( msg, COMM_BUFFER_OUT_FP_CAN_PC, ACK_NOT_REQUIRED );
+    }
+    else
+    {
+        result = serializeMessage( msg, COMM_BUFFER_OUT_DD_CAN_PC, ACK_NOT_REQUIRED );
+    }
 
+
     return result;
 }