From 3ba094f633ea9503e5d7102d75aab4bb0e0ebb8e Mon Sep 17 00:00:00 2001 From: vk7js <58905135+vk7js@users.noreply.github.com> Date: Mon, 12 Sep 2022 22:04:01 +1000 Subject: [PATCH] Minor cleanup of beep code. --- openrtx/src/core/voicePrompts.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/openrtx/src/core/voicePrompts.c b/openrtx/src/core/voicePrompts.c index b6fed5cf..03ae88b5 100644 --- a/openrtx/src/core/voicePrompts.c +++ b/openrtx/src/core/voicePrompts.c @@ -316,6 +316,16 @@ void vp_terminate() #endif } +static void beep_flush() +{ + if (currentBeepDuration > 0) + platform_beepStop(); + + currentBeepDuration = 0; + memset(beepSeriesBuffer, 0, sizeof(beepSeriesBuffer)); + beepSeriesIndex=0; +} + void vp_stop() { voicePromptActive = false; @@ -325,11 +335,7 @@ void vp_stop() codec_stop(); // If any beep is playing, immediately stop it. - if (currentBeepDuration > 0) - platform_beepStop(); - - memset(beepSeriesBuffer, 0, sizeof(beepSeriesBuffer)); - beepSeriesIndex=0; + beep_flush(); } void vp_flush() @@ -497,8 +503,7 @@ static bool beep_tick() } else { - memset(beepSeriesBuffer, 0, sizeof(beepSeriesBuffer)); - beepSeriesIndex=0; + beep_flush(); } } return true;