Skip to content

Commit 72843a6

Browse files
committed
Disable idf log errors
1 parent c75c8d0 commit 72843a6

File tree

2 files changed

+35
-29
lines changed

2 files changed

+35
-29
lines changed

esp3d/src/core/esp3d_log.cpp

Lines changed: 32 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,34 @@ void esp3d_logf(uint8_t level, const char* format, ...) {
125125
}
126126
}
127127

128+
void esp3d_network_log_init() {
129+
130+
#if ESP_LOG_FEATURE == LOG_OUTPUT_TELNET
131+
telnet_log.begin(LOG_ESP3D_OUTPUT_PORT, true);
132+
#endif // ESP_LOG_FEATURE == LOG_OUTPUT_TELNET
133+
#if ESP_LOG_FEATURE == LOG_OUTPUT_WEBSOCKET
134+
websocket_log.begin(LOG_ESP3D_OUTPUT_PORT);
135+
#endif // ESP_LOG_FEATURE == LOG_OUTPUT_WEBSOCKET
136+
}
137+
void esp3d_network_log_handle() {
138+
#if ESP_LOG_FEATURE == LOG_OUTPUT_TELNET
139+
telnet_log.handle();
140+
#endif // ESP_LOG_FEATURE == LOG_OUTPUT_TELNET
141+
#if ESP_LOG_FEATURE == LOG_OUTPUT_WEBSOCKET
142+
websocket_log.handle();
143+
#endif // ESP_LOG_FEATURE == LOG_OUTPUT_WEBSOCKET
144+
}
145+
void esp3d_network_log_end() {
146+
#if ESP_LOG_FEATURE == LOG_OUTPUT_TELNET
147+
telnet_log.end();
148+
#endif // ESP_LOG_FEATURE == LOG_OUTPUT_TELNET
149+
#if ESP_LOG_FEATURE == LOG_OUTPUT_WEBSOCKET
150+
websocket_log.end();
151+
#endif // ESP_LOG_FEATURE == LOG_OUTPUT_WEBSOCKET
152+
}
153+
154+
#endif // ESP_LOG_FEATURE
155+
128156
void esp3d_log_init() {
129157
#if defined(ARDUINO_ARCH_ESP32)
130158
#if !defined(SHOW_ESP_LOG)
@@ -148,6 +176,9 @@ void esp3d_log_init() {
148176
esp_log_level_set("phy", ESP_LOG_NONE);
149177
#endif // !defined(SHOW_ESP_LOG)
150178
#endif // ARDUINO_ARCH_ESP32
179+
180+
#if defined(ESP_LOG_FEATURE)
181+
151182
#if (ESP_LOG_FEATURE == LOG_OUTPUT_SERIAL0) || \
152183
(ESP_LOG_FEATURE == LOG_OUTPUT_SERIAL1) || \
153184
(ESP_LOG_FEATURE == LOG_OUTPUT_SERIAL2)
@@ -166,32 +197,6 @@ void esp3d_log_init() {
166197

167198
#endif // (ESP_LOG_FEATURE == LOG_OUTPUT_SERIAL0) || (ESP_LOG_FEATURE ==
168199
// LOG_OUTPUT_SERIAL1)||(ESP_LOG_FEATURE == LOG_OUTPUT_SERIAL2)
169-
}
170-
171-
void esp3d_network_log_init() {
172-
173-
#if ESP_LOG_FEATURE == LOG_OUTPUT_TELNET
174-
telnet_log.begin(LOG_ESP3D_OUTPUT_PORT, true);
175-
#endif // ESP_LOG_FEATURE == LOG_OUTPUT_TELNET
176-
#if ESP_LOG_FEATURE == LOG_OUTPUT_WEBSOCKET
177-
websocket_log.begin(LOG_ESP3D_OUTPUT_PORT);
178-
#endif // ESP_LOG_FEATURE == LOG_OUTPUT_WEBSOCKET
179-
}
180-
void esp3d_network_log_handle() {
181-
#if ESP_LOG_FEATURE == LOG_OUTPUT_TELNET
182-
telnet_log.handle();
183-
#endif // ESP_LOG_FEATURE == LOG_OUTPUT_TELNET
184-
#if ESP_LOG_FEATURE == LOG_OUTPUT_WEBSOCKET
185-
websocket_log.handle();
186-
#endif // ESP_LOG_FEATURE == LOG_OUTPUT_WEBSOCKET
187-
}
188-
void esp3d_network_log_end() {
189-
#if ESP_LOG_FEATURE == LOG_OUTPUT_TELNET
190-
telnet_log.end();
191-
#endif // ESP_LOG_FEATURE == LOG_OUTPUT_TELNET
192-
#if ESP_LOG_FEATURE == LOG_OUTPUT_WEBSOCKET
193-
websocket_log.end();
194-
#endif // ESP_LOG_FEATURE == LOG_OUTPUT_WEBSOCKET
195-
}
196200

197201
#endif // ESP_LOG_FEATURE
202+
}

esp3d/src/core/esp3d_log.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,14 @@
2222

2323
#include "../include/esp3d_config.h"
2424
#include "../include/esp3d_defines.h"
25+
extern void esp3d_log_init();
26+
2527
#if defined(ESP_LOG_FEATURE)
2628
extern void esp3d_logf(uint8_t level, const char* format, ...);
2729
extern void esp3d_network_log_init();
2830
extern void esp3d_network_log_handle();
2931
extern void esp3d_network_log_end();
3032

31-
extern void esp3d_log_init();
3233

3334
#if !defined(ESP3D_LOG_LEVEL) && defined(ESP_DEBUG_FEATURE)
3435
#error "ESP3D_LOG_LEVEL is not defined, please define it in configuration.h"
@@ -75,7 +76,7 @@ extern void esp3d_log_init();
7576
#define esp3d_log_d(format, ...)
7677
#define esp3d_log(format, ...)
7778
#undef ESP3D_LOG_LEVEL
78-
#define ESP3D_LOG_INIT_FN
79+
#define ESP3D_LOG_INIT_FN esp3d_log_init(); //to desactivate idf log extensively
7980
#define ESP3D_LOG_NETWORK_INIT_FN
8081
#define ESP3D_LOG_NETWORK_HANDLE_FN
8182
#define ESP3D_LOG_NETWORK_END_FN

0 commit comments

Comments
 (0)