Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-09-22 13:01:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/update_ftm_caldata_s31' into 'master'

Browse Source 
Update FTM calibration data for ESP32-S31

Closes WIFIBUG-2138

See merge request espressif/esp-idf!52510
This commit is contained in:
Jiang Jiang Jian
2026-09-17 11:58:52 +08:00
parent 1b3dc2d75b 47ae08abb8
commit a992ea7a1d
3 changed files with 61 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
components/esp_wifi/include/esp_private/ftm_calibration_data.h
View File

@@ -228,37 +228,36 @@
#define EST_PHY_RESP_FTM_COMP_40_40D_MHZ 631 // Connected Responder in 40MHz (Ch 11) using 40MHz FTM
#define EST_PHY_RESP_FTM_COMP_40_40D_MHZ_DIS 631 // Disconnected Responder in 40MHz (Ch 11) using 40MHz FTM
#elif CONFIG_IDF_TARGET_ESP32S31
//TODO: Dummy values, remove or update when FTM loopback and auto-calibration is verified
// 20 MHz FTM in 20MHz PHY - Initiator Values
#define EST_PHY_INIT_FTM_COMP_20_20U_MHZ 437 // Connected Initiator in 20MHz (Ch 1) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_20U_MHZ_DIS 433 // Disconnected Initiator in 20MHz (Ch 1) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_20D_MHZ 443 // Connected Initiator in 20MHz (Ch 11) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_20D_MHZ_DIS 442 // Disconnected Initiator in 20MHz (Ch 11) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_20U_MHZ 1151667 // Connected Initiator in 20MHz (Ch 1) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_20U_MHZ_DIS 1150667 // Disconnected Initiator in 20MHz (Ch 1) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_20D_MHZ 1157667 // Connected Initiator in 20MHz (Ch 11) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_20D_MHZ_DIS 1157667 // Disconnected Initiator in 20MHz (Ch 11) using 20MHz FTM
// 20 MHz FTM in 20MHz PHY - Responder Values
#define EST_PHY_RESP_FTM_COMP_20_20U_MHZ 426 // Connected Responder in 20MHz (Ch 1) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_20U_MHZ_DIS 429 // Disconnected Responder in 20MHz (Ch 1) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_20D_MHZ 420 // Connected Responder in 20MHz (Ch 11) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_20D_MHZ_DIS 421 // Disconnected Responder in 20MHz (Ch 11) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_20U_MHZ 1143333 // Connected Responder in 20MHz (Ch 1) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_20U_MHZ_DIS 1143333 // Disconnected Responder in 20MHz (Ch 1) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_20D_MHZ 1137333 // Connected Responder in 20MHz (Ch 11) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_20D_MHZ_DIS 1137333 // Disconnected Responder in 20MHz (Ch 11) using 20MHz FTM
// 20 MHz FTM in 40MHz PHY - Initiator Values
#define EST_PHY_INIT_FTM_COMP_20_40U_MHZ 462 // Connected Initiator in 40MHz (Ch 1) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_40U_MHZ_DIS 433 // Disconnected Initiator in 40MHz (Ch 1) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_40D_MHZ 438 // Connected Initiator in 40MHz (Ch 11) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_40D_MHZ_DIS 442 // Disconnected Initiator in 40MHz (Ch 11) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_40U_MHZ 980667 // Connected Initiator in 40MHz (Ch 1) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_40U_MHZ_DIS 974667 // Disconnected Initiator in 40MHz (Ch 1) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_40D_MHZ 983667 // Connected Initiator in 40MHz (Ch 11) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_40D_MHZ_DIS 980667 // Disconnected Initiator in 40MHz (Ch 11) using 20MHz FTM
// 20 MHz FTM in 40MHz PHY - Responder Values
#define EST_PHY_RESP_FTM_COMP_20_40U_MHZ 425 // Connected Responder in 40MHz (Ch 1) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_40U_MHZ_DIS 430 // Disconnected Responder in 40MHz (Ch 1) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_40D_MHZ 420 // Connected Responder in 40MHz (Ch 11) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_40D_MHZ_DIS 420 // Disconnected Responder in 40MHz (Ch 11) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_40U_MHZ 971333 // Connected Responder in 40MHz (Ch 1) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_40U_MHZ_DIS 963333 // Disconnected Responder in 40MHz (Ch 1) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_40D_MHZ 964333 // Connected Responder in 40MHz (Ch 11) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_40D_MHZ_DIS 957333 // Disconnected Responder in 40MHz (Ch 11) using 20MHz FTM
// 40 MHz FTM in 40MHz PHY - Initiator Values
#define EST_PHY_INIT_FTM_COMP_40_40U_MHZ 237 // Connected Initiator in 40MHz (Ch 1) using 40MHz FTM
#define EST_PHY_INIT_FTM_COMP_40_40U_MHZ_DIS 237 // Disconnected Initiator in 40MHz (Ch 1) using 40MHz FTM
#define EST_PHY_INIT_FTM_COMP_40_40D_MHZ 234 // Connected Initiator in 40MHz (Ch 11) using 40MHz FTM
#define EST_PHY_INIT_FTM_COMP_40_40D_MHZ_DIS 234 // Disconnected Initiator in 40MHz (Ch 11) using 40MHz FTM
#define EST_PHY_INIT_FTM_COMP_40_40U_MHZ 1304667 // Connected Initiator in 40MHz (Ch 1) using 40MHz FTM
#define EST_PHY_INIT_FTM_COMP_40_40U_MHZ_DIS 1304667 // Disconnected Initiator in 40MHz (Ch 1) using 40MHz FTM
#define EST_PHY_INIT_FTM_COMP_40_40D_MHZ 1309333 // Connected Initiator in 40MHz (Ch 11) using 40MHz FTM
#define EST_PHY_INIT_FTM_COMP_40_40D_MHZ_DIS 1310333 // Disconnected Initiator in 40MHz (Ch 11) using 40MHz FTM
// 40 MHz FTM in 40MHz PHY - Responder Values
#define EST_PHY_RESP_FTM_COMP_40_40U_MHZ 626 // Connected Responder in 40MHz (Ch 1) using 40MHz FTM
#define EST_PHY_RESP_FTM_COMP_40_40U_MHZ_DIS 626 // Disconnected Responder in 40MHz (Ch 1) using 40MHz FTM
#define EST_PHY_RESP_FTM_COMP_40_40D_MHZ 629 // Connected Responder in 40MHz (Ch 11) using 40MHz FTM
#define EST_PHY_RESP_FTM_COMP_40_40D_MHZ_DIS 629 // Disconnected Responder in 40MHz (Ch 11) using 40MHz FTM
#define EST_PHY_RESP_FTM_COMP_40_40U_MHZ 683333 // Connected Responder in 40MHz (Ch 1) using 40MHz FTM
#define EST_PHY_RESP_FTM_COMP_40_40U_MHZ_DIS 683333 // Disconnected Responder in 40MHz (Ch 1) using 40MHz FTM
#define EST_PHY_RESP_FTM_COMP_40_40D_MHZ 678667 // Connected Responder in 40MHz (Ch 11) using 40MHz FTM
#define EST_PHY_RESP_FTM_COMP_40_40D_MHZ_DIS 678667 // Disconnected Responder in 40MHz (Ch 11) using 40MHz FTM
#endif
/********************************************** 5 GHz Values *******************************************************/

