From 3bd2e40855d444a5416709c003a46af8124b3439 Mon Sep 17 00:00:00 2001 From: medentem Date: Wed, 8 Jan 2025 19:41:31 -0600 Subject: [PATCH] trunk --- debian/update_changelog.sh | 4 ++-- src/mesh/FloodingRouter.cpp | 4 ++-- src/mesh/NodeDB.h | 4 ++-- userPrefs.jsonc | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/debian/update_changelog.sh b/debian/update_changelog.sh index 60af34511..e199795ed 100644 --- a/debian/update_changelog.sh +++ b/debian/update_changelog.sh @@ -1,5 +1,5 @@ #!/usr/bin/bash export DEBEMAIL="github-actions[bot]@users.noreply.github.com" dch --newversion "$(python3 bin/buildinfo.py short)-1" \ - --distribution unstable \ - "GitHub Actions Automatic version bump" + --distribution unstable \ + "GitHub Actions Automatic version bump" diff --git a/src/mesh/FloodingRouter.cpp b/src/mesh/FloodingRouter.cpp index 78357b282..fa23802c2 100644 --- a/src/mesh/FloodingRouter.cpp +++ b/src/mesh/FloodingRouter.cpp @@ -172,9 +172,9 @@ float FloodingRouter::calculateForwardProbability(const CoverageFilter &incoming config.device.role == meshtastic_Config_DeviceConfig_Role_REPEATER) { return 1.0f; } - + // If we haven't heard from any other nodes directly within the stale coverage time, fall back to always forward - if (nodeDB->secondsSinceLastDirectNeighborHeard() >= STALE_COVERAGE_SECONDS){ + if (nodeDB->secondsSinceLastDirectNeighborHeard() >= STALE_COVERAGE_SECONDS) { return UNKNOWN_COVERAGE_FORWARD_PROB; } diff --git a/src/mesh/NodeDB.h b/src/mesh/NodeDB.h index 8caa5ce1f..d23f759c1 100644 --- a/src/mesh/NodeDB.h +++ b/src/mesh/NodeDB.h @@ -180,8 +180,8 @@ class NodeDB uint32_t secondsSinceLastDirectNeighborHeard(); private: - uint32_t lastNodeDbSave = 0; // when we last saved our db to flash - uint32_t maxLastHeardDirectNeighbor_ = 0; // the most recent last_heard value we've seen + uint32_t lastNodeDbSave = 0; // when we last saved our db to flash + uint32_t maxLastHeardDirectNeighbor_ = 0; // the most recent last_heard value we've seen /// Find a node in our DB, create an empty NodeInfoLite if missing meshtastic_NodeInfoLite *getOrCreateMeshNode(NodeNum n); diff --git a/userPrefs.jsonc b/userPrefs.jsonc index d1030d091..4f8511cd8 100644 --- a/userPrefs.jsonc +++ b/userPrefs.jsonc @@ -35,5 +35,5 @@ // "USERPREFS_USE_ADMIN_KEY_2": "{}", // "USERPREFS_NODEINFO_BROADCAST_CHANNEL_HASH": "8", // "USERPREFS_USE_COVERAGE_FILTER": "", - "USERPREFS_TZ_STRING": "tzplaceholder " + "USERPREFS_TZ_STRING": "tzplaceholder ", }