kevin/meshtastic_firmware
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

fix: add ROUTER_LATE to infrastructure init and config preservation (#9820)

Browse Source 
ROUTER_LATE now preserves node_info_broadcast_secs during factory
reset and auto-enables Store & Forward server mode, matching ROUTER
infrastructure behavior.
This commit is contained in:
Clive Blackledge
2026-03-05 05:48:53 -06:00
committed by GitHub
co-authored by GitHub
parent 66161da2a7
commit 1626836a71
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesh/NodeDB.cpp
+2 -1
View File
@@ -672,7 +672,8 @@ void NodeDB::installDefaultConfig(bool preserveKey = false)
#endif #endif
config.position.broadcast_smart_minimum_distance = 100; config.position.broadcast_smart_minimum_distance = 100;
config.position.broadcast_smart_minimum_interval_secs = default_broadcast_smart_minimum_interval_secs; config.position.broadcast_smart_minimum_interval_secs = default_broadcast_smart_minimum_interval_secs;
if (config.device.role != meshtastic_Config_DeviceConfig_Role_ROUTER) if (config.device.role != meshtastic_Config_DeviceConfig_Role_ROUTER &&
config.device.role != meshtastic_Config_DeviceConfig_Role_ROUTER_LATE)
config.device.node_info_broadcast_secs = default_node_info_broadcast_secs; config.device.node_info_broadcast_secs = default_node_info_broadcast_secs;
config.security.serial_enabled = true; config.security.serial_enabled = true;
config.security.admin_channel_enabled = false; config.security.admin_channel_enabled = false;
src/modules/StoreForwardModule.cpp
+2 -1
View File
@@ -588,7 +588,8 @@ StoreForwardModule::StoreForwardModule()
if (moduleConfig.store_forward.enabled) { if (moduleConfig.store_forward.enabled) {
// Router // Router
if ((config.device.role == meshtastic_Config_DeviceConfig_Role_ROUTER || moduleConfig.store_forward.is_server)) { if ((config.device.role == meshtastic_Config_DeviceConfig_Role_ROUTER ||
config.device.role == meshtastic_Config_DeviceConfig_Role_ROUTER_LATE || moduleConfig.store_forward.is_server)) {
LOG_INFO("Init Store & Forward Module in Server mode"); LOG_INFO("Init Store & Forward Module in Server mode");
if (memGet.getPsramSize() > 0) { if (memGet.getPsramSize() > 0) {
if (memGet.getFreePsram() >= 1024 * 1024) { if (memGet.getFreePsram() >= 1024 * 1024) {