Merge pull request #11097 from iNavFlight/MrD_Correct-mode-display-ordering

Corrected mode display ordering

Author: MrD-RC

src/main/io/osd.c

@@ -2558,16 +2558,15 @@ static bool osdDrawSingleElement(uint8_t item)
             if (FLIGHT_MODE(NAV_FW_AUTOLAND))
                 p = "LAND";
             else
-#endif
-#ifdef USE_GEOZONE
-            if (FLIGHT_MODE(NAV_SEND_TO))
-                p = "GEO";
-            else
 #endif
             if (FLIGHT_MODE(FAILSAFE_MODE))
                 p = "!FS!";
             else if (FLIGHT_MODE(MANUAL_MODE))
                 p = "MANU";
+#ifdef USE_GEOZONE
+            else if (FLIGHT_MODE(NAV_SEND_TO) && !FLIGHT_MODE(NAV_WP_MODE))
+                p = "GEO";
+#endif
             else if (FLIGHT_MODE(TURTLE_MODE))
                 p = "TURT";
             else if (FLIGHT_MODE(NAV_RTH_MODE))

src/main/telemetry/crsf.c

@@ -353,18 +353,19 @@ static void crsfFrameFlightMode(sbuf_t *dst)
     const char *flightMode = "OK";
     if (ARMING_FLAG(ARMED)) {
         flightMode = "ACRO";
-        if (FLIGHT_MODE(FAILSAFE_MODE)) {
-            flightMode = "!FS!";
 #ifdef USE_FW_AUTOLAND
-        } else if (FLIGHT_MODE(NAV_FW_AUTOLAND)) {
+        if (FLIGHT_MODE(NAV_FW_AUTOLAND)) {
             flightMode = "LAND";
+        } else
 #endif
-#ifdef USE_GEOZONE
-        } else if (FLIGHT_MODE(NAV_SEND_TO)) {
-            flightMode = "GEO";
-#endif            
+        if (FLIGHT_MODE(FAILSAFE_MODE)) {
+            flightMode = "!FS!";          
         } else if (FLIGHT_MODE(MANUAL_MODE)) {
             flightMode = "MANU";
+#ifdef USE_GEOZONE
+        } else if (FLIGHT_MODE(NAV_SEND_TO) && !FLIGHT_MODE(NAV_WP_MODE)) {
+            flightMode = "GEO";
+#endif  
         } else if (FLIGHT_MODE(TURTLE_MODE)) {
             flightMode = "TURT";
         } else if (FLIGHT_MODE(NAV_RTH_MODE)) {