Michel2/Seeed_Arduino_CAN
1
0
Fork 0
mirror of https://github.com/Seeed-Studio/Seeed_Arduino_CAN.git synced 2026-09-14 10:33:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'Seeed-Studio:master' into master

Browse Source
This commit is contained in:
Jacob G
2021-07-06 16:44:28 -07:00
committed by GitHub
parent e9adda5cea 5a41853758
commit c991cacd9a
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
library.json
+2 -2
View File
@@ -1,13 +1,13 @@
{
"name": "CAN_BUS_Shield",
"keywords": "can, bus, MCP2518FD ，mcp2515, MCP-2515",
"keywords": "can, bus, mcp2518fd, mcp2515, mcp-2515",
"description": "Seeed Arduino library to control CAN-BUS and CAN BUS FD.",
"repository":
{
"type": "git",
"url": "https://github.com/Seeed-Studio/Seeed_Arduino_CAN.git"
},
"version": "1.20",
"version": "2.3.0",
"frameworks": "arduino",
"platforms": "*"
}
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;