Skip to content

Commit 4080671

Browse files
committed
fix variable collision that broke compatibility with Arudino Uno Wifi R2 boards. May also affect Arduino Nano Every
1 parent c110bf1 commit 4080671

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

src/mcp2518fd_can.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1909,15 +1909,15 @@ byte mcp2518fd::init_Mask(byte num, byte ext, unsigned long ulData) {
19091909
mcp2518fd_OperationModeSelect(CAN_CONFIGURATION_MODE);
19101910

19111911
mcp2518fd_FilterToFifoLink((CAN_FILTER)num, APP_RX_FIFO, false);
1912-
1912+
19131913
// Setup RX Mask
19141914
mObj.word = 0;
19151915
mObj.bF.MSID = ulData;
19161916
mObj.bF.MIDE = ext;
19171917
err = mcp2518fd_FilterMaskConfigure((CAN_FILTER)num, &mObj.bF);
1918-
1918+
19191919
mcp2518fd_FilterToFifoLink((CAN_FILTER)num, APP_RX_FIFO, true);
1920-
1920+
19211921
mcp2518fd_OperationModeSelect(mcpMode);
19221922

19231923
return err;
@@ -1932,7 +1932,7 @@ byte mcp2518fd::init_Filt(byte num, byte ext, unsigned long ulData) {
19321932
err = mcp2518fd_OperationModeSelect(CAN_CONFIGURATION_MODE);
19331933

19341934
mcp2518fd_FilterToFifoLink((CAN_FILTER)num, APP_RX_FIFO, false);
1935-
1935+
19361936
// Setup RX Filter
19371937
fObj.word = 0;
19381938
if (!ext) { // standard identifier
@@ -1942,9 +1942,9 @@ byte mcp2518fd::init_Filt(byte num, byte ext, unsigned long ulData) {
19421942
}
19431943
fObj.bF.EXIDE = !!ext;
19441944
mcp2518fd_FilterObjectConfigure((CAN_FILTER)num, &fObj.bF);
1945-
1945+
19461946
mcp2518fd_FilterToFifoLink((CAN_FILTER)num, APP_RX_FIFO, true);
1947-
1947+
19481948
mcp2518fd_OperationModeSelect(mcpMode);
19491949
return err;
19501950
}
@@ -2252,10 +2252,10 @@ byte mcp2518fd::mcpDigitalRead(const byte pin) {
22522252
// Update data
22532253
switch (pin) {
22542254
case GPIO_PIN_0:
2255-
state = (GPIO_PIN_STATE)iocon.bF.GPIO0;
2255+
state = (GPIO_PIN_STATE)iocon.bF.GPIO0_;
22562256
break;
22572257
case GPIO_PIN_1:
2258-
state = (GPIO_PIN_STATE)iocon.bF.GPIO1;
2258+
state = (GPIO_PIN_STATE)iocon.bF.GPIO1_;
22592259
break;
22602260
default:
22612261
return -1;

src/mcp2518fd_can_dfs.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1463,8 +1463,8 @@ typedef union _REG_IOCON {
14631463
uint32_t LAT1 : 1;
14641464
uint32_t unimplemented3 : 5;
14651465
uint32_t HVDETSEL : 1;
1466-
uint32_t GPIO0 : 1;
1467-
uint32_t GPIO1 : 1;
1466+
uint32_t GPIO0_ : 1;
1467+
uint32_t GPIO1_ : 1;
14681468
uint32_t unimplemented4 : 6;
14691469
uint32_t PinMode0 : 1;
14701470
uint32_t PinMode1 : 1;

0 commit comments

Comments
 (0)