Skip to content

Commit 73eba43

Browse files
committed
Use typedef instead of conditionals.
1 parent f4b028d commit 73eba43

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

src/NimBLEDevice.cpp

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -422,18 +422,17 @@ std::vector<NimBLEClient*> NimBLEDevice::getConnectedClients() {
422422
/* -------------------------------------------------------------------------- */
423423

424424
# ifdef ESP_PLATFORM
425-
# ifndef CONFIG_IDF_TARGET_ESP32P4
426425

427426
/**
428427
* @brief Get the transmission power.
429428
* @return The power level currently used in esp_power_level_t.
430429
*/
431430
esp_power_level_t NimBLEDevice::getPowerLevel(esp_ble_power_type_t powerType) {
432-
# ifdef CONFIG_IDF_TARGET_ESP32P4
431+
# ifdef CONFIG_IDF_TARGET_ESP32P4
433432
return 0xFF; // CONFIG_IDF_TARGET_ESP32P4 does not support esp_ble_tx_power_get
434-
# else
433+
# else
435434
return esp_ble_tx_power_get(powerType);
436-
# endif
435+
# endif
437436
} // getPowerLevel
438437

439438
/**
@@ -442,14 +441,17 @@ esp_power_level_t NimBLEDevice::getPowerLevel(esp_ble_power_type_t powerType) {
442441
* @return True if the power level was set successfully.
443442
*/
444443
bool NimBLEDevice::setPowerLevel(esp_power_level_t powerLevel, esp_ble_power_type_t powerType) {
444+
# ifdef CONFIG_IDF_TARGET_ESP32P4
445+
return false; // CONFIG_IDF_TARGET_ESP32P4 does not support esp_ble_tx_power_set
446+
# else
445447
esp_err_t errRc = esp_ble_tx_power_set(powerType, powerLevel);
446448
if (errRc != ESP_OK) {
447449
NIMBLE_LOGE(LOG_TAG, "esp_ble_tx_power_set: rc=%d", errRc);
448450
}
449451

450452
return errRc == ESP_OK;
453+
# endif
451454
} // setPowerLevel
452-
# endif // !CONFIG_IDF_TARGET_ESP32P4
453455
# endif // ESP_PLATFORM
454456

455457
/**

src/NimBLEDevice.h

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,11 @@
1818
#include "nimconfig.h"
1919
#if defined(CONFIG_BT_ENABLED)
2020
# ifdef ESP_PLATFORM
21-
# ifndef CONFIG_IDF_TARGET_ESP32P4
21+
# ifdef CONFIG_IDF_TARGET_ESP32P4
22+
typedef int esp_ble_power_type_t;
23+
typedef int esp_power_level_t;
24+
# define ESP_BLE_PWR_TYPE_DEFAULT 0
25+
# else
2226
# include <esp_bt.h>
2327
# endif
2428
# endif
@@ -139,10 +143,8 @@ class NimBLEDevice {
139143
static bool setPower(int8_t dbm);
140144

141145
# ifdef ESP_PLATFORM
142-
# ifndef CONFIG_IDF_TARGET_ESP32P4
143146
static esp_power_level_t getPowerLevel(esp_ble_power_type_t powerType = ESP_BLE_PWR_TYPE_DEFAULT);
144147
static bool setPowerLevel(esp_power_level_t powerLevel, esp_ble_power_type_t powerType = ESP_BLE_PWR_TYPE_DEFAULT);
145-
# endif
146148
# endif
147149

148150
# if CONFIG_BT_NIMBLE_EXT_ADV

0 commit comments

Comments
 (0)