Merge branch 'bugfix/fix_phy_cal_data_v5.2' into 'release/v5.2'

fix(phy): add phy calibration data check when mode is not none calibration v5.2 See merge request espressif/esp-idf!31816
espressif · Jul 3, 2024 · 2acb6ac · 2acb6ac
2 parents cb2a226 + ea4a2c7
commit 2acb6ac
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/components/esp_phy/lib b/components/esp_phy/lib
diff --git a/components/esp_phy/src/phy_init.c b/components/esp_phy/src/phy_init.c
@@ -858,8 +858,7 @@ void esp_phy_load_cal_and_init(void)
         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) ||
-            (calibration_mode != PHY_RF_CAL_FULL && ret == ESP_CAL_DATA_CHECK_FAIL)) {
+    if ((calibration_mode != PHY_RF_CAL_NONE) && ((err != ESP_OK) || (ret == ESP_CAL_DATA_CHECK_FAIL))) {
         err = esp_phy_store_cal_data_to_nvs(cal_data);
     } else {
         err = ESP_OK;
+ −		esp32/libbttestmode.a
+ −		esp32/libphy.a
+ −		esp32/librftest.a
+ −		esp32c2/libbtbb.a
+ −		esp32c2/libbttestmode.a
+ −		esp32c2/libphy.a
+ −		esp32c2/librftest.a
+ −		esp32c3/libbtbb.a
+ −		esp32c3/libbttestmode.a
+ −		esp32c3/libphy.a
+ −		esp32c3/librftest.a
+ −		esp32c6/libbtbb.a
+ −		esp32c6/libbttestmode.a
+ −		esp32c6/libphy.a
+ −		esp32c6/librftest.a
+ −		esp32h2/libbtbb.a
+ −		esp32h2/libbttestmode.a
+ −		esp32h2/libphy.a
+ −		esp32h2/librftest.a
+ −		esp32s2/libphy.a
+ −		esp32s2/librftest.a
+ −		esp32s3/libbtbb.a
+ −		esp32s3/libbttestmode.a
+ −		esp32s3/libphy.a
+ −		esp32s3/librftest.a
+7 −5		fix_printf.sh