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

AC_Fence: ensure fencepoint protocol not compiled in if not HAL_GCS_ENABLED #26235

Merged
merged 2 commits into from Feb 20, 2024

Conversation

peterbarker
Copy link
Contributor

also use GCS_SEND_TEXT a bit

@rmackay9
Copy link
Contributor

To be fair we should consider pulling in commits from this pr #25262

@@ -11,5 +13,5 @@
#endif

#ifndef AC_POLYFENCE_FENCE_POINT_PROTOCOL_SUPPORT
#define AC_POLYFENCE_FENCE_POINT_PROTOCOL_SUPPORT AP_FENCE_ENABLED
#define AC_POLYFENCE_FENCE_POINT_PROTOCOL_SUPPORT HAL_GCS_ENABLED && AP_FENCE_ENABLED
Copy link
Contributor

Choose a reason for hiding this comment

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

Won't the GCS_SEND_TEXT macros take care of the case when HAL_GCS_ENABLED is zero?

Is this change really needed?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

There are other bits in there that aren't gcs().send_text.

Also, the fencepoint protocol is mavlink, so it makes sense to gate it.

Copy link
Contributor

Choose a reason for hiding this comment

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

I need coffee, sorry. I read Fence instead of Fencepoint. :)

Carry on, nothing to see here. :)

@peterbarker
Copy link
Contributor Author

To be fair we should consider pulling in commits from this pr #25262

I've rebased on top of a cherry-picked patch from that PR and force-pushed this branch

@tridge tridge merged commit 0e742fe into ArduPilot:master Feb 20, 2024
92 checks passed
@peterbarker peterbarker deleted the pr/fence-hal-gcs-enabled branch February 20, 2024 04:21
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