meshcore-dev/MeshCore
1
0
Fork 0
mirror of https://github.com/meshcore-dev/MeshCore.git synced 2026-04-20 22:13:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add BRIDGE_DELAY as a buffer to prevent immediate processing conflicts in the mesh network

Browse source
This commit is contained in:
João Brázio 2025-09-08 20:21:33 +01:00
parent 1c93c162a1
commit a55fa8d8ec
No known key found for this signature in database
GPG key ID: 56A1490716A324DD
3 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/helpers/bridges/BridgeBase.cpp
View file

@ -1,5 +1,7 @@
#include "BridgeBase.h" #include "BridgeBase.h"
#include <Arduino.h>
const char *BridgeBase::getLogDateTime() { const char *BridgeBase::getLogDateTime() {
static char tmp[32]; static char tmp[32];
uint32_t now = _rtc->getCurrentTime(); uint32_t now = _rtc->getCurrentTime();
@ -27,7 +29,7 @@ bool BridgeBase::validateChecksum(const uint8_t *data, size_t len, uint16_t rece
void BridgeBase::handleReceivedPacket(mesh::Packet *packet) { void BridgeBase::handleReceivedPacket(mesh::Packet *packet) {
if (!_seen_packets.hasSeen(packet)) { if (!_seen_packets.hasSeen(packet)) {
_mgr->queueInbound(packet, 0); _mgr->queueInbound(packet, millis() + BRIDGE_DELAY);
} else { } else {
_mgr->free(packet); _mgr->free(packet);
} }

12
src/helpers/bridges/BridgeBase.h
View file

@ -23,7 +23,7 @@ public:
/** /**
* @brief Common magic number used by all bridge implementations for packet identification * @brief Common magic number used by all bridge implementations for packet identification
* *
* This magic number is placed at the beginning of bridge packets to identify * This magic number is placed at the beginning of bridge packets to identify
* them as mesh bridge packets and provide frame synchronization. * them as mesh bridge packets and provide frame synchronization.
*/ */
@ -31,7 +31,7 @@ public:
/** /**
* @brief Common field sizes used by bridge implementations * @brief Common field sizes used by bridge implementations
* *
* These constants define the size of common packet fields used across bridges. * These constants define the size of common packet fields used across bridges.
* BRIDGE_MAGIC_SIZE is used by all bridges for packet identification. * BRIDGE_MAGIC_SIZE is used by all bridges for packet identification.
* BRIDGE_LENGTH_SIZE is used by bridges that need explicit length fields (like RS232). * BRIDGE_LENGTH_SIZE is used by bridges that need explicit length fields (like RS232).
@ -41,6 +41,14 @@ public:
static constexpr uint16_t BRIDGE_LENGTH_SIZE = sizeof(uint16_t); static constexpr uint16_t BRIDGE_LENGTH_SIZE = sizeof(uint16_t);
static constexpr uint16_t BRIDGE_CHECKSUM_SIZE = sizeof(uint16_t); static constexpr uint16_t BRIDGE_CHECKSUM_SIZE = sizeof(uint16_t);
/**
* @brief Default delay in milliseconds for scheduling inbound packet processing
*
* It provides a buffer to prevent immediate processing conflicts in the mesh network.
* Used in handleReceivedPacket() as: millis() + BRIDGE_DELAY
*/
static constexpr uint16_t BRIDGE_DELAY = 500; // TODO: maybe too high ?
protected: protected:
/** Packet manager for allocating and queuing mesh packets */ /** Packet manager for allocating and queuing mesh packets */
mesh::PacketManager *_mgr; mesh::PacketManager *_mgr;

4
src/helpers/bridges/RS232Bridge.cpp
View file

@ -54,8 +54,8 @@ void RS232Bridge::onPacketTransmitted(mesh::Packet *packet) {
// Build packet header // Build packet header
buffer[0] = (BRIDGE_PACKET_MAGIC >> 8) & 0xFF; // Magic high byte buffer[0] = (BRIDGE_PACKET_MAGIC >> 8) & 0xFF; // Magic high byte
buffer[1] = BRIDGE_PACKET_MAGIC & 0xFF; // Magic low byte buffer[1] = BRIDGE_PACKET_MAGIC & 0xFF; // Magic low byte
buffer[2] = (len >> 8) & 0xFF; // Length high byte buffer[2] = (len >> 8) & 0xFF; // Length high byte
buffer[3] = len & 0xFF; // Length low byte buffer[3] = len & 0xFF; // Length low byte
// Calculate checksum over the payload // Calculate checksum over the payload
uint16_t checksum = fletcher16(buffer + 4, len); uint16_t checksum = fletcher16(buffer + 4, len);