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

fixed issue of auto announcement clobbering manual request for summary. 

Fixed a couple of issues with direction announcement.
This commit is contained in:
vk7js 2022-09-13 16:37:36 +10:00 committed by Silvano Seva
parent 4edef678c1
commit f1639159bf
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -646,15 +646,15 @@ void vp_announceGPSInfo(vpGPSInfoFlags_t gpsInfoFlags)
{ {
vp_queuePrompt(PROMPT_NORTH); vp_queuePrompt(PROMPT_NORTH);
} }
else if (state.gps_data.tmg_true > 87 || state.gps_data.tmg_true < 93) else if (state.gps_data.tmg_true > 87 && state.gps_data.tmg_true < 93)
{ {
vp_queuePrompt(PROMPT_EAST); vp_queuePrompt(PROMPT_EAST);
} }
else if (state.gps_data.tmg_true > 177 || state.gps_data.tmg_true < 183) else if (state.gps_data.tmg_true > 177 && state.gps_data.tmg_true < 183)
{ {
vp_queuePrompt(PROMPT_SOUTH); vp_queuePrompt(PROMPT_SOUTH);
} }
else if (state.gps_data.tmg_true > 267 || state.gps_data.tmg_true < 273) else if (state.gps_data.tmg_true > 267 && state.gps_data.tmg_true < 273)
{ {
vp_queuePrompt(PROMPT_WEST); vp_queuePrompt(PROMPT_WEST);
} }

5
openrtx/src/ui/ui.c
View File

@ -2018,8 +2018,9 @@ void ui_updateFSM(bool *sync_rtx)
ReleaseFunctionLatchIfNeeded(); ReleaseFunctionLatchIfNeeded();
#ifdef GPS_PRESENT #ifdef GPS_PRESENT
if ((state.ui_screen == MENU_GPS) && if ((state.ui_screen == MENU_GPS) &&
(!txOngoing && !rtx_rxSquelchOpen()) && (!vp_isPlaying()) &&
(state.settings.vpLevel > vpLow)) (state.settings.vpLevel > vpLow) &&
(!txOngoing && !rtx_rxSquelchOpen()))
{// automatically read speed and direction changes only! {// automatically read speed and direction changes only!
vpGPSInfoFlags_t whatChanged = GetGPSDirectionOrSpeedChanged(); vpGPSInfoFlags_t whatChanged = GetGPSDirectionOrSpeedChanged();
if (whatChanged != vpGPSNone) if (whatChanged != vpGPSNone)