Fixed setting of CTCSS and tone so that one can rapidly change tone without hearing the word "tone", "receive tone," "transmit tone" etc prior to each tone value.

openrtx/src/core/voicePromptUtils.c

@@ -335,7 +335,8 @@ void vp_announceCTCSS(const bool rxToneEnabled, const uint8_t rxTone,
 
     if ((rxToneEnabled == false) && (txToneEnabled == false))
     {
-        vp_queuePrompt(PROMPT_TONE);
+        if (flags & vpqIncludeDescriptions)
+            vp_queuePrompt(PROMPT_TONE);
         vp_queueStringTableEntry(&currentLanguage->off);
         playIfNeeded(flags);
         return;
@@ -346,7 +347,8 @@ void vp_announceCTCSS(const bool rxToneEnabled, const uint8_t rxTone,
     // If the rx and tx tones are the same and both are enabled, just say Tone.
     if ((rxToneEnabled && txToneEnabled) && (rxTone == txTone))
     {
-        vp_queuePrompt(PROMPT_TONE);
+        if (flags & vpqIncludeDescriptions)
+            vp_queuePrompt(PROMPT_TONE);
 
         snprintf(buffer, 16, "%3.1f", ctcss_tone[rxTone] / 10.0f);
         vp_queueString(buffer, vpAnnounceCommonSymbols);
@@ -359,18 +361,23 @@ void vp_announceCTCSS(const bool rxToneEnabled, const uint8_t rxTone,
     // Speak the individual rx and tx tones.
     if (rxToneEnabled)
     {
-        vp_queuePrompt(PROMPT_RECEIVE);
+        if (flags & vpqIncludeDescriptions)
-        vp_queuePrompt(PROMPT_TONE);
+        {
-
+            vp_queuePrompt(PROMPT_RECEIVE);
+            vp_queuePrompt(PROMPT_TONE);
+        }
         snprintf(buffer, 16, "%3.1f", ctcss_tone[rxTone] / 10.0f);
         vp_queueString(buffer, vpAnnounceCommonSymbols);
         vp_queuePrompt(PROMPT_HERTZ);
     }
     if (txToneEnabled)
     {
-        vp_queuePrompt(PROMPT_TRANSMIT);
+        if (flags & vpqIncludeDescriptions)
-        vp_queuePrompt(PROMPT_TONE);
+        {
-
+            vp_queuePrompt(PROMPT_TRANSMIT);
+            vp_queuePrompt(PROMPT_TONE);
+        }
+        
         snprintf(buffer, 16, "%3.1f", ctcss_tone[txTone] / 10.0f);
         vp_queueString(buffer, vpAnnounceCommonSymbols);
         vp_queuePrompt(PROMPT_HERTZ);

openrtx/src/ui/ui.c

@@ -890,7 +890,7 @@ static void _ui_fsm_menuMacro(kbd_msg_t msg, bool *sync_rtx)
                                  state.channel.fm.rxTone,
                                  state.channel.fm.txToneEn,
                                  state.channel.fm.txTone,
-                                 queueFlags);
+                                 queueFlags |vpqIncludeDescriptions);
             }
             break;
         case 4: