Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove argument location from QuadPlane::control_auto(), not used #12461

Merged
merged 1 commit into from Oct 7, 2019
Merged

Remove argument location from QuadPlane::control_auto(), not used #12461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion ArduPlane/mode_auto.cpp
View file
Open in desktop
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion ArduPlane/quadplane.cpp
View file
Open in desktop
Expand Up @@ -2376,7 +2376,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;
Expand Down
2 changes: 1 addition & 1 deletion ArduPlane/quadplane.h
View file
Open in desktop
Expand Up @@ -44,7 +44,7 @@ class QuadPlane
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);

Expand Down