ScStw/esp-nimble-cpp
2
0
Fork 0
mirror of https://github.com/h2zero/esp-nimble-cpp.git synced 2024-11-22 13:10:55 +01:00
Code Issues Projects Releases Packages Wiki Activity

Account for differences in IDF version.

Browse source
This commit is contained in:
thekurtovic 2024-11-15 17:51:03 -05:00
parent c7a707ebed
commit c002920e37
1 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/NimBLEDevice.cpp
View file

@ -497,15 +497,21 @@ int NimBLEDevice::getPower() {
# ifndef CONFIG_IDF_TARGET_ESP32P4 # ifndef CONFIG_IDF_TARGET_ESP32P4
switch (esp_ble_tx_power_get(ESP_BLE_PWR_TYPE_DEFAULT)) { switch (esp_ble_tx_power_get(ESP_BLE_PWR_TYPE_DEFAULT)) {
# ifndef CONFIG_IDF_TARGET_ESP32 # 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: case ESP_PWR_LVL_N24:
return -24; return -24;
case ESP_PWR_LVL_N21: case ESP_PWR_LVL_N21:
return -21; return -21;
case ESP_PWR_LVL_N18: case ESP_PWR_LVL_N18:
return -18; return -18;
# endif
# endif
case ESP_PWR_LVL_N15: case ESP_PWR_LVL_N15:
return -15; return -15;
# endif
case ESP_PWR_LVL_N12: case ESP_PWR_LVL_N12:
return -12; return -12;
case ESP_PWR_LVL_N9: case ESP_PWR_LVL_N9:
@ -527,7 +533,7 @@ int NimBLEDevice::getPower() {
return 12; return 12;
case ESP_PWR_LVL_P15: case ESP_PWR_LVL_P15:
return 15; 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: case ESP_PWR_LVL_P16:
return 16; return 16;
case ESP_PWR_LVL_P17: case ESP_PWR_LVL_P17:
@ -537,16 +543,15 @@ int NimBLEDevice::getPower() {
# endif # endif
case ESP_PWR_LVL_P18: case ESP_PWR_LVL_P18:
return 18; return 18;
# if defined(CONFIG_IDF_TARGET_ESP32S3) \ # if !defined(CONFIG_IDF_TARGET_ESP32H2) \
|| defined(CONFIG_IDF_TARGET_ESP32H2) || (defined(CONFIG_IDF_TARGET_ESP32C6) && ESP_IDF_VERSION == ESP_IDF_VERSION_VAL(5,1,0)) \
case ESP_PWR_LVL_P20: && !(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))) \
return 20; && !(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)))
# endif
# if defined(CONFIG_IDF_TARGET_ESP32C2) \
|| defined(CONFIG_IDF_TARGET_ESP32C3) \
|| defined(CONFIG_IDF_TARGET_ESP32C6)
case ESP_PWR_LVL_P21: case ESP_PWR_LVL_P21:
return 21; return 21;
# else
case ESP_PWR_LVL_P20:
return 20;
# endif # endif
# endif # endif
default: default: