Skip to content

Commit a9b80de

Browse files
committed
Rename ESP3D_DEBUG_LEVEL to ESP3D_LOG_LEVEL for consistency
1 parent 693f31f commit a9b80de

2 files changed

Lines changed: 15 additions & 11 deletions

File tree

esp3d/configuration.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -657,7 +657,7 @@
657657
// LOG_OUTPUT_WEBSOCKET
658658
// #define ESP_LOG_FEATURE LOG_OUTPUT_SERIAL0
659659

660-
// #define ESP3D_DEBUG_LEVEL LOG_LEVEL_DEBUG
660+
// #define ESP3D_LOG_LEVEL LOG_LEVEL_DEBUG
661661

662662
#ifdef ESP_LOG_FEATURE
663663
#define LOG_ESP3D_BAUDRATE 115200

esp3d/src/core/esp3d_log.h

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,31 +30,35 @@ extern void esp3d_network_log_end();
3030

3131
extern void esp3d_log_init();
3232

33-
#if !defined(ESP3D_DEBUG_LEVEL)
34-
#define ESP3D_DEBUG_LEVEL LOG_LEVEL_NONE
35-
#endif // ESP3D_DEBUG_LEVEL
33+
#if !defined(ESP3D_LOG_LEVEL) && defined(ESP_DEBUG_FEATURE)
34+
#error "ESP3D_LOG_LEVEL is not defined, please define it in configuration.h"
35+
#endif // !defined(ESP3D_LOG_LEVEL) && defined(ESP_DEBUG_FEATURE)
36+
37+
#if !defined(ESP3D_LOG_LEVEL)
38+
#define ESP3D_LOG_LEVEL LOG_LEVEL_NONE
39+
#endif // ESP3D_LOG_LEVEL
3640
#if defined(ARDUINO_ARCH_ESP8266)
3741
// no need with latest esp8266 core
3842
#define pathToFileName(p) p
3943
#endif // ARDUINO_ARCH_ESP8266
4044

41-
#if ESP3D_DEBUG_LEVEL >= LOG_LEVEL_VERBOSE
45+
#if ESP3D_LOG_LEVEL >= LOG_LEVEL_VERBOSE
4246
#define esp3d_log(format, ...) \
4347
esp3d_logf(LOG_LEVEL_VERBOSE, "[ESP3D-VERBOSE][%s:%u] %s(): " format "\r\n", \
4448
pathToFileName(__FILE__), __LINE__, __FUNCTION__, ##__VA_ARGS__)
4549
#else
4650
#define esp3d_log(format, ...)
47-
#endif // ESP3D_DEBUG_LEVEL>= LOG_LEVEL_VERBOSE
51+
#endif // ESP3D_LOG_LEVEL>= LOG_LEVEL_VERBOSE
4852

49-
#if ESP3D_DEBUG_LEVEL >= LOG_LEVEL_DEBUG
53+
#if ESP3D_LOG_LEVEL >= LOG_LEVEL_DEBUG
5054
#define esp3d_log_d(format, ...) \
5155
esp3d_logf(LOG_LEVEL_DEBUG, "[ESP3D-DEBUG][%s:%u] %s(): " format "\r\n", \
5256
pathToFileName(__FILE__), __LINE__, __FUNCTION__, ##__VA_ARGS__)
5357
#else
5458
#define esp3d_log_d(format, ...)
55-
#endif // ESP3D_DEBUG_LEVEL>= LOG_LEVEL_DEBUG
59+
#endif // ESP3D_LOG_LEVEL>= LOG_LEVEL_DEBUG
5660

57-
#if ESP3D_DEBUG_LEVEL >= LOG_LEVEL_ERROR
61+
#if ESP3D_LOG_LEVEL >= LOG_LEVEL_ERROR
5862
#define esp3d_log_e(format, ...) \
5963
esp3d_logf(LOG_LEVEL_ERROR, "[ESP3D-ERROR][%s:%u] %s(): " format "\r\n", \
6064
pathToFileName(__FILE__), __LINE__, __FUNCTION__, ##__VA_ARGS__)
@@ -64,13 +68,13 @@ extern void esp3d_log_init();
6468
#define ESP3D_LOG_NETWORK_END_FN esp3d_network_log_end();
6569
#else
6670
#define esp3d_log_e(format, ...)
67-
#endif // ESP3D_DEBUG_LEVEL >= LOG_LEVEL_ERROR
71+
#endif // ESP3D_LOG_LEVEL >= LOG_LEVEL_ERROR
6872

6973
#else
7074
#define esp3d_log_e(format, ...)
7175
#define esp3d_log_d(format, ...)
7276
#define esp3d_log(format, ...)
73-
#undef ESP3D_DEBUG_LEVEL
77+
#undef ESP3D_LOG_LEVEL
7478
#define ESP3D_LOG_INIT_FN
7579
#define ESP3D_LOG_NETWORK_INIT_FN
7680
#define ESP3D_LOG_NETWORK_HANDLE_FN

0 commit comments

Comments
 (0)