-
Notifications
You must be signed in to change notification settings - Fork 16.8k
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
Clean up some includes #20174
Merged
Merged
Clean up some includes #20174
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
f315c73
to
ddbd2d4
Compare
ddbd2d4
to
1cfd4e6
Compare
tridge
approved these changes
Mar 1, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Most notable, don't include
GCS_MAVLink/GCS.h
everywhere. That header pulls a lot of stuff in - and there are only a handful of header files in the system that actually need anything more than the mavlink variable types (e.g.mavlink_message_t
) out of it.Several of the remaining uses of it I think show a flaw in the way we're doing our
idiom. To get
HAL_GCS_ENABLED
those headers have to include the massive file and its many includes - probably most of the headers in the system, eventually.We should consider either (a) moving to putting stuff in
AP_HAL/AP_HAL_Boards.h
, or doing something similar toAP_Filesystem/AP_Filesystem_Available
- but with a better name.... perhapsGCS_MAVLink/config.h
?There's also (c), which is to stop guarding method definitions against the feature required. So e.g.
AP_VisualOdom
uses#if HAL_GCS_ENABLED
whereasAP_OpticalFlow
does not, despite them being roughly equivalent in terms of why they're interested in that define.This has only been tested for compilation / autotest suite.