Compare commits

..

No commits in common. "master" and "fix-missing-same5x-header" have entirely different histories.

3 changed files with 5 additions and 9 deletions

View file

@ -7,11 +7,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/setup-python@v4
- uses: actions/setup-python@v1
with:
python-version: '3.x'
- uses: actions/checkout@v3
- uses: actions/checkout@v3
- uses: actions/checkout@v2
- uses: actions/checkout@v2
with:
repository: adafruit/ci-arduino
path: ci

View file

@ -1,5 +1,5 @@
name=CAN Adafruit Fork
version=1.2.1
version=1.1.0
author=Sandeep Mistry <sandeep.mistry@gmail.com>
maintainer=adafruit <info@adafruit.com>
sentence=An Arduino library for sending and receiving data using CAN bus.

View file

@ -456,8 +456,6 @@ int CANSAME5x::filter(int id, int mask) {
state->extended_rx_filter[0].XIDFE_0.bit.EFEC = CAN_XIDFE_0_EFEC_REJECT_Val;
state->extended_rx_filter[0].XIDFE_1.bit.EFID2 = 0; // mask
state->extended_rx_filter[0].XIDFE_1.bit.EFT = CAN_XIDFE_1_EFT_CLASSIC_Val;
return 1;
}
int CANSAME5x::filterExtended(long id, long mask) {
@ -467,13 +465,11 @@ int CANSAME5x::filterExtended(long id, long mask) {
state->standard_rx_filter[0].SIDFE_0.bit.SFEC = CAN_SIDFE_0_SFEC_REJECT_Val;
state->standard_rx_filter[0].SIDFE_0.bit.SFT = CAN_SIDFE_0_SFT_CLASSIC_Val;
// accept matching extended messages
// reject all extended messages
state->extended_rx_filter[0].XIDFE_0.bit.EFID1 = id;
state->extended_rx_filter[0].XIDFE_0.bit.EFEC = CAN_XIDFE_0_EFEC_STF0M_Val;
state->extended_rx_filter[0].XIDFE_1.bit.EFID2 = mask;
state->extended_rx_filter[0].XIDFE_1.bit.EFT = CAN_XIDFE_1_EFT_CLASSIC_Val;
return 1;
}
int CANSAME5x::observe() {