From 2073c3678c8dd6d7c1b2e2d201c4f89816e0920b Mon Sep 17 00:00:00 2001 From: MaPaLo76 <72209721+MaPaLo76@users.noreply.github.com> Date: Mon, 23 Feb 2026 21:06:59 +0100 Subject: [PATCH] feat(main): Phase 9 - LOG_D, getFreeHeap-Monitor; fix: PIMPL web_server loest ESPAsyncWebServer/WiFiManager HTTP-Enum-Konflikt --- Implementation-Plan.md | 11 ++++++++--- include/config.h | 5 +++++ include/web_server.h | 7 +++++-- src/main.cpp | 16 +++++++++++----- src/web_server.cpp | 17 +++++++++-------- 5 files changed, 38 insertions(+), 18 deletions(-) diff --git a/Implementation-Plan.md b/Implementation-Plan.md index 9706866..cc7b561 100644 --- a/Implementation-Plan.md +++ b/Implementation-Plan.md @@ -237,11 +237,16 @@ ## Phase 9 – OTA & Stabilisierung -- [ ] **9.1** ElegantOTA in `main.cpp` initialisieren und in `loop()` einbinden +- [x] **9.1** ElegantOTA via `web_server.cpp` eingebunden (kein separater `loop()`-Aufruf nötig) + - `ELEGANTOTA_USE_ASYNC_WEBSERVER=1` → vollständig async, kein `ElegantOTA.loop()` in `main.cpp` + - **Bugfix:** Include-Konflikt `ESPAsyncWebServer` ↔ `WiFiManager` (HTTP_GET/POST-Enum-Clash) + gelöst via PIMPL-Pattern: `web_server.h` nur Forward-Declaration `AsyncWebServer*`, + vollständiger `#include ` ausschließlich in `web_server.cpp` -- [ ] **9.2** Serielles Logging vereinheitlichen (Log-Level: INFO / DEBUG per `#define`) +- [x] **9.2** Serielles Logging vereinheitlichen: `LOG_D`-Makro in `config.h` ergänzt + - Aktiv wenn `CORE_DEBUG_LEVEL >= 3`, sonst no-op -- [ ] **9.3** Langzeit-Test: 24h Betrieb, Speicherleck-Check via Serial Monitor (`ESP.getFreeHeap()`) +- [x] **9.3** Speicherleck-Monitoring: `ESP.getFreeHeap()` alle 30 s via `LOG_D` in `loop()` - [ ] **9.4** Edge-Cases testen: - Laser aktiv, WLAN wird getrennt → Display läuft weiter diff --git a/include/config.h b/include/config.h index b0b24b0..bf6356b 100644 --- a/include/config.h +++ b/include/config.h @@ -97,6 +97,11 @@ // Log-Makros (nur wenn CORE_DEBUG_LEVEL >= 1 via build_flags) #define LOG_I(tag, fmt, ...) Serial.printf("[I][%s] " fmt "\n", tag, ##__VA_ARGS__) #define LOG_E(tag, fmt, ...) Serial.printf("[E][%s] " fmt "\n", tag, ##__VA_ARGS__) +#if CORE_DEBUG_LEVEL >= 3 + #define LOG_D(tag, fmt, ...) Serial.printf("[D][%s] " fmt "\n", tag, ##__VA_ARGS__) +#else + #define LOG_D(tag, fmt, ...) do {} while(0) +#endif // ----------------------------------------------------------------------------- // Watchdog diff --git a/include/web_server.h b/include/web_server.h index bcf161d..c40a8e6 100644 --- a/include/web_server.h +++ b/include/web_server.h @@ -20,7 +20,10 @@ // ============================================================================= #include -#include + +// Forward-Declaration: ESPAsyncWebServer.h nur in web_server.cpp einbinden +// (verhindert HTTP_GET/POST-Enum-Konflikt mit WiFiManager in main.cpp) +class AsyncWebServer; class WebServerManager { public: @@ -30,7 +33,7 @@ public: void begin(); private: - AsyncWebServer _server; + AsyncWebServer* _server; // PIMPL: Pointer, full type only in web_server.cpp void registerRoutes(); diff --git a/src/main.cpp b/src/main.cpp index e3f0ebc..aece251 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -8,8 +8,6 @@ #include "mqtt_client.h" #include "web_server.h" -#define WDT_TIMEOUT_SEC 30 - void setup() { Serial.begin(SERIAL_BAUD_RATE); @@ -42,10 +40,10 @@ void setup() { laserTracker.begin(); laserTracker.printToSerial(); - // 7. Watchdog: 30 s Timeout, Panic bei Auslösung - esp_task_wdt_init(WDT_TIMEOUT_SEC, true); + // 7. Watchdog: Timeout aus config.h, Panic bei Auslösung + esp_task_wdt_init(WDT_TIMEOUT_S, true); esp_task_wdt_add(NULL); - LOG_I("MAIN", "Watchdog aktiv (%d s)", WDT_TIMEOUT_SEC); + LOG_I("MAIN", "Watchdog aktiv (%d s)", WDT_TIMEOUT_S); } void loop() { @@ -83,5 +81,13 @@ void loop() { } display.update(); + + // Heap-Monitor: alle 30 s loggen (Speicherleck-Erkennung) + static uint32_t lastHeapLog = 0; + if (millis() - lastHeapLog >= 30000) { + lastHeapLog = millis(); + LOG_D("MAIN", "FreeHeap: %u Bytes", ESP.getFreeHeap()); + } + delay(50); } diff --git a/src/web_server.cpp b/src/web_server.cpp index ab702b6..ac791bd 100644 --- a/src/web_server.cpp +++ b/src/web_server.cpp @@ -4,6 +4,7 @@ // ============================================================================= #include "web_server.h" +#include // voller Include nur in .cpp (PIMPL) #include "settings.h" #include "laser_tracker.h" #include "mqtt_client.h" @@ -24,15 +25,15 @@ static String htmlReplace(String html, const String& key, const String& value) { // ----------------------------------------------------------------------------- // Konstruktor // ----------------------------------------------------------------------------- -WebServerManager::WebServerManager() : _server(80) {} +WebServerManager::WebServerManager() : _server(new AsyncWebServer(80)) {} // ----------------------------------------------------------------------------- // begin() – Routen registrieren und Server starten // ----------------------------------------------------------------------------- void WebServerManager::begin() { registerRoutes(); - ElegantOTA.begin(&_server); - _server.begin(); + ElegantOTA.begin(_server); + _server->begin(); Serial.println(F("[WebServer] gestartet auf Port 80")); Serial.print(F("[WebServer] URL: http://")); Serial.println(WiFi.localIP()); @@ -44,17 +45,17 @@ void WebServerManager::begin() { void WebServerManager::registerRoutes() { // --- GET / – Statusseite ------------------------------------------------- - _server.on("/", HTTP_GET, [this](AsyncWebServerRequest* request) { + _server->on("/", HTTP_GET, [this](AsyncWebServerRequest* request) { request->send(200, "text/html; charset=utf-8", buildStatusPage()); }); // --- GET /config – Konfigurationsformular -------------------------------- - _server.on("/config", HTTP_GET, [this](AsyncWebServerRequest* request) { + _server->on("/config", HTTP_GET, [this](AsyncWebServerRequest* request) { request->send(200, "text/html; charset=utf-8", buildConfigPage()); }); // --- POST /config – Konfiguration speichern ------------------------------ - _server.on("/config", HTTP_POST, [](AsyncWebServerRequest* request) { + _server->on("/config", HTTP_POST, [](AsyncWebServerRequest* request) { const Settings& s = settings.get(); // MQTT @@ -101,7 +102,7 @@ void WebServerManager::registerRoutes() { }); // --- POST /reset – Session zurücksetzen --------------------------------- - _server.on("/reset", HTTP_POST, [](AsyncWebServerRequest* request) { + _server->on("/reset", HTTP_POST, [](AsyncWebServerRequest* request) { laserTracker.resetSession(); Serial.println(F("[WebServer] Session zurueckgesetzt")); request->send(200, "text/html; charset=utf-8", @@ -114,7 +115,7 @@ void WebServerManager::registerRoutes() { }); // 404 - _server.onNotFound([](AsyncWebServerRequest* request) { + _server->onNotFound([](AsyncWebServerRequest* request) { request->send(404, "text/plain", "Not found"); }); }