Darkages/SpotMicroESP32-Leika
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleans up ESP32Sveltekit header

Browse Source
This commit is contained in:
Rune Harlyk
2024-04-22 23:40:09 +02:00
committed by Rune Harlyk
parent d800c8612f
commit 7e521235f4
1 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esp32/lib/ESP32-sveltekit/ESP32SvelteKit.cpp
+8 -14
View File
@@ -79,9 +79,7 @@ void ESP32SvelteKit::setupServer() {
_server->listen(80); _server->listen(80);
#ifdef EMBED_WWW #ifdef EMBED_WWW
// Serve static resources from PROGMEM ESP_LOGV("ESP32SvelteKit","Registering routes from PROGMEM static resources");
ESP_LOGV("ESP32SvelteKit",
"Registering routes from PROGMEM static resources");
WWWData::registerRoutes([&](const String &uri, const String &contentType, const uint8_t *content, size_t len) { WWWData::registerRoutes([&](const String &uri, const String &contentType, const uint8_t *content, size_t len) {
PsychicHttpRequestCallback requestHandler = [contentType, content, len](PsychicRequest *request) { PsychicHttpRequestCallback requestHandler = [contentType, content, len](PsychicRequest *request) {
PsychicResponse response(request); PsychicResponse response(request);
@@ -125,14 +123,11 @@ void ESP32SvelteKit::setupServer() {
#if defined(ENABLE_CORS) #if defined(ENABLE_CORS)
ESP_LOGV("ESP32SvelteKit", "Enabling CORS headers"); ESP_LOGV("ESP32SvelteKit", "Enabling CORS headers");
DefaultHeaders::Instance().addHeader("Access-Control-Allow-Origin", DefaultHeaders::Instance().addHeader("Access-Control-Allow-Origin", CORS_ORIGIN);
CORS_ORIGIN); DefaultHeaders::Instance().addHeader("Access-Control-Allow-Headers", "Accept, Content-Type, Authorization");
DefaultHeaders::Instance().addHeader("Access-Control-Allow-Headers", DefaultHeaders::Instance().addHeader("Access-Control-Allow-Credentials", "true");
"Accept, Content-Type, Authorization");
DefaultHeaders::Instance().addHeader("Access-Control-Allow-Credentials",
"true");
DefaultHeaders::Instance().addHeader("Server", _appName);
#endif #endif
DefaultHeaders::Instance().addHeader("Server", _appName);
} }
void ESP32SvelteKit::setupMDNS() { void ESP32SvelteKit::setupMDNS() {
@@ -145,7 +140,6 @@ void ESP32SvelteKit::setupMDNS() {
} }
void ESP32SvelteKit::startServices() { void ESP32SvelteKit::startServices() {
// Start the services
_apStatus.begin(); _apStatus.begin();
_socket.begin(); _socket.begin();
_apSettingsService.begin(); _apSettingsService.begin();
@@ -188,10 +182,10 @@ void ESP32SvelteKit::startServices() {
void ESP32SvelteKit::_loop() { void ESP32SvelteKit::_loop() {
while (1) { while (1) {
_wifiSettingsService.loop(); // 30 seconds _wifiSettingsService.loop();
_apSettingsService.loop(); // 10 seconds _apSettingsService.loop();
#if FT_ENABLED(FT_MQTT) #if FT_ENABLED(FT_MQTT)
_mqttSettingsService.loop(); // 5 seconds _mqttSettingsService.loop();
#endif #endif
vTaskDelay(20 / portTICK_PERIOD_MS); vTaskDelay(20 / portTICK_PERIOD_MS);
} }