From cdbbaa0ef1994870f070d0437a170c502e0ba4f0 Mon Sep 17 00:00:00 2001 From: Silvano Seva Date: Tue, 14 Jun 2022 21:01:11 +0200 Subject: [PATCH] In Module17 output stream driver prevented the DAC channel for baseband output to be turned off when the speaker stream is activated. Fixes #78 --- platform/drivers/audio/outputStream_Mod17.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/platform/drivers/audio/outputStream_Mod17.cpp b/platform/drivers/audio/outputStream_Mod17.cpp index efa56e19..5320cb3c 100644 --- a/platform/drivers/audio/outputStream_Mod17.cpp +++ b/platform/drivers/audio/outputStream_Mod17.cpp @@ -176,10 +176,10 @@ streamId outputStream_start(const enum AudioSink destination, if(destination == SINK_RTX) { - DAC->CR = DAC_CR_DMAEN1 // Enable DMA mode - | DAC_CR_TSEL1_1 // TIM7 TRGO as trigger source - | DAC_CR_TEN1 // Enable trigger input - | DAC_CR_EN1; // Enable DAC + DAC->CR |= DAC_CR_DMAEN1 // Enable DMA mode + | DAC_CR_TSEL1_1 // TIM7 TRGO as trigger source + | DAC_CR_TEN1 // Enable trigger input + | DAC_CR_EN1; // Enable DAC DMA1_Stream5->NDTR = length; DMA1_Stream5->PAR = reinterpret_cast< uint32_t >(&(DAC->DHR12R1)); @@ -201,10 +201,10 @@ streamId outputStream_start(const enum AudioSink destination, } else { - DAC->CR = DAC_CR_DMAEN2 // Enable DMA mode - | DAC_CR_TSEL2_1 // TIM7 TRGO as trigger source - | DAC_CR_TEN2 // Enable trigger input - | DAC_CR_EN2; // Enable DAC + DAC->CR |= DAC_CR_DMAEN2 // Enable DMA mode + | DAC_CR_TSEL2_1 // TIM7 TRGO as trigger source + | DAC_CR_TEN2 // Enable trigger input + | DAC_CR_EN2; // Enable DAC DMA1_Stream6->NDTR = length; DMA1_Stream6->PAR = reinterpret_cast< uint32_t >(&(DAC->DHR12R2));