From efaa9d9856e8e4985cbe46dbe3c9cda23916eac7 Mon Sep 17 00:00:00 2001 From: Shubham Patil Date: Wed, 5 Mar 2025 18:37:50 +0530 Subject: [PATCH] ESP32: handle nimble_port_init's return values based on idf version nimble_port_init() on idf v5.0.1 and prior returns void, and from v5.0.2 it returns esp_err_t. --- src/platform/ESP32/nimble/BLEManagerImpl.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/platform/ESP32/nimble/BLEManagerImpl.cpp b/src/platform/ESP32/nimble/BLEManagerImpl.cpp index 5acd186a0dc18d..2c5bcb54c4d499 100644 --- a/src/platform/ESP32/nimble/BLEManagerImpl.cpp +++ b/src/platform/ESP32/nimble/BLEManagerImpl.cpp @@ -942,8 +942,13 @@ CHIP_ERROR BLEManagerImpl::InitESPBleLayer(void) SuccessOrExit(err); #endif +// For ESP-IDF 5.0.1 and below, nimble_port_init() returns void +#if ESP_IDF_VERSION <= ESP_IDF_VERSION_VAL(5, 0, 1) + nimble_port_init(); +#else err = MapBLEError(nimble_port_init()); SuccessOrExit(err); +#endif /* Initialize the NimBLE host configuration. */ ble_hs_cfg.reset_cb = bleprph_on_reset;