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

Remove sticks arming #4640

Merged
merged 2 commits into from
Apr 24, 2019
Merged

Remove sticks arming #4640

merged 2 commits into from
Apr 24, 2019

Conversation

DzikuVx
Copy link
Member

@DzikuVx DzikuVx commented Apr 24, 2019

closes #4583

@DzikuVx DzikuVx added this to the 2.2 milestone Apr 24, 2019
@DzikuVx
Copy link
Member Author

DzikuVx commented Apr 24, 2019

ok, looks like I have to fix conflicts :)

@DzikuVx
Copy link
Member Author

DzikuVx commented Apr 24, 2019

@digitalentity rebased and fixed

Copy link
Member

@digitalentity digitalentity left a comment

Choose a reason for hiding this comment

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

LGTM

@DzikuVx DzikuVx merged commit 8dbb7e7 into development Apr 24, 2019
@DzikuVx DzikuVx deleted the dzikuvx-remove-sticks-arming branch April 24, 2019 22:14
@hali9
Copy link
Contributor

hali9 commented May 4, 2019

If I good undestand code this PR also removed fixed_wing_auto_arm
This is probably not intentional.

@oldgeezy
Copy link

So did this happen? Because I can't arm with sticks anymore. And I can't find the setting to prevent disarm unless the throttle is idle.

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.

4 participants