diff --git a/radio/src/audio_arm.cpp b/radio/src/audio_arm.cpp index a13255312..b2dae928c 100644 --- a/radio/src/audio_arm.cpp +++ b/radio/src/audio_arm.cpp @@ -147,7 +147,7 @@ const int16_t sineValues[] = }; #if defined(SDCARD) -const char * audioFilenames[] = { +const char * const audioFilenames[] = { "tada", "thralert", "swalert", @@ -278,7 +278,7 @@ void referenceSystemAudioFiles() sdAvailableSystemAudioFiles = availableAudioFiles; } -const char * suffixes[] = { "-off", "-on" }; +const char * const suffixes[] = { "-off", "-on" }; char * getModelAudioPath(char * path) { diff --git a/radio/src/targets/taranis/audio_driver.cpp b/radio/src/targets/taranis/audio_driver.cpp index 9c350b16a..3f4020e64 100644 --- a/radio/src/targets/taranis/audio_driver.cpp +++ b/radio/src/targets/taranis/audio_driver.cpp @@ -36,7 +36,7 @@ #include "../../opentx.h" -int dacIdle = 1; +bool dacIdle = true; void setSampleRate(uint32_t frequency) { @@ -96,7 +96,7 @@ void dacInit() bool dacQueue(AudioBuffer *buffer) { if (dacIdle) { - dacIdle = 0; + dacIdle = false; DMA1_Stream5->CR &= ~DMA_SxCR_EN ; // Disable DMA channel DMA1->HIFCR = DMA_HIFCR_CTCIF5 | DMA_HIFCR_CHTIF5 | DMA_HIFCR_CTEIF5 | DMA_HIFCR_CDMEIF5 | DMA_HIFCR_CFEIF5 ; // Write ones to clear bits DMA1_Stream5->M0AR = CONVERT_PTR_UINT(buffer->data); @@ -163,7 +163,7 @@ extern "C" void DMA1_Stream5_IRQHandler() DAC->SR = DAC_SR_DMAUDR1; // Write 1 to clear flag } else { - dacIdle = 1; + dacIdle = true; } } #endif diff --git a/radio/src/targets/taranis/audio_driver.h b/radio/src/targets/taranis/audio_driver.h index e357e8627..ea277a8ed 100644 --- a/radio/src/targets/taranis/audio_driver.h +++ b/radio/src/targets/taranis/audio_driver.h @@ -44,8 +44,6 @@ void dacStop(); extern void setSampleRate(uint32_t frequency); -extern int dacIdle; - #define VOLUME_LEVEL_MAX 23 #define VOLUME_LEVEL_DEF 12 static const int8_t volumeScale[VOLUME_LEVEL_MAX+1] =