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

Rename _arming -> _actuator_armed , _battery -> _battery_status in the land_detector module. #12342

Merged
merged 1 commit into from
Jun 27, 2019

Conversation

mcsauder
Copy link
Contributor

Describe problem solved by the proposed pull request
This PR renames _arming -> _actuator_armed and _battery -> _battery_status to standardize two variables that were not included in PR #12339; _arming is utilized in multiple classes in the land_detector module, so this is also a simpler diff to review in that regard.

Test data / coverage
This commit was flight tested on a 250 quad with pixhawk 4 mini:

  1. https://review.px4.io/plot_app?log=bd337c09-87e2-46b9-a3c4-3c59490a2dcf
  2. https://review.px4.io/plot_app?log=58db08fb-74d2-44a3-bc77-aa6affa081f3
  3. https://review.px4.io/plot_app?log=ce3b0ede-19e2-4be9-b502-e34de6ead3f0

Additional context
@dagar, this PR streamlines remaining work for #9756 and minimizes the diff in #11857 .

Please let me know if you have any questions on this PR. Thanks!

-Mark

Rename _battery -> _battery_status in the MulticopterLandDetector class.
@dagar dagar merged commit 1466d11 into PX4:master Jun 27, 2019
@mcsauder mcsauder deleted the land_detector_var_naming branch June 27, 2019 21:15
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.

2 participants