Mirror/inav
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav.git synced 2025-07-25 01:05:21 +03:00
Code Issues Wiki Activity

Merge branch 'master' into delayed_safehome

Browse source 
# Conflicts:
#	docs/Settings.md
#	src/main/fc/settings.yaml
#	src/main/navigation/navigation.c
This commit is contained in:
Alexander van Saase 2021-04-18 13:58:01 +02:00
commit e5b2fef65c
381 changed files with 44228 additions and 5189 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/cms/cms_menu_navigation.c
View file

@ -72,7 +72,7 @@ static const CMS_Menu cmsx_menuNavSettings = {
OSD_SETTING_ENTRY("RTH ALT MODE", SETTING_NAV_RTH_ALT_MODE),
OSD_SETTING_ENTRY("RTH ALT", SETTING_NAV_RTH_ALTITUDE),
OSD_SETTING_ENTRY("CLIMB BEFORE RTH", SETTING_NAV_RTH_CLIMB_FIRST),
OSD_SETTING_ENTRY("CLIMB FIRST", SETTING_NAV_RTH_CLIMB_FIRST),
OSD_SETTING_ENTRY("TAIL FIRST", SETTING_NAV_RTH_TAIL_FIRST),
OSD_SETTING_ENTRY("LAND AFTER RTH", SETTING_NAV_RTH_ALLOW_LANDING),
OSD_SETTING_ENTRY("LAND VERT SPEED", SETTING_NAV_LANDING_SPEED),