From f1639159bf1585ed1fe8f971ddce7a1abfa448c2 Mon Sep 17 00:00:00 2001
From: vk7js <58905135+vk7js@users.noreply.github.com>
Date: Tue, 13 Sep 2022 16:37:36 +1000
Subject: [PATCH] fixed issue of auto announcement clobbering manual request
 for summary. Fixed a couple of issues with direction announcement.

---
 openrtx/src/core/voicePromptUtils.c | 6 +++---
 openrtx/src/ui/ui.c                 | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

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)