Merge branch 'master' into tft-gui-work

meshtastic · Jan 21, 2025 · 2dfe5a6 · 2dfe5a6
2 parents 50ff6e4 + 9041af3
commit 2dfe5a6
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/bin/config.d/BananaPi-BPI-R4-sx1262.yaml → ...fig.d/OpenWRT/BananaPi-BPI-R4-sx1262.yaml b/bin/config.d/BananaPi-BPI-R4-sx1262.yaml → ...fig.d/OpenWRT/BananaPi-BPI-R4-sx1262.yaml
diff --git a/....d/OpenWRT-One-mikroBUS-LR-IOT-CLICK.yaml → ...RT/OpenWRT-One-mikroBUS-LR-IOT-CLICK.yaml b/....d/OpenWRT-One-mikroBUS-LR-IOT-CLICK.yaml → ...RT/OpenWRT-One-mikroBUS-LR-IOT-CLICK.yaml
diff --git a/...config.d/OpenWRT_One_mikroBUS_sx1262.yaml → .../OpenWRT/OpenWRT_One_mikroBUS_sx1262.yaml b/...config.d/OpenWRT_One_mikroBUS_sx1262.yaml → .../OpenWRT/OpenWRT_One_mikroBUS_sx1262.yaml
diff --git a/src/mesh/RadioLibInterface.cpp b/src/mesh/RadioLibInterface.cpp
@@ -340,8 +340,11 @@ void RadioLibInterface::clampToLateRebroadcastWindow(NodeNum from, PacketId id)
     meshtastic_MeshPacket *p = txQueue.remove(from, id, true, false);
     if (p) {
         p->tx_after = millis() + getTxDelayMsecWeightedWorst(p->rx_snr);
-        txQueue.enqueue(p);
-        LOG_DEBUG("Move existing queued packet to the late rebroadcast window %dms from now", p->tx_after - millis());
+        if (txQueue.enqueue(p)) {
+            LOG_DEBUG("Move existing queued packet to the late rebroadcast window %dms from now", p->tx_after - millis());
+        } else {
+            packetPool.release(p);
+        }
     }
 }