From: Ivan Grokhotkov <ivan@espressif.com>
Date: Tue, 7 Feb 2017 07:14:45 +0000 (+0800)
Subject: phy_init: don’t rewrite valid calibration data
X-Git-Tag: v2.0-rc2~58^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=777816cb99874b9c7f53ad93365fd5fffbefd364;p=esp-idf

phy_init: don’t rewrite valid calibration data

In the default PHY init routine, calibration data is loaded from NVS.
Most of the time the incremental changes to calibration will be fairly
small, so we don’t need to rewrite the existing calibration data stored
in the NVS.

Possible enhancement to be done in the future: expose a function in PHY
library to tell how big was the change in calibration data. If the
change was significant, then calibration data stored in NVS should be
updated.
---

diff --git a/components/esp32/cpu_start.c b/components/esp32/cpu_start.c
index 001d1706e1..5278f9b166 100644
--- a/components/esp32/cpu_start.c
+++ b/components/esp32/cpu_start.c
@@ -294,7 +294,7 @@ static void do_phy_init()
 
     esp_phy_init(init_data, calibration_mode, cal_data);
 
-    if (calibration_mode != PHY_RF_CAL_NONE) {
+    if (calibration_mode != PHY_RF_CAL_NONE && err != ESP_OK) {
         err = esp_phy_store_cal_data_to_nvs(cal_data);
     } else {
         err = ESP_OK;