From 115738b91e3d833493a6f6caca1c354d8bfae8f5 Mon Sep 17 00:00:00 2001 From: xiaqilin Date: Thu, 16 May 2024 17:29:16 +0800 Subject: [PATCH 1/2] fix(esp_phy): fix the frequency switching issue in esp32h2/esp32c6 ble/ieee802154 coex --- components/esp_phy/lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/esp_phy/lib b/components/esp_phy/lib index 792ba5917e..c5d2548ae6 160000 --- a/components/esp_phy/lib +++ b/components/esp_phy/lib @@ -1 +1 @@ -Subproject commit 792ba5917ee8191e7264143e69f9e6f8c1c0eacc +Subproject commit c5d2548ae63b895c5f7c8727f25c3e129c59d71d From ea4a2c70e93b89e750ebbc1687985762a1acca4c Mon Sep 17 00:00:00 2001 From: chenjianxing Date: Wed, 5 Jun 2024 15:56:57 +0800 Subject: [PATCH 2/2] fix(phy): add phy calibration data check when mode is not none calibration --- components/esp_phy/lib | 2 +- components/esp_phy/src/phy_init.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/components/esp_phy/lib b/components/esp_phy/lib index c5d2548ae6..06e7625de1 160000 --- a/components/esp_phy/lib +++ b/components/esp_phy/lib @@ -1 +1 @@ -Subproject commit c5d2548ae63b895c5f7c8727f25c3e129c59d71d +Subproject commit 06e7625de197bc12797dd701d6762229bca01826 diff --git a/components/esp_phy/src/phy_init.c b/components/esp_phy/src/phy_init.c index 74fde92b8f..f3410fc561 100644 --- 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;