From c432792300076962357f16d5d37e016ba8fde387 Mon Sep 17 00:00:00 2001 From: Rune Harlyk Date: Thu, 11 Jul 2024 21:28:54 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=8D=20Makes=20sveltekit=20run=20arduin?= =?UTF-8?q?o=20task=20loop?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- esp32/lib/ESP32-sveltekit/ESP32SvelteKit.cpp | 4 +--- esp32/lib/ESP32-sveltekit/ESP32SvelteKit.h | 4 ++-- esp32/src/main.cpp | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/esp32/lib/ESP32-sveltekit/ESP32SvelteKit.cpp b/esp32/lib/ESP32-sveltekit/ESP32SvelteKit.cpp index 46353b8..0656467 100644 --- a/esp32/lib/ESP32-sveltekit/ESP32SvelteKit.cpp +++ b/esp32/lib/ESP32-sveltekit/ESP32SvelteKit.cpp @@ -83,8 +83,6 @@ void ESP32SvelteKit::begin() { startServices(); ESP_LOGV("ESP32SvelteKit", "Starting loop task"); - _taskManager.createTask(this->_loopImpl, "Spot main", 4096, this, (tskIDLE_PRIORITY + 1), NULL, - ESP32SVELTEKIT_RUNNING_CORE); } void ESP32SvelteKit::setupServer() { @@ -204,7 +202,7 @@ void ESP32SvelteKit::startServices() { #endif } -void IRAM_ATTR ESP32SvelteKit::_loop() { +void IRAM_ATTR ESP32SvelteKit::loop() { while (1) { _wifiSettingsService.loop(); _apSettingsService.loop(); diff --git a/esp32/lib/ESP32-sveltekit/ESP32SvelteKit.h b/esp32/lib/ESP32-sveltekit/ESP32SvelteKit.h index 14fe482..2f61dbd 100644 --- a/esp32/lib/ESP32-sveltekit/ESP32SvelteKit.h +++ b/esp32/lib/ESP32-sveltekit/ESP32SvelteKit.h @@ -128,6 +128,8 @@ class ESP32SvelteKit { void recoveryMode() { _apSettingsService.recoveryMode(); } + void loop(); + private: PsychicHttpServer *_server; unsigned int _numberEndpoints; @@ -184,8 +186,6 @@ class ESP32SvelteKit { String _appName = APP_NAME; protected: - static void _loopImpl(void *_this) { static_cast(_this)->_loop(); } - void _loop(); void setupServer(); void setupMDNS(); void startServices(); diff --git a/esp32/src/main.cpp b/esp32/src/main.cpp index fb473af..5b96eb3 100644 --- a/esp32/src/main.cpp +++ b/esp32/src/main.cpp @@ -13,4 +13,4 @@ void setup() { spot.begin(); } -void loop() { vTaskDelete(NULL); } +void loop() { spot.loop(); }