Skip to content

fix: Compilation with esp-idf 5.5 (AEGHB-1187) #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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: Compilation with esp-idf 5.5 (AEGHB-1187) #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
10 changes: 9 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,15 @@ list(APPEND srcs "src/utils/src/espnow_mem.c"
"src/utils/src/espnow_utils.c")
list(APPEND include_dirs "src/utils/include")

list(APPEND requires "spi_flash" "nvs_flash" "esp_timer" "esp_wifi" "driver")
list(APPEND requires "spi_flash" "nvs_flash" "esp_timer" "esp_wifi")
# only need to append these if ESP-IDF is >= 5.4
idf_build_get_property(IDF_VERSION_MAJOR IDF_VERSION_MAJOR)
idf_build_get_property(IDF_VERSION_MINOR IDF_VERSION_MINOR)
if(IDF_VERSION_MAJOR GREATER 5 OR (IDF_VERSION_MAJOR EQUAL 5 AND IDF_VERSION_MINOR GREATER_EQUAL 4))
list(APPEND requires "esp_driver_gpio" "esp_driver_uart" "esp_driver_usb_serial_jtag")
else()
list(APPEND requires "driver")
endif()

idf_component_register(SRCS "${srcs}"
INCLUDE_DIRS "${include_dirs}"
Expand Down
11 changes: 11 additions & 0 deletions src/espnow/src/espnow.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,16 +401,27 @@ void espnow_recv_cb(const uint8_t *addr, const uint8_t *data, int size)
}

/**< callback function of sending ESPNOW data */
#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 1)
void espnow_send_cb(const esp_now_send_info_t *tx_info, esp_now_send_status_t status)
#else
void espnow_send_cb(const uint8_t *addr, esp_now_send_status_t status)
#endif
{
if (g_buffered_num) {
g_buffered_num --;
}

#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 1)
if (!tx_info || !g_event_group) {
ESP_LOGW(TAG, "Send cb args error, tx_info is NULL");
return ;
}
#else
if (!addr || !g_event_group) {
ESP_LOGW(TAG, "Send cb args error, addr is NULL");
return ;
}
#endif

if (status == ESP_NOW_SEND_SUCCESS) {
xEventGroupSetBits(g_event_group, SEND_CB_OK);
Expand Down