fengqi/lv_micropython
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

stm32/fdcan: Use FDCAN_RXFxS_FxFL instead of hard-coded value.

Browse Source
This commit is contained in:
iabdalkader 2020-06-30 23:04:57 +02:00 committed by Amir Gonnen
parent 8e6befc609
commit 172f2ba228
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ports/stm32/fdcan.c
View File

@ -200,17 +200,21 @@ void can_clearfilter(pyb_can_obj_t *self, uint32_t f, uint8_t bank) {
int can_receive(FDCAN_HandleTypeDef *can, int fifo, FDCAN_RxHeaderTypeDef *hdr, uint8_t *data, uint32_t timeout_ms) { int can_receive(FDCAN_HandleTypeDef *can, int fifo, FDCAN_RxHeaderTypeDef *hdr, uint8_t *data, uint32_t timeout_ms) {
volatile uint32_t *rxf, *rxa; volatile uint32_t *rxf, *rxa;
uint32_t fl;
if (fifo == FDCAN_RX_FIFO0) { if (fifo == FDCAN_RX_FIFO0) {
rxf = &can->Instance->RXF0S; rxf = &can->Instance->RXF0S;
rxa = &can->Instance->RXF0A; rxa = &can->Instance->RXF0A;
fl = FDCAN_RXF0S_F0FL;
} else { } else {
rxf = &can->Instance->RXF1S; rxf = &can->Instance->RXF1S;
rxa = &can->Instance->RXF1A; rxa = &can->Instance->RXF1A;
fl = FDCAN_RXF1S_F1FL;
} }
// Wait for a message to become available, with timeout // Wait for a message to become available, with timeout
uint32_t start = HAL_GetTick(); uint32_t start = HAL_GetTick();
while ((*rxf & 7) == 0) { while ((*rxf & fl) == 0) {
MICROPY_EVENT_POLL_HOOK MICROPY_EVENT_POLL_HOOK
if (HAL_GetTick() - start >= timeout_ms) { if (HAL_GetTick() - start >= timeout_ms) {
return -MP_ETIMEDOUT; return -MP_ETIMEDOUT;