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

add 25K baudrate

Browse Source
This commit is contained in:
loovee
2016-01-27 14:04:38 +08:00
parent eecab748af
commit 4209ffd693
2 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mcp_can.cpp
+7 -1
View File
@@ -184,7 +184,7 @@ INT8U MCP_CAN::mcp2515_configRate(const INT8U canSpeed)
{ {
INT8U set, cfg1, cfg2, cfg3; INT8U set, cfg1, cfg2, cfg3;
set = 1; set = 1;
switch (canSpeed) switch (canSpeed)
{ {
case (CAN_5KBPS): case (CAN_5KBPS):
cfg1 = MCP_16MHz_5kBPS_CFG1; cfg1 = MCP_16MHz_5kBPS_CFG1;
@@ -204,6 +204,12 @@ INT8U MCP_CAN::mcp2515_configRate(const INT8U canSpeed)
cfg3 = MCP_16MHz_20kBPS_CFG3; cfg3 = MCP_16MHz_20kBPS_CFG3;
break; break;
case (CAN_25KBPS):
cfg1 = MCP_16MHz_25kBPS_CFG1;
cfg2 = MCP_16MHz_25kBPS_CFG2;
cfg3 = MCP_16MHz_25kBPS_CFG3;
break;
case (CAN_31K25BPS): case (CAN_31K25BPS):
cfg1 = MCP_16MHz_31k25BPS_CFG1; cfg1 = MCP_16MHz_31k25BPS_CFG1;
cfg2 = MCP_16MHz_31k25BPS_CFG2; cfg2 = MCP_16MHz_31k25BPS_CFG2;
mcp_can_dfs.h
+18 -13
View File
@@ -327,6 +327,10 @@
#define MCP_16MHz_31k25BPS_CFG2 (0xF1) #define MCP_16MHz_31k25BPS_CFG2 (0xF1)
#define MCP_16MHz_31k25BPS_CFG3 (0x85) #define MCP_16MHz_31k25BPS_CFG3 (0x85)
#define MCP_16MHz_25kBPS_CFG1 (0X0F)
#define MCP_16MHz_25kBPS_CFG2 (0XBA)
#define MCP_16MHz_25kBPS_CFG3 (0X07)
#define MCP_16MHz_20kBPS_CFG1 (0x0F) #define MCP_16MHz_20kBPS_CFG1 (0x0F)
#define MCP_16MHz_20kBPS_CFG2 (0xFF) #define MCP_16MHz_20kBPS_CFG2 (0xFF)
#define MCP_16MHz_20kBPS_CFG3 (0x87) #define MCP_16MHz_20kBPS_CFG3 (0x87)
@@ -378,19 +382,20 @@
#define CAN_5KBPS 1 #define CAN_5KBPS 1
#define CAN_10KBPS 2 #define CAN_10KBPS 2
#define CAN_20KBPS 3 #define CAN_20KBPS 3
#define CAN_31K25BPS 4 #define CAN_25KBPS 4
#define CAN_33KBPS 5 #define CAN_31K25BPS 5
#define CAN_40KBPS 6 #define CAN_33KBPS 6
#define CAN_50KBPS 7 #define CAN_40KBPS 7
#define CAN_80KBPS 8 #define CAN_50KBPS 8
#define CAN_83K3BPS 9 #define CAN_80KBPS 9
#define CAN_95KBPS 10 #define CAN_83K3BPS 10
#define CAN_100KBPS 11 #define CAN_95KBPS 11
#define CAN_125KBPS 12 #define CAN_100KBPS 12
#define CAN_200KBPS 13 #define CAN_125KBPS 13
#define CAN_250KBPS 14 #define CAN_200KBPS 14
#define CAN_500KBPS 15 #define CAN_250KBPS 15
#define CAN_1000KBPS 16 #define CAN_500KBPS 16
#define CAN_1000KBPS 17
#define CAN_OK (0) #define CAN_OK (0)
#define CAN_FAILINIT (1) #define CAN_FAILINIT (1)