Clear local position on nodedb-reset (#3451)

* Clear local position on nodedb-reset * NodeDB pointer now, yo --------- Co-authored-by: Jonathan Bennett <[email protected]>
meshtastic · Mar 21, 2024 · 6dd337a · 6dd337a
1 parent 0a7ddb7
commit 6dd337a
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/src/mesh/NodeDB.cpp b/src/mesh/NodeDB.cpp
@@ -434,6 +434,7 @@ void NodeDB::resetNodes()
 {
     numMeshNodes = 1;
     std::fill(devicestate.node_db_lite.begin() + 1, devicestate.node_db_lite.end(), meshtastic_NodeInfoLite());
+    clearLocalPosition();
     saveDeviceStateToDisk();
     if (neighborInfoModule && moduleConfig.neighbor_info.enabled)
         neighborInfoModule->resetNeighbors();
@@ -455,6 +456,16 @@ void NodeDB::removeNodeByNum(uint nodeNum)
     saveDeviceStateToDisk();
 }
 
+void NodeDB::clearLocalPosition()
+{
+    meshtastic_NodeInfoLite *node = getMeshNode(nodeDB->getNodeNum());
+    node->position.latitude_i = 0;
+    node->position.longitude_i = 0;
+    node->position.altitude = 0;
+    node->position.time = 0;
+    setLocalPosition(meshtastic_Position_init_default);
+}
+
 void NodeDB::cleanupMeshDB()
 {
     int newPos = 0, removed = 0;

diff --git a/src/mesh/NodeDB.h b/src/mesh/NodeDB.h
@@ -131,6 +131,8 @@ class NodeDB
     meshtastic_NodeInfoLite *getMeshNode(NodeNum n);
     size_t getNumMeshNodes() { return numMeshNodes; }
 
+    void clearLocalPosition();
+
     void setLocalPosition(meshtastic_Position position, bool timeOnly = false)
     {
         if (timeOnly) {

diff --git a/src/modules/PositionModule.cpp b/src/modules/PositionModule.cpp
@@ -34,21 +34,11 @@ PositionModule::PositionModule()
     if ((config.device.role == meshtastic_Config_DeviceConfig_Role_TRACKER ||
          config.device.role == meshtastic_Config_DeviceConfig_Role_TAK_TRACKER) &&
         config.power.is_power_saving) {
-        clearPosition();
+        LOG_DEBUG("Clearing position on startup for sleepy tracker (ー。ー) zzz\n");
+        nodeDB->clearLocalPosition();
     }
 }
 
-void PositionModule::clearPosition()
-{
-    LOG_DEBUG("Clearing position on startup for sleepy tracker (ー。ー) zzz\n");
-    meshtastic_NodeInfoLite *node = nodeDB->getMeshNode(nodeDB->getNodeNum());
-    node->position.latitude_i = 0;
-    node->position.longitude_i = 0;
-    node->position.altitude = 0;
-    node->position.time = 0;
-    nodeDB->setLocalPosition(meshtastic_Position_init_default);
-}
-
 bool PositionModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshtastic_Position *pptr)
 {
     auto p = *pptr;

diff --git a/src/modules/PositionModule.h b/src/modules/PositionModule.h
@@ -51,9 +51,6 @@ class PositionModule : public ProtobufModule<meshtastic_Position>, private concu
     struct SmartPosition getDistanceTraveledSinceLastSend(meshtastic_PositionLite currentPosition);
     meshtastic_MeshPacket *allocAtakPli();
     uint32_t precision;
-
-    /** Only used in power saving trackers for now */
-    void clearPosition();
     void sendLostAndFoundText();
 };