From c002920e375870a5ef7e18c6f609a960addfe219 Mon Sep 17 00:00:00 2001 From: thekurtovic <40248206+thekurtovic@users.noreply.github.com> Date: Fri, 15 Nov 2024 17:51:03 -0500 Subject: [PATCH] Account for differences in IDF version. --- src/NimBLEDevice.cpp | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/src/NimBLEDevice.cpp b/src/NimBLEDevice.cpp index 17abd8c..1d70dc5 100644 --- a/src/NimBLEDevice.cpp +++ b/src/NimBLEDevice.cpp @@ -497,15 +497,21 @@ int NimBLEDevice::getPower() { # ifndef CONFIG_IDF_TARGET_ESP32P4 switch (esp_ble_tx_power_get(ESP_BLE_PWR_TYPE_DEFAULT)) { # ifndef CONFIG_IDF_TARGET_ESP32 +# if ESP_IDF_VERSION <= ESP_IDF_VERSION_VAL(4,4,2) + case ESP_PWR_LVL_N27: + return -27; +# endif +# if !defined(CONFIG_IDF_TARGET_ESP32C6) || (ESP_IDF_VERSION == ESP_IDF_VERSION_VAL(5,1,0)) case ESP_PWR_LVL_N24: return -24; case ESP_PWR_LVL_N21: return -21; case ESP_PWR_LVL_N18: return -18; +# endif +# endif case ESP_PWR_LVL_N15: return -15; -# endif case ESP_PWR_LVL_N12: return -12; case ESP_PWR_LVL_N9: @@ -527,7 +533,7 @@ int NimBLEDevice::getPower() { return 12; case ESP_PWR_LVL_P15: return 15; -# ifdef CONFIG_IDF_TARGET_ESP32H2 +# if defined(CONFIG_IDF_TARGET_ESP32H2) && ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5,1,0) && ESP_IDF_VERSION <= ESP_IDF_VERSION_VAL(5,1,1) case ESP_PWR_LVL_P16: return 16; case ESP_PWR_LVL_P17: @@ -537,16 +543,15 @@ int NimBLEDevice::getPower() { # endif case ESP_PWR_LVL_P18: return 18; -# if defined(CONFIG_IDF_TARGET_ESP32S3) \ - || defined(CONFIG_IDF_TARGET_ESP32H2) - case ESP_PWR_LVL_P20: - return 20; -# endif -# if defined(CONFIG_IDF_TARGET_ESP32C2) \ - || defined(CONFIG_IDF_TARGET_ESP32C3) \ - || defined(CONFIG_IDF_TARGET_ESP32C6) +# if !defined(CONFIG_IDF_TARGET_ESP32H2) \ + || (defined(CONFIG_IDF_TARGET_ESP32C6) && ESP_IDF_VERSION == ESP_IDF_VERSION_VAL(5,1,0)) \ + && !(defined(CONFIG_IDF_TARGET_ESP32C3) && (ESP_IDF_VERSION == ESP_IDF_VERSION_VAL(5,1,5) || ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5,4,0))) \ + && !(defined(CONFIG_IDF_TARGET_ESP32C2) && (ESP_IDF_VERSION == ESP_IDF_VERSION_VAL(5,1,0) || ESP_IDF_VERSION == ESP_IDF_VERSION_VAL(5,1,1))) case ESP_PWR_LVL_P21: return 21; +# else + case ESP_PWR_LVL_P20: + return 20; # endif # endif default: