Mirror/inav
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav.git synced 2025-07-20 06:45:14 +03:00
Code Issues Wiki Activity

Fix Merge Correction Errors

Browse source
This commit is contained in:
breadoven 2020-11-15 21:49:12 +00:00
parent efb31fcbde
commit 181a1ce9e5
2 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/main/navigation/navigation.c
View file

@ -107,7 +107,6 @@ PG_RESET_TEMPLATE(navConfig_t, navConfig,
.disarm_on_landing = 0, .disarm_on_landing = 0,
.rth_allow_landing = NAV_RTH_ALLOW_LANDING_ALWAYS, .rth_allow_landing = NAV_RTH_ALLOW_LANDING_ALWAYS,
.rth_alt_control_override = 0, //set using nav_rth_alt_control_override .rth_alt_control_override = 0, //set using nav_rth_alt_control_override
.auto_overrides_motor_stop = 1,
.nav_overrides_motor_stop = NOMS_ALL_NAV, .nav_overrides_motor_stop = NOMS_ALL_NAV,
}, },

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

@ -182,7 +182,6 @@ typedef struct navConfig_s {
uint8_t rth_allow_landing; // Enable landing as last stage of RTH. Use constants in navRTHAllowLanding_e. uint8_t rth_allow_landing; // Enable landing as last stage of RTH. Use constants in navRTHAllowLanding_e.
uint8_t rth_climb_ignore_emerg; // Option to ignore GPS loss on initial climb stage of RTH uint8_t rth_climb_ignore_emerg; // Option to ignore GPS loss on initial climb stage of RTH
uint8_t rth_alt_control_override; // Set RTH preset climb altitude to Current altutude during climb using AltHold mode switch uint8_t rth_alt_control_override; // Set RTH preset climb altitude to Current altutude during climb using AltHold mode switch
uint8_t auto_overrides_motor_stop; // Autonomous modes override motor_stop setting and user command to stop motor
uint8_t nav_overrides_motor_stop; // Autonomous modes override motor_stop setting and user command to stop motor uint8_t nav_overrides_motor_stop; // Autonomous modes override motor_stop setting and user command to stop motor
} flags; } flags;