espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-02 20:24:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fix_two_times_full_calibration' into 'master'

Browse Source 
esp32: fix the bug that the first two reboots do full calibration

See merge request idf/esp-idf!2540
This commit is contained in:
Jiang Jiang Jian
2018-06-14 15:49:03 +08:00
parent 0b16ed644e fc72d53c71
commit 54d882101c
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/esp32/phy_init.c
View File

@@ -493,7 +493,6 @@ static esp_err_t load_cal_data_from_nvs_handle(nvs_handle handle,
ESP_LOGD(TAG, "%s: invalid length of cal_data (%d)", __func__, length); ESP_LOGD(TAG, "%s: invalid length of cal_data (%d)", __func__, length);
return ESP_ERR_INVALID_SIZE; return ESP_ERR_INVALID_SIZE;
} }
memcpy(out_cal_data->mac, sta_mac, 6);
return ESP_OK; return ESP_OK;
} }
@@ -549,6 +548,7 @@ void esp_phy_load_cal_and_init(phy_rf_module_t module)
#ifdef CONFIG_ESP32_PHY_CALIBRATION_AND_DATA_STORAGE #ifdef CONFIG_ESP32_PHY_CALIBRATION_AND_DATA_STORAGE
esp_phy_calibration_mode_t calibration_mode = PHY_RF_CAL_PARTIAL; esp_phy_calibration_mode_t calibration_mode = PHY_RF_CAL_PARTIAL;
uint8_t sta_mac[6];
if (rtc_get_reset_reason(0) == DEEPSLEEP_RESET) { if (rtc_get_reset_reason(0) == DEEPSLEEP_RESET) {
calibration_mode = PHY_RF_CAL_NONE; calibration_mode = PHY_RF_CAL_NONE;
} }
@@ -558,6 +558,8 @@ void esp_phy_load_cal_and_init(phy_rf_module_t module)
calibration_mode = PHY_RF_CAL_FULL; calibration_mode = PHY_RF_CAL_FULL;
} }
esp_efuse_mac_get_default(sta_mac);
memcpy(cal_data->mac, sta_mac, 6);
esp_phy_rf_init(init_data, calibration_mode, cal_data, module); esp_phy_rf_init(init_data, calibration_mode, cal_data, module);
if (calibration_mode != PHY_RF_CAL_NONE && err != ESP_OK) { if (calibration_mode != PHY_RF_CAL_NONE && err != ESP_OK) {