ALPAKA/sta-core
1
0
Fork 0
mirror of https://git.intern.spaceteamaachen.de/ALPAKA/sta-core.git synced 2025-06-10 16:55:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request 'Feature: CAN via IRQ' (#28) from can_wo_isotp into main

Browse Source 
Reviewed-on: https://git.intern.spaceteamaachen.de/ALPAKA/sta-core/pulls/28
Reviewed-by: dario <dario@noreply.git.intern.spaceteamaachen.de>
This commit is contained in:
carlwachter 2024-05-01 09:46:30 +00:00
commit 09b0d4b5e9
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/devices/stm32/can.cpp
View File

@ -166,6 +166,7 @@ namespace sta
config->FilterScale = CAN_FILTERSCALE_32BIT; config->FilterScale = CAN_FILTERSCALE_32BIT;
config->FilterActivation = CAN_FILTER_DISABLE; config->FilterActivation = CAN_FILTER_DISABLE;
config->SlaveStartFilterBank = MAX_FILTER_COUNT; config->SlaveStartFilterBank = MAX_FILTER_COUNT;
HAL_CAN_ConfigFilter(handle_, config);
} }
} }
@ -203,16 +204,16 @@ namespace sta
} // namespace sta } // namespace sta
#ifdef STA_STM32_CAN_GLOBAL #ifdef STA_STM32_CAN_HANDLE
#include <can.h> #include <can.h>
namespace sta namespace sta
{ {
STM32CanController CanBus(&STA_STM32_CAN_GLOBAL); STM32CanController CanBus(&STA_STM32_CAN_HANDLE);
STA_WEAK STA_WEAK
void CanBus_RxPendingCallback() void CanBus_RxPendingCallback(uint32_t fifo)
{} {}
} // namespace sta } // namespace sta
@ -221,17 +222,17 @@ extern "C"
{ {
void HAL_CAN_RxFifo0MsgPendingCallback(CAN_HandleTypeDef *hcan) void HAL_CAN_RxFifo0MsgPendingCallback(CAN_HandleTypeDef *hcan)
{ {
if (hcan == &STA_STM32_CAN_GLOBAL) if (hcan == &STA_STM32_CAN_HANDLE)
{ {
sta::CanBus_RxPendingCallback(); sta::CanBus_RxPendingCallback(CAN_RX_FIFO0);
} }
} }
void HAL_CAN_RxFifo1MsgPendingCallback(CAN_HandleTypeDef *hcan) void HAL_CAN_RxFifo1MsgPendingCallback(CAN_HandleTypeDef *hcan)
{ {
if (hcan == &STA_STM32_CAN_GLOBAL) if (hcan == &STA_STM32_CAN_HANDLE)
{ {
sta::CanBus_RxPendingCallback(); sta::CanBus_RxPendingCallback(CAN_RX_FIFO1);
} }
} }
} }