diff --git a/openrtx/src/core/voicePromptUtils.c b/openrtx/src/core/voicePromptUtils.c index 94086400..ee14d8b2 100644 --- a/openrtx/src/core/voicePromptUtils.c +++ b/openrtx/src/core/voicePromptUtils.c @@ -646,15 +646,15 @@ void vp_announceGPSInfo(vpGPSInfoFlags_t gpsInfoFlags) { 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); } - 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); } - 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); } diff --git a/openrtx/src/ui/ui.c b/openrtx/src/ui/ui.c index 51edd00f..af0a0f04 100644 --- a/openrtx/src/ui/ui.c +++ b/openrtx/src/ui/ui.c @@ -2018,8 +2018,9 @@ void ui_updateFSM(bool *sync_rtx) ReleaseFunctionLatchIfNeeded(); #ifdef GPS_PRESENT if ((state.ui_screen == MENU_GPS) && - (!txOngoing && !rtx_rxSquelchOpen()) && - (state.settings.vpLevel > vpLow)) + (!vp_isPlaying()) && + (state.settings.vpLevel > vpLow) && + (!txOngoing && !rtx_rxSquelchOpen())) {// automatically read speed and direction changes only! vpGPSInfoFlags_t whatChanged = GetGPSDirectionOrSpeedChanged(); if (whatChanged != vpGPSNone)