jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-27 20:56:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix conflicting log_level definitions (#21337)

Browse Source
This commit is contained in:
Christian Baars 2024-05-03 23:25:41 +02:00 committed by GitHub
parent 1d7498d0b8
commit fffb43fa79
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/libesp32_div/esp-nimble-cpp/src/NimBLELog.h
View File

@ -38,6 +38,19 @@
# define NIMBLE_LOGC(tag, format, ...) \ # define NIMBLE_LOGC(tag, format, ...) \
NIMBLE_CPP_LOG_PRINT(ESP_LOG_ERROR, tag, format, ##__VA_ARGS__) NIMBLE_CPP_LOG_PRINT(ESP_LOG_ERROR, tag, format, ##__VA_ARGS__)
// These defines pollute the global namespace and conflict with Tasmota and basically always turn on `seriallog 3`
#ifdef LOG_LEVEL_DEBUG
#undef LOG_LEVEL_DEBUG
#endif
#ifdef LOG_LEVEL_INFO
#undef LOG_LEVEL_INFO
#endif
#ifdef LOG_LEVEL_ERROR
#undef LOG_LEVEL_ERROR
#endif
#else // using Arduino #else // using Arduino
# include "nimble/porting/nimble/include/syscfg/syscfg.h" # include "nimble/porting/nimble/include/syscfg/syscfg.h"
# include "nimble/console/console.h" # include "nimble/console/console.h"

7
tasmota/tasmota_xsns_sensor/xsns_62_esp32_mi.ino
View File

@ -60,13 +60,6 @@
#define XSNS_62 62 #define XSNS_62 62
// undefine "trash" from the NimBLE stack, that collides with Tasmotas enum
#undef LOG_LEVEL_DEBUG
#undef LOG_LEVEL_NONE
#undef LOG_LEVEL_ERROR
#undef LOG_LEVEL_INFO
#undef LOG_LEVEL_DEBUG
#undef LOG_LEVEL_DEBUG_MORE
#include <vector> #include <vector>
#include "freertos/ringbuf.h" #include "freertos/ringbuf.h"