From 9405fd69581c25712353eeb3bd57e43c7f4cdb61 Mon Sep 17 00:00:00 2001 From: sas Date: Tue, 1 Oct 2019 16:11:48 +0200 Subject: [PATCH] Plane: remove unused location argument to control_auto --- ArduPlane/mode_auto.cpp | 2 +- ArduPlane/quadplane.cpp | 2 +- ArduPlane/quadplane.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ArduPlane/mode_auto.cpp b/ArduPlane/mode_auto.cpp index 9a3e378658..b3d29cfd65 100644 --- a/ArduPlane/mode_auto.cpp +++ b/ArduPlane/mode_auto.cpp @@ -57,7 +57,7 @@ void ModeAuto::update() uint16_t nav_cmd_id = plane.mission.get_current_nav_cmd().id; 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 || (nav_cmd_id == MAV_CMD_NAV_LAND && plane.flight_stage == AP_Vehicle::FixedWing::FLIGHT_ABORT_LAND)) { plane.takeoff_calc_roll(); diff --git a/ArduPlane/quadplane.cpp b/ArduPlane/quadplane.cpp index 0715079efe..1c327a5943 100644 --- a/ArduPlane/quadplane.cpp +++ b/ArduPlane/quadplane.cpp @@ -2387,7 +2387,7 @@ void QuadPlane::waypoint_controller(void) /* handle auto-mode when auto_state.vtol_mode is true */ -void QuadPlane::control_auto(const Location &loc) +void QuadPlane::control_auto(void) { if (!setup()) { return; diff --git a/ArduPlane/quadplane.h b/ArduPlane/quadplane.h index 48d11957c9..859bf495f6 100644 --- a/ArduPlane/quadplane.h +++ b/ArduPlane/quadplane.h @@ -44,7 +44,7 @@ public: static const struct AP_Param::GroupInfo var_info2[]; void control_run(void); - void control_auto(const Location &loc); + void control_auto(void); bool init_mode(void); bool setup(void);