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

Instantiate just one copy of Button in Plane and Copter #12912

Merged
merged 4 commits into from Dec 10, 2019

Conversation

@peterbarker
Copy link
Contributor

peterbarker commented Nov 27, 2019

AP_Button was being instantiated twice.

Remove the extra instantiation.

This was tested in SITL by moving backwards and forwards between this branch and master, ensuring parameter changes stuck.

Also test the button library on each vehicle.

Copy link
Contributor

magicrub left a comment

That was a tricky one! How did you find it? By adding the singleton and it panicking?

@peterbarker

This comment has been minimized.

Copy link
Contributor Author

peterbarker commented Nov 28, 2019

@peterbarker peterbarker force-pushed the peterbarker:pr/button-fix branch from 2e66f14 to acb3810 Nov 29, 2019
@CraigElder CraigElder removed the DevCallTopic label Dec 3, 2019
@IamPete1

This comment has been minimized.

Copy link
Contributor

IamPete1 commented Dec 9, 2019

Any reason this shouldn't be merged? I think it got the all clear on last weeks call

@rmackay9 rmackay9 merged commit 33a0e55 into ArduPilot:master Dec 10, 2019
4 checks passed
4 checks passed
ArduPilot.ardupilot #20191129.6 succeeded
Details
ArduPilot.ardupilot (Cygwin SITL build) Cygwin SITL build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
semaphoreci The build passed on Semaphore.
Details
@rmackay9

This comment has been minimized.

Copy link
Contributor

rmackay9 commented Dec 10, 2019

Merged, thanks!

@peterbarker peterbarker deleted the peterbarker:pr/button-fix branch Dec 10, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants
You can’t perform that action at this time.