From 4e86f21be94c65cba6ae61c79a321f07fc24aa78 Mon Sep 17 00:00:00 2001 From: Nachiket Kukade Date: Wed, 6 May 2026 16:46:57 +0530 Subject: [PATCH] refactor(ftm): Add dummy FTM calibration values for S31 --- .../esp_private/ftm_calibration_data.h | 32 +++++++++++++++++++ components/esp_wifi/lib | 2 +- .../esp_wifi/src/ftm_load_calibration.c | 4 +-- 3 files changed, 35 insertions(+), 3 deletions(-) diff --git a/components/esp_wifi/include/esp_private/ftm_calibration_data.h b/components/esp_wifi/include/esp_private/ftm_calibration_data.h index f02fed2cacc..53297fd4f81 100644 --- a/components/esp_wifi/include/esp_private/ftm_calibration_data.h +++ b/components/esp_wifi/include/esp_private/ftm_calibration_data.h @@ -227,6 +227,38 @@ #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 +#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 859 // Connected Initiator in 20MHz (Ch 1) using 20MHz FTM +#define EST_PHY_INIT_FTM_COMP_20_20U_MHZ_DIS 859 // Disconnected Initiator in 20MHz (Ch 1) using 20MHz FTM +#define EST_PHY_INIT_FTM_COMP_20_20D_MHZ 869 // Connected Initiator in 20MHz (Ch 11) using 20MHz FTM +#define EST_PHY_INIT_FTM_COMP_20_20D_MHZ_DIS 869 // 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 867 // Connected Responder in 20MHz (Ch 1) using 20MHz FTM +#define EST_PHY_RESP_FTM_COMP_20_20U_MHZ_DIS 867 // Disconnected Responder in 20MHz (Ch 1) using 20MHz FTM +#define EST_PHY_RESP_FTM_COMP_20_20D_MHZ 857 // Connected Responder in 20MHz (Ch 11) using 20MHz FTM +#define EST_PHY_RESP_FTM_COMP_20_20D_MHZ_DIS 857 // 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 746 // Connected Initiator in 40MHz (Ch 1) using 20MHz FTM +#define EST_PHY_INIT_FTM_COMP_20_40U_MHZ_DIS 744 // Disconnected Initiator in 40MHz (Ch 1) using 20MHz FTM +#define EST_PHY_INIT_FTM_COMP_20_40D_MHZ 758 // Connected Initiator in 40MHz (Ch 11) using 20MHz FTM +#define EST_PHY_INIT_FTM_COMP_20_40D_MHZ_DIS 755 // 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 754 // Connected Responder in 40MHz (Ch 1) using 20MHz FTM +#define EST_PHY_RESP_FTM_COMP_20_40U_MHZ_DIS 753 // Disconnected Responder in 40MHz (Ch 1) using 20MHz FTM +#define EST_PHY_RESP_FTM_COMP_20_40D_MHZ 744 // Connected Responder in 40MHz (Ch 11) using 20MHz FTM +#define EST_PHY_RESP_FTM_COMP_20_40D_MHZ_DIS 744 // 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 931 // Connected Initiator in 40MHz (Ch 1) using 40MHz FTM +#define EST_PHY_INIT_FTM_COMP_40_40U_MHZ_DIS 931 // Disconnected Initiator in 40MHz (Ch 1) using 40MHz FTM +#define EST_PHY_INIT_FTM_COMP_40_40D_MHZ 931 // Connected Initiator in 40MHz (Ch 11) using 40MHz FTM +#define EST_PHY_INIT_FTM_COMP_40_40D_MHZ_DIS 931 // 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 566 // Connected Responder in 40MHz (Ch 1) using 40MHz FTM +#define EST_PHY_RESP_FTM_COMP_40_40U_MHZ_DIS 566 // Disconnected Responder in 40MHz (Ch 1) using 40MHz FTM +#define EST_PHY_RESP_FTM_COMP_40_40D_MHZ 567 // Connected Responder in 40MHz (Ch 11) using 40MHz FTM +#define EST_PHY_RESP_FTM_COMP_40_40D_MHZ_DIS 567 // Disconnected Responder in 40MHz (Ch 11) using 40MHz FTM #endif /********************************************** 5 GHz Values *******************************************************/ diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib index 5ec6ff614ad..ba511a1ad56 160000 --- a/components/esp_wifi/lib +++ b/components/esp_wifi/lib @@ -1 +1 @@ -Subproject commit 5ec6ff614ad9163384df491554c025b7c8ac39dc +Subproject commit ba511a1ad56b8f0f17e24ebe04f7bb3bf2806e12 diff --git a/components/esp_wifi/src/ftm_load_calibration.c b/components/esp_wifi/src/ftm_load_calibration.c index 8ff5f740388..8e937843d78 100644 --- a/components/esp_wifi/src/ftm_load_calibration.c +++ b/components/esp_wifi/src/ftm_load_calibration.c @@ -47,7 +47,7 @@ uint16_t est_PHY_RESP_FTM_COMP_20_40_MHZ_5G = EST_PHY_RESP_FTM_COMP_20_40U_MHZ_5 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_INIT_FTM_COMP_40_40U_MHZ_5G; -uint16_t est_PHY_RESP_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; #endif #endif /* CONFIG_ESP_WIFI_FTM_ENABLE */