Michel2/Seeed_Arduino_CAN
1
0
Fork 0
mirror of https://github.com/Seeed-Studio/Seeed_Arduino_CAN.git synced 2026-07-28 04:06:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move: adapt canbus example to new API attach()

Browse Source
This commit is contained in:
turmary
2021-02-01 20:26:53 +08:00
parent 7cb25da245
commit 8920835971
2 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/canbus-monitor/canbus-monitor.ino
+22 -17
View File
@@ -34,16 +34,22 @@
void setup() {
Serial.begin(LW232_DEFAULT_BAUD_RATE); // default COM baud rate is 115200.
// Can232::init (RATE, CLOCK)
// Rates: CAN_10KBPS, CAN_20KBPS, CAN_50KBPS, CAN_100KBPS, CAN_125KBPS, CAN_250KBPS, CAN_500KBPS, CAN_500KBPS, CAN_1000KBPS, CAN_83K3BPS
// Default is CAN_83K3BPS ;)))))))))
// Clock: MCP_16MHz or MCP_8MHz.
// Default is MCP_16MHz. Please note, not all CAN speeds supported. check big switch in mcp_can.cpp
// defaults can be changed in mcp_can.h
Serial.begin(LW232_DEFAULT_BAUD_RATE); // default COM baud rate is 115200.
while (!Serial) {
delay(10);
}
// Can232::init(); // rate and clock = LW232_DEFAULT_CAN_RATE and LW232_DEFAULT_CLOCK_FREQ
// Can232::init(CAN_125KBPS); // rate = 125, clock = LW232_DEFAULT_CLOCK_FREQ
// associate the Can232 and the CAN lowlevel driver
Can232::attach(&CAN);
// Can232::init (RATE, CLOCK)
// Rates: CAN_10KBPS, CAN_20KBPS, CAN_50KBPS, CAN_100KBPS, CAN_125KBPS, CAN_250KBPS, CAN_500KBPS, CAN_500KBPS, CAN_1000KBPS, CAN_83K3BPS
// Default is CAN_83K3BPS.
// Clock: MCP_16MHz or MCP_8MHz.
// Default is MCP_16MHz. Please note, not all CAN speeds supported. check big switch in mcp_can.cpp
// defaults can be changed according to mcp_can.h
// Can232::init(); // rate and clock = LW232_DEFAULT_CAN_RATE and LW232_DEFAULT_CLOCK_FREQ
// Can232::init(CAN_125KBPS); // rate = 125, clock = LW232_DEFAULT_CLOCK_FREQ
Can232::init(CAN_125KBPS, MCP_16MHz); // set default rate you need here and clock frequency of CAN shield. Typically it is 16MHz, but on some MCP2515 + TJA1050 it is 8Mhz
// optional custom packet filter to reduce number of messages comingh through to canhacker
@@ -57,7 +63,7 @@ INT8U myCustomAddressFilter(INT32U addr) {
// case 0x1C8: //lights
// case 0x2C0: // pedals
case 0x3d0: // sound vol, treb..
ret = LW232_FILTER_PROCESS;
ret = LW232_FILTER_PROCESS;
// case 0x000: // ?
// case 0x003: //shifter
// case 0x015: // dor open close affects this as well
@@ -66,19 +72,18 @@ INT8U myCustomAddressFilter(INT32U addr) {
// break;
// case 0x002:
// case 0x1a7: //fuel cons or some other
// ret = 1;
// break;
// default:
// ret = 0;
// ret = 1;
// break;
// default:
// ret = 0;
}
return ret;
return ret;
}
void loop() {
Can232::loop();
}
void serialEvent() {
void serialEventRun() {
Can232::serialEvent();
}
examples/receive_monitor/receive_monitor.ino
+1 -1
View File
@@ -32,7 +32,7 @@ const int CAN_INT_PIN = 2;
#include "mcp2518fd_can.h"
mcp2518fd CAN(SPI_CS_PIN); // Set CS pin
// TEST TEST MCP2518FD CAN2.0 data transfer
// To TEST MCP2518FD CAN2.0 data transfer
#define MAX_DATA_SIZE 8
// To TEST MCP2518FD CANFD data transfer, uncomment below lines
// #undef MAX_DATA_SIZE