feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

adc_cali: fix the condition of ocode calibration

Browse Source
This commit is contained in:
laokaiyao
2023-05-25 16:25:03 +08:00
parent e2fe2bf152
commit de8ae73de3
2 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/efuse/esp32c6/esp_efuse_rtc_calib.c
View File

@@ -19,10 +19,8 @@
int esp_efuse_rtc_calib_get_ver(void) int esp_efuse_rtc_calib_get_ver(void)
{ {
uint32_t blk_ver = efuse_hal_blk_version();
uint32_t cali_version = 0; uint32_t cali_version = 0;
if (blk_ver > 0) { if (efuse_hal_blk_version() >= 1) {
cali_version = ESP_EFUSE_ADC_CALIB_VER; cali_version = ESP_EFUSE_ADC_CALIB_VER;
} else { } else {
ESP_LOGW("eFuse", "calibration efuse version does not match, set default version to 0"); ESP_LOGW("eFuse", "calibration efuse version does not match, set default version to 0");

16
components/esp_hw_support/port/esp32c6/ocode_init.c
View File

@@ -78,20 +78,8 @@ static void calibrate_ocode(void)
void esp_ocode_calib_init(void) void esp_ocode_calib_init(void)
{ {
bool ignore_major = efuse_ll_get_disable_blk_version_major(); if (efuse_hal_blk_version() >= 1) {
uint32_t blk_version = efuse_hal_blk_version(); set_ocode_by_efuse(1);
uint8_t ocode_scheme_ver = 0;
if(blk_version == 0 && !ignore_major) {
ESP_HW_LOGE(TAG, "Invalid blk_version\n");
abort();
}
if(blk_version > 0) {
ocode_scheme_ver = 1;
}
if (ocode_scheme_ver == 1) {
set_ocode_by_efuse(ocode_scheme_ver);
} else { } else {
calibrate_ocode(); calibrate_ocode();
} }