From d4dafbdc3572387cd4f9a62b776580bc4ac3bde7 Mon Sep 17 00:00:00 2001 From: zhangyanjiao Date: Thu, 29 May 2025 17:23:19 +0800 Subject: [PATCH 1/2] fix(wifi): Added more check when receiving espnow data --- 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 a84db720aa..206fe3e13e 160000 --- a/components/esp_wifi/lib +++ b/components/esp_wifi/lib @@ -1 +1 @@ -Subproject commit a84db720aaf543d5846369071a13af881fa30002 +Subproject commit 206fe3e13e788b5fad8be6d39b5d9742e4bd9985 From b369c44beb214ec5a7b054987866e14d03ce7300 Mon Sep 17 00:00:00 2001 From: sibeibei Date: Tue, 13 May 2025 19:10:30 +0800 Subject: [PATCH 2/2] fix(wifi): rx bcn failed when sta off channel under modem state --- components/esp_rom/esp32c2/ld/esp32c2.rom.eco4.ld | 2 +- components/esp_rom/esp32c2/ld/esp32c2.rom.ld | 2 +- components/esp_rom/esp32c3/ld/esp32c3.rom.ld | 2 +- components/esp_rom/esp32c5/ld/esp32c5.rom.pp.ld | 10 +++++----- components/esp_rom/esp32c61/ld/esp32c61.rom.pp.ld | 12 ++++++------ components/esp_rom/esp32s3/ld/esp32s3.rom.ld | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/components/esp_rom/esp32c2/ld/esp32c2.rom.eco4.ld b/components/esp_rom/esp32c2/ld/esp32c2.rom.eco4.ld index 36e30777e6..2102daeb9e 100644 --- a/components/esp_rom/esp32c2/ld/esp32c2.rom.eco4.ld +++ b/components/esp_rom/esp32c2/ld/esp32c2.rom.eco4.ld @@ -202,7 +202,7 @@ pm_beacon_offset_init = 0x400030b0; pm_beacon_offset_deinit = 0x400030b4; pm_get_tbtt_count = 0x400030b8; pm_coex_schm_overall_period_get = 0x400030bc; -pm_coex_pwr_update = 0x400030c0; +//pm_coex_pwr_update = 0x400030c0; /* Data (.data, .bss, .rodata) */ s_pm_beacon_offset_ptr = 0x3fcdfa64; s_pm_beacon_offset_config_ptr = 0x3fcdfa60; diff --git a/components/esp_rom/esp32c2/ld/esp32c2.rom.ld b/components/esp_rom/esp32c2/ld/esp32c2.rom.ld index 515f4c4a41..eafa0d9ab8 100644 --- a/components/esp_rom/esp32c2/ld/esp32c2.rom.ld +++ b/components/esp_rom/esp32c2/ld/esp32c2.rom.ld @@ -528,7 +528,7 @@ pm_mac_sleep = 0x40001b80; pm_enable_active_timer = 0x40001b84; pm_enable_sleep_delay_timer = 0x40001b88; pm_local_tsf_process = 0x40001b8c; -pm_set_beacon_filter = 0x40001b90; +//pm_set_beacon_filter = 0x40001b90; /*pm_is_in_wifi_slice_threshold = 0x40001b94;*/ pm_is_waked = 0x40001b98; /*pm_keep_alive = 0x40001b9c;*/ diff --git a/components/esp_rom/esp32c3/ld/esp32c3.rom.ld b/components/esp_rom/esp32c3/ld/esp32c3.rom.ld index 5b1804c435..ad2ce17b72 100644 --- a/components/esp_rom/esp32c3/ld/esp32c3.rom.ld +++ b/components/esp_rom/esp32c3/ld/esp32c3.rom.ld @@ -717,7 +717,7 @@ pm_mac_sleep = 0x4000165c; pm_enable_active_timer = 0x40001660; pm_enable_sleep_delay_timer = 0x40001664; pm_local_tsf_process = 0x40001668; -pm_set_beacon_filter = 0x4000166c; +//pm_set_beacon_filter = 0x4000166c; /*pm_is_in_wifi_slice_threshold = 0x40001670;*/ pm_is_waked = 0x40001674; /*pm_keep_alive = 0x40001678;*/ diff --git a/components/esp_rom/esp32c5/ld/esp32c5.rom.pp.ld b/components/esp_rom/esp32c5/ld/esp32c5.rom.pp.ld index 801f29803a..47c5e46850 100644 --- a/components/esp_rom/esp32c5/ld/esp32c5.rom.pp.ld +++ b/components/esp_rom/esp32c5/ld/esp32c5.rom.pp.ld @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2024-2025 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -115,7 +115,7 @@ pm_mac_sleep = 0x40000d5c; /*pm_enable_active_timer = 0x40000d60;*/ pm_enable_sleep_delay_timer = 0x40000d64; pm_local_tsf_process = 0x40000d68; -pm_set_beacon_filter = 0x40000d6c; +//pm_set_beacon_filter = 0x40000d6c; /*pm_is_in_wifi_slice_threshold = 0x40000d70;*/ pm_is_waked = 0x40000d74; /*pm_keep_alive = 0x40000d78;*/ @@ -158,9 +158,9 @@ pm_twt_disallow_tx = 0x40000e08; pm_clear_wakeup_signal = 0x40000e0c; pm_mac_disable_tsf_tbtt_soc_wakeup = 0x40000e10; pm_mac_disable_tsf_tbtt_modem_wakeup = 0x40000e14; -pm_mac_enable_tsf_tbtt_soc_wakeup = 0x40000e18; -pm_mac_enable_tsf_tbtt_modem_wakeup = 0x40000e1c; -pm_mac_modem_params_rt_update = 0x40000e20; +//pm_mac_enable_tsf_tbtt_soc_wakeup = 0x40000e18; +//pm_mac_enable_tsf_tbtt_modem_wakeup = 0x40000e1c; +//pm_mac_modem_params_rt_update = 0x40000e20; pm_update_at_next_beacon = 0x40000e24; tbtt_adaptive_setup = 0x40000e28; tbtt_adaptive_servo = 0x40000e2c; diff --git a/components/esp_rom/esp32c61/ld/esp32c61.rom.pp.ld b/components/esp_rom/esp32c61/ld/esp32c61.rom.pp.ld index 7e0776a187..856ffb226d 100644 --- a/components/esp_rom/esp32c61/ld/esp32c61.rom.pp.ld +++ b/components/esp_rom/esp32c61/ld/esp32c61.rom.pp.ld @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2024-2025 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -119,7 +119,7 @@ pm_mac_sleep = 0x40000cc8; /*pm_enable_active_timer = 0x40000ccc;*/ pm_enable_sleep_delay_timer = 0x40000cd0; pm_local_tsf_process = 0x40000cd4; -pm_set_beacon_filter = 0x40000cd8; +//pm_set_beacon_filter = 0x40000cd8; /*pm_is_in_wifi_slice_threshold = 0x40000cdc;*/ pm_is_waked = 0x40000ce0; //pm_keep_alive = 0x40000ce4; @@ -162,13 +162,13 @@ pm_twt_disallow_tx = 0x40000d74; pm_clear_wakeup_signal = 0x40000d78; pm_mac_disable_tsf_tbtt_soc_wakeup = 0x40000d7c; pm_mac_disable_tsf_tbtt_modem_wakeup = 0x40000d80; -pm_mac_enable_tsf_tbtt_soc_wakeup = 0x40000d84; -pm_mac_enable_tsf_tbtt_modem_wakeup = 0x40000d88; -pm_mac_modem_params_rt_update = 0x40000d8c; +//pm_mac_enable_tsf_tbtt_soc_wakeup = 0x40000d84; +//pm_mac_enable_tsf_tbtt_modem_wakeup = 0x40000d88; +//pm_mac_modem_params_rt_update = 0x40000d8c; pm_update_at_next_beacon = 0x40000d90; pm_get_null_max_tx_time = 0x40000d94; pm_coex_schm_overall_period_get = 0x40000d98; -pm_coex_pwr_update = 0x40000d9c; +//pm_coex_pwr_update = 0x40000d9c; tbtt_adaptive_setup = 0x40000da0; tbtt_adaptive_servo = 0x40000da4; ppAMPDU2Normal = 0x40000da8; diff --git a/components/esp_rom/esp32s3/ld/esp32s3.rom.ld b/components/esp_rom/esp32s3/ld/esp32s3.rom.ld index c3799fb4cf..47433b0e21 100644 --- a/components/esp_rom/esp32s3/ld/esp32s3.rom.ld +++ b/components/esp_rom/esp32s3/ld/esp32s3.rom.ld @@ -971,7 +971,7 @@ pm_mac_sleep = 0x40005454; pm_enable_active_timer = 0x40005460; pm_enable_sleep_delay_timer = 0x4000546c; pm_local_tsf_process = 0x40005478; -pm_set_beacon_filter = 0x40005484; +//pm_set_beacon_filter = 0x40005484; /*pm_is_in_wifi_slice_threshold = 0x40005490;*/ pm_is_waked = 0x4000549c; /*pm_keep_alive = 0x400054a8;*/