2
components/esp_wifi/lib

Submodule components/esp_wifi/lib updated: cce8a73285...fa145344e0

72
components/esp_wifi/src/ftm_load_calibration.c
View File

@@ -10,44 +10,44 @@
#if CONFIG_ESP_WIFI_FTM_ENABLE
/****************** FTM Calibration Data Variables ******************/
uint16_t est_PHY_INIT_FTM_COMP_20_20U_MHZ = EST_PHY_INIT_FTM_COMP_20_20U_MHZ;
uint16_t est_PHY_RESP_FTM_COMP_20_20U_MHZ = EST_PHY_RESP_FTM_COMP_20_20U_MHZ;
uint16_t est_PHY_INIT_FTM_COMP_20_20D_MHZ = EST_PHY_INIT_FTM_COMP_20_20D_MHZ;
uint16_t est_PHY_RESP_FTM_COMP_20_20D_MHZ = EST_PHY_RESP_FTM_COMP_20_20D_MHZ;
uint16_t est_PHY_INIT_FTM_COMP_20_20U_MHZ_DIS = EST_PHY_INIT_FTM_COMP_20_20U_MHZ_DIS;
uint16_t est_PHY_INIT_FTM_COMP_20_20D_MHZ_DIS = EST_PHY_INIT_FTM_COMP_20_20D_MHZ_DIS;
uint16_t est_PHY_RESP_FTM_COMP_20_20U_MHZ_DIS = EST_PHY_RESP_FTM_COMP_20_20U_MHZ_DIS;
uint16_t est_PHY_RESP_FTM_COMP_20_20D_MHZ_DIS = EST_PHY_RESP_FTM_COMP_20_20D_MHZ_DIS;
uint32_t est_PHY_INIT_FTM_COMP_20_20U_MHZ = EST_PHY_INIT_FTM_COMP_20_20U_MHZ;
uint32_t est_PHY_RESP_FTM_COMP_20_20U_MHZ = EST_PHY_RESP_FTM_COMP_20_20U_MHZ;
uint32_t est_PHY_INIT_FTM_COMP_20_20D_MHZ = EST_PHY_INIT_FTM_COMP_20_20D_MHZ;
uint32_t est_PHY_RESP_FTM_COMP_20_20D_MHZ = EST_PHY_RESP_FTM_COMP_20_20D_MHZ;
uint32_t est_PHY_INIT_FTM_COMP_20_20U_MHZ_DIS = EST_PHY_INIT_FTM_COMP_20_20U_MHZ_DIS;
uint32_t est_PHY_INIT_FTM_COMP_20_20D_MHZ_DIS = EST_PHY_INIT_FTM_COMP_20_20D_MHZ_DIS;
uint32_t est_PHY_RESP_FTM_COMP_20_20U_MHZ_DIS = EST_PHY_RESP_FTM_COMP_20_20U_MHZ_DIS;
uint32_t est_PHY_RESP_FTM_COMP_20_20D_MHZ_DIS = EST_PHY_RESP_FTM_COMP_20_20D_MHZ_DIS;
#if !CONFIG_IDF_TARGET_ESP32C2
uint16_t est_PHY_INIT_FTM_COMP_40_40U_MHZ = EST_PHY_INIT_FTM_COMP_40_40U_MHZ;
uint16_t est_PHY_RESP_FTM_COMP_40_40U_MHZ = EST_PHY_RESP_FTM_COMP_40_40U_MHZ;
uint16_t est_PHY_INIT_FTM_COMP_40_40D_MHZ = EST_PHY_INIT_FTM_COMP_40_40D_MHZ;
uint16_t est_PHY_RESP_FTM_COMP_40_40D_MHZ = EST_PHY_RESP_FTM_COMP_40_40D_MHZ;
uint16_t est_PHY_INIT_FTM_COMP_20_40U_MHZ = EST_PHY_INIT_FTM_COMP_20_40U_MHZ;
uint16_t est_PHY_RESP_FTM_COMP_20_40U_MHZ = EST_PHY_RESP_FTM_COMP_20_40U_MHZ;
uint16_t est_PHY_INIT_FTM_COMP_20_40D_MHZ = EST_PHY_INIT_FTM_COMP_20_40D_MHZ;
uint16_t est_PHY_RESP_FTM_COMP_20_40D_MHZ = EST_PHY_RESP_FTM_COMP_20_40D_MHZ;
uint16_t est_PHY_INIT_FTM_COMP_20_40U_MHZ_DIS = EST_PHY_INIT_FTM_COMP_20_40U_MHZ_DIS;
uint16_t est_PHY_RESP_FTM_COMP_20_40U_MHZ_DIS = EST_PHY_RESP_FTM_COMP_20_40U_MHZ_DIS;
uint16_t est_PHY_INIT_FTM_COMP_20_40D_MHZ_DIS = EST_PHY_INIT_FTM_COMP_20_40D_MHZ_DIS;
uint16_t est_PHY_RESP_FTM_COMP_20_40D_MHZ_DIS = EST_PHY_RESP_FTM_COMP_20_40D_MHZ_DIS;
uint16_t est_PHY_INIT_FTM_COMP_40_40U_MHZ_DIS = EST_PHY_INIT_FTM_COMP_40_40U_MHZ_DIS;
uint16_t est_PHY_RESP_FTM_COMP_40_40U_MHZ_DIS = EST_PHY_RESP_FTM_COMP_40_40U_MHZ_DIS;
uint16_t est_PHY_INIT_FTM_COMP_40_40D_MHZ_DIS = EST_PHY_INIT_FTM_COMP_40_40D_MHZ_DIS;
uint16_t est_PHY_RESP_FTM_COMP_40_40D_MHZ_DIS = EST_PHY_RESP_FTM_COMP_40_40D_MHZ_DIS;
uint32_t est_PHY_INIT_FTM_COMP_40_40U_MHZ = EST_PHY_INIT_FTM_COMP_40_40U_MHZ;
uint32_t est_PHY_RESP_FTM_COMP_40_40U_MHZ = EST_PHY_RESP_FTM_COMP_40_40U_MHZ;
uint32_t est_PHY_INIT_FTM_COMP_40_40D_MHZ = EST_PHY_INIT_FTM_COMP_40_40D_MHZ;
uint32_t est_PHY_RESP_FTM_COMP_40_40D_MHZ = EST_PHY_RESP_FTM_COMP_40_40D_MHZ;
uint32_t est_PHY_INIT_FTM_COMP_20_40U_MHZ = EST_PHY_INIT_FTM_COMP_20_40U_MHZ;
uint32_t est_PHY_RESP_FTM_COMP_20_40U_MHZ = EST_PHY_RESP_FTM_COMP_20_40U_MHZ;
uint32_t est_PHY_INIT_FTM_COMP_20_40D_MHZ = EST_PHY_INIT_FTM_COMP_20_40D_MHZ;
uint32_t est_PHY_RESP_FTM_COMP_20_40D_MHZ = EST_PHY_RESP_FTM_COMP_20_40D_MHZ;
uint32_t est_PHY_INIT_FTM_COMP_20_40U_MHZ_DIS = EST_PHY_INIT_FTM_COMP_20_40U_MHZ_DIS;
uint32_t est_PHY_RESP_FTM_COMP_20_40U_MHZ_DIS = EST_PHY_RESP_FTM_COMP_20_40U_MHZ_DIS;
uint32_t est_PHY_INIT_FTM_COMP_20_40D_MHZ_DIS = EST_PHY_INIT_FTM_COMP_20_40D_MHZ_DIS;
uint32_t est_PHY_RESP_FTM_COMP_20_40D_MHZ_DIS = EST_PHY_RESP_FTM_COMP_20_40D_MHZ_DIS;
uint32_t est_PHY_INIT_FTM_COMP_40_40U_MHZ_DIS = EST_PHY_INIT_FTM_COMP_40_40U_MHZ_DIS;
uint32_t est_PHY_RESP_FTM_COMP_40_40U_MHZ_DIS = EST_PHY_RESP_FTM_COMP_40_40U_MHZ_DIS;
uint32_t est_PHY_INIT_FTM_COMP_40_40D_MHZ_DIS = EST_PHY_INIT_FTM_COMP_40_40D_MHZ_DIS;
uint32_t est_PHY_RESP_FTM_COMP_40_40D_MHZ_DIS = EST_PHY_RESP_FTM_COMP_40_40D_MHZ_DIS;
#endif
#if CONFIG_SOC_WIFI_SUPPORT_5G
uint16_t est_PHY_INIT_FTM_COMP_20_20_MHZ_5G = EST_PHY_INIT_FTM_COMP_20_20U_MHZ_5G;
uint16_t est_PHY_INIT_FTM_COMP_20_20_MHZ_5G_DIS = EST_PHY_INIT_FTM_COMP_20_20U_MHZ_5G_DIS;
uint16_t est_PHY_RESP_FTM_COMP_20_20_MHZ_5G = EST_PHY_RESP_FTM_COMP_20_20U_MHZ_5G;
uint16_t est_PHY_RESP_FTM_COMP_20_20_MHZ_5G_DIS = EST_PHY_RESP_FTM_COMP_20_20U_MHZ_5G_DIS;
uint16_t est_PHY_INIT_FTM_COMP_20_40_MHZ_5G = EST_PHY_INIT_FTM_COMP_20_40U_MHZ_5G;
uint16_t est_PHY_INIT_FTM_COMP_20_40_MHZ_5G_DIS = EST_PHY_INIT_FTM_COMP_20_40U_MHZ_5G_DIS;
uint16_t est_PHY_RESP_FTM_COMP_20_40_MHZ_5G = EST_PHY_RESP_FTM_COMP_20_40U_MHZ_5G;
uint16_t est_PHY_RESP_FTM_COMP_20_40_MHZ_5G_DIS = EST_PHY_RESP_FTM_COMP_20_40U_MHZ_5G_DIS;
uint16_t est_PHY_INIT_FTM_COMP_40_40_MHZ_5G = EST_PHY_INIT_FTM_COMP_40_40U_MHZ_5G;
uint16_t est_PHY_INIT_FTM_COMP_40_40_MHZ_5G_DIS = EST_PHY_INIT_FTM_COMP_40_40U_MHZ_5G_DIS;
uint16_t est_PHY_RESP_FTM_COMP_40_40_MHZ_5G = EST_PHY_RESP_FTM_COMP_40_40U_MHZ_5G;
uint16_t est_PHY_RESP_FTM_COMP_40_40_MHZ_5G_DIS = EST_PHY_RESP_FTM_COMP_40_40U_MHZ_5G_DIS;
uint32_t est_PHY_INIT_FTM_COMP_20_20_MHZ_5G = EST_PHY_INIT_FTM_COMP_20_20U_MHZ_5G;
uint32_t est_PHY_INIT_FTM_COMP_20_20_MHZ_5G_DIS = EST_PHY_INIT_FTM_COMP_20_20U_MHZ_5G_DIS;
uint32_t est_PHY_RESP_FTM_COMP_20_20_MHZ_5G = EST_PHY_RESP_FTM_COMP_20_20U_MHZ_5G;
uint32_t est_PHY_RESP_FTM_COMP_20_20_MHZ_5G_DIS = EST_PHY_RESP_FTM_COMP_20_20U_MHZ_5G_DIS;
uint32_t est_PHY_INIT_FTM_COMP_20_40_MHZ_5G = EST_PHY_INIT_FTM_COMP_20_40U_MHZ_5G;
uint32_t est_PHY_INIT_FTM_COMP_20_40_MHZ_5G_DIS = EST_PHY_INIT_FTM_COMP_20_40U_MHZ_5G_DIS;
uint32_t est_PHY_RESP_FTM_COMP_20_40_MHZ_5G = EST_PHY_RESP_FTM_COMP_20_40U_MHZ_5G;
uint32_t est_PHY_RESP_FTM_COMP_20_40_MHZ_5G_DIS = EST_PHY_RESP_FTM_COMP_20_40U_MHZ_5G_DIS;
uint32_t est_PHY_INIT_FTM_COMP_40_40_MHZ_5G = EST_PHY_INIT_FTM_COMP_40_40U_MHZ_5G;
uint32_t est_PHY_INIT_FTM_COMP_40_40_MHZ_5G_DIS = EST_PHY_INIT_FTM_COMP_40_40U_MHZ_5G_DIS;
uint32_t est_PHY_RESP_FTM_COMP_40_40_MHZ_5G = EST_PHY_RESP_FTM_COMP_40_40U_MHZ_5G;
uint32_t est_PHY_RESP_FTM_COMP_40_40_MHZ_5G_DIS = EST_PHY_RESP_FTM_COMP_40_40U_MHZ_5G_DIS;
#endif
#endif /* CONFIG_ESP_WIFI_FTM_ENABLE */