|
|
@@ -1,5 +1,5 @@
|
|
|
/*
|
|
|
- * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD
|
|
|
+ * SPDX-FileCopyrightText: 2020-2023 Espressif Systems (Shanghai) CO LTD
|
|
|
*
|
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
|
*/
|
|
|
@@ -39,32 +39,32 @@ static const int coeff_a_scaling = 1000000;
|
|
|
* @note Above formula is rewritten from the original documentation, please note that the coefficients are re-ordered.
|
|
|
*/
|
|
|
const static uint64_t adc1_error_coef_atten[4][5][2] = {
|
|
|
- {{27856531419538344, 1e16}, {50871540569528, 1e16}, {9798249589, 1e15}, {0, 0}, {0, 0}}, //ADC1 atten0
|
|
|
- {{29831022915028695, 1e16}, {49393185868806, 1e16}, {101379430548, 1e16}, {0, 0}, {0, 0}}, //ADC1 atten1
|
|
|
- {{23285545746296417, 1e16}, {147640181047414, 1e16}, {208385525314, 1e16}, {0, 0}, {0, 0}}, //ADC1 atten2
|
|
|
- {{644403418269478, 1e15}, {644334888647536, 1e16}, {1297891447611, 1e16}, {70769718, 1e15}, {13515, 1e15}} //ADC1 atten3
|
|
|
- };
|
|
|
+ {{27856531419538344, 1e16}, {50871540569528, 1e16}, {9798249589, 1e15}, {0, 0}, {0, 0}}, //ADC1 atten0
|
|
|
+ {{29831022915028695, 1e16}, {49393185868806, 1e16}, {101379430548, 1e16}, {0, 0}, {0, 0}}, //ADC1 atten1
|
|
|
+ {{23285545746296417, 1e16}, {147640181047414, 1e16}, {208385525314, 1e16}, {0, 0}, {0, 0}}, //ADC1 atten2
|
|
|
+ {{644403418269478, 1e15}, {644334888647536, 1e16}, {1297891447611, 1e16}, {70769718, 1e15}, {13515, 1e15}} //ADC1 atten3
|
|
|
+};
|
|
|
const static uint64_t adc2_error_coef_atten[4][5][2] = {
|
|
|
- {{25668651654328927, 1e16}, {1353548869615, 1e16}, {36615265189, 1e16}, {0, 0}, {0, 0}}, //ADC2 atten0
|
|
|
- {{23690184690298404, 1e16}, {66319894226185, 1e16}, {118964995959, 1e16}, {0, 0}, {0, 0}}, //ADC2 atten1
|
|
|
- {{9452499397020617, 1e16}, {200996773954387, 1e16}, {259011467956, 1e16}, {0, 0}, {0, 0}}, //ADC2 atten2
|
|
|
- {{12247719764336924,1e16}, {755717904943462, 1e16}, {1478791187119, 1e16}, {79672528, 1e15}, {15038, 1e15}} //ADC2 atten3
|
|
|
- };
|
|
|
+ {{25668651654328927, 1e16}, {1353548869615, 1e16}, {36615265189, 1e16}, {0, 0}, {0, 0}}, //ADC2 atten0
|
|
|
+ {{23690184690298404, 1e16}, {66319894226185, 1e16}, {118964995959, 1e16}, {0, 0}, {0, 0}}, //ADC2 atten1
|
|
|
+ {{9452499397020617, 1e16}, {200996773954387, 1e16}, {259011467956, 1e16}, {0, 0}, {0, 0}}, //ADC2 atten2
|
|
|
+ {{12247719764336924, 1e16}, {755717904943462, 1e16}, {1478791187119, 1e16}, {79672528, 1e15}, {15038, 1e15}} //ADC2 atten3
|
|
|
+};
|
|
|
/**
|
|
|
* Term sign
|
|
|
*/
|
|
|
const static int32_t adc1_error_sign[4][5] = {
|
|
|
- {-1, -1, 1, 0, 0}, //ADC1 atten0
|
|
|
- {-1, -1, 1, 0, 0}, //ADC1 atten1
|
|
|
- {-1, -1, 1, 0, 0}, //ADC1 atten2
|
|
|
- {-1, -1, 1, -1, 1} //ADC1 atten3
|
|
|
- };
|
|
|
+ {-1, -1, 1, 0, 0}, //ADC1 atten0
|
|
|
+ {-1, -1, 1, 0, 0}, //ADC1 atten1
|
|
|
+ {-1, -1, 1, 0, 0}, //ADC1 atten2
|
|
|
+ {-1, -1, 1, -1, 1} //ADC1 atten3
|
|
|
+};
|
|
|
const static int32_t adc2_error_sign[4][5] = {
|
|
|
- {-1, 1, 1, 0, 0}, //ADC2 atten0
|
|
|
- {-1, -1, 1, 0, 0}, //ADC2 atten1
|
|
|
- {-1, -1, 1, 0, 0}, //ADC2 atten2
|
|
|
- { 1, -1, 1, -1, 1} //ADC2 atten3
|
|
|
- };
|
|
|
+ {-1, 1, 1, 0, 0}, //ADC2 atten0
|
|
|
+ {-1, -1, 1, 0, 0}, //ADC2 atten1
|
|
|
+ {-1, -1, 1, 0, 0}, //ADC2 atten2
|
|
|
+ { 1, -1, 1, -1, 1} //ADC2 atten3
|
|
|
+};
|
|
|
|
|
|
/* -------------------- Characterization Helper Data Types ------------------ */
|
|
|
typedef struct {
|
|
|
@@ -81,7 +81,6 @@ typedef struct {
|
|
|
} ref_data;
|
|
|
} adc_calib_info_t;
|
|
|
|
|
|
-
|
|
|
//To get the reference point (Dout, Vin)
|
|
|
static esp_err_t get_reference_point(int version_num, adc_unit_t adc_num, adc_atten_t atten, adc_calib_info_t *calib_info)
|
|
|
{
|
|
|
@@ -125,10 +124,10 @@ static void calculate_characterization_coefficients(const adc_calib_info_t *pars
|
|
|
}
|
|
|
|
|
|
esp_adc_cal_value_t esp_adc_cal_characterize(adc_unit_t adc_num,
|
|
|
- adc_atten_t atten,
|
|
|
- adc_bits_width_t bit_width,
|
|
|
- uint32_t default_vref,
|
|
|
- esp_adc_cal_characteristics_t *chars)
|
|
|
+ adc_atten_t atten,
|
|
|
+ adc_bits_width_t bit_width,
|
|
|
+ uint32_t default_vref,
|
|
|
+ esp_adc_cal_characteristics_t *chars)
|
|
|
{
|
|
|
(void) default_vref;
|
|
|
|
|
|
@@ -176,8 +175,8 @@ uint32_t esp_adc_cal_raw_to_voltage(uint32_t adc_reading, const esp_adc_cal_char
|
|
|
esp_adc_error_calc_param_t param = {
|
|
|
.v_cali_input = v_cali_1,
|
|
|
.term_num = (chars->atten == 3) ? 5 : 3,
|
|
|
- .coeff = (chars->adc_num == ADC_UNIT_1) ? &adc1_error_coef_atten : &adc2_error_coef_atten,
|
|
|
- .sign = (chars->adc_num == ADC_UNIT_1) ? &adc1_error_sign : &adc2_error_sign,
|
|
|
+ .coeff = (chars->adc_num == ADC_UNIT_1) ? &adc1_error_coef_atten :&adc2_error_coef_atten,
|
|
|
+ .sign = (chars->adc_num == ADC_UNIT_1) ? &adc1_error_sign :&adc2_error_sign,
|
|
|
};
|
|
|
error = esp_adc_cal_get_reading_error(¶m, chars->atten);
|
|
|
|