Don't let MQTT ACKs cancel LoRa transmission if it's still in the Tx queue #3191
Conversation
This file contains 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
To avoid canceling a transmission if it was already ACKed via MQTT
thebentern
approved these changes
Feb 9, 2024
thebentern
added a commit
to meshtastic/artifacts
that referenced
this pull request
Feb 9, 2024
mverch67
pushed a commit
that referenced
this pull request
Feb 12, 2024
…3191) To avoid canceling a transmission if it was already ACKed via MQTT Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
ut3uku
added a commit
to meshtastic-ua/firmware
that referenced
this pull request
Feb 17, 2024
nimnull
pushed a commit
to meshtastic-ua/firmware
that referenced
this pull request
May 2, 2024
nimnull
added a commit
to meshtastic-ua/firmware
that referenced
this pull request
May 2, 2024
* feat: [none] Added permissions for flawfinder workflow * fixed initial capped queue implementation. Added enque check for maxElements in queue.size() * Turned off wantReply for new nodes observed in chat * Increased smart position min distance broadcast to 1km. Set min interval for position broadcast to 1min. Smart position broadcast disabled by default * Added Ukrainian localisation. Added v1_APRS DIY variant * Ukrainian localisation in extracted ScreenFonts.h * Added missed maxElements slot into the TypedQueue * UA fonts update * Replaced EInk UA font with 16pt. Enabled UA Font for t-deck * Add NiceRF based module, change some default settings * Don't let MQTT ACKs cancel LoRa transmission if it's still in the Tx queue by @GUVWAF in meshtastic#3191 * Change font for tdeck * Added UA fonts for t-deck * Update UA fonts * Sex with fonts & splash screen * Switched default oled font to UA * fix techo splash screen * fix compass * fix compass & some bug, cleaning code * fix compass * Fixed version number in properties. Added meshtastic-diy-NiceRF board * Fixed build matrix for meshtastic-diy-NiceRF * fix NiceRf power config * Fix Meshtastic APRS board * Updated github workflow persmissions * Updated github workflow persmissions for contents and packages * Added dockerhub creds variables * Updated docker repo path for device sim * Dropped properties PR & bump --------- Co-authored-by: Yehor Nazarkin <ynazarkin@healthjoy.com> Co-authored-by: UT3UKU <serhii.bondarenko@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
A user on Discord reported that packets were still not sent out via LoRa if MQTT uplink was enabled.
Looks like if you have a fast internet connection (or local MQTT server), a packet may be ACKed via MQTT during the small delay we add before transmitting via LoRa. To avoid canceling this packet (removing it from the LoRa Tx queue), I now check if we have less than
NUM_RETRANSMISSIONS - 1left, which is the original setting:firmware/src/mesh/ReliableRouter.cpp
Line 144 in 54e52ae
Meaning we've not yet decremented it due to a failed transmission.