Skip to content

fix(led-strip): migrate dmaInit() to ownership-checked dmaAllocate() #1394

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

Merged
nerdCopter merged 2 commits into from
Aug 18, 2026
Merged

fix(led-strip): migrate dmaInit() to ownership-checked dmaAllocate() #1394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28f01de
fix(led-strip): migrate dmaInit() to ownership-checked dmaAllocate()
nerdCopter Aug 17, 2026
db2c44d
fix(led-strip): move dmaAllocate() check before hardware setup
nerdCopter Aug 17, 2026
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
4 changes: 2 additions & 2 deletions src/main/drivers/light_ws2811strip_hal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ void ws2811LedStripHardwareInit(ioTag_t ioTag) {
const timerHardware_t *timerHardware = timerGetByTag(ioTag);
TIM_TypeDef *timer = timerHardware->tim;
timerChannel = timerHardware->channel;
if (timerHardware->dmaRef == NULL) {
if (timerHardware->dmaRef == NULL || !dmaAllocate(timerHardware->dmaIrqHandler, OWNER_LED_STRIP, 0)) {
return;
}
TimHandle.Instance = timer;
Expand Down Expand Up @@ -99,7 +99,7 @@ void ws2811LedStripHardwareInit(ioTag_t ioTag) {
uint16_t dmaIndex = timerDmaIndex(timerChannel);
/* Link hdma_tim to hdma[x] (channelx) */
__HAL_LINKDMA(&TimHandle, hdma[dmaIndex], hdma_tim);
dmaInit(timerHardware->dmaIrqHandler, OWNER_LED_STRIP, 0);
dmaEnable(timerHardware->dmaIrqHandler);
dmaSetHandler(timerHardware->dmaIrqHandler, WS2811_DMA_IRQHandler, NVIC_PRIO_WS2811_DMA, dmaIndex);
/* Initialize TIMx DMA handle */
if (HAL_DMA_Init(TimHandle.hdma[dmaIndex]) != HAL_OK) {
Expand Down
4 changes: 2 additions & 2 deletions src/main/drivers/light_ws2811strip_stdperiph.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ void ws2811LedStripHardwareInit(ioTag_t ioTag) {
DMA_InitTypeDef DMA_InitStructure;
const timerHardware_t *timerHardware = timerGetByTag(ioTag);
timer = timerHardware->tim;
if (timerHardware->dmaRef == NULL) {
if (timerHardware->dmaRef == NULL || !dmaAllocate(timerHardware->dmaIrqHandler, OWNER_LED_STRIP, 0)) {
return;
}
ws2811IO = IOGetByTag(ioTag);
Expand Down Expand Up @@ -106,7 +106,7 @@ void ws2811LedStripHardwareInit(ioTag_t ioTag) {
TIM_CCxCmd(timer, timerHardware->channel, TIM_CCx_Enable);
}
TIM_Cmd(timer, ENABLE);
dmaInit(timerHardware->dmaIrqHandler, OWNER_LED_STRIP, 0);
dmaEnable(timerHardware->dmaIrqHandler);
dmaSetHandler(timerHardware->dmaIrqHandler, WS2811_DMA_IRQHandler, NVIC_PRIO_WS2811_DMA, 0);
dmaRef = timerHardware->dmaRef;
DMA_DeInit(dmaRef);
Expand Down
Loading