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

Merge pull request #2396 from iNavFlight/agh_rtl_to_rth

Browse source 
Replace RTL with RTH across all the code and comments
This commit is contained in:
Konstantin Sharlaimov 2017-10-24 21:46:46 +10:00 • committed by GitHub
commit 37a0aa6d34
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/main/io/osd.c
View file

@ -562,8 +562,7 @@ static const char * osdFailsafePhaseMessage(void)
#ifdef NAV #ifdef NAV
case FAILSAFE_RETURN_TO_HOME: case FAILSAFE_RETURN_TO_HOME:
// XXX: Keep this in sync with OSD_FLYMODE. // XXX: Keep this in sync with OSD_FLYMODE.
// Should we show RTH instead? return OSD_MESSAGE_STR("(RTH)");
return OSD_MESSAGE_STR("(RTL)");
#endif #endif
case FAILSAFE_LANDING: case FAILSAFE_LANDING:
// This should be considered an emergengy landing // This should be considered an emergengy landing
@ -961,7 +960,7 @@ static bool osdDrawSingleElement(uint8_t item)
} else if (FLIGHT_MODE(HEADFREE_MODE)) } else if (FLIGHT_MODE(HEADFREE_MODE))
p = "!HF!"; p = "!HF!";
else if (FLIGHT_MODE(NAV_RTH_MODE)) else if (FLIGHT_MODE(NAV_RTH_MODE))
p = "RTL "; p = "RTH ";
else if (FLIGHT_MODE(NAV_POSHOLD_MODE)) { else if (FLIGHT_MODE(NAV_POSHOLD_MODE)) {
if (FLIGHT_MODE(NAV_ALTHOLD_MODE)) { if (FLIGHT_MODE(NAV_ALTHOLD_MODE)) {
// 3D HOLD // 3D HOLD

2
src/main/navigation/navigation.h
View file

@ -129,7 +129,7 @@ typedef struct navConfig_s {
uint16_t land_slowdown_maxalt; // Altitude to start lowering descent rate during RTH descend uint16_t land_slowdown_maxalt; // Altitude to start lowering descent rate during RTH descend
uint16_t emerg_descent_rate; // emergency landing descent rate uint16_t emerg_descent_rate; // emergency landing descent rate
uint16_t rth_altitude; // altitude to maintain when RTH is active (depends on rth_alt_control_mode) (cm) uint16_t rth_altitude; // altitude to maintain when RTH is active (depends on rth_alt_control_mode) (cm)
uint16_t min_rth_distance; // 0 Disables. Minimal distance for RTL in cm, otherwise it will just autoland uint16_t min_rth_distance; // 0 Disables. Minimal distance for RTH in cm, otherwise it will just autoland
uint16_t rth_abort_threshold; // Initiate emergency landing if during RTH we get this much [cm] away from home uint16_t rth_abort_threshold; // Initiate emergency landing if during RTH we get this much [cm] away from home
} general; } general;