espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-05 05:34:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/support_esp32s3_wifi_new' into 'master'

Browse Source 
Feature/support esp32s3 wifi

Closes WIFI-3794

See merge request espressif/esp-idf!13950
This commit is contained in:
Jiang Jiang Jian
2021-07-06 06:41:57 +00:00
parent d9d4db43a1 8fd261b3eb
commit 6be2491cb1
6 changed files with 84 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

131
components/esp_phy/esp32s3/include/phy_init_data.h
View File

@@ -44,72 +44,76 @@ static const char phy_init_magic_pre[] = PHY_INIT_MAGIC;
* @brief Structure containing default recommended PHY initialization parameters. * @brief Structure containing default recommended PHY initialization parameters.
*/ */
static const esp_phy_init_data_t phy_init_data= { { static const esp_phy_init_data_t phy_init_data= { {
3, 0x00,
3, 0x00,
0x05, LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 0x50),
0x09, LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 0x50),
0x06, LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 0x50),
0x05, LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 0x4c),
0x03, LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 0x4c),
0x06, LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 0x48),
0x05, LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 0x4c),
0x04, LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 0x48),
0x06, LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 0x48),
0x04, LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 0x44),
0x05, LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 0x4a),
LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 0x46),
LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 0x46),
LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 0x42),
0x00, 0x00,
0x00, 0x00,
0x00, 0x00,
0x00, 0xff,
0x05, 0xff,
0x09, 0xff,
0x06, 0xff,
0x05, 0xff,
0x03, 0xff,
0x06, 0xff,
0x05, 0xff,
0x00, 0xff,
0x00, 0xff,
0x00, 0xff,
0x00, 0xff,
0x00, 0xff,
0x00, 0xff,
0x00, 0xff,
0x00, 0xff,
0xfc, 0xff,
0xfc, 0xff,
0xfe, 0xff,
0xf0, 0xff,
0xf0, 0xff,
0xf0, 0xff,
0xe0, 0xff,
0xe0, 0xff,
0xe0, 0xff,
0x18, 0xff,
0x18, 0xff,
0x18, 0xff,
LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 84), 0xff,
LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 72), 0xff,
LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 66), 0xff,
LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 60), 0xff,
LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 56), 0xff,
LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 52), 0xff,
0, 0xff,
1, 0xff,
1, 0xff,
2, 0xff,
2, 0xff,
3, 0xff,
4, 0xff,
5, 0xff,
0, 0xff,
0, 0xff,
0, 0xff,
0, 0xff,
0, 0xff,
0, 0xff,
0, 0xff,
0, 0xff,
0xff,
0, 0,
0, 0,
0, 0,
@@ -151,6 +155,7 @@ static const esp_phy_init_data_t phy_init_data= { {
0, 0,
0, 0,
0, 0,
0x74
} }; } };
static const char phy_init_magic_post[] = PHY_INIT_MAGIC; static const char phy_init_magic_post[] = PHY_INIT_MAGIC;

2
components/esp_phy/lib

Submodule components/esp_phy/lib updated: 0deb3621c2...6def308291

2
components/esp_rom/esp32s3/ld/esp32s3.rom.ld
View File

@@ -2027,7 +2027,7 @@ ic_reset_rx_ba = 0x40005a3c;
ieee80211_align_eb = 0x40005a48; ieee80211_align_eb = 0x40005a48;
ieee80211_ampdu_reorder = 0x40005a54; ieee80211_ampdu_reorder = 0x40005a54;
ieee80211_ampdu_start_age_timer = 0x40005a60; ieee80211_ampdu_start_age_timer = 0x40005a60;
ieee80211_encap_esfbuf = 0x40005a6c; /* ieee80211_encap_esfbuf = 0x40005a6c; */
ieee80211_is_tx_allowed = 0x40005a78; ieee80211_is_tx_allowed = 0x40005a78;
ieee80211_output_pending_eb = 0x40005a84; ieee80211_output_pending_eb = 0x40005a84;
ieee80211_output_process = 0x40005a90; ieee80211_output_process = 0x40005a90;

2
components/esp_wifi/Kconfig
View File

@@ -280,7 +280,7 @@ menu "Wi-Fi"
config ESP_WIFI_FTM_ENABLE config ESP_WIFI_FTM_ENABLE
bool "WiFi FTM" bool "WiFi FTM"
default n default n
depends on (IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32C3) depends on (IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32S3)
help help
Enable feature Fine Timing Measurement for calculating WiFi Round-Trip-Time (RTT). Enable feature Fine Timing Measurement for calculating WiFi Round-Trip-Time (RTT).

2
components/esp_wifi/lib

Submodule components/esp_wifi/lib updated: ae2b749c21...845eb82031

24
examples/wifi/iperf/sdkconfig.defaults.esp32s3
View File

@@ -1,19 +1,19 @@
# #
# ESP32S3-specific # ESP32S3-specific
# #
CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=8 CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=16
CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=24 CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=32
CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=24 CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=32
CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED=y CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED=y
CONFIG_ESP32_WIFI_TX_BA_WIN=16 CONFIG_ESP32_WIFI_TX_BA_WIN=32
CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=y CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=y
CONFIG_ESP32_WIFI_RX_BA_WIN=16 CONFIG_ESP32_WIFI_RX_BA_WIN=32
CONFIG_LWIP_TCP_SND_BUF_DEFAULT=28000 CONFIG_LWIP_TCP_SND_BUF_DEFAULT=65535
CONFIG_LWIP_TCP_WND_DEFAULT=28000 CONFIG_LWIP_TCP_WND_DEFAULT=65535
CONFIG_LWIP_TCP_RECVMBOX_SIZE=32 CONFIG_LWIP_TCP_RECVMBOX_SIZE=64
CONFIG_LWIP_UDP_RECVMBOX_SIZE=32 CONFIG_LWIP_UDP_RECVMBOX_SIZE=64
CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=32 CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=64
CONFIG_ESP32S3_DEFAULT_CPU_FREQ_240=y CONFIG_ESP32S3_DEFAULT_CPU_FREQ_240=y
CONFIG_ESP32S3_DEFAULT_CPU_FREQ_MHZ=240 CONFIG_ESP32S3_DEFAULT_CPU_FREQ_MHZ=240
@@ -21,6 +21,6 @@ CONFIG_ESP32S3_DEFAULT_CPU_FREQ_MHZ=240
CONFIG_ESPTOOLPY_FLASHMODE_QIO=y CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
CONFIG_ESPTOOLPY_FLASHFREQ_80M=y CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
CONFIG_ESP32S3_INSTRUCTION_CACHE_16KB=y CONFIG_ESP32S3_INSTRUCTION_CACHE_32KB=y
CONFIG_ESP32S3_INSTRUCTION_CACHE_LINE_16B=y CONFIG_ESP32S3_INSTRUCTION_CACHE_LINE_32B=y
CONFIG_ESP32S3_INSTRUCTION_CACHE_WRAP=y CONFIG_ESP32S3_INSTRUCTION_CACHE_WRAP=y