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

Soaring: Use RCX_OPTION #14815

Merged
merged 4 commits into from Jul 20, 2020
Merged

Conversation

samuelctabor
Copy link
Collaborator

@samuelctabor samuelctabor commented Jul 14, 2020

This simplifies soaring.cpp somewhat and converts from using SOAR_ENABLE_CH to having soaring as a RC option. The parameter is converted if configured.

@samuelctabor
Copy link
Collaborator Author

PR for wiki update is here

@Hwurzburg
Copy link
Collaborator

thanks!

ArduPlane/RC_Channel.cpp Show resolved Hide resolved
ArduPlane/Parameters.cpp Show resolved Hide resolved
ArduPlane/soaring.cpp Outdated Show resolved Hide resolved
libraries/AP_Soaring/AP_Soaring.h Show resolved Hide resolved
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.

The title of this PR is kind of bad; the change to using a channel option is excellent, but kind of besides the point of this PR.

Changing to use the channel option should be a straight-forward change - the changes in the soaring library are rather non-trivial :-)

The changes don't look too intertwined - is it reasonable to split this into two PRs?

ArduPlane/RC_Channel.cpp Show resolved Hide resolved
ArduPlane/soaring.cpp Outdated Show resolved Hide resolved
Tools/autotest/arduplane.py Show resolved Hide resolved
ArduPlane/RC_Channel.cpp Outdated Show resolved Hide resolved
@samuelctabor samuelctabor force-pushed the pr/soar-rcx-option branch 2 times, most recently from 43f78cc to 5694f38 Compare July 16, 2020 10:54
@samuelctabor
Copy link
Collaborator Author

I have dropped the refactor to make this one easier to review as Peter suggested. I'll open a separate PR for that.

@peterbarker
Copy link
Contributor

peterbarker commented Jul 17, 2020 via email

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.

Perhaps some squashing-down of the commits would be nice in here.

ArduPlane/Parameters.cpp Show resolved Hide resolved
libraries/AP_Soaring/AP_Soaring.cpp Show resolved Hide resolved
@samuelctabor
Copy link
Collaborator Author

Thanks, now squashed.

@tridge tridge merged commit d57b7ca into ArduPilot:master Jul 20, 2020
@samuelctabor samuelctabor deleted the pr/soar-rcx-option branch July 21, 2020 08:36
@Hwurzburg Hwurzburg removed the WikiNeeded needs wiki update label Aug 21, 2020
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

6 participants