pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-07-30 02:15:41 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge 833b7398c7 into aa3b14ce72

Browse Source
This commit is contained in:
Ben Meadors 2025-07-27 22:14:05 -05:00 committed by GitHub
commit c03991015c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/mesh/NodeDB.cpp
View File

@ -371,11 +371,22 @@ NodeDB::NodeDB()
if (moduleConfig.telemetry.health_update_interval > MAX_INTERVAL) if (moduleConfig.telemetry.health_update_interval > MAX_INTERVAL)
moduleConfig.telemetry.health_update_interval = MAX_INTERVAL; moduleConfig.telemetry.health_update_interval = MAX_INTERVAL;
if (moduleConfig.mqtt.has_map_report_settings && if (moduleConfig.has_mqtt && moduleConfig.mqtt.has_map_report_settings &&
moduleConfig.mqtt.map_report_settings.publish_interval_secs < default_map_publish_interval_secs) { moduleConfig.mqtt.map_report_settings.publish_interval_secs < default_map_publish_interval_secs) {
moduleConfig.mqtt.map_report_settings.publish_interval_secs = default_map_publish_interval_secs; moduleConfig.mqtt.map_report_settings.publish_interval_secs = default_map_publish_interval_secs;
} }
// If we are using the default MQTT server, then we need to ensure that the root topic is set to msh/region name
if (moduleConfig.has_mqtt && config.lora.region != meshtastic_Config_LoRaConfig_RegionCode_UNSET &&
strncmp(moduleConfig.mqtt.address, default_mqtt_address, sizeof(default_mqtt_address)) == 0 &&
strcmp(moduleConfig.mqtt.root, default_mqtt_root) == 0) {
if (myRegion == nullptr) {
logError("myRegion is null. Cannot set MQTT root topic.");
} else {
sprintf(moduleConfig.mqtt.root, "%s/%s", default_mqtt_root, myRegion->name);
}
}
// Ensure that the neighbor info update interval is coerced to the minimum // Ensure that the neighbor info update interval is coerced to the minimum
moduleConfig.neighbor_info.update_interval = moduleConfig.neighbor_info.update_interval =
Default::getConfiguredOrMinimumValue(moduleConfig.neighbor_info.update_interval, min_neighbor_info_broadcast_secs); Default::getConfiguredOrMinimumValue(moduleConfig.neighbor_info.update_interval, min_neighbor_info_broadcast_secs);
@ -436,8 +447,8 @@ NodeDB::NodeDB()
} }
/** /**
* Most (but not always) of the time we want to treat packets 'from' the local phone (where from == 0), as if they originated on * Most (but not always) of the time we want to treat packets 'from' the local phone (where from == 0), as if they originated
* the local node. If from is zero this function returns our node number instead * on the local node. If from is zero this function returns our node number instead
*/ */
NodeNum getFrom(const meshtastic_MeshPacket *p) NodeNum getFrom(const meshtastic_MeshPacket *p)
{ {
@ -1192,11 +1203,10 @@ void NodeDB::loadFromDisk()
&meshtastic_DeviceState_msg, &devicestate); &meshtastic_DeviceState_msg, &devicestate);
// See https://github.com/meshtastic/firmware/issues/4184#issuecomment-2269390786 // See https://github.com/meshtastic/firmware/issues/4184#issuecomment-2269390786
// It is very important to try and use the saved prefs even if we fail to read meshtastic_DeviceState. Because most of our // It is very important to try and use the saved prefs even if we fail to read meshtastic_DeviceState. Because most of
// critical config may still be valid (in the other files - loaded next). // our critical config may still be valid (in the other files - loaded next). Also, if we did fail on reading we probably
// Also, if we did fail on reading we probably failed on the enormous (and non critical) nodeDB. So DO NOT install default // failed on the enormous (and non critical) nodeDB. So DO NOT install default device state. if (state !=
// device state. // LoadFileResult::LOAD_SUCCESS) {
// if (state != LoadFileResult::LOAD_SUCCESS) {
// installDefaultDeviceState(); // Our in RAM copy might now be corrupt // installDefaultDeviceState(); // Our in RAM copy might now be corrupt
//} else { //} else {
if ((state != LoadFileResult::LOAD_SUCCESS) || (devicestate.version < DEVICESTATE_MIN_VER)) { if ((state != LoadFileResult::LOAD_SUCCESS) || (devicestate.version < DEVICESTATE_MIN_VER)) {