Skip to content

fix(log): fix kernel panic when checking the error #151

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.

Sign up for GitHub

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 1 commit into from
Jan 10, 2025
Merged

fix(log): fix kernel panic when checking the error #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
### Bugfixes:

* fix(touch): fix GT911 build warning
* fix(log): fix kernel panic when checking the error @Kanzll (#144)
* fix(version): fix minor number check @arduinomnomnom (#148)

## v0.2.2 - 2025-01-09
Expand Down
2 changes: 1 addition & 1 deletion examples/PlatformIO/platformio.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ monitor_speed = 115200
build_flags =
; Arduino related:
-DBOARD_HAS_PSRAM ; Enable PSRAM
; -DARDUINO_USB_CDC_ON_BOOT=0 ; If using UART port
; -DARDUINO_USB_CDC_ON_BOOT=0 ; If using UART port
-DARDUINO_USB_CDC_ON_BOOT=1 ; If using USB port
-DCORE_DEBUG_LEVEL=1 ; Set to `5` for full debug output, `0` for none
; LVGL related:
Expand Down
14 changes: 5 additions & 9 deletions src/ESP_PanelLog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,11 @@
#define ESP_PANEL_CHECK_NULL_RET(x, ...) assert((x) != NULL)
#define ESP_PANEL_CHECK_FALSE_RET(x, ...) assert((x) != false)
#else
// #if ESP_PANEL_ENABLE_LOG
#define ESP_PANEL_ERROR_CHECK_LOG_FORMAT(err, format) "[%s] %s(%u): " format, esp_err_to_name(err), __FUNCTION__, __LINE__
#define ESP_PANEL_ERROR_CHECK_LOGE(tag, err, format, ...) ESP_LOGE(tag, ESP_PANEL_ERROR_CHECK_LOG_FORMAT(err, format), ##__VA_ARGS__)
#define ESP_PANEL_OTHER_CHECK_LOG_FORMAT(format) "%s(%u): " format, __FUNCTION__, __LINE__
#define ESP_PANEL_OTHER_CHECK_LOGE(tag, format, ...) ESP_LOGE(tag, ESP_PANEL_OTHER_CHECK_LOG_FORMAT(format), ##__VA_ARGS__)
// #else
// #define ESP_PANEL_ERROR_CHECK_LOGE(tag, err, format, ...) do {} while(0)
// #define ESP_PANEL_OTHER_CHECK_LOGE(tag, format, ...) do {} while(0)
// #endif

#define ESP_PANEL_ERROR_CHECK_LOGE(tag, err, format, ...) \
ESP_LOGE(tag, "[%s] %s(%u): " format, esp_err_to_name(err), __FUNCTION__, __LINE__, ##__VA_ARGS__)
#define ESP_PANEL_OTHER_CHECK_LOGE(tag, format, ...) \
ESP_LOGE(tag, "%s(%u): " format, __FUNCTION__, __LINE__, ##__VA_ARGS__)

#define ESP_PANEL_CHECK_ERR_RET(x, ret, fmt, ...) do { \
esp_err_t err_rc_ = (x); \
Expand Down
Loading