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

Merge branch 'bugfix/phy_calib_data_to_nvs_for_c3_s3_v4.3' into 'release/v4.3'

Browse Source 
esp_wifi: re-enable phy calibration data to nvs for esp32c3 & esp32s3(V4.3)

See merge request espressif/esp-idf!13625
This commit is contained in:
Jiang Jiang Jian
2021-06-24 09:50:18 +00:00
parent cd4c444af9 8744cb880b
commit 5ab41b6c5d
6 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/esp_wifi/Kconfig
View File

@@ -376,9 +376,6 @@ endmenu # Wi-Fi
menu "PHY" menu "PHY"
config ESP32_PHY_CALIBRATION_AND_DATA_STORAGE config ESP32_PHY_CALIBRATION_AND_DATA_STORAGE
# ToDo: remove target dependency once NVS and PHY partial calibration are supported
# also re-enable the <RF_calibration> entry in docs/../api-guides/index.rst
depends on IDF_TARGET_ESP32
bool "Store phy calibration data in NVS" bool "Store phy calibration data in NVS"
default y default y
help help

2
components/esp_wifi/src/phy_init.c
View File

@@ -40,9 +40,11 @@
#elif CONFIG_IDF_TARGET_ESP32S2 #elif CONFIG_IDF_TARGET_ESP32S2
#include "esp32s2/rom/rtc.h" #include "esp32s2/rom/rtc.h"
#elif CONFIG_IDF_TARGET_ESP32C3 #elif CONFIG_IDF_TARGET_ESP32C3
#include "esp32c3/rom/rtc.h"
#include "soc/rtc_cntl_reg.h" #include "soc/rtc_cntl_reg.h"
#include "soc/syscon_reg.h" #include "soc/syscon_reg.h"
#elif CONFIG_IDF_TARGET_ESP32S3 #elif CONFIG_IDF_TARGET_ESP32S3
#include "esp32s3/rom/rtc.h"
#include "soc/rtc_cntl_reg.h" #include "soc/rtc_cntl_reg.h"
#include "soc/syscon_reg.h" #include "soc/syscon_reg.h"
#endif #endif

1
docs/conf_common.py
View File

@@ -180,7 +180,6 @@ RISCV_DOCS = []
ESP32_DOCS = ['api-guides/ulp_instruction_set.rst', ESP32_DOCS = ['api-guides/ulp_instruction_set.rst',
'api-reference/system/himem.rst', 'api-reference/system/himem.rst',
'api-guides/RF_calibration.rst',
'api-guides/romconsole.rst', 'api-guides/romconsole.rst',
'api-reference/system/ipc.rst', 'api-reference/system/ipc.rst',
'security/secure-boot-v1.rst', 'security/secure-boot-v1.rst',

8
docs/en/api-guides/RF_calibration.rst
View File

@@ -48,13 +48,7 @@ PHY initialization data
The PHY initialization data is used for RF calibration. The PHY initialization data is used for RF calibration.
There are two ways to get the PHY initialization data. 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/{IDF_TARGET_PATH_NAME}/include/phy_init_data.h`.
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`.
It is embedded into the application binary after compiling and then stored into read-only memory (DROM). 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`. To use the default initialization data, please go to ``menuconfig`` and disable :ref:`CONFIG_ESP32_PHY_INIT_DATA_IN_PARTITION`.

2
docs/en/api-guides/index.rst
View File

@@ -29,8 +29,8 @@ API Guides
Memory Types <memory-types> Memory Types <memory-types>
lwIP TCP/IP Stack <lwip> lwIP TCP/IP Stack <lwip>
Partition Tables <partition-tables> Partition Tables <partition-tables>
:esp32: RF Calibration <RF_calibration>
:esp32: ROM debug console <romconsole> :esp32: ROM debug console <romconsole>
RF Calibration <RF_calibration>
:esp32: Secure Boot <../security/secure-boot-v1> :esp32: Secure Boot <../security/secure-boot-v1>
Secure Boot V2 <../security/secure-boot-v2> Secure Boot V2 <../security/secure-boot-v2>
Thread Local Storage <thread-local-storage> Thread Local Storage <thread-local-storage>

2
docs/zh_CN/api-guides/index.rst
View File

@@ -29,8 +29,8 @@ API 指南
lwIP TCP/IP 协议栈 <lwip> lwIP TCP/IP 协议栈 <lwip>
Memory Types <memory-types> Memory Types <memory-types>
分区表 <partition-tables> 分区表 <partition-tables>
:esp32: 射频校准 <RF_calibration>
:esp32: ROM 调试控制台 <romconsole> :esp32: ROM 调试控制台 <romconsole>
射频校准 <RF_calibration>
:esp32: 安全启动 <../security/secure-boot-v1> :esp32: 安全启动 <../security/secure-boot-v1>
安全启动 V2 <../security/secure-boot-v2> 安全启动 V2 <../security/secure-boot-v2>
线程本地存储 <thread-local-storage> 线程本地存储 <thread-local-storage>