Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions can.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ typedef __u32 canid_t;
#define CAN_MAX_DLEN 8

struct can_frame {
canid_t can_id; /* 32 bit CAN_ID + EFF/RTR/ERR flags */
__u8 can_dlc; /* frame payload length in byte (0 .. CAN_MAX_DLEN) */
__u8 data[CAN_MAX_DLEN] __attribute__((aligned(8)));
canid_t can_id; /* 32 bit CAN_ID + EFF/RTR/ERR flags */
__u8 can_dlc; /* frame payload length in byte (0 .. CAN_MAX_DLEN) */
alignas(8) __u8 data[CAN_MAX_DLEN];
};

#endif /* CAN_H_ */
7 changes: 6 additions & 1 deletion mcp2515.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -177,9 +177,14 @@ MCP2515::ERROR MCP2515::setNormalMode()
return setMode(CANCTRL_REQOP_NORMAL);
}

MCP2515::ERROR MCP2515::setNormalOneShotMode()
{
return setMode(CANCTRL_REQOP_NORMAL | CANCTRL_OSM);
}

MCP2515::ERROR MCP2515::setMode(const CANCTRL_REQOP_MODE mode)
{
modifyRegister(MCP_CANCTRL, CANCTRL_REQOP, mode);
modifyRegister(MCP_CANCTRL, CANCTRL_REQOP | CANCTRL_OSM, mode);

unsigned long endTime = millis() + 10;
bool modeMatch = false;
Expand Down
1 change: 1 addition & 0 deletions mcp2515.h
Original file line number Diff line number Diff line change
Expand Up @@ -473,6 +473,7 @@ class MCP2515
ERROR setSleepMode();
ERROR setLoopbackMode();
ERROR setNormalMode();
ERROR setNormalOneShotMode();
ERROR setClkOut(const CAN_CLKOUT divisor);
ERROR setBitrate(const CAN_SPEED canSpeed);
ERROR setBitrate(const CAN_SPEED canSpeed, const CAN_CLOCK canClock);
Expand Down