From 88698146ef72eb297c6713210cda40a45513447f Mon Sep 17 00:00:00 2001 From: mikee47 Date: Mon, 25 Nov 2024 12:33:51 +0000 Subject: [PATCH] Revert "Add current task name to debug_x output" This reverts commit e1ea5785af17d99aa55a30325c189c6750abf2cc. --- .../Arch/Esp32/Components/esp32/src/include/esp_system.h | 2 -- Sming/Arch/Esp32/Components/esp32/src/system.cpp | 5 ----- Sming/System/include/debug_progmem.h | 8 -------- 3 files changed, 15 deletions(-) diff --git a/Sming/Arch/Esp32/Components/esp32/src/include/esp_system.h b/Sming/Arch/Esp32/Components/esp32/src/include/esp_system.h index 0d8f292047..9531516ba2 100644 --- a/Sming/Arch/Esp32/Components/esp32/src/include/esp_system.h +++ b/Sming/Arch/Esp32/Components/esp32/src/include/esp_system.h @@ -58,8 +58,6 @@ unsigned long os_random(void); int os_get_random(unsigned char* buf, size_t len); -const char* os_get_task_name(); - #ifdef __cplusplus } #endif diff --git a/Sming/Arch/Esp32/Components/esp32/src/system.cpp b/Sming/Arch/Esp32/Components/esp32/src/system.cpp index 15e11a2a69..5977deb7d9 100644 --- a/Sming/Arch/Esp32/Components/esp32/src/system.cpp +++ b/Sming/Arch/Esp32/Components/esp32/src/system.cpp @@ -119,8 +119,3 @@ int WEAK_ATTR os_get_random(unsigned char* buf, size_t len) esp_fill_random(buf, len); return 0; } - -const char* os_get_task_name() -{ - return pcTaskGetName(xTaskGetCurrentTaskHandle()); -} diff --git a/Sming/System/include/debug_progmem.h b/Sming/System/include/debug_progmem.h index b42ad48da2..71a011c383 100644 --- a/Sming/System/include/debug_progmem.h +++ b/Sming/System/include/debug_progmem.h @@ -22,8 +22,6 @@ extern "C" { #endif -extern const char* os_get_task_name(); - //This enables or disables logging //Can be overridden in Makefile #ifndef DEBUG_BUILD @@ -75,12 +73,6 @@ extern uint32_t system_get_time(); PSTR_ARRAY(fmtbuf, "[" MACROQUOTE(CUST_FILE_BASE) ":%d] " fmt "\r\n"); \ m_printf(fmtbuf, __LINE__, ##__VA_ARGS__); \ })) -#elif defined(ARCH_ESP32) -#define debug_e(fmt, ...) \ - (__extension__({ \ - PSTR_ARRAY(fmtbuf, "%u %s " fmt "\r\n"); \ - m_printf(fmtbuf, system_get_time(), os_get_task_name(), ##__VA_ARGS__); \ - })) #else #define debug_e(fmt, ...) \ (__extension__({ \