Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Plane: move landing servo override out of throttle control function

This commit is contained in:
Iampete1 2023-12-10 17:40:29 +00:00 committed by Andrew Tridgell
parent 283a1edb9f
commit 21a9f8e3a2
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ArduPlane/Plane.h
View File

@ -1091,7 +1091,7 @@ private:
// servos.cpp // servos.cpp
void set_servos_idle(void); void set_servos_idle(void);
void set_servos(); void set_servos();
void set_servos_controlled(void); void set_throttle(void);
void set_takeoff_expected(void); void set_takeoff_expected(void);
void set_servos_old_elevons(void); void set_servos_old_elevons(void);
void set_servos_flaps(void); void set_servos_flaps(void);

7
ArduPlane/servos.cpp
View File

@ -829,8 +829,13 @@ void Plane::set_servos(void)
quadplane.update(); quadplane.update();
#endif #endif
if (flight_stage == AP_FixedWing::FlightStage::LAND) {
// allow landing to override servos if it would like to
landing.override_servos();
}
if (control_mode != &mode_manual) { if (control_mode != &mode_manual) {
set_servos_controlled(); set_throttle();
set_takeoff_expected(); set_takeoff_expected();
} }