mirror
/
OpenRTX
kopia lustrzana https://github.com/OpenRTX/OpenRTX
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

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.

md1702
vk7js 2022-09-06 17:57:53 +10:00 zatwierdzone przez Silvano Seva
rodzic d622080cfe
commit 495b721231
2 zmienionych plików z 16 dodań i 9 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

23
openrtx/src/core/voicePromptUtils.c
Wyświetl plik

@ -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);
vp_queuePrompt(PROMPT_TONE);
if (flags & vpqIncludeDescriptions)
{
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);
vp_queuePrompt(PROMPT_TONE);
if (flags & vpqIncludeDescriptions)
{
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);

2
openrtx/src/ui/ui.c
Wyświetl plik

@ -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: