From 96c0951587afc99b8899538568de8787ea9d9334 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Wed, 20 Jan 2021 15:43:26 +0100
Subject: [PATCH] move includes

---
 tasmota/tasmota.ino                    | 21 +++++++++++++++++++++
 tasmota/tasmota_configurations_ESP32.h | 21 +++++++++++----------
 tasmota/xdrv_50_filesystem.ino         |  3 +++
 3 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/tasmota/tasmota.ino b/tasmota/tasmota.ino
index 18995cd47..e0577afbd 100644
--- a/tasmota/tasmota.ino
+++ b/tasmota/tasmota.ino
@@ -70,6 +70,27 @@
   #include <SPI.h>                          // SPI support, TFT
 #endif  // USE_SPI
 
+#ifdef USE_UFILESYS
+#ifdef ESP8266
+#include <LittleFS.h>
+#include <SPI.h>
+#ifdef USE_SDCARD
+#include <SD.h>
+#include <SDFAT.h>
+#endif  // USE_SDCARD
+#endif  // ESP8266
+
+#ifdef ESP32
+#define FFS_2
+#include <LITTLEFS.h>
+#ifdef USE_SDCARD
+#include <SD.h>
+#endif  // USE_SDCARD
+#include "FFat.h"
+#include "FS.h"
+#endif  // ESP32
+#endif  // USE_UFILESYS
+
 // Structs
 #include "settings.h"
 
diff --git a/tasmota/tasmota_configurations_ESP32.h b/tasmota/tasmota_configurations_ESP32.h
index 874da5306..af6d0418f 100644
--- a/tasmota/tasmota_configurations_ESP32.h
+++ b/tasmota/tasmota_configurations_ESP32.h
@@ -52,8 +52,9 @@
 #define FALLBACK_MODULE        ODROID_GO         // [Module2] Select default module on fast reboot where USER_MODULE is user template
 
 #define USE_ODROID_GO                            // Add support for Odroid Go
+#define USE_UFILESYS
 #define USE_SDCARD
-#define GUI_TRASH_FILE
+  #define GUI_TRASH_FILE
 #define USE_ADC
 #define USE_SPI
   #define USE_DISPLAY                            // Add SPI Display Support (+2k code)
@@ -78,21 +79,21 @@
 #define FALLBACK_MODULE        M5STACK_CORE2     // [Module2] Select default module on fast reboot where USER_MODULE is user template
 
 #define USE_M5STACK_CORE2                        // Add support for M5Stack Core2
+  #define SAY_TIME
+  #define USE_WEBRADIO
+  #define USE_MPU6886
 #define USE_UFILESYS
 #define USE_SDCARD
-#define GUI_TRASH_FILE
+  #define GUI_TRASH_FILE
 #define USE_I2C
-#define USE_BMA423
-#define SAY_TIME
-#define USE_WEBRADIO
+  #define USE_BMA423
 #define USE_SPI
   #define USE_DISPLAY
     #define USE_DISPLAY_ILI9342
-#define USE_TOUCH_BUTTONS
-  #define MAX_TOUCH_BUTTONS 16
-#define JPEG_PICTS
-#define USE_FT5206
-#define USE_MPU6886
+    #define JPEG_PICTS
+    #define USE_FT5206
+    #define USE_TOUCH_BUTTONS
+      #define MAX_TOUCH_BUTTONS 16
 #define USE_SENDMAIL
 #define USE_ESP32MAIL
 
diff --git a/tasmota/xdrv_50_filesystem.ino b/tasmota/xdrv_50_filesystem.ino
index 0e200deef..c20fcceac 100644
--- a/tasmota/xdrv_50_filesystem.ino
+++ b/tasmota/xdrv_50_filesystem.ino
@@ -50,6 +50,8 @@ ufsfree   free size in kB
 #define UFS_TFAT          2
 #define UFS_TLFS          3
 
+/*
+// In tasmota.ino
 #ifdef ESP8266
 #include <LittleFS.h>
 #include <SPI.h>
@@ -68,6 +70,7 @@ ufsfree   free size in kB
 #include "FFat.h"
 #include "FS.h"
 #endif  // ESP32
+*/
 
 // Global file system pointer
 FS *ufsp;