Index: CommBuffers.h =================================================================== diff -u -r34e9d24b76d786a5d3bba641f06e7764439c161e -rfb1be94d30e7017deb9bb465ce676ee37f2d73f3 --- CommBuffers.h (.../CommBuffers.h) (revision 34e9d24b76d786a5d3bba641f06e7764439c161e) +++ CommBuffers.h (.../CommBuffers.h) (revision fb1be94d30e7017deb9bb465ce676ee37f2d73f3) @@ -35,47 +35,47 @@ { COMM_BUFFER_NOT_USED = 0, ///< CAN message boxes start at 1 so we will not use this buffer #ifdef _TD_ - COMM_BUFFER_OUT_CAN_TD_ALARM, ///< Buffer for outgoing TD alarm messages - COMM_BUFFER_IN_CAN_DD_ALARM, ///< Buffer for incoming DD alarm messages - COMM_BUFFER_IN_CAN_RO_ALARM, ///< Buffer for incoming RO alarm messages - COMM_BUFFER_IN_CAN_UI_ALARM, ///< Buffer for incoming UI alarm messages - COMM_BUFFER_OUT_CAN_TD_2_DD, ///< Buffer for outgoing TD to DD messages - COMM_BUFFER_IN_CAN_DD_2_TD, ///< Buffer for incoming DD to HD messages - COMM_BUFFER_OUT_CAN_TD_2_UI, ///< Buffer for outgoing TD to UI messages - COMM_BUFFER_IN_CAN_UI_2_TD, ///< Buffer for incoming UI to TD messages - COMM_BUFFER_OUT_CAN_TD_BROADCAST, ///< Buffer for outgoing TD broadcast messages - COMM_BUFFER_IN_CAN_DD_BROADCAST, ///< Buffer for incoming DD broadcast messages - COMM_BUFFER_IN_CAN_RO_BROADCAST, ///< Buffer for incoming RO broadcast messages - COMM_BUFFER_IN_CAN_UI_BROADCAST, ///< Buffer for incoming UI broadcast messages + COMM_BUFFER_OUT_CAN_TD_ALARM, ///< Buffer for outgoing TD alarm messages (channel 1) + COMM_BUFFER_IN_CAN_DD_ALARM, ///< Buffer for incoming DD alarm messages (channel 2) + COMM_BUFFER_IN_CAN_RO_ALARM, ///< Buffer for incoming RO alarm messages (channel 4) + COMM_BUFFER_IN_CAN_UI_ALARM, ///< Buffer for incoming UI alarm messages (channel 8) + COMM_BUFFER_OUT_CAN_TD_2_DD, ///< Buffer for outgoing TD to DD messages (channel 10) + COMM_BUFFER_IN_CAN_DD_2_TD, ///< Buffer for incoming DD to HD messages (channel 11) + COMM_BUFFER_OUT_CAN_TD_2_UI, ///< Buffer for outgoing TD to UI messages (channel 40) + COMM_BUFFER_IN_CAN_UI_2_TD, ///< Buffer for incoming UI to TD messages (channel 41) + COMM_BUFFER_OUT_CAN_TD_BROADCAST, ///< Buffer for outgoing TD broadcast messages (channel 100) + COMM_BUFFER_IN_CAN_DD_BROADCAST, ///< Buffer for incoming DD broadcast messages (channel 101) + COMM_BUFFER_IN_CAN_RO_BROADCAST, ///< Buffer for incoming RO broadcast messages (channel 102) + COMM_BUFFER_IN_CAN_UI_BROADCAST, ///< Buffer for incoming UI broadcast messages (channel 103) #endif #ifdef _DD_ - COMM_BUFFER_IN_CAN_TD_ALARM, ///< Buffer for incoming TD alarm messages - COMM_BUFFER_OUT_CAN_DD_ALARM, ///< Buffer for outgoing DD alarm messages - COMM_BUFFER_IN_CAN_RO_ALARM, ///< Buffer for incoming RO alarm messages - COMM_BUFFER_IN_CAN_UI_ALARM, ///< Buffer for incoming UI alarm messages - COMM_BUFFER_IN_CAN_TD_2_DD, ///< Buffer for incoming TD to DD messages - COMM_BUFFER_OUT_CAN_DD_2_TD, ///< Buffer for outgoing DD to TD messages - COMM_BUFFER_OUT_CAN_DD_2_RO, ///< Buffer for outgoing DD to RO messages - COMM_BUFFER_IN_CAN_RO_2_DD, ///< Buffer for incoming RO to DD messages - COMM_BUFFER_IN_CAN_TD_BROADCAST, ///< Buffer for incoming TD broadcast messages - COMM_BUFFER_OUT_CAN_DD_BROADCAST, ///< Buffer for outgoing DD broadcast messages - COMM_BUFFER_IN_CAN_RO_BROADCAST, ///< Buffer for incoming RO broadcast messages - COMM_BUFFER_IN_CAN_UI_BROADCAST, ///< Buffer for incoming UI broadcast messages + COMM_BUFFER_IN_CAN_TD_ALARM, ///< Buffer for incoming TD alarm messages (channel 1) + COMM_BUFFER_OUT_CAN_DD_ALARM, ///< Buffer for outgoing DD alarm messages (channel 2) + COMM_BUFFER_IN_CAN_RO_ALARM, ///< Buffer for incoming RO alarm messages (channel 4) + COMM_BUFFER_IN_CAN_UI_ALARM, ///< Buffer for incoming UI alarm messages (channel 8) + COMM_BUFFER_IN_CAN_TD_2_DD, ///< Buffer for incoming TD to DD messages (channel 10) + COMM_BUFFER_OUT_CAN_DD_2_TD, ///< Buffer for outgoing DD to TD messages (channel 11) + COMM_BUFFER_OUT_CAN_DD_2_RO, ///< Buffer for outgoing DD to RO messages (channel 20) + COMM_BUFFER_IN_CAN_RO_2_DD, ///< Buffer for incoming RO to DD messages (channel 21) + COMM_BUFFER_IN_CAN_TD_BROADCAST, ///< Buffer for incoming TD broadcast messages (channel 100) + COMM_BUFFER_OUT_CAN_DD_BROADCAST, ///< Buffer for outgoing DD broadcast messages (channel 101) + COMM_BUFFER_IN_CAN_RO_BROADCAST, ///< Buffer for incoming RO broadcast messages (channel 102) + COMM_BUFFER_IN_CAN_UI_BROADCAST, ///< Buffer for incoming UI broadcast messages (channel 103) #endif #ifdef _RO_ - COMM_BUFFER_IN_CAN_TD_ALARM, ///< Buffer for incoming TD alarm messages - COMM_BUFFER_IN_CAN_DD_ALARM, ///< Buffer for incoming DD alarm messages - COMM_BUFFER_OUT_CAN_RO_ALARM, ///< Buffer for outgoing RO alarm messages - COMM_BUFFER_IN_CAN_UI_ALARM, ///< Buffer for incoming UI alarm messages - COMM_BUFFER_IN_CAN_DD_2_RO, ///< Buffer for incoming DD to RO messages - COMM_BUFFER_OUT_CAN_RO_2_DD, ///< Buffer for outgoing RO to DD messages - COMM_BUFFER_IN_CAN_TD_BROADCAST, ///< Buffer for incoming TD broadcast messages - COMM_BUFFER_IN_CAN_DD_BROADCAST, ///< Buffer for incoming DD broadcast messages - COMM_BUFFER_OUT_CAN_RO_BROADCAST, ///< Buffer for incoming RO broadcast messages - COMM_BUFFER_IN_CAN_UI_BROADCAST, ///< Buffer for incoming UI broadcast messages + COMM_BUFFER_IN_CAN_TD_ALARM, ///< Buffer for incoming TD alarm messages (channel 1) + COMM_BUFFER_IN_CAN_DD_ALARM, ///< Buffer for incoming DD alarm messages (channel 2) + COMM_BUFFER_OUT_CAN_RO_ALARM, ///< Buffer for outgoing RO alarm messages (channel 4) + COMM_BUFFER_IN_CAN_UI_ALARM, ///< Buffer for incoming UI alarm messages (channel 8) + COMM_BUFFER_IN_CAN_DD_2_RO, ///< Buffer for incoming DD to RO messages (channel 20) + COMM_BUFFER_OUT_CAN_RO_2_DD, ///< Buffer for outgoing RO to DD messages (channel 21) + COMM_BUFFER_IN_CAN_TD_BROADCAST, ///< Buffer for incoming TD broadcast messages (channel 100) + COMM_BUFFER_IN_CAN_DD_BROADCAST, ///< Buffer for incoming DD broadcast messages (channel 101) + COMM_BUFFER_OUT_CAN_RO_BROADCAST, ///< Buffer for incoming RO broadcast messages (channel 102) + COMM_BUFFER_IN_CAN_UI_BROADCAST, ///< Buffer for incoming UI broadcast messages (channel 103) #endif - COMM_BUFFER_IN_CAN_PC, ///< Buffer for incoming PC messages - COMM_BUFFER_OUT_CAN_PC, ///< Buffer for outgoing messages to PC + COMM_BUFFER_IN_CAN_PC, ///< Buffer for incoming PC messages (channel 400-TD, 402-DD, 404-RO) + COMM_BUFFER_OUT_CAN_PC, ///< Buffer for outgoing messages to PC (channel 401-TD, 403-DD, 405-RO) NUM_OF_COMM_BUFFERS ///< Number of CAN communication buffers } COMM_BUFFER_T;