Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Macro Madness #3

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Macro Madness #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
212e3b9
Macro Madness
Quinn1876 Nov 4, 2022
1f62cb2
fixup meassage on error
Quinn1876 Nov 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 28 additions & 14 deletions can_messages.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#define MAX_CAN_MSG_SIZE 64
#define _impl_PASTE(a,b) a##b
#define _impl_CASSERT_LINE(predicate, line, descriptor) \
typedef char _impl_PASTE(assertion_failed_##descriptor##_,line)[2*!!(predicate)-1];
typedef char _impl_PASTE(assertion_failed_##descriptor##_unexpected_msg_size_##_,line)[2*!!(predicate)-1];

/**
* @brief A Can Message must be one of the following lengths
Expand All @@ -29,7 +29,7 @@
#define PACKED_STRUCT struct __attribute__((packed))

/**
* @brief CAN_MESSAGE The CAN_MESSAGE macro
* @brief CAN_MESSAGE_STRUCT
* is used to define can message structs. We use
* This macro because it automatically includes a VALIDATE_CAN_MESSAGE call after defining the struct.
* This allows us to validate at compile time that the message does not exceed the maximum size limits
Expand Down Expand Up @@ -73,7 +73,7 @@
* typedef char assertion_failed_exampleCommand_<line number>[2*!!(sizeof(exampleCommand) <= MAX_CAN_MESSAGE_SIZE) - 1]
* ```
*/
#define CAN_MESSAGE(commandName, fields) \
#define CAN_MESSAGE_STRUCT(commandName, fields) \
typedef PACKED_STRUCT \
fields \
commandName; \
Expand All @@ -90,24 +90,38 @@ extern "C" {
//=========================================
// BEGIN MESSAGES
//=========================================

CAN_MESSAGE(relayFaultDetected, {
uint8_t errorCode;
});
#define Messages \
CAN_MESSAGE(RelayFaultDetected, 0x00, { \
uint8_t errorCode;\
}) \
CAN_MESSAGE(BmsFaultDetected, 0x01, { \
uint8_t errorCode;\
}) \
CAN_MESSAGE(McFaultDetected, 0x02, {\
uint8_t errorCode;\
}) \
CAN_MESSAGE(LVSensingFaultDetected, 0x03, { \
uint8_t errorCode; \
})

//=========================================
// Begin Message Ids
// Generate Message Ids
//=========================================
#define CAN_MESSAGE(name, id, fields) name##Id = id,
enum CanMessageId : uint32_t {
RelayFaultDetected = 0x00,
BmsFaultDetected = 0x01,
McFaultDetected = 0x02,
LVSensingFaultDetected = 0x03,


Messages
// TODO Fill out with the rest of the values
DefaultRx = 0x7FFFFFF,
};
#undef CAN_MESSAGE

//=========================================
// Generate Message structs
//=========================================
#define CAN_MESSAGE(name, id, fields) CAN_MESSAGE_STRUCT(name##Message, fields);
Messages
#undef CAN_MESSAGE


#ifdef __cplusplus
}
Expand Down