Skip to content

fix(pl18): Sound Playing will Sometimes Sluggish - v2.11 #7472

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

Draft
richardclli wants to merge 2 commits into
base: 2.11
Choose a base branch
from
+23 −2
Draft

fix(pl18): Sound Playing will Sometimes Sluggish - v2.11 #7472

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
07ede3e
fix(pl18): audio sluggishness from DAC underrun during flash erase
richardclli Jun 18, 2026
18347c5
fix(build): guard RTOS includes in spi_flash.cpp for bootloader build
richardclli Jun 18, 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
15 changes: 13 additions & 2 deletions radio/src/targets/common/arm/stm32/audio_dac_driver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,10 +203,12 @@ void dacInit()

// use TIM6 TRGO as trigger (TSEL1 = TSEL2 = 000)
// enable DAC & channel 1 trigger
AUDIO_DAC->CR = DAC_CR_TEN1 | DAC_CR_EN1;
AUDIO_DAC->CR = DAC_CR_TEN1 | DAC_CR_EN1 | DAC_CR_DMAUDRIE1;
#endif
NVIC_EnableIRQ(AUDIO_DMA_Stream_IRQn);
NVIC_SetPriority(AUDIO_DMA_Stream_IRQn, 7);
NVIC_EnableIRQ(AUDIO_TIM_IRQn);
NVIC_SetPriority(AUDIO_TIM_IRQn, 7);
}

#if defined(AUDIO_MUTE_GPIO)
Expand Down Expand Up @@ -299,7 +301,7 @@ void audioConsumeCurrentBuffer()
AUDIO_DAC->SR = DAC_SR_DMAUDR1;

// enable DAC
AUDIO_DAC->CR |= DAC_CR_EN1 | DAC_CR_DMAEN1;
AUDIO_DAC->CR |= DAC_CR_EN1 | DAC_CR_DMAEN1 | DAC_CR_DMAUDRIE1;
#endif
} else {
#if defined(AUDIO_MUTE_GPIO)
Expand All @@ -325,6 +327,15 @@ void audioEnd()
NVIC_DisableIRQ(AUDIO_DMA_Stream_IRQn);
}

extern "C" void AUDIO_TIM_IRQHandler()
{
DEBUG_INTERRUPT(INT_AUDIO);
if (AUDIO_DAC->SR & DAC_SR_DMAUDR1) {
AUDIO_DAC->CR &= ~(DAC_CR_DMAEN1 | DAC_CR_DMAUDRIE1);
AUDIO_DAC->SR = DAC_SR_DMAUDR1;
}
}

extern "C" void AUDIO_DMA_Stream_IRQHandler()
{
#if defined(STM32H5) || defined(STM32H7) || defined(STM32H7RS)
Expand Down
4 changes: 4 additions & 0 deletions radio/src/targets/common/arm/stm32/spi_flash.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#include "stm32_gpio.h"

#include "hal.h"
#include "rtos.h"

#define CS_HIGH() stm32_spi_unselect(&_flash_spi)
#define CS_LOW() stm32_spi_select(&_flash_spi)
Expand Down Expand Up @@ -147,6 +148,9 @@ static void flash_wait_for_not_busy()
uint8_t status;
do {
flash_do_cmd(FLASH_CMD_STATUS, 0, &status, 1);
if (status & 0x01) {
RTOS_WAIT_MS(1);
}
} while (status & 0x01);
}

Expand Down