Resolve LittleFS path ambiguity

Author: CapnBry

src/lib/LR1121Driver/LR1121.cpp

@@ -3,7 +3,7 @@
 #include "LR1121_hal.h"
 #include "logging.h"
 
-#include <SPIFFS.h>
+#include <LittleFS.h>
 #include <SPIEx.h>
 
 #define LR1121_FIRMWARE_TYPE 0xF3
@@ -70,7 +70,7 @@ void LR1121Driver::End()
 bool LR1121Driver::CheckVersion(const SX12XX_Radio_Number_t radioNumber)
 {
     firmware_version_t version = GetFirmwareVersion(radioNumber);
-    if (!SPIFFS.exists("/lr1121.txt") && (version.type != LR1121_FIRMWARE_TYPE || version.version != LR11XX_FIRMWARE_VERSION))
+    if (!LittleFS.exists("/lr1121.txt") && (version.type != LR1121_FIRMWARE_TYPE || version.version != LR11XX_FIRMWARE_VERSION))
     {
         DBGLN("Upgrading radio #%d", radioNumber);
         // do upgrade

src/lib/OPTIONS/hardware.cpp

@@ -146,7 +146,7 @@ static String builtinHardwareConfig;
 
 String& getHardware()
 {
-    File file = LittleFS.open("hardware.json", "r");
+    File file = LittleFS.open("/hardware.json", "r");
     if (!file || file.isDirectory())
     {
         if (file)
@@ -222,7 +222,7 @@ bool hardware_init(EspFlashStream &strmFlash)
 
     Stream *strmSrc;
     JsonDocument doc;
-    File file = LittleFS.open("hardware.json", "r");
+    File file = LittleFS.open("/hardware.json", "r");
     if (!file || file.isDirectory()) {
         constexpr size_t hardwareConfigOffset = ELRSOPTS_PRODUCTNAME_SIZE + ELRSOPTS_DEVICENAME_SIZE + ELRSOPTS_OPTIONS_SIZE;
         strmFlash.setPosition(hardwareConfigOffset);

src/lib/OPTIONS/options.cpp

@@ -97,7 +97,7 @@ void saveOptions(Stream &stream, bool customised)
 
 void saveOptions()
 {
-    File options = LittleFS.open("options.json", "w");
+    File options = LittleFS.open("/options.json", "w");
     saveOptions(options, true);
     options.close();
 }
@@ -143,7 +143,7 @@ static void options_LoadFromFlashOrFile(EspFlashStream &strmFlash)
     }
 
     // load options.json from the SPIFFS partition
-    File file = LittleFS.open("options.json", "r");
+    File file = LittleFS.open("/options.json", "r");
     if (file && !file.isDirectory())
     {
         DeserializationError error = deserializeJson(spiffsDoc, file);
@@ -218,7 +218,7 @@ void options_SetTrueDefaults()
     doc["domain"] = firmwareOptions.domain;
     doc["flash-discriminator"] = firmwareOptions.flash_discriminator;
 
-    File options = LittleFS.open("options.json", "w");
+    File options = LittleFS.open("/options.json", "w");
     serializeJson(doc, options);
     options.close();
 }

src/lib/WIFI/devWIFI.cpp

@@ -171,13 +171,17 @@ static void putFile(AsyncWebServerRequest *request, uint8_t *data, size_t len, s
 {
   static File file;
   static size_t bytes;
-  if (!file || request->url() != file.name()) {
+  if (!file ||
+    // Request URI starts with a / and LittleFS File::name() does not include it, ESP32 doesn't have File::fullName()
+    strcmp(&request->url().c_str()[1], file.name()) != 0)
+  {
     file = LittleFS.open(request->url(), "w");
     bytes = 0;
   }
   file.write(data, len);
   bytes += len;
-  if (bytes == total) {
+  if (bytes == total)
+  {
     file.close();
   }
 }
@@ -204,18 +208,18 @@ static void HandleReboot(AsyncWebServerRequest *request)
 static void HandleReset(AsyncWebServerRequest *request)
 {
   if (request->hasArg("hardware")) {
-    LittleFS.remove("hardware.json");
+    LittleFS.remove("/hardware.json");
   }
   if (request->hasArg("options")) {
-    LittleFS.remove("options.json");
+    LittleFS.remove("/options.json");
 #if defined(TARGET_RX)
     config.SetModelId(255);
     config.SetForceTlmOff(false);
     config.Commit();
 #endif
   }
   if (request->hasArg("lr1121")) {
-    LittleFS.remove("lr1121.txt");
+    LittleFS.remove("/lr1121.txt");
   }
   if (request->hasArg("model") || request->hasArg("config")) {
     config.SetDefaults(true);
@@ -233,7 +237,7 @@ static void UpdateSettings(AsyncWebServerRequest *request, JsonVariant &json)
     return;
   }
 
-  File file = LittleFS.open("options.json", "w");
+  File file = LittleFS.open("/options.json", "w");
   serializeJson(json, file);
   file.close();
   String options;
@@ -1073,7 +1077,7 @@ static void startServices()
   DefaultHeaders::Instance().addHeader("Access-Control-Allow-Methods", "POST,GET,OPTIONS");
   DefaultHeaders::Instance().addHeader("Access-Control-Allow-Headers", "*");
 
-  server.on("/hardware.json", HTTP_GET, getFile, nullptr, putFile);
+  server.on("/hardware.json", HTTP_GET | HTTP_POST, getFile, nullptr, putFile);
   server.on("/options.json", HTTP_GET, getFile);
   server.on("/reboot", HandleReboot);
   server.on("/reset", HandleReset);

src/lib/WIFI/lr1121.cpp

@@ -26,9 +26,9 @@ static void WebUploadLR1121ResponseHandler(AsyncWebServerRequest *request)
     {
         msg = String(R"({"status": "ok", "msg": "Update complete. Refresh page to see new version information."})");
         // add tag file for lr1121 custom firmware
-        if (!LittleFS.exists("lr1121.txt"))
+        if (!LittleFS.exists("/lr1121.txt"))
         {
-            File tagFile = LittleFS.open("lr1121.txt", "w");
+            File tagFile = LittleFS.open("/lr1121.txt", "w");
             tagFile.close();
         }
         DBGLN("Update complete");
@@ -86,7 +86,7 @@ static void GetLR1121Status(AsyncWebServerRequest *request)
     hal.end();
     hal.init();
     hal.reset();
-    json["manual"] = LittleFS.exists("lr1121.txt");
+    json["manual"] = LittleFS.exists("/lr1121.txt");
     ReadStatusForRadio(json["radio1"].to<JsonObject>(), SX12XX_Radio_1);
     if (GPIO_PIN_NSS_2 != UNDEF_PIN)
     {