mirror of
https://github.com/meshtastic/firmware.git
synced 2025-04-24 01:16:55 +00:00
SERIOUS BUG: we've been discarding devicestate when we should not
This commit is contained in:
parent
b02212009a
commit
c097852ab0
2
proto
2
proto
@ -1 +1 @@
|
||||
Subproject commit 5c1062ea839f97cfc6d33d428a89d1702c39bd93
|
||||
Subproject commit e63f9713f73ea5c9308b7822602ea75f506b6b00
|
@ -145,6 +145,7 @@ void NodeDB::installDefaultDeviceState()
|
||||
devicestate.has_my_node = true;
|
||||
devicestate.has_owner = true;
|
||||
devicestate.node_db_count = 0;
|
||||
devicestate.version = DEVICESTATE_CUR_VER;
|
||||
devicestate.receive_queue_count = 0; // Not yet implemented FIXME
|
||||
|
||||
// default to no GPS, until one has been found by probing
|
||||
@ -308,7 +309,7 @@ void NodeDB::loadFromDisk()
|
||||
installDefaultDeviceState(); // Our in RAM copy might now be corrupt
|
||||
} else {
|
||||
if (devicestate.version < DEVICESTATE_MIN_VER) {
|
||||
DEBUG_MSG("Warn: devicestate is old, discarding\n");
|
||||
DEBUG_MSG("Warn: devicestate %d is old, discarding\n", devicestate.version);
|
||||
installDefaultDeviceState();
|
||||
} else {
|
||||
DEBUG_MSG("Loaded saved preferences version %d\n", devicestate.version);
|
||||
|
Loading…
Reference in New Issue
Block a user