From 57fd0fe836aa49bf099b18c672f66d3fe67bdcde Mon Sep 17 00:00:00 2001 From: muhaidong Date: Thu, 10 Apr 2025 21:17:05 +0800 Subject: [PATCH 1/2] fix(phy): fix phy data partition restoring default fails issue Closes https://github.com/espressif/esp-idf/issues/14698 --- components/esp_phy/src/phy_init.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/components/esp_phy/src/phy_init.c b/components/esp_phy/src/phy_init.c index a2e175c1d5..1e902a318b 100644 --- a/components/esp_phy/src/phy_init.c +++ b/components/esp_phy/src/phy_init.c @@ -611,6 +611,13 @@ const esp_phy_init_data_t* esp_phy_get_init_data(void) assert(memcmp(init_data_store + init_data_store_length - PHY_INIT_MAGIC_LEN, PHY_INIT_MAGIC, PHY_INIT_MAGIC_LEN) == 0); + err = esp_partition_erase_range(partition, 0, partition->size); + if (err != ESP_OK) { + ESP_LOGE(TAG, "failed to erase partition (0x%x)!", err); + free(init_data_store); + return NULL; + } + // write default data err = esp_partition_write(partition, 0, init_data_store, init_data_store_length); if (err != ESP_OK) { From 592e747c7841b450fd260429afd0b8ae6ba9a6f9 Mon Sep 17 00:00:00 2001 From: muhaidong Date: Mon, 17 Feb 2025 19:14:41 +0800 Subject: [PATCH 2/2] fix(wifi): fix some wifi bugs 250427 1. fix ersu compatibility issue 2. fix association timeout timer issue for wep shared auth --- components/esp_rom/esp32c61/ld/esp32c61.rom.net80211.ld | 2 +- components/esp_wifi/lib | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/esp_rom/esp32c61/ld/esp32c61.rom.net80211.ld b/components/esp_rom/esp32c61/ld/esp32c61.rom.net80211.ld index 230c560b3d..a864189192 100644 --- a/components/esp_rom/esp32c61/ld/esp32c61.rom.net80211.ld +++ b/components/esp_rom/esp32c61/ld/esp32c61.rom.net80211.ld @@ -65,7 +65,7 @@ wifi_get_macaddr = 0x40000b2c; wifi_rf_phy_disable = 0x40000b30; wifi_rf_phy_enable = 0x40000b34; wifi_is_started = 0x40000b38; -sta_input = 0x40000b3c; +/*sta_input = 0x40000b3c;*/ sta_rx_eapol = 0x40000b40; sta_reset_beacon_timeout = 0x40000b44; sta_get_beacon_timeout = 0x40000b48; diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib index cfceb15dc5..7488ede43c 160000 --- a/components/esp_wifi/lib +++ b/components/esp_wifi/lib @@ -1 +1 @@ -Subproject commit cfceb15dc595cdba9172b1c3865d139a25388fcf +Subproject commit 7488ede43ce2dd122119f2ee1a229d5e9c3a5d89