Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
A
Ardupilot
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
OpenSource
Ardupilot
Commits
105e2e19
Commit
105e2e19
authored
10 years ago
by
Randy Mackay
Browse files
Options
Downloads
Patches
Plain Diff
Copter: skip pre-arm checks when already armed
parent
4033f11a
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
ArduCopter/motors.pde
+6
-0
6 additions, 0 deletions
ArduCopter/motors.pde
with
6 additions
and
0 deletions
ArduCopter/motors.pde
+
6
−
0
View file @
105e2e19
...
@@ -215,7 +215,13 @@ static bool init_arm_motors()
...
@@ -215,7 +215,13 @@ static bool init_arm_motors()
// perform pre-arm checks and set ap.pre_arm_check flag
// perform pre-arm checks and set ap.pre_arm_check flag
static
void
pre_arm_checks
(
bool
display_failure
)
static
void
pre_arm_checks
(
bool
display_failure
)
{
{
// exit immediately if already armed
if
(
motors
.
armed
())
{
return
;
}
// exit immediately if we've already successfully performed the pre-arm check
// exit immediately if we've already successfully performed the pre-arm check
// run gps checks because results may change and affect LED colour
if
(
ap
.
pre_arm_check
)
{
if
(
ap
.
pre_arm_check
)
{
pre_arm_gps_checks
(
display_failure
);
pre_arm_gps_checks
(
display_failure
);
return
;
return
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment