Reset config retains the domain

CapnBry · Jan 25, 2024 · fbfd839 · fbfd839
1 parent 6431f1f
commit fbfd839
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/src/lib/OPTIONS/options.cpp b/src/lib/OPTIONS/options.cpp
@@ -351,6 +351,8 @@ static void options_LoadFromFlashOrFile(EspFlashStream &strmFlash)
 void options_SetTrueDefaults()
 {
     DynamicJsonDocument doc(128);
+    // The Regulatory Domain is retained, as there is no sensible default
+    doc["domain"] = firmwareOptions.domain;
     doc["flash-discriminator"] = flash_discriminator;
 
     File options = SPIFFS.open("/options.json", "w");

diff --git a/src/src/rx_main.cpp b/src/src/rx_main.cpp
@@ -1680,6 +1680,7 @@ void resetConfigAndReboot()
     yield();
     // Remove options.json and hardware.json
     SPIFFS.format();
+    yield();
     SPIFFS.begin();
     options_SetTrueDefaults();