diff --git a/openrtx/include/core/voicePromptUtils.h b/openrtx/include/core/voicePromptUtils.h index d1b3c399..59620161 100644 --- a/openrtx/include/core/voicePromptUtils.h +++ b/openrtx/include/core/voicePromptUtils.h @@ -36,10 +36,6 @@ should be used to ensure that the message interupts the current prompt and plays immediately. */ -/** - * - */ -void vp_announceVFO(); /** * @@ -118,11 +114,6 @@ void vp_announceCTCSS(const bool rxToneEnabled, const uint8_t rxTone, */ void vp_anouncePower(const float power, const vpQueueFlags_t flags); -/** - * - */ -void vp_announceBrightness(const uint8_t brightness, const vpQueueFlags_t flags); - /** * */ @@ -199,6 +190,13 @@ void vp_announceSettingsVoiceLevel(const vpQueueFlags_t flags); void vp_announceSettingsOnOffToggle(const char* const* stringTableStringPtr, const vpQueueFlags_t flags, bool val); +/** + * This is called to speak generic settings int values. + */ +void vp_announceSettingsInt(const char* const* stringTableStringPtr, + const vpQueueFlags_t flags, + int val); + /** * This function is called from ui_updateFSM to speak informational screens. */ diff --git a/openrtx/src/core/voicePromptUtils.c b/openrtx/src/core/voicePromptUtils.c index d40b0447..5e5527fa 100644 --- a/openrtx/src/core/voicePromptUtils.c +++ b/openrtx/src/core/voicePromptUtils.c @@ -72,13 +72,6 @@ static void removeUnnecessaryZerosFromVoicePrompts(char* str) -void vp_announceVFO() -{ - vp_flush(); - vp_queuePrompt(PROMPT_VFO); - vp_play(); -} - void vp_announceChannelName(const channel_t* channel, const uint16_t channelIndex, const vpQueueFlags_t flags) @@ -385,19 +378,6 @@ void vp_announceCTCSS(const bool rxToneEnabled, const uint8_t rxTone, playIfNeeded(flags); } -void vp_announceBrightness(const uint8_t brightness, const vpQueueFlags_t flags) -{ - clearCurrPromptIfNeeded(flags); - - if (flags & vpqIncludeDescriptions) - { - vp_queueStringTableEntry(¤tLanguage->brightness); - } - - vp_queueInteger(brightness); - playIfNeeded(flags); -} - void vp_announceSquelch(const uint8_t squelch, const vpQueueFlags_t flags) { clearCurrPromptIfNeeded(flags); @@ -736,6 +716,20 @@ void vp_announceSettingsOnOffToggle(const char* const* stringTableStringPtr, playIfNeeded(flags); } +void vp_announceSettingsInt(const char* const* stringTableStringPtr, + const vpQueueFlags_t flags, + int val) +{ + clearCurrPromptIfNeeded(flags); + + if (flags & vpqIncludeDescriptions) + vp_queueStringTableEntry(stringTableStringPtr); + + vp_queueInteger(val); + + playIfNeeded(flags); +} + void vp_announceScreen(uint8_t ui_screen) { switch (ui_screen) diff --git a/openrtx/src/ui/ui.c b/openrtx/src/ui/ui.c index 59de06fb..47e11212 100644 --- a/openrtx/src/ui/ui.c +++ b/openrtx/src/ui/ui.c @@ -912,11 +912,13 @@ static void _ui_fsm_menuMacro(kbd_msg_t msg, bool *sync_rtx) break; case 7: _ui_changeBrightness(-5); - vp_announceBrightness(state.settings.brightness, queueFlags); + vp_announceSettingsInt(¤tLanguage->brightness, queueFlags, + state.settings.brightness); break; case 8: _ui_changeBrightness(+5); - vp_announceBrightness(state.settings.brightness, queueFlags); + vp_announceSettingsInt(¤tLanguage->brightness, queueFlags, + state.settings.brightness); break; } @@ -1719,11 +1721,14 @@ void ui_updateFSM(bool *sync_rtx) { case D_BRIGHTNESS: _ui_changeBrightness(-5); - vp_announceBrightness(state.settings.brightness, queueFlags); + vp_announceSettingsInt(¤tLanguage->brightness, queueFlags, + state.settings.brightness); break; #ifdef SCREEN_CONTRAST case D_CONTRAST: _ui_changeContrast(-4); + vp_announceSettingsInt(¤tLanguage->brightness, queueFlags, + state.settings.contrast); break; #endif case D_TIMER: @@ -1740,11 +1745,14 @@ void ui_updateFSM(bool *sync_rtx) { case D_BRIGHTNESS: _ui_changeBrightness(+5); - vp_announceBrightness(state.settings.brightness, queueFlags); + vp_announceSettingsInt(¤tLanguage->brightness, queueFlags, + state.settings.brightness); break; #ifdef SCREEN_CONTRAST case D_CONTRAST: _ui_changeContrast(+4); + vp_announceSettingsInt(¤tLanguage->brightness, queueFlags, + state.settings.contrast); break; #endif case D_TIMER: