esp_adc_cal: Remove deprecated ADC calibration functions

Deprecated since ESP-IDF V3.1

diff --git a/components/esp_adc_cal/esp_adc_cal.c b/components/esp_adc_cal/esp_adc_cal.c
index 75146b37c9f8f829336c42cb4df940681ece792b..43b08c14612debcf0b02438c1bbbb021395550f8 100644 (file)
--- a/components/esp_adc_cal/esp_adc_cal.c
+++ b/components/esp_adc_cal/esp_adc_cal.c
@@ -390,23 +390,3 @@ esp_err_t esp_adc_cal_get_voltage(adc_channel_t channel,
     *voltage = esp_adc_cal_raw_to_voltage((uint32_t)adc_reading, chars);
     return ESP_OK;
 }
-
-/* ------------------------ Deprecated API --------------------------------- */
-void esp_adc_cal_get_characteristics(uint32_t vref,
-                                     adc_atten_t atten,
-                                     adc_bits_width_t bit_width,
-                                     esp_adc_cal_characteristics_t *chars)
-{
-    assert(chars != NULL);
-    esp_adc_cal_characterize(ADC_UNIT_1, atten, bit_width, vref, chars);
-}
-
-uint32_t adc1_to_voltage(adc1_channel_t channel, const esp_adc_cal_characteristics_t *chars)
-{
-    assert(chars != NULL);
-    uint32_t voltage = 0;
-    esp_adc_cal_get_voltage((adc_channel_t)channel, chars, &voltage);
-    return voltage;
-}
-
-

diff --git a/components/esp_adc_cal/include/esp_adc_cal.h b/components/esp_adc_cal/include/esp_adc_cal.h
index af611357b49a6b675e723fcdf0fce9dd162775c2..b1798847bd95007eb6093bb309f175146b0674d4 100644 (file)
--- a/components/esp_adc_cal/include/esp_adc_cal.h
+++ b/components/esp_adc_cal/include/esp_adc_cal.h
@@ -127,24 +127,6 @@ uint32_t esp_adc_cal_raw_to_voltage(uint32_t adc_reading, const esp_adc_cal_char
  */
 esp_err_t esp_adc_cal_get_voltage(adc_channel_t channel, const esp_adc_cal_characteristics_t *chars, uint32_t *voltage);
 
-/* -------------------------- Deprecated API ------------------------------- */
-
-/** @cond */    //Doxygen command to hide deprecated function from API Reference
-/**
- * @deprecated  ADC1 characterization function. Deprecated in order to accommodate
- *              ADC2 and eFuse functionality. Use esp_adc_cal_characterize() instead
- */
-void esp_adc_cal_get_characteristics(uint32_t vref, adc_atten_t atten, adc_bits_width_t bit_width, esp_adc_cal_characteristics_t *chars) __attribute__((deprecated));
-
-/*
- * @deprecated  This function reads ADC1 and returns the corrected voltage. This
- *              has been deprecated in order to accommodate ADC2 support. Use the
- *              new function esp_adc_cal_get_voltage() instead.
- */
-uint32_t adc1_to_voltage(adc1_channel_t channel, const esp_adc_cal_characteristics_t *chars) __attribute__((deprecated));
-
-/** @endcond */
-
 #ifdef __cplusplus
 }
 #endif