Browse Source

Plane: remove unused location argument to control_auto

master
sas 5 years ago committed by Andrew Tridgell
parent
commit
9405fd6958
  1. 2
      ArduPlane/mode_auto.cpp
  2. 2
      ArduPlane/quadplane.cpp
  3. 2
      ArduPlane/quadplane.h

2
ArduPlane/mode_auto.cpp

@ -57,7 +57,7 @@ void ModeAuto::update() @@ -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();

2
ArduPlane/quadplane.cpp

@ -2387,7 +2387,7 @@ void QuadPlane::waypoint_controller(void) @@ -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;

2
ArduPlane/quadplane.h

@ -44,7 +44,7 @@ public: @@ -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);

Loading…
Cancel
Save