Fall back to /sys if wifi firmware not found in /firmware

2 files changed, 10 insertions, 5 deletions

diff --git a/src/Networking/ESP8266WiFi/WifiFirmwareUploader.cpp b/src/Networking/ESP8266WiFi/WifiFirmwareUploader.cpp
index fe38ee6d..17a922c2 100644
--- a/src/Networking/ESP8266WiFi/WifiFirmwareUploader.cpp
+++ b/src/Networking/ESP8266WiFi/WifiFirmwareUploader.cpp
@@ -733,14 +733,19 @@ void WifiFirmwareUploader::Spin() noexcept
 }
 
 // Try to upload the given file at the given address
-void WifiFirmwareUploader::SendUpdateFile(const char *file, const char *dir, uint32_t address) noexcept
+void WifiFirmwareUploader::SendUpdateFile(const char *file, uint32_t address) noexcept
 {
 	Platform& platform = reprap.GetPlatform();
-	uploadFile = platform.OpenFile(dir, file, OpenMode::read);
+	uploadFile = platform.OpenFile(FIRMWARE_DIRECTORY, file, OpenMode::read);
 	if (uploadFile == nullptr)
 	{
-		MessageF("Failed to open file %s\n", file);
-		return;
+		// Fall back to /sys if the wifi file wasn't found in /firmware
+		uploadFile = platform.OpenFile(DEFAULT_SYS_DIR, file, OpenMode::read);
+		if (uploadFile == nullptr)
+		{
+			MessageF("Failed to open file %s%s\n", FIRMWARE_DIRECTORY, file);
+			return;
+		}
 	}
 
 	fileSize = uploadFile->Length();
diff --git a/src/Networking/ESP8266WiFi/WifiFirmwareUploader.h b/src/Networking/ESP8266WiFi/WifiFirmwareUploader.h
index 470d1328..77c60203 100644
--- a/src/Networking/ESP8266WiFi/WifiFirmwareUploader.h
+++ b/src/Networking/ESP8266WiFi/WifiFirmwareUploader.h
@@ -17,7 +17,7 @@ class WifiFirmwareUploader
 public:
 	WifiFirmwareUploader(UARTClass& port, WiFiInterface &iface) noexcept;
 	bool IsReady() const noexcept;
-	void SendUpdateFile(const char *file, const char *dir, uint32_t address) noexcept;
+	void SendUpdateFile(const char *file, uint32_t address) noexcept;
 	void Spin() noexcept;
 
 	static const uint32_t FirmwareAddress = 0x00000000;