[build] Changes from SPIFFS to FS letscontrolit#2482

Core 2.6.x has changed _SPIFFS_* to _FS_*
See letscontrolit#2482

Author: TD-er

platformio.ini

@@ -89,6 +89,9 @@ build_flags               = -D BUILD_GIT='"${sysenv.TRAVIS_TAG}"'
                             -DPUYA_SUPPORT=1
                             -DCORE_POST_2_5_0
 
+[esp82xx_2_6_x]
+build_flags               = ${esp82xx_2_5_x.build_flags} -DCORE_POST_2_6_0
+
 
 [core_2_3_0]
 platform                  = https://github.com/TD-er/platform-espressif8266.git#patch/v1.5.0_Puya
@@ -120,9 +123,10 @@ build_flags               = ${esp82xx_2_5_x.build_flags}
 platform                  = [email protected]
 build_flags               = ${esp82xx_2_5_x.build_flags}
 
+
 [core_stage]
 platform                  = https://github.com/platformio/platform-espressif8266.git#feature/stage
-build_flags               = ${esp82xx_2_5_x.build_flags}
+build_flags               = ${esp82xx_2_6_x.build_flags}
 
 
 [core_esp32_0_12_0]

src/ESPEasy-Globals.h

@@ -12,7 +12,7 @@
 
 #include <stddef.h>
 
-namespace std 
+namespace std
 {
   using ::ptrdiff_t;
   using ::size_t;
@@ -582,10 +582,18 @@ bool showSettingsFileLayout = false;
   extern "C" {
   #include "spi_flash.h"
   }
-  extern "C" uint32_t _SPIFFS_start;
-  extern "C" uint32_t _SPIFFS_end;
-  extern "C" uint32_t _SPIFFS_page;
-  extern "C" uint32_t _SPIFFS_block;
+  #ifdef CORE_POST_2_6_0
+    extern "C" uint32_t _FS_start;
+    extern "C" uint32_t _FS_end;
+    extern "C" uint32_t _FS_page;
+    extern "C" uint32_t _FS_block;
+  #else
+    extern "C" uint32_t _SPIFFS_start;
+    extern "C" uint32_t _SPIFFS_end;
+    extern "C" uint32_t _SPIFFS_page;
+    extern "C" uint32_t _SPIFFS_block;
+  #endif
+
   #ifdef FEATURE_MDNS
     #include <ESP8266mDNS.h>
   #endif

src/ESPEasyStorage.ino

@@ -856,8 +856,14 @@ int SpiffsSectors()
 {
   checkRAM(F("SpiffsSectors"));
   #if defined(ESP8266)
-    uint32_t _sectorStart = ((uint32_t)&_SPIFFS_start - 0x40200000) / SPI_FLASH_SEC_SIZE;
-    uint32_t _sectorEnd = ((uint32_t)&_SPIFFS_end - 0x40200000) / SPI_FLASH_SEC_SIZE;
+    #ifdef CORE_POST_2_6_0
+      uint32_t _sectorStart = ((uint32_t)&_FS_start - 0x40200000) / SPI_FLASH_SEC_SIZE;
+      uint32_t _sectorEnd = ((uint32_t)&_FS_end - 0x40200000) / SPI_FLASH_SEC_SIZE;
+    #else
+      uint32_t _sectorStart = ((uint32_t)&_SPIFFS_start - 0x40200000) / SPI_FLASH_SEC_SIZE;
+      uint32_t _sectorEnd = ((uint32_t)&_SPIFFS_end - 0x40200000) / SPI_FLASH_SEC_SIZE;
+    #endif
+
     return _sectorEnd - _sectorStart;
   #endif
   #if defined(ESP32)