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

fix: don't check ELRS version if crossfire disabled #5961

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

pfeerick
Copy link
Member

@pfeerick pfeerick commented Mar 3, 2025

Fixes #5960

Summary of changes:

  • If -DCROSSFIRE=N defined at compile time, calls to CRSF_ELRS_MIN_VER() are not valid, and response should simply be "no". crossfireModuleStatus does not exist, so should not be checked.
  • Also, use the helper function rather than reinvent the wheel

If `-DCROSSFIRE=N` defined at compile time, calls to `CRSF_ELRS_MIN_VER()` are not valid.
Also, use the helper function rather than reinvent the wheel
@pfeerick pfeerick added bug/regression ↩️ A new version of EdgeTX broke something house keeping 🧹 Cleanup of code and house keeping labels Mar 3, 2025
@pfeerick pfeerick added this to the 2.11 milestone Mar 3, 2025
@pfeerick
Copy link
Member Author

pfeerick commented Mar 3, 2025

What say you @mha1 ? 🤭

@mha1
Copy link
Contributor

mha1 commented Mar 4, 2025

What say you @mha1 ? 🤭

Me says well done, nice and tidy. The macro was implemented months after the change for ELRS binding via ETX UI. Missed using the macro there also. Good find.

Clearly the ifdef was missing but as Crossfire is a default yes the check builds didn't catch it. Good find too.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug/regression ↩️ A new version of EdgeTX broke something house keeping 🧹 Cleanup of code and house keeping
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Undefined symbol "crossfireModuleStatus" in simulator library for X7Access if built without crossfire support
2 participants