changed: decoupled from the specific file system

Author: sivar2311

examples/Settings/MultiWiFi/MultiWiFi.ino

@@ -28,12 +28,11 @@
 #include <WiFi.h>
 #endif
 
-#include "FS.h"
-#include "LittleFS.h"
-#include "ArduinoJson.h"
+#include <LittleFS.h>
+#include <ArduinoJson.h>
 
-#include "SinricPro.h"
-#include "SinricProSwitch.h"
+#include <SinricPro.h>
+#include <SinricProSwitch.h>
 #include "SinricProWiFiSettings.h"
 
 #define APP_KEY ""     // Should look like "de0bxxxx-1x3x-4x3x-ax2x-5dabxxxxxxxx"
@@ -52,7 +51,7 @@ const char* primaryPassword = "";    // Set to your primary wifi's password
 const char* secondarySSID = "";      // Set to your secondary wifi's ssid
 const char* secondaryPassword = "";  // Set to your secondary wifi's password
 
-SinricProWiFiSettings spws(primarySSID, primaryPassword, secondarySSID, secondaryPassword, "/wificonfig.dat");
+SinricProWiFiSettings spws(LittleFS, primarySSID, primaryPassword, secondarySSID, secondaryPassword, "/wificonfig.dat");
 
 bool onSetModuleSetting(const String& id, const String& value) {
   // Handle module settings.

examples/Settings/MultiWiFi/SinricProWiFiSettings.cpp

@@ -1,9 +1,11 @@
 #include "SinricProWiFiSettings.h"
 
-SinricProWiFiSettings::SinricProWiFiSettings(const char* defaultPrimarySSID, const char* defaultPrimaryPassword,
+SinricProWiFiSettings::SinricProWiFiSettings(fs::FS& fs,
+                                             const char* defaultPrimarySSID, const char* defaultPrimaryPassword,
                                              const char* defaultSecondarySSID, const char* defaultSecondaryPassword,
                                              const char* configFileName)
-  : defaultPrimarySSID(defaultPrimarySSID), defaultPrimaryPassword(defaultPrimaryPassword),
+  : fs(fs)
+  , defaultPrimarySSID(defaultPrimarySSID), defaultPrimaryPassword(defaultPrimaryPassword),
     defaultSecondarySSID(defaultSecondarySSID), defaultSecondaryPassword(defaultSecondaryPassword),
     configFileName(configFileName) {
   memset(&wifiSettings, 0, sizeof(wifiSettings));
@@ -46,9 +48,9 @@ void SinricProWiFiSettings::printSettings() const {
 void SinricProWiFiSettings::saveToFile() {
 
   #if defined(ESP8266)
-    File file = LittleFS.open(configFileName, "w");
+    File file = fs.open(configFileName, "w");
   #elif defined(ESP32)
-    File file = LittleFS.open(configFileName, FILE_WRITE);
+    File file = fs.open(configFileName, FILE_WRITE);
   #endif
 
   if (file) {
@@ -59,9 +61,9 @@ void SinricProWiFiSettings::saveToFile() {
 
 bool SinricProWiFiSettings::loadFromFile() {
   #if defined(ESP8266)
-    File file = LittleFS.open(configFileName, "r");
+    File file = fs.open(configFileName, "r");
   #elif defined(ESP32)
-    File file = LittleFS.open(configFileName, FILE_READ);
+    File file = fs.open(configFileName, FILE_READ);
   #endif
 
   if (file && file.size() == sizeof(wifiSettings)) {
@@ -85,8 +87,8 @@ void SinricProWiFiSettings::saveDefaultSettings() {
 
 void SinricProWiFiSettings::deleteAllSettings() {
   memset(&wifiSettings, 0, sizeof(wifiSettings));
-  if (LittleFS.exists(configFileName)) {
-    LittleFS.remove(configFileName);
+  if (fs.exists(configFileName)) {
+    fs.remove(configFileName);
   }
   Serial.println("All WiFi settings have been deleted.");
 }

examples/Settings/MultiWiFi/SinricProWiFiSettings.h

@@ -1,8 +1,7 @@
 #pragma once
 
 #include <Arduino.h>
-#include "FS.h"
-#include "LittleFS.h"
+#include <FS.h>
 
 
 /**
@@ -26,7 +25,8 @@ class SinricProWiFiSettings {
    * @param defaultSecondaryPassword Default secondary password.
    * @param configFileName File name for storing WiFi settings.
    */
-  SinricProWiFiSettings(const char* defaultPrimarySSID, const char* defaultPrimaryPassword,
+  SinricProWiFiSettings(fs::FS& fs,
+                        const char* defaultPrimarySSID, const char* defaultPrimaryPassword,
                         const char* defaultSecondarySSID, const char* defaultSecondaryPassword,
                         const char* configFileName);
 
@@ -71,6 +71,7 @@ class SinricProWiFiSettings {
   const wifi_settings_t& getWiFiSettings() const;
 
 private:
+  fs::FS& fs;                            // filesystem to be used
   const char* defaultPrimarySSID;        ///< Default primary SSID.
   const char* defaultPrimaryPassword;    ///< Default primary password.
   const char* defaultSecondarySSID;      ///< Default secondary SSID.