Skip to content

Commit

Permalink
fixed CAN error handles (#43)
Browse files Browse the repository at this point in the history
* fixed error handles

* typo
  • Loading branch information
dyldonahue committed Dec 7, 2023
1 parent 081b1ff commit edbb398
Showing 1 changed file with 10 additions and 6 deletions.
16 changes: 10 additions & 6 deletions platforms/stm32f405/src/can.c
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,19 @@ HAL_StatusTypeDef can_init(can_t *can)
sFilterConfig.FilterFIFOAssignment = CAN_RX_FIFO0; // FIFO to assign the filter to
sFilterConfig.FilterActivation = ENABLE; // Enable the filter

uint8_t err;
err = HAL_CAN_ConfigFilter(&hcan, &sFilterConfig) != HAL_OK)
uint8_t err = 0;
err = HAL_CAN_ConfigFilter(&hcan, &sFilterConfig) != HAL_OK);
if (err != HAL_OK) return err;

/* set up interrupt & activate CAN */
err |= HAL_CAN_Start(can->hcan);

err = HAL_CAN_Start(can->hcan);
if (err != HAL_OK) return err;

// Override the default callback for CAN_IT_RX_FIFO0_MSG_PENDING
err |= HAL_CAN_RegisterCallback(can->hcan, HAL_CAN_RX_FIFO0_MSG_PENDING_CB_ID, can->can_callback);
err |= HAL_CAN_ActivateNotification(can->hcan, CAN_IT_RX_FIFO0_MSG_PENDING);
err = HAL_CAN_RegisterCallback(can->hcan, HAL_CAN_RX_FIFO0_MSG_PENDING_CB_ID, can->can_callback);
if (err != HAL_OK) return err;

err = HAL_CAN_ActivateNotification(can->hcan, CAN_IT_RX_FIFO0_MSG_PENDING);

return err;
}
Expand Down

0 comments on commit edbb398

Please sign in to comment.