Michel2/Seeed_Arduino_CAN
1
0
Fork 0
mirror of https://github.com/Seeed-Studio/Seeed_Arduino_CAN.git synced 2026-07-27 19:55:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/mbaum0193/CAN_BUS_Shield into mbaum0193-master

Browse Source
This commit is contained in:
Baozhu Zuo
2020-03-30 10:20:33 +08:00
parent dc03e48b66 33bb082ecf
commit 055c0024ea
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mcp_can.cpp
+5 -1
View File
@@ -453,7 +453,11 @@ byte MCP_CAN::mcp2515_configRate(const byte canSpeed, const byte clock) {
cfg2 = MCP_16MHz_40kBPS_CFG2;
cfg3 = MCP_16MHz_40kBPS_CFG3;
break;
case (CAN_47KBPS):
cfg1 = MCP_16MHz_47kBPS_CFG1;
cfg2 = MCP_16MHz_47kBPS_CFG2;
cfg3 = MCP_16Mhz_47kBPS_CFG3;
break;
case (CAN_50KBPS):
cfg1 = MCP_16MHz_50kBPS_CFG1;
cfg2 = MCP_16MHz_50kBPS_CFG2;
mcp_can_dfs.h
+5
View File
@@ -405,6 +405,10 @@
#define MCP_8MHz_5kBPS_CFG2 (0xbf)
#define MCP_8MHz_5kBPS_CFG3 (0x07)
#define MCP_16MHz_47kBPS_CFG1 (0x06)
#define MCP_16MHz_47kBPS_CFG2 (0xBE)
#define MCP_16Mhz_47kBPS_CFG3 (0x07)
#define MCPDEBUG (0)
#define MCPDEBUG_TXBUF (0)
#define MCP_N_TXBUFFERS (3)
@@ -465,6 +469,7 @@
#define CAN_500KBPS 16
#define CAN_666KBPS 17
#define CAN_1000KBPS 18
#define CAN_47KBPS 19
#define CAN_OK (0)
#define CAN_FAILINIT (1)