From 50a07dc8d82c9323cb056864e7c9df55ae92cdff Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Thu, 7 Nov 2019 13:58:56 +0100 Subject: [PATCH] Cosmetics --- radio/src/audio.cpp | 2 +- radio/src/targets/common/arm/stm32/audio_dac_driver.cpp | 3 +-- radio/src/targets/horus/audio_spi_driver.cpp | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/radio/src/audio.cpp b/radio/src/audio.cpp index 2737592cb..c8417568d 100644 --- a/radio/src/audio.cpp +++ b/radio/src/audio.cpp @@ -755,7 +755,7 @@ void AudioQueue::wakeup() DEBUG_TIMER_STOP(debugTimerAudioConsume); AudioBuffer * buffer; - while ((buffer = buffersFifo.getEmptyBuffer()) != 0) { + while ((buffer = buffersFifo.getEmptyBuffer()) != nullptr) { int result; unsigned int fade = 0; int size = 0; diff --git a/radio/src/targets/common/arm/stm32/audio_dac_driver.cpp b/radio/src/targets/common/arm/stm32/audio_dac_driver.cpp index 2962731b7..d050382a2 100644 --- a/radio/src/targets/common/arm/stm32/audio_dac_driver.cpp +++ b/radio/src/targets/common/arm/stm32/audio_dac_driver.cpp @@ -90,8 +90,7 @@ void dacInit() void audioConsumeCurrentBuffer() { - if (nextBuffer == 0) { - + if (!nextBuffer) { nextBuffer = audioQueue.buffersFifo.getNextFilledBuffer(); if (nextBuffer) { #if defined(AUDIO_MUTE_GPIO_PIN) diff --git a/radio/src/targets/horus/audio_spi_driver.cpp b/radio/src/targets/horus/audio_spi_driver.cpp index dc05ef06d..32ef0f906 100644 --- a/radio/src/targets/horus/audio_spi_driver.cpp +++ b/radio/src/targets/horus/audio_spi_driver.cpp @@ -374,7 +374,7 @@ void audioInit() audioHardReset(); audioSoftReset(); audioSpiSetSpeed(SPI_SPEED_8); - delay_01us(10000); // 1ms + delay_ms(1); // 1ms audioSendRiffHeader(); }