From 5bed10076163ccfadcb23abd6c3492abecbc18fc Mon Sep 17 00:00:00 2001 From: yinqingzhao Date: Mon, 12 May 2025 20:16:07 +0800 Subject: [PATCH 1/2] feat(wifi): add tx error 0xa0 count --- components/esp_rom/esp32c5/ld/esp32c5.rom.pp.ld | 2 +- .../esp_wifi/include/esp_private/esp_wifi_he_types_private.h | 3 ++- components/esp_wifi/lib | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/components/esp_rom/esp32c5/ld/esp32c5.rom.pp.ld b/components/esp_rom/esp32c5/ld/esp32c5.rom.pp.ld index 69174a6c87..3529406291 100644 --- a/components/esp_rom/esp32c5/ld/esp32c5.rom.pp.ld +++ b/components/esp_rom/esp32c5/ld/esp32c5.rom.pp.ld @@ -288,7 +288,7 @@ esp_test_clr_tx_statistics = 0x40001020; esp_test_get_tx_statistics = 0x40001024; esp_test_clr_tx_tb_statistics = 0x40001028; esp_test_get_tx_tb_statistics = 0x4000102c; -esp_test_tx_process_complete = 0x40001030; +/*esp_test_tx_process_complete = 0x40001030;*/ esp_test_tx_process_txq_state = 0x40001034; esp_test_tx_enab_statistics = 0x40001038; esp_test_tx_tb_complete = 0x4000103c; diff --git a/components/esp_wifi/include/esp_private/esp_wifi_he_types_private.h b/components/esp_wifi/include/esp_private/esp_wifi_he_types_private.h index 7443822ad9..8e86bb3bd7 100644 --- a/components/esp_wifi/include/esp_private/esp_wifi_he_types_private.h +++ b/components/esp_wifi/include/esp_private/esp_wifi_he_types_private.h @@ -350,7 +350,8 @@ typedef struct { uint32_t tx_muedca_enable; /* count TX times within mu-timer working */ uint32_t collision; uint32_t timeout; -} esp_test_tx_statistics_t; //136 bytes + uint32_t tx_error_a0; +} esp_test_tx_statistics_t; //140 bytes typedef struct { uint32_t complete_suc_tb; diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib index fb55dc6289..643e8bfd44 160000 --- a/components/esp_wifi/lib +++ b/components/esp_wifi/lib @@ -1 +1 @@ -Subproject commit fb55dc62895f49cbd80cf32f5a053ffb11414511 +Subproject commit 643e8bfd44ae63f367afed3c28d77d83ba818772 From 4e20dc58b3b97069c7fa03e8f8b5914f3f85f103 Mon Sep 17 00:00:00 2001 From: yinqingzhao Date: Tue, 13 May 2025 14:38:45 +0800 Subject: [PATCH 2/2] fix(wifi): fix build issue by modifying parttion table of file_server example --- .../protocols/http_server/file_serving/partitions_example.csv | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/protocols/http_server/file_serving/partitions_example.csv b/examples/protocols/http_server/file_serving/partitions_example.csv index 48947d9341..c943624078 100644 --- a/examples/protocols/http_server/file_serving/partitions_example.csv +++ b/examples/protocols/http_server/file_serving/partitions_example.csv @@ -2,5 +2,5 @@ # Note: if you have increased the bootloader size, make sure to update the offsets to avoid overlap nvs, data, nvs, 0x9000, 0x6000, phy_init, data, phy, 0xf000, 0x1000, -factory, app, factory, 0x10000, 1M, -storage, data, spiffs, , 0xF0000, +factory, app, factory, 0x10000, 0x110000, +storage, data, spiffs, , 0xE0000,