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

jack0c · jack0c · commit e7b6fb75d415 · 2024-06-25T11:36:50.000+08:00
fix(phy): add phy calibration data check when mode is not none calibration(v5.3)

See merge request espressif/esp-idf!31480
diff --git a/components/esp_phy/lib b/components/esp_phy/lib
@@ -1 +1 @@
-Subproject commit 792ba5917ee8191e7264143e69f9e6f8c1c0eacc
+Subproject commit 06e7625de197bc12797dd701d6762229bca01826
diff --git a/components/esp_phy/src/phy_init.c b/components/esp_phy/src/phy_init.c
@@ -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);
     }
 
-    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;

Original file line number	Diff line number	Diff line change
`@@ -873,8 +873,7 @@ void esp_phy_load_cal_and_init(void)`
`873`	`873`	`ESP_LOGW(TAG, "saving new calibration data because of checksum failure, mode(%d)", calibration_mode);`
`874`	`874`	`}`
`875`	`875`
`876`		`- if ((calibration_mode != PHY_RF_CAL_NONE && err != ESP_OK) \|\|`
`877`		`- (calibration_mode != PHY_RF_CAL_FULL && ret == ESP_CAL_DATA_CHECK_FAIL)) {`
	`876`	`+ if ((calibration_mode != PHY_RF_CAL_NONE) && ((err != ESP_OK) \|\| (ret == ESP_CAL_DATA_CHECK_FAIL))) {`
`878`	`877`	`err = esp_phy_store_cal_data_to_nvs(cal_data);`
`879`	`878`	`} else {`
`880`	`879`	`err = ESP_OK;`