From e4a0988111db0573e8cf921341b436211148ff81 Mon Sep 17 00:00:00 2001 From: Stefano Calabretti Date: Thu, 3 Feb 2022 19:29:58 +0100 Subject: [PATCH] Fix compilation errors --- Inc/mmr_can_header.h | 9 +++++---- Inc/mmr_can_message_id.h | 1 + 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Inc/mmr_can_header.h b/Inc/mmr_can_header.h index 7a5cf88..7e22dcf 100644 --- a/Inc/mmr_can_header.h +++ b/Inc/mmr_can_header.h @@ -22,7 +22,7 @@ typedef enum { MMR_CAN_MESSAGE_ACK = B_(0001), MMR_CAN_MESSAGE_TYPE_MULTI_FRAME = B_(0010), MMR_CAN_MESSAGE_TYPE_MULTI_FRAME_END = B_(0011), - MMR_CAN_MESSAGE_TYPE_NORMAL = B_(1000), + MMR_CAN_MESSAGE_TYPE_NORMAL = B_(0100), } MmrCanMessageType; @@ -40,9 +40,10 @@ typedef enum { */ typedef struct { MmrCanMessagePriority priority : 3; - MmrCanMessageId messageId : 10; - uint32_t senderId : 12; - MmrCanMessageType messageType : 4; + uint16_t messageId : 10; + uint16_t senderId : 10; + uint8_t seqNumber : 3; + MmrCanMessageType messageType : 3; } MmrCanHeader; diff --git a/Inc/mmr_can_message_id.h b/Inc/mmr_can_message_id.h index 68d1082..e41740d 100644 --- a/Inc/mmr_can_message_id.h +++ b/Inc/mmr_can_message_id.h @@ -1,6 +1,7 @@ #ifndef INC_MMR_CAN_MESSAGE_ID_H_ #define INC_MMR_CAN_MESSAGE_ID_H_ +#include #include #include "mmr_can_binary_literals.h"