From 58dffd9b3cf15063b047e0f488182345d0968d81 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_coex/lib | 2 +- components/esp_rom/esp32c2/ld/esp32c2.rom.ld | 4 ++-- components/esp_rom/esp32c3/ld/esp32c3.rom.eco7.ld | 2 +- components/esp_rom/esp32c3/ld/esp32c3.rom.ld | 2 +- components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld | 2 +- components/esp_rom/esp32s3/ld/esp32s3.rom.ld | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/components/esp_coex/lib b/components/esp_coex/lib index 496ee81e16..7016fb2971 160000 --- a/components/esp_coex/lib +++ b/components/esp_coex/lib @@ -1 +1 @@ -Subproject commit 496ee81e168881cad93f9a813802e7f7a6daec92 +Subproject commit 7016fb297135efc5dbdf84b5c795335c82f561c3 diff --git a/components/esp_rom/esp32c2/ld/esp32c2.rom.ld b/components/esp_rom/esp32c2/ld/esp32c2.rom.ld index 6d4998538a..e1e7ae7d0f 100644 --- a/components/esp_rom/esp32c2/ld/esp32c2.rom.ld +++ b/components/esp_rom/esp32c2/ld/esp32c2.rom.ld @@ -1474,7 +1474,7 @@ ebuf_list_remove = 0x40001adc; GetAccess = 0x40001aec; hal_mac_is_low_rate_enabled = 0x40001af0; hal_mac_tx_get_blockack = 0x40001af4; -hal_mac_tx_set_ppdu = 0x40001af8; +/*hal_mac_tx_set_ppdu = 0x40001af8;*/ ic_get_trc = 0x40001afc; /* ic_mac_deinit = 0x40001b00; */ ic_mac_init = 0x40001b04; @@ -1561,7 +1561,7 @@ ppTask = 0x40001c44; ppTxPkt = 0x40001c48; ppTxProtoProc = 0x40001c4c; ppTxqUpdateBitmap = 0x40001c50; -pp_coex_tx_request = 0x40001c54; +/*pp_coex_tx_request = 0x40001c54;*/ pp_hdrsize = 0x40001c58; pp_post = 0x40001c5c; pp_process_hmac_waiting_txq = 0x40001c60; diff --git a/components/esp_rom/esp32c3/ld/esp32c3.rom.eco7.ld b/components/esp_rom/esp32c3/ld/esp32c3.rom.eco7.ld index 19f62f387c..0c1d5c191a 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 a287e60447..0d86b315ad 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/esp32c6/ld/esp32c6.rom.pp.ld b/components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld index af1fbbc8e1..751cc2977b 100644 --- a/components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld +++ b/components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld @@ -111,7 +111,7 @@ ppSubFromAMPDU = 0x40000d38; //ppTxPkt = 0x40000d40; ppTxProtoProc = 0x40000d44; ppTxqUpdateBitmap = 0x40000d48; -pp_coex_tx_request = 0x40000d4c; +/*pp_coex_tx_request = 0x40000d4c;*/ pp_hdrsize = 0x40000d50; pp_post = 0x40000d54; pp_process_hmac_waiting_txq = 0x40000d58; diff --git a/components/esp_rom/esp32s3/ld/esp32s3.rom.ld b/components/esp_rom/esp32s3/ld/esp32s3.rom.ld index b38a8772a1..b8cb6f39f8 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 3b86f974ea787eaa847ff69a9d3d68cec374328f 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 f0e97da81eab200bc0080f9276c75e5de947199a 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_coex/lib | 2 +- components/esp_wifi/lib | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/esp_coex/lib b/components/esp_coex/lib index 7016fb2971..2717868407 160000 --- a/components/esp_coex/lib +++ b/components/esp_coex/lib @@ -1 +1 @@ -Subproject commit 7016fb297135efc5dbdf84b5c795335c82f561c3 +Subproject commit 2717868407a01878a49d19794538b6da120597ae diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib index ca06494db9..0e0ccbb3ed 160000 --- a/components/esp_wifi/lib +++ b/components/esp_wifi/lib @@ -1 +1 @@ -Subproject commit ca06494db941947214367a95c062805383d6bf74 +Subproject commit 0e0ccbb3ed7afa066a2935a0a3a6bcd65740d2f5