Index: firmware/App/Services/SystemCommMessages.c =================================================================== diff -u -rbf44edd28c59df78a75165764b6b654f2e91e556 -ra3cfe22ccebe829b2f76cbf7f9b2d791af41b14c --- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision bf44edd28c59df78a75165764b6b654f2e91e556) +++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision a3cfe22ccebe829b2f76cbf7f9b2d791af41b14c) @@ -3362,16 +3362,16 @@ * The sendConfirmationRequest function sends a confirmation request to UI * @details Inputs: none * @details Outputs: none - * @param request_id ID of confirmation being requested - * @param request_type Type of confirmation being requested - * @param reject_reason Reason Reason for reject if type is reject + * @param requestID ID of confirmation being requested + * @param requestType Type of confirmation being requested + * @param rejectReason Reason Reason for reject if type is reject * @return none *************************************************************************/ -void sendConfirmationRequest( GENERIC_CONFIRM_ID_T request_id, GENERIC_CONFIRM_COMMAND_T request_type, U32 reject_reason ) +void sendConfirmationRequest( GENERIC_CONFIRM_ID_T requestID, GENERIC_CONFIRM_COMMAND_T requestType, U32 rejectReason ) { MESSAGE_T msg; U08 *payloadPtr = msg.payload; - U32 temp_request = request_id; + U32 temp_request = requestID; // Create a message record blankMessage( &msg ); @@ -3381,13 +3381,13 @@ memcpy( payloadPtr, &temp_request, sizeof( U32 ) ); payloadPtr += sizeof( U32 ); - temp_request = request_type; + temp_request = requestType; memcpy( payloadPtr, &temp_request, sizeof( U32 ) ); payloadPtr += sizeof( U32 ); - memcpy( payloadPtr, &reject_reason, sizeof( U32 ) ); + memcpy( payloadPtr, &rejectReason, sizeof( U32 ) ); // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer - serializeMessage( msg, COMM_BUFFER_OUT_CAN_HD_2_UI, ACK_NOT_REQUIRED ); + serializeMessage( msg, COMM_BUFFER_OUT_CAN_HD_2_UI, ACK_REQUIRED ); } /*********************************************************************//**