From 3423cc2937d124ffe89ce37bd889e5a7c2794a9f Mon Sep 17 00:00:00 2001 From: chenjianxing Date: Thu, 20 May 2021 21:55:59 +0800 Subject: [PATCH 1/2] esp_wifi: re-enable phy calibration data to nvs for esp32c3 & esp32s3 --- components/esp_wifi/Kconfig | 3 --- components/esp_wifi/src/phy_init.c | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/components/esp_wifi/Kconfig b/components/esp_wifi/Kconfig index 010e42e9fc..7571af4569 100644 --- a/components/esp_wifi/Kconfig +++ b/components/esp_wifi/Kconfig @@ -376,9 +376,6 @@ endmenu # Wi-Fi menu "PHY" config ESP32_PHY_CALIBRATION_AND_DATA_STORAGE - # ToDo: remove target dependency once NVS and PHY partial calibration are supported - # also re-enable the entry in docs/../api-guides/index.rst - depends on IDF_TARGET_ESP32 bool "Store phy calibration data in NVS" default y help diff --git a/components/esp_wifi/src/phy_init.c b/components/esp_wifi/src/phy_init.c index 88454cb0fe..0f50000f20 100644 --- a/components/esp_wifi/src/phy_init.c +++ b/components/esp_wifi/src/phy_init.c @@ -40,9 +40,11 @@ #elif CONFIG_IDF_TARGET_ESP32S2 #include "esp32s2/rom/rtc.h" #elif CONFIG_IDF_TARGET_ESP32C3 +#include "esp32c3/rom/rtc.h" #include "soc/rtc_cntl_reg.h" #include "soc/syscon_reg.h" #elif CONFIG_IDF_TARGET_ESP32S3 +#include "esp32s3/rom/rtc.h" #include "soc/rtc_cntl_reg.h" #include "soc/syscon_reg.h" #endif From 8744cb880bce441d07195fe25a032ec8e1851303 Mon Sep 17 00:00:00 2001 From: Marius Vikhammer Date: Wed, 26 May 2021 10:09:50 +0800 Subject: [PATCH 2/2] docs: add rf calibration docs for S2 and C3 --- docs/conf_common.py | 1 - docs/en/api-guides/RF_calibration.rst | 8 +------- docs/en/api-guides/index.rst | 2 +- docs/zh_CN/api-guides/index.rst | 2 +- 4 files changed, 3 insertions(+), 10 deletions(-) diff --git a/docs/conf_common.py b/docs/conf_common.py index 55baf60022..cf5f1418f9 100644 --- a/docs/conf_common.py +++ b/docs/conf_common.py @@ -180,7 +180,6 @@ RISCV_DOCS = [] ESP32_DOCS = ['api-guides/ulp_instruction_set.rst', 'api-reference/system/himem.rst', - 'api-guides/RF_calibration.rst', 'api-guides/romconsole.rst', 'api-reference/system/ipc.rst', 'security/secure-boot-v1.rst', diff --git a/docs/en/api-guides/RF_calibration.rst b/docs/en/api-guides/RF_calibration.rst index 883d82f809..a38b311331 100644 --- a/docs/en/api-guides/RF_calibration.rst +++ b/docs/en/api-guides/RF_calibration.rst @@ -48,13 +48,7 @@ PHY initialization data The PHY initialization data is used for RF calibration. There are two ways to get the PHY initialization data. -.. only:: esp32 - - One is the default initialization data which is located in the header file :idf_file:`components/esp_wifi/esp32/include/phy_init_data.h`. - -.. only:: esp32s2 - - One is the default initialization data which is located in the header file :idf_file:`components/esp_wifi/esp32s2/include/phy_init_data.h`. +One is the default initialization data which is located in the header file :idf_file:`components/esp_wifi/{IDF_TARGET_PATH_NAME}/include/phy_init_data.h`. It is embedded into the application binary after compiling and then stored into read-only memory (DROM). To use the default initialization data, please go to ``menuconfig`` and disable :ref:`CONFIG_ESP32_PHY_INIT_DATA_IN_PARTITION`. diff --git a/docs/en/api-guides/index.rst b/docs/en/api-guides/index.rst index d815e4d86f..16ab3d2f0a 100644 --- a/docs/en/api-guides/index.rst +++ b/docs/en/api-guides/index.rst @@ -29,8 +29,8 @@ API Guides Memory Types lwIP TCP/IP Stack Partition Tables - :esp32: RF Calibration :esp32: ROM debug console + RF Calibration :esp32: Secure Boot <../security/secure-boot-v1> Secure Boot V2 <../security/secure-boot-v2> Thread Local Storage diff --git a/docs/zh_CN/api-guides/index.rst b/docs/zh_CN/api-guides/index.rst index 6a8e5ef5a4..a12125ff31 100644 --- a/docs/zh_CN/api-guides/index.rst +++ b/docs/zh_CN/api-guides/index.rst @@ -29,8 +29,8 @@ API 指南 lwIP TCP/IP 协议栈 Memory Types 分区表 - :esp32: 射频校准 :esp32: ROM 调试控制台 + 射频校准 :esp32: 安全启动 <../security/secure-boot-v1> 安全启动 V2 <../security/secure-boot-v2> 线程本地存储