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

fix variable collision that broke compatibility with Arudino Uno Wifi R2 boards. May also affect Arduino Nano Every

Browse Source
This commit is contained in:
QuentinTorg
2021-06-06 09:31:59 -04:00
parent c110bf10c0
commit 4080671c63
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mcp2518fd_can.cpp
+8 -8
View File
@@ -1909,15 +1909,15 @@ byte mcp2518fd::init_Mask(byte num, byte ext, unsigned long ulData) {
mcp2518fd_OperationModeSelect(CAN_CONFIGURATION_MODE);
mcp2518fd_FilterToFifoLink((CAN_FILTER)num, APP_RX_FIFO, false);
// Setup RX Mask
mObj.word = 0;
mObj.bF.MSID = ulData;
mObj.bF.MIDE = ext;
err = mcp2518fd_FilterMaskConfigure((CAN_FILTER)num, &mObj.bF);
mcp2518fd_FilterToFifoLink((CAN_FILTER)num, APP_RX_FIFO, true);
mcp2518fd_OperationModeSelect(mcpMode);
return err;
@@ -1932,7 +1932,7 @@ byte mcp2518fd::init_Filt(byte num, byte ext, unsigned long ulData) {
err = mcp2518fd_OperationModeSelect(CAN_CONFIGURATION_MODE);
mcp2518fd_FilterToFifoLink((CAN_FILTER)num, APP_RX_FIFO, false);
// Setup RX Filter
fObj.word = 0;
if (!ext) { // standard identifier
@@ -1942,9 +1942,9 @@ byte mcp2518fd::init_Filt(byte num, byte ext, unsigned long ulData) {
}
fObj.bF.EXIDE = !!ext;
mcp2518fd_FilterObjectConfigure((CAN_FILTER)num, &fObj.bF);
mcp2518fd_FilterToFifoLink((CAN_FILTER)num, APP_RX_FIFO, true);
mcp2518fd_OperationModeSelect(mcpMode);
return err;
}
@@ -2252,10 +2252,10 @@ byte mcp2518fd::mcpDigitalRead(const byte pin) {
// Update data
switch (pin) {
case GPIO_PIN_0:
state = (GPIO_PIN_STATE)iocon.bF.GPIO0;
state = (GPIO_PIN_STATE)iocon.bF.GPIO0_;
break;
case GPIO_PIN_1:
state = (GPIO_PIN_STATE)iocon.bF.GPIO1;
state = (GPIO_PIN_STATE)iocon.bF.GPIO1_;
break;
default:
return -1;
src/mcp2518fd_can_dfs.h
+2 -2
View File
@@ -1463,8 +1463,8 @@ typedef union _REG_IOCON {
uint32_t LAT1 : 1;
uint32_t unimplemented3 : 5;
uint32_t HVDETSEL : 1;
uint32_t GPIO0 : 1;
uint32_t GPIO1 : 1;
uint32_t GPIO0_ : 1;
uint32_t GPIO1_ : 1;
uint32_t unimplemented4 : 6;
uint32_t PinMode0 : 1;
uint32_t PinMode1 : 1;