Index: firmware/App/Services/SystemCommMessages.c =================================================================== diff -u -r54e58f64179ea382d2e2c403c8c3b9a15a612636 -rd332a26f463cc5d209be77e562952f70775cf913 --- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 54e58f64179ea382d2e2c403c8c3b9a15a612636) +++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision d332a26f463cc5d209be77e562952f70775cf913) @@ -52,9 +52,6 @@ // ********** private definitions ********** -#define ACK_REQUIRED TRUE ///< Require an ACK. -#define ACK_NOT_REQUIRED FALSE ///< Not require an ACK. - #ifdef DEBUG_ENABLED #define DEBUG_EVENT_MAX_TEXT_LEN 40 #endif @@ -66,7 +63,6 @@ // ********** private function prototypes ********** -static U32 serializeMessage( MESSAGE_T msg, COMM_BUFFER_T buffer, BOOL ackReq ); static BOOL sendTestAckResponseMsg( MSG_ID_T msgID, BOOL ack ); static BOOL sendAckResponseMsg( MSG_ID_T msgID, COMM_BUFFER_T buffer, BOOL ack ); @@ -84,7 +80,7 @@ * @param ackReq is an acknowledgement from receiver required? * @return size (in bytes) of serialized message populated in given data array. *************************************************************************/ -static U32 serializeMessage( MESSAGE_T msg, COMM_BUFFER_T buffer, BOOL ackReq ) +U32 serializeMessage( MESSAGE_T msg, COMM_BUFFER_T buffer, BOOL ackReq ) { BOOL result = FALSE; BOOL error = FALSE; @@ -216,36 +212,6 @@ /*********************************************************************//** * @brief - * The broadcastData function broadcasts data. - * @details Inputs: none - * @details Outputs: load cell data msg constructed and queued - * @param msgID message ID of the data is broadcast - * @param buffer comm buffer ID - * @param dataPtr pointer to the start of the buffer - * @param length length of the data buffer - * @return TRUE if msg successfully queued for transmit, FALSE if not - *************************************************************************/ -BOOL broadcastData( MSG_ID_T msgID, COMM_BUFFER_T buffer, U08* dataPtr, U32 length ) -{ - BOOL result; - MESSAGE_T msg; - U08 *payloadPtr = msg.payload; - - // create a message record - blankMessage( &msg ); - msg.hdr.msgID = msgID; - msg.hdr.payloadLen = length; - - memcpy( payloadPtr, dataPtr, length ); - - // serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer - result = serializeMessage( msg, buffer, ACK_NOT_REQUIRED ); - - return result; -} - -/*********************************************************************//** - * @brief * The broadcastAlarmTriggered function constructs an alarm triggered msg to * be broadcast and queues the msg for transmit on the appropriate CAN channel. * @details Inputs: none