🏫 Collects all config file paths in espfs

2024-09-03 18:14:51 +02:00
parent db203e1503
commit 2bffac6558
8 changed files with 16 additions and 24 deletions
@@ -21,6 +21,7 @@
 #include <JsonUtils.h>
 #include <WiFi.h>
 #include <Timing.h>
+#include <ESPFS.h>

 #include <DNSServer.h>
 #include <IPAddress.h>
@@ -61,7 +62,6 @@
 #define FACTORY_AP_MAX_CLIENTS 4
 #endif

-#define AP_SETTINGS_FILE "/config/apSettings.json"
 #define AP_SETTINGS_SERVICE_PATH "/api/apSettings"

 #define AP_MODE_ALWAYS 0
@@ -13,8 +13,8 @@ namespace Camera {
 #include <SettingValue.h>
 #include <StatefulService.h>
 #include <esp_camera.h>
+#include <ESPFS.h>

-#define CAMERA_SETTINGS_FILE "/config/cameraSettings.json"
 #define EVENT_CAMERA_SETTINGS "CameraSettings"
 #define CAMERA_SETTINGS_PATH "/api/camera/settings"

@@ -1,21 +1,13 @@
-#ifndef ESPFS_H_
-#define ESPFS_H_
-
-/**
- *   ESP32 SvelteKit
- *
- *   A simple, secure and extensible framework for IoT projects for ESP32 platforms
- *   with responsive Sveltekit front-end built with TailwindCSS and DaisyUI.
- *   https://github.com/theelims/ESP32-sveltekit
- *
- *   Copyright (C) 2018 - 2023 rjwats
- *   Copyright (C) 2023 theelims
- *
- *   All Rights Reserved. This software may be modified and distributed under
- *   the terms of the LGPL v3 license. See the LICENSE file for details.
- **/
+#pragma once

 #include <LittleFS.h>
+
 #define ESPFS LittleFS

-#endif
+#define AP_SETTINGS_FILE "/config/apSettings.json"
+#define CAMERA_SETTINGS_FILE "/config/cameraSettings.json"
+#define FS_CONFIG_DIRECTORY "/config"
+#define NTP_SETTINGS_FILE "/config/ntpSettings.json"
+#define DEVICE_CONFIG_FILE "/config/peripheral.json"
+#define SECURITY_SETTINGS_FILE "/config/securitySettings.json"
+#define WIFI_SETTINGS_FILE "/config/wifiSettings.json"
@@ -21,8 +21,8 @@
 #include <SecurityManager.h>
 #include <RestartService.h>
 #include <FS.h>
+#include <ESPFS.h>

-#define FS_CONFIG_DIRECTORY "/config"
 #define FACTORY_RESET_SERVICE_PATH "/api/factoryReset"

 class FactoryResetService {
@@ -18,6 +18,7 @@
 #include <HttpEndpoint.h>
 #include <FSPersistence.h>
 #include <WiFi.h>
+#include <ESPFS.h>

 #include <time.h>
 #include <lwip/apps/sntp.h>
@@ -38,7 +39,6 @@
 #define FACTORY_NTP_SERVER "time.google.com"
 #endif

-#define NTP_SETTINGS_FILE "/config/ntpSettings.json"
 #define NTP_SETTINGS_SERVICE_PATH "/api/ntpSettings"

 #define TIME_PATH "/api/time"
@@ -8,6 +8,7 @@
 #include <StatefulService.h>
 #include <MathUtils.h>
 #include <Timing.h>
+#include <ESPFS.h>

 #include <list>
 #include <SPI.h>
@@ -21,7 +22,6 @@
 #include <Adafruit_ADS1X15.h>
 #include <NewPing.h>

-#define DEVICE_CONFIG_FILE "/config/peripheral.json"
 #define EVENT_CONFIGURATION_SETTINGS "peripheralSettings"
 #define CONFIGURATION_SETTINGS_PATH "/api/peripheral/settings"

@@ -20,6 +20,7 @@
 #include <SecurityManager.h>
 #include <HttpEndpoint.h>
 #include <FSPersistence.h>
+#include <ESPFS.h>

 #ifndef FACTORY_JWT_SECRET
 #define FACTORY_JWT_SECRET "#{random}-#{random}"
@@ -41,7 +42,6 @@
 #define FACTORY_GUEST_PASSWORD "guest"
 #endif

-#define SECURITY_SETTINGS_FILE "/config/securitySettings.json"
 #define SECURITY_SETTINGS_PATH "/api/securitySettings"

 #define GENERATE_TOKEN_PATH "/api/generateToken"
@@ -28,6 +28,7 @@
 #include <WiFiMulti.h>
 #include <vector>
 #include <Timing.h>
+#include <ESPFS.h>

 #ifndef FACTORY_WIFI_SSID
 #define FACTORY_WIFI_SSID ""
@@ -45,7 +46,6 @@
 #define FACTORY_WIFI_RSSI_THRESHOLD -80
 #endif

-#define WIFI_SETTINGS_FILE "/config/wifiSettings.json"
 #define WIFI_SETTINGS_SERVICE_PATH "/api/wifiSettings"

 #define WIFI_RECONNECTION_DELAY 1000 * 30