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.

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

AP_Arming: fix system check #9178

Merged
merged 2 commits into from Aug 14, 2018
Merged

Conversation

OXINARF
Copy link
Member

@OXINARF OXINARF commented Aug 11, 2018

The system check would never return false, so although the message would be displayed to the user, it never rejected arming.

I've also removed calling the check on arming as it's already done in pre-arming and repeated until arming is done.

There is also an unrelated commit on top to fix a warning on ChibiOS for boards where STDOUT is defined.

../../libraries/AP_HAL_ChibiOS/UARTDriver.cpp:118:12: warning: 'int hal_console_vprintf(const char*, va_list)' defined but not used [-Wunused-function]
 static int hal_console_vprintf(const char *fmt, va_list arg)
            ^
Copy link
Contributor

@peterbarker peterbarker left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Haven't run these, and I can't comment on the ChibiOS change, but the arming stuff looks right.

@tridge tridge merged commit 1b46104 into ArduPilot:master Aug 14, 2018
@OXINARF OXINARF deleted the pr/fix-ap-arming branch May 24, 2019 10:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants