fleg
/
OpenRTX
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added M17 dst_addr to channel summary. 

Added zone name to channel summary if called from memmory mode.
This commit is contained in:
vk7js 2022-05-19 15:29:02 +10:00 committed by Silvano Seva
parent 74ab9cbbf6
commit 339131a5b7
2 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
openrtx/include/core/voicePromptUtils.h
View File

@ -64,6 +64,7 @@ void announceContact(contact_t* contact, VoicePromptQueueFlags_T flags);
void announceContactWithIndex(uint16_t index, VoicePromptQueueFlags_T flags); void announceContactWithIndex(uint16_t index, VoicePromptQueueFlags_T flags);
void announceTimeslot(uint8_t timeslot, VoicePromptQueueFlags_T flags); void announceTimeslot(uint8_t timeslot, VoicePromptQueueFlags_T flags);
void announceColorCode(uint8_t rxColorCode, uint8_t txColorCode, VoicePromptQueueFlags_T flags); void announceColorCode(uint8_t rxColorCode, uint8_t txColorCode, VoicePromptQueueFlags_T flags);
void announceBank(uint16_t bank, VoicePromptQueueFlags_T flags);
VoicePromptQueueFlags_T GetQueueFlagsForVoiceLevel(); VoicePromptQueueFlags_T GetQueueFlagsForVoiceLevel();
#endif //VOICE_PROMPT_UTILS_H_INCLUDED #endif //VOICE_PROMPT_UTILS_H_INCLUDED

32
openrtx/src/core/voicePromptUtils.c
View File

@ -203,6 +203,13 @@ VoicePromptQueueFlags_T flags)
} }
else if (channel->mode == OPMODE_M17) else if (channel->mode == OPMODE_M17)
{ {
if (state.m17_data.dst_addr[0])
{
if (localFlags & vpqIncludeDescriptions)
vpQueuePrompt(PROMPT_DEST_ID);
vpQueueString(state.m17_data.dst_addr, vpAnnounceCommonSymbols);
}
else if (channel->m17.contact_index)
announceContactWithIndex(channel->m17.contact_index, localFlags); announceContactWithIndex(channel->m17.contact_index, localFlags);
} }
else if (channel->mode == OPMODE_DMR) else if (channel->mode == OPMODE_DMR)
@ -215,6 +222,9 @@ VoicePromptQueueFlags_T flags)
anouncePower(channel->power, localFlags); anouncePower(channel->power, localFlags);
if (channelIndex > 0) // i.e. not called from VFO.
announceBank(bank, localFlags);
vpPlayIfNeeded(flags); vpPlayIfNeeded(flags);
} }
@ -409,6 +419,25 @@ void announceColorCode(uint8_t rxColorCode, uint8_t txColorCode, VoicePromptQue
vpPlayIfNeeded(flags); vpPlayIfNeeded(flags);
} }
void announceBank(uint16_t bank, VoicePromptQueueFlags_T flags)
{
vpInitIfNeeded(flags);
if (flags & vpqIncludeDescriptions)
vpQueueStringTableEntry(&currentLanguage->banks);
if (state.bank_enabled)
{
bankHdr_t bank_hdr = { 0 };
cps_readBankHeader(&bank_hdr, bank);
vpQueueString(bank_hdr.name, vpAnnounceCommonSymbols);
}
else
vpQueueStringTableEntry(currentLanguage->allChannels);
vpPlayIfNeeded(flags);
}
/* /*
there are 5 levels of verbosity: there are 5 levels of verbosity:
@ -452,5 +481,6 @@ VoicePromptQueueFlags_T GetQueueFlagsForVoiceLevel()
break; break;
} }
return flags; return flags;
} }