wip

2025-12-23 15:18:16 +01:00 · 2024-12-12 09:03:55 -07:00
76 changed files with 888 additions and 1566 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -17,7 +17,7 @@ jobs:
        # See https://hub.docker.com/r/espressif/idf/tags and
        # https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-guides/tools/idf-docker-image.html
        # for details.
-        idf_ver: ["release-v4.4", "release-v5.1", "v5.3.2"]
+        idf_ver: ["release-v4.4", "release-v5.1", "release-v5.3"]
        idf_target: ["esp32", "esp32s3", "esp32c2", "esp32c3", "esp32c6", "esp32h2", "esp32p4"]
        example:
          - NimBLE_Client
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,20 +0,0 @@
-name: Release
-
-on:
-  release:
-    types: [published]
-
-jobs:
-  build_docs:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Doxygen Action
-        uses: mattnotmitt/doxygen-action@v1.9.8
-        with:
-          working-directory: 'docs/'
-      - name: Deploy
-        uses: peaceiris/actions-gh-pages@v4
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: ./docs/doxydocs/html
--- a/.github/workflows/sponsors.yml
+++ b/.github/workflows/sponsors.yml
@@ -1,17 +0,0 @@
-name: Generate Sponsors README
-on:
-  workflow_dispatch:
-permissions:
-  contents: write
-jobs:
-  deploy:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout 🛎️
-        uses: actions/checkout@v4
-
-      - name: Generate Sponsors 💖
-        uses: JamesIves/github-sponsors-readme-action@v1.5.4
-        with:
-          token: ${{ secrets.PAT }}
-          file: 'README.md'
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-docs/doxydocs
+docs/doxydocs
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,82 +1,7 @@
 # Changelog
+
 All notable changes to this project will be documented in this file.
-
-## [2.2.1] 2025-02-28
-
-## Fixed
- Added back `NimBLEClient::connect` overload with `NimBLEAdvertisedDevice` parameter to resolve connection error due to NULL address.
- Crash caused by returning invalid vector entry when retrieving remote descriptors.
-
-## [2.2.0] 2025-02-24
-
-## Fixed
- Crash when calling `NimBLEClient::DiscoverAttributes`.
-
-## Added
- Conditional macros for logging.
- `NimBLEDeviceCallbacks` class with a callback for handling bond storage.
-
-## [2.1.1] 2025-01-26
-
-## Fixed
- remote descriptor discovery error when no descriptors exist.
- scan filter settings not enabled for esp32s3/c3.
- remote descriptor discovery returning more than the desired descriptor.
-
-## [2.1.0] 2025-01-12
-
-## Fixed
- Crash when retrieving descriptors if more than one exists.
- Incorrect TX power value being advertised.
- New user guide code for 2.x
- Potential race condition if `NimBLEScan::clearResults1 is called from multiple tasks.
-
-## Changed
- If privacy is not enabled identity keys will not be shared.
- `NimBLEDevice::setPower` and `NimBLEDevice::getPower` now take an additional parameter `NimBLETxPowerType` to set/get the power level for different operations.
-
-## Added
- Config option `CONFIG_NIMBLE_CPP_ADDR_FMT_EXCLUDE_DELIMITER`, if defined will remove the ":" delimiter from the BLE address string.
- Config option `CONFIG_NIMBLE_CPP_ADDR_FMT_UPPERCASE` if defined will make the BLE address strings uppercase.
-
-## [2.0.3] 2025-01-05
-
-## Fixed
- Unused variable warning when log level is below info.
- Build error missing definition of CONFIG_NIMBLE_CPP_FREERTOS_TASK_BLOCK_BIT in platformio.
- Race condition in `NimBLEScan` that can cause a crash due to heap corruption if `NimBLEScan::stop` is called from the `onResult` callback.
- Advertisement data not set if scan response is enabled after the data is set.
- `NimBLECharacteristic`/`NimBLEDescriptor` not able to update their values in the `onRead` callback.
- Too short of a timeout being requested in NimBLE_Server example leading to frequent disconnects.
-
-## Changed
- `NimBLEHIDDevice` now allows for the same report ID in multiple input/output/feature reports.
-
-## Added
- Config for custom log colors pre level.
- Error logs in the case that NIMBLE_CPP_DEBUG_ASSERT is not defined.
- Error logs when setting advertisement data fails.
- Missing documentation in the migration guide about enabling automatic advertising on disconnect, which was disabled by default in 2.x.
-
-## [2.0.2] 2024-12-21
-
-## Fixed
- Compile error when only advertising role is enabled.
- Possible crash if bonded client reconnects.
-
-## Changed
- `NimBLEHIDDevice` can now create more than one in/out/feature report map.
-
-## [2.0.1] 2024-12-16
-
-## Fixed
- `NimBLEHIDDevice::getOutputReport` will now return the correct characteristic.
- Compile error when central is disabled, class `NimBLEServer` has no member named `m_pClient`.
-
-## Changed
- Added missing includes for `NimBLEConnInfo` and `NimBLEUtils` to `NimBLEDevice.h`.
-
-## [2.0.0] 2024-12-14
+## [Unreleased]

 ## **Breaking changes**
 - All connection oriented callbacks now receive a reference to `NimBLEConnInfo`, the `ble_gap_conn_desc` has also been replace with `NimBLEConnInfo` in the functions that received it.
@@ -135,7 +60,6 @@ All notable changes to this project will be documented in this file.
 - `NimBLEService::getCharacteristics` now returns a `const std::vector<NimBLECharacteristic*>&` instead of std::vector<NimBLECharacteristic *>.
 - `NimBLEUUID::getNative` method replaced with `NimBLEUUID::getBase` which returns a read-only pointer to the underlying `ble_uuid_t` struct.
 - `NimBLEUUID`; `msbFirst` parameter has been removed from constructor, caller should reverse the data first or call the new `reverseByteOrder` method after.
- `NimBLEAddress` constructor; default value for the `type` parameter removed, caller should know the address type and specify it.
 - `NimBLEAddress::getNative` replaced with `NimBLEAddress::getBase` and now returns a pointer to `const ble_addr_t` instead of a pointer to the address value.
 - `NimBLEAddress::equals` method and `NimBLEAddress::== operator` will now also test if the address types are the same.
 - `NimBLEUtils::dumpGapEvent` function removed.
--- a/CMakeLists.txt_idf3
+++ b/CMakeLists.txt_idf3
@@ -0,0 +1,56 @@
+# The following lines of boilerplate have to be in your project's
+# CMakeLists in this exact order for cmake to work correctly
+cmake_minimum_required(VERSION 3.5)
+
+set(SUPPORTED_TARGETS esp32)
+
+set(COMPONENT_SRCS
+    "src/NimBLE2904.cpp"
+    "src/NimBLEAddress.cpp"
+    "src/NimBLEAdvertisedDevice.cpp"
+    "src/NimBLEAdvertising.cpp"
+    "src/NimBLEBeacon.cpp"
+    "src/NimBLECharacteristic.cpp"
+    "src/NimBLEClient.cpp"
+    "src/NimBLEDescriptor.cpp"
+    "src/NimBLEDevice.cpp"
+    "src/NimBLEEddystoneTLM.cpp"
+    "src/NimBLEEddystoneURL.cpp"
+    "src/NimBLEHIDDevice.cpp"
+    "src/NimBLERemoteCharacteristic.cpp"
+    "src/NimBLERemoteDescriptor.cpp"
+    "src/NimBLERemoteService.cpp"
+    "src/NimBLEScan.cpp"
+    "src/NimBLESecurity.cpp"
+    "src/NimBLEServer.cpp"
+    "src/NimBLEService.cpp"
+    "src/NimBLEUtils.cpp"
+    "src/NimBLEUUID.cpp"
+)
+
+set(COMPONENT_ADD_INCLUDEDIRS
+    src
+)
+
+set(COMPONENT_PRIV_REQUIRES
+    nvs_flash
+    bt
+)
+
+if(COMPONENTS MATCHES "esp-nimble-component")
+    list(APPEND COMPONENT_PRIV_REQUIRES
+        esp-nimble-component
+    )
+elseif(COMPONENTS MATCHES "nimble")
+    list(APPEND COMPONENT_PRIV_REQUIRES
+        nimble
+    )
+endif()
+
+if(COMPONENTS MATCHES "arduino")
+    list(APPEND COMPONENT_PRIV_REQUIRES
+        arduino
+    )
+endif()
+
+register_component()
--- a/127
+++ b/127
@@ -26,113 +26,6 @@ config NIMBLE_CPP_LOG_LEVEL
    default 3 if NIMBLE_CPP_LOG_LEVEL_INFO
    default 4 if NIMBLE_CPP_LOG_LEVEL_DEBUG

-config NIMBLE_CPP_LOG_OVERRIDE_COLOR
-    bool "Enable log color override."
-    default "n"
-    help
-        Enabling this option will allow NimBLE log levels to have
-        specific colors assigned.
-
-menu "NIMBLE Log Override Colors"
-    depends on NIMBLE_CPP_LOG_OVERRIDE_COLOR
-
-    choice NIMBLE_CPP_LOG_OVERRIDE_COLOR_ERR
-        prompt "NimBLE CPP log override color Error"
-        default NIMBLE_CPP_LOG_OVERRIDE_COLOR_ERR_NONE
-        help
-            Select NimBLE CPP log override error color.
-
-        config NIMBLE_CPP_LOG_OVERRIDE_COLOR_ERR_NONE
-            bool "None"
-        config NIMBLE_CPP_LOG_OVERRIDE_COLOR_ERR_BLACK
-            bool "Black"
-        config NIMBLE_CPP_LOG_OVERRIDE_COLOR_ERR_RED
-            bool "Red"
-        config NIMBLE_CPP_LOG_OVERRIDE_COLOR_ERR_GREEN
-            bool "Green"
-        config NIMBLE_CPP_LOG_OVERRIDE_COLOR_ERR_YELLOW
-            bool "Yellow"
-        config NIMBLE_CPP_LOG_OVERRIDE_COLOR_ERR_BLUE
-            bool "Blue"
-        config NIMBLE_CPP_LOG_OVERRIDE_COLOR_ERR_PURPLE
-            bool "Purple"
-        config NIMBLE_CPP_LOG_OVERRIDE_COLOR_ERR_CYAN
-            bool "Cyan"
-    endchoice #NIMBLE_CPP_LOG_OVERRIDE_COLOR_ERR
-
-    choice NIMBLE_CPP_LOG_OVERRIDE_COLOR_WARN
-        prompt "NimBLE CPP log override color Warning"
-        default NIMBLE_CPP_LOG_OVERRIDE_COLOR_WARN_NONE
-        help
-            Select NimBLE CPP log override warning color.
-
-        config NIMBLE_CPP_LOG_OVERRIDE_COLOR_WARN_NONE
-            bool "None"
-        config NIMBLE_CPP_LOG_OVERRIDE_COLOR_WARN_BLACK
-            bool "Black"
-        config NIMBLE_CPP_LOG_OVERRIDE_COLOR_WARN_RED
-            bool "Red"
-        config NIMBLE_CPP_LOG_OVERRIDE_COLOR_WARN_GREEN
-            bool "Green"
-        config NIMBLE_CPP_LOG_OVERRIDE_COLOR_WARN_YELLOW
-            bool "Yellow"
-        config NIMBLE_CPP_LOG_OVERRIDE_COLOR_WARN_BLUE
-            bool "Blue"
-        config NIMBLE_CPP_LOG_OVERRIDE_COLOR_WARN_PURPLE
-            bool "Purple"
-        config NIMBLE_CPP_LOG_OVERRIDE_COLOR_WARN_CYAN
-            bool "Cyan"
-    endchoice #NIMBLE_CPP_LOG_OVERRIDE_COLOR_WARN
-
-    choice NIMBLE_CPP_LOG_OVERRIDE_COLOR_INFO
-        prompt "NimBLE CPP log override color Info"
-        default NIMBLE_CPP_LOG_OVERRIDE_COLOR_INFO_NONE
-        help
-            Select NimBLE CPP log override info color.
-
-        config NIMBLE_CPP_LOG_OVERRIDE_COLOR_INFO_NONE
-            bool "None"
-        config NIMBLE_CPP_LOG_OVERRIDE_COLOR_INFO_BLACK
-            bool "Black"
-        config NIMBLE_CPP_LOG_OVERRIDE_COLOR_INFO_RED
-            bool "Red"
-        config NIMBLE_CPP_LOG_OVERRIDE_COLOR_INFO_GREEN
-            bool "Green"
-        config NIMBLE_CPP_LOG_OVERRIDE_COLOR_INFO_YELLOW
-            bool "Yellow"
-        config NIMBLE_CPP_LOG_OVERRIDE_COLOR_INFO_BLUE
-            bool "Blue"
-        config NIMBLE_CPP_LOG_OVERRIDE_COLOR_INFO_PURPLE
-            bool "Purple"
-        config NIMBLE_CPP_LOG_OVERRIDE_COLOR_INFO_CYAN
-            bool "Cyan"
-    endchoice #NIMBLE_CPP_LOG_OVERRIDE_COLOR_INFO
-
-    choice NIMBLE_CPP_LOG_OVERRIDE_COLOR_DEBUG
-        prompt "NimBLE CPP log override color Debug"
-        default NIMBLE_CPP_LOG_OVERRIDE_COLOR_DEBUG_NONE
-        help
-            Select NimBLE CPP log override debug color.
-
-        config NIMBLE_CPP_LOG_OVERRIDE_COLOR_DEBUG_NONE
-            bool "None"
-        config NIMBLE_CPP_LOG_OVERRIDE_COLOR_DEBUG_BLACK
-            bool "Black"
-        config NIMBLE_CPP_LOG_OVERRIDE_COLOR_DEBUG_RED
-            bool "Red"
-        config NIMBLE_CPP_LOG_OVERRIDE_COLOR_DEBUG_GREEN
-            bool "Green"
-        config NIMBLE_CPP_LOG_OVERRIDE_COLOR_DEBUG_YELLOW
-            bool "Yellow"
-        config NIMBLE_CPP_LOG_OVERRIDE_COLOR_DEBUG_BLUE
-            bool "Blue"
-        config NIMBLE_CPP_LOG_OVERRIDE_COLOR_DEBUG_PURPLE
-            bool "Purple"
-        config NIMBLE_CPP_LOG_OVERRIDE_COLOR_DEBUG_CYAN
-            bool "Cyan"
-    endchoice #NIMBLE_CPP_LOG_OVERRIDE_COLOR_DEBUG
-endmenu
-
 config NIMBLE_CPP_ENABLE_RETURN_CODE_TEXT
    bool "Show NimBLE return codes as text in debug log."
    default "n"
@@ -157,20 +50,6 @@ config NIMBLE_CPP_ENABLE_ADVERTISEMENT_TYPE_TEXT
        while scanning as text messages in the debug log.
        This will use approximately 250 bytes of flash memory.

-config NIMBLE_CPP_ADDR_FMT_EXCLUDE_DELIMITER
-    bool "Exclude colon characters when printing address."
-    default "n"
-    help
-        Enabling this option will format MAC addresses without
-        colon characters when printing.
-
-config NIMBLE_CPP_ADDR_FMT_UPPERCASE
-    bool "Use uppercase letters when printing address."
-    default "n"
-    help
-        Enabling this option will format MAC addresses in
-        uppercase letters when printing.
-
 config NIMBLE_CPP_ATT_VALUE_TIMESTAMP_ENABLED
    bool "Enable timestamps to be stored with attribute values."
    default "n"
@@ -198,12 +77,12 @@ config NIMBLE_CPP_DEBUG_ASSERT_ENABLED
        This will use approximately 1kB of flash memory.

 config NIMBLE_CPP_FREERTOS_TASK_BLOCK_BIT
-    int "FreeRTOS task block bit."
+    int "FreeRTOS task block bit"
    default 31
    help
        Configure the bit to set in the task notification value when a task is blocked waiting for an event.
        This should be set to a bit that is not used by other notifications in the system.
-
+        
 #
 # BT config
 #
@@ -251,4 +130,4 @@ if IDF_TARGET_ESP32P4
    endchoice
 endif

-endmenu
+endmenu
--- a/4
+++ b/4
@@ -186,7 +186,7 @@
      same "printed page" as the copyright notice for easier
      identification within third-party archives.

-   Copyright {yyyy} {name of copyright owner}
+   Copyright {2020} {Ryan Powell}

   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -199,3 +199,5 @@
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
+    
+   This product partly derives from esp32-snippets; Copyright 2017 Neil Kolban.
--- a/10
+++ b/10
@@ -1,10 +0,0 @@
-esp-nimble-cpp
-NimBLE-Arduino
-Copyright 2020-2025 Ryan Powell <ryan@nable-embedded.io> and
-esp-nimble-cpp, NimBLE-Arduino contributors.
-
-The Initial Developer of some parts of this library, which are copied from, 
-derived from, or inspired by is, esp32-snippets, Copyright 2017 Neil Kolban.
-
-If this library is used for commercial purposes, it is requested that the user consider
-making a donation and/or sponsoring this project to support it's ongoing development.
--- a/README.md
+++ b/README.md
@@ -1,20 +1,19 @@
-[![Release Version](https://img.shields.io/github/release/h2zero/esp-nimble-cpp.svg?style=plastic)
+[Latest release ![Release Version](https://img.shields.io/github/release/h2zero/esp-nimble-cpp.svg?style=plastic)
 ![Release Date](https://img.shields.io/github/release-date/h2zero/esp-nimble-cpp.svg?style=plastic)](https://github.com/h2zero/esp-nimble-cpp/releases/latest/)  

-> [!IMPORTANT]
-> Version 2 is now released!
-> Check out the [1.x to 2.x Migration Guide](docs/1.x_to2.x_migration_guide.md) and [Release Notes](https://github.com/h2zero/esp-nimble-cpp/releases/latest/)
+Need help? Have questions or suggestions? Join the [![Gitter](https://badges.gitter.im/NimBLE-Arduino/community.svg)](https://gitter.im/NimBLE-Arduino/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)  
+<br/>

 # esp-nimble-cpp

-NimBLE CPP library for use with ESP32 that attempts to maintain compatibility with the [nkolban cpp_utils BLE API](https://github.com/nkolban/esp32-snippets/tree/master/cpp_utils).
+NimBLE CPP library for use with ESP32 that attempts to maintain compatibility with the [nkolban cpp_uitls BLE API](https://github.com/nkolban/esp32-snippets/tree/master/cpp_utils).

 **An Arduino version of this library, including NimBLE, can be [found here.](https://github.com/h2zero/NimBLE-Arduino)**

 This library **significantly** reduces resource usage and improves performance for ESP32 BLE applications as compared    
 with the bluedroid based library. The goal is to maintain, as much as reasonable, compatibility with the original   
-library but using the NimBLE stack. In addition, this library will be more actively developed and maintained   
-to provide improved capabilities and stability over the original.
+library but refactored to use the NimBLE stack. In addition, this library will be more actively developed and maintained   
+to provide improved capabilites and stability over the original.

 **Testing shows a nearly 50% reduction in flash use and approx. 100kB less ram consumed vs the original!**  
 *Your results may vary*  
@@ -36,6 +35,16 @@ Configure settings in `NimBLE Options`.
 Call `NimBLEDevice::init("");` in `app_main`.  
 <br/>

+### ESP-IDF v3.2 & v3.3
+The NimBLE component does not come with these versions of IDF (now included in 3.3.2 and above).  
+A backport that works in these versions has been created and is [available here](https://github.com/h2zero/esp-nimble-component).  
+Download or clone that repo into your project/components folder and run menuconfig.
+Configure settings in `main menu -> NimBLE Options`.  
+
+`#include "NimBLEDevice.h"` in main.cpp.  
+Call `NimBLEDevice::init("");` in `app_main`.  
+<br/>  
+
 # Using 
 This library is intended to be compatible with the original ESP32 BLE functions and types with minor changes.  

@@ -53,14 +62,6 @@ When using this library along with Arduino and compiling with *CMake* you must a
 in your project/CMakeLists.txt after the line `include($ENV{IDF_PATH}/tools/cmake/project.cmake)` to prevent Arduino from releasing BLE memory.
 <br>

-# Sponsors
-Thank you to all the sponsors who support this project!
-
-<!-- sponsors --><!-- sponsors -->
-
-If you use this library for a commercial product please consider [sponsoring the development](https://github.com/sponsors/h2zero) to ensure the continued updates and maintenance.  
-<br/>
-
 # Acknowledgments
 * [nkolban](https://github.com/nkolban) and [chegewara](https://github.com/chegewara) for the [original esp32 BLE library](https://github.com/nkolban/esp32-snippets/tree/master/cpp_utils) this project was derived from.
 * [beegee-tokyo](https://github.com/beegee-tokyo) for contributing your time to test/debug and contributing the beacon examples.
--- a/component.mk
+++ b/component.mk
@@ -0,0 +1,2 @@
+COMPONENT_ADD_INCLUDEDIRS := src
+COMPONENT_SRCDIRS := src
--- a/docs/1.x_to2.x_migration_guide.md
+++ b/docs/1.x_to2.x_migration_guide.md
@@ -65,8 +65,7 @@ This returns a pointer to `const ble_addr_t` instead of a pointer to the address
 ## Server
 - `NimBLEServer::disconnect` now returns `bool`, true = success,  instead of `int` to be consistent with the rest of the library.
 - `NimBLEServerCallbacks::onMTUChanged` renamed to `NimBLEServerCallbacks::onMTUChange` to be consistent with the client callback.
- `NimBLEServer::getPeerIDInfo` renamed to `NimBLEServer::getPeerInfoByHandle` to better describe it's use.
- Advertising is no longer automatically restarted when a peer disconnects, to re-enable this feature either call `NimBLEServer::advertiseOnDisconnect(true);` after creating the server or manually restart advertising in the `onDisconnect` callback.  
+- `NimBLEServer::getPeerIDInfo` renamed to `NimBLEServer::getPeerInfoByHandle` to better describe it's use.  
 <br/>

 ### Services
--- a/docs/Doxyfile
+++ b/docs/Doxyfile
@@ -48,7 +48,7 @@ PROJECT_NAME           = esp-nimble-cpp
 # could be handy for archiving the generated documentation or if some version
 # control system is used.

-PROJECT_NUMBER         = 2.2.1
+PROJECT_NUMBER         = 2.0.0

 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
--- a/docs/New_user_guide.md
+++ b/docs/New_user_guide.md
@@ -37,7 +37,9 @@ For this example we will keep it simple and use a 16 bit value: ABCD.
 ```
 #include "NimBLEDevice.h"

-extern "C" void app_main(void) {
+// void setup() in Arduino
+void app_main(void)  
+{
    NimBLEDevice::init("NimBLE");
    
    NimBLEServer *pServer = NimBLEDevice::createServer();
@@ -77,7 +79,9 @@ The function call will simply be `pService->createCharacteristic("1234");`
 ```
 #include "NimBLEDevice.h"

-extern "C" void app_main(void) {
+// void setup() in Arduino
+void app_main(void)
+{
    NimBLEDevice::init("NimBLE");
    
    NimBLEServer *pServer = NimBLEDevice::createServer();
@@ -95,13 +99,12 @@ There are many different types you can send as parameters for the value but for
 `pCharacteristic->setValue("Hello BLE");`  

 Next we need to advertise for connections.  
-To do this we create an instance of `NimBLEAdvertising` add our service to it (optional) and start advertising.  
+To do this we create an instance of `NimBLEAdvertising` add our service to it (optional) and start advertisng.  

 **The code for this will be:**  
 ```
 NimBLEAdvertising *pAdvertising = NimBLEDevice::getAdvertising(); // create advertising instance
-pAdvertising->addServiceUUID("ABCD"); // advertise the UUID of our service
-pAdvertising->setName("NimBLE"); // advertise the device name
+pAdvertising->addServiceUUID("ABCD"); // tell advertising the UUID of our service
 pAdvertising->start(); // start advertising
 ```
 That's it, this will be enough to create a BLE server with a service and a characteristic and advertise for client connections.  
@@ -110,7 +113,9 @@ That's it, this will be enough to create a BLE server with a service and a chara
 ```
 #include "NimBLEDevice.h"

-extern "C" void app_main(void) {
+// void setup() in Arduino
+void app_main(void)
+{
    NimBLEDevice::init("NimBLE");
    
    NimBLEServer *pServer = NimBLEDevice::createServer();
@@ -121,8 +126,7 @@ extern "C" void app_main(void) {
    pCharacteristic->setValue("Hello BLE");
    
    NimBLEAdvertising *pAdvertising = NimBLEDevice::getAdvertising();
-    pAdvertising->addServiceUUID("ABCD"); // advertise the UUID of our service
-    pAdvertising->setName("NimBLE"); // advertise the device name
+    pAdvertising->addServiceUUID("ABCD"); 
    pAdvertising->start(); 
 }
 ```
@@ -140,7 +144,7 @@ After initializing the NimBLE stack we create a scan instance by calling `NimBLE

 Once we have created the scan we can start looking for advertising servers.  

-To do this we call `NimBLEScan::getResults(duration)`, the duration parameter is a uint32_t that specifies the number of milliseconds to scan for,  
+To do this we call `NimBLEScan::start(duration)`, the duration parameter is a uint32_t that specifies the number of milliseconds to scan for,  
 passing 0 will scan forever.  

 In this example we will scan for 10 seconds. This is a blocking function (a non blocking overload is also available).  
@@ -150,7 +154,9 @@ This call returns an instance of `NimBLEScanResults` when the scan completes whi
 ```
 #include "NimBLEDevice.h"

-extern "C" void app_main(void) {
+// void setup() in Arduino
+void app_main(void)  
+{
    NimBLEDevice::init("");
    
    NimBLEScan *pScan = NimBLEDevice::getScan();
@@ -162,7 +168,7 @@ extern "C" void app_main(void) {
 Now that we have scanned we need to check the results for any advertisers we are interested in connecting to.  

 To do this we iterate through the results and check if any of the devices found are advertising the service we want `ABCD`.  
-Each result in `NimBLEScanResults` is a `const NimBLEAdvertisedDevice*` that we can access data from.
+Each result in `NimBLEScanResults` is a `NimBLEAdvertisedDevice` instance that we can access data from.

 We will check each device found for the `ABCD` service by calling `NimBLEAdvertisedDevice::isAdvertisingService`.  
 This takes an instance of `NimBLEUUID` as a parameter so we will need to create one.  
@@ -171,11 +177,11 @@ This takes an instance of `NimBLEUUID` as a parameter so we will need to create
 ```
 NimBLEUUID serviceUuid("ABCD");

-for (int i = 0; i < results.getCount(); i++) {
-    const NimBLEAdvertisedDevice *device = results.getDevice(i);
+for(int i = 0; i < results.getCount(); i++) {
+    NimBLEAdvertisedDevice device = results.getDevice(i);
    
-    if (device->isAdvertisingService(serviceUuid)) {
-        // create a client and connect
+    if (device.isAdvertisingService(serviceUuid)) {
+    // create a client and connect
    }
 }
 ```
@@ -192,16 +198,16 @@ This takes a pointer to the `NimBLEAdvertisedDevice` and returns `true` if succe
 ```
 NimBLEUUID serviceUuid("ABCD");

-for (int i = 0; i < results.getCount(); i++) {
-    const NimBLEAdvertisedDevice *device = results.getDevice(i);
+for(int i = 0; i < results.getCount(); i++) {
+    NimBLEAdvertisedDevice device = results.getDevice(i);
    
-    if (device->isAdvertisingService(serviceUuid)) {
+    if (device.isAdvertisingService(serviceUuid)) {
        NimBLEClient *pClient = NimBLEDevice::createClient();
        
-        if (pClient->connect(&device)) {
-            //success
+        if(pClient->connect(&device)) {
+        //success
        } else {
-            // failed to connect
+        // failed to connect
        }
    }
 }
@@ -223,15 +229,11 @@ Finally we will read the characteristic value with `NimBLERemoteCharacteristic::
 ```
 NimBLEUUID serviceUuid("ABCD");

-for (int i = 0; i < results.getCount(); i++) {
-    const NimBLEAdvertisedDevice *device = results.getDevice(i);
+for(int i = 0; i < results.getCount(); i++) {
+    NimBLEAdvertisedDevice device = results.getDevice(i);
    
-    if (device->isAdvertisingService(serviceUuid)) {
+    if (device.isAdvertisingService(serviceUuid)) {
        NimBLEClient *pClient = NimBLEDevice::createClient();
-
-        if (!pClient) { // Make sure the client was created
-            break;
-        }
        
        if (pClient->connect(&device)) {
            NimBLERemoteService *pService = pClient->getService(serviceUuid);
@@ -245,7 +247,7 @@ for (int i = 0; i < results.getCount(); i++) {
                }
            }
        } else {
-            // failed to connect
+        // failed to connect
        }
    }
 }
@@ -260,16 +262,12 @@ This is done by calling `NimBLEDevice::deleteClient`.
 ```
 NimBLEUUID serviceUuid("ABCD");

-for (int i = 0; i < results.getCount(); i++) {
-    const NimBLEAdvertisedDevice *device = results.getDevice(i);
+for(int i = 0; i < results.getCount(); i++) {
+    NimBLEAdvertisedDevice device = results.getDevice(i);
    
-    if (device->isAdvertisingService(serviceUuid)) {
+    if (device.isAdvertisingService(serviceUuid)) {
        NimBLEClient *pClient = NimBLEDevice::createClient();
-
-        if (!pClient) { // Make sure the client was created
-            break;
-        }
-
+        
        if (pClient->connect(&device)) {
            NimBLERemoteService *pService = pClient->getService(serviceUuid);
            
@@ -282,7 +280,7 @@ for (int i = 0; i < results.getCount(); i++) {
                }
            }
        } else {
-            // failed to connect
+        // failed to connect
        }
        
        NimBLEDevice::deleteClient(pClient);
@@ -296,39 +294,37 @@ Note that there is no need to disconnect as that will be done when deleting the
 ```
 #include "NimBLEDevice.h"

-extern "C" void app_main(void) {
+// void setup() in Arduino
+void app_main(void)  
+{
    NimBLEDevice::init("");
-
+    
    NimBLEScan *pScan = NimBLEDevice::getScan();
-    NimBLEScanResults results = pScan->getResults(10 * 1000);
-
+    NimBLEScanResults results = pScan->start(10 * 1000);
+    
    NimBLEUUID serviceUuid("ABCD");
-
-    for (int i = 0; i < results.getCount(); i++) {
-        const NimBLEAdvertisedDevice *device = results.getDevice(i);
-
-        if (device->isAdvertisingService(serviceUuid)) {
+    
+    for(int i = 0; i < results.getCount(); i++) {
+        NimBLEAdvertisedDevice device = results.getDevice(i);
+        
+        if (device.isAdvertisingService(serviceUuid)) {
            NimBLEClient *pClient = NimBLEDevice::createClient();
-
-            if (!pClient) { // Make sure the client was created
-                break;
-            }
-
+            
            if (pClient->connect(&device)) {
                NimBLERemoteService *pService = pClient->getService(serviceUuid);
-
+                
                if (pService != nullptr) {
                    NimBLERemoteCharacteristic *pCharacteristic = pService->getCharacteristic("1234");
-
+                    
                    if (pCharacteristic != nullptr) {
                        std::string value = pCharacteristic->readValue();
                        // print or do whatever you need with the value
                    }
                }
            } else {
-                // failed to connect
+            // failed to connect
            }
-
+            
            NimBLEDevice::deleteClient(pClient);
        }
    }
@@ -338,3 +334,4 @@ extern "C" void app_main(void) {

 For more advanced features and options please see the client examples in the examples folder.  
 <br/>
+
--- a/docs/index.md
+++ b/docs/index.md
@@ -1,4 +1,5 @@
 # Overview
+
 This is a C++ BLE library for the ESP32 that uses the NimBLE host stack instead of bluedroid.  
 The aim is to maintain, as much as reasonable, the original bluedroid C++ & Arduino BLE API by while adding new features  
 and making improvements in performance, resource use, and stability.  
@@ -22,6 +23,16 @@ Configure settings in `NimBLE Options`.
 Call `NimBLEDevice::init` in `app_main`.  
 <br/>

+### v3.2 & v3.3
+The NimBLE component does not come with these versions of IDF (now included in 3.3.2 and above).   
+A backport that works in these versions has been created and is [available here](https://github.com/h2zero/esp-nimble-component).  
+Download or clone that repo into your project/components folder and run menuconfig.
+Configure settings in `main menu -> NimBLE Options`.  
+
+`#include "NimBLEDevice.h"` in main.cpp.  
+Call `NimBLEDevice::init` in `app_main`.  
+<br/>  
+
 # Using
 This library is intended to be compatible with the original ESP32 BLE functions and types with minor changes.  

@@ -32,13 +43,12 @@ If you are familiar with the original library, see: [The migration guide](Migrat
 For more advanced usage see [Usage tips](Usage_tips.md) for more performance and optimization.  
 <br/>

-# Sponsors
-Thank you to all the sponsors who support this project!
-
-If you use this library for a commercial product please consider [sponsoring the development](https://github.com/sponsors/h2zero) to ensure the continued updates and maintenance.  
+# Need help? Have a question or suggestion?
+Come chat on [gitter](https://gitter.im/NimBLE-Arduino/community?utm_source=share-link&utm_medium=link&utm_campaign=share-link) or open an issue at [NimBLE-Arduino](https://github.com/h2zero/NimBLE-Arduino/issues) or [esp-nimble-cpp](https://github.com/h2zero/esp-nimble-cpp/issues)  
 <br/>

 # Acknowledgments
+
 * [nkolban](https://github.com/nkolban) and [chegewara](https://github.com/chegewara) for the [original esp32 BLE library](https://github.com/nkolban/esp32-snippets/tree/master/cpp_utils) this project was derived from.
 * [beegee-tokyo](https://github.com/beegee-tokyo) for contributing your time to test/debug and contributing the beacon examples.
 * [Jeroen88](https://github.com/Jeroen88) for the amazing help debugging and improving the client code.
--- a/examples/Bluetooth_5/NimBLE_extended_client/main/main.cpp
+++ b/examples/Bluetooth_5/NimBLE_extended_client/main/main.cpp
@@ -14,8 +14,8 @@
 #define CHARACTERISTIC_UUID "1234"

 static const NimBLEAdvertisedDevice* advDevice;
-static bool                          doConnect  = false;
-static uint32_t                      scanTimeMs = 10 * 1000; // In milliseconds, 0 = scan forever
+static bool                          doConnect = false;
+static uint32_t                      scanTime  = 10 * 1000; // In milliseconds, 0 = scan forever

 /** Define the PHY's to use when connecting to peer devices, can be 1, 2, or all 3 (default).*/
 static uint8_t connectPhys = BLE_GAP_LE_PHY_CODED_MASK | BLE_GAP_LE_PHY_1M_MASK /*| BLE_GAP_LE_PHY_2M_MASK */;
@@ -26,7 +26,7 @@ class ClientCallbacks : public NimBLEClientCallbacks {

    void onDisconnect(NimBLEClient* pClient, int reason) override {
        printf("%s Disconnected, reason = %d - Starting scan\n", pClient->getPeerAddress().toString().c_str(), reason);
-        NimBLEDevice::getScan()->start(scanTimeMs);
+        NimBLEDevice::getScan()->start(scanTime);
    }
 } clientCallbacks;

@@ -123,7 +123,7 @@ extern "C" void app_main(void) {
     *  Start scanning for advertisers for the scan time specified (in milliseconds) 0 = forever
     *  Optional callback for when scanning stops.
     */
-    pScan->start(scanTimeMs);
+    pScan->start(scanTime);

    printf("Scanning for peripherals\n");

@@ -137,7 +137,7 @@ extern "C" void app_main(void) {
            }

            doConnect = false;
-            NimBLEDevice::getScan()->start(scanTimeMs);
+            NimBLEDevice::getScan()->start(scanTime);
        }
        vTaskDelay(pdMS_TO_TICKS(10));
    }
--- a/examples/Bluetooth_5/NimBLE_extended_scan/main/main.cpp
+++ b/examples/Bluetooth_5/NimBLE_extended_scan/main/main.cpp
@@ -9,8 +9,8 @@

 #include <NimBLEDevice.h>

-static uint32_t        scanTimeMs = 10 * 1000; // In milliseconds, 0 = scan forever
-static NimBLEScan::Phy scanPhy    = NimBLEScan::Phy::SCAN_ALL;
+static uint32_t        scanTime = 10 * 1000; // In milliseconds, 0 = scan forever
+static NimBLEScan::Phy scanPhy  = NimBLEScan::Phy::SCAN_ALL;

 /** Define a class to handle the callbacks when advertisements are received */
 class ScanCallbacks : public NimBLEScanCallbacks {
@@ -43,7 +43,7 @@ class ScanCallbacks : public NimBLEScanCallbacks {

        NimBLEScan* pScan = NimBLEDevice::getScan();
        pScan->setPhy(scanPhy);
-        pScan->start(scanTimeMs);
+        pScan->start(scanTime);
    }
 } scanCallbacks;

@@ -63,7 +63,7 @@ extern "C" void app_main(void) {
    /** Set the initial PHY's to scan on, default is SCAN_ALL */
    pScan->setPhy(scanPhy);

-    /** Start scanning for scanTimeMs */
-    pScan->start(scanTimeMs);
+    /** Start scanning for scanTime */
+    pScan->start(scanTime);
    printf("Scanning for peripherals\n");
 }
--- a/examples/NimBLE_Client/main/main.cpp
+++ b/examples/NimBLE_Client/main/main.cpp
@@ -10,8 +10,8 @@
 #include <NimBLEDevice.h>

 static const NimBLEAdvertisedDevice* advDevice;
-static bool                          doConnect  = false;
-static uint32_t                      scanTimeMs = 5000; /** scan time in milliseconds, 0 = scan forever */
+static bool                          doConnect = false;
+static uint32_t                      scanTime  = 5000; /** scan time in milliseconds, 0 = scan forever */

 /**  None of these are required as they will be handled by the library with defaults. **
 **                       Remove as you see fit for your needs                        */
@@ -20,7 +20,7 @@ class ClientCallbacks : public NimBLEClientCallbacks {

    void onDisconnect(NimBLEClient* pClient, int reason) override {
        printf("%s Disconnected, reason = %d - Starting scan\n", pClient->getPeerAddress().toString().c_str(), reason);
-        NimBLEDevice::getScan()->start(scanTimeMs, false, true);
+        NimBLEDevice::getScan()->start(scanTime, false, true);
    }

    /********************* Security handled here *********************/
@@ -48,10 +48,10 @@ class ClientCallbacks : public NimBLEClientCallbacks {
            return;
        }
    }
-} clientCallbacks;
+} clientCB;

 /** Define a class to handle the callbacks when scan events are received */
-class ScanCallbacks : public NimBLEScanCallbacks {
+class scanCallbacks : public NimBLEScanCallbacks {
    void onResult(const NimBLEAdvertisedDevice* advertisedDevice) override {
        printf("Advertised Device found: %s\n", advertisedDevice->toString().c_str());
        if (advertisedDevice->isAdvertisingService(NimBLEUUID("DEAD"))) {
@@ -68,9 +68,9 @@ class ScanCallbacks : public NimBLEScanCallbacks {
    /** Callback to process the results of the completed scan or restart it */
    void onScanEnd(const NimBLEScanResults& results, int reason) override {
        printf("Scan Ended, reason: %d, device count: %d; Restarting scan\n", reason, results.getCount());
-        NimBLEDevice::getScan()->start(scanTimeMs, false, true);
+        NimBLEDevice::getScan()->start(scanTime, false, true);
    }
-} scanCallbacks;
+} scanCB;

 /** Notification / Indication receiving handler callback */
 void notifyCB(NimBLERemoteCharacteristic* pRemoteCharacteristic, uint8_t* pData, size_t length, bool isNotify) {
@@ -121,7 +121,7 @@ bool connectToServer() {

        printf("New client created\n");

-        pClient->setClientCallbacks(&clientCallbacks, false);
+        pClient->setClientCallbacks(&clientCB, false);
        /**
         *  Set initial connection parameters:
         *  These settings are safe for 3 clients to connect reliably, can go faster if you have less
@@ -241,7 +241,8 @@ bool connectToServer() {
    return true;
 }

-extern "C" void app_main(void) {
+extern "C"
+void app_main(void) {
    printf("Starting NimBLE Client\n");
    /** Initialize NimBLE and set the device name */
    NimBLEDevice::init("NimBLE-Client");
@@ -265,11 +266,11 @@ extern "C" void app_main(void) {
    NimBLEDevice::setSecurityAuth(/*BLE_SM_PAIR_AUTHREQ_BOND | BLE_SM_PAIR_AUTHREQ_MITM |*/ BLE_SM_PAIR_AUTHREQ_SC);

    /** Optional: set the transmit power */
-    NimBLEDevice::setPower(3); /** 3dbm */
+    NimBLEDevice::setPower(3); // 9dbm
    NimBLEScan* pScan = NimBLEDevice::getScan();

    /** Set the callbacks to call when scan events occur, no duplicates */
-    pScan->setScanCallbacks(&scanCallbacks, false);
+    pScan->setScanCallbacks(&scanCB, false);

    /** Set scan interval (how often) and window (how long) in milliseconds */
    pScan->setInterval(100);
@@ -282,7 +283,7 @@ extern "C" void app_main(void) {
    pScan->setActiveScan(true);

    /** Start scanning for advertisers */
-    pScan->start(scanTimeMs);
+    pScan->start(scanTime);
    printf("Scanning for peripherals\n");

    /** Loop here until we find a device we want to connect to */
@@ -298,7 +299,7 @@ extern "C" void app_main(void) {
                printf("Failed to connect, starting scan\n");
            }

-            NimBLEDevice::getScan()->start(scanTimeMs, false, true);
+            NimBLEDevice::getScan()->start(scanTime, false, true);
        }
    }
 }
--- a/examples/NimBLE_Server/main/main.cpp
+++ b/examples/NimBLE_Server/main/main.cpp
@@ -26,7 +26,7 @@ class ServerCallbacks : public NimBLEServerCallbacks {
         *  Latency: number of intervals allowed to skip.
         *  Timeout: 10 millisecond increments.
         */
-        pServer->updateConnParams(connInfo.getConnHandle(), 24, 48, 0, 180);
+        pServer->updateConnParams(connInfo.getConnHandle(), 24, 48, 0, 18);
    }

    void onDisconnect(NimBLEServer* pServer, NimBLEConnInfo& connInfo, int reason) override {
--- a/idf_component.yml
+++ b/idf_component.yml
@@ -1,24 +1,15 @@
 ## IDF Component Manager Manifest File
-version: "2.2.1"
-license: "Apache-2.0"
-description: "C++ wrapper for the NimBLE BLE stack"
-url: "https://github.com/h2zero/esp-nimble-cpp"
-repository: "https://github.com/h2zero/esp-nimble-cpp"
-maintainers:
-  - Ryan Powell <ryan@nable-embedded.io>
-documentation: "https://h2zero.github.io/esp-nimble-cpp/"
-tags:
-  - BLE
-  - NimBLE
 dependencies:
  espressif/esp_hosted:
    version: "*"
    rules:
      - if: "target in [esp32p4]"
  espressif/esp_wifi_remote:
-    version: "<0.5.4"
+    version: "*"
    rules:
      - if: "target in [esp32p4]"
+
+  ## Required IDF version
  idf:
    version: ">=5.3.0"
    rules:
--- a/library.json
+++ b/library.json
@@ -1,23 +0,0 @@
-{
-  "name": "esp-nimble-cpp",
-  "version": "2.2.1",
-  "description": "C++ wrapper for the NimBLE BLE stack",
-  "keywords": [
-    "BLE",
-    "espidf",
-    "espressif",
-    "esp32",
-    "nimble"
-  ],
-  "license": "Apache-2.0",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/h2zero/esp-nimble-cpp"
-  },
-  "authors": {
-    "name": "Ryan Powell",
-    "email": "ryan@nable-embedded.io",
-    "url": "https://github.com/h2zero/esp-nimble-cpp",
-    "maintainer": true
-  }
-}
--- a/package.json
+++ b/package.json
@@ -0,0 +1,17 @@
+{
+  "name": "esp-nimble-cpp",
+  "version": "1.5.0",
+  "description": "NimBLE, BLE stack for the Espressif ESP32, ESP32-S and ESP32-C series of SoCs",
+  "keywords": [
+    "BLE",
+    "espidf",
+    "arduino",
+    "espressif",
+    "esp32"
+  ],
+  "license": "LGPL-2.1-or-later",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/h2zero/esp-nimble-cpp"
+  }
+}
--- a/pkg.yml
+++ b/pkg.yml
@@ -0,0 +1,20 @@
+pkg.name: esp-nimble-cpp
+pkg.type: lib
+pkg.description: NimBLE CPP wrapper
+pkg.author: "Ryan Powell"
+pkg.homepage: "http://mynewt.apache.org/"
+pkg.keywords:
+
+pkg.deps:
+    - "@apache-mynewt-nimble/nimble"
+    - "@apache-mynewt-nimble/nimble/host"
+    - "@apache-mynewt-nimble/nimble/host/services/gap"
+    - "@apache-mynewt-nimble/nimble/host/services/gatt"
+    - "@apache-mynewt-nimble/nimble/host/store/config"
+    - "@apache-mynewt-nimble/nimble/host/util"
+
+pkg.source_dirs:
+    - src
+
+pkg.include_dirs:
+    - src
--- a/src/NimBLE2904.cpp
+++ b/src/NimBLE2904.cpp
@@ -1,18 +1,15 @@
 /*
- * Copyright 2020-2025 Ryan Powell <ryan@nable-embedded.io> and
- * esp-nimble-cpp, NimBLE-Arduino contributors.
+ * NimBLE2904.cpp
 *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  Created: on March 13, 2020
+ *      Author H2zero
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * Originally:
 *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * BLE2904.cpp
+ *
+ *  Created on: Dec 23, 2017
+ *      Author: kolban
 */

 #include "nimconfig.h"
--- a/src/NimBLE2904.h
+++ b/src/NimBLE2904.h
@@ -1,18 +1,15 @@
 /*
- * Copyright 2020-2025 Ryan Powell <ryan@nable-embedded.io> and
- * esp-nimble-cpp, NimBLE-Arduino contributors.
+ * NimBLE2904.h
 *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  Created: on March 13, 2020
+ *      Author H2zero
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * Originally:
 *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * BLE2904.h
+ *
+ *  Created on: Dec 23, 2017
+ *      Author: kolban
 */

 #ifndef NIMBLE_CPP_2904_H_
@@ -26,8 +23,8 @@
 struct NimBLE2904Data {
    uint8_t  m_format{0};
    int8_t   m_exponent{0};
-    uint16_t m_unit{0x2700};   // Unitless; See https://www.bluetooth.com/specifications/assigned-numbers/units
-    uint8_t  m_namespace{1};   // 1 = Bluetooth SIG Assigned Numbers
+    uint16_t m_unit{0x2700}; // Unitless; See https://www.bluetooth.com/specifications/assigned-numbers/units
+    uint8_t  m_namespace{1}; // 1 = Bluetooth SIG Assigned Numbers
    uint16_t m_description{0}; // unknown description
 } __attribute__((packed));

@@ -68,7 +65,7 @@ class NimBLE2904 : public NimBLEDescriptor {
    static const uint8_t FORMAT_OPAQUE    = 27;
    static const uint8_t FORMAT_MEDASN1   = 28;

-    void setDescription(uint16_t description);
+    void setDescription(uint16_t);
    void setExponent(int8_t exponent);
    void setFormat(uint8_t format);
    void setNamespace(uint8_t namespace_value);
--- a/src/NimBLEAddress.cpp
+++ b/src/NimBLEAddress.cpp
@@ -1,20 +1,16 @@
 /*
- * Copyright 2020-2025 Ryan Powell <ryan@nable-embedded.io> and
- * esp-nimble-cpp, NimBLE-Arduino contributors.
+ * NimBLEAddress.cpp
 *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  Created: on Jan 24 2020
+ *      Author H2zero
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * Originally:
 *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * BLEAddress.cpp
+ *
+ *  Created on: Jul 2, 2017
+ *      Author: kolban
 */
-
 #include "nimconfig.h"
 #if defined(CONFIG_BT_ENABLED)

@@ -23,18 +19,6 @@

 # include <algorithm>

-# ifdef CONFIG_NIMBLE_CPP_ADDR_FMT_EXCLUDE_DELIMITER
-#  define NIMBLE_CPP_ADDR_DELIMITER ""
-# else
-#  define NIMBLE_CPP_ADDR_DELIMITER ":"
-# endif
-
-# ifdef CONFIG_NIMBLE_CPP_ADDR_FMT_UPPERCASE
-#  define NIMBLE_CPP_ADDR_FMT "%02X%s%02X%s%02X%s%02X%s%02X%s%02X"
-# else
-#  define NIMBLE_CPP_ADDR_FMT "%02x%s%02x%s%02x%s%02x%s%02x%s%02x"
-# endif
-
 static const char* LOG_TAG = "NimBLEAddress";

 /*************************************************
@@ -57,9 +41,7 @@ NimBLEAddress::NimBLEAddress(ble_addr_t address) : ble_addr_t{address} {}
 * ```
 * which is 17 characters in length.
 * @param [in] addr The hex string representation of the address.
- * @param [in] type The type of the address, should be one of:
- * * BLE_ADDR_PUBLIC (0)
- * * BLE_ADDR_RANDOM (1)
+ * @param [in] type The type of the address.
 */
 NimBLEAddress::NimBLEAddress(const std::string& addr, uint8_t type) {
    this->type = type;
@@ -73,7 +55,7 @@ NimBLEAddress::NimBLEAddress(const std::string& addr, uint8_t type) {
        std::string mac{addr};
        mac.erase(std::remove(mac.begin(), mac.end(), ':'), mac.end());
        uint64_t address = std::stoull(mac, nullptr, 16);
-        memcpy(this->val, &address, sizeof(this->val));
+        memcpy(this->val, &address, sizeof this->val);
        return;
    }

@@ -84,9 +66,7 @@ NimBLEAddress::NimBLEAddress(const std::string& addr, uint8_t type) {
 /**
 * @brief Constructor for compatibility with bluedroid esp library using native ESP representation.
 * @param [in] address A uint8_t[6] or esp_bd_addr_t containing the address.
- * @param [in] type The type of the address should be one of:
- * * BLE_ADDR_PUBLIC (0)
- * * BLE_ADDR_RANDOM (1)
+ * @param [in] type The type of the address.
 */
 NimBLEAddress::NimBLEAddress(const uint8_t address[BLE_DEV_ADDR_LEN], uint8_t type) {
    std::reverse_copy(address, address + BLE_DEV_ADDR_LEN, this->val);
@@ -97,12 +77,10 @@ NimBLEAddress::NimBLEAddress(const uint8_t address[BLE_DEV_ADDR_LEN], uint8_t ty
 * @brief Constructor for address using a hex value.\n
 * Use the same byte order, so use 0xa4c1385def16 for "a4:c1:38:5d:ef:16"
 * @param [in] address uint64_t containing the address.
- * @param [in] type The type of the address should be one of:
- * * BLE_ADDR_PUBLIC (0)
- * * BLE_ADDR_RANDOM (1)
+ * @param [in] type The type of the address.
 */
 NimBLEAddress::NimBLEAddress(const uint64_t& address, uint8_t type) {
-    memcpy(this->val, &address, sizeof(this->val));
+    memcpy(this->val, &address, sizeof this->val);
    this->type = type;
 } // NimBLEAddress

@@ -205,7 +183,7 @@ bool NimBLEAddress::operator==(const NimBLEAddress& rhs) const {
        return false;
    }

-    return memcmp(rhs.val, this->val, sizeof(this->val)) == 0;
+    return memcmp(rhs.val, this->val, sizeof this->val) == 0;
 } // operator ==

 /**
@@ -223,12 +201,12 @@ NimBLEAddress::operator std::string() const {
    char buffer[18];
    snprintf(buffer,
             sizeof(buffer),
-             NIMBLE_CPP_ADDR_FMT,
-             this->val[5], NIMBLE_CPP_ADDR_DELIMITER,
-             this->val[4], NIMBLE_CPP_ADDR_DELIMITER,
-             this->val[3], NIMBLE_CPP_ADDR_DELIMITER,
-             this->val[2], NIMBLE_CPP_ADDR_DELIMITER,
-             this->val[1], NIMBLE_CPP_ADDR_DELIMITER,
+             "%02x:%02x:%02x:%02x:%02x:%02x",
+             this->val[5],
+             this->val[4],
+             this->val[3],
+             this->val[2],
+             this->val[1],
             this->val[0]);
    return std::string{buffer};
 } // operator std::string
@@ -238,7 +216,7 @@ NimBLEAddress::operator std::string() const {
 */
 NimBLEAddress::operator uint64_t() const {
    uint64_t address = 0;
-    memcpy(&address, this->val, sizeof(this->val));
+    memcpy(&address, this->val, sizeof this->val);
    return address;
 } // operator uint64_t

--- a/src/NimBLEAddress.h
+++ b/src/NimBLEAddress.h
@@ -1,18 +1,15 @@
 /*
- * Copyright 2020-2025 Ryan Powell <ryan@nable-embedded.io> and
- * esp-nimble-cpp, NimBLE-Arduino contributors.
+ * NimBLEAddress.h
 *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  Created: on Jan 24 2020
+ *      Author H2zero
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * Originally:
 *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * BLEAddress.h
+ *
+ *  Created on: Jul 2, 2017
+ *      Author: kolban
 */

 #ifndef NIMBLE_CPP_ADDRESS_H_
@@ -34,9 +31,9 @@
 # include <string>

 /**
- * @brief A BLE device address.
+ * @brief A %BLE device address.
 *
- * Every BLE device has a unique address which can be used to identify it and form connections.
+ * Every %BLE device has a unique address which can be used to identify it and form connections.
 */
 class NimBLEAddress : private ble_addr_t {
  public:
@@ -45,9 +42,9 @@ class NimBLEAddress : private ble_addr_t {
     */
    NimBLEAddress() = default;
    NimBLEAddress(const ble_addr_t address);
-    NimBLEAddress(const uint8_t address[BLE_DEV_ADDR_LEN], uint8_t type);
-    NimBLEAddress(const std::string& stringAddress, uint8_t type);
-    NimBLEAddress(const uint64_t& address, uint8_t type);
+    NimBLEAddress(const uint8_t address[BLE_DEV_ADDR_LEN], uint8_t type = BLE_ADDR_PUBLIC);
+    NimBLEAddress(const std::string& stringAddress, uint8_t type = BLE_ADDR_PUBLIC);
+    NimBLEAddress(const uint64_t& address, uint8_t type = BLE_ADDR_PUBLIC);

    bool                 isRpa() const;
    bool                 isNrpa() const;
@@ -62,8 +59,8 @@ class NimBLEAddress : private ble_addr_t {
    const NimBLEAddress& reverseByteOrder();
    bool                 operator==(const NimBLEAddress& rhs) const;
    bool                 operator!=(const NimBLEAddress& rhs) const;
-    operator std::string() const;
-    operator uint64_t() const;
+                         operator std::string() const;
+                         operator uint64_t() const;
 };

 #endif /* CONFIG_BT_ENABLED */
--- a/src/NimBLEAdvertisedDevice.cpp
+++ b/src/NimBLEAdvertisedDevice.cpp
@@ -1,18 +1,15 @@
 /*
- * Copyright 2020-2025 Ryan Powell <ryan@nable-embedded.io> and
- * esp-nimble-cpp, NimBLE-Arduino contributors.
+ * NimBLEAdvertisedDevice.cpp
 *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  Created: on Jan 24 2020
+ *      Author H2zero
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * Originally:
 *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *  BLEAdvertisedDevice.cpp
+ *
+ *  Created on: Jul 3, 2017
+ *      Author: kolban
 */

 #include "nimconfig.h"
@@ -780,16 +777,6 @@ bool NimBLEAdvertisedDevice::isLegacyAdvertisement() const {
 # endif
 } // isLegacyAdvertisement

-/**
- * @brief Convenience operator to convert this NimBLEAdvertisedDevice to NimBLEAddress representation.
- * @details This allows passing NimBLEAdvertisedDevice to functions
- * that accept NimBLEAddress and/or or it's methods as a parameter.
- */
-NimBLEAdvertisedDevice::operator NimBLEAddress() const {
-    NimBLEAddress address(getAddress());
-    return address;
-} // operator NimBLEAddress
-
 /**
 * @brief Get the payload advertised by the device.
 * @return The advertisement payload.
--- a/src/NimBLEAdvertisedDevice.h
+++ b/src/NimBLEAdvertisedDevice.h
@@ -1,18 +1,15 @@
 /*
- * Copyright 2020-2025 Ryan Powell <ryan@nable-embedded.io> and
- * esp-nimble-cpp, NimBLE-Arduino contributors.
+ * NimBLEAdvertisedDevice.h
 *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  Created: on Jan 24 2020
+ *      Author H2zero
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * Originally:
 *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * BLEAdvertisedDevice.h
+ *
+ *  Created on: Jul 3, 2017
+ *      Author: kolban
 */

 #ifndef NIMBLE_CPP_ADVERTISED_DEVICE_H_
@@ -93,7 +90,6 @@ class NimBLEAdvertisedDevice {
    uint8_t  getSecondaryPhy() const;
    uint16_t getPeriodicInterval() const;
 # endif
-    operator NimBLEAddress() const;

    const std::vector<uint8_t>&                getPayload() const;
    const std::vector<uint8_t>::const_iterator begin() const;
--- a/src/NimBLEAdvertisementData.cpp
+++ b/src/NimBLEAdvertisementData.cpp
@@ -1,18 +1,9 @@
 /*
- * Copyright 2020-2025 Ryan Powell <ryan@nable-embedded.io> and
- * esp-nimble-cpp, NimBLE-Arduino contributors.
+ * NimBLEAdvertisementData.cpp
 *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  Created: on November 24, 2024
+ *      Author H2zero
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
 */

 #include "nimconfig.h"
@@ -39,7 +30,7 @@ static const char* LOG_TAG = "NimBLEAdvertisementData";
 * @param [in] length The size of data to be added to the payload.
 */
 bool NimBLEAdvertisementData::addData(const uint8_t* data, size_t length) {
-    if (m_payload.size() + length > BLE_HS_ADV_MAX_SZ) {
+    if ((m_payload.size() + length) > BLE_HS_ADV_MAX_SZ) {
        NIMBLE_LOGE(LOG_TAG, "Data length exceeded");
        return false;
    }
@@ -110,7 +101,7 @@ bool NimBLEAdvertisementData::addTxPower() {
    data[0] = BLE_HS_ADV_TX_PWR_LVL_LEN + 1;
    data[1] = BLE_HS_ADV_TYPE_TX_PWR_LVL;
 # ifndef CONFIG_IDF_TARGET_ESP32P4
-    data[2] = NimBLEDevice::getPower(NimBLETxPowerType::Advertise);
+    data[2] = NimBLEDevice::getPower();
 # else
    data[2] = 0;
 # endif
@@ -159,7 +150,6 @@ bool NimBLEAdvertisementData::addServiceUUID(const NimBLEUUID& serviceUUID) {
            type = BLE_HS_ADV_TYPE_COMP_UUIDS128;
            break;
        default:
-            NIMBLE_LOGE(LOG_TAG, "Cannot add UUID, invalid size!");
            return false;
    }

@@ -170,11 +160,10 @@ bool NimBLEAdvertisementData::addServiceUUID(const NimBLEUUID& serviceUUID) {
    }

    if (length + getPayload().size() > BLE_HS_ADV_MAX_SZ) {
-        NIMBLE_LOGE(LOG_TAG, "Cannot add UUID, data length exceeded!");
        return false;
    }

-    uint8_t        data[BLE_HS_ADV_MAX_SZ];
+    uint8_t        data[31];
    const uint8_t* uuid = serviceUUID.getValue();
    if (dataLoc == -1) {
        data[0] = 1 + bytes;
@@ -216,7 +205,6 @@ bool NimBLEAdvertisementData::removeServiceUUID(const NimBLEUUID& serviceUUID) {
            type = BLE_HS_ADV_TYPE_COMP_UUIDS128;
            break;
        default:
-            NIMBLE_LOGE(LOG_TAG, "Cannot remove UUID, invalid size!");
            return false;
    }

@@ -269,12 +257,12 @@ bool NimBLEAdvertisementData::removeServices() {
 * @return True if successful.
 */
 bool NimBLEAdvertisementData::setManufacturerData(const uint8_t* data, size_t length) {
-    if (length > BLE_HS_ADV_MAX_FIELD_SZ) {
+    if (length > 29) {
        NIMBLE_LOGE(LOG_TAG, "MFG data too long");
        return false;
    }

-    uint8_t mdata[BLE_HS_ADV_MAX_SZ];
+    uint8_t mdata[31];
    mdata[0] = length + 1;
    mdata[1] = BLE_HS_ADV_TYPE_MFG_DATA;
    memcpy(&mdata[2], data, length);
@@ -305,12 +293,12 @@ bool NimBLEAdvertisementData::setManufacturerData(const std::vector<uint8_t>& da
 * @return True if successful.
 */
 bool NimBLEAdvertisementData::setURI(const std::string& uri) {
-    if (uri.length() > BLE_HS_ADV_MAX_FIELD_SZ) {
+    if (uri.length() > 29) {
        NIMBLE_LOGE(LOG_TAG, "URI too long");
        return false;
    }

-    uint8_t data[BLE_HS_ADV_MAX_SZ];
+    uint8_t data[31];
    uint8_t length = 2 + uri.length();
    data[0]        = length - 1;
    data[1]        = BLE_HS_ADV_TYPE_URI;
@@ -327,16 +315,16 @@ bool NimBLEAdvertisementData::setURI(const std::string& uri) {
 * @return True if successful.
 */
 bool NimBLEAdvertisementData::setName(const std::string& name, bool isComplete) {
-    if (name.length() > BLE_HS_ADV_MAX_FIELD_SZ) {
+    if (name.length() > 29) {
        NIMBLE_LOGE(LOG_TAG, "Name too long - truncating");
        isComplete = false;
    }

-    uint8_t data[BLE_HS_ADV_MAX_SZ];
-    uint8_t length = 2 + std::min<uint8_t>(name.length(), BLE_HS_ADV_MAX_FIELD_SZ);
+    uint8_t data[31];
+    uint8_t length = 2 + std::min<uint8_t>(name.length(), 29);
    data[0]        = length - 1;
    data[1]        = isComplete ? BLE_HS_ADV_TYPE_COMP_NAME : BLE_HS_ADV_TYPE_INCOMP_NAME;
-    memcpy(&data[2], name.c_str(), std::min<uint8_t>(name.length(), BLE_HS_ADV_MAX_FIELD_SZ));
+    memcpy(&data[2], name.c_str(), std::min<uint8_t>(name.length(), 29));
    return addData(data, length);
 } // setName

@@ -414,14 +402,14 @@ bool NimBLEAdvertisementData::setPartialServices32(const std::vector<NimBLEUUID>
 bool NimBLEAdvertisementData::setServices(bool complete, uint8_t size, const std::vector<NimBLEUUID>& uuids) {
    uint8_t bytes  = size / 8;
    uint8_t length = 2; // start with 2 for length + type bytes
-    uint8_t data[BLE_HS_ADV_MAX_SZ];
+    uint8_t data[31];

    for (const auto& uuid : uuids) {
        if (uuid.bitSize() != size) {
            NIMBLE_LOGE(LOG_TAG, "Service UUID(%d) invalid", size);
            continue;
        } else {
-            if (length + bytes >= BLE_HS_ADV_MAX_SZ) {
+            if (length + bytes >= 31) {
                NIMBLE_LOGW(LOG_TAG, "Too many services - truncating");
                complete = false;
                break;
@@ -444,7 +432,6 @@ bool NimBLEAdvertisementData::setServices(bool complete, uint8_t size, const std
            data[1] = (complete ? BLE_HS_ADV_TYPE_COMP_UUIDS128 : BLE_HS_ADV_TYPE_INCOMP_UUIDS128);
            break;
        default:
-            NIMBLE_LOGE(LOG_TAG, "Cannot set services, invalid size!");
            return false;
    }

@@ -462,7 +449,7 @@ bool NimBLEAdvertisementData::setServices(bool complete, uint8_t size, const std
 bool NimBLEAdvertisementData::setServiceData(const NimBLEUUID& uuid, const uint8_t* data, size_t length) {
    uint8_t uuidBytes = uuid.bitSize() / 8;
    uint8_t sDataLen  = 2 + uuidBytes + length;
-    if (sDataLen > BLE_HS_ADV_MAX_SZ) {
+    if (sDataLen > 31) {
        NIMBLE_LOGE(LOG_TAG, "Service Data too long");
        return false;
    }
@@ -479,7 +466,6 @@ bool NimBLEAdvertisementData::setServiceData(const NimBLEUUID& uuid, const uint8
            type = BLE_HS_ADV_TYPE_SVC_DATA_UUID128;
            break;
        default:
-            NIMBLE_LOGE(LOG_TAG, "Cannot set service data, invalid size!");
            return false;
    }

@@ -488,7 +474,7 @@ bool NimBLEAdvertisementData::setServiceData(const NimBLEUUID& uuid, const uint8
        return true;
    }

-    uint8_t sData[BLE_HS_ADV_MAX_SZ];
+    uint8_t sData[31];
    sData[0] = uuidBytes + length + 1;
    sData[1] = type;
    memcpy(&sData[2], uuid.getValue(), uuidBytes);
--- a/src/NimBLEAdvertisementData.h
+++ b/src/NimBLEAdvertisementData.h
@@ -1,18 +1,9 @@
 /*
- * Copyright 2020-2025 Ryan Powell <ryan@nable-embedded.io> and
- * esp-nimble-cpp, NimBLE-Arduino contributors.
+ * NimBLEAdvertisementData.h
 *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  Created: on November 24, 2024
+ *      Author H2zero
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
 */

 #ifndef NIMBLE_CPP_ADVERTISEMENT_DATA_H_
@@ -22,9 +13,9 @@
 #if (defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_BROADCASTER) && !CONFIG_BT_NIMBLE_EXT_ADV) || \
    defined(_DOXYGEN_)

-# include <cstdint>
-# include <string>
-# include <vector>
+#include <cstdint>
+#include <string>
+#include <vector>

 class NimBLEUUID;
 /**
@@ -38,7 +29,7 @@ class NimBLEAdvertisementData {
    bool addData(const uint8_t* data, size_t length);
    bool addData(const std::vector<uint8_t>& data);
    bool setAppearance(uint16_t appearance);
-    bool setFlags(uint8_t flag);
+    bool setFlags(uint8_t);
    bool addTxPower();
    bool setPreferredParams(uint16_t minInterval, uint16_t maxInterval);
    bool addServiceUUID(const NimBLEUUID& serviceUUID);
--- a/src/NimBLEAdvertising.cpp
+++ b/src/NimBLEAdvertising.cpp
@@ -1,18 +1,17 @@
 /*
- * Copyright 2020-2025 Ryan Powell <ryan@nable-embedded.io> and
- * esp-nimble-cpp, NimBLE-Arduino contributors.
+ * NimBLEAdvertising.cpp
 *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  Created: on March 3, 2020
+ *      Author H2zero
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * Originally:
+ *
+ * BLEAdvertising.cpp
+ *
+ * This class encapsulates advertising a BLE Server.
+ *  Created on: Jun 21, 2017
+ *      Author: kolban
 *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
 */

 #include "nimconfig.h"
@@ -408,7 +407,7 @@ bool NimBLEAdvertising::refreshAdvertisingData() {
 * @return True if the service was added successfully.
 */
 bool NimBLEAdvertising::addServiceUUID(const NimBLEUUID& serviceUUID) {
-    if (!m_advData.addServiceUUID(serviceUUID)) {
+    if (!m_advData.addServiceUUID(serviceUUID) && m_scanResp) {
        if (!m_scanData.addServiceUUID(serviceUUID)) {
            return false;
        }
@@ -466,7 +465,7 @@ bool NimBLEAdvertising::removeServices() {
 * @return True if the appearance was set successfully.
 */
 bool NimBLEAdvertising::setAppearance(uint16_t appearance) {
-    if (!m_advData.setAppearance(appearance)) {
+    if (!m_advData.setAppearance(appearance) && m_scanResp) {
        if (!m_scanData.setAppearance(appearance)) {
            return false;
        }
@@ -484,7 +483,7 @@ bool NimBLEAdvertising::setAppearance(uint16_t appearance) {
 * @details  Range = 0x0006(7.5ms) to 0x0C80(4000ms), values not within the range will be limited to this range.
 */
 bool NimBLEAdvertising::setPreferredParams(uint16_t minInterval, uint16_t maxInterval) {
-    if (!m_advData.setPreferredParams(minInterval, maxInterval)) {
+    if (!m_advData.setPreferredParams(minInterval, maxInterval) && m_scanResp) {
        if (!m_scanData.setPreferredParams(minInterval, maxInterval)) {
            return false;
        }
@@ -499,7 +498,7 @@ bool NimBLEAdvertising::setPreferredParams(uint16_t minInterval, uint16_t maxInt
 * @return True if the transmission power level was added successfully.
 */
 bool NimBLEAdvertising::addTxPower() {
-    if (!m_advData.addTxPower()) {
+    if (!m_advData.addTxPower() && m_scanResp) {
        if (!m_scanData.addTxPower()) {
            return false;
        }
@@ -537,7 +536,7 @@ bool NimBLEAdvertising::setName(const std::string& name) {
 * @return True if the manufacturer data was set successfully.
 */
 bool NimBLEAdvertising::setManufacturerData(const uint8_t* data, size_t length) {
-    if (!m_advData.setManufacturerData(data, length)) {
+    if (!m_advData.setManufacturerData(data, length) && m_scanResp) {
        if (!m_scanData.setManufacturerData(data, length)) {
            return false;
        }
@@ -571,7 +570,7 @@ bool NimBLEAdvertising::setManufacturerData(const std::vector<uint8_t>& data) {
 * @return True if the URI was set successfully.
 */
 bool NimBLEAdvertising::setURI(const std::string& uri) {
-    if (!m_advData.setURI(uri)) {
+    if (!m_advData.setURI(uri) && m_scanResp) {
        if (!m_scanData.setURI(uri)) {
            return false;
        }
@@ -590,7 +589,7 @@ bool NimBLEAdvertising::setURI(const std::string& uri) {
 * @note If data length is 0 the service data will not be advertised.
 */
 bool NimBLEAdvertising::setServiceData(const NimBLEUUID& uuid, const uint8_t* data, size_t length) {
-    if (!m_advData.setServiceData(uuid, data, length)) {
+    if (!m_advData.setServiceData(uuid, data, length) && m_scanResp) {
        if (!m_scanData.setServiceData(uuid, data, length)) {
            return false;
        }
--- a/src/NimBLEAdvertising.h
+++ b/src/NimBLEAdvertising.h
@@ -1,18 +1,15 @@
 /*
- * Copyright 2020-2025 Ryan Powell <ryan@nable-embedded.io> and
- * esp-nimble-cpp, NimBLE-Arduino contributors.
+ * NimBLEAdvertising.h
 *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  Created: on March 3, 2020
+ *      Author H2zero
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * Originally:
 *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * BLEAdvertising.h
+ *
+ *  Created on: Jun 21, 2017
+ *      Author: kolban
 */

 #ifndef NIMBLE_CPP_ADVERTISING_H_
--- a/src/NimBLEAttValue.cpp
+++ b/src/NimBLEAttValue.cpp
@@ -1,18 +1,9 @@
 /*
- * Copyright 2020-2025 Ryan Powell <ryan@nable-embedded.io> and
- * esp-nimble-cpp, NimBLE-Arduino contributors.
+ * NimBLEAttValue.cpp
 *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  Created: on July 17, 2024
+ *      Author H2zero
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
 */

 #include "nimconfig.h"
@@ -25,9 +16,6 @@
 # endif

 # include "NimBLEAttValue.h"
-# include "NimBLELog.h"
-
-static const char* LOG_TAG = "NimBLEAttValue";

 // Default constructor implementation.
 NimBLEAttValue::NimBLEAttValue(uint16_t init_len, uint16_t max_len)
@@ -41,17 +29,14 @@ NimBLEAttValue::NimBLEAttValue(uint16_t init_len, uint16_t max_len)
 # endif
 {
    NIMBLE_CPP_DEBUG_ASSERT(m_attr_value);
-    if (m_attr_value == nullptr) {
-        NIMBLE_LOGE(LOG_TAG, "Failed to calloc ctx");
-    }
 }

 // Value constructor implementation.
-NimBLEAttValue::NimBLEAttValue(const uint8_t* value, uint16_t len, uint16_t max_len) : NimBLEAttValue(len, max_len) {
-    if (m_attr_value != nullptr) {
-        memcpy(m_attr_value, value, len);
-        m_attr_len = len;
-    }
+NimBLEAttValue::NimBLEAttValue(const uint8_t *value, uint16_t len, uint16_t max_len)
+: NimBLEAttValue(len, max_len) {
+    memcpy(m_attr_value, value, len);
+    m_attr_value[len] = '\0';
+    m_attr_len        = len;
 }

 // Destructor implementation.
@@ -88,10 +73,6 @@ NimBLEAttValue& NimBLEAttValue::operator=(const NimBLEAttValue& source) {
 void NimBLEAttValue::deepCopy(const NimBLEAttValue& source) {
    uint8_t* res = static_cast<uint8_t*>(realloc(m_attr_value, source.m_capacity + 1));
    NIMBLE_CPP_DEBUG_ASSERT(res);
-    if (res == nullptr) {
-        NIMBLE_LOGE(LOG_TAG, "Failed to realloc deepCopy");
-        return;
-    }

    ble_npl_hw_enter_critical();
    m_attr_value   = res;
@@ -117,7 +98,7 @@ NimBLEAttValue& NimBLEAttValue::append(const uint8_t* value, uint16_t len) {
    }

    if ((m_attr_len + len) > m_attr_max_len) {
-        NIMBLE_LOGE(LOG_TAG, "val > max, len=%u, max=%u", len, m_attr_max_len);
+        NIMBLE_LOGE("NimBLEAttValue", "val > max, len=%u, max=%u", len, m_attr_max_len);
        return *this;
    }

@@ -128,10 +109,6 @@ NimBLEAttValue& NimBLEAttValue::append(const uint8_t* value, uint16_t len) {
        m_capacity = new_len;
    }
    NIMBLE_CPP_DEBUG_ASSERT(res);
-    if (res == nullptr) {
-        NIMBLE_LOGE(LOG_TAG, "Failed to realloc append");
-        return *this;
-    }

 # if CONFIG_NIMBLE_CPP_ATT_VALUE_TIMESTAMP_ENABLED
    time_t t = time(nullptr);
@@ -150,13 +127,4 @@ NimBLEAttValue& NimBLEAttValue::append(const uint8_t* value, uint16_t len) {
    return *this;
 }

-uint8_t NimBLEAttValue::operator[](int pos) const {
-    NIMBLE_CPP_DEBUG_ASSERT(pos < m_attr_len);
-    if (pos >= m_attr_len) {
-        NIMBLE_LOGE(LOG_TAG, "pos >= len, pos=%u, len=%u", pos, m_attr_len);
-        return 0;
-    }
-    return m_attr_value[pos];
-}
-
 #endif // CONFIG_BT_ENABLED
--- a/src/NimBLEAttValue.h
+++ b/src/NimBLEAttValue.h
@@ -1,18 +1,9 @@
 /*
- * Copyright 2020-2025 Ryan Powell <ryan@nable-embedded.io> and
- * esp-nimble-cpp, NimBLE-Arduino contributors.
+ * NimBLEAttValue.h
 *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  Created: on March 18, 2021
+ *      Author H2zero
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
 */

 #ifndef NIMBLE_CPP_ATTVALUE_H
@@ -24,6 +15,7 @@
 #  include <Arduino.h>
 # endif

+# include "NimBLELog.h"
 # include <string>
 # include <vector>
 # include <ctime>
@@ -322,7 +314,10 @@ class NimBLEAttValue {
    /*********************** Operators ************************/

    /** @brief Subscript operator */
-    uint8_t operator[](int pos) const;
+    uint8_t operator[](int pos) const {
+        NIMBLE_CPP_DEBUG_ASSERT(pos < m_attr_len);
+        return m_attr_value[pos];
+    }

    /** @brief Operator; Get the value as a std::vector<uint8_t>. */
    operator std::vector<uint8_t>() const { return std::vector<uint8_t>(m_attr_value, m_attr_value + m_attr_len); }
--- a/src/NimBLEAttribute.h
+++ b/src/NimBLEAttribute.h
@@ -1,18 +1,8 @@
 /*
- * Copyright 2020-2025 Ryan Powell <ryan@nable-embedded.io> and
- * esp-nimble-cpp, NimBLE-Arduino contributors.
+ * NimBLEAttribute.h
 *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *  Created: on July 28 2024
+ *      Author H2zero
 */

 #ifndef NIMBLE_CPP_ATTRIBUTE_H_
@@ -53,7 +43,7 @@ class NimBLEAttribute {
    ~NimBLEAttribute() = default;

    const NimBLEUUID m_uuid{};
-    uint16_t         m_handle{0};
+    uint16_t   m_handle{0};
 };

 #endif // CONFIG_BT_ENABLED && (CONFIG_BT_NIMBLE_ROLE_PERIPHERAL || CONFIG_BT_NIMBLE_ROLE_CENTRAL)
--- a/src/NimBLEBeacon.cpp
+++ b/src/NimBLEBeacon.cpp
@@ -1,18 +1,15 @@
 /*
- * Copyright 2020-2025 Ryan Powell <ryan@nable-embedded.io> and
- * esp-nimble-cpp, NimBLE-Arduino contributors.
+ * NimBLEBeacon.cpp
 *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  Created: on March 15 2020
+ *      Author H2zero
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * Originally:
 *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * BLEBeacon.cpp
+ *
+ *  Created on: Jan 4, 2018
+ *      Author: kolban
 */

 #include "nimconfig.h"
--- a/src/NimBLEBeacon.h
+++ b/src/NimBLEBeacon.h
@@ -1,18 +1,15 @@
 /*
- * Copyright 2020-2025 Ryan Powell <ryan@nable-embedded.io> and
- * esp-nimble-cpp, NimBLE-Arduino contributors.
+ * NimBLEBeacon.h
 *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  Created: on March 15 2020
+ *      Author H2zero
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * Originally:
 *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * BLEBeacon.h
+ *
+ *  Created on: Jan 4, 2018
+ *      Author: kolban
 */

 #ifndef NIMBLE_CPP_BEACON_H_
--- a/src/NimBLECharacteristic.cpp
+++ b/src/NimBLECharacteristic.cpp
@@ -1,18 +1,13 @@
 /*
- * Copyright 2020-2025 Ryan Powell <ryan@nable-embedded.io> and
- * esp-nimble-cpp, NimBLE-Arduino contributors.
+ * NimBLECharacteristic.cpp
 *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  Created: on March 3, 2020
+ *      Author H2zero
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * BLECharacteristic.cpp
 *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *  Created on: Jun 22, 2017
+ *      Author: kolban
 */

 #include "nimconfig.h"
--- a/src/NimBLECharacteristic.h
+++ b/src/NimBLECharacteristic.h
@@ -1,18 +1,14 @@
 /*
- * Copyright 2020-2025 Ryan Powell <ryan@nable-embedded.io> and
- * esp-nimble-cpp, NimBLE-Arduino contributors.
+ * NimBLECharacteristic.h
 *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  Created: on March 3, 2020
+ *      Author H2zero
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * Originally:
+ * BLECharacteristic.h
 *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *  Created on: Jun 22, 2017
+ *      Author: kolban
 */

 #ifndef NIMBLE_CPP_CHARACTERISTIC_H_
--- a/src/NimBLEClient.cpp
+++ b/src/NimBLEClient.cpp
@@ -1,18 +1,14 @@
 /*
- * Copyright 2020-2025 Ryan Powell <ryan@nable-embedded.io> and
- * esp-nimble-cpp, NimBLE-Arduino contributors.
+ * NimBLEClient.cpp
 *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  Created: on Jan 26 2020
+ *      Author H2zero
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * Originally:
+ * BLEClient.cpp
 *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *  Created on: Mar 22, 2017
+ *      Author: kolban
 */

 #include "nimconfig.h"
@@ -25,7 +21,7 @@
 # include "NimBLELog.h"

 # if defined(CONFIG_NIMBLE_CPP_IDF)
-#  include "nimble/nimble_port.h"
+//#  include "nimble/nimble_port.h"
 # else
 #  include "nimble/porting/nimble/include/nimble/nimble_port.h"
 # endif
@@ -126,22 +122,6 @@ size_t NimBLEClient::deleteService(const NimBLEUUID& uuid) {
    return m_svcVec.size();
 } // deleteService

-/**
- * @brief Connect to an advertising device.
- * @param [in] pDevice A pointer to the advertised device instance to connect to.
- * @param [in] deleteAttributes If true this will delete any attribute objects this client may already\n
- * have created when last connected.
- * @param [in] asyncConnect If true, the connection will be made asynchronously and this function will return immediately.\n
- * If false, this function will block until the connection is established or the connection attempt times out.
- * @param [in] exchangeMTU If true, the client will attempt to exchange MTU with the server after connection.\n
- * If false, the client will use the default MTU size and the application will need to call exchangeMTU() later.
- * @return true on success.
- */
-bool NimBLEClient::connect(const NimBLEAdvertisedDevice* pDevice, bool deleteAttributes, bool asyncConnect, bool exchangeMTU) {
-    NimBLEAddress address(pDevice->getAddress());
-    return connect(address, deleteAttributes, asyncConnect, exchangeMTU);
-} // connect
-
 /**
 * @brief Connect to the BLE Server using the address of the last connected device, or the address\n
 * passed to the constructor.
@@ -157,6 +137,22 @@ bool NimBLEClient::connect(bool deleteAttributes, bool asyncConnect, bool exchan
    return connect(m_peerAddress, deleteAttributes, asyncConnect, exchangeMTU);
 } // connect

+/**
+ * @brief Connect to an advertising device.
+ * @param [in] device The device to connect to.
+ * @param [in] deleteAttributes If true this will delete any attribute objects this client may already\n
+ * have created when last connected.
+ * @param [in] asyncConnect If true, the connection will be made asynchronously and this function will return immediately.\n
+ * If false, this function will block until the connection is established or the connection attempt times out.
+ * @param [in] exchangeMTU If true, the client will attempt to exchange MTU with the server after connection.\n
+ * If false, the client will use the default MTU size and the application will need to call exchangeMTU() later.
+ * @return true on success.
+ */
+bool NimBLEClient::connect(const NimBLEAdvertisedDevice* device, bool deleteAttributes, bool asyncConnect, bool exchangeMTU) {
+    NimBLEAddress address(device->getAddress());
+    return connect(address, deleteAttributes, asyncConnect, exchangeMTU);
+} // connect
+
 /**
 * @brief Connect to a BLE Server by address.
 * @param [in] address The address of the server.
@@ -308,7 +304,7 @@ bool NimBLEClient::secureConnection(bool async) const {

    int rc = 0;
    if (async && !NimBLEDevice::startSecurity(m_connHandle, &rc)) {
-        m_lastErr            = rc;
+        m_lastErr = rc;
        m_asyncSecureAttempt = 0;
        return false;
    }
--- a/src/NimBLEClient.h
+++ b/src/NimBLEClient.h
@@ -1,18 +1,14 @@
 /*
- * Copyright 2020-2025 Ryan Powell <ryan@nable-embedded.io> and
- * esp-nimble-cpp, NimBLE-Arduino contributors.
+ * NimBLEClient.h
 *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  Created: on Jan 26 2020
+ *      Author H2zero
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * Originally:
+ * BLEClient.h
 *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *  Created on: Mar 22, 2017
+ *      Author: kolban
 */

 #ifndef NIMBLE_CPP_CLIENT_H_
--- a/src/NimBLEConnInfo.h
+++ b/src/NimBLEConnInfo.h
@@ -1,20 +1,3 @@
-/*
- * Copyright 2020-2025 Ryan Powell <ryan@nable-embedded.io> and
- * esp-nimble-cpp, NimBLE-Arduino contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 #ifndef NIMBLECONNINFO_H_
 #define NIMBLECONNINFO_H_

@@ -77,7 +60,7 @@ class NimBLEConnInfo {
    friend class NimBLEDescriptor;

    ble_gap_conn_desc m_desc{};
-    NimBLEConnInfo() {};
+    NimBLEConnInfo(){};
    NimBLEConnInfo(ble_gap_conn_desc desc) { m_desc = desc; }
 };
 #endif
--- a/src/NimBLEDescriptor.cpp
+++ b/src/NimBLEDescriptor.cpp
@@ -1,18 +1,15 @@
 /*
- * Copyright 2020-2025 Ryan Powell <ryan@nable-embedded.io> and
- * esp-nimble-cpp, NimBLE-Arduino contributors.
+ * NimBLEDescriptor.cpp
 *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  Created: on March 10, 2020
+ *      Author H2zero
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * Originally:
 *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * BLEDescriptor.cpp
+ *
+ *  Created on: Jun 22, 2017
+ *      Author: kolban
 */

 #include "nimconfig.h"
--- a/src/NimBLEDescriptor.h
+++ b/src/NimBLEDescriptor.h
@@ -1,18 +1,15 @@
 /*
- * Copyright 2020-2025 Ryan Powell <ryan@nable-embedded.io> and
- * esp-nimble-cpp, NimBLE-Arduino contributors.
+ * NimBLEDescriptor.h
 *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  Created: on March 10, 2020
+ *      Author H2zero
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * Originally:
 *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * BLEDescriptor.h
+ *
+ *  Created on: Jun 22, 2017
+ *      Author: kolban
 */

 #ifndef NIMBLE_CPP_DESCRIPTOR_H_
@@ -21,12 +18,17 @@
 #include "nimconfig.h"
 #if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)

-# include "NimBLELocalValueAttribute.h"
-# include <string>
-
-class NimBLECharacteristic;
+class NimBLEDescriptor;
 class NimBLEDescriptorCallbacks;

+# include "NimBLELocalValueAttribute.h"
+# include "NimBLECharacteristic.h"
+# include "NimBLEUUID.h"
+# include "NimBLEAttValue.h"
+# include "NimBLEConnInfo.h"
+
+# include <string>
+
 /**
 * @brief A model of a BLE descriptor.
 */
--- a/src/NimBLEDevice.cpp
+++ b/src/NimBLEDevice.cpp
@@ -1,18 +1,15 @@
 /*
- * Copyright 2020-2025 Ryan Powell <ryan@nable-embedded.io> and
- * esp-nimble-cpp, NimBLE-Arduino contributors.
+ * NimBLEDevice.cpp
 *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  Created: on Jan 24 2020
+ *      Author H2zero
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * Originally:
 *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * BLEDevice.cpp
+ *
+ *  Created on: Mar 16, 2017
+ *      Author: kolban
 */

 #include "nimconfig.h"
@@ -42,7 +39,12 @@
 #   include "nimble/esp_port/esp-hci/include/esp_nimble_hci.h"
 #  endif
 # else
-#  include "nimble/nimble/controller/include/controller/ble_phy.h"
+//#  include "nimble/nimble/controller/include/controller/ble_phy.h"
+#    include "controller/ble_phy.h"
+#    include "host/ble_hs.h"
+#    include "host/util/util.h"
+#    include "services/gap/ble_svc_gap.h"
+#    include "services/gatt/ble_svc_gatt.h"
 # endif

 # ifndef CONFIG_NIMBLE_CPP_IDF
@@ -76,9 +78,6 @@ extern "C" void ble_store_config_init(void);
 /**
 * Singletons for the NimBLEDevice.
 */
-NimBLEDeviceCallbacks NimBLEDevice::defaultDeviceCallbacks{};
-NimBLEDeviceCallbacks* NimBLEDevice::m_pDeviceCallbacks = &defaultDeviceCallbacks;
-
 # if defined(CONFIG_BT_NIMBLE_ROLE_OBSERVER)
 NimBLEScan* NimBLEDevice::m_pScan = nullptr;
 # endif
@@ -467,7 +466,7 @@ bool NimBLEDevice::setPowerLevel(esp_power_level_t powerLevel, esp_ble_power_typ
 * @param [in] dbm The power level to set in dBm.
 * @return True if the power level was set successfully.
 */
-bool NimBLEDevice::setPower(int8_t dbm, NimBLETxPowerType type) {
+bool NimBLEDevice::setPower(int8_t dbm) {
 # ifdef ESP_PLATFORM
 #  ifdef CONFIG_IDF_TARGET_ESP32P4
    return false; // CONFIG_IDF_TARGET_ESP32P4 does not support esp_ble_tx_power_set
@@ -475,25 +474,9 @@ bool NimBLEDevice::setPower(int8_t dbm, NimBLETxPowerType type) {
    if (dbm % 3 == 2) {
        dbm++; // round up to the next multiple of 3 to be able to target 20dbm
    }
-
-    bool success = false;
-    esp_power_level_t espPwr = static_cast<esp_power_level_t>(dbm / 3 + ESP_PWR_LVL_N0);
-    if (type == NimBLETxPowerType::All) {
-        success  = setPowerLevel(espPwr, ESP_BLE_PWR_TYPE_ADV);
-        success &= setPowerLevel(espPwr, ESP_BLE_PWR_TYPE_SCAN);
-        success &= setPowerLevel(espPwr, ESP_BLE_PWR_TYPE_DEFAULT);
-    } else if (type == NimBLETxPowerType::Advertise) {
-        success = setPowerLevel(espPwr,  ESP_BLE_PWR_TYPE_ADV);
-    } else if (type == NimBLETxPowerType::Scan) {
-        success = setPowerLevel(espPwr, ESP_BLE_PWR_TYPE_SCAN);
-    } else if (type == NimBLETxPowerType::Connection) {
-        success = setPowerLevel(espPwr, ESP_BLE_PWR_TYPE_DEFAULT);
-    }
-
-    return success;
+    return setPowerLevel(static_cast<esp_power_level_t>(dbm / 3 + ESP_PWR_LVL_N0));
 #  endif
 # else
-    (void)type; // unused
    NIMBLE_LOGD(LOG_TAG, ">> setPower: %d", dbm);
    ble_hci_vs_set_tx_pwr_cp cmd{dbm};
    ble_hci_vs_set_tx_pwr_rp rsp{0};
@@ -512,16 +495,12 @@ bool NimBLEDevice::setPower(int8_t dbm, NimBLETxPowerType type) {
 * @brief Get the transmission power.
 * @return The power level currently used in dbm or 0xFF on error.
 */
-int NimBLEDevice::getPower(NimBLETxPowerType type) {
+int NimBLEDevice::getPower() {
 # ifdef ESP_PLATFORM
 #  ifdef CONFIG_IDF_TARGET_ESP32P4
    return 0xFF; // CONFIG_IDF_TARGET_ESP32P4 does not support esp_ble_tx_power_get
 #  else
-    esp_ble_power_type_t espPwr = type == NimBLETxPowerType::Advertise ? ESP_BLE_PWR_TYPE_ADV
-                                  : type == NimBLETxPowerType::Scan    ? ESP_BLE_PWR_TYPE_SCAN
-                                                                       : ESP_BLE_PWR_TYPE_DEFAULT;
-
-    int pwr = getPowerLevel(espPwr);
+    int pwr = getPowerLevel();
    if (pwr < 0) {
        NIMBLE_LOGE(LOG_TAG, "esp_ble_tx_power_get failed rc=%d", pwr);
        return 0xFF;
@@ -538,8 +517,7 @@ int NimBLEDevice::getPower(NimBLETxPowerType type) {
    return 0;
 #  endif
 # else
-    (void)type; // unused
-    return ble_phy_txpwr_get();
+    return ble_phy_tx_power_get(); //ble_phy_txpwr_get();
 # endif
 } // getPower

@@ -638,14 +616,18 @@ bool NimBLEDevice::isBonded(const NimBLEAddress& address) {
 /**
 * @brief Get the address of a bonded peer device by index.
 * @param [in] index The index to retrieve the peer address of.
- * @returns NimBLEAddress of the found bonded peer or null address if not found.
+ * @returns NimBLEAddress of the found bonded peer or nullptr if not found.
 */
 NimBLEAddress NimBLEDevice::getBondedAddress(int index) {
    ble_addr_t peer_id_addrs[MYNEWT_VAL(BLE_STORE_MAX_BONDS)];
    int        num_peers, rc;
    rc = ble_store_util_bonded_peers(&peer_id_addrs[0], &num_peers, MYNEWT_VAL(BLE_STORE_MAX_BONDS));
-    if (rc != 0 || index > num_peers || index < 0) {
-        return NimBLEAddress{};
+    if (rc != 0) {
+        return nullptr;
+    }
+
+    if (index > num_peers || index < 0) {
+        return nullptr;
    }

    return NimBLEAddress(peer_id_addrs[index]);
@@ -724,12 +706,12 @@ size_t NimBLEDevice::getWhiteListCount() {
 /**
 * @brief Gets the address at the vector index.
 * @param [in] index The vector index to retrieve the address from.
- * @returns The NimBLEAddress at the whitelist index or null address if not found.
+ * @returns The NimBLEAddress at the whitelist index or nullptr if not found.
 */
 NimBLEAddress NimBLEDevice::getWhiteListAddress(size_t index) {
    if (index > m_whiteList.size()) {
        NIMBLE_LOGE(LOG_TAG, "Invalid index; %u", index);
-        return NimBLEAddress{};
+        return nullptr;
    }

    return m_whiteList[index];
@@ -832,10 +814,19 @@ void NimBLEDevice::onSync(void) {
 */
 void NimBLEDevice::host_task(void* param) {
    NIMBLE_LOGI(LOG_TAG, "BLE Host Task Started");
+#ifndef MYNEWT
    nimble_port_run(); // This function will return only when nimble_port_stop() is executed
    nimble_port_freertos_deinit();
+#else
+    while (1) {
+        os_eventq_run(os_eventq_dflt_get());
+    }
+#endif
 } // host_task

+static struct os_task ble_nimble_task;
+static os_stack_t ble_nimble_stack[1024];
+
 /**
 * @brief Initialize the BLE environment.
 * @param [in] deviceName The device name of the device.
@@ -898,30 +889,31 @@ bool NimBLEDevice::init(const std::string& deviceName) {
        }
 #  endif
 # endif
-        nimble_port_init();

+#ifndef MYNEWT
+        nimble_port_init();
+#endif
        // Setup callbacks for host events
-        ble_hs_cfg.reset_cb        = NimBLEDevice::onReset;
-        ble_hs_cfg.sync_cb         = NimBLEDevice::onSync;
-        ble_hs_cfg.store_status_cb = [](struct ble_store_status_event* event, void* arg) {
-            return m_pDeviceCallbacks->onStoreStatus(event, arg);
-        };
+        ble_hs_cfg.reset_cb = NimBLEDevice::onReset;
+        ble_hs_cfg.sync_cb  = NimBLEDevice::onSync;

        // Set initial security capabilities
        ble_hs_cfg.sm_io_cap         = BLE_HS_IO_NO_INPUT_OUTPUT;
        ble_hs_cfg.sm_bonding        = 0;
        ble_hs_cfg.sm_mitm           = 0;
        ble_hs_cfg.sm_sc             = 1;
-        ble_hs_cfg.sm_our_key_dist   = BLE_SM_PAIR_KEY_DIST_ENC;
-        ble_hs_cfg.sm_their_key_dist = BLE_SM_PAIR_KEY_DIST_ENC;
-# if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
-        ble_hs_cfg.sm_our_key_dist   |= BLE_SM_PAIR_KEY_DIST_ID;
-        ble_hs_cfg.sm_their_key_dist |= BLE_SM_PAIR_KEY_DIST_ID;
-# endif
+        ble_hs_cfg.sm_our_key_dist   = BLE_SM_PAIR_KEY_DIST_ENC | BLE_SM_PAIR_KEY_DIST_ID;
+        ble_hs_cfg.sm_their_key_dist = BLE_SM_PAIR_KEY_DIST_ENC | BLE_SM_PAIR_KEY_DIST_ID;
+        ble_hs_cfg.store_status_cb   = ble_store_util_status_rr; /*TODO: Implement handler for this*/

        setDeviceName(deviceName);
+#ifndef MYNEWT
        ble_store_config_init();
        nimble_port_freertos_init(NimBLEDevice::host_task);
+#else
+        os_task_init(&ble_nimble_task, "ble_nimble_task", NimBLEDevice::host_task, NULL, 8,
+                     OS_WAIT_FOREVER, ble_nimble_stack, 1024);
+#endif
    }

    // Wait for host and controller to sync before returning and accepting new tasks
@@ -943,6 +935,7 @@ bool NimBLEDevice::init(const std::string& deviceName) {
 bool NimBLEDevice::deinit(bool clearAll) {
    int rc = 0;
    if (m_initialized) {
+#ifndef MYNEWT
        rc = nimble_port_stop();
        if (rc == 0) {
            nimble_port_deinit();
@@ -954,6 +947,10 @@ bool NimBLEDevice::deinit(bool clearAll) {
            }
 #  endif
 # endif
+#else
+        rc = ble_hs_shutdown(0);
+        if (rc == 0) {
+#endif
            m_initialized = false;
            m_synced      = false;
        }
@@ -1184,7 +1181,6 @@ bool NimBLEDevice::startSecurity(uint16_t connHandle, int* rcPtr) {
    return rc == 0 || rc == BLE_HS_EALREADY;
 } // startSecurity

-# if defined(CONFIG_BT_NIMBLE_ROLE_CENTRAL) || defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
 /**
 * @brief Inject the provided passkey into the Security Manager.
 * @param [in] peerInfo Connection information for the peer.
@@ -1209,7 +1205,6 @@ bool NimBLEDevice::injectConfirmPasskey(const NimBLEConnInfo& peerInfo, bool acc
    NIMBLE_LOGD(LOG_TAG, "BLE_SM_IOACT_NUMCMP; ble_sm_inject_io result: %d", rc);
    return rc == 0;
 }
-# endif // CONFIG_BT_NIMBLE_ROLE_CENTRAL || CONFIG_BT_NIMBLE_ROLE_PERIPHERAL

 /* -------------------------------------------------------------------------- */
 /*                                  UTILITIES                                 */
@@ -1261,19 +1256,9 @@ std::string NimBLEDevice::toString() {
 * @param [in] line The line number where the assert occurred.
 */
 void nimble_cpp_assert(const char* file, unsigned line) {
-    console_printf("Assertion failed at %s:%u\n", file, line);
-    ble_npl_time_delay(10);
+    NIMBLE_LOGC("", "Assertion failed at %s:%u\n", file, line);
    abort();
 }
 # endif // CONFIG_NIMBLE_CPP_DEBUG_ASSERT_ENABLED

-void NimBLEDevice::setDeviceCallbacks(NimBLEDeviceCallbacks* cb) {
-    m_pDeviceCallbacks = cb ? cb : &defaultDeviceCallbacks;
-}
-
-int NimBLEDeviceCallbacks::onStoreStatus(struct ble_store_status_event* event, void* arg) {
-    NIMBLE_LOGD("NimBLEDeviceCallbacks", "onStoreStatus: default");
-    return ble_store_util_status_rr(event, arg);
-}
-
 #endif // CONFIG_BT_ENABLED
--- a/src/NimBLEDevice.h
+++ b/src/NimBLEDevice.h
@@ -1,18 +1,15 @@
 /*
- * Copyright 2020-2025 Ryan Powell <ryan@nable-embedded.io> and
- * esp-nimble-cpp, NimBLE-Arduino contributors.
+ * NimBLEDevice.h
 *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  Created: on Jan 24 2020
+ *      Author H2zero
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * Originally:
 *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * BLEDevice.h
+ *
+ *  Created on: Mar 16, 2017
+ *      Author: kolban
 */

 #ifndef NIMBLE_CPP_DEVICE_H_
@@ -66,7 +63,6 @@ class NimBLEConnInfo;
 # endif

 class NimBLEAddress;
-class NimBLEDeviceCallbacks;

 # define BLEDevice                    NimBLEDevice
 # define BLEClient                    NimBLEClient
@@ -102,13 +98,6 @@ class NimBLEDeviceCallbacks;
 #  define NIMBLE_MAX_CONNECTIONS CONFIG_NIMBLE_MAX_CONNECTIONS
 # endif

-enum class NimBLETxPowerType {
-    All  = 0,
-    Advertise  = 1,
-    Scan = 2,
-    Connection = 3
-};
-
 typedef int (*gap_event_handler)(ble_gap_event* event, void* arg);

 /**
@@ -130,7 +119,6 @@ class NimBLEDevice {
    static bool          setOwnAddrType(uint8_t type);
    static bool          setOwnAddr(const NimBLEAddress& addr);
    static bool          setOwnAddr(const uint8_t* addr);
-    static void          setDeviceCallbacks(NimBLEDeviceCallbacks* cb);
    static void          setScanDuplicateCacheSize(uint16_t cacheSize);
    static void          setScanFilterMode(uint8_t type);
    static bool          setCustomGapHandler(gap_event_handler handler);
@@ -147,8 +135,8 @@ class NimBLEDevice {
    static void          onReset(int reason);
    static void          onSync(void);
    static void          host_task(void* param);
-    static int           getPower(NimBLETxPowerType type = NimBLETxPowerType::All);
-    static bool          setPower(int8_t dbm, NimBLETxPowerType type = NimBLETxPowerType::All);
+    static int           getPower();
+    static bool          setPower(int8_t dbm);

 # ifdef ESP_PLATFORM
 #  ifndef CONFIG_IDF_TARGET_ESP32P4
@@ -215,8 +203,6 @@ class NimBLEDevice {
    static ble_gap_event_listener     m_listener;
    static uint8_t                    m_ownAddrType;
    static std::vector<NimBLEAddress> m_whiteList;
-    static NimBLEDeviceCallbacks*     m_pDeviceCallbacks;
-    static NimBLEDeviceCallbacks      defaultDeviceCallbacks;

 # if defined(CONFIG_BT_NIMBLE_ROLE_OBSERVER)
    static NimBLEScan* m_pScan;
@@ -293,33 +279,5 @@ class NimBLEDevice {
 #  endif
 # endif

-# if defined(CONFIG_BT_NIMBLE_ROLE_CENTRAL) || defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
-#  include "NimBLEConnInfo.h"
-# endif
-
-# include "NimBLEUtils.h"
-
-/**
- * @brief Callbacks associated with a BLE device.
- */
-class NimBLEDeviceCallbacks {
-  public:
-    virtual ~NimBLEDeviceCallbacks() {};
-
-    /**
-     * @brief Indicates an inability to perform a store operation.
-     * This callback should do one of two things:
-     *     -Address the problem and return 0, indicating that the store operation
-     *      should proceed.
-     *     -Return nonzero to indicate that the store operation should be aborted.
-     * @param event     Describes the store event being reported.
-     *                      BLE_STORE_EVENT_FULL; or
-     *                      BLE_STORE_EVENT_OVERFLOW
-     * @return          0 if the store operation should proceed;
-     *                  nonzero if the store operation should be aborted.
-     */
-    virtual int onStoreStatus(struct ble_store_status_event* event, void* arg);
-};
-
 #endif // CONFIG_BT_ENABLED
 #endif // NIMBLE_CPP_DEVICE_H_
--- a/src/NimBLEEddystoneTLM.cpp
+++ b/src/NimBLEEddystoneTLM.cpp
@@ -1,18 +1,15 @@
 /*
- * Copyright 2020-2025 Ryan Powell <ryan@nable-embedded.io> and
- * esp-nimble-cpp, NimBLE-Arduino contributors.
+ * NimBLEEddystoneTLM.cpp
 *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  Created: on March 15 2020
+ *      Author H2zero
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * Originally:
 *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * BLEEddystoneTLM.cpp
+ *
+ *  Created on: Mar 12, 2018
+ *      Author: pcbreflux
 */

 #include "nimconfig.h"
--- a/src/NimBLEEddystoneTLM.h
+++ b/src/NimBLEEddystoneTLM.h
@@ -1,18 +1,15 @@
 /*
- * Copyright 2020-2025 Ryan Powell <ryan@nable-embedded.io> and
- * esp-nimble-cpp, NimBLE-Arduino contributors.
+ * NimBLEEddystoneTLM.h
 *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  Created: on March 15 2020
+ *      Author H2zero
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * Originally:
 *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * BLEEddystoneTLM.h
+ *
+ *  Created on: Mar 12, 2018
+ *      Author: pcbreflux
 */

 #ifndef NIMBLE_CPP_EDDYSTONETLM_H_
--- a/src/NimBLEExtAdvertising.cpp
+++ b/src/NimBLEExtAdvertising.cpp
@@ -1,18 +1,8 @@
 /*
- * Copyright 2020-2025 Ryan Powell <ryan@nable-embedded.io> and
- * esp-nimble-cpp, NimBLE-Arduino contributors.
+ * NimBLEExtAdvertising.cpp
 *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *  Created: on February 6, 2022
+ *      Author H2zero
 */

 #include "nimconfig.h"
@@ -359,7 +349,7 @@ NimBLEExtAdvertisement::NimBLEExtAdvertisement(uint8_t priPhy, uint8_t secPhy) {
    m_params.own_addr_type = NimBLEDevice::m_ownAddrType;
    m_params.primary_phy   = priPhy;
    m_params.secondary_phy = secPhy;
-    m_params.tx_power      = NimBLEDevice::getPower(NimBLETxPowerType::Advertise);
+    m_params.tx_power      = 127;
 } // NimBLEExtAdvertisement

 /**
@@ -701,7 +691,6 @@ bool NimBLEExtAdvertisement::addServiceUUID(const NimBLEUUID& serviceUUID) {
            type = BLE_HS_ADV_TYPE_COMP_UUIDS128;
            break;
        default:
-            NIMBLE_LOGE(LOG_TAG, "Cannot add UUID, invalid size!");
            return false;
    }

@@ -712,11 +701,10 @@ bool NimBLEExtAdvertisement::addServiceUUID(const NimBLEUUID& serviceUUID) {
    }

    if (length + getDataSize() > CONFIG_BT_NIMBLE_MAX_EXT_ADV_DATA_LEN) {
-        NIMBLE_LOGE(LOG_TAG, "Cannot add UUID, data length exceeded!");
        return false;
    }

-    uint8_t        data[BLE_HS_ADV_MAX_SZ];
+    uint8_t        data[31];
    const uint8_t* uuid = serviceUUID.getValue();
    if (dataLoc == -1) {
        data[0] = 1 + bytes;
@@ -758,7 +746,6 @@ bool NimBLEExtAdvertisement::removeServiceUUID(const NimBLEUUID& serviceUUID) {
            type = BLE_HS_ADV_TYPE_COMP_UUIDS128;
            break;
        default:
-            NIMBLE_LOGE(LOG_TAG, "Cannot remove UUID, invalid size!");
            return false;
    }

@@ -768,7 +755,7 @@ bool NimBLEExtAdvertisement::removeServiceUUID(const NimBLEUUID& serviceUUID) {
    }

    int uuidLoc = -1;
-    for (size_t i = dataLoc + 2; i < m_payload.size(); i += bytes) {
+    for (int i = dataLoc + 2; i < m_payload.size(); i += bytes) {
        if (memcmp(&m_payload[i], serviceUUID.getValue(), bytes) == 0) {
            uuidLoc = i;
            break;
@@ -881,7 +868,6 @@ bool NimBLEExtAdvertisement::setServices(bool complete, uint8_t size, const std:
            header[1] = complete ? BLE_HS_ADV_TYPE_COMP_UUIDS128 : BLE_HS_ADV_TYPE_INCOMP_UUIDS128;
            break;
        default:
-            NIMBLE_LOGE(LOG_TAG, "Cannot set services, invalid size!");
            return false;
    }

@@ -936,7 +922,6 @@ bool NimBLEExtAdvertisement::setServiceData(const NimBLEUUID& uuid, const uint8_
            type = BLE_HS_ADV_TYPE_SVC_DATA_UUID128;
            break;
        default:
-            NIMBLE_LOGE(LOG_TAG, "Cannot set service data, invalid size!");
            return false;
    }

@@ -1014,22 +999,8 @@ bool NimBLEExtAdvertisement::setPreferredParams(uint16_t minInterval, uint16_t m
 /**
 * @brief Adds Tx power level to the advertisement data.
 */
-bool NimBLEExtAdvertisement::addTxPower() {
-    if (m_params.legacy_pdu) {
-        m_params.include_tx_power = 0;
-        uint8_t data[3];
-        data[0] = BLE_HS_ADV_TX_PWR_LVL_LEN + 1;
-        data[1] = BLE_HS_ADV_TYPE_TX_PWR_LVL;
-# ifndef CONFIG_IDF_TARGET_ESP32P4
-        data[2] = NimBLEDevice::getPower(NimBLETxPowerType::Advertise);
-# else
-        data[2] = 0;
-# endif
-        return addData(data, 3);
-    }
-
+void NimBLEExtAdvertisement::addTxPower() {
    m_params.include_tx_power = 1;
-    return true;
 } // addTxPower

 /**
@@ -1038,7 +1009,7 @@ bool NimBLEExtAdvertisement::addTxPower() {
 * @return -1 if the data is not found, otherwise the index of the data in the payload.
 */
 int NimBLEExtAdvertisement::getDataLocation(uint8_t type) const {
-    size_t index = 0;
+    int index = 0;
    while (index < m_payload.size()) {
        if (m_payload[index + 1] == type) {
            return index;
--- a/src/NimBLEExtAdvertising.h
+++ b/src/NimBLEExtAdvertising.h
@@ -1,18 +1,8 @@
 /*
- * Copyright 2020-2025 Ryan Powell <ryan@nable-embedded.io> and
- * esp-nimble-cpp, NimBLE-Arduino contributors.
+ * NimBLEExtAdvertising.h
 *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *  Created: on February 6, 2022
+ *      Author H2zero
 */

 #ifndef NIMBLE_CPP_EXTADVERTISING_H_
@@ -46,33 +36,34 @@ class NimBLEUUID;
 class NimBLEExtAdvertisement {
  public:
    NimBLEExtAdvertisement(uint8_t priPhy = BLE_HCI_LE_PHY_1M, uint8_t secPhy = BLE_HCI_LE_PHY_1M);
-    bool        setAppearance(uint16_t appearance);
-    bool        addServiceUUID(const NimBLEUUID& serviceUUID);
-    bool        addServiceUUID(const char* serviceUUID);
-    bool        removeServiceUUID(const NimBLEUUID& serviceUUID);
-    bool        removeServiceUUID(const char* serviceUUID);
-    bool        removeServices();
-    bool        setCompleteServices(const NimBLEUUID& uuid);
-    bool        setCompleteServices16(const std::vector<NimBLEUUID>& uuids);
-    bool        setCompleteServices32(const std::vector<NimBLEUUID>& uuids);
-    bool        setFlags(uint8_t flag);
-    bool        setManufacturerData(const uint8_t* data, size_t length);
-    bool        setManufacturerData(const std::string& data);
-    bool        setManufacturerData(const std::vector<uint8_t>& data);
-    bool        setURI(const std::string& uri);
-    bool        setName(const std::string& name, bool isComplete = true);
-    bool        setPartialServices(const NimBLEUUID& uuid);
-    bool        setPartialServices16(const std::vector<NimBLEUUID>& uuids);
-    bool        setPartialServices32(const std::vector<NimBLEUUID>& uuids);
-    bool        setServiceData(const NimBLEUUID& uuid, const uint8_t* data, size_t length);
-    bool        setServiceData(const NimBLEUUID& uuid, const std::string& data);
-    bool        setServiceData(const NimBLEUUID& uuid, const std::vector<uint8_t>& data);
-    bool        setShortName(const std::string& name);
-    bool        setData(const uint8_t* data, size_t length);
-    bool        addData(const uint8_t* data, size_t length);
-    bool        addData(const std::string& data);
-    bool        setPreferredParams(uint16_t min, uint16_t max);
-    bool        addTxPower();
+    bool setAppearance(uint16_t appearance);
+    bool addServiceUUID(const NimBLEUUID& serviceUUID);
+    bool addServiceUUID(const char* serviceUUID);
+    bool removeServiceUUID(const NimBLEUUID& serviceUUID);
+    bool removeServiceUUID(const char* serviceUUID);
+    bool removeServices();
+    bool setCompleteServices(const NimBLEUUID& uuid);
+    bool setCompleteServices16(const std::vector<NimBLEUUID>& uuids);
+    bool setCompleteServices32(const std::vector<NimBLEUUID>& uuids);
+    bool setFlags(uint8_t flag);
+    bool setManufacturerData(const uint8_t* data, size_t length);
+    bool setManufacturerData(const std::string& data);
+    bool setManufacturerData(const std::vector<uint8_t>& data);
+    bool setURI(const std::string& uri);
+    bool setName(const std::string& name, bool isComplete = true);
+    bool setPartialServices(const NimBLEUUID& uuid);
+    bool setPartialServices16(const std::vector<NimBLEUUID>& uuids);
+    bool setPartialServices32(const std::vector<NimBLEUUID>& uuids);
+    bool setServiceData(const NimBLEUUID& uuid, const uint8_t* data, size_t length);
+    bool setServiceData(const NimBLEUUID& uuid, const std::string& data);
+    bool setServiceData(const NimBLEUUID& uuid, const std::vector<uint8_t>& data);
+    bool setShortName(const std::string& name);
+    bool setData(const uint8_t* data, size_t length);
+    bool addData(const uint8_t* data, size_t length);
+    bool addData(const std::string& data);
+    bool setPreferredParams(uint16_t min, uint16_t max);
+
+    void        addTxPower();
    void        setLegacyAdvertising(bool enable);
    void        setConnectable(bool enable);
    void        setScannable(bool enable);
--- a/src/NimBLEHIDDevice.cpp
+++ b/src/NimBLEHIDDevice.cpp
@@ -1,18 +1,15 @@
 /*
- * Copyright 2020-2025 Ryan Powell <ryan@nable-embedded.io> and
- * esp-nimble-cpp, NimBLE-Arduino contributors.
+ * NimBLEHIDDevice.cpp
 *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  Created: on Oct 06 2020
+ *      Author wakwak-koba
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * Originally:
 *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * BLEHIDDevice.cpp
+ *
+ *  Created on: Jan 03, 2018
+ *      Author: chegewara
 */

 #include "nimconfig.h"
@@ -149,35 +146,14 @@ void NimBLEHIDDevice::setBatteryLevel(uint8_t level, bool notify) {
    }
 } // setBatteryLevel

-/**
- * @brief Locate the characteristic for a report ID and a report type.
- *
- * @param [in] reportId Report identifier to locate.
- * @param [in] reportType Type of report (input/output/feature).
- * @return NimBLECharacteristic* The characteristic.
- * @return nullptr If the characteristic does not exist.
- */
-NimBLECharacteristic* NimBLEHIDDevice::locateReportCharacteristicByIdAndType(uint8_t reportId, uint8_t reportType) {
-    NimBLECharacteristic* candidate = m_hidSvc->getCharacteristic(inputReportChrUuid, 0);
-    for (uint16_t i = 1; (candidate != nullptr) && (i != 0); i++) {
-        NimBLEDescriptor* dsc           = candidate->getDescriptorByUUID(featureReportDscUuid);
-        NimBLEAttValue    desc1_val_att = dsc->getValue();
-        const uint8_t*    desc1_val     = desc1_val_att.data();
-        if ((desc1_val[0] == reportId) && (desc1_val[1] == reportType)) return candidate;
-        candidate = m_hidSvc->getCharacteristic(inputReportChrUuid, i);
-    }
-    return nullptr;
-}
-
 /**
 * @brief Get the input report characteristic.
- * @param [in] reportId Input report ID, the same as in report map for input object related to the characteristic.
- * @return NimBLECharacteristic* A pointer to the input report characteristic.
- *                               Store this value to avoid computational overhead.
+ * @param [in] reportId input report ID, the same as in report map for input object related to the characteristic.
+ * @return A pointer to the input report characteristic.
 * @details This will create the characteristic if not already created.
 */
 NimBLECharacteristic* NimBLEHIDDevice::getInputReport(uint8_t reportId) {
-    NimBLECharacteristic* inputReportChr = locateReportCharacteristicByIdAndType(reportId, 0x01);
+    NimBLECharacteristic* inputReportChr = m_hidSvc->getCharacteristic(inputReportChrUuid);
    if (inputReportChr == nullptr) {
        inputReportChr =
            m_hidSvc->createCharacteristic(inputReportChrUuid,
@@ -195,12 +171,11 @@ NimBLECharacteristic* NimBLEHIDDevice::getInputReport(uint8_t reportId) {
 /**
 * @brief Get the output report characteristic.
 * @param [in] reportId Output report ID, the same as in report map for output object related to the characteristic.
- * @return NimBLECharacteristic* A pointer to the output report characteristic.
- *                               Store this value to avoid computational overhead.
+ * @return A pointer to the output report characteristic.
 * @details This will create the characteristic if not already created.
 */
 NimBLECharacteristic* NimBLEHIDDevice::getOutputReport(uint8_t reportId) {
-    NimBLECharacteristic* outputReportChr = locateReportCharacteristicByIdAndType(reportId, 0x02);
+    NimBLECharacteristic* outputReportChr = m_hidSvc->getCharacteristic(inputReportChrUuid);
    if (outputReportChr == nullptr) {
        outputReportChr =
            m_hidSvc->createCharacteristic(inputReportChrUuid,
@@ -209,6 +184,7 @@ NimBLECharacteristic* NimBLEHIDDevice::getOutputReport(uint8_t reportId) {
        NimBLEDescriptor* outputReportDsc = outputReportChr->createDescriptor(
            featureReportDscUuid,
            NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::WRITE | NIMBLE_PROPERTY::READ_ENC | NIMBLE_PROPERTY::WRITE_ENC);
+
        uint8_t desc1_val[] = {reportId, 0x02};
        outputReportDsc->setValue(desc1_val, 2);
    }
@@ -219,12 +195,11 @@ NimBLECharacteristic* NimBLEHIDDevice::getOutputReport(uint8_t reportId) {
 /**
 * @brief Get the feature report characteristic.
 * @param [in] reportId Feature report ID, the same as in report map for feature object related to the characteristic.
- * @return NimBLECharacteristic* A pointer to feature report characteristic.
- *                               Store this value to avoid computational overhead.
+ * @return A pointer to feature report characteristic.
 * @details This will create the characteristic if not already created.
 */
 NimBLECharacteristic* NimBLEHIDDevice::getFeatureReport(uint8_t reportId) {
-    NimBLECharacteristic* featureReportChr = locateReportCharacteristicByIdAndType(reportId, 0x03);
+    NimBLECharacteristic* featureReportChr = m_hidSvc->getCharacteristic(inputReportChrUuid);
    if (featureReportChr == nullptr) {
        featureReportChr = m_hidSvc->createCharacteristic(
            inputReportChrUuid,
--- a/src/NimBLEHIDDevice.h
+++ b/src/NimBLEHIDDevice.h
@@ -1,18 +1,15 @@
 /*
- * Copyright 2020-2025 Ryan Powell <ryan@nable-embedded.io> and
- * esp-nimble-cpp, NimBLE-Arduino contributors.
+ * NimBLEHIDDevice.h
 *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  Created: on Oct 06 2020
+ *      Author wakwak-koba
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * Originally:
 *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * BLEHIDDevice.h
+ *
+ *  Created on: Jan 03, 2018
+ *      Author: chegewara
 */

 #ifndef NIMBLE_CPP_HIDDEVICE_H_
@@ -81,8 +78,6 @@ class NimBLEHIDDevice {
    NimBLECharacteristic* m_hidControlChr{nullptr};   // 0x2a4c
    NimBLECharacteristic* m_protocolModeChr{nullptr}; // 0x2a4e
    NimBLECharacteristic* m_batteryLevelChr{nullptr}; // 0x2a19
-
-    NimBLECharacteristic* locateReportCharacteristicByIdAndType(uint8_t reportId, uint8_t reportType);
 };

 #endif // CONFIG_BT_ENABLED && CONFIG_BT_NIMBLE_ROLE_BROADCASTER && defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
--- a/src/NimBLELocalAttribute.h
+++ b/src/NimBLELocalAttribute.h
@@ -1,18 +1,8 @@
 /*
- * Copyright 2020-2025 Ryan Powell <ryan@nable-embedded.io> and
- * esp-nimble-cpp, NimBLE-Arduino contributors.
+ * NimBLELocalAttribute.cpp
 *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *  Created: on July 28 2024
+ *      Author H2zero
 */

 #ifndef NIMBLE_CPP_LOCAL_ATTRIBUTE_H_
--- a/src/NimBLELocalValueAttribute.h
+++ b/src/NimBLELocalValueAttribute.h
@@ -1,18 +1,8 @@
 /*
- * Copyright 2020-2025 Ryan Powell <ryan@nable-embedded.io> and
- * esp-nimble-cpp, NimBLE-Arduino contributors.
+ * NimBLELocalValueAttribute.cpp
 *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *  Created: on July 28 2024
+ *      Author H2zero
 */

 #ifndef NIMBLE_LOCAL_VALUE_ATTRIBUTE_H_
--- a/src/NimBLELog.h
+++ b/src/NimBLELog.h
@@ -1,183 +1,81 @@
 /*
- * Copyright 2020-2025 Ryan Powell <ryan@nable-embedded.io> and
- * esp-nimble-cpp, NimBLE-Arduino contributors.
+ * NimBLELog.h
 *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  Created: on Feb 24 2020
+ *      Author H2zero
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
 */
-
-#ifndef NIMBLE_CPP_LOG_H_
-#define NIMBLE_CPP_LOG_H_
+#ifndef MAIN_NIMBLELOG_H_
+#define MAIN_NIMBLELOG_H_

 #include "nimconfig.h"
+
 #if defined(CONFIG_BT_ENABLED)

-# if defined(CONFIG_NIMBLE_CPP_IDF)
+#if (0) // using esp-idf
 #  include "esp_log.h"
 #  include "console/console.h"
 #  ifndef CONFIG_NIMBLE_CPP_LOG_LEVEL
-#   define CONFIG_NIMBLE_CPP_LOG_LEVEL 0
+#    define CONFIG_NIMBLE_CPP_LOG_LEVEL 0
 #  endif

-#  if defined(CONFIG_NIMBLE_CPP_LOG_OVERRIDE_COLOR)
-#   if CONFIG_LOG_COLORS
-#    if defined(CONFIG_NIMBLE_CPP_LOG_OVERRIDE_COLOR_DEBUG_BLACK)
-#     define NIMBLE_CPP_LOG_COLOR_D		LOG_COLOR(LOG_COLOR_BLACK)
-#    elif defined(CONFIG_NIMBLE_CPP_LOG_OVERRIDE_COLOR_DEBUG_RED)
-#     define NIMBLE_CPP_LOG_COLOR_D     LOG_COLOR(LOG_COLOR_RED)
-#    elif defined(CONFIG_NIMBLE_CPP_LOG_OVERRIDE_COLOR_DEBUG_GREEN)
-#     define NIMBLE_CPP_LOG_COLOR_D     LOG_COLOR(LOG_COLOR_GREEN)
-#    elif defined(CONFIG_NIMBLE_CPP_LOG_OVERRIDE_COLOR_DEBUG_YELLOW)
-#     define NIMBLE_CPP_LOG_COLOR_D     LOG_COLOR(LOG_COLOR_BROWN)
-#    elif defined(CONFIG_NIMBLE_CPP_LOG_OVERRIDE_COLOR_DEBUG_BLUE)
-#     define NIMBLE_CPP_LOG_COLOR_D     LOG_COLOR(LOG_COLOR_BLUE)
-#    elif defined(CONFIG_NIMBLE_CPP_LOG_OVERRIDE_COLOR_DEBUG_PURPLE)
-#     define NIMBLE_CPP_LOG_COLOR_D     LOG_COLOR(LOG_COLOR_PURPLE)
-#    elif defined(CONFIG_NIMBLE_CPP_LOG_OVERRIDE_COLOR_DEBUG_CYAN)
-#     define NIMBLE_CPP_LOG_COLOR_D     LOG_COLOR(LOG_COLOR_CYAN)
-#    else
-#     define NIMBLE_CPP_LOG_COLOR_D
-#    endif
+#  define NIMBLE_CPP_LOG_PRINT(level, tag, format, ...) do { \
+    if (CONFIG_NIMBLE_CPP_LOG_LEVEL >= level) \
+      ESP_LOG_LEVEL_LOCAL(level, tag, format, ##__VA_ARGS__); \
+    } while(0)

-#    if defined(CONFIG_NIMBLE_CPP_LOG_OVERRIDE_COLOR_INFO_BLACK)
-#     define NIMBLE_CPP_LOG_COLOR_I     LOG_COLOR(LOG_COLOR_BLACK)
-#    elif defined(CONFIG_NIMBLE_CPP_LOG_OVERRIDE_COLOR_INFO_RED)
-#     define NIMBLE_CPP_LOG_COLOR_I     LOG_COLOR(LOG_COLOR_RED)
-#    elif defined(CONFIG_NIMBLE_CPP_LOG_OVERRIDE_COLOR_INFO_GREEN)
-#     define NIMBLE_CPP_LOG_COLOR_I     LOG_COLOR(LOG_COLOR_GREEN)
-#    elif defined(CONFIG_NIMBLE_CPP_LOG_OVERRIDE_COLOR_INFO_YELLOW)
-#     define NIMBLE_CPP_LOG_COLOR_I     LOG_COLOR(LOG_COLOR_BROWN)
-#    elif defined(CONFIG_NIMBLE_CPP_LOG_OVERRIDE_COLOR_INFO_BLUE)
-#     define NIMBLE_CPP_LOG_COLOR_I     LOG_COLOR(LOG_COLOR_BLUE)
-#    elif defined(CONFIG_NIMBLE_CPP_LOG_OVERRIDE_COLOR_INFO_PURPLE)
-#     define NIMBLE_CPP_LOG_COLOR_I     LOG_COLOR(LOG_COLOR_PURPLE)
-#    elif defined(CONFIG_NIMBLE_CPP_LOG_OVERRIDE_COLOR_INFO_CYAN)
-#     define NIMBLE_CPP_LOG_COLOR_I     LOG_COLOR(LOG_COLOR_CYAN)
-#    else
-#     define NIMBLE_CPP_LOG_COLOR_I
-#    endif
+#  define NIMBLE_LOGD(tag, format, ...) \
+     NIMBLE_CPP_LOG_PRINT(ESP_LOG_DEBUG, tag, format, ##__VA_ARGS__)

-#    if defined(CONFIG_NIMBLE_CPP_LOG_OVERRIDE_COLOR_WARN_BLACK)
-#     define NIMBLE_CPP_LOG_COLOR_W     LOG_COLOR(LOG_COLOR_BLACK)
-#    elif defined(CONFIG_NIMBLE_CPP_LOG_OVERRIDE_COLOR_WARN_RED)
-#     define NIMBLE_CPP_LOG_COLOR_W     LOG_COLOR(LOG_COLOR_RED)
-#    elif defined(CONFIG_NIMBLE_CPP_LOG_OVERRIDE_COLOR_WARN_GREEN)
-#     define NIMBLE_CPP_LOG_COLOR_W     LOG_COLOR(LOG_COLOR_GREEN)
-#    elif defined(CONFIG_NIMBLE_CPP_LOG_OVERRIDE_COLOR_WARN_YELLOW)
-#     define NIMBLE_CPP_LOG_COLOR_W     LOG_COLOR(LOG_COLOR_BROWN)
-#    elif defined(CONFIG_NIMBLE_CPP_LOG_OVERRIDE_COLOR_WARN_BLUE)
-#     define NIMBLE_CPP_LOG_COLOR_W     LOG_COLOR(LOG_COLOR_BLUE)
-#    elif defined(CONFIG_NIMBLE_CPP_LOG_OVERRIDE_COLOR_WARN_PURPLE)
-#     define NIMBLE_CPP_LOG_COLOR_W     LOG_COLOR(LOG_COLOR_PURPLE)
-#    elif defined(CONFIG_NIMBLE_CPP_LOG_OVERRIDE_COLOR_WARN_CYAN)
-#     define NIMBLE_CPP_LOG_COLOR_W     LOG_COLOR(LOG_COLOR_CYAN)
-#    else
-#     define NIMBLE_CPP_LOG_COLOR_W
-#    endif
+#  define NIMBLE_LOGI(tag, format, ...) \
+     NIMBLE_CPP_LOG_PRINT(ESP_LOG_INFO, tag, format, ##__VA_ARGS__)

-#    if defined(CONFIG_NIMBLE_CPP_LOG_OVERRIDE_COLOR_ERR_BLACK)
-#     define NIMBLE_CPP_LOG_COLOR_E     LOG_COLOR(LOG_COLOR_BLACK)
-#    elif defined(CONFIG_NIMBLE_CPP_LOG_OVERRIDE_COLOR_ERR_RED)
-#     define NIMBLE_CPP_LOG_COLOR_E     LOG_COLOR(LOG_COLOR_RED)
-#    elif defined(CONFIG_NIMBLE_CPP_LOG_OVERRIDE_COLOR_ERR_GREEN)
-#     define NIMBLE_CPP_LOG_COLOR_E     LOG_COLOR(LOG_COLOR_GREEN)
-#    elif defined(CONFIG_NIMBLE_CPP_LOG_OVERRIDE_COLOR_ERR_YELLOW)
-#     define NIMBLE_CPP_LOG_COLOR_E     LOG_COLOR(LOG_COLOR_BROWN)
-#    elif defined(CONFIG_NIMBLE_CPP_LOG_OVERRIDE_COLOR_ERR_BLUE)
-#     define NIMBLE_CPP_LOG_COLOR_E     LOG_COLOR(LOG_COLOR_BLUE)
-#    elif defined(CONFIG_NIMBLE_CPP_LOG_OVERRIDE_COLOR_ERR_PURPLE)
-#     define NIMBLE_CPP_LOG_COLOR_E     LOG_COLOR(LOG_COLOR_PURPLE)
-#    elif defined(CONFIG_NIMBLE_CPP_LOG_OVERRIDE_COLOR_ERR_CYAN)
-#     define NIMBLE_CPP_LOG_COLOR_E     LOG_COLOR(LOG_COLOR_CYAN)
-#    else
-#     define NIMBLE_CPP_LOG_COLOR_E
-#    endif
-#   else //CONFIG_LOG_COLORS
-#    define NIMBLE_CPP_LOG_COLOR_D
-#    define NIMBLE_CPP_LOG_COLOR_I
-#    define NIMBLE_CPP_LOG_COLOR_W
-#    define NIMBLE_CPP_LOG_COLOR_E
-#   endif //CONFIG_LOG_COLORS
+#  define NIMBLE_LOGW(tag, format, ...) \
+     NIMBLE_CPP_LOG_PRINT(ESP_LOG_WARN, tag, format, ##__VA_ARGS__)

-#   define NIMBLE_CPP_LOG_FORMAT(letter, format) NIMBLE_CPP_LOG_COLOR_##letter #letter " (%lu) %s: " format LOG_RESET_COLOR "\n"
+#  define NIMBLE_LOGE(tag, format, ...) \
+     NIMBLE_CPP_LOG_PRINT(ESP_LOG_ERROR, tag, format, ##__VA_ARGS__)

-#   define NIMBLE_CPP_LOG_LEVEL_LOCAL(level, tag, format, ...)                                                                                                          \
-      do {                                                                                                                                                              \
-        if (level==ESP_LOG_ERROR)       { esp_log_write(ESP_LOG_ERROR, tag, NIMBLE_CPP_LOG_FORMAT(E, format), esp_log_timestamp(), tag __VA_OPT__(,) __VA_ARGS__); }    \
-        else if (level==ESP_LOG_WARN)   { esp_log_write(ESP_LOG_WARN, tag, NIMBLE_CPP_LOG_FORMAT(W, format), esp_log_timestamp(), tag __VA_OPT__(,) __VA_ARGS__); }     \
-        else if (level==ESP_LOG_INFO)   { esp_log_write(ESP_LOG_INFO, tag, NIMBLE_CPP_LOG_FORMAT(I, format), esp_log_timestamp(), tag __VA_OPT__(,) __VA_ARGS__); }     \
-        else                            { esp_log_write(ESP_LOG_DEBUG, tag, NIMBLE_CPP_LOG_FORMAT(D, format), esp_log_timestamp(), tag __VA_OPT__(,) __VA_ARGS__); }    \
-      } while(0)
-
-#   define NIMBLE_CPP_LOG_PRINT(level, tag, format, ...)                                                            \
-      do {                                                                                                          \
-        if (CONFIG_NIMBLE_CPP_LOG_LEVEL >= level) NIMBLE_CPP_LOG_LEVEL_LOCAL(level, tag, format, ##__VA_ARGS__);    \
-      } while (0)
-
-#  else
-#   define NIMBLE_CPP_LOG_PRINT(level, tag, format, ...)                                                    \
-      do {                                                                                                  \
-        if (CONFIG_NIMBLE_CPP_LOG_LEVEL >= level) ESP_LOG_LEVEL_LOCAL(level, tag, format, ##__VA_ARGS__);   \
-      } while (0)
-
-#  endif /* CONFIG_NIMBLE_CPP_LOG_OVERRIDE_COLOR */
-
-#  define NIMBLE_LOGD(tag, format, ...) NIMBLE_CPP_LOG_PRINT(ESP_LOG_DEBUG, tag, format, ##__VA_ARGS__)
-#  define NIMBLE_LOGI(tag, format, ...) NIMBLE_CPP_LOG_PRINT(ESP_LOG_INFO, tag, format, ##__VA_ARGS__)
-#  define NIMBLE_LOGW(tag, format, ...) NIMBLE_CPP_LOG_PRINT(ESP_LOG_WARN, tag, format, ##__VA_ARGS__)
-#  define NIMBLE_LOGE(tag, format, ...) NIMBLE_CPP_LOG_PRINT(ESP_LOG_ERROR, tag, format, ##__VA_ARGS__)
-
-# else
-#  include "nimble/porting/nimble/include/syscfg/syscfg.h"
-#  include "nimble/console/console.h"
+#else // using Arduino
+//#  include "nimble/porting/nimble/include/syscfg/syscfg.h"
+//#  include "nimble/console/console.h"
+#  include "syscfg/syscfg.h"
+#  include "console/console.h"
 #  ifndef CONFIG_NIMBLE_CPP_LOG_LEVEL
-#   if defined(ARDUINO_ARCH_ESP32) && defined(CORE_DEBUG_LEVEL)
-#    define CONFIG_NIMBLE_CPP_LOG_LEVEL CORE_DEBUG_LEVEL
-#   else
-#    define CONFIG_NIMBLE_CPP_LOG_LEVEL 0
-#   endif
+#    if defined(ARDUINO_ARCH_ESP32) && defined(CORE_DEBUG_LEVEL)
+#      define CONFIG_NIMBLE_CPP_LOG_LEVEL CORE_DEBUG_LEVEL
+#    else
+#      define CONFIG_NIMBLE_CPP_LOG_LEVEL 0
+#    endif
 #  endif

 #  if CONFIG_NIMBLE_CPP_LOG_LEVEL >= 4
-#   define NIMBLE_LOGD(tag, format, ...) console_printf("D %s: " format "\n", tag, ##__VA_ARGS__)
+#    define NIMBLE_LOGD( tag, format, ... ) console_printf("D %s: " format "\n", tag, ##__VA_ARGS__)
 #  else
-#   define NIMBLE_LOGD(tag, format, ...) (void)tag
+#    define NIMBLE_LOGD( tag, format, ... ) (void)tag
 #  endif

 #  if CONFIG_NIMBLE_CPP_LOG_LEVEL >= 3
-#   define NIMBLE_LOGI(tag, format, ...) console_printf("I %s: " format "\n", tag, ##__VA_ARGS__)
+#    define NIMBLE_LOGI( tag, format, ... ) console_printf("I %s: " format "\n", tag, ##__VA_ARGS__)
 #  else
-#   define NIMBLE_LOGI(tag, format, ...) (void)tag
+#    define NIMBLE_LOGI( tag, format, ... ) (void)tag
 #  endif

 #  if CONFIG_NIMBLE_CPP_LOG_LEVEL >= 2
-#   define NIMBLE_LOGW(tag, format, ...) console_printf("W %s: " format "\n", tag, ##__VA_ARGS__)
+#    define NIMBLE_LOGW( tag, format, ... ) console_printf("W %s: " format "\n", tag, ##__VA_ARGS__)
 #  else
-#   define NIMBLE_LOGW(tag, format, ...) (void)tag
+#    define NIMBLE_LOGW( tag, format, ... ) (void)tag
 #  endif

 #  if CONFIG_NIMBLE_CPP_LOG_LEVEL >= 1
-#   define NIMBLE_LOGE(tag, format, ...) console_printf("E %s: " format "\n", tag, ##__VA_ARGS__)
+#    define NIMBLE_LOGE( tag, format, ... ) console_printf("E %s: " format "\n", tag, ##__VA_ARGS__)
 #  else
-#   define NIMBLE_LOGE(tag, format, ...) (void)tag
+#    define NIMBLE_LOGE( tag, format, ... ) (void)tag
 #  endif

-# endif  /* CONFIG_NIMBLE_CPP_IDF */
+#endif /* CONFIG_NIMBLE_CPP_IDF */

-#  define NIMBLE_LOGD_IF(cond, tag, format, ...) { if (cond) { NIMBLE_LOGD(tag, format, ##__VA_ARGS__); }}
-#  define NIMBLE_LOGI_IF(cond, tag, format, ...) { if (cond) { NIMBLE_LOGI(tag, format, ##__VA_ARGS__); }}
-#  define NIMBLE_LOGW_IF(cond, tag, format, ...) { if (cond) { NIMBLE_LOGW(tag, format, ##__VA_ARGS__); }}
-#  define NIMBLE_LOGE_IF(cond, tag, format, ...) { if (cond) { NIMBLE_LOGE(tag, format, ##__VA_ARGS__); }}
-#  define NIMBLE_LOGE_RC(rc, tag, format, ...) { if (rc) { NIMBLE_LOGE(tag, format "; rc=%d %s", ##__VA_ARGS__, rc, NimBLEUtils::returnCodeToString(rc)); }}
+#define NIMBLE_LOGC( tag, format, ... ) console_printf("CRIT %s: " format "\n", tag, ##__VA_ARGS__)

-#endif   /* CONFIG_BT_ENABLED */
-#endif   /* NIMBLE_CPP_LOG_H_ */
+#endif /* CONFIG_BT_ENABLED */
+#endif /* MAIN_NIMBLELOG_H_ */
--- a/src/NimBLERemoteCharacteristic.cpp
+++ b/src/NimBLERemoteCharacteristic.cpp
@@ -1,18 +1,15 @@
 /*
- * Copyright 2020-2025 Ryan Powell <ryan@nable-embedded.io> and
- * esp-nimble-cpp, NimBLE-Arduino contributors.
+ * NimBLERemoteCharacteristic.cpp
 *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  Created: on Jan 27 2020
+ *      Author H2zero
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * Originally:
 *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * BLERemoteCharacteristic.cpp
+ *
+ *  Created on: Mar 16, 2017
+ *      Author: kolban
 */

 #include "nimconfig.h"
@@ -27,18 +24,17 @@

 # include <climits>

-struct NimBLEDescriptorFilter {
-    NimBLERemoteDescriptor* dsc;
-    const NimBLEUUID*       uuid;
-    void*                   taskData;
-};
+typedef struct {
+    const NimBLEUUID* uuid;
+    void*             task_data;
+} desc_filter_t;

 static const char* LOG_TAG = "NimBLERemoteCharacteristic";

 /**
 * @brief Constructor.
 * @param [in] svc A pointer to the service this characteristic belongs to.
- * @param [in] chr struct defined as:
+ * @param [in] ble_gatt_chr struct defined as:
 *  struct ble_gatt_chr {
 *      uint16_t def_handle;
 *      uint16_t val_handle;
@@ -64,73 +60,71 @@ NimBLERemoteCharacteristic::~NimBLERemoteCharacteristic() {
 * @brief Callback used by the API when a descriptor is discovered or search complete.
 */
 int NimBLERemoteCharacteristic::descriptorDiscCB(
-    uint16_t connHandle, const ble_gatt_error* error, uint16_t chrHandle, const ble_gatt_dsc* dsc, void* arg) {
-    int        rc        = error->status;
-    auto       filter    = (NimBLEDescriptorFilter*)arg;
-    auto       pTaskData = (NimBLETaskData*)filter->taskData;
-    const auto pChr      = (NimBLERemoteCharacteristic*)pTaskData->m_pInstance;
-    const auto uuid      = filter->uuid; // UUID to filter for
+    uint16_t conn_handle, const ble_gatt_error* error, uint16_t chr_val_handle, const ble_gatt_dsc* dsc, void* arg) {
+    int rc = error->status;
    NIMBLE_LOGD(LOG_TAG, "Descriptor Discovery >> status: %d handle: %d", rc, (rc == 0) ? dsc->handle : -1);

-    // Results for chrHandle added until rc != 0
-    // Must find specified UUID if filter is used
-    if (rc == 0 && pChr->getHandle() == chrHandle && (!uuid || 0 == ble_uuid_cmp(uuid->getBase(), &dsc->uuid.u))) {
-        // Return BLE_HS_EDONE if the descriptor was found, stop the search
-        pChr->m_vDescriptors.push_back(new NimBLERemoteDescriptor(pChr, dsc));
-        rc = !!uuid * BLE_HS_EDONE;
+    auto              filter     = (desc_filter_t*)arg;
+    auto              pTaskData  = (NimBLETaskData*)filter->task_data;
+    const auto        pChr       = (NimBLERemoteCharacteristic*)pTaskData->m_pInstance;
+    const NimBLEUUID* uuidFilter = filter->uuid;
+
+    if (error->status == BLE_HS_ENOTCONN) {
+        NIMBLE_LOGE(LOG_TAG, "<< Descriptor Discovery; Not connected");
+        NimBLEUtils::taskRelease(*pTaskData, error->status);
+        return error->status;
    }

-    if (rc != 0) {
-        NimBLEUtils::taskRelease(*pTaskData, rc);
-        NIMBLE_LOGD(LOG_TAG, "<< Descriptor Discovery");
+    if (pChr->getHandle() != chr_val_handle) {
+        rc = BLE_HS_EDONE; // descriptor not for this characteristic
    }
+
+    if (rc == 0) {
+        if (uuidFilter != nullptr) {
+            if (ble_uuid_cmp(uuidFilter->getBase(), &dsc->uuid.u) == 0) {
+                rc = BLE_HS_EDONE; // Found the descriptor, stop the search
+            } else {
+                return 0; // Not the descriptor we are looking for
+            }
+        }
+
+        pChr->m_vDescriptors.push_back(new NimBLERemoteDescriptor(pChr, dsc));
+    }
+
+    NimBLEUtils::taskRelease(*pTaskData, rc);
+    NIMBLE_LOGD(LOG_TAG, "<< Descriptor Discovery");
    return rc;
 }

 /**
 * @brief Populate the descriptors (if any) for this characteristic.
- * @param [in] pFilter Pointer to a filter containing pointers to descriptor, UUID, and task data.
- * @return True if successfully retrieved, success = BLE_HS_EDONE.
+ * @param [in] the end handle of the characteristic, or the service, whichever comes first.
 */
-bool NimBLERemoteCharacteristic::retrieveDescriptors(NimBLEDescriptorFilter* pFilter) const {
+bool NimBLERemoteCharacteristic::retrieveDescriptors(const NimBLEUUID* uuidFilter) const {
    NIMBLE_LOGD(LOG_TAG, ">> retrieveDescriptors() for characteristic: %s", getUUID().toString().c_str());

-    // If this is the last handle then there are no descriptors
-    if (getHandle() == getRemoteService()->getEndHandle()) {
-        NIMBLE_LOGD(LOG_TAG, "<< retrieveDescriptors(): found 0 descriptors.");
-        return true;
-    }
-
-    NimBLETaskData         taskData(const_cast<NimBLERemoteCharacteristic*>(this));
-    NimBLEDescriptorFilter defaultFilter{nullptr, nullptr, &taskData};
-    if (pFilter == nullptr) {
-        pFilter = &defaultFilter;
-    }
+    NimBLETaskData taskData(const_cast<NimBLERemoteCharacteristic*>(this));
+    desc_filter_t  filter = {uuidFilter, &taskData};

    int rc = ble_gattc_disc_all_dscs(getClient()->getConnHandle(),
                                     getHandle(),
                                     getRemoteService()->getEndHandle(),
                                     NimBLERemoteCharacteristic::descriptorDiscCB,
-                                     pFilter);
+                                     &filter);
    if (rc != 0) {
        NIMBLE_LOGE(LOG_TAG, "ble_gattc_disc_all_dscs: rc=%d %s", rc, NimBLEUtils::returnCodeToString(rc));
        return false;
    }

-    auto prevDscCount = m_vDescriptors.size();
-    NimBLEUtils::taskWait(pFilter->taskData, BLE_NPL_TIME_FOREVER);
-    rc = ((NimBLETaskData*)pFilter->taskData)->m_flags;
-    if (rc != BLE_HS_EDONE) {
-        NIMBLE_LOGE(LOG_TAG, "<< retrieveDescriptors(): failed: rc=%d %s", rc, NimBLEUtils::returnCodeToString(rc));
-        return false;
+    NimBLEUtils::taskWait(taskData, BLE_NPL_TIME_FOREVER);
+    rc = taskData.m_flags;
+    if (rc == 0 || rc == BLE_HS_EDONE) {
+        NIMBLE_LOGD(LOG_TAG, "<< retrieveDescriptors(): found %d descriptors.", m_vDescriptors.size());
+        return true;
    }

-    if (m_vDescriptors.size() > prevDscCount) {
-        pFilter->dsc = m_vDescriptors.back();
-    }
-
-    NIMBLE_LOGD(LOG_TAG, "<< retrieveDescriptors(): found %d descriptors.", m_vDescriptors.size() - prevDscCount);
-    return true;
+    NIMBLE_LOGE(LOG_TAG, "<< retrieveDescriptors(): failed: rc=%d %s", rc, NimBLEUtils::returnCodeToString(rc));
+    return false;
 } // retrieveDescriptors

 /**
@@ -140,38 +134,51 @@ bool NimBLERemoteCharacteristic::retrieveDescriptors(NimBLEDescriptorFilter* pFi
 */
 NimBLERemoteDescriptor* NimBLERemoteCharacteristic::getDescriptor(const NimBLEUUID& uuid) const {
    NIMBLE_LOGD(LOG_TAG, ">> getDescriptor: uuid: %s", uuid.toString().c_str());
-    NimBLEUUID             uuidTmp{uuid};
-    NimBLETaskData         taskData(const_cast<NimBLERemoteCharacteristic*>(this));
-    NimBLEDescriptorFilter filter{nullptr, &uuidTmp, &taskData};
+    NimBLERemoteDescriptor* pDsc      = nullptr;
+    size_t                  prev_size = m_vDescriptors.size();

-    for (const auto& dsc : m_vDescriptors) {
-        if (dsc->getUUID() == uuid) {
-            filter.dsc = dsc;
+    for (const auto& it : m_vDescriptors) {
+        if (it->getUUID() == uuid) {
+            pDsc = it;
            goto Done;
        }
    }

-    if (!retrieveDescriptors(&filter) || filter.dsc) {
-        goto Done;
-    }
+    if (retrieveDescriptors(&uuid)) {
+        if (m_vDescriptors.size() > prev_size) {
+            pDsc = m_vDescriptors.back();
+            goto Done;
+        }

-    // Try again with 128 bit uuid if request succeeded but no descriptor found.
-    if (uuid.bitSize() != BLE_UUID_TYPE_128) {
-        uuidTmp.to128();
-        retrieveDescriptors(&filter);
-        goto Done;
-    }
-
-    // If the uuid was 128 bit, try again with 16 bit uuid.
-    uuidTmp.to16();
-    if (uuidTmp.bitSize() == BLE_UUID_TYPE_16) {
-        filter.uuid = &uuidTmp;
-        retrieveDescriptors(&filter);
+        // If the request was successful but 16/32 bit uuid not found
+        // try again with the 128 bit uuid.
+        if (uuid.bitSize() == BLE_UUID_TYPE_16 || uuid.bitSize() == BLE_UUID_TYPE_32) {
+            NimBLEUUID uuid128(uuid);
+            uuid128.to128();
+            if (retrieveDescriptors(&uuid128)) {
+                if (m_vDescriptors.size() > prev_size) {
+                    pDsc = m_vDescriptors.back();
+                }
+            }
+        } else {
+            // If the request was successful but the 128 bit uuid not found
+            // try again with the 16 bit uuid.
+            NimBLEUUID uuid16(uuid);
+            uuid16.to16();
+            // if the uuid was 128 bit but not of the BLE base type this check will fail
+            if (uuid16.bitSize() == BLE_UUID_TYPE_16) {
+                if (retrieveDescriptors(&uuid16)) {
+                    if (m_vDescriptors.size() > prev_size) {
+                        pDsc = m_vDescriptors.back();
+                    }
+                }
+            }
+        }
    }

 Done:
-    NIMBLE_LOGD(LOG_TAG, "<< getDescriptor: %sfound", filter.dsc ? "" : "not ");
-    return filter.dsc;
+    NIMBLE_LOGD(LOG_TAG, "<< getDescriptor: %sfound", pDsc ? "" : "not ");
+    return pDsc;
 } // getDescriptor

 /**
@@ -300,7 +307,7 @@ size_t NimBLERemoteCharacteristic::deleteDescriptor(const NimBLEUUID& uuid) cons
 * @return True if supported.
 */
 bool NimBLERemoteCharacteristic::canBroadcast() const {
-    return (m_properties & BLE_GATT_CHR_PROP_BROADCAST);
+    return (m_properties & BLE_GATT_CHR_PROP_BROADCAST) != 0;
 };

 /**
--- a/src/NimBLERemoteCharacteristic.h
+++ b/src/NimBLERemoteCharacteristic.h
@@ -1,18 +1,15 @@
 /*
- * Copyright 2020-2025 Ryan Powell <ryan@nable-embedded.io> and
- * esp-nimble-cpp, NimBLE-Arduino contributors.
+ * NimBLERemoteCharacteristic.h
 *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  Created: on Jan 27 2020
+ *      Author H2zero
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * Originally:
 *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * BLERemoteCharacteristic.h
+ *
+ *  Created on: Jul 8, 2017
+ *      Author: kolban
 */

 #ifndef NIMBLE_CPP_REMOTE_CHARACTERISTIC_H_
@@ -25,10 +22,8 @@
 # include <vector>
 # include <functional>

-class NimBLEUUID;
 class NimBLERemoteService;
 class NimBLERemoteDescriptor;
-struct NimBLEDescriptorFilter;

 /**
 * @brief A model of a remote BLE characteristic.
@@ -67,10 +62,10 @@ class NimBLERemoteCharacteristic : public NimBLERemoteValueAttribute {
    ~NimBLERemoteCharacteristic();

    bool setNotify(uint16_t val, notify_callback notifyCallback = nullptr, bool response = true) const;
-    bool retrieveDescriptors(NimBLEDescriptorFilter* pFilter = nullptr) const;
+    bool retrieveDescriptors(const NimBLEUUID* uuidFilter = nullptr) const;

    static int descriptorDiscCB(
-        uint16_t connHandle, const ble_gatt_error* error, uint16_t chrHandle, const ble_gatt_dsc* dsc, void* arg);
+        uint16_t conn_handle, const ble_gatt_error* error, uint16_t chr_val_handle, const ble_gatt_dsc* dsc, void* arg);

    const NimBLERemoteService*                   m_pRemoteService{nullptr};
    uint8_t                                      m_properties{0};
--- a/src/NimBLERemoteDescriptor.cpp
+++ b/src/NimBLERemoteDescriptor.cpp
@@ -1,18 +1,15 @@
 /*
- * Copyright 2020-2025 Ryan Powell <ryan@nable-embedded.io> and
- * esp-nimble-cpp, NimBLE-Arduino contributors.
+ * NimBLERemoteDescriptor.cpp
 *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  Created: on Jan 27 2020
+ *      Author H2zero
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * Originally:
 *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * BLERemoteDescriptor.cpp
+ *
+ *  Created on: Jul 8, 2017
+ *      Author: kolban
 */

 #include "nimconfig.h"
@@ -28,8 +25,7 @@
 */
 NimBLERemoteDescriptor::NimBLERemoteDescriptor(const NimBLERemoteCharacteristic* pRemoteCharacteristic,
                                               const ble_gatt_dsc*               dsc)
-    : NimBLERemoteValueAttribute{dsc->uuid, dsc->handle},
-      m_pRemoteCharacteristic{pRemoteCharacteristic} {} // NimBLERemoteDescriptor
+    : NimBLERemoteValueAttribute{dsc->uuid, dsc->handle}, m_pRemoteCharacteristic{pRemoteCharacteristic} {} // NimBLERemoteDescriptor

 /**
 * @brief Get the characteristic that owns this descriptor.
--- a/src/NimBLERemoteDescriptor.h
+++ b/src/NimBLERemoteDescriptor.h
@@ -1,18 +1,15 @@
 /*
- * Copyright 2020-2025 Ryan Powell <ryan@nable-embedded.io> and
- * esp-nimble-cpp, NimBLE-Arduino contributors.
+ * NimBLERemoteDescriptor.h
 *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  Created: on Jan 27 2020
+ *      Author H2zero
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * Originally:
 *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * BLERemoteDescriptor.h
+ *
+ *  Created on: Jul 8, 2017
+ *      Author: kolban
 */

 #ifndef NIMBLE_CPP_REMOTE_DESCRIPTOR_H_
--- a/src/NimBLERemoteService.cpp
+++ b/src/NimBLERemoteService.cpp
@@ -1,18 +1,15 @@
 /*
- * Copyright 2020-2025 Ryan Powell <ryan@nable-embedded.io> and
- * esp-nimble-cpp, NimBLE-Arduino contributors.
+ * NimBLERemoteService.cpp
 *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  Created: on Jan 27 2020
+ *      Author H2zero
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * Originally:
 *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * BLERemoteService.cpp
+ *
+ *  Created on: Jul 8, 2017
+ *      Author: kolban
 */

 #include "nimconfig.h"
@@ -147,13 +144,11 @@ int NimBLERemoteService::characteristicDiscCB(uint16_t              conn_handle,
                                              const ble_gatt_error* error,
                                              const ble_gatt_chr*   chr,
                                              void*                 arg) {
-    NIMBLE_LOGD(LOG_TAG,
-                "Characteristic Discovery >> status: %d handle: %d",
-                error->status,
-                (error->status == 0) ? chr->def_handle : -1);
+    NIMBLE_LOGD(LOG_TAG, "Characteristic Discovery >>");
    auto       pTaskData = (NimBLETaskData*)arg;
    const auto pSvc      = (NimBLERemoteService*)pTaskData->m_pInstance;

+
    if (error->status == BLE_HS_ENOTCONN) {
        NIMBLE_LOGE(LOG_TAG, "<< Characteristic Discovery; Not connected");
        NimBLEUtils::taskRelease(*pTaskData, error->status);
--- a/src/NimBLERemoteService.h
+++ b/src/NimBLERemoteService.h
@@ -1,18 +1,15 @@
 /*
- * Copyright 2020-2025 Ryan Powell <ryan@nable-embedded.io> and
- * esp-nimble-cpp, NimBLE-Arduino contributors.
+ * NimBLERemoteService.h
 *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  Created: on Jan 27 2020
+ *      Author H2zero
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * Originally:
 *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * BLERemoteService.h
+ *
+ *  Created on: Jul 8, 2017
+ *      Author: kolban
 */

 #ifndef NIMBLE_CPP_REMOTE_SERVICE_H_
--- a/src/NimBLERemoteValueAttribute.cpp
+++ b/src/NimBLERemoteValueAttribute.cpp
@@ -1,18 +1,8 @@
 /*
- * Copyright 2020-2025 Ryan Powell <ryan@nable-embedded.io> and
- * esp-nimble-cpp, NimBLE-Arduino contributors.
+ * NimBLERemoteValueAttribute.cpp
 *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *  Created: on July 28 2024
+ *      Author H2zero
 */

 #include "nimconfig.h"
@@ -21,7 +11,6 @@
 # include "NimBLERemoteValueAttribute.h"
 # include "NimBLEClient.h"
 # include "NimBLEUtils.h"
-# include "NimBLELog.h"

 # include <climits>

--- a/src/NimBLERemoteValueAttribute.h
+++ b/src/NimBLERemoteValueAttribute.h
@@ -1,18 +1,8 @@
 /*
- * Copyright 2020-2025 Ryan Powell <ryan@nable-embedded.io> and
- * esp-nimble-cpp, NimBLE-Arduino contributors.
+ * NimBLERemoteValueAttribute.h
 *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *  Created: on July 28 2024
+ *      Author H2zero
 */

 #ifndef NIMBLE_CPP_REMOTE_VALUE_ATTRIBUTE_H_
--- a/src/NimBLEScan.cpp
+++ b/src/NimBLEScan.cpp
@@ -1,18 +1,15 @@
 /*
- * Copyright 2020-2025 Ryan Powell <ryan@nable-embedded.io> and
- * esp-nimble-cpp, NimBLE-Arduino contributors.
+ * NimBLEScan.cpp
 *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  Created: on Jan 24 2020
+ *      Author H2zero
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * Originally:
 *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * BLEScan.cpp
+ *
+ *  Created on: Jul 1, 2017
+ *      Author: kolban
 */

 #include "nimconfig.h"
@@ -119,19 +116,19 @@ int NimBLEScan::handleGapEvent(ble_gap_event* event, void* arg) {
            }

            if (!advertisedDevice->m_callbackSent) {
-                advertisedDevice->m_callbackSent++;
                pScan->m_pScanCallbacks->onDiscovered(advertisedDevice);
+                advertisedDevice->m_callbackSent++;
            }

            // If not active scanning or scan response is not available
            // or extended advertisement scanning, report the result to the callback now.
            if (pScan->m_scanParams.passive || !isLegacyAdv || !advertisedDevice->isScannable()) {
-                advertisedDevice->m_callbackSent++;
                pScan->m_pScanCallbacks->onResult(advertisedDevice);
-            } else if (isLegacyAdv && event_type == BLE_HCI_ADV_RPT_EVTYPE_SCAN_RSP) {
                advertisedDevice->m_callbackSent++;
+            } else if (isLegacyAdv && event_type == BLE_HCI_ADV_RPT_EVTYPE_SCAN_RSP) {
                // got the scan response report the full data.
                pScan->m_pScanCallbacks->onResult(advertisedDevice);
+                advertisedDevice->m_callbackSent++;
            }

            // If not storing results and we have invoked the callback, delete the device.
@@ -468,26 +465,20 @@ NimBLEScanResults NimBLEScan::getResults() {
 * @brief Clear the stored results of the scan.
 */
 void NimBLEScan::clearResults() {
-    if (m_scanResults.m_deviceVec.size()) {
-        std::vector<NimBLEAdvertisedDevice*> vSwap{};
-        ble_npl_hw_enter_critical();
-        vSwap.swap(m_scanResults.m_deviceVec);
-        ble_npl_hw_exit_critical(0);
-        for (const auto& dev : vSwap) {
-            delete dev;
-        }
+    for (const auto& dev : m_scanResults.m_deviceVec) {
+        delete dev;
    }
+    std::vector<NimBLEAdvertisedDevice*>().swap(m_scanResults.m_deviceVec);
 } // clearResults

 /**
 * @brief Dump the scan results to the log.
 */
 void NimBLEScanResults::dump() const {
-#if CONFIG_NIMBLE_CPP_LOG_LEVEL >=3
    for (const auto& dev : m_deviceVec) {
+        (void)dev; // suppress unused variable warning when log level is less than info
        NIMBLE_LOGI(LOG_TAG, "- %s", dev->toString().c_str());
    }
-#endif
 } // dump

 /**
--- a/src/NimBLEScan.h
+++ b/src/NimBLEScan.h
@@ -1,20 +1,16 @@
 /*
- * Copyright 2020-2025 Ryan Powell <ryan@nable-embedded.io> and
- * esp-nimble-cpp, NimBLE-Arduino contributors.
+ * NimBLEScan.h
 *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  Created: on Jan 24 2020
+ *      Author H2zero
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * Originally:
 *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * BLEScan.h
+ *
+ *  Created on: Jul 1, 2017
+ *      Author: kolban
 */
-
 #ifndef NIMBLE_CPP_SCAN_H_
 #define NIMBLE_CPP_SCAN_H_

--- a/src/NimBLEServer.cpp
+++ b/src/NimBLEServer.cpp
@@ -1,18 +1,15 @@
 /*
- * Copyright 2020-2025 Ryan Powell <ryan@nable-embedded.io> and
- * esp-nimble-cpp, NimBLE-Arduino contributors.
+ * NimBLEServer.cpp
 *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  Created: on March 2, 2020
+ *      Author H2zero
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * Originally:
 *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * BLEServer.cpp
+ *
+ *  Created on: Apr 16, 2017
+ *      Author: kolban
 */

 #include "nimconfig.h"
@@ -70,11 +67,9 @@ NimBLEServer::~NimBLEServer() {
        delete m_pServerCallbacks;
    }

-# if defined(CONFIG_BT_NIMBLE_ROLE_CENTRAL)
    if (m_pClient != nullptr) {
        delete m_pClient;
    }
-# endif
 }

 /**
@@ -401,12 +396,10 @@ int NimBLEServer::handleGapEvent(ble_gap_event* event, void* arg) {
                }
            }

-# if defined(CONFIG_BT_NIMBLE_ROLE_CENTRAL)
            if (pServer->m_pClient && pServer->m_pClient->m_connHandle == event->disconnect.conn.conn_handle) {
                // If this was also the client make sure it's flagged as disconnected.
                pServer->m_pClient->m_connHandle = BLE_HS_CONN_HANDLE_NONE;
            }
-# endif

            if (pServer->m_svcChanged) {
                pServer->resetGATT();
@@ -611,9 +604,8 @@ int NimBLEServer::handleGattEvent(uint16_t connHandle, uint16_t attrHandle, ble_
    NIMBLE_LOGD(LOG_TAG,
                "Gatt %s event",
                (ctxt->op == BLE_GATT_ACCESS_OP_READ_CHR || ctxt->op == BLE_GATT_ACCESS_OP_READ_DSC) ? "Read" : "Write");
-    auto                  pAtt = static_cast<NimBLELocalValueAttribute*>(arg);
-    const NimBLEAttValue& val  = pAtt->getAttVal();
-
+    auto           pAtt = static_cast<NimBLELocalValueAttribute*>(arg);
+    auto           val  = pAtt->getAttVal();
    NimBLEConnInfo peerInfo{};
    ble_gap_conn_find(connHandle, &peerInfo.m_desc);

@@ -624,7 +616,7 @@ int NimBLEServer::handleGattEvent(uint16_t connHandle, uint16_t attrHandle, ble_
            if (connHandle != BLE_HS_CONN_HANDLE_NONE) {
                // If the packet header is only 8 bytes then this is a follow up of a long read
                // so we don't want to call the onRead() callback again.
-                if (ctxt->om->om_pkthdr_len > 8 || val.size() <= (ble_att_mtu(connHandle) - 3)) {
+                if (ctxt->om->om_pkthdr_len > 8 || pAtt->getAttVal().size() <= (ble_att_mtu(connHandle) - 3)) {
                    pAtt->readEvent(peerInfo);
                }
            }
--- a/src/NimBLEServer.h
+++ b/src/NimBLEServer.h
@@ -1,18 +1,15 @@
 /*
- * Copyright 2020-2025 Ryan Powell <ryan@nable-embedded.io> and
- * esp-nimble-cpp, NimBLE-Arduino contributors.
+ * NimBLEServer.h
 *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  Created: on March 2, 2020
+ *      Author H2zero
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * Originally:
 *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * BLEServer.h
+ *
+ *  Created on: Apr 16, 2017
+ *      Author: kolban
 */

 #ifndef NIMBLE_CPP_SERVER_H_
--- a/src/NimBLEService.cpp
+++ b/src/NimBLEService.cpp
@@ -1,20 +1,19 @@
 /*
- * Copyright 2020-2025 Ryan Powell <ryan@nable-embedded.io> and
- * esp-nimble-cpp, NimBLE-Arduino contributors.
+ * NimBLEService.cpp
 *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  Created: on March 2, 2020
+ *      Author H2zero
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * Originally:
 *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * BLEService.cpp
+ *
+ *  Created on: Mar 25, 2017
+ *      Author: kolban
 */

+// A service is identified by a UUID.  A service is also the container for one or more characteristics.
+
 #include "nimconfig.h"
 #if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)

@@ -91,13 +90,6 @@ void NimBLEService::dump() const {
 */
 bool NimBLEService::start() {
    NIMBLE_LOGD(LOG_TAG, ">> start(): Starting service: %s", toString().c_str());
-
-    // If started previously and no characteristics have been added or removed,
-    // then we can skip the service registration process.
-    if (m_pSvcDef->characteristics && !getServer()->m_svcChanged) {
-        return true;
-    }
-
    // If started previously, clear everything and start over
    if (m_pSvcDef->characteristics) {
        if (m_pSvcDef->characteristics->descriptors) {
--- a/src/NimBLEService.h
+++ b/src/NimBLEService.h
@@ -1,18 +1,15 @@
 /*
- * Copyright 2020-2025 Ryan Powell <ryan@nable-embedded.io> and
- * esp-nimble-cpp, NimBLE-Arduino contributors.
+ * NimBLEService.h
 *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  Created: on March 2, 2020
+ *      Author H2zero
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * Originally:
 *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * BLEService.h
+ *
+ *  Created on: Mar 25, 2017
+ *      Author: kolban
 */

 #ifndef NIMBLE_CPP_SERVICE_H_
--- a/src/NimBLEUUID.cpp
+++ b/src/NimBLEUUID.cpp
@@ -1,18 +1,15 @@
 /*
- * Copyright 2020-2025 Ryan Powell <ryan@nable-embedded.io> and
- * esp-nimble-cpp, NimBLE-Arduino contributors.
+ * NimBLEUUID.cpp
 *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  Created: on Jan 24 2020
+ *      Author H2zero
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * Originally:
 *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * BLEUUID.cpp
+ *
+ *  Created on: Jun 21, 2017
+ *      Author: kolban
 */

 #include "nimconfig.h"
@@ -337,4 +334,4 @@ NimBLEUUID::operator std::string() const {
    return ble_uuid_to_str(&m_uuid.u, buf);
 } // operator std::string

-#endif /* CONFIG_BT_ENABLED */
+# endif /* CONFIG_BT_ENABLED */
--- a/src/NimBLEUUID.h
+++ b/src/NimBLEUUID.h
@@ -1,18 +1,15 @@
 /*
- * Copyright 2020-2025 Ryan Powell <ryan@nable-embedded.io> and
- * esp-nimble-cpp, NimBLE-Arduino contributors.
+ * NimBLEUUID.h
 *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  Created: on Jan 24 2020
+ *      Author H2zero
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * Originally:
 *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * BLEUUID.h
+ *
+ *  Created on: Jun 21, 2017
+ *      Author: kolban
 */

 #ifndef NIMBLE_CPP_UUID_H_
@@ -64,7 +61,7 @@ class NimBLEUUID {

    bool operator==(const NimBLEUUID& rhs) const;
    bool operator!=(const NimBLEUUID& rhs) const;
-    operator std::string() const;
+         operator std::string() const;

  private:
    ble_uuid_any_t m_uuid{};
--- a/src/NimBLEUtils.cpp
+++ b/src/NimBLEUtils.cpp
@@ -1,18 +1,9 @@
 /*
- * Copyright 2020-2025 Ryan Powell <ryan@nable-embedded.io> and
- * esp-nimble-cpp, NimBLE-Arduino contributors.
+ * NimBLEUtils.cpp
 *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  Created: on Jan 25 2020
+ *      Author H2zero
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
 */

 #include "nimconfig.h"
@@ -37,9 +28,6 @@
 # include <climits>

 # if defined INC_FREERTOS_H
-#  ifndef CONFIG_NIMBLE_CPP_FREERTOS_TASK_BLOCK_BIT
-#   define CONFIG_NIMBLE_CPP_FREERTOS_TASK_BLOCK_BIT 31
-#  endif
 constexpr uint32_t TASK_BLOCK_BIT = (1 << CONFIG_NIMBLE_CPP_FREERTOS_TASK_BLOCK_BIT);
 # endif

@@ -78,7 +66,6 @@ NimBLETaskData::NimBLETaskData(void* pInstance, int flags, void* buf)
 NimBLETaskData::~NimBLETaskData() {
 # if !defined INC_FREERTOS_H
    if (m_pHandle != nullptr) {
-        ble_npl_sem_deinit(static_cast<ble_npl_sem*>(m_pHandle));
        delete static_cast<ble_npl_sem*>(m_pHandle);
    }
 # endif
--- a/src/NimBLEUtils.h
+++ b/src/NimBLEUtils.h
@@ -1,18 +1,9 @@
 /*
- * Copyright 2020-2025 Ryan Powell <ryan@nable-embedded.io> and
- * esp-nimble-cpp, NimBLE-Arduino contributors.
+ * NimBLEUtils.h
 *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  Created: on Jan 25 2020
+ *      Author H2zero
 *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
 */

 #ifndef NIMBLE_CPP_UTILS_H_
--- a/src/nimconfig.h
+++ b/src/nimconfig.h
@@ -6,7 +6,7 @@
 */

 #pragma once
-
+#ifdef ESP_PLATFORM
 #include "sdkconfig.h"
 #include "nimconfig_rename.h"

@@ -150,3 +150,25 @@ void nimble_cpp_assert(const char *file, unsigned line) __attribute((weak, noret
 #define CONFIG_BT_NIMBLE_TASK_STACK_SIZE 4096

 #endif // _DOXYGEN_
+#else
+#include "syscfg/syscfg.h"
+#define CONFIG_BT_ENABLED
+#define CONFIG_BT_NIMBLE_ROLE_OBSERVER
+#define CONFIG_BT_NIMBLE_ROLE_BROADCASTER
+#define CONFIG_BT_NIMBLE_ROLE_CENTRAL
+#define CONFIG_BT_NIMBLE_ROLE_PERIPHERAL
+#define CONFIG_NIMBLE_CPP_IDF
+#define CONFIG_BT_NIMBLE_MAX_CONNECTIONS 3
+#define CONFIG_NIMBLE_CPP_LOG_LEVEL 0
+#if CONFIG_NIMBLE_CPP_DEBUG_ASSERT_ENABLED && !defined NDEBUG
+void nimble_cpp_assert(const char *file, unsigned line) __attribute((weak, noreturn));
+# define NIMBLE_ATT_VAL_FILE  (__builtin_strrchr(__FILE__, '/') ? \
+                            __builtin_strrchr (__FILE__, '/') + 1 : __FILE__)
+# define NIMBLE_CPP_DEBUG_ASSERT(cond) \
+    if (!(cond)) { \
+        nimble_cpp_assert(NIMBLE_ATT_VAL_FILE, __LINE__); \
+    }
+#else
+# define NIMBLE_CPP_DEBUG_ASSERT(cond) (void(0))
+#endif
+#endif // ESP_PLATFORM
--- a/src/nimconfig_rename.h
+++ b/src/nimconfig_rename.h
@@ -63,19 +63,3 @@
 #if defined(CONFIG_BT_NIMBLE_EXT_ADV_MAX_SIZE) && !defined(CONFIG_BT_NIMBLE_MAX_EXT_ADV_DATA_LEN)
 #define CONFIG_BT_NIMBLE_MAX_EXT_ADV_DATA_LEN CONFIG_BT_NIMBLE_EXT_ADV_MAX_SIZE
 #endif
-
-#if !defined(CONFIG_BTDM_BLE_SCAN_DUPL) && defined(CONFIG_BT_CTRL_BLE_SCAN_DUPL)
-#define CONFIG_BTDM_BLE_SCAN_DUPL CONFIG_BT_CTRL_BLE_SCAN_DUPL
-#endif
-
-#if !defined(CONFIG_BTDM_SCAN_DUPL_TYPE_DEVICE) && defined(CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DEVICE)
-#define CONFIG_BTDM_SCAN_DUPL_TYPE_DEVICE CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DEVICE
-#endif
-
-#if !defined(CONFIG_BTDM_SCAN_DUPL_TYPE_DATA) && defined(CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA)
-#define CONFIG_BTDM_SCAN_DUPL_TYPE_DATA CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA
-#endif
-
-#if !defined(CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE) && defined(CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA_DEVICE)
-#define CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA_DEVICE
-#endif