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

Compilation fixes when features disabled / feature extraction fixes #29007

Merged
merged 11 commits into from
Jan 7, 2025

Conversation

peterbarker
Copy link
Contributor

  • several missing dependencies
  • kludge to make AP_CAN_LOGGING_ENABLED work removed as not necessary with corrected includes
  • add missing #ifs for harmonic notch
  • several build_options.py features are only applicable on Plane or Copter, so add them into the test_build_options.py exemptions list (which should be moved into build_options.py
  • remove AP_NETWORKING_CAN_MCAST_ENABLED from build server options as dependent defines are not present (most notably AP_NETWORKING_ENABLED.

@rmackay9
Copy link
Contributor

rmackay9 commented Jan 6, 2025

Thanks for this. I think the Copter changes are probably best answered by @andyp1per (who I see you've already tagged)

Copy link
Collaborator

@andyp1per andyp1per left a comment

Choose a reason for hiding this comment

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

AP_INERTIALSENSOR_FAST_SAMPLE_WINDOW_ENABLED should never be built without harmonic notch support, so we should express the dependency a different way if necessary rather than littering the code with extra defines

ArduCopter/Copter.cpp Outdated Show resolved Hide resolved
ArduCopter/rate_thread.cpp Outdated Show resolved Hide resolved
ArduCopter/rate_thread.cpp Outdated Show resolved Hide resolved
…_WINDOW_ENABLED from sanity check

the symbol supplied will only ever exist on Copter as it is nthe only thing that supports the window
the default, "init" doesn't exist for this mode
"> AP_INERTIALSENSOR_FAST_SAMPLE_WINDOW_ENABLED should never be built without harmonic notch support, so we should express the dependency a different way if necessary rather than littering the code with extra defines"
@peterbarker peterbarker force-pushed the pr/compilation-error-fixes branch from 1519d77 to 915929a Compare January 6, 2025 08:29
@peterbarker
Copy link
Contributor Author

AP_INERTIALSENSOR_FAST_SAMPLE_WINDOW_ENABLED should never be built without harmonic notch support, so we should express the dependency a different way if necessary rather than littering the code with extra defines

I was indeed wondering if that was the case. I've added the dependency into build_options.py and removed the patches from the Copter directory.

@tridge tridge merged commit 1de59f8 into ArduPilot:master Jan 7, 2025
99 checks passed
@peterbarker peterbarker deleted the pr/compilation-error-fixes branch January 7, 2025 03:08
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.

5 participants