Skip to content

Meshcore dev#2670#57

Merged
m0urs merged 20 commits into
v1.16.0mu6from
meshcore-dev#2670
Jul 9, 2026
Merged

Meshcore dev#2670#57
m0urs merged 20 commits into
v1.16.0mu6from
meshcore-dev#2670

Conversation

@m0urs

@m0urs m0urs commented Jul 9, 2026

Copy link
Copy Markdown
Owner

usrflo and others added 20 commits June 1, 2026 07:25
…c to isRetryMatch method for packet retransmission handling
Resolved conflicts:
- CommonCLI.h/cpp: kept both max_resend_attempts (feature) and
  cad_enabled/radio_fem_rxgain (upstream dev), appending
  max_resend_attempts at the end of the pref blob.
- Dispatcher.cpp: kept noise-floor calibration at end of loop()
  (to avoid disrupting repeated-sending retransmissions) and added
  upstream's setCADEnabled() call inside the idle guard.
@m0urs m0urs merged commit 5dda0fa into v1.16.0mu6 Jul 9, 2026
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.

2 participants