Skip to content

Commit e812264

Browse files
committed
Only trust settings.gnssConfigured from LittleFS
1 parent fc0d68f commit e812264

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

Firmware/RTK_Everywhere/NVM.ino

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,20 @@ void loadSettings()
6060

6161
// Temp store any variables from LFS that should override SD
6262
int resetCount = settings.resetCount;
63+
bool gnssConfiguredOnce = settings.gnssConfiguredOnce;
64+
bool gnssConfiguredRover = settings.gnssConfiguredRover;
65+
bool gnssConfiguredBase = settings.gnssConfiguredBase;
6366

6467
loadSystemSettingsFromFileSD(settingsFileName);
6568

6669
settings.resetCount = resetCount; // resetCount from LFS should override SD
6770

71+
// Trust gnssConfigured from LittleFS over SD.
72+
// LittleFS may have been erased, SD could be stale.
73+
settings.gnssConfiguredOnce = gnssConfiguredOnce;
74+
settings.gnssConfiguredRover = gnssConfiguredRover;
75+
settings.gnssConfiguredBase = gnssConfiguredBase;
76+
6877
// Change empty profile name to 'Profile1' etc
6978
if (strlen(settings.profileName) == 0)
7079
{

0 commit comments

Comments
 (0)