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(debug): don't initalise SP_AUX1 if not exist #4962

Merged
merged 2 commits into from
May 3, 2024

Conversation

pfeerick
Copy link
Member

@pfeerick pfeerick commented May 3, 2024

Fixes #4958

Summary of changes:

#3814 implicitly exposed an assumption whereby AUX1 was being initialised for use for debugging when not available, and thus locking "Debug" out as an option for USB-VCP on radios with no available AUX1. Therefore, check if AUX_SERIAL is defined as well as DEBUG.

@pfeerick pfeerick requested review from raphaelcoeffic and 3djc May 3, 2024 09:46
@pfeerick pfeerick added the bug 🪲 Something isn't working label May 3, 2024
@pfeerick pfeerick added this to the 2.10 milestone May 3, 2024
Copy link
Collaborator

@3djc 3djc left a comment

Choose a reason for hiding this comment

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

This even fixes an issue I would have had with upcoming hardware. Kudos !

It is a CMake option, so belongs in CMakeLists.txt for the relevant target
@pfeerick
Copy link
Member Author

pfeerick commented May 3, 2024

Thanks JC, and glad I fixed a bug before it bugged you 😁

NV14 and PL18EV are both working now - could toggle debug output on USB-VCP. I have just sanity checked on TX16S... AUX1 is still putting out debug output until otherwise instructed, and you can disable it and switch to USB-VCP (because both ports are configurable). This should generally only effect the NV14/EL18/PL18/PL18EV and X10 Express as standard. I do see a bunch of TARANIS targets don't enable AUX_SERIAL by defaults as it it not turned on across the board as it is with horus targets, but that means they need their options updated if anything is missing there.

@pfeerick pfeerick merged commit 003224a into main May 3, 2024
44 checks passed
@pfeerick pfeerick deleted the pfeerick/fix-aux1-debug branch May 3, 2024 22:34
@3djc
Copy link
Collaborator

3djc commented May 4, 2024

I will review the aux serial definitions for Taranis, but it certainly cannot be defined across the board(s)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug 🪲 Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

USB VCP Cannot select DEBUG with debug build
2 participants