From 386f1c627daff0fbf31f489a680e2ee5fcc24d1a Mon Sep 17 00:00:00 2001 From: Rune Harlyk Date: Fri, 8 Nov 2024 17:24:06 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=B9=20Renames=20member?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- esp32/lib/ESP32-sveltekit/CameraSettingsService.h | 6 +++--- esp32/lib/ESP32-sveltekit/ESP32SvelteKit.cpp | 3 --- esp32/lib/ESP32-sveltekit/Peripherals.h | 8 ++++---- esp32/lib/ESP32-sveltekit/ServoController.h | 6 +++--- esp32/lib/ESP32-sveltekit/ap_service.cpp | 4 ++-- esp32/lib/ESP32-sveltekit/ap_service.h | 2 +- esp32/lib/ESP32-sveltekit/wifi_service.cpp | 4 ++-- esp32/lib/ESP32-sveltekit/wifi_service.h | 2 +- 8 files changed, 16 insertions(+), 19 deletions(-) diff --git a/esp32/lib/ESP32-sveltekit/CameraSettingsService.h b/esp32/lib/ESP32-sveltekit/CameraSettingsService.h index f25a2fe..90e186e 100644 --- a/esp32/lib/ESP32-sveltekit/CameraSettingsService.h +++ b/esp32/lib/ESP32-sveltekit/CameraSettingsService.h @@ -24,13 +24,13 @@ class CameraSettingsService : public StatefulService { CameraSettingsService() : endpoint(CameraSettings::read, CameraSettings::update, this), _eventEndpoint(CameraSettings::read, CameraSettings::update, this, EVENT_CAMERA_SETTINGS), - _fsPersistence(CameraSettings::read, CameraSettings::update, this, &ESPFS, CAMERA_SETTINGS_FILE) { + _persistence(CameraSettings::read, CameraSettings::update, this, &ESPFS, CAMERA_SETTINGS_FILE) { addUpdateHandler([&](const String &originId) { updateCamera(); }, false); } void begin() { _eventEndpoint.begin(); - _fsPersistence.readFromFS(); + _persistence.readFromFS(); sensor_t *s = safe_sensor_get(); _state.pixformat = s->pixformat; _state.framesize = s->status.framesize; @@ -98,7 +98,7 @@ class CameraSettingsService : public StatefulService { private: EventEndpoint _eventEndpoint; - FSPersistence _fsPersistence; + FSPersistence _persistence; }; } // namespace Camera diff --git a/esp32/lib/ESP32-sveltekit/ESP32SvelteKit.cpp b/esp32/lib/ESP32-sveltekit/ESP32SvelteKit.cpp index 28db866..6fe63c7 100644 --- a/esp32/lib/ESP32-sveltekit/ESP32SvelteKit.cpp +++ b/esp32/lib/ESP32-sveltekit/ESP32SvelteKit.cpp @@ -205,9 +205,6 @@ void ESP32SvelteKit::startServices() { #if FT_ENABLED(USE_UPLOAD_FIRMWARE) _uploadFirmwareService.begin(); #endif -#if FT_ENABLED(USE_DOWNLOAD_FIRMWARE) - _downloadFirmwareService.begin(); -#endif #if FT_ENABLED(USE_NTP) _ntpService.begin(); #endif diff --git a/esp32/lib/ESP32-sveltekit/Peripherals.h b/esp32/lib/ESP32-sveltekit/Peripherals.h index 3d4da27..6411658 100644 --- a/esp32/lib/ESP32-sveltekit/Peripherals.h +++ b/esp32/lib/ESP32-sveltekit/Peripherals.h @@ -68,15 +68,15 @@ class Peripherals : public StatefulService { #if FT_ENABLED(USE_BMP) _bmp(10085), #endif - _fsPersistence(PeripheralsConfiguration::read, PeripheralsConfiguration::update, this, &ESPFS, - DEVICE_CONFIG_FILE) { + _persistence(PeripheralsConfiguration::read, PeripheralsConfiguration::update, this, &ESPFS, + DEVICE_CONFIG_FILE) { _accessMutex = xSemaphoreCreateMutex(); addUpdateHandler([&](const String &originId) { updatePins(); }, false); }; void begin() { _eventEndpoint.begin(); - _fsPersistence.readFromFS(); + _persistence.readFromFS(); socket.onEvent(EVENT_I2C_SCAN, [&](JsonObject &root, int originId) { scanI2C(); @@ -399,7 +399,7 @@ class Peripherals : public StatefulService { private: EventEndpoint _eventEndpoint; - FSPersistence _fsPersistence; + FSPersistence _persistence; SemaphoreHandle_t _accessMutex; inline void beginTransaction() { xSemaphoreTakeRecursive(_accessMutex, portMAX_DELAY); } diff --git a/esp32/lib/ESP32-sveltekit/ServoController.h b/esp32/lib/ESP32-sveltekit/ServoController.h index 419c200..53e76f8 100644 --- a/esp32/lib/ESP32-sveltekit/ServoController.h +++ b/esp32/lib/ESP32-sveltekit/ServoController.h @@ -21,13 +21,13 @@ class ServoController : public StatefulService { : _server(server), _peripherals(peripherals), endpoint(ServoSettings::read, ServoSettings::update, this), - _fsPersistence(ServoSettings::read, ServoSettings::update, this, &ESPFS, SERVO_SETTINGS_FILE) {} + _persistence(ServoSettings::read, ServoSettings::update, this, &ESPFS, SERVO_SETTINGS_FILE) {} void begin() { socket.onEvent(EVENT_SERVO_CONFIGURATION_SETTINGS, [&](JsonObject &root, int originId) { servoEvent(root, originId); }); socket.onEvent(EVENT_SERVO_STATE, [&](JsonObject &root, int originId) { stateUpdate(root, originId); }); - _fsPersistence.readFromFS(); + _persistence.readFromFS(); } void stateUpdate(JsonObject &root, int originId) { @@ -85,7 +85,7 @@ class ServoController : public StatefulService { private: PsychicHttpServer *_server; Peripherals *_peripherals; - FSPersistence _fsPersistence; + FSPersistence _persistence; bool is_active {true}; constexpr static int ServoInterval = 2; diff --git a/esp32/lib/ESP32-sveltekit/ap_service.cpp b/esp32/lib/ESP32-sveltekit/ap_service.cpp index 03d0560..0cd3d11 100644 --- a/esp32/lib/ESP32-sveltekit/ap_service.cpp +++ b/esp32/lib/ESP32-sveltekit/ap_service.cpp @@ -4,13 +4,13 @@ static const char *TAG = "APService"; APService::APService() : endpoint(APSettings::read, APSettings::update, this), - _fsPersistence(APSettings::read, APSettings::update, this, &ESPFS, NTP_SETTINGS_FILE) { + _persistence(APSettings::read, APSettings::update, this, &ESPFS, NTP_SETTINGS_FILE) { addUpdateHandler([&](const String &originId) { reconfigureAP(); }, false); } APService::~APService() {} -void APService::begin() { _fsPersistence.readFromFS(); } +void APService::begin() { _persistence.readFromFS(); } esp_err_t APService::getStatus(PsychicRequest *request) { PsychicJsonResponse response = PsychicJsonResponse(request, false); diff --git a/esp32/lib/ESP32-sveltekit/ap_service.h b/esp32/lib/ESP32-sveltekit/ap_service.h index c204226..4d760ac 100644 --- a/esp32/lib/ESP32-sveltekit/ap_service.h +++ b/esp32/lib/ESP32-sveltekit/ap_service.h @@ -22,7 +22,7 @@ class APService : public StatefulService { private: PsychicHttpServer *_server; - FSPersistence _fsPersistence; + FSPersistence _persistence; DNSServer *_dnsServer; diff --git a/esp32/lib/ESP32-sveltekit/wifi_service.cpp b/esp32/lib/ESP32-sveltekit/wifi_service.cpp index c8976e0..bb51510 100644 --- a/esp32/lib/ESP32-sveltekit/wifi_service.cpp +++ b/esp32/lib/ESP32-sveltekit/wifi_service.cpp @@ -2,7 +2,7 @@ WiFiService::WiFiService() : endpoint(WiFiSettings::read, WiFiSettings::update, this), - _fsPersistence(WiFiSettings::read, WiFiSettings::update, this, &ESPFS, WIFI_SETTINGS_FILE) { + _persistence(WiFiSettings::read, WiFiSettings::update, this, &ESPFS, WIFI_SETTINGS_FILE) { addUpdateHandler([&](const String &originId) { reconfigureWiFiConnection(); }, false); } @@ -21,7 +21,7 @@ void WiFiService::begin() { WiFi.onEvent(onStationModeGotIP, WiFiEvent_t::ARDUINO_EVENT_WIFI_STA_GOT_IP); - _fsPersistence.readFromFS(); + _persistence.readFromFS(); reconfigureWiFiConnection(); } diff --git a/esp32/lib/ESP32-sveltekit/wifi_service.h b/esp32/lib/ESP32-sveltekit/wifi_service.h index c79e324..3a4becd 100644 --- a/esp32/lib/ESP32-sveltekit/wifi_service.h +++ b/esp32/lib/ESP32-sveltekit/wifi_service.h @@ -20,7 +20,7 @@ class WiFiService : public StatefulService { void onStationModeStop(WiFiEvent_t event, WiFiEventInfo_t info); static void onStationModeGotIP(WiFiEvent_t event, WiFiEventInfo_t info); - FSPersistence _fsPersistence; + FSPersistence _persistence; void reconfigureWiFiConnection(); void manageSTA();