fix(h7): common drivers for H7 support (#6149)
Co-authored-by: raphaelcoeffic <1050031+raphaelcoeffic@users.noreply.github.com>
This commit is contained in:
co-authored by
raphaelcoeffic
parent
46f3716995
commit
706a092bc2
@@ -29,8 +29,56 @@
|
||||
|
||||
#include "edgetx.h"
|
||||
|
||||
|
||||
const AudioBuffer * nextBuffer = nullptr;
|
||||
|
||||
#if defined(STM32H5) || defined(STM32H7) || defined(STM32H7RS)
|
||||
// 16 bit, 1 channels
|
||||
#define DMA_BUFFER_HALF_LEN AUDIO_BUFFER_SIZE
|
||||
|
||||
// 2 buffers
|
||||
#define DMA_BUFFER_LEN (DMA_BUFFER_HALF_LEN * 2)
|
||||
|
||||
static uint16_t _dma_buffer[DMA_BUFFER_LEN] __DMA_NO_CACHE;
|
||||
|
||||
static volatile uint32_t _dma_buffer_offset = 0;
|
||||
|
||||
static inline uint32_t _calc_offset(uint8_t tc)
|
||||
{
|
||||
return tc * DMA_BUFFER_HALF_LEN;
|
||||
}
|
||||
|
||||
// the returned bool is true when there is no more data available
|
||||
static bool audio_update_dma_buffer(uint8_t tc)
|
||||
{
|
||||
_dma_buffer_offset = _calc_offset(tc);
|
||||
|
||||
auto buffer = audioQueue.buffersFifo.getNextFilledBuffer();
|
||||
nextBuffer = buffer;
|
||||
if (!buffer) {
|
||||
unsigned idx = 0;
|
||||
for (; idx < DMA_BUFFER_HALF_LEN; idx++) {
|
||||
uint32_t offset = _dma_buffer_offset + idx;
|
||||
_dma_buffer[offset] = AUDIO_DATA_SILENCE;
|
||||
}
|
||||
return true;
|
||||
} else {
|
||||
unsigned idx = 0;
|
||||
for (; idx < buffer->size; idx++) {
|
||||
uint32_t offset = _dma_buffer_offset + idx;
|
||||
_dma_buffer[offset] = (uint16_t)buffer->data[idx];
|
||||
}
|
||||
for (; idx < DMA_BUFFER_HALF_LEN; idx++) {
|
||||
uint32_t offset = _dma_buffer_offset + idx;
|
||||
_dma_buffer[offset] = AUDIO_DATA_SILENCE;
|
||||
}
|
||||
audioQueue.buffersFifo.freeNextFilledBuffer();
|
||||
return false;
|
||||
}
|
||||
}
|
||||
#else
|
||||
#define AUDIO_DAC DAC
|
||||
#endif
|
||||
|
||||
// Init timer that triggers the DAC conversion
|
||||
// at sampling frequency
|
||||
@@ -96,6 +144,26 @@ void dacInit()
|
||||
gpio_init_analog(AUDIO_OUTPUT_GPIO);
|
||||
stm32_dma_enable_clock(AUDIO_DMA);
|
||||
|
||||
#if defined(STM32H5) || defined(STM32H7) || defined(STM32H7RS)
|
||||
LL_DMA_DeInit(AUDIO_DMA, AUDIO_DMA_Stream);
|
||||
|
||||
LL_DMA_InitTypeDef dmaInit;
|
||||
LL_DMA_StructInit(&dmaInit);
|
||||
|
||||
#if defined(STM32H7)
|
||||
dmaInit.Mode = LL_DMA_MODE_CIRCULAR;
|
||||
dmaInit.PeriphRequest = AUDIO_DMA_Channel;
|
||||
dmaInit.Direction = LL_DMA_DIRECTION_MEMORY_TO_PERIPH;
|
||||
dmaInit.Priority = LL_DMA_PRIORITY_VERYHIGH;
|
||||
dmaInit.PeriphOrM2MSrcAddress = LL_DAC_DMA_GetRegAddr(DAC1, LL_DAC_CHANNEL_1, LL_DAC_DMA_REG_DATA_12BITS_LEFT_ALIGNED);
|
||||
dmaInit.PeriphOrM2MSrcDataSize = LL_DMA_PDATAALIGN_HALFWORD;
|
||||
dmaInit.MemoryOrM2MDstIncMode = LL_DMA_MEMORY_INCREMENT;
|
||||
dmaInit.MemoryOrM2MDstDataSize = LL_DMA_MDATAALIGN_HALFWORD;
|
||||
#elif defined(STM32H7RS)
|
||||
#error not implemented
|
||||
#endif
|
||||
LL_DMA_Init(AUDIO_DMA, AUDIO_DMA_Stream, &dmaInit);
|
||||
#else
|
||||
// Disable DMA stream
|
||||
AUDIO_DMA_Stream->CR &= ~DMA_SxCR_EN;
|
||||
|
||||
@@ -110,23 +178,34 @@ void dacInit()
|
||||
DMA_SxCR_CIRC;
|
||||
|
||||
// write to DAC channel 1 (12 bits, left-aligned)
|
||||
AUDIO_DMA_Stream->PAR = CONVERT_PTR_UINT(&DAC->DHR12L1);
|
||||
AUDIO_DMA_Stream->PAR = CONVERT_PTR_UINT(&AUDIO_DAC->DHR12L1);
|
||||
|
||||
// disable direct mode and set FIFO threshold to half
|
||||
AUDIO_DMA_Stream->FCR = DMA_SxFCR_DMDIS | DMA_SxFCR_FTH_0;
|
||||
#endif
|
||||
|
||||
#if defined(LL_APB1_GRP1_PERIPH_DAC12)
|
||||
LL_APB1_GRP1_EnableClock(LL_APB1_GRP1_PERIPH_DAC12);
|
||||
#else
|
||||
LL_APB1_GRP1_EnableClock(LL_APB1_GRP1_PERIPH_DAC1);
|
||||
#endif
|
||||
|
||||
// set data registre to silence
|
||||
DAC->DHR12L1 = AUDIO_DATA_SILENCE;
|
||||
AUDIO_DAC->DHR12L1 = AUDIO_DATA_SILENCE;
|
||||
#if defined(STM32H5) || defined(STM32H7) || defined(STM32H7RS)
|
||||
LL_DAC_ClearFlag_DMAUDR1(AUDIO_DAC);
|
||||
LL_DAC_SetTriggerSource(AUDIO_DAC, LL_DAC_CHANNEL_1, LL_DAC_TRIG_EXT_TIM6_TRGO);
|
||||
LL_DAC_EnableTrigger(AUDIO_DAC, LL_DAC_CHANNEL_1);
|
||||
LL_DAC_Enable(AUDIO_DAC, LL_DAC_CHANNEL_1);
|
||||
|
||||
#else
|
||||
// clear underrun flag
|
||||
DAC->SR = DAC_SR_DMAUDR1;
|
||||
AUDIO_DAC->SR = DAC_SR_DMAUDR1;
|
||||
|
||||
// use TIM6 TRGO as trigger (TSEL1 = TSEL2 = 000)
|
||||
// enable DAC & channel 1 trigger
|
||||
DAC->CR = DAC_CR_TEN1 | DAC_CR_EN1;
|
||||
|
||||
AUDIO_DAC->CR = DAC_CR_TEN1 | DAC_CR_EN1;
|
||||
#endif
|
||||
NVIC_EnableIRQ(AUDIO_DMA_Stream_IRQn);
|
||||
NVIC_SetPriority(AUDIO_DMA_Stream_IRQn, 7);
|
||||
}
|
||||
@@ -175,6 +254,25 @@ void audioUnmute()
|
||||
|
||||
void audioConsumeCurrentBuffer()
|
||||
{
|
||||
#if defined(STM32H5) || defined(STM32H7) || defined(STM32H7RS)
|
||||
if (!LL_DMA_IsEnabledStream(AUDIO_DMA, AUDIO_DMA_Stream)) {
|
||||
if (!audio_update_dma_buffer(0)) {
|
||||
#if defined(AUDIO_MUTE_GPIO)
|
||||
audioUnmute();
|
||||
#endif
|
||||
|
||||
LL_DMA_DisableStream(AUDIO_DMA, AUDIO_DMA_Stream);
|
||||
stm32_dma_check_tc_flag(AUDIO_DMA, AUDIO_DMA_Stream);
|
||||
stm32_dma_check_ht_flag(AUDIO_DMA, AUDIO_DMA_Stream);
|
||||
LL_DAC_ClearFlag_DMAUDR1(AUDIO_DAC);
|
||||
LL_DAC_EnableDMAReq(AUDIO_DAC, LL_DAC_CHANNEL_1);
|
||||
LL_DAC_Enable(AUDIO_DAC, LL_DAC_CHANNEL_1);
|
||||
LL_DMA_SetMemoryAddress(AUDIO_DMA, AUDIO_DMA_Stream, (intptr_t)_dma_buffer);
|
||||
LL_DMA_SetDataLength(AUDIO_DMA, AUDIO_DMA_Stream, DMA_BUFFER_LEN);
|
||||
LL_DMA_EnableStream(AUDIO_DMA, AUDIO_DMA_Stream);
|
||||
LL_DMA_EnableIT_HT(AUDIO_DMA, AUDIO_DMA_Stream);
|
||||
LL_DMA_EnableIT_TC(AUDIO_DMA, AUDIO_DMA_Stream);
|
||||
#else
|
||||
if (!nextBuffer) {
|
||||
nextBuffer = audioQueue.buffersFifo.getNextFilledBuffer();
|
||||
if (nextBuffer) {
|
||||
@@ -182,7 +280,6 @@ void audioConsumeCurrentBuffer()
|
||||
#if defined(AUDIO_MUTE_GPIO)
|
||||
audioUnmute();
|
||||
#endif
|
||||
|
||||
// Disable DMA stream
|
||||
AUDIO_DMA_Stream->CR &= ~DMA_SxCR_EN;
|
||||
|
||||
@@ -199,11 +296,11 @@ void audioConsumeCurrentBuffer()
|
||||
AUDIO_DMA_Stream->CR |= DMA_SxCR_EN | DMA_SxCR_TCIE;
|
||||
|
||||
// clear underrun flag
|
||||
DAC->SR = DAC_SR_DMAUDR1;
|
||||
AUDIO_DAC->SR = DAC_SR_DMAUDR1;
|
||||
|
||||
// enable DAC
|
||||
DAC->CR |= DAC_CR_EN1 | DAC_CR_DMAEN1;
|
||||
|
||||
AUDIO_DAC->CR |= DAC_CR_EN1 | DAC_CR_DMAEN1;
|
||||
#endif
|
||||
} else {
|
||||
#if defined(AUDIO_MUTE_GPIO)
|
||||
audioMute();
|
||||
@@ -220,7 +317,7 @@ void audioInit()
|
||||
|
||||
void audioEnd()
|
||||
{
|
||||
DAC->CR = 0;
|
||||
AUDIO_DAC->CR = 0;
|
||||
AUDIO_TIMER->CR1 = 0;
|
||||
|
||||
// Also need to turn off any possible interrupts
|
||||
@@ -230,6 +327,23 @@ void audioEnd()
|
||||
|
||||
extern "C" void AUDIO_DMA_Stream_IRQHandler()
|
||||
{
|
||||
#if defined(STM32H5) || defined(STM32H7) || defined(STM32H7RS)
|
||||
bool stopDMA = false;
|
||||
if(stm32_dma_check_ht_flag(AUDIO_DMA, AUDIO_DMA_Stream)) {
|
||||
stopDMA = audio_update_dma_buffer(0);
|
||||
}
|
||||
|
||||
if(stm32_dma_check_tc_flag(AUDIO_DMA, AUDIO_DMA_Stream)) {
|
||||
stopDMA |= audio_update_dma_buffer(1);
|
||||
}
|
||||
|
||||
if(stopDMA) {
|
||||
LL_DMA_DisableIT_TC(AUDIO_DMA, AUDIO_DMA_Stream);
|
||||
LL_DMA_DisableIT_HT(AUDIO_DMA, AUDIO_DMA_Stream);
|
||||
LL_DMA_DisableStream(AUDIO_DMA, AUDIO_DMA_Stream);
|
||||
}
|
||||
|
||||
#else
|
||||
// disable transfer complete interrupt
|
||||
AUDIO_DMA_Stream->CR &= ~DMA_SxCR_TCIE;
|
||||
|
||||
@@ -256,6 +370,7 @@ extern "C" void AUDIO_DMA_Stream_IRQHandler()
|
||||
AUDIO_DMA_Stream->CR |= DMA_SxCR_EN | DMA_SxCR_TCIE;
|
||||
|
||||
// clear underrun flag
|
||||
DAC->SR = DAC_SR_DMAUDR1;
|
||||
AUDIO_DAC->SR = DAC_SR_DMAUDR1;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user