Skip to content

Commit 2458a2c

Browse files
committed
Add full factory reset with -1 sizeOfSettings
1 parent a28cfd5 commit 2458a2c

File tree

2 files changed

+3
-13
lines changed

2 files changed

+3
-13
lines changed

Firmware/RTK_Surveyor/NVM.ino

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -352,17 +352,7 @@ bool parseLine(char* str) {
352352
//If user sets sizeOfSettings to -1 in config file, RTK Surveyor will factory reset
353353
if (d == -1)
354354
{
355-
eepromErase();
356-
357-
//Assemble settings file name
358-
char settingsFileName[40]; //SFE_Surveyor_Settings.txt
359-
strcpy(settingsFileName, platformFilePrefix);
360-
strcat(settingsFileName, "_Settings.txt");
361-
sd.remove(settingsFileName);
362-
363-
Serial.printf("RTK %s has been factory reset via settings file. Unit restarting. Please open terminal at 115200bps.\n\r", platformPrefix);
364-
delay(2000);
365-
ESP.restart();
355+
factoryReset(); //Erase EEPROM, erase settings file, reset u-blox module, display message on OLED
366356
}
367357

368358
//Check to see if this setting file is compatible with this version of RTK Surveyor

Firmware/RTK_Surveyor/menuMain.ino

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,8 @@ void menuMain()
104104
//Erase all settings. Upon restart, unit will use defaults
105105
void factoryReset()
106106
{
107+
displaySytemReset(); //Display friendly message on OLED
108+
107109
eepromErase();
108110

109111
//Assemble settings file name
@@ -122,8 +124,6 @@ void factoryReset()
122124
} //End xFATSemaphore
123125
}
124126

125-
displaySytemReset(); //Display friendly message on OLED
126-
127127
i2cGNSS.factoryReset(); //Reset everything: baud rate, I2C address, update rate, everything.
128128

129129
Serial.println(F("Settings erased successfully. Rebooting. Good bye!"));

0 commit comments

Comments
 (0)