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

Resolve compilation errors. I hope

Browse source
This commit is contained in:
Pawel Spychalski (DzikuVx) 2024-03-03 18:25:02 +01:00
parent d35a895ad3
commit c75c45c58d
2 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -299,10 +299,9 @@ bool validateRTHSanityChecker(void);
void updateHomePosition(void); void updateHomePosition(void);
bool abortLaunchAllowed(void); bool abortLaunchAllowed(void);
static bool rthAltControlStickOverrideCheck(unsigned axis); // static bool rthAltControlStickOverrideCheck(unsigned axis);
// static void updateRthTrackback(bool forceSaveTrackPoint);
static void updateRthTrackback(bool forceSaveTrackPoint); // static fpVector3_t * rthGetTrackbackPos(void);
static fpVector3_t * rthGetTrackbackPos(void);
#ifdef USE_FW_AUTOLAND #ifdef USE_FW_AUTOLAND
static float getLandAltitude(void); static float getLandAltitude(void);

12
src/main/navigation/navigation_multicopter.c
View file

@ -218,13 +218,13 @@ void resetMulticopterAltitudeController(void)
pt1FilterReset(&posControl.pids.vel[Z].dterm_filter_state, 0.0f); pt1FilterReset(&posControl.pids.vel[Z].dterm_filter_state, 0.0f);
if (FLIGHT_MODE(FAILSAFE_MODE) || FLIGHT_MODE(NAV_RTH_MODE) || FLIGHT_MODE(NAV_WP_MODE) || navigationIsExecutingAnEmergencyLanding()) { if (FLIGHT_MODE(FAILSAFE_MODE) || FLIGHT_MODE(NAV_RTH_MODE) || FLIGHT_MODE(NAV_WP_MODE) || navigationIsExecutingAnEmergencyLanding()) {
nav_speed_up = navConfig()->general.max_auto_climb_rate; nav_speed_up = navConfig()->mc.max_auto_climb_rate;
nav_accel_z = navConfig()->general.max_auto_climb_rate; nav_accel_z = navConfig()->mc.max_auto_climb_rate;
nav_speed_down = navConfig()->general.max_auto_climb_rate; nav_speed_down = navConfig()->mc.max_auto_climb_rate;
} else { } else {
nav_speed_up = navConfig()->general.max_manual_climb_rate; nav_speed_up = navConfig()->mc.max_manual_climb_rate;
nav_accel_z = navConfig()->general.max_manual_climb_rate; nav_accel_z = navConfig()->mc.max_manual_climb_rate;
nav_speed_down = navConfig()->general.max_manual_climb_rate; nav_speed_down = navConfig()->mc.max_manual_climb_rate;
} }
sqrtControllerInit( sqrtControllerInit(