From ac0e88403c43f438964aad294f690683993ee2e3 Mon Sep 17 00:00:00 2001 From: liuning Date: Fri, 29 Dec 2023 11:29:38 +0800 Subject: [PATCH 1/3] feat(coex): improve Wi-Fi connecting compatibility at coexistence --- components/esp_rom/esp32c3/ld/esp32c3.rom.eco7.ld | 2 +- components/esp_rom/esp32c3/ld/esp32c3.rom.ld | 2 +- components/esp_rom/esp32s3/ld/esp32s3.rom.ld | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/esp_rom/esp32c3/ld/esp32c3.rom.eco7.ld b/components/esp_rom/esp32c3/ld/esp32c3.rom.eco7.ld index afd0e982a8..8ff698397b 100644 --- a/components/esp_rom/esp32c3/ld/esp32c3.rom.eco7.ld +++ b/components/esp_rom/esp32c3/ld/esp32c3.rom.eco7.ld @@ -6,7 +6,7 @@ esf_buf_alloc = 0x400015bc; esf_buf_alloc_dynamic = 0x400015c0; esf_buf_recycle = 0x400015c4; -hal_mac_tx_set_ppdu = 0x400015d4; +/*hal_mac_tx_set_ppdu = 0x400015d4;*/ ic_mac_deinit = 0x400015dc; lmacDiscardMSDU = 0x400015f4; lmacSetTxFrame = 0x40001628; diff --git a/components/esp_rom/esp32c3/ld/esp32c3.rom.ld b/components/esp_rom/esp32c3/ld/esp32c3.rom.ld index 0aa285a82d..b4bef53b49 100644 --- a/components/esp_rom/esp32c3/ld/esp32c3.rom.ld +++ b/components/esp_rom/esp32c3/ld/esp32c3.rom.ld @@ -1591,7 +1591,7 @@ ppTask = 0x40001720; ppTxPkt = 0x40001724; ppTxProtoProc = 0x40001728; ppTxqUpdateBitmap = 0x4000172c; -pp_coex_tx_request = 0x40001730; +/*pp_coex_tx_request = 0x40001730;*/ pp_hdrsize = 0x40001734; pp_post = 0x40001738; pp_process_hmac_waiting_txq = 0x4000173c; diff --git a/components/esp_rom/esp32s3/ld/esp32s3.rom.ld b/components/esp_rom/esp32s3/ld/esp32s3.rom.ld index fad51f33aa..7d49cb5a16 100644 --- a/components/esp_rom/esp32s3/ld/esp32s3.rom.ld +++ b/components/esp_rom/esp32s3/ld/esp32s3.rom.ld @@ -1894,7 +1894,7 @@ ppSubFromAMPDU = 0x40005694; /* ppTxPkt = 0x400056ac;*/ ppTxProtoProc = 0x400056b8; ppTxqUpdateBitmap = 0x400056c4; -pp_coex_tx_request = 0x400056d0; +/*pp_coex_tx_request = 0x400056d0;*/ pp_hdrsize = 0x400056dc; pp_post = 0x400056e8; pp_process_hmac_waiting_txq = 0x400056f4; From f13d02da8cda8b763aff80e3a7df8de66034508d Mon Sep 17 00:00:00 2001 From: liuning Date: Tue, 27 Feb 2024 09:42:52 +0800 Subject: [PATCH 2/3] example: add custom partition table for mesh manual networking --- examples/mesh/manual_networking/partitions.csv | 5 +++++ examples/mesh/manual_networking/sdkconfig.defaults | 5 +++++ 2 files changed, 10 insertions(+) create mode 100644 examples/mesh/manual_networking/partitions.csv create mode 100644 examples/mesh/manual_networking/sdkconfig.defaults diff --git a/examples/mesh/manual_networking/partitions.csv b/examples/mesh/manual_networking/partitions.csv new file mode 100644 index 0000000000..028e2a905b --- /dev/null +++ b/examples/mesh/manual_networking/partitions.csv @@ -0,0 +1,5 @@ +# Name, Type, SubType, Offset, Size, Flags +# 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, 1200K, diff --git a/examples/mesh/manual_networking/sdkconfig.defaults b/examples/mesh/manual_networking/sdkconfig.defaults new file mode 100644 index 0000000000..4fa6805624 --- /dev/null +++ b/examples/mesh/manual_networking/sdkconfig.defaults @@ -0,0 +1,5 @@ +CONFIG_PARTITION_TABLE_CUSTOM=y +CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv" +CONFIG_PARTITION_TABLE_FILENAME="partitions.csv" +CONFIG_PARTITION_TABLE_OFFSET=0x8000 +CONFIG_PARTITION_TABLE_MD5=y From d0d1676fccbedd7090ffbc0e627beda7183dff94 Mon Sep 17 00:00:00 2001 From: liuning Date: Tue, 27 Feb 2024 20:03:25 +0800 Subject: [PATCH 3/3] feat(coex): support to scan long time on channel, fix coexist sync issue --- components/esp_rom/esp32c3/ld/esp32c3.rom.eco7.ld | 2 +- components/esp_rom/esp32c3/ld/esp32c3.rom.ld | 4 ++-- components/esp_rom/esp32s3/ld/esp32s3.rom.ld | 4 ++-- components/esp_wifi/lib | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/components/esp_rom/esp32c3/ld/esp32c3.rom.eco7.ld b/components/esp_rom/esp32c3/ld/esp32c3.rom.eco7.ld index 8ff698397b..1fbf2e9de6 100644 --- a/components/esp_rom/esp32c3/ld/esp32c3.rom.eco7.ld +++ b/components/esp_rom/esp32c3/ld/esp32c3.rom.eco7.ld @@ -37,7 +37,7 @@ ieee80211_encap_esfbuf = 0x4000185c; /*sta_input = 0x40001870;*/ ieee80211_crypto_decap = 0x4000189c; ieee80211_decap = 0x400018a0; -coex_core_timer_idx_get = 0x400018d0; +/*coex_core_timer_idx_get = 0x400018d0;*/ rom1_chip_i2c_readReg = 0x40001924; rom1_chip_i2c_writeReg = 0x40001928; rom_index_to_txbbgain = 0x40001964; diff --git a/components/esp_rom/esp32c3/ld/esp32c3.rom.ld b/components/esp_rom/esp32c3/ld/esp32c3.rom.ld index b4bef53b49..82bf93833c 100644 --- a/components/esp_rom/esp32c3/ld/esp32c3.rom.ld +++ b/components/esp_rom/esp32c3/ld/esp32c3.rom.ld @@ -1760,12 +1760,12 @@ esp_coex_rom_version_get = 0x400018ac; coex_bt_release = 0x400018b0; coex_bt_request = 0x400018b4; coex_core_ble_conn_dyn_prio_get = 0x400018b8; -coex_core_event_duration_get = 0x400018bc; +/*coex_core_event_duration_get = 0x400018bc;*/ coex_core_pti_get = 0x400018c0; coex_core_release = 0x400018c4; coex_core_request = 0x400018c8; coex_core_status_get = 0x400018cc; -coex_core_timer_idx_get = 0x400018d0; +/*coex_core_timer_idx_get = 0x400018d0;*/ coex_event_duration_get = 0x400018d4; coex_hw_timer_disable = 0x400018d8; coex_hw_timer_enable = 0x400018dc; diff --git a/components/esp_rom/esp32s3/ld/esp32s3.rom.ld b/components/esp_rom/esp32s3/ld/esp32s3.rom.ld index 7d49cb5a16..1d5fc854b7 100644 --- a/components/esp_rom/esp32s3/ld/esp32s3.rom.ld +++ b/components/esp_rom/esp32s3/ld/esp32s3.rom.ld @@ -2069,12 +2069,12 @@ esp_coex_rom_version_get = 0x40005b68; coex_bt_release = 0x40005b74; coex_bt_request = 0x40005b80; coex_core_ble_conn_dyn_prio_get = 0x40005b8c; -coex_core_event_duration_get = 0x40005b98; +/* coex_core_event_duration_get = 0x40005b98; */ coex_core_pti_get = 0x40005ba4; coex_core_release = 0x40005bb0; coex_core_request = 0x40005bbc; coex_core_status_get = 0x40005bc8; -coex_core_timer_idx_get = 0x40005bd4; +/*coex_core_timer_idx_get = 0x40005bd4;*/ coex_event_duration_get = 0x40005be0; coex_hw_timer_disable = 0x40005bec; coex_hw_timer_enable = 0x40005bf8; diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib index 499341f539..faf5a16d72 160000 --- a/components/esp_wifi/lib +++ b/components/esp_wifi/lib @@ -1 +1 @@ -Subproject commit 499341f53904937d10186c938bc7d3c73e1eacfe +Subproject commit faf5a16d72f47618a414f0a0aefd2b26838c2534