rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2026-01-16 06:47:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into apollo

Browse Source
This commit is contained in:
Thomas Göttgens
2023-08-17 10:06:19 +02:00
committed by GitHub
parent c31476d3e8 929b8f6209
commit 2b074e60d9
47 changed files with 443 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/mesh/NodeDB.cpp
View File

@@ -248,6 +248,11 @@ void NodeDB::installDefaultModuleConfig()
moduleConfig.has_neighbor_info = true;
moduleConfig.neighbor_info.enabled = false;
moduleConfig.has_detection_sensor = true;
moduleConfig.detection_sensor.enabled = false;
moduleConfig.detection_sensor.detection_triggered_high = true;
moduleConfig.detection_sensor.minimum_broadcast_secs = 45;
initModuleConfigIntervals();
}
@@ -765,7 +770,7 @@ void NodeDB::updateFrom(const meshtastic_MeshPacket &mp)
uint8_t NodeDB::getMeshNodeChannel(NodeNum n)
{
meshtastic_NodeInfoLite *info = getMeshNode(n);
const meshtastic_NodeInfoLite *info = getMeshNode(n);
if (!info) {
return 0; // defaults to PRIMARY
}
@@ -790,7 +795,8 @@ meshtastic_NodeInfoLite *NodeDB::getOrCreateMeshNode(NodeNum n)
if (!lite) {
if ((*numMeshNodes >= MAX_NUM_NODES) || (memGet.getFreeHeap() < meshtastic_NodeInfoLite_size * 3)) {
screen->print("warning: node_db_lite full! erasing oldest entry\n");
if (screen)
screen->print("warning: node_db_lite full! erasing oldest entry\n");
// look for oldest node and erase it
uint32_t oldest = UINT32_MAX;
int oldestIndex = -1;