Skip to content

Commit d9adb28

Browse files
authored
Merge pull request autowp#86 from PL125/master
Add 95kbps at 16MHz
2 parents d424134 + 63ba4c8 commit d9adb28

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

mcp2515.cpp

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,13 @@ MCP2515::ERROR MCP2515::setBitrate(const CAN_SPEED canSpeed, CAN_CLOCK canClock)
356356
cfg1 = MCP_16MHz_83k3BPS_CFG1;
357357
cfg2 = MCP_16MHz_83k3BPS_CFG2;
358358
cfg3 = MCP_16MHz_83k3BPS_CFG3;
359-
break;
359+
break;
360+
361+
case (CAN_95KBPS): // 95Kbps
362+
cfg1 = MCP_16MHz_95kBPS_CFG1;
363+
cfg2 = MCP_16MHz_95kBPS_CFG2;
364+
cfg3 = MCP_16MHz_95kBPS_CFG3;
365+
break;
360366

361367
case (CAN_100KBPS): // 100Kbps
362368
cfg1 = MCP_16MHz_100kBPS_CFG1;

mcp2515.h

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,14 +90,18 @@
9090
#define MCP_16MHz_100kBPS_CFG2 (0xFA)
9191
#define MCP_16MHz_100kBPS_CFG3 (0x87)
9292

93-
#define MCP_16MHz_80kBPS_CFG1 (0x03)
94-
#define MCP_16MHz_80kBPS_CFG2 (0xFF)
95-
#define MCP_16MHz_80kBPS_CFG3 (0x87)
93+
#define MCP_16MHz_95kBPS_CFG1 (0x03)
94+
#define MCP_16MHz_95kBPS_CFG2 (0xAD)
95+
#define MCP_16MHz_95kBPS_CFG3 (0x07)
9696

9797
#define MCP_16MHz_83k3BPS_CFG1 (0x03)
9898
#define MCP_16MHz_83k3BPS_CFG2 (0xBE)
9999
#define MCP_16MHz_83k3BPS_CFG3 (0x07)
100100

101+
#define MCP_16MHz_80kBPS_CFG1 (0x03)
102+
#define MCP_16MHz_80kBPS_CFG2 (0xFF)
103+
#define MCP_16MHz_80kBPS_CFG3 (0x87)
104+
101105
#define MCP_16MHz_50kBPS_CFG1 (0x07)
102106
#define MCP_16MHz_50kBPS_CFG2 (0xFA)
103107
#define MCP_16MHz_50kBPS_CFG3 (0x87)

0 commit comments

Comments
 (0)