Merge branch 'bugfix/fix_phy_cal_data' into 'master'

fix(phy): add phy calibration data check when mode is not none calibration

Closes PM-130 and AUD-5423

See merge request espressif/esp-idf!31052
This commit is contained in:
Jiang Jiang Jian
2024-06-25 11:34:24 +08:00
2 changed files with 2 additions and 3 deletions

View File

@@ -873,8 +873,7 @@ void esp_phy_load_cal_and_init(void)
ESP_LOGW(TAG, "saving new calibration data because of checksum failure, mode(%d)", calibration_mode); ESP_LOGW(TAG, "saving new calibration data because of checksum failure, mode(%d)", calibration_mode);
} }
if ((calibration_mode != PHY_RF_CAL_NONE && err != ESP_OK) || if ((calibration_mode != PHY_RF_CAL_NONE) && ((err != ESP_OK) || (ret == ESP_CAL_DATA_CHECK_FAIL))) {
(calibration_mode != PHY_RF_CAL_FULL && ret == ESP_CAL_DATA_CHECK_FAIL)) {
err = esp_phy_store_cal_data_to_nvs(cal_data); err = esp_phy_store_cal_data_to_nvs(cal_data);
} else { } else {
err = ESP_OK; err = ESP_OK;