diff --git a/src/drv/touch/touch_driver_tftespi.h b/src/drv/touch/touch_driver_tftespi.h index 322b6e45..4762844a 100644 --- a/src/drv/touch/touch_driver_tftespi.h +++ b/src/drv/touch/touch_driver_tftespi.h @@ -1,10 +1,10 @@ -/* MIT License - Copyright (c) 2019-2022 Francis Van Roie +/* MIT License - Copyright (c) 2019-2023 Francis Van Roie For full license information read the LICENSE file in the project folder */ #ifndef HASP_TFTESPI_TOUCH_DRIVER_H #define HASP_TFTESPI_TOUCH_DRIVER_H -#ifdef ARDUINO&& defined(USER_SETUP_LOADED) +#ifdef ARDUINO && defined(USER_SETUP_LOADED) #include #include "touch_driver.h" // base class diff --git a/src/hasp_debug.cpp b/src/hasp_debug.cpp index befc10ca..a08ee97e 100644 --- a/src/hasp_debug.cpp +++ b/src/hasp_debug.cpp @@ -1,4 +1,4 @@ -/* MIT License - Copyright (c) 2019-2022 Francis Van Roie +/* MIT License - Copyright (c) 2019-2023 Francis Van Roie For full license information read the LICENSE file in the project folder */ #include "hasplib.h" @@ -364,6 +364,13 @@ static void debugPrintLvglMemory(int level, Print* _logOutput) #endif // LV_MEM_CUSTOM } +#if defined(ESP32) && defined(HASP_LOG_TASKS) +static void debugPrintTaskName(int level, Print* _logOutput) +{ + debug_print(_logOutput, "[%s%6u]", pcTaskGetTaskName(NULL), uxTaskGetStackHighWaterMark(NULL)); +} +#endif + static void debugPrintPriority(int level, Print* _logOutput) { switch(level) { @@ -408,6 +415,9 @@ void debugPrintPrefix(uint8_t tag, int level, Print* _logOutput) debugPrintTimestamp(level, _logOutput); debugPrintHaspMemory(level, _logOutput); debugPrintLvglMemory(level, _logOutput); +#if defined(ESP32) && defined(HASP_LOG_TASKS) + debugPrintTaskName(level, _logOutput); +#endif if(tag == TAG_MQTT_PUB && level == LOG_LEVEL_NOTICE) { debugSendAnsiCode(F(TERM_COLOR_GREEN), _logOutput); diff --git a/src/sys/svc/hasp_http.cpp b/src/sys/svc/hasp_http.cpp index b38cf759..11736084 100644 --- a/src/sys/svc/hasp_http.cpp +++ b/src/sys/svc/hasp_http.cpp @@ -848,7 +848,6 @@ static void webHandleInfoJson() { // Send Content String htmldata((char*)0); htmldata.reserve(HTTP_PAGE_SIZE); - StaticJsonDocument<1024> doc; htmldata += F("

"); htmldata += haspDevice.get_hostname();