From bc014ccbd8dd4f169fb9f301cd7df0fec35033c2 Mon Sep 17 00:00:00 2001 From: wangcoolc <1387172050@163.com> Date: Wed, 9 Dec 2020 16:38:53 +0800 Subject: [PATCH] Modified canbus rece SD example --- examples/recv_sd/recv_sd.ino | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/examples/recv_sd/recv_sd.ino b/examples/recv_sd/recv_sd.ino index 8e6e222..7f4a90f 100644 --- a/examples/recv_sd/recv_sd.ino +++ b/examples/recv_sd/recv_sd.ino @@ -4,7 +4,6 @@ // loovee, Jun 12, 2017 #include -#include "mcp_can.h" #include /*SAMD core*/ @@ -16,12 +15,25 @@ File myFile; +//#define CAN_2515 +#define CAN_2518FD // the cs pin of the version after v1.1 is default to D9 // v0.9b and v1.0 is default D10 -const int SPI_CS_CAN = 9; -const int SPI_CS_SD = 4; -MCP_CAN CAN(SPI_CS_CAN); // Set CS pin + +#ifdef CAN_2518FD +#include "mcp2518fd_can.h" +const int SPI_CS_PIN = BCM8; +const int CAN_INT_PIN = BCM25; +mcp2518fd CAN(SPI_CS_PIN); // Set CS pin +#endif + +#ifdef CAN_2515 +#include "mcp2515_can.h" +const int SPI_CS_PIN = 9; +const int CAN_INT_PIN = 2; +mcp2515_can CAN(SPI_CS_PIN); // Set CS pin +#endif // Set CS pin unsigned char flagRecv = 0; unsigned char len = 0; @@ -31,7 +43,11 @@ char str[20]; void setup() { SERIAL.begin(115200); - while (CAN_OK != CAN.begin(CAN_500KBPS)) { // init can bus : baudrate = 500k +#ifdef CAN_2518FD + while (0 != CAN.begin((byte)CAN_500K_1M)) { // init can bus : baudrate = 500k +#else + while (CAN_OK != CAN.begin(CAN_500KBPS)) { // init can bus : baudrate = 500k +#endif SERIAL.println("CAN BUS Shield init fail"); SERIAL.println("Init CAN BUS Shield again"); delay(100); @@ -88,4 +104,4 @@ void loop() { } } -// END FILE \ No newline at end of file +// END FILE