Merge pull request #6979 from breadoven/abo_WP_finish_OSD_msg

Improve OSD WP finished message
iNavFlight · Jul 19, 2021 · f3743df · f3743df
2 parents 580161d + dca3c40
commit f3743df
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/main/io/osd.c b/src/main/io/osd.c
@@ -3932,7 +3932,9 @@ textAttributes_t osdGetSystemMessage(char *buff, size_t buff_size, bool isCenter
                         messages[messageCount++] = OSD_MESSAGE_STR(OSD_MSG_WP_RTH_CANCEL);
                     }
 
-                    if (NAV_Status.state == MW_NAV_STATE_WP_ENROUTE) {
+                    if (navGetCurrentStateFlags() & NAV_AUTO_WP_DONE) {
+                        messages[messageCount++] = OSD_MESSAGE_STR(OSD_MSG_WP_FINISHED);
+                    } else if (NAV_Status.state == MW_NAV_STATE_WP_ENROUTE) {
                         // Countdown display for remaining Waypoints
                         char buf[6];
                         osdFormatDistanceSymbol(buf, posControl.wpDistance, 0);

diff --git a/src/main/io/osd.h b/src/main/io/osd.h
@@ -83,8 +83,7 @@
 #define OSD_MSG_STARTING_RTH        "STARTING RTH"
 #define OSD_MSG_RTH_CLIMB           "ADJUSTING RTH ALTITUDE"
 #define OSD_MSG_HEADING_HOME        "EN ROUTE TO HOME"
-#define OSD_MSG_HOLDING_WAYPOINT    "HOLDING WAYPOINT"
-#define OSD_MSG_TO_WP               "TO WP"
+#define OSD_MSG_WP_FINISHED         "WP END>HOLDING POSITION"
 #define OSD_MSG_PREPARE_NEXT_WP     "PREPARING FOR NEXT WAYPOINT"
 #define OSD_MSG_WP_RTH_CANCEL       "CANCEL WP TO EXIT RTH"
 #define OSD_MSG_EMERG_LANDING       "EMERGENCY LANDING"