From 2469d96127413eceb44766b9562dbb7e3baf3d23 Mon Sep 17 00:00:00 2001 From: Stefano Calabretti Date: Sat, 12 Feb 2022 11:44:45 +0100 Subject: [PATCH] Fix bugs --- Src/mmr_can_message_id.c | 1 + Src/mmr_can_send.c | 9 ++++++--- Src/mmr_can_send_scs.c | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Src/mmr_can_message_id.c b/Src/mmr_can_message_id.c index d224d92..61f1162 100644 --- a/Src/mmr_can_message_id.c +++ b/Src/mmr_can_message_id.c @@ -1,3 +1,4 @@ +#include #include "mmr_can_message_id.h" diff --git a/Src/mmr_can_send.c b/Src/mmr_can_send.c index 4e02a7d..2ff5374 100644 --- a/Src/mmr_can_send.c +++ b/Src/mmr_can_send.c @@ -28,6 +28,7 @@ HalStatus MMR_CAN_Send(CanHandle *hcan, MmrCanPacket packet) { TransmissionParams tp = { .handle = hcan, .packet = &packet, + .headers.mmr = packet.header, .headers.tx = { .IDE = CAN_ID_EXT, .RTR = CAN_RTR_DATA, @@ -72,11 +73,13 @@ static HalStatus sendSingleMultiFrame(TransmissionParams *tp) { uint8_t length = computeNextMessageLength(tp->packet); - tp->packet->length -= length; - tp->packet->data += length; tp->headers.tx.DLC = length; + tp->packet->length -= length; - return send(tp); + HalStatus result = send(tp); + + tp->packet->data += length; + return result; } diff --git a/Src/mmr_can_send_scs.c b/Src/mmr_can_send_scs.c index 7e8a489..9df0218 100644 --- a/Src/mmr_can_send_scs.c +++ b/Src/mmr_can_send_scs.c @@ -18,4 +18,4 @@ HalStatus MMR_CAN_SendSCS( }; return MMR_CAN_Send(hcan, packet); -} \ No newline at end of file +}