Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-22 07:44:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Copter: move auto allows_arming in mode_auto.cpp

Browse Source 
this should be a non-functional change
This commit is contained in:
Randy Mackay 2020-10-14 14:27:10 +09:00
parent ab42bbc43f
commit c1c9d87efe
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ArduCopter/mode_auto.cpp
View File

@ -59,11 +59,6 @@ bool ModeAuto::init(bool ignore_checks)
}
}
bool ModeAuto::allows_arming(bool from_gcs) const
{
return (copter.g2.auto_options & (int32_t)Options::AllowArming) != 0;
};
// auto_run - runs the auto controller
// should be called at 100hz or more
// relies on run_autopilot being called at 10hz which handles decision making and non-navigation related commands
@ -117,6 +112,11 @@ void ModeAuto::run()
}
}
bool ModeAuto::allows_arming(bool from_gcs) const
{
return (copter.g2.auto_options & (int32_t)Options::AllowArming) != 0;
};
// auto_loiter_start - initialises loitering in auto mode
// returns success/failure because this can be called by exit_mission
bool ModeAuto::loiter_start()