From c257daa950ecc89745b7ff621ae2ca748a55d982 Mon Sep 17 00:00:00 2001 From: "Michael (XIAO Xufeng)" Date: Mon, 4 Jan 2021 12:25:24 +0800 Subject: [PATCH] wifi: run adc2 calibration on C3 --- components/driver/include/driver/adc2_wifi_private.h | 11 +++++++++-- components/esp_wifi/src/wifi_init.c | 2 -- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/components/driver/include/driver/adc2_wifi_private.h b/components/driver/include/driver/adc2_wifi_private.h index c5204f8884..c4f622658d 100644 --- a/components/driver/include/driver/adc2_wifi_private.h +++ b/components/driver/include/driver/adc2_wifi_private.h @@ -43,14 +43,21 @@ esp_err_t adc2_wifi_acquire(void); */ esp_err_t adc2_wifi_release(void); -#if CONFIG_IDF_TARGET_ESP32S2 +#if CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32C3 /** * @brief This API help ADC2 calibration constructor be linked. * * @note This is a private function, Don't call `adc2_cal_include` in user code. */ void adc2_cal_include(void); -#endif //CONFIG_IDF_TARGET_ESP32S2 +#else +/** + * @brief There's no calibration involved on this chip. + * + * @note This is a private function, Don't call `adc2_cal_include` in user code. + */ +#define adc2_cal_include() +#endif //CONFIG_IDF_TARGET_* #ifdef __cplusplus } diff --git a/components/esp_wifi/src/wifi_init.c b/components/esp_wifi/src/wifi_init.c index 85d74a777c..5a5a5ffcdb 100644 --- a/components/esp_wifi/src/wifi_init.c +++ b/components/esp_wifi/src/wifi_init.c @@ -247,9 +247,7 @@ esp_err_t esp_wifi_init(const wifi_init_config_t *config) return result; } } -#if CONFIG_IDF_TARGET_ESP32S2 adc2_cal_include(); //This enables the ADC2 calibration constructor at start up. -#endif esp_wifi_config_info(); return result; }