Skip to content

Refined CAN Settings Logic in the Code #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MaRuolang wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Refined CAN Settings Logic in the Code #37

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions Library/StdDriver/src/can.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,18 +574,19 @@ int32_t CAN_SetRxMsgObjAndMsk(CAN_T *tCAN, uint8_t u8MsgObj, uint8_t u8idType, u

if(u8idType == CAN_STD_ID) /* According STD/EXT ID format,Configure Mask and Arbitration register */
{
tCAN->IF[u32MsgIfNum].MASK1 = 0ul;
tCAN->IF[u32MsgIfNum].MASK2 = (u32idmask & 0x7FFul) << 2;
tCAN->IF[u32MsgIfNum].ARB1 = 0ul;
tCAN->IF[u32MsgIfNum].ARB2 = CAN_IF_ARB2_MSGVAL_Msk | (u32id & 0x7FFul) << 2;
}
else
{
tCAN->IF[u32MsgIfNum].MASK1 = u32idmask & 0xFFFFul;
tCAN->IF[u32MsgIfNum].MASK2 = CAN_IF_MASK2_MXTD_Msk | (u32idmask & 0x1FFF0000ul) >> 16;
tCAN->IF[u32MsgIfNum].ARB1 = u32id & 0xFFFFul;
tCAN->IF[u32MsgIfNum].ARB2 = CAN_IF_ARB2_MSGVAL_Msk | CAN_IF_ARB2_XTD_Msk | (u32id & 0x1FFF0000ul) >> 16;
}

tCAN->IF[u32MsgIfNum].MASK1 = (u32idmask & 0xFFFFul);
tCAN->IF[u32MsgIfNum].MASK2 = (u32idmask >> 16) & 0xFFFFul;

/* tCAN->IF[u32MsgIfNum].MCON |= CAN_IF_MCON_UMASK_Msk | CAN_IF_MCON_RXIE_Msk; */
tCAN->IF[u32MsgIfNum].MCON = CAN_IF_MCON_UMASK_Msk | CAN_IF_MCON_RXIE_Msk;
if(u8singleOrFifoLast)
Expand Down Expand Up @@ -653,8 +654,8 @@ int32_t CAN_SetRxMsgObj(CAN_T *tCAN, uint8_t u8MsgObj, uint8_t u8idType, uint32_
tCAN->IF[u32MsgIfNum].ARB2 = CAN_IF_ARB2_MSGVAL_Msk | CAN_IF_ARB2_XTD_Msk | (u32id & 0x1FFF0000ul) >> 16;
}

/* tCAN->IF[u8MsgIfNum].MCON |= CAN_IF_MCON_UMASK_Msk | CAN_IF_MCON_RXIE_Msk; */
tCAN->IF[u32MsgIfNum].MCON = CAN_IF_MCON_UMASK_Msk | CAN_IF_MCON_RXIE_Msk;
/* tCAN->IF[u8MsgIfNum].MCON |= CAN_IF_MCON_RXIE_Msk; */
tCAN->IF[u32MsgIfNum].MCON = CAN_IF_MCON_RXIE_Msk;
if(u8singleOrFifoLast)
{
tCAN->IF[u32MsgIfNum].MCON |= CAN_IF_MCON_EOB_Msk;
Expand Down