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

Add support for bypassing extra arming safety #4623

Merged
merged 2 commits into from
Apr 26, 2019

Conversation

fiam
Copy link
Member

@fiam fiam commented Apr 18, 2019

In order to bypass the checks, users must set the new
nav_extra_arming_safety value ALLOW_BYPASS and arm with a switch
while holding yaw high. If this is used to arm the craft, the checks
are skipped until the next power cycle in order to allow rearming quickly
in case of an accidental mid air disarm.

Also, the "NAVIGATION IS UNSAFE" OSD message has been replaced
with more specific messages which tell the user the exact reason
why the navigation system is blocking arming.

@fiam fiam added this to the 2.2 milestone Apr 18, 2019
@fiam fiam force-pushed the agh_nav_extra_arming_safety_bypass branch from 559e25d to 582676e Compare April 18, 2019 16:53
In order to bypass the checks, users must set the new
nav_extra_arming_safety value ALLOW_BYPASS and arm with a switch
while holding yaw high. If this is used to arm the craft, the checks
are skipped until the next power cycle in order to allow rearming
quickly in case of an accidental mid air disarm.

Also, the "NAVIGATION IS UNSAFE" OSD message has been replaced
with more specific messages which tell the user the exact reason
why the navigation system is blocking arming.
@fiam fiam force-pushed the agh_nav_extra_arming_safety_bypass branch from 582676e to dc6d002 Compare April 25, 2019 12:14
Also, make the check for setting the STATE() flag clearer. Previous
implementation was a bit confusing.
@fiam fiam merged commit d9c60d9 into development Apr 26, 2019
@fiam fiam deleted the agh_nav_extra_arming_safety_bypass branch April 26, 2019 16:32
@teckel12
Copy link
Contributor

@fiam Will this change still work with code that checks if extra arming safety is enabled? For example:

navConfig()->general.flags.extra_arming_safety

@fiam
Copy link
Member Author

fiam commented Apr 26, 2019

@teckel12 Depends on what it checks. 0 and 1 continue to be OFF and ON, but there's a new value 2 which means ALLOW_BYPASS and allows arming while holding yaw to the right.

@teckel12
Copy link
Contributor

@fiam Makes sense. I know at least one place a change will need to made to accommodate this. Can I commit to this branch?

@fiam
Copy link
Member Author

fiam commented Apr 27, 2019

No, this is already merged so you need to open a new PR. Which changes do you need?

@teckel12
Copy link
Contributor

@fiam I believe for CRSF telemetry it will need to check for different values when deciding to show the NOT OK flight mode.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants