From cb47f6c02e3684ed36a857b0631fde0ff9fbd81b Mon Sep 17 00:00:00 2001
From: theFeiter <git@marvinfeiter.de>
Date: Thu, 7 Jul 2022 11:49:57 +0200
Subject: [PATCH] use littlefs since spiffs is deprecated

---
 FDRS_Gateway/FDRS_Gateway.ino |  5 ++++-
 FDRS_Gateway/fdrs_config.h    |  6 +++---
 FDRS_Gateway/fdrs_functions.h | 15 +++++++--------
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/FDRS_Gateway/FDRS_Gateway.ino b/FDRS_Gateway/FDRS_Gateway.ino
index 9b798ac..f7e84f1 100644
--- a/FDRS_Gateway/FDRS_Gateway.ino
+++ b/FDRS_Gateway/FDRS_Gateway.ino
@@ -30,6 +30,9 @@
 #include <SPI.h>
 #include <SD.h>
 #endif
+#ifdef USE_FS_LOG
+#include <LittleFS.h>
+#endif
 #include "fdrs_functions.h"
 
 void setup() {
@@ -69,7 +72,7 @@ void setup() {
 #ifdef USE_SD_LOG
   begin_SD();
 #endif
-#ifdef USE_SPIFFS_LOG
+#ifdef USE_FS_LOG
   begin_FS();
 #endif
   
diff --git a/FDRS_Gateway/fdrs_config.h b/FDRS_Gateway/fdrs_config.h
index 2a5c0b2..c5d0859 100644
--- a/FDRS_Gateway/fdrs_config.h
+++ b/FDRS_Gateway/fdrs_config.h
@@ -19,7 +19,7 @@
 //#define USE_LORA
 //#define USE_WIFI      //Used only for MQTT gateway
 //#define USE_SD_LOG      //Used only for SD-card logging
-//#define USE_SPIFFS_LOG      //Used only for SPIFFS logging (esp internal filesystem)
+//#define USE_FS_LOG      //Used only for SPIFFS logging (esp internal filesystem)
 
 // Peer addresses
 #define ESPNOW1_PEER  0x0E  // ESPNOW1 Address 
@@ -86,5 +86,5 @@
 #define SD_SS 0     //SD card Chipselect pin (Use a different pins for LoRa and SD)
 #define SD_FILENAME "fdrs_log.csv"  // length max. 32
 
-// SPIFFS logging config -- Needed only for SPIFFS logging
-#define SPIFFS_FILENAME "fdrs_log.csv"  // length max. 32
\ No newline at end of file
+// Internal flash logging config -- Needed only for internal flash logging
+#define FS_FILENAME "fdrs_log.csv"  // length max. 32
\ No newline at end of file
diff --git a/FDRS_Gateway/fdrs_functions.h b/FDRS_Gateway/fdrs_functions.h
index 518901f..872d06f 100644
--- a/FDRS_Gateway/fdrs_functions.h
+++ b/FDRS_Gateway/fdrs_functions.h
@@ -196,9 +196,9 @@ void send_SD(char filename[32]) {
   #endif
 }
 void send_FS(char filename[32]) {
-  #ifdef USE_SPIFFS_LOG
+  #ifdef USE_FS_LOG
   DBG("Logging to internal flash.");
-  File logfile = SPIFFS.open(filename, "a");
+  File logfile = LittleFS.open(filename, "a");
   for (int i = 0; i < ln; i++) {
     #ifdef USE_WIFI
     logfile.print(timeClient.getEpochTime());
@@ -213,7 +213,6 @@ void send_FS(char filename[32]) {
     logfile.println(theData[i].d);
   }
   logfile.close();
-  }
   #endif
 }
 void reconnect(int attempts, bool silent) {
@@ -277,7 +276,7 @@ void mqtt_publish(const char* payload){
   if(!client.publish(TOPIC_DATA, payload)){
     DBG(" Error on sending MQTT");
     send_SD(SD_FILENAME);
-    send_FS(SPIFFS_FILENAME);
+    send_FS(FS_FILENAME);
   }
   #endif
 }
@@ -669,17 +668,17 @@ void begin_SD(){
   #endif
 }
 void begin_FS(){
-  #ifdef USE_SPIFFS_LOG
-  DBG("Initializing SPIFFS...");
+  #ifdef USE_FS_LOG
+  DBG("Initializing LittleFS...");
 
-  if(!SPIFFS.begin())
+  if(!LittleFS.begin())
   {
     Serial.println(" initialization failed");
     while (1);
   }
   else
   {
-    Serial.println(" SPIFFS initialized");
+    Serial.println(" LittleFS initialized");
   }
   #endif
 }