From 8e47b98c8e4134cab43cbe94bed3376a43ddee3b Mon Sep 17 00:00:00 2001 From: xiehang Date: Thu, 21 Jan 2021 11:37:10 +0800 Subject: [PATCH 1/2] example: Fix espnow stuck issue --- examples/wifi/espnow/main/espnow_example_main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/examples/wifi/espnow/main/espnow_example_main.c b/examples/wifi/espnow/main/espnow_example_main.c index c5311a17f5..a99f9f673d 100644 --- a/examples/wifi/espnow/main/espnow_example_main.c +++ b/examples/wifi/espnow/main/espnow_example_main.c @@ -29,6 +29,8 @@ #include "esp_crc.h" #include "espnow_example.h" +#define ESPNOW_MAXDELAY 512 + static const char *TAG = "espnow_example"; static xQueueHandle s_example_espnow_queue; @@ -70,7 +72,7 @@ static void example_espnow_send_cb(const uint8_t *mac_addr, esp_now_send_status_ evt.id = EXAMPLE_ESPNOW_SEND_CB; memcpy(send_cb->mac_addr, mac_addr, ESP_NOW_ETH_ALEN); send_cb->status = status; - if (xQueueSend(s_example_espnow_queue, &evt, portMAX_DELAY) != pdTRUE) { + if (xQueueSend(s_example_espnow_queue, &evt, ESPNOW_MAXDELAY) != pdTRUE) { ESP_LOGW(TAG, "Send send queue fail"); } } @@ -94,7 +96,7 @@ static void example_espnow_recv_cb(const uint8_t *mac_addr, const uint8_t *data, } memcpy(recv_cb->data, data, len); recv_cb->data_len = len; - if (xQueueSend(s_example_espnow_queue, &evt, portMAX_DELAY) != pdTRUE) { + if (xQueueSend(s_example_espnow_queue, &evt, ESPNOW_MAXDELAY) != pdTRUE) { ESP_LOGW(TAG, "Send receive queue fail"); free(recv_cb->data); } From 3410711f9bb024e29b0e05772f82c91db8eca272 Mon Sep 17 00:00:00 2001 From: zhangyanjiao Date: Tue, 18 Jan 2022 16:08:08 +0800 Subject: [PATCH 2/2] esp_wifi: 1. fix the issue that no tbtt is generated in station+softap mode when maximum modem sleep is enabled 2. update libphy.a to V4670 719f9f6_20210218 for esp32 --- components/esp_wifi/lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib index 127aa3bba9..2d8942782c 160000 --- a/components/esp_wifi/lib +++ b/components/esp_wifi/lib @@ -1 +1 @@ -Subproject commit 127aa3bba9effe0976e5de30d89107318be3cc34 +Subproject commit 2d8942782c28a3621e6d73eb4dab20e8635569f1