From b4f3fbe8231bb49acfca7574c150aa6902bd4ff2 Mon Sep 17 00:00:00 2001
From: Rick Watson <rjwats@gmail.com>
Date: Mon, 25 May 2020 11:30:13 +0100
Subject: [PATCH] Remove SPIFFS reference from ESP8266 react, use FS pointer
 instead

---
 interface/src/system/SystemStatusForm.tsx |  4 ++--
 lib/framework/ESP8266React.cpp            | 10 +++++-----
 lib/framework/ESP8266React.h              |  2 --
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/interface/src/system/SystemStatusForm.tsx b/interface/src/system/SystemStatusForm.tsx
index 0b9d09d..eb83ae9 100644
--- a/interface/src/system/SystemStatusForm.tsx
+++ b/interface/src/system/SystemStatusForm.tsx
@@ -73,7 +73,7 @@ class SystemStatusForm extends Component<SystemStatusFormProps, SystemStatusForm
               <MemoryIcon />
             </Avatar>
           </ListItemAvatar>
-          <ListItemText primary="Heap (Free / Max Alloc)" secondary={formatNumber(data.free_heap) + ' / ' + formatNumber(data.max_alloc_heap) + ' bytes (~' + this.approxHeapFragmentation() + '% fragmentation)'} />
+          <ListItemText primary="Heap (Free / Max Alloc)" secondary={formatNumber(data.free_heap) + ' / ' + formatNumber(data.max_alloc_heap) + ' bytes (~' + this.approxHeapFragmentation() + '%\xa0fragmentation)'} />
         </ListItem>
         <Divider variant="inset" component="li" />
         <ListItem >
@@ -100,7 +100,7 @@ class SystemStatusForm extends Component<SystemStatusFormProps, SystemStatusForm
               <FolderIcon />
             </Avatar>
           </ListItemAvatar>
-          <ListItemText primary="File System (Used / Total)" secondary={formatNumber(data.fs_used) + ' / ' + formatNumber(data.fs_total) + ' bytes (' + formatNumber(data.fs_total - data.fs_used) + ' bytes free)'} />
+          <ListItemText primary="File System (Used / Total)" secondary={formatNumber(data.fs_used) + ' / ' + formatNumber(data.fs_total) + ' bytes (' + formatNumber(data.fs_total - data.fs_used) + '\xa0bytes free)'} />
         </ListItem>
         <Divider variant="inset" component="li" />
       </Fragment>
diff --git a/lib/framework/ESP8266React.cpp b/lib/framework/ESP8266React.cpp
index b03a7d1..6ddcf9f 100644
--- a/lib/framework/ESP8266React.cpp
+++ b/lib/framework/ESP8266React.cpp
@@ -42,11 +42,11 @@ ESP8266React::ESP8266React(AsyncWebServer* server, FS* fs) :
       });
 #else
   // Serve static resources from /www/
-  server->serveStatic("/js/", SPIFFS, "/www/js/");
-  server->serveStatic("/css/", SPIFFS, "/www/css/");
-  server->serveStatic("/fonts/", SPIFFS, "/www/fonts/");
-  server->serveStatic("/app/", SPIFFS, "/www/app/");
-  server->serveStatic("/favicon.ico", SPIFFS, "/www/favicon.ico");
+  server->serveStatic("/js/", *fs, "/www/js/");
+  server->serveStatic("/css/", *fs, "/www/css/");
+  server->serveStatic("/fonts/", *fs, "/www/fonts/");
+  server->serveStatic("/app/", *fs, "/www/app/");
+  server->serveStatic("/favicon.ico", *fs, "/www/favicon.ico");
   // Serving all other get requests with "/www/index.htm"
   // OPTIONS get a straight up 200 response
   server->onNotFound([](AsyncWebServerRequest* request) {
diff --git a/lib/framework/ESP8266React.h b/lib/framework/ESP8266React.h
index a4d95f3..3509f0a 100644
--- a/lib/framework/ESP8266React.h
+++ b/lib/framework/ESP8266React.h
@@ -5,12 +5,10 @@
 
 #ifdef ESP32
 #include <AsyncTCP.h>
-#include <SPIFFS.h>
 #include <WiFi.h>
 #elif defined(ESP8266)
 #include <ESP8266WiFi.h>
 #include <ESPAsyncTCP.h>
-#include <FS.h>
 #endif
 
 #include <APSettingsService.h>