DG4MLK/MeshCore-Evo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #645 from recrof/dev

Browse Source 
set default flood advert interval to 12 hours
This commit is contained in:
ripplebiz
2025-08-20 22:01:07 +10:00
committed by GitHub
parent a9d4cf1d21 5dc930410c
commit 412e9d4678
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
examples/simple_repeater/main.cpp
View File

@@ -159,7 +159,7 @@ class MyMesh : public mesh::Mesh, public CommonCLICallbacks {
} }
void putNeighbour(const mesh::Identity& id, uint32_t timestamp, float snr) { void putNeighbour(const mesh::Identity& id, uint32_t timestamp, float snr) {
#if MAX_NEIGHBOURS // check if neighbours enabled #if MAX_NEIGHBOURS // check if neighbours enabled
// find existing neighbour, else use least recently updated // find existing neighbour, else use least recently updated
uint32_t oldest_timestamp = 0xFFFFFFFF; uint32_t oldest_timestamp = 0xFFFFFFFF;
NeighbourInfo* neighbour = &neighbours[0]; NeighbourInfo* neighbour = &neighbours[0];
@@ -589,7 +589,7 @@ public:
_prefs.cr = LORA_CR; _prefs.cr = LORA_CR;
_prefs.tx_power_dbm = LORA_TX_POWER; _prefs.tx_power_dbm = LORA_TX_POWER;
_prefs.advert_interval = 1; // default to 2 minutes for NEW installs _prefs.advert_interval = 1; // default to 2 minutes for NEW installs
_prefs.flood_advert_interval = 3; // 3 hours _prefs.flood_advert_interval = 12; // 12 hours
_prefs.flood_max = 64; _prefs.flood_max = 64;
_prefs.interference_threshold = 0; // disabled _prefs.interference_threshold = 0; // disabled
} }
@@ -611,8 +611,8 @@ public:
const char* getBuildDate() override { return FIRMWARE_BUILD_DATE; } const char* getBuildDate() override { return FIRMWARE_BUILD_DATE; }
const char* getRole() override { return FIRMWARE_ROLE; } const char* getRole() override { return FIRMWARE_ROLE; }
const char* getNodeName() { return _prefs.node_name; } const char* getNodeName() { return _prefs.node_name; }
NodePrefs* getNodePrefs() { NodePrefs* getNodePrefs() {
return &_prefs; return &_prefs;
} }
void savePrefs() override { void savePrefs() override {

10
examples/simple_room_server/main.cpp
View File

@@ -298,7 +298,7 @@ class MyMesh : public mesh::Mesh, public CommonCLICallbacks {
// uint32_t now = getRTCClock()->getCurrentTimeUnique(); // uint32_t now = getRTCClock()->getCurrentTimeUnique();
// memcpy(reply_data, &now, 4); // response packets always prefixed with timestamp // memcpy(reply_data, &now, 4); // response packets always prefixed with timestamp
memcpy(reply_data, &sender_timestamp, 4); // reflect sender_timestamp back in response packet (kind of like a 'tag') memcpy(reply_data, &sender_timestamp, 4); // reflect sender_timestamp back in response packet (kind of like a 'tag')
switch (payload[0]) { switch (payload[0]) {
case REQ_TYPE_GET_STATUS: { case REQ_TYPE_GET_STATUS: {
ServerStats stats; ServerStats stats;
@@ -746,9 +746,9 @@ public:
_prefs.tx_power_dbm = LORA_TX_POWER; _prefs.tx_power_dbm = LORA_TX_POWER;
_prefs.disable_fwd = 1; _prefs.disable_fwd = 1;
_prefs.advert_interval = 1; // default to 2 minutes for NEW installs _prefs.advert_interval = 1; // default to 2 minutes for NEW installs
_prefs.flood_advert_interval = 3; // 3 hours _prefs.flood_advert_interval = 12; // 12 hours
_prefs.flood_max = 64; _prefs.flood_max = 64;
_prefs.interference_threshold = 0; // disabled _prefs.interference_threshold = 0; // disabled
#ifdef ROOM_PASSWORD #ifdef ROOM_PASSWORD
StrHelper::strncpy(_prefs.guest_password, ROOM_PASSWORD, sizeof(_prefs.guest_password)); StrHelper::strncpy(_prefs.guest_password, ROOM_PASSWORD, sizeof(_prefs.guest_password));
#endif #endif
@@ -778,8 +778,8 @@ public:
const char* getBuildDate() override { return FIRMWARE_BUILD_DATE; } const char* getBuildDate() override { return FIRMWARE_BUILD_DATE; }
const char* getRole() override { return FIRMWARE_ROLE; } const char* getRole() override { return FIRMWARE_ROLE; }
const char* getNodeName() { return _prefs.node_name; } const char* getNodeName() { return _prefs.node_name; }
NodePrefs* getNodePrefs() { NodePrefs* getNodePrefs() {
return &_prefs; return &_prefs;
} }
void savePrefs() override { void savePrefs() override {