-
Notifications
You must be signed in to change notification settings - Fork 7.9k
fix(logging): Add wrapper when using wifi without esp_diagnostics #12188
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| /* | ||
| * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD | ||
| * | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| #include "sdkconfig.h" | ||
|
|
||
| /* | ||
| * This file provides wrapper implementations for esp_log_write and esp_log_writev | ||
| * when CONFIG_DIAG_USE_EXTERNAL_LOG_WRAP is not enabled. | ||
| * | ||
| * When CONFIG_DIAG_USE_EXTERNAL_LOG_WRAP is enabled, the esp_diagnostics component | ||
| * provides these wrappers. However, when it's disabled, WiFi libraries still expect | ||
| * these wrapper functions to exist, causing linker errors. | ||
| * | ||
| * This implementation provides simple pass-through wrappers that call the real | ||
| * ESP-IDF logging functions, ensuring compatibility without requiring esp_diagnostics. | ||
| */ | ||
|
|
||
| #ifndef CONFIG_DIAG_USE_EXTERNAL_LOG_WRAP | ||
|
|
||
| #include <stdarg.h> | ||
| #include "esp_log.h" | ||
|
|
||
| // Declare the real functions that will be wrapped by the linker | ||
| void __real_esp_log_write(esp_log_level_t level, const char *tag, const char *format, ...); | ||
| void __real_esp_log_writev(esp_log_level_t level, const char *tag, const char *format, va_list args); | ||
|
|
||
| // Wrapper implementations that simply call through to the real functions | ||
| void __wrap_esp_log_write(esp_log_level_t level, const char *tag, const char *format, ...) { | ||
| va_list args; | ||
| va_start(args, format); | ||
| __real_esp_log_writev(level, tag, format, args); | ||
| va_end(args); | ||
| } | ||
|
|
||
| void __wrap_esp_log_writev(esp_log_level_t level, const char *tag, const char *format, va_list args) { | ||
| __real_esp_log_writev(level, tag, format, args); | ||
| } | ||
|
|
||
| #endif // !CONFIG_DIAG_USE_EXTERNAL_LOG_WRAP | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.