pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-02-03 19:29:57 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Merge pull request #897 from a-f-G-U-C/nodedb-updatepos-atomic

Browse Source 
implement RX_SRC_LOCAL, Position in updatePosition
This commit is contained in:
Sacha Weatherstone 2021-10-27 06:38:33 +11:00 committed by GitHub
commit 3ffcecee6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/mesh/NodeDB.cpp
View File

@ -451,21 +451,29 @@ void NodeDB::updatePosition(uint32_t nodeId, const Position &p, RxSource src)
{ {
NodeInfo *info = getOrCreateNode(nodeId); NodeInfo *info = getOrCreateNode(nodeId);
DEBUG_MSG("DB update position node=0x%x time=%u, latI=%d, lonI=%d\n", nodeId, p.time, p.latitude_i, p.longitude_i); if (src == RX_SRC_LOCAL) {
// Local packet, fully authoritative
DEBUG_MSG("updatePosition LOCAL pos@%x:5, time=%u, latI=%d, lonI=%d\n",
p.pos_timestamp, p.time, p.latitude_i, p.longitude_i);
info->position = p;
// Be careful to only update fields that have been set by the sender } else {
// A lot of position reports don't have time populated. In that case, be careful to not blow away the time we // Be careful to only update fields that have been set by the REMOTE sender
// recorded based on the packet rxTime // A lot of position reports don't have time populated. In that case, be careful to not blow away the time we
if (p.time) // recorded based on the packet rxTime
info->position.time = p.time; DEBUG_MSG("updatePosition REMOTE node=0x%x time=%u, latI=%d, lonI=%d\n",
if (p.battery_level) nodeId, p.time, p.latitude_i, p.longitude_i);
info->position.battery_level = p.battery_level;
if (p.latitude_i || p.longitude_i) { // First, back up fields that we want to protect from overwrite
info->position.latitude_i = p.latitude_i; uint32_t tmp_time = info->position.time;
info->position.longitude_i = p.longitude_i;
// Next, update atomically
info->position = p;
// Last, restore any fields that may have been overwritten
if (! info->position.time)
info->position.time = tmp_time;
} }
if (p.altitude)
info->position.altitude = p.altitude;
info->has_position = true; info->has_position = true;
updateGUIforNode = info; updateGUIforNode = info;
notifyObservers(true); // Force an update whether or not our node counts have changed notifyObservers(true); // Force an update whether or not our node counts have changed