Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-09 17:38:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

Plane: remove unused location argument to control_auto

Browse Source
This commit is contained in:
sas 2019-10-01 16:11:48 +02:00 committed by Andrew Tridgell
parent d2861f7db9
commit 286963ad16
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ArduPlane/mode_auto.cpp
View File

@ -57,7 +57,7 @@ void ModeAuto::update()
uint16_t nav_cmd_id = plane.mission.get_current_nav_cmd().id; uint16_t nav_cmd_id = plane.mission.get_current_nav_cmd().id;
if (plane.quadplane.in_vtol_auto()) { if (plane.quadplane.in_vtol_auto()) {
plane.quadplane.control_auto(plane.next_WP_loc); plane.quadplane.control_auto();
} else if (nav_cmd_id == MAV_CMD_NAV_TAKEOFF || } else if (nav_cmd_id == MAV_CMD_NAV_TAKEOFF ||
(nav_cmd_id == MAV_CMD_NAV_LAND && plane.flight_stage == AP_Vehicle::FixedWing::FLIGHT_ABORT_LAND)) { (nav_cmd_id == MAV_CMD_NAV_LAND && plane.flight_stage == AP_Vehicle::FixedWing::FLIGHT_ABORT_LAND)) {
plane.takeoff_calc_roll(); plane.takeoff_calc_roll();

2
ArduPlane/quadplane.cpp
View File

@ -2422,7 +2422,7 @@ void QuadPlane::waypoint_controller(void)
/* /*
handle auto-mode when auto_state.vtol_mode is true handle auto-mode when auto_state.vtol_mode is true
*/ */
void QuadPlane::control_auto(const Location &loc) void QuadPlane::control_auto(void)
{ {
if (!setup()) { if (!setup()) {
return; return;

2
ArduPlane/quadplane.h
View File

@ -44,7 +44,7 @@ public:
static const struct AP_Param::GroupInfo var_info2[]; static const struct AP_Param::GroupInfo var_info2[];
void control_run(void); void control_run(void);
void control_auto(const Location &loc); void control_auto(void);
bool init_mode(void); bool init_mode(void);
bool setup(void); bool setup(void);