Guard m_hidCoalesceTimer reference behind HAVE_HIDAPI (Windows build)#1606
Merged
ten9876 merged 1 commit intoApr 18, 2026
Merged
Conversation
ten9876
commented
Apr 18, 2026
Collaborator
- Schedule rigctld client sockets for deletion on server stop
- Guard m_hidCoalesceTimer reference behind HAVE_HIDAPI (Windows build)
- Schedule rigctld client sockets for deletion on server stop - Guard m_hidCoalesceTimer reference behind HAVE_HIDAPI (Windows build)
NF0T
added a commit
to NF0T/AetherSDR
that referenced
this pull request
Apr 18, 2026
…thersdr#1606 partial) Upstream PR aethersdr#1606 guarded m_hidCoalesceTimer behind HAVE_HIDAPI but left m_flexCoalesceTimer unguarded. Wrap it in HAVE_SERIALPORT to match the header declaration and fix Windows builds without serial port support. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Collaborator
|
This fix covers the HIDAPI side, but there's a matching issue on the SERIALPORT side in the same lambda (also added in #1527). // After this PR (line ~4846):
bool activeTuning = m_flexCoalesceTimer.isActive(); // ← still unguarded
#ifdef HAVE_HIDAPI
activeTuning = activeTuning || m_hidCoalesceTimer.isActive();
#endifThis breaks Windows builds where bool activeTuning = false;
#ifdef HAVE_SERIALPORT
activeTuning = activeTuning || m_flexCoalesceTimer.isActive();
#endif
#ifdef HAVE_HIDAPI
activeTuning = activeTuning || m_hidCoalesceTimer.isActive();
#endifHappy to open a follow-up PR if helpful. |
NF0T
added a commit
to NF0T/AetherSDR
that referenced
this pull request
Apr 18, 2026
…thersdr#1606 partial) Upstream PR aethersdr#1606 guarded m_hidCoalesceTimer behind HAVE_HIDAPI but left m_flexCoalesceTimer unguarded. Wrap it in HAVE_SERIALPORT to match the header declaration and fix Windows builds without serial port support. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
NF0T
added a commit
to NF0T/AetherSDR
that referenced
this pull request
Apr 18, 2026
…thersdr#1606 partial) Upstream PR aethersdr#1606 guarded m_hidCoalesceTimer behind HAVE_HIDAPI but left m_flexCoalesceTimer unguarded. Wrap it in HAVE_SERIALPORT to match the header declaration and fix Windows builds without serial port support. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
NF0T
added a commit
to NF0T/AetherSDR
that referenced
this pull request
Apr 20, 2026
…thersdr#1606 partial) Upstream PR aethersdr#1606 guarded m_hidCoalesceTimer behind HAVE_HIDAPI but left m_flexCoalesceTimer unguarded. Wrap it in HAVE_SERIALPORT to match the header declaration and fix Windows builds without serial port support. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
NF0T
added a commit
to NF0T/AetherSDR
that referenced
this pull request
Apr 21, 2026
…thersdr#1606 partial) Upstream PR aethersdr#1606 guarded m_hidCoalesceTimer behind HAVE_HIDAPI but left m_flexCoalesceTimer unguarded. Wrap it in HAVE_SERIALPORT to match the header declaration and fix Windows builds without serial port support. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2 tasks
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.