esp_nimble_hci_and_controller_deinit() does not exist in idf anymore, I hope we never need it

.travis.yml

@@ -0,0 +1,27 @@
+sudo: false
+
+before_install:
+ - cd ${TMPDIR-/tmp}
+ - wget -q http://doxygen.nl/files/doxygen-1.9.0.src.tar.gz
+ - tar -xzvf doxygen-1.9.0.src.tar.gz
+ - mkdir doxygen_build
+ - cd doxygen_build
+ - cmake ../doxygen-1.9.0/
+ - make
+ - export PATH="${TMPDIR-/tmp}/doxygen_build/bin:$PATH"
+ - cd ${TRAVIS_BUILD_DIR}
+ 
+branches:
+  only:
+    - master
+
+script:
+  - doxygen ./docs/Doxyfile
+
+deploy:
+  provider: pages
+  skip_cleanup: true
+  local_dir: docs/html
+  github_token: $GH_REPO_TOKEN
+  on:
+    branch: master

CHANGELOG.md

@@ -1,105 +1,6 @@
 # Changelog
 
-All notable changes to this project will be documented in this file.
-
-## [1.4.0] - 2022-07-31
-
-### Fixed
-- Fixed missing data from long notification values.
-- Fixed NimbleCharacteristicCallbacks::onRead not being called when a non-long read command is received.
-- Prevent a potential crash when retrieving characteristics from a service if the result was successful but no characteristics found.
-- logs/typos.
-
-### Changed
-- AD flags are no longer set in the advertisements of non-connectable beacons, freeing up 3 bytes of advertisement room.
-- Save resources when retrieving descriptors if the characteristic handle is the same as the end handle (no descriptors).
-- Subscribing to characteristic notifications/indications will now always use write with response, as per BLE specifications.
-- `NimBLEClient::discoverAttributes` now returns a bool value to indicate success/failure.
-- Scan result callbacks are no longer called when the scan response data is updated in order to reduce duplicates.
-
-### Added
-- Preliminary support for non-esp devices, NRF51 and NRF52 devices supported with [n-able arduino core](https://github.com/h2zero/n-able-Arduino)
-- Alias added for  `NimBLEServerCallbacks::onMTUChange` to `onMtuChanged` in order to support porting code from original library.
-- `NimBLEAttValue` Class added to reduce and control RAM footprint of characteristic/descriptor values and support conversions from Arduino Strings and many other data types.
-- Bluetooth 5 extended advertising support for capable devices. CODED Phy, 2M Phy, extended advertising data, and multi-advertising are supported, periodic advertising will be implemented in the future.
-
-## [1.3.3] - 2022-02-15
-
-### Changed
-- If attribute retrieval fails with a "not found" try again with the 16 bit version if a 128 bit base uuid is used.
-
-### Fixed
-- Memory leak when deleting client instance.
-- IDf version check for data length extension.
-- Memory leak when server services changed.
-- Compiler warnings for non-esp32 devices.
-
-## [1.3.2] - 2022-01-15
-
-### Fixed
-- Initialize advertising complete callback in NimBLEAdvertising constructor.
-- Clear client disconnect timer in constructor before initializing.
-- Fix missing data when reading large values.
-- Fix missing data in notifications when using a large MTU size and more than 270 bytes of data are sent.
-- Workaround fix added for cases when the task notification value is not cleared, causing various functions that should block not to block.
-
-### Added
-- `NimBLEClient::getLastError` : Gets the error code of the last function call that produces a return code from the stack.
-- `NimBLECharacteristic::notify` : Overload method to send notifications/indications with custom values.
-- Added conditional checks for ESP32 specific functions/values to support use of the library on non-esp32 devices.
-- Added an alias to use the callback name from the original library `onMtuChanged`.
-- `NimBLEClient::setDataLen` and `NimBLEServer::setDataLen`:  Data length extension support (IDF version >= 4.3.2 only)
-- Config option to set logging level for esp-nimble-cpp
-
-### Changed
-- Critical section calls now use the NimBLE API instead of FreeRTOS directly. This removes the need for a `portMUX_TYPE` variable in the class definitions.
-- Removed unnecessary variables in `NimBLEService` and changed the constructor no no longer accept `numHandles` and `inst_id` parameters.
-
-## [1.3.1] - 2021-08-04
-
-### Fixed
-- Corrected a compiler/linker error when an application or a library uses bluetooth classic due to the redefinition of `btInUse`.
-
-## [1.3.0] - 2021-08-02
-
-### Added
-- `NimBLECharacteristic::removeDescriptor`: Dynamically remove a descriptor from a characterisic. Takes effect after all connections are closed and sends a service changed indication.
-- `NimBLEService::removeCharacteristic`: Dynamically remove a characteristic from a service. Takes effect after all connections are closed and sends a service changed indication
-- `NimBLEServerCallbacks::onMTUChange`: This is callback is called when the MTU is updated after connection with a client.
-- ESP32C3 support
-
-- Whitelist API:
-  - `NimBLEDevice::whiteListAdd`: Add a device to the whitelist.
-  - `NimBLEDevice::whiteListRemove`: Remove a device from the whitelist.
-  - `NimBLEDevice::onWhiteList`: Check if the device is on the whitelist.
-  - `NimBLEDevice::getWhiteListCount`: Gets the size of the whitelist
-  - `NimBLEDevice::getWhiteListAddress`: Get the address of a device on the whitelist by index value.
-
-- Bond management API:
-  - `NimBLEDevice::getNumBonds`: Gets the number of bonds stored.
-  - `NimBLEDevice::isBonded`: Checks if the device is bonded.
-  - `NimBLEDevice::deleteAllBonds`: Deletes all bonds.
-  - `NimBLEDevice::getBondedAddress`: Gets the address of a bonded device by the index value.
-
-- `NimBLECharacteristic::getCallbacks` to retrieve the current callback handler.
-- Connection Information class: `NimBLEConnInfo`.
-- `NimBLEScan::clearDuplicateCache`: This can be used to reset the cache of advertised devices so they will be immediately discovered again.
-
-### Changed
-- FreeRTOS files have been removed as they are not used by the library.
-- Services, characteristics and descriptors can now be created statically and added after.
-- Excess logging and some asserts removed.
-- Use ESP_LOGx macros to enable using local log level filtering.
-
-### Fixed
-- `NimBLECharacteristicCallbacks::onSubscribe` Is now called after the connection is added to the vector.
-- Corrected bonding failure when reinitializing the BLE stack.
-- Writing to a characterisic with a std::string value now correctly writes values with null characters.
-- Retrieving remote descriptors now uses the characterisic end handle correctly.
-- Missing data in long writes to remote descriptors.
-- Hanging on task notification when sending an indication from the characteristic callback.
-- BLE controller memory could be released when using Arduino as a component.
-- Complile errors with NimBLE release 1.3.0.
+All notable changes to this project will be documented in this file.  
 
 ## [1.2.0] - 2021-02-08
 

CMakeLists.txt

@@ -14,11 +14,12 @@ elseif("nimble" IN_LIST BUILD_COMPONENTS OR "__nimble" IN_LIST __hack_component_
     )
 endif()
 
-if("arduino" IN_LIST BUILD_COMPONENTS OR __hack_component_targets MATCHES "__idf_arduino")
-    list(APPEND ESP_NIMBLE_PRIV_REQUIRES
-        arduino
-    )
-endif()
+# Dont use arduino bullshit
+#if("arduino" IN_LIST BUILD_COMPONENTS OR __hack_component_targets MATCHES "__idf_arduino")
+#    list(APPEND ESP_NIMBLE_PRIV_REQUIRES
+#        arduino
+#    )
+#endif()
 
 idf_component_register(
   REQUIRED_IDF_TARGETS
@@ -28,6 +29,7 @@ idf_component_register(
   INCLUDE_DIRS
     "src"
   SRCS
+    "src/FreeRTOS.cpp"
     "src/NimBLE2904.cpp"
     "src/NimBLEAddress.cpp"
     "src/NimBLEAdvertisedDevice.cpp"
@@ -39,7 +41,6 @@ idf_component_register(
     "src/NimBLEDevice.cpp"
     "src/NimBLEEddystoneTLM.cpp"
     "src/NimBLEEddystoneURL.cpp"
-    "src/NimBLEExtAdvertising.cpp"
     "src/NimBLEHIDDevice.cpp"
     "src/NimBLERemoteCharacteristic.cpp"
     "src/NimBLERemoteDescriptor.cpp"
@@ -53,7 +54,12 @@ idf_component_register(
   REQUIRES
     bt
     nvs_flash
+    esp_ringbuf
   PRIV_REQUIRES
     ${ESP_NIMBLE_PRIV_REQUIRES}
 )
 
+target_compile_options(${COMPONENT_TARGET}
+    PUBLIC
+        -DDONT_USE_ARDUINO_BULLSHIT
+)

CMakeLists.txt_idf3

@@ -5,6 +5,7 @@ cmake_minimum_required(VERSION 3.5)
 set(SUPPORTED_TARGETS esp32)
 
 set(COMPONENT_SRCS
+    "src/FreeRTOS.cpp"
     "src/NimBLE2904.cpp"
     "src/NimBLEAddress.cpp"
     "src/NimBLEAdvertisedDevice.cpp"

Kconfig

@@ -1,31 +1,5 @@
 menu "ESP-NimBLE-CPP configuration"
 
-choice NIMBLE_CPP_LOG_LEVEL
-    prompt "NimBLE CPP log verbosity"
-    default NIMBLE_CPP_LOG_LEVEL_NONE
-    help
-        Select NimBLE CPP log verbosity level.
-
-    config NIMBLE_CPP_LOG_LEVEL_NONE
-        bool "No logs"
-    config NIMBLE_CPP_LOG_LEVEL_ERROR
-        bool "Error logs"
-    config NIMBLE_CPP_LOG_LEVEL_WARNING
-        bool "Warning logs"
-    config NIMBLE_CPP_LOG_LEVEL_INFO
-        bool "Info logs"
-    config NIMBLE_CPP_LOG_LEVEL_DEBUG
-        bool "Debug logs"
-endchoice #NIMBLE_CPP_LOG_LEVEL
-
-config NIMBLE_CPP_LOG_LEVEL
-    int
-    default 0 if NIMBLE_CPP_LOG_LEVEL_NONE
-    default 1 if NIMBLE_CPP_LOG_LEVEL_ERROR
-    default 2 if NIMBLE_CPP_LOG_LEVEL_WARNING
-    default 3 if NIMBLE_CPP_LOG_LEVEL_INFO
-    default 4 if NIMBLE_CPP_LOG_LEVEL_DEBUG
-
 config NIMBLE_CPP_ENABLE_RETURN_CODE_TEXT
     bool "Show NimBLE return codes as text in debug log."
     default "n"
@@ -42,31 +16,12 @@ config NIMBLE_CPP_ENABLE_GAP_EVENT_CODE_TEXT
         messages in the debug log. This will use approximately 1kB
         of flash memory.
 
-config NIMBLE_CPP_ENABLE_ADVERTISEMENT_TYPE_TEXT
+config NIMBLE_CPP_ENABLE_ADVERTISMENT_TYPE_TEXT
     bool "Show advertisment types as text in debug log."
     default "n"
     help
         Enabling this option will display advertisment types recieved
         while scanning as text messages in the debug log. 
         This will use approximately 250 bytes of flash memory.
-
-config NIMBLE_CPP_ATT_VALUE_TIMESTAMP_ENABLED
-    bool "Enable timestamps to be stored with attribute values."
-    default "n"
-    help
-        Enabling this option will store the timestamp when an attribute value is updated.
-        This allows for checking the last update time using getTimeStamp()
-        or getValue(time_t*). If disabled, the timestamp returned from these functions will be 0.
-        Disabling timestamps will reduce the memory used for each value.
-
-config NIMBLE_CPP_ATT_VALUE_INIT_LENGTH
-    int "Initial attribute value size (bytes) for empty values."
-    range 1 512
-    default 20
-    help
-        Sets the default allocation size (bytes) for each attribute if not specified
-        when the constructor is called. This is also the size used when a remote
-        characteristic or descriptor is constructed before a value is read/notifed.
-        Increasing this will reduce reallocations but increase memory footprint.
         
 endmenu

README.md

@@ -68,3 +68,9 @@ in your project/CMakeLists.txt after the line `include($ENV{IDF_PATH}/tools/cmak
 * [Jeroen88](https://github.com/Jeroen88) for the amazing help debugging and improving the client code.  
 <br/>  
 
+# Todo
+- Improve host reset handler
+- Implement random address handling
+- Implement bond management
+- Add Bluetooth Mesh
+<br/>  

docs/Bluetooth 5 features.md

@@ -1,28 +0,0 @@
-# Bluetooth 5.x features
-
-## About extended advertising
-Extended advertising allows for much more capability and flexibility.
-
-* Allows for 251 bytes of advertisement data and up to 1650 bytes when chained (configuration dependant) vs 31.
-
-* New PHY's (physical layers) that allow for faster data rate (2M PHY) or long range/slower data rates (CODED PHY) as well as the original 1M PHY.
-
-* New periodic advertising, allowing the scanning device to sync with the advertisements of a beacon. This allows for the scanning device to sleep or perform other tasks before the next expected advertisement is sent, preserving cpu cycles and power (To be implemented).  
-<br/>
-
-## Enabling extended advertising
-Extended advertising is supported when enabled with the config option `CONFIG_BT_NIMBLE_EXT_ADV` set to a value of 1. This is done in menuconfig under `Component config > Bluetooth > NimBLE options > Enable extended advertising`, or set in `nimconfig.h` for Arduino, or in `build_flags` in PlatformIO.
-
-When enabled the following will occur:
-* `NimBLEScan::start` method will scan on both the 1M PHY and the coded PHY standards automatically.
-
-* `NimBLEClient::connect` will use the primary PHY the device is listening on, unless specified (see below).
-
-* `NimBLEClient::setConnectPhy` becomes available to specify the PHY's to connect with (default is all).
-
-* `NimBLEAdvertising` is no longer available for use and is replaced by `NimBLEExtAdvertising`. `NimBLEDevice::getAdvertising` will now return an instance of `NimBLEExtAdvertising`.
-
-* `NimBLEAdvertisementData` is no longer available for use and is replaced by `NimBLEExtAdvertisement`. This new class is where everything about the advertisement is configured, including the advertisement intervals and advertisement ended callback.
-
-
-

docs/Command_line_config.md

@@ -0,0 +1,117 @@
+# Arduino command line and platformio config options  
+
+`CONFIG_BT_NIMBLE_MAX_CONNECTIONS`  
+
+Sets the number of simultaneous connections (esp controller max is 9)  
+- Default value is 3  
+<br/>
+
+`CONFIG_BT_NIMBLE_ATT_PREFERRED_MTU`  
+
+Sets the default MTU size.  
+- Default value is 255  
+<br/>
+
+`CONFIG_BT_NIMBLE_SVC_GAP_DEVICE_NAME`  
+
+Set the default device name  
+- Default value is "nimble"  
+<br/>
+
+`CONFIG_BT_NIMBLE_DEBUG`   
+
+If defined, enables debug log messages from the NimBLE host  
+- Uses approx. 32kB of flash memory.  
+<br/>
+
+`CONFIG_NIMBLE_CPP_ENABLE_RETURN_CODE_TEXT`  
+
+If defined, NimBLE host return codes will be printed as text in debug log messages.  
+- Uses approx. 7kB of flash memory.  
+<br/>
+
+`CONFIG_NIMBLE_CPP_ENABLE_GAP_EVENT_CODE_TEXT`  
+
+If defined, GAP event codes will be printed as text in debug log messages.  
+- Uses approx. 1kB of flash memory.  
+<br/>
+
+`CONFIG_NIMBLE_CPP_ENABLE_ADVERTISMENT_TYPE_TEXT`  
+
+If defined, advertisment types will be printed as text while scanning in debug log messages.  
+- Uses approx. 250 bytes of flash memory.  
+<br/>
+
+`CONFIG_BT_NIMBLE_SVC_GAP_APPEARANCE`  
+
+Set the default appearance.  
+- Default value is 0x00  
+<br/>
+
+`CONFIG_BT_NIMBLE_ROLE_CENTRAL_DISABLED`  
+ 
+If defined, NimBLE Client functions will not be included.  
+- Reduces flash size by approx. 7kB.  
+<br/>
+
+`CONFIG_BT_NIMBLE_ROLE_OBSERVER_DISABLED`  
+
+If defined, NimBLE Scan functions will not be included.  
+- Reduces flash size by approx. 26kB.  
+<br/>
+
+`CONFIG_BT_NIMBLE_ROLE_PERIPHERAL_DISABLED`  
+
+If defined NimBLE Server functions will not be included.  
+- Reduces flash size by approx. 16kB.  
+<br/>
+
+`CONFIG_BT_NIMBLE_ROLE_BROADCASTER_DISABLED`  
+
+If defined, NimBLE Advertising functions will not be included.  
+- Reduces flash size by approx. 5kB.  
+<br/>
+
+`CONFIG_BT_NIMBLE_MAX_BONDS`  
+
+Sets the number of devices allowed to store/bond with  
+- Default value is 3  
+<br/>
+
+`CONFIG_BT_NIMBLE_MAX_CCCDS`  
+
+Sets the maximum number of CCCD subscriptions to store  
+- Default value is 8  
+<br/>
+
+`CONFIG_BT_NIMBLE_RPA_TIMEOUT`  
+
+Sets the random address refresh time in seconds.  
+- Default value is 900  
+<br/>
+
+`CONFIG_BT_NIMBLE_MSYS1_BLOCK_COUNT`  
+
+Set the number of msys blocks For prepare write & prepare responses. This may need to be increased if  
+you are sending large blocks of data with a low MTU. E.g: 512 bytes with 23 MTU will fail.  
+- Default value is 12  
+<br/>
+
+`CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_EXTERNAL`  
+
+Sets the NimBLE stack to use external PSRAM will be loaded  
+- Must be defined with a value of 1; Default is CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_INTERNAL 1  
+<br/>
+
+`CONFIG_BT_NIMBLE_PINNED_TO_CORE`  
+
+Sets the core the NimBLE host stack will run on   
+- Options: 0 or 1
+<br/>
+
+`CONFIG_BT_NIMBLE_TASK_STACK_SIZE`  
+
+Set the task stack size for the NimBLE core.  
+- Default is 4096  
+<br/>
+

docs/Doxyfile

@@ -1,4 +1,4 @@
-# Doxyfile 1.9.1
+# Doxyfile 1.8.18
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -32,13 +32,13 @@ DOXYFILE_ENCODING      = UTF-8
 # title of most generated pages and in a few other places.
 # The default value is: My Project.
 
-PROJECT_NAME           = esp-nimble-cpp
+PROJECT_NAME           = "esp-nimble-cpp / NimBLE-Arduino"
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number. This
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 1.4.0
+PROJECT_NUMBER         = 1.2.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
@@ -58,7 +58,7 @@ PROJECT_LOGO           =
 # entered, it will be relative to the location where doxygen was started. If
 # left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = .
+OUTPUT_DIRECTORY       = docs
 
 # If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
 # directories (in 2 levels) under the output directory of each output format and
@@ -227,14 +227,6 @@ QT_AUTOBRIEF           = NO
 
 MULTILINE_CPP_IS_BRIEF = NO
 
-# By default Python docstrings are displayed as preformatted text and doxygen's
-# special commands cannot be used. By setting PYTHON_DOCSTRING to NO the
-# doxygen's special commands can be used and the contents of the docstring
-# documentation blocks is shown as doxygen documentation.
-# The default value is: YES.
-
-PYTHON_DOCSTRING       = YES
-
 # If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
 # documentation from any documented member that it re-implements.
 # The default value is: YES.
@@ -323,10 +315,7 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # Note: For files without extension you can use no_extension as a placeholder.
 #
 # Note that for custom extensions you also need to set FILE_PATTERNS otherwise
-# the files are not read by doxygen. When specifying no_extension you should add
-# * to the FILE_PATTERNS.
-#
-# Note see also the list of default file extension mappings.
+# the files are not read by doxygen.
 
 EXTENSION_MAPPING      =
 
@@ -460,19 +449,6 @@ TYPEDEF_HIDES_STRUCT   = NO
 
 LOOKUP_CACHE_SIZE      = 0
 
-# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use
-# during processing. When set to 0 doxygen will based this on the number of
-# cores available in the system. You can set it explicitly to a value larger
-# than 0 to get more control over the balance between CPU load and processing
-# speed. At this moment only the input processing can be done using multiple
-# threads. Since this is still an experimental feature the default is set to 1,
-# which efficively disables parallel processing. Please report any issues you
-# encounter. Generating dot graphs in parallel is controlled by the
-# DOT_NUM_THREADS setting.
-# Minimum value: 0, maximum value: 32, default value: 1.
-
-NUM_PROC_THREADS       = 1
-
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
@@ -536,13 +512,6 @@ EXTRACT_LOCAL_METHODS  = NO
 
 EXTRACT_ANON_NSPACES   = NO
 
-# If this flag is set to YES, the name of an unnamed parameter in a declaration
-# will be determined by the corresponding definition. By default unnamed
-# parameters remain unnamed in the output.
-# The default value is: YES.
-
-RESOLVE_UNNAMED_PARAMS = YES
-
 # If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
 # undocumented members inside documented classes or files. If set to NO these
 # members will be included in the various overviews, but no documentation
@@ -580,18 +549,11 @@ HIDE_IN_BODY_DOCS      = YES
 
 INTERNAL_DOCS          = NO
 
-# With the correct setting of option CASE_SENSE_NAMES doxygen will better be
-# able to match the capabilities of the underlying filesystem. In case the
-# filesystem is case sensitive (i.e. it supports files in the same directory
-# whose names only differ in casing), the option must be set to YES to properly
-# deal with such files in case they appear in the input. For filesystems that
-# are not case sensitive the option should be be set to NO to properly deal with
-# output files written for symbols that only differ in casing, such as for two
-# classes, one named CLASS and the other named Class, and to also support
-# references to files without having to specify the exact matching casing. On
-# Windows (including Cygwin) and MacOS, users should typically set this option
-# to NO, whereas on Linux or other Unix flavors it should typically be set to
-# YES.
+# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
+# names in lower-case letters. If set to YES, upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
+# (including Cygwin) ands Mac users are advised to set this option to NO.
 # The default value is: system dependent.
 
 CASE_SENSE_NAMES       = NO
@@ -830,10 +792,7 @@ WARN_IF_DOC_ERROR      = YES
 WARN_NO_PARAMDOC       = NO
 
 # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when
-# a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS
-# then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but
-# at the end of the doxygen process doxygen will return with a non-zero status.
-# Possible values are: NO, YES and FAIL_ON_WARNINGS.
+# a warning is encountered.
 # The default value is: NO.
 
 WARN_AS_ERROR          = NO
@@ -864,15 +823,13 @@ WARN_LOGFILE           =
 # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
 # Note: If this tag is empty the current directory is searched.
 
-INPUT                  = ../CHANGELOG.md \
-                         . \
-                         ../src
+INPUT                  = .
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
 # libiconv (or the iconv built into libc) for the transcoding. See the libiconv
-# documentation (see:
-# https://www.gnu.org/software/libiconv/) for the list of possible encodings.
+# documentation (see: https://www.gnu.org/software/libiconv/) for the list of
+# possible encodings.
 # The default value is: UTF-8.
 
 INPUT_ENCODING         = UTF-8
@@ -885,15 +842,13 @@ INPUT_ENCODING         = UTF-8
 # need to set EXTENSION_MAPPING for the extension otherwise the files are not
 # read by doxygen.
 #
-# Note the list of default checked file patterns might differ from the list of
-# default file extension mappings.
-#
 # If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
 # *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
 # *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
 # *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
-# *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd, *.vhdl,
-# *.ucf, *.qsf and *.ice.
+# *.doc (to be provided as doxygen C comment), *.txt (to be provided as doxygen
+# C comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
+# *.vhdl, *.ucf, *.qsf and *.ice.
 
 FILE_PATTERNS          = *.c \
                          *.cc \
@@ -956,7 +911,11 @@ RECURSIVE              = YES
 # Note that relative paths are relative to the directory from which doxygen is
 # run.
 
-EXCLUDE                = ../src/nimconfig_rename.h
+EXCLUDE                = ./README.md \
+                         ./src/FreeRTOS.h \
+                         ./src/FreeRTOS.cpp \
+                         ./examples \
+                         ./CMakelists.txt
 
 # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
 # directories that are symbolic links (a Unix file system feature) are excluded
@@ -1153,44 +1112,6 @@ USE_HTAGS              = NO
 
 VERBATIM_HEADERS       = YES
 
-# If the CLANG_ASSISTED_PARSING tag is set to YES then doxygen will use the
-# clang parser (see:
-# http://clang.llvm.org/) for more accurate parsing at the cost of reduced
-# performance. This can be particularly helpful with template rich C++ code for
-# which doxygen's built-in parser lacks the necessary type information.
-# Note: The availability of this option depends on whether or not doxygen was
-# generated with the -Duse_libclang=ON option for CMake.
-# The default value is: NO.
-
-CLANG_ASSISTED_PARSING = NO
-
-# If clang assisted parsing is enabled and the CLANG_ADD_INC_PATHS tag is set to
-# YES then doxygen will add the directory of each input to the include path.
-# The default value is: YES.
-
-CLANG_ADD_INC_PATHS    = YES
-
-# If clang assisted parsing is enabled you can provide the compiler with command
-# line options that you would normally use when invoking the compiler. Note that
-# the include paths will already be set by doxygen for the files and directories
-# specified with INPUT and INCLUDE_PATH.
-# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
-
-CLANG_OPTIONS          =
-
-# If clang assisted parsing is enabled you can provide the clang parser with the
-# path to the directory containing a file called compile_commands.json. This
-# file is the compilation database (see:
-# http://clang.llvm.org/docs/HowToSetupToolingForLLVM.html) containing the
-# options used when the source files were built. This is equivalent to
-# specifying the -p option to a clang tool, such as clang-check. These options
-# will then be passed to the parser. Any options specified with CLANG_OPTIONS
-# will be added as well.
-# Note: The availability of this option depends on whether or not doxygen was
-# generated with the -Duse_libclang=ON option for CMake.
-
-CLANG_DATABASE_PATH    =
-
 #---------------------------------------------------------------------------
 # Configuration options related to the alphabetical class index
 #---------------------------------------------------------------------------
@@ -1202,6 +1123,13 @@ CLANG_DATABASE_PATH    =
 
 ALPHABETICAL_INDEX     = YES
 
+# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
+# which the alphabetical index list will be split.
+# Minimum value: 1, maximum value: 20, default value: 5.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
+
+COLS_IN_ALPHA_INDEX    = 5
+
 # In case all classes in a project start with a common prefix, all classes will
 # be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
 # can be used to specify a prefix (or a list of prefixes) that should be ignored
@@ -1372,11 +1300,10 @@ HTML_INDEX_NUM_ENTRIES = 100
 
 # If the GENERATE_DOCSET tag is set to YES, additional index files will be
 # generated that can be used as input for Apple's Xcode 3 integrated development
-# environment (see:
-# https://developer.apple.com/xcode/), introduced with OSX 10.5 (Leopard). To
-# create a documentation set, doxygen will generate a Makefile in the HTML
-# output directory. Running make will produce the docset in that directory and
-# running make install will install the docset in
+# environment (see: https://developer.apple.com/xcode/), introduced with OSX
+# 10.5 (Leopard). To create a documentation set, doxygen will generate a
+# Makefile in the HTML output directory. Running make will produce the docset in
+# that directory and running make install will install the docset in
 # ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
 # startup. See https://developer.apple.com/library/archive/featuredarticles/Doxy
 # genXcode/_index.html for more information.
@@ -1418,8 +1345,8 @@ DOCSET_PUBLISHER_NAME  = Publisher
 # If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
 # additional HTML index files: index.hhp, index.hhc, and index.hhk. The
 # index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
-# (see:
-# https://www.microsoft.com/en-us/download/details.aspx?id=21138) on Windows.
+# (see: https://www.microsoft.com/en-us/download/details.aspx?id=21138) on
+# Windows.
 #
 # The HTML Help Workshop contains a compiler that can convert all HTML output
 # generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
@@ -1449,7 +1376,7 @@ CHM_FILE               =
 HHC_LOCATION           =
 
 # The GENERATE_CHI flag controls if a separate .chi index file is generated
-# (YES) or that it should be included in the main .chm file (NO).
+# (YES) or that it should be included in the master .chm file (NO).
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
@@ -1494,8 +1421,7 @@ QCH_FILE               =
 
 # The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
 # Project output. For more information please see Qt Help Project / Namespace
-# (see:
-# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#namespace).
+# (see: https://doc.qt.io/archives/qt-4.8/qthelpproject.html#namespace).
 # The default value is: org.doxygen.Project.
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
@@ -1503,8 +1429,8 @@ QHP_NAMESPACE          = org.doxygen.Project
 
 # The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
 # Help Project output. For more information please see Qt Help Project / Virtual
-# Folders (see:
-# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#virtual-folders).
+# Folders (see: https://doc.qt.io/archives/qt-4.8/qthelpproject.html#virtual-
+# folders).
 # The default value is: doc.
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
@@ -1512,16 +1438,16 @@ QHP_VIRTUAL_FOLDER     = doc
 
 # If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
 # filter to add. For more information please see Qt Help Project / Custom
-# Filters (see:
-# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-filters).
+# Filters (see: https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-
+# filters).
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHP_CUST_FILTER_NAME   =
 
 # The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
 # custom filter to add. For more information please see Qt Help Project / Custom
-# Filters (see:
-# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-filters).
+# Filters (see: https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-
+# filters).
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHP_CUST_FILTER_ATTRS  =
@@ -1533,9 +1459,9 @@ QHP_CUST_FILTER_ATTRS  =
 
 QHP_SECT_FILTER_ATTRS  =
 
-# The QHG_LOCATION tag can be used to specify the location (absolute path
-# including file name) of Qt's qhelpgenerator. If non-empty doxygen will try to
-# run qhelpgenerator on the generated .qhp file.
+# The QHG_LOCATION tag can be used to specify the location of Qt's
+# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
+# generated .qhp file.
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHG_LOCATION           =
@@ -1616,8 +1542,8 @@ EXT_LINKS_IN_WINDOW    = NO
 # tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
 # https://inkscape.org) to generate formulas as SVG images instead of PNGs for
 # the HTML output. These images will generally look nicer at scaled resolutions.
-# Possible values are: png (the default) and svg (looks nicer but requires the
-# pdf2svg or inkscape tool).
+# Possible values are: png The default and svg Looks nicer but requires the
+# pdf2svg tool.
 # The default value is: png.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
@@ -1662,7 +1588,7 @@ USE_MATHJAX            = NO
 
 # When MathJax is enabled you can set the default output format to be used for
 # the MathJax output. See the MathJax site (see:
-# http://docs.mathjax.org/en/v2.7-latest/output.html) for more details.
+# http://docs.mathjax.org/en/latest/output.html) for more details.
 # Possible values are: HTML-CSS (which is slower, but has the best
 # compatibility), NativeMML (i.e. MathML) and SVG.
 # The default value is: HTML-CSS.
@@ -1692,8 +1618,7 @@ MATHJAX_EXTENSIONS     =
 
 # The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
 # of code that will be used on startup of the MathJax code. See the MathJax site
-# (see:
-# http://docs.mathjax.org/en/v2.7-latest/output.html) for more details. For an
+# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
 # example see the documentation.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
@@ -1740,8 +1665,7 @@ SERVER_BASED_SEARCH    = NO
 #
 # Doxygen ships with an example indexer (doxyindexer) and search engine
 # (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see:
-# https://xapian.org/).
+# Xapian (see: https://xapian.org/).
 #
 # See the section "External Indexing and Searching" for details.
 # The default value is: NO.
@@ -1754,9 +1678,8 @@ EXTERNAL_SEARCH        = NO
 #
 # Doxygen ships with an example indexer (doxyindexer) and search engine
 # (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see:
-# https://xapian.org/). See the section "External Indexing and Searching" for
-# details.
+# Xapian (see: https://xapian.org/). See the section "External Indexing and
+# Searching" for details.
 # This tag requires that the tag SEARCHENGINE is set to YES.
 
 SEARCHENGINE_URL       =
@@ -1920,11 +1843,9 @@ LATEX_EXTRA_FILES      =
 
 PDF_HYPERLINKS         = YES
 
-# If the USE_PDFLATEX tag is set to YES, doxygen will use the engine as
-# specified with LATEX_CMD_NAME to generate the PDF file directly from the LaTeX
-# files. Set this option to YES, to get a higher quality PDF documentation.
-#
-# See also section LATEX_CMD_NAME for selecting the engine.
+# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
+# the PDF file directly from the LaTeX files. Set this option to YES, to get a
+# higher quality PDF documentation.
 # The default value is: YES.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
@@ -2163,10 +2084,6 @@ DOCBOOK_PROGRAMLISTING = NO
 
 GENERATE_AUTOGEN_DEF   = NO
 
-#---------------------------------------------------------------------------
-# Configuration options related to Sqlite3 output
-#---------------------------------------------------------------------------
-
 #---------------------------------------------------------------------------
 # Configuration options related to the Perl module output
 #---------------------------------------------------------------------------
@@ -2267,8 +2184,7 @@ PREDEFINED             = _DOXYGEN_ \
                          CONFIG_BT_NIMBLE_ROLE_CENTRAL \
                          CONFIG_BT_NIMBLE_ROLE_OBSERVER \
                          CONFIG_BT_NIMBLE_ROLE_PERIPHERAL \
-                         CONFIG_BT_NIMBLE_ROLE_BROADCASTER \
-                         CONFIG_BT_NIMBLE_EXT_ADV
+                         CONFIG_BT_NIMBLE_ROLE_BROADCASTER
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
 # tag can be used to specify a list of macro names that should be expanded. The
@@ -2445,31 +2361,9 @@ UML_LOOK               = NO
 # but if the number exceeds 15, the total amount of fields shown is limited to
 # 10.
 # Minimum value: 0, maximum value: 100, default value: 10.
-# This tag requires that the tag UML_LOOK is set to YES.
-
-UML_LIMIT_NUM_FIELDS   = 10
-
-# If the DOT_UML_DETAILS tag is set to NO, doxygen will show attributes and
-# methods without types and arguments in the UML graphs. If the DOT_UML_DETAILS
-# tag is set to YES, doxygen will add type and arguments for attributes and
-# methods in the UML graphs. If the DOT_UML_DETAILS tag is set to NONE, doxygen
-# will not generate fields with class member information in the UML graphs. The
-# class diagrams will look similar to the default class diagrams but using UML
-# notation for the relationships.
-# Possible values are: NO, YES and NONE.
-# The default value is: NO.
-# This tag requires that the tag UML_LOOK is set to YES.
-
-DOT_UML_DETAILS        = NO
-
-# The DOT_WRAP_THRESHOLD tag can be used to set the maximum number of characters
-# to display on a single line. If the actual line length exceeds this threshold
-# significantly it will wrapped across multiple lines. Some heuristics are apply
-# to avoid ugly line breaks.
-# Minimum value: 0, maximum value: 1000, default value: 17.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-DOT_WRAP_THRESHOLD     = 17
+UML_LIMIT_NUM_FIELDS   = 10
 
 # If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
 # collaboration graphs will show the relations between templates and their
@@ -2660,11 +2554,9 @@ DOT_MULTI_TARGETS      = NO
 
 GENERATE_LEGEND        = YES
 
-# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate
+# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate dot
 # files that are used to generate the various graphs.
-#
-# Note: This setting is not only used for dot files but also for msc and
-# plantuml temporary files.
 # The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_CLEANUP            = YES

docs/Improvements_and_updates.md

@@ -1,6 +1,7 @@
 # Improvements and updates
 
-Many improvements have been made to this library vs the original, this is a brief overview of the most significant changes. Refer to the [class documentation](https://h2zero.github.io/esp-nimble-cpp/annotated.html) for further information on class specifics.
+Many improvements have been made to this library vs the original, this is a brief overview of the most significant changes.  
+Refer to the [class documentation](https://h2zero.github.io/esp-nimble-cpp/annotated.html) for futher information on class specifics.  
 
 * [Server](#server)
 * [Advertising](#advertising)
@@ -9,26 +10,23 @@ Many improvements have been made to this library vs the original, this is a brie
 <br/>
 
 <a name="server"></a>
-# Server
+# Server  
 
-`NimBLEService::NimBLEService::createCharacteristic` takes a 3rd parameter to specify the maximum data size that can be stored by the characteristic. This allows for limiting the RAM use of the characteristic in cases where small amounts of data are expected.  
-<br/>
+`NimBLECharacteristic::setValue(const T &s)`  
+`NimBLEDescriptor::setValue(const T &s)`  
 
-`NimBLECharacteristic::setValue(const T &s)`
-`NimBLEDescriptor::setValue(const T &s)`
-
-Now use the `NimbleAttValue` class and templates to accommodate standard and custom types/values.
+Now use a template to accomodate standard and custom types/values.  
 
 **Example**
 ```
-struct my_struct {
+struct my_struct{
     uint8_t  one;
     uint16_t two;
     uint32_t four;
     uint64_t eight;
     float    flt;
-} myStruct;
-
+}myStruct;
+        
     myStruct.one = 1;
     myStruct.two = 2;
     myStruct.four = 4;
@@ -36,14 +34,12 @@ struct my_struct {
     myStruct.flt = 1234.56;
 
     pCharacteristic->setValue(myStruct);
-
-    // Arduino String support
-    String myString = "Hello";
-    pCharacteristic->setValue(myString);
  ```
-This will send the struct to the receiving client when read or a notification sent.
+This will send the struct to the recieving client when read or a notification sent.  
 
-`NimBLECharacteristic::getValue` now takes an optional timestamp parameter which will update it's value with the time the last value was received. In addition an overloaded template has been added to retrieve the value as a type specified by the user.
+`NimBLECharacteristic::getValue` now takes an optional timestamp parameter which will update it's value with  
+the time the last value was recieved. In addition an overloaded template has been added to retrieve the value  
+as a type specified by the user.  
 
 **Example**
 ```
@@ -52,34 +48,38 @@ This will send the struct to the receiving client when read or a notification se
 ```
 <br/>
 
-**Advertising will automatically start when a client disconnects.**
+**Advertising will automatically start when a client disconnects.**  
 
 A new method `NimBLEServer::advertiseOnDisconnect(bool)` has been implemented to control this, true(default) = enabled.  
 <br/>
 
-`NimBLEServer::removeService` takes an additional parameter `bool deleteSvc` that if true will delete the service and all characteristics / descriptors belonging to it and invalidating any pointers to them.
+`NimBLEServer::removeService` takes an additional parameter `bool deleteSvc` that if true will delete the service  
+and all characteristics / descriptors belonging to it and invalidating any pointers to them.  
 
-If false the service is only removed from visibility by clients. The pointers to the service and it's characteristics / descriptors will remain valid and the service can be re-added in the future using `NimBLEServer::addService`.  
+If false the service is only removed from visibility by clients. The pointers to the service and  
+it's characteristics / descriptors will remain valid and the service can be re-added in the future  
+using `NimBLEServer::addService`.  
 <br/>
 
 <a name="advertising"></a>
 # Advertising
 `NimBLEAdvertising::start`
 
-Now takes 2 optional parameters, the first is the duration to advertise for (in seconds), the second is a callback that is invoked when advertising ends and takes a pointer to a `NimBLEAdvertising` object (similar to the `NimBLEScan::start` API).
+Now takes 2 optional parameters, the first is the duration to advertise for (in seconds), the second is a callback  
+that is invoked when advertsing ends and takes a pointer to a `NimBLEAdvertising` object (similar to the `NimBLEScan::start` API).  
 
-This provides an opportunity to update the advertisement data if desired.
+This provides an opportunity to update the advertisment data if desired.  
 
-Also now returns a bool value to indicate if advertising successfully started or not.  
-<br/>
+Also now returns a bool value to indicate if advertising successfully started or not.
+<br/>  
 
 <a name="client"></a>
-# Client
+# Client  
 
-`NimBLERemoteCharacteristic::readValue(time_t\*, bool)`
-`NimBLERemoteDescriptor::readValue(bool)`
+`NimBLERemoteCharacteristic::readValue(time_t\*, bool)`   
+`NimBLERemoteDescriptor::readValue(bool)`  
 
-Have been added as templates to allow reading the values as any specified type.
+Have been added as templates to allow reading the values as any specified type.   
 
 **Example**
 ```
@@ -93,56 +93,56 @@ struct my_struct{
 
     time_t timestamp;
     myStruct = pRemoteCharacteristic->readValue<myStruct>(&timestamp); // timestamp optional
-```
+```  
 <br/>
 
-`NimBLERemoteCharacteristic::registerForNotify`
-Has been **deprecated** as now the internally stored characteristic value is updated when notification/indication is received.
+`NimBLERemoteCharacteristic::registerForNotify`  
+Has been **deprecated** as now the internally stored characteristic value is updated when notification/indication is recieved.  
 
-`NimBLERemoteCharacteristic::subscribe` and `NimBLERemoteCharacteristic::unsubscribe` have been implemented to replace it.
-A callback is no longer required to get the most recent value unless timing is important. Instead, the application can call `NimBLERemoteCharacteristic::getValue` to get the last updated value any time.  
-<br/>
+`NimBLERemoteCharacteristic::subscribe` and `NimBLERemoteCharacteristic::unsubscribe` have been implemented to replace it.  
+A callback is no longer requred to get the most recent value unless timing is important. Instead, the application can call `NimBLERemoteCharacteristic::getValue` to  
+get the last updated value any time.  
+<br/>  
 
-The `notify_callback` function is now defined as a `std::function` to take advantage of using `std::bind` to specify a class member function for the callback.
+The `notifiy_callback` function is now defined as a `std::function` to take advantage of using `std::bind` to specifiy a class member function for the callback.  
 
-Example:
+Example:  
 ```
 using namespace std::placeholders;
 notify_callback callback = std::bind(&<ClassName>::<memberFunctionCallbackName>, this, _1, _2, _3, _4);
-
 <remoteCharacteristicInstance>->subscribe(true, callback);
 ```
 
-`NimBLERemoteCharacteristic::readValue` and `NimBLERemoteCharacteristic::getValue` take an optional timestamp parameter which will update it's value with
-the time the last value was received.
+`NimBLERemoteCharacteristic::readValue` and `NimBLERemoteCharacteristic::getValue` take an optional timestamp parameter which will update it's value with  
+the time the last value was recieved.  
 
 > NimBLEClient::getService  
 > NimBLERemoteService::getCharacteristic  
-> NimBLERemoteCharacteristic::getDescriptor
+> NimBLERemoteCharacteristic::getDescriptor  
 
-These methods will now check the respective vectors for the attribute object and, if not found, will retrieve (only)
-the specified attribute from the peripheral.
+These methods will now check the respective vectors for the attribute object and, if not found, will retrieve (only)  
+the specified attribute from the peripheral.  
 
-These changes allow more control for the user to manage the resources used for the attributes.  
+These changes allow more control for the user to manage the resources used for the attributes.    
 <br/>
 
-`NimBLEClient::connect()` can now be called without an address or advertised device parameter. This will connect to the device with the address previously set when last connected or set with `NimBLEDevice::setPeerAddress()`.
+`NimBLEClient::connect()` can now be called without an address or advertised device parameter. This will connect to the  
+device with the address previously set when last connected or set with `NimBLEDevice::setPeerAddress()`. 
 
 <a name="general"></a>
-# General
-To reduce resource use all instances of `std::map` have been replaced with `std::vector`.
+# General  
+To reduce resource use all instances of `std::map` have been replaced with `std::vector`.  
 
-Use of `FreeRTOS::Semaphore` has been removed as it was consuming too much ram, the related files have been left in place to accomodate application use.
+Use of `FreeRTOS::Semaphore` has been removed as it was consuming too much ram, the related files have been left in place to accomodate application use.  
 
-Operators `==`, `!=` and `std::string` have been added to `NimBLEAddress` and `NimBLEUUID` for easier comparison and logging.
+Operators `==`, `!=` and `std::string` have been added to `NimBLEAddress` and `NimBLEUUID` for easier comparison and logging.  
 
-New constructor for `NimBLEUUID(uint32_t, uint16_t, uint16_t, uint64_t)` added to lower memory use vs string construction. See: [#21](https://github.com/h2zero/NimBLE-Arduino/pull/21).
+New constructor for `NimBLEUUID(uint32_t, uint16_t, uint16_t, uint64_t)` added to lower memory use vs string construction. See: [#21](https://github.com/h2zero/NimBLE-Arduino/pull/21).   
 
-Security/pairing operations are now handled in the respective `NimBLEClientCallbacks` and `NimBLEServerCallbacks` classes, `NimBLESecurity`(deprecated) remains for backward compatibility.
+Security/pairing operations are now handled in the respective `NimBLEClientCallbacks` and `NimBLEServerCallbacks` classes, `NimBLESecurity`(deprecated) remains for backward compatibility.  
 
-Configuration options have been added to add or remove debugging information, when disabled (default) significantly reduces binary size.
+Configuration options have been added to add or remove debugging information, when disabled (default) significatly reduces binary size.  
 In ESP-IDF the options are in menuconfig: `Main menu -> ESP-NimBLE-cpp configuration`.  
-For Arduino the options must be commented / uncommented in nimconfig.h.
-
-Characteristics and descriptors now use the `NimBLEAttValue` class to store their data. This is a polymorphic container class capable of converting to/from many different types efficiently. See: [#286](https://github.com/h2zero/NimBLE-Arduino/pull/286)
+For Arduino the options must be commented / uncommented in nimconfig.h.   
+<br/>  
 

docs/Migration_guide.md

@@ -1,10 +1,10 @@
 # Migrating from Bluedroid to NimBLE
 
-This guide describes the required changes to existing projects migrating from the original bluedroid API to NimBLE.
+This guide describes the required changes to existing projects migrating from the original bluedroid API to NimBLE.  
 
-**The changes listed here are only the required changes that must be made**, and a short overview of options for migrating existing applications.
+**The changes listed here are only the required changes that must be made**, and a short overview of options for migrating existing applications.  
 
-For more information on the improvements and additions please refer to the [class documentation](https://h2zero.github.io/NimBLE-Arduino/annotated.html) and [Improvements and updates](Improvements_and_updates.md)
+For more information on the improvements and additions please refer to the [class documentation](https://h2zero.github.io/esp-nimble-cpp/annotated.html) and [Improvements and updates](Improvements_and_updates.md)  
 
 * [General Changes](#general-information)
 * [Server](#server-api)
@@ -19,78 +19,84 @@ For more information on the improvements and additions please refer to the [clas
     * [Security](#client-security)
 * [General Security](#security-api)
 * [Configuration](#arduino-configuration)
-<br/>
+<br/>  
 
 <a name="general-information"></a>
 ## General Information
 
 ### Header Files
-All classes are accessible by including `NimBLEDevice.h` in your application, no further headers need to be included.
+All classes are accessible by including `NimBLEDevice.h` in your application, no further headers need to be included.  
 
-(Mainly for Arduino) You may choose to include `NimBLELog.h` in your application if you want to use the `NIMBLE_LOGx` macros for debugging. These macros are used the same way as the `ESP_LOGx` macros.
+(Mainly for Arduino) You may choose to include `NimBLELog.h` in your appplication if you want to use the `NIMBLE_LOGx` macros for debugging.  
+These macros are used the same way as the `ESP_LOGx` macros.  
 <br/>
 
 ### Class Names
-Class names remain the same as the original with the addition of a "Nim" prefix.
-For example `BLEDevice` is now `NimBLEDevice` and `BLEServer` is now `NimBLEServer` etc.
+Class names remain the same as the original with the addition of a "Nim" prefix.  
+For example `BLEDevice` is now `NimBLEDevice` and `BLEServer` is now `NimBLEServer` etc.  
 
-For convenience definitions have been added to allow applications to use either name for all classes this means **no class names need to be changed in existing code** and makes migrating easier.
+For convienience definitions have been added to allow applications to use either name for all classes  
+this means **no class names need to be changed in existing code** and makes migrating easier.  
 <br/>
 
 ### BLE Addresses
-`BLEAddress` (`NimBLEAddress`) When constructing an address the constructor now takes an *(optional)* `uint8_t type` parameter to specify the address type. Default is (0) Public static address.
+`BLEAddress` (`NimBLEAddress`) When constructing an address the constructor now takes an *(optional)* `uint8_t type` paramameter  
+to specify the address type. Default is (0) Public static address.  
 
-For example `BLEAddress addr(11:22:33:44:55:66, 1)` will create the address object with an address type of: 1 (Random).
+For example `BLEAddress addr(11:22:33:44:55:66, 1)` will create the address object with an address type of: 1 (Random).  
 
-As this parameter is optional no changes to existing code are needed, it is mentioned here for information.
-
-`BLEAddress::getNative` (`NimBLEAddress::getNative`) returns a uint8_t pointer to the native address byte array. In this library the address bytes are stored in reverse order from the original library. This is due to the way the NimBLE stack expects addresses to be presented to it. All other functions such as `toString` are
-not affected as the endian change is made within them.
+As this paramameter is optional no changes to existing code are needed, it is mentioned here for information.  
+<br/>
+`BLEAddress::getNative` (`NimBLEAddress::getNative`) returns a uint8_t pointer to the native address byte array.  
+In this library the address bytes are stored in reverse order from the original library. This is due to the way  
+the NimBLE stack expects addresses to be presented to it. All other functions such as `toString` are  
+not affected as the endian change is made within them.  
 <br/>
 
 <a name="server-api"></a>
 ## Server API
 Creating a `BLEServer` instance is the same as original, no changes required.
-For example `BLEDevice::createServer()` will work just as it did before.
+For example `BLEDevice::createServer()` will work just as it did before.  
 
-`BLEServerCallbacks` (`NimBLEServerCallbacks`) has new methods for handling security operations.
-**Note:** All callback methods have default implementations which allows the application to implement only the methods applicable.
+`BLEServerCallbacks` (`NimBLEServerCallbacks`) has new methods for handling security operations.  
+**Note:** All callback methods have default implementations which allows the application to implement only the methods applicable.  
 <br/>
 
 <a name="services"></a>
 ### Services
-Creating a `BLEService` (`NimBLEService`) instance is the same as original, no changes required.
-For example `BLEServer::createService(SERVICE_UUID)` will work just as it did before.
+Creating a `BLEService` (`NimBLEService`) instance is the same as original, no changes required.  
+For example `BLEServer::createService(SERVICE_UUID)` will work just as it did before.  
 
 <a name="characteristics"></a>
 ### Characteristics
-`BLEService::createCharacteristic` (`NimBLEService::createCharacteristic`) is used the same way as originally except the properties parameter has changed.
+The constructor for `(Nim)BLECharacteristic` is now private, so if you currently subclass it to add logic you should switch to use `NimBLEService::createCharacteristic` instead.  Any custom processing logic previously in a `BLECharacteristic` subclass should be moved to a `NimBLECharacteristicCallbacks` subclass instead, and passed into `NimBLECharacteristic::setCallbacks`.
+
+`BLEService::createCharacteristic` (`NimBLEService::createCharacteristic`) is used the same way as originally except the properties parameter has changed.  
 
 When creating a characteristic the properties are now set with `NIMBLE_PROPERTY::XXXX` instead of `BLECharacteristic::XXXX`.
 
 #### Originally
-> BLECharacteristic::PROPERTY_READ |
-> BLECharacteristic::PROPERTY_WRITE
+> BLECharacteristic::PROPERTY_READ |  
+> BLECharacteristic::PROPERTY_WRITE  
 
 #### Is Now
-> NIMBLE_PROPERTY::READ |
-> NIMBLE_PROPERTY::WRITE
+> NIMBLE_PROPERTY::READ |  
+> NIMBLE_PROPERTY::WRITE  
 <br/>
 
 #### The full list of properties
-> NIMBLE_PROPERTY::READ
-> NIMBLE_PROPERTY::READ_ENC
-> NIMBLE_PROPERTY::READ_AUTHEN
-> NIMBLE_PROPERTY::READ_AUTHOR
-> NIMBLE_PROPERTY::WRITE
-> NIMBLE_PROPERTY::WRITE_NR
-> NIMBLE_PROPERTY::WRITE_ENC
-> NIMBLE_PROPERTY::WRITE_AUTHEN
-> NIMBLE_PROPERTY::WRITE_AUTHOR
-> NIMBLE_PROPERTY::BROADCAST
-> NIMBLE_PROPERTY::NOTIFY
-> NIMBLE_PROPERTY::INDICATE
-
+> NIMBLE_PROPERTY::READ  
+> NIMBLE_PROPERTY::READ_ENC  
+> NIMBLE_PROPERTY::READ_AUTHEN  
+> NIMBLE_PROPERTY::READ_AUTHOR  
+> NIMBLE_PROPERTY::WRITE  
+> NIMBLE_PROPERTY::WRITE_NR  
+> NIMBLE_PROPERTY::WRITE_ENC  
+> NIMBLE_PROPERTY::WRITE_AUTHEN  
+> NIMBLE_PROPERTY::WRITE_AUTHOR  
+> NIMBLE_PROPERTY::BROADCAST  
+> NIMBLE_PROPERTY::NOTIFY   
+> NIMBLE_PROPERTY::INDICATE  
 <br/>
 
 **Example:**
@@ -98,7 +104,7 @@ When creating a characteristic the properties are now set with `NIMBLE_PROPERTY:
 BLECharacteristic *pCharacteristic = pService->createCharacteristic(
                                      CHARACTERISTIC_UUID,
                                      BLECharacteristic::PROPERTY_READ   |
-                                     BLECharacteristic::PROPERTY_WRITE
+                                     BLECharacteristic::PROPERTY_WRITE  
                                      );
 
 ```
@@ -107,22 +113,23 @@ Needs to be changed to:
 BLECharacteristic *pCharacteristic = pService->createCharacteristic(
                                      CHARACTERISTIC_UUID,
                                      NIMBLE_PROPERTY::READ |
-                                     NIMBLE_PROPERTY::WRITE
+                                     NIMBLE_PROPERTY::WRITE 
                                     );
 ```
 <br/>
 
-`BLECharacteristicCallbacks` (`NimBLECharacteristicCallbacks`) has a new method `NimBLECharacteristicCallbacks::onSubscribe` which is called when a client subscribes to notifications/indications.
+`BLECharacteristicCallbacks` (`NimBLECharacteristicCallbacks`) has a new method `NimBLECharacteristicCallbacks::onSubscribe`  
+which is called when a client subscribes to notifications/indications.  
 
-**Note:** All callback methods have default implementations which allows the application to implement only the methods applicable.
+**Note:** All callback methods have default implementations which allows the application to implement only the methods applicable.  
 <br/>
 
-> BLECharacteristic::getData
+> BLECharacteristic::getData  
 
-**Has been removed from the API.**
-Originally this returned a `uint8_t*` to the internal data, which is volatile.
-To prevent possibly throwing exceptions this has been removed and `NimBLECharacteristic::getValue` should be used
-to get a copy of the data first which can then safely be accessed via pointer.
+**Has been removed from the API.**  
+Originally this returned a `uint8_t*` to the internal data, which is volatile.  
+To prevent possibly throwing exceptions this has been removed and `NimBLECharacteristic::getValue` should be used  
+to get a copy of the data first which can then safely be accessed via pointer.  
 
 **Example:**
 ```
@@ -137,47 +144,48 @@ my_struct_t myStruct = pChr->getValue<my_struct_t>();
 
 <a name="descriptors"></a>
 ### Descriptors
+The previous method `BLECharacteristic::addDescriptor()` has been removed.  
 
 Descriptors are now created using the `NimBLECharacteristic::createDescriptor` method.
+ 
+BLE2902 or NimBLE2902 class has been removed.  
+NimBLE automatically creates the 0x2902 descriptor if a characteristic has a notification or indication property assigned to it.  
 
-BLE2902 or NimBLE2902 class has been removed.
-NimBLE automatically creates the 0x2902 descriptor if a characteristic has a notification or indication property assigned to it.
+It was no longer useful to have a class for the 0x2902 descriptor as a new callback `NimBLECharacteristicCallbacks::onSubscribe` was added  
+to handle callback functionality and the client subscription status is handled internally.  
 
-It was no longer useful to have a class for the 0x2902 descriptor as a new callback `NimBLECharacteristicCallbacks::onSubscribe` was added
-to handle callback functionality and the client subscription status is handled internally.
-
-**Note:** Attempting to create a 0x2902 descriptor will trigger an assert to notify the error,
+**Note:** Attempting to create a 0x2902 descriptor will trigger an assert to notify the error, 
 allowing the creation of it would cause a fault in the NimBLE stack.
 
-All other descriptors are now created just as characteristics are by using the `NimBLECharacteristic::createDescriptor` method (except 0x2904, see below).
+All other descriptors are now created just as characteristics are by using the `NimBLECharacteristic::createDescriptor` method (except 0x2904, see below).   
 Which are defined as:
 ```
 NimBLEDescriptor* createDescriptor(const char* uuid,
-                                   uint32_t properties =
+                                   uint32_t properties = 
                                    NIMBLE_PROPERTY::READ |
                                    NIMBLE_PROPERTY::WRITE,
                                    uint16_t max_len = 100);
-
+                                     
 NimBLEDescriptor* createDescriptor(NimBLEUUID uuid,
-                                   uint32_t properties =
+                                   uint32_t properties = 
                                    NIMBLE_PROPERTY::READ |
                                    NIMBLE_PROPERTY::WRITE,
                                    uint16_t max_len = 100);
 ```
 ##### Example
 ```
-pDescriptor = pCharacteristic->createDescriptor("ABCD",
-                                                NIMBLE_PROPERTY::READ |
+pDescriptor = pCharacteristic->createDescriptor("ABCD", 
+                                                NIMBLE_PROPERTY::READ | 
                                                 NIMBLE_PROPERTY::WRITE |
                                                 NIMBLE_PROPERTY::WRITE_ENC,
                                                 25);
 ```
-Would create a descriptor with the UUID 0xABCD, publicly readable but only writable if paired/bonded (encrypted) and has a max value length of 25 bytes.
+Would create a descriptor with the UUID 0xABCD, publicly readable but only writable if paired/bonded (encrypted) and has a max value length of 25 bytes.  
 <br/>
 
 For the 0x2904, there is a special class that is created when you call `createDescriptor("2904").
 
-The pointer returned is of the base class `NimBLEDescriptor` but the call will create the derived class of `NimBLE2904` so you must cast the returned pointer to
+The pointer returned is of the base class `NimBLEDescriptor` but the call will create the derived class of `NimBLE2904` so you must cast the returned pointer to  
 `NimBLE2904` to access the specific class methods.
 
 ##### Example
@@ -189,115 +197,127 @@ p2904 = (NimBLE2904*)pCharacteristic->createDescriptor("2904");
 <a name="server-security"></a>
 ### Server Security
 Security is set on the characteristic or descriptor properties by applying one of the following:
-> NIMBLE_PROPERTY::READ_ENC
-> NIMBLE_PROPERTY::READ_AUTHEN
-> NIMBLE_PROPERTY::READ_AUTHOR
-> NIMBLE_PROPERTY::WRITE_ENC
-> NIMBLE_PROPERTY::WRITE_AUTHEN
-> NIMBLE_PROPERTY::WRITE_AUTHOR
+> NIMBLE_PROPERTY::READ_ENC  
+> NIMBLE_PROPERTY::READ_AUTHEN  
+> NIMBLE_PROPERTY::READ_AUTHOR  
+> NIMBLE_PROPERTY::WRITE_ENC  
+> NIMBLE_PROPERTY::WRITE_AUTHEN  
+> NIMBLE_PROPERTY::WRITE_AUTHOR  
 
-<br/>
-
-When a peer wants to read or write a characteristic or descriptor with any of these properties applied it will trigger the pairing process. By default the "just-works" pairing will be performed automatically.
-
-This can be changed to use passkey authentication or numeric comparison. See [Security API](#security-api) for details.
+When a peer wants to read or write a characteristic or descriptor with any of these properties applied    
+it will trigger the pairing process. By default the "just-works" pairing will be performed automatically.   
+This can be changed to use passkey authentication or numeric comparison. See [Security API](#security-api) for details.  
 <br/>
 
 <a name="advertising-api"></a>
 ## Advertising API
-Advertising works the same as the original API except:
+Advertising works the same as the original API except:  
+> BLEAdvertising::setMinPreferred  
+> BLEAdvertising::setMaxPreferred  
 
-Calling `NimBLEAdvertising::setAdvertisementData` will entirely replace any data set with `NimBLEAdvertising::addServiceUUID`, or
-`NimBLEAdvertising::setAppearance` or similar methods. You should set all the data you wish to advertise within the `NimBLEAdvertisementData` instead.
+These methods were found to not provide useful functionality and consumed valuable advertising space (6 bytes of 31) if used unknowingly.  
+If you wish to advertise these parameters you can still do so manually via `BLEAdvertisementData::addData` (`NimBLEAdvertisementData::addData`).  
+<br/>
+
+Calling `NimBLEAdvertising::setAdvertisementData` will entirely replace any data set with `NimBLEAdvertising::addServiceUUID`, or  
+`NimBLEAdvertising::setAppearance` or similar methods. You should set all the data you wish to advertise within the `NimBLEAdvertisementData` instead.  
+
+~~Calling `NimBLEAdvertising::setScanResponseData` without also calling `NimBLEAdvertising::setAdvertisementData` will have no effect.  
+When using custom scan response data you must also use custom advertisement data.~~  
+No longer true as of release 1.2.0 and above, custom scan response is now supported without custom advertisement data.  
 <br/>
 
 > BLEAdvertising::start (NimBLEAdvertising::start)
 
-Now takes 2 optional parameters, the first is the duration to advertise for (in seconds), the second is a callback that is invoked when advertising ends and takes a pointer to a `NimBLEAdvertising` object (similar to the `NimBLEScan::start` API).
-This provides an opportunity to update the advertisement data if desired.
+Now takes 2 optional parameters, the first is the duration to advertise for (in seconds), the second is a callback  
+that is invoked when advertsing ends and takes a pointer to a `NimBLEAdvertising` object (similar to the `NimBLEScan::start` API).  
+
+This provides an opportunity to update the advertisment data if desired.  
 <br/>
 
 <a name="client-api"></a>
 ## Client API
 
-Client instances are created just as before with `BLEDevice::createClient` (`NimBLEDevice::createClient`).
+Client instances are created just as before with `BLEDevice::createClient` (`NimBLEDevice::createClient`).  
 
-Multiple client instances can be created, up to the maximum number of connections set in the config file (default: 3). To delete a client instance you must use `NimBLEDevice::deleteClient`.
+Multiple client instances can be created, up to the maximum number of connections set in the config file (default: 3).  
+To delete a client instance you must use `NimBLEDevice::deleteClient`.  
 
-`BLEClient::connect`(`NimBLEClient::connect`) Has had it's parameters altered.
+`BLEClient::connect`(`NimBLEClient::connect`) Has had it's parameters altered.  
 Defined as:
-> NimBLEClient::connect(bool deleteServices = true);
-> NimBLEClient::connect(NimBLEAdvertisedDevice\* device, bool deleteServices = true);
-> NimBLEClient::connect(NimBLEAddress address, bool deleteServices = true);
+> NimBLEClient::connect(bool deleteServices = true);  
+> NimBLEClient::connect(NimBLEAdvertisedDevice\* device, bool deleteServices = true);  
+> NimBLEClient::connect(NimBLEAddress address, bool deleteServices = true);  
 
-The type parameter has been removed and a new bool parameter has been added to indicate if the client should delete the attribute database previously retrieved (if applicable) for the peripheral, default value is true.
-
-If set to false the client will use the attribute database it retrieved from the peripheral when previously connected.
-
-This allows for faster connections and power saving if the devices dropped connection and are reconnecting.
+The type parameter has been removed and a new bool parameter has been added to indicate if the client should  
+delete the attribute database previously retrieved (if applicable) for the peripheral, default value is true.  
+If set to false the client will use the attribute database it retrieved from the peripheral when previously connected.  
+This allows for faster connections and power saving if the devices dropped connection and are reconnecting.  
 <br/>
 
-> `BLEClient::getServices` (`NimBLEClient::getServices`)
+> `BLEClient::getServices` (`NimBLEClient::getServices`)  
 
-This method now takes an optional (bool) parameter to indicate if the services should be retrieved from the server (true) or the currently known database returned (false : default).
-Also now returns a pointer to `std::vector` instead of `std::map`.
+This method now takes an optional (bool) parameter to indicate if the services should be retrieved from the server (true) or  
+the currently known database returned (false : default).  
+Also now returns a pointer to `std::vector` instead of `std::map`.  
 <br/>
 
-**Removed:** the automatic discovery of all peripheral attributes as they consumed time and resources for data the user may not be interested in.
-
-**Added:** `NimBLEClient::discoverAttributes` for the user to discover all the peripheral attributes to replace the the removed automatic functionality.
+**Removed:** the automatic discovery of all peripheral attributes as they consumed time and resources for data   
+the user may not be interested in.  
+   
+**Added:** `NimBLEClient::discoverAttributes` for the user to discover all the peripheral attributes   
+to replace the the removed automatic functionality.  
 <br/>
 
 <a name="remote-services"></a>
 ### Remote Services
-`BLERemoteService` (`NimBLERemoteService`) Methods remain mostly unchanged with the exceptions of:
+`BLERemoteService` (`NimBLERemoteService`) Methods remain mostly unchanged with the exceptions of:  
 
 > BLERemoteService::getCharacteristicsByHandle
 
-This method has been removed.
+This method has been removed.  
 <br/>
 
-> `BLERemoteService::getCharacteristics` (`NimBLERemoteService::getCharacteristics`)
+> `BLERemoteService::getCharacteristics` (`NimBLERemoteService::getCharacteristics`) 
 
-This method now takes an optional (bool) parameter to indicate if the characteristics should be retrieved from the server (true) or
-the currently known database returned (false : default).
-Also now returns a pointer to `std::vector` instead of `std::map`.
+This method now takes an optional (bool) parameter to indicate if the characteristics should be retrieved from the server (true) or  
+the currently known database returned (false : default).  
+Also now returns a pointer to `std::vector` instead of `std::map`.  
 <br/>
 
 <a name="remote-characteristics"></a>
 ### Remote Characteristics
-`BLERemoteCharacteristic` (`NimBLERemoteCharacteristic`)
- There have been a few changes to the methods in this class:
+`BLERemoteCharacteristic` (`NimBLERemoteCharacteristic`) There have been a few changes to the methods in this class:  
 
-> `BLERemoteCharacteristic::writeValue` (`NimBLERemoteCharacteristic::writeValue`)
-> `BLERemoteCharacteristic::registerForNotify` (`NimBLERemoteCharacteristic::registerForNotify`)
+> `BLERemoteCharacteristic::writeValue` (`NimBLERemoteCharacteristic::writeValue`)  
+> `BLERemoteCharacteristic::registerForNotify` (`NimBLERemoteCharacteristic::registerForNotify`)  
 
-Now return true or false to indicate success or failure so you can choose to disconnect or try again.
+Now return true or false to indicate success or failure so you can choose to disconnect or try again.  
 <br/>
 
-> `BLERemoteCharacteristic::registerForNotify` (`NimBLERemoteCharacteristic::registerForNotify`)
+> `BLERemoteCharacteristic::registerForNotify` (`NimBLERemoteCharacteristic::registerForNotify`)  
 
-Is now **deprecated**.
-> `NimBLERemoteCharacteristic::subscribe`
-> `NimBLERemoteCharacteristic::unsubscribe`
+Is now **deprecated**.  
+> `NimBLERemoteCharacteristic::subscribe`  
+> `NimBLERemoteCharacteristic::unsubscribe`  
 
-Are the new methods added to replace it.
+Are the new methods added to replace it.  
 <br/>
 
-> `BLERemoteCharacteristic::readUInt8` (`NimBLERemoteCharacteristic::readUInt8`)
-> `BLERemoteCharacteristic::readUInt16` (`NimBLERemoteCharacteristic::readUInt16`)
-> `BLERemoteCharacteristic::readUInt32` (`NimBLERemoteCharacteristic::readUInt32`)
-> `BLERemoteCharacteristic::readFloat` (`NimBLERemoteCharacteristic::readFloat`)
+> `BLERemoteCharacteristic::readUInt8` (`NimBLERemoteCharacteristic::readUInt8`)  
+> `BLERemoteCharacteristic::readUInt16` (`NimBLERemoteCharacteristic::readUInt16`)  
+> `BLERemoteCharacteristic::readUInt32` (`NimBLERemoteCharacteristic::readUInt32`)  
+> `BLERemoteCharacteristic::readFloat` (`NimBLERemoteCharacteristic::readFloat`)  
 
-Are **deprecated** a template: `NimBLERemoteCharacteristic::readValue<type\>(time_t\*, bool)` has been added to replace them.
+Are **deprecated** a template: NimBLERemoteCharacteristic::readValue<type\>(time_t\*, bool) has been added to replace them.  
 <br/>
 
-> `BLERemoteCharacteristic::readRawData`
+> `BLERemoteCharacteristic::readRawData`  
 
-**Has been removed from the API**
-Originally it stored an unnecessary copy of the data and was returning a `uint8_t` pointer to volatile internal data.
-The user application should use `NimBLERemoteCharacteristic::readValue` or `NimBLERemoteCharacteristic::getValue`.
-To obtain a copy of the data, then cast the returned std::string to the type required such as:
+**Has been removed from the API**  
+Originally it stored an unnecessary copy of the data and was returning a `uint8_t` pointer to volatile internal data.  
+The user application should use `NimBLERemoteCharacteristic::readValue` or `NimBLERemoteCharacteristic::getValue`.  
+To obatain a copy of the data, then cast the returned std::string to the type required such as:  
 ```
 std::string value = pChr->readValue();
 uint8_t *data = (uint8_t*)value.data();
@@ -307,73 +327,75 @@ Alternatively use the `readValue` template:
 my_struct_t myStruct = pChr->readValue<my_struct_t>();
 ```
 <br/>
+  
+> `BLERemoteCharacteristic::getDescriptors` (`NimBLERemoteCharacteristic::getDescriptors`)      
 
-> `BLERemoteCharacteristic::getDescriptors` (`NimBLERemoteCharacteristic::getDescriptors`)
-
-This method now takes an optional (bool) parameter to indicate if the descriptors should be retrieved from the server (true) or
-the currently known database returned (false : default).
-Also now returns a pointer to `std::vector` instead of `std::map`.
+This method now takes an optional (bool) parameter to indicate if the descriptors should be retrieved from the server (true) or  
+the currently known database returned (false : default).  
+Also now returns a pointer to `std::vector` instead of `std::map`.  
 <br/>
 
 <a name="client-security"></a>
 ### Client Security
-The client will automatically initiate security when the peripheral responds that it's required.
-The default configuration will use "just-works" pairing with no bonding, if you wish to enable bonding see below.
+The client will automatically initiate security when the peripheral responds that it's required.  
+The default configuration will use "just-works" pairing with no bonding, if you wish to enable bonding see below.  
 <br/>
 
 <a name="security-api"></a>
 ## Security API
 Security operations have been moved to `BLEDevice` (`NimBLEDevice`).
 
-Also security callback methods are now incorporated in the `NimBLEServerCallbacks` / `NimBLEClientCallbacks` classes.
-However backward compatibility with the original `BLESecurity` (`NimBLESecurity`) class is retained to minimize application code changes.
+Also security callback methods are now incorporated in the `NimBLEServerCallbacks` / `NimBLEClientCallbacks` classes.   
+However backward compatibility with the original `BLESecurity` (`NimBLESecurity`) class is retained to minimize application code changes.  
 
 The callback methods are:
 
-> `bool onConfirmPIN(uint32_t pin)`
+> `bool onConfirmPIN(uint32_t pin)`  
 
-Receives the pin when using numeric comparison authentication, `return true;` to accept.
+Receives the pin when using numeric comparison authentication, `return true;` to accept.  
 <br/>
 
-> `uint32_t onPassKeyRequest()`
+> `uint32_t onPassKeyRequest()`  
 
-For server callback; return the passkey expected from the client.
-For client callback; return the passkey to send to the server.
+For server callback; return the passkey expected from the client.  
+For client callback; return the passkey to send to the server.  
 <br/>
 
-> `void onAuthenticationComplete(ble_gap_conn_desc\* desc)`
+> `void onAuthenticationComplete(ble_gap_conn_desc\* desc)`  
 
-Authentication complete, success or failed information is in `desc`.
+Authentication complete, success or failed information is in `desc`.  
 <br/>
 
 Security settings and IO capabilities are now set by the following methods of NimBLEDevice.
-> `NimBLEDevice::setSecurityAuth(bool bonding, bool mitm, bool sc)`
-> `NimBLEDevice::setSecurityAuth(uint8_t auth_req)`
+> `NimBLEDevice::setSecurityAuth(bool bonding, bool mitm, bool sc)`  
+> `NimBLEDevice::setSecurityAuth(uint8_t auth_req)`  
 
-Sets the authorization mode for this device.
+Sets the authorization mode for this device.  
 <br/>
 
-> `NimBLEDevice::setSecurityIOCap(uint8_t iocap)`
+> `NimBLEDevice::setSecurityIOCap(uint8_t iocap)`  
 
-Sets the Input/Output capabilities of this device.
+Sets the Input/Output capabilities of this device.  
 <br/>
 
-> `NimBLEDevice::setSecurityInitKey(uint8_t init_key)`
+> `NimBLEDevice::setSecurityInitKey(uint8_t init_key)`  
 
-If we are the initiator of the security procedure this sets the keys we will distribute.
+If we are the initiator of the security procedure this sets the keys we will distribute.  
 <br/>
 
-> `NimBLEDevice::setSecurityRespKey(uint8_t resp_key)`
+> `NimBLEDevice::setSecurityRespKey(uint8_t resp_key)`  
 
-Sets the keys we are willing to accept from the peer during pairing.
+Sets the keys we are willing to accept from the peer during pairing.  
 <br/>
 
 <a name="arduino-configuration"></a>
 ## Arduino Configuration
 
-Unlike the original library pre-packaged in the esp32-arduino, this library has all the configuration options that are normally set in menuconfig available in the *src/nimconfig.h* file.
+Unlike the original library pre-packaged in the esp32-arduino, this library has all the configuration  
+options that are normally set in menuconfig available in the *src/nimconfig.h* file.  
 
-This allows Arduino users to fully customize the build, such as increasing max connections or loading the BLE stack into external PSRAM.
+This allows Arduino users to fully customize the build, such as increasing max connections  
+or loading the BLE stack into external PSRAM.  
 
-For details on the options, they are fully commented in *nimconfig.h*
+For details on the options, they are fully commented in *nimconfig.h*  
 <br/>

docs/New_user_guide.md

@@ -23,7 +23,7 @@ This can be called any time you wish to use BLE functions and does not need to b
 
 <a name="creating-a-server"></a>
 ## Creating a Server
-BLE servers perform 2 tasks, they advertise their existence for clients to find them and they provide services which contain information for the connecting client.  
+BLE servers perform 2 tasks, they advertise their existance for clients to find them and they provide services which contain information for the connecting client.  
 
 After initializing the NimBLE stack we create a server by calling `NimBLEDevice::createServer()`, this will create a server instance and return a pointer to it.  
 
@@ -91,7 +91,7 @@ void app_main(void)
 }
 ```
 
-All that's left to do now is start the service, give the characteristic a value and start advertising for clients.  
+All that's left to do now is start the sevice, give the characteristic a value and start advertising for clients.  
 
 Fist we start the service by calling `NimBLEService::start()`.
 
@@ -214,7 +214,7 @@ for(int i = 0; i < results.getCount(); i++) {
     }
 }
 ```
-As shown, the call to `NimBLEClient::connect` should have it's return value tested to make sure it succeeded before proceeding to get data.  
+As shown, the call to `NimBLEClient::connect` should have it's eturn value tested to make sure it succeeded before proceeding to get data.  
 <br/>
 
 Next we need to access the servers data by asking it for the service and the characteristic we are interested in, then read the characteristic value. 
@@ -222,7 +222,7 @@ Next we need to access the servers data by asking it for the service and the cha
 To do this we call `NimBLEClient::getService`, which takes as a parameter the UUID of the service and returns  
 a pointer an instance to `NimBLERemoteService` or `nullptr` if the service was not found.  
 
-Next we will call `NimBLERemoteService::getCharacteristic` which takes as a parameter the UUID of the service and returns  
+Next we will call `NimBLERemoteService::getCharateristic` which takes as a parameter the UUID of the service and returns  
 a pointer to an instance of `NimBLERemoteCharacteristic` or `nullptr` if not found.  
 
 Finally we will read the characteristic value with `NimBLERemoteCharacteristic::readValue()`.  

docs/Usage_tips.md

@@ -2,7 +2,7 @@
 
 ## Put BLE functions in a task running on the NimBLE stack core
 
-When commands are sent to the stack from a different core they can experience delays in execution.  
+When commands are sent to the stack from a differnt core they can experience delays in execution.  
 This library detects this and invokes the esp32 IPC to reroute these commands through the correct core but this also increases overhead.  
 Therefore it is highly recommended to create tasks for BLE to run on the same core, the macro `CONFIG_BT_NIMBLE_PINNED_TO_CORE` can be used to set the core.
 <br/>  
@@ -13,12 +13,12 @@ When a client instance has been created and has connected to a peer device and i
 If you are periodically connecting to the same devices and you have deleted the client instance or the services when connecting again it will cause a retrieval of that information from the peer again.  
 This results in significant energy drain on the battery of the devices, fragments heap, and reduces connection performance.  
   
-Client instances in this library use approximately 20% of the original bluedroid library, deleting them will provide much less gain than it did before.  
+Client instances in this library use approximately 20% of the original bluedroid library, deleteing them will provide much less gain than it did before.  
 
 It is recommended to retain the client instance in cases where the time between connecting to the same device is less than 5 minutes.  
 <br/>  
 
-## Only retrieve the services and characteristics needed
+## Only retrieve the services and characteriscs needed
 
 As a client the use of `NimBLEClient::getServices` or `NimBLERemoteService::getCharacteristics` and using `true` for the parameter should be limited to devices that are not known.  
 Instead `NimBLEClient::getService(NimBLEUUID)` or `NimBLERemoteService::getCharacteristic(NimBLEUUID)` should be used to access certain attributes that are useful to the application.  

docs/index.md

@@ -13,6 +13,18 @@ NimBLE is a completely open source Bluetooth Low Energy stack produced by [Apach
 It is more suited to resource constrained devices than bluedroid and has now been ported to the ESP32 by Espressif.  
 <br/>
 
+# Arduino Installation
+**Arduino Library manager:** Go to `sketch` -> `Include Library` -> `Manage Libraries` and search for NimBLE and install.  
+
+**Alternatively:** Download as .zip and extract to Arduino/libraries folder, or in Arduino IDE from Sketch menu -> Include library -> Add .Zip library.  
+
+`#include "NimBLEDevice.h"` at the beginning of your sketch.  
+
+Call `NimBLEDevice::init` in `setup`.
+
+Tested and working with esp32-arduino in Arduino IDE and platform IO.  
+<br/>  
+
 # ESP-IDF Installation
 ### v4.0+
 Download as .zip and extract or clone into the components folder in your esp-idf project.
@@ -45,6 +57,21 @@ Also see [Improvements and updates](Improvements_and_updates.md) for information
 For more advanced usage see [Usage tips](Usage_tips.md) for more performance and optimization.  
 <br/>
 
+### Arduino specific
+See the Refactored_original_examples in the examples folder for highlights of the differences with the original library.  
+
+More advanced examples highlighting many available features are in examples/NimBLE_Server, NimBLE_Client.  
+    
+Beacon examples provided by [beegee-tokyo](https://github.com/beegee-tokyo) are in examples/BLE_Beacon_Scanner, BLE_EddystoneTLM_Beacon, BLE_EddystoneURL_Beacon.  
+
+Change the settings in the nimconfig.h file to customize NimBLE to your project, such as increasing max connections (default is 3).  
+<br/>
+
+### Arduino command line and platformio
+As an alternative to changing the configuration in nimconfig.h, Arduino command line and platformio.ini options are available.  
+See the command line configuration options available in [Command line config](Command_line_config.md).  
+<br/>  
+
 # 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/>

examples/Advanced/NimBLE_Server/main/main.cpp

@@ -41,9 +41,6 @@ class ServerCallbacks: public NimBLEServerCallbacks {
         printf("Client disconnected - start advertising\n");
         NimBLEDevice::startAdvertising();
     };
-    void onMTUChange(uint16_t MTU, ble_gap_conn_desc* desc) {
-        printf("MTU updated: %u for connection ID: %u\n", MTU, desc->conn_handle);
-    };
     
 /********************* Security handled here **********************
 ****** Note: these are the same return values as defaults ********/

examples/Bluetooth_5/NimBLE_extended_client/CMakeLists.txt

@@ -1,7 +0,0 @@
-# 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)
-
-include($ENV{IDF_PATH}/tools/cmake/project.cmake)
-set(SUPPORTED_TARGETS esp32c3 esp32s3)
-project(NimBLE_extended_client)

examples/Bluetooth_5/NimBLE_extended_client/Makefile

@@ -1,3 +0,0 @@
-PROJECT_NAME := NimBLE_extended_client
-
-include $(IDF_PATH)/make/project.mk

examples/Bluetooth_5/NimBLE_extended_client/main/CMakeLists.txt

@@ -1,4 +0,0 @@
-set(COMPONENT_SRCS "main.cpp")
-set(COMPONENT_ADD_INCLUDEDIRS ".")
-
-register_component()

examples/Bluetooth_5/NimBLE_extended_client/main/component.mk

@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)

examples/Bluetooth_5/NimBLE_extended_client/main/main.cpp

@@ -1,169 +0,0 @@
-
-/** NimBLE Extended Client Demo:
- *
- *  Demonstrates the Bluetooth 5.x client capabilities.
- *
- *  Created: on April 2 2022
- *      Author: H2zero
- *
-*/
-#include <NimBLEDevice.h>
-
-extern "C" void app_main(void);
-
-void scanEndedCB(NimBLEScanResults results);
-
-#define SERVICE_UUID        "ABCD"
-#define CHARACTERISTIC_UUID "1234"
-
-static NimBLEAdvertisedDevice* advDevice;
-static bool doConnect = false;
-static uint32_t scanTime = 10; /* 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 */ ;
-
-/* Define a class to handle the callbacks for client connection events */
-class ClientCallbacks : public NimBLEClientCallbacks {
-    void onConnect(NimBLEClient* pClient) {
-        printf("Connected\n");
-    };
-
-    void onDisconnect(NimBLEClient* pClient) {
-        printf("%s Disconnected - Starting scan\n", pClient->getPeerAddress().toString().c_str());
-        NimBLEDevice::getScan()->start(scanTime, scanEndedCB);
-    };
-};
-
-
-/* Define a class to handle the callbacks when advertisements are received */
-class AdvertisedDeviceCallbacks: public NimBLEAdvertisedDeviceCallbacks {
-
-    void onResult(NimBLEAdvertisedDevice* advertisedDevice) {
-        printf("Advertised Device found: %s\n", advertisedDevice->toString().c_str());
-        if(advertisedDevice->isAdvertisingService(NimBLEUUID("ABCD")))
-        {
-            printf("Found Our Service\n");
-            /* Ready to connect now */
-            doConnect = true;
-            /* Save the device reference in a global for the client to use*/
-            advDevice = advertisedDevice;
-            /* stop scan before connecting */
-            NimBLEDevice::getScan()->stop();
-        }
-    };
-};
-
-
-/* Callback to process the results of the last scan or restart it */
-void scanEndedCB(NimBLEScanResults results){
-    printf("Scan Ended\n");
-    if (!doConnect) { /* Don't start the scan while connecting */
-        NimBLEDevice::getScan()->start(scanTime, scanEndedCB);
-    }
-}
-
-
-/* Handles the provisioning of clients and connects / interfaces with the server */
-bool connectToServer() {
-    NimBLEClient* pClient = nullptr;
-
-    pClient = NimBLEDevice::createClient();
-    pClient->setClientCallbacks(new ClientCallbacks, false);
-
-    /* Set the PHY's to use for this connection. This is a bitmask that represents the PHY's:
-     * * 0x01 BLE_GAP_LE_PHY_1M_MASK
-     * * 0x02 BLE_GAP_LE_PHY_2M_MASK
-     * * 0x04 BLE_GAP_LE_PHY_CODED_MASK
-     * Combine these with OR ("|"), eg BLE_GAP_LE_PHY_1M_MASK | BLE_GAP_LE_PHY_2M_MASK | BLE_GAP_LE_PHY_CODED_MASK;
-     */
-    pClient->setConnectPhy(connectPhys);
-
-    /** Set how long we are willing to wait for the connection to complete (seconds), default is 30. */
-    pClient->setConnectTimeout(10);
-
-    if (!pClient->connect(advDevice)) {
-        /* Created a client but failed to connect, don't need to keep it as it has no data */
-        NimBLEDevice::deleteClient(pClient);
-        printf("Failed to connect, deleted client\n");
-        return false;
-    }
-
-    printf("Connected to: %s RSSI: %d\n",
-           pClient->getPeerAddress().toString().c_str(),
-           pClient->getRssi());
-
-    /* Now we can read/write/subscribe the charateristics of the services we are interested in */
-    NimBLERemoteService* pSvc = nullptr;
-    NimBLERemoteCharacteristic* pChr = nullptr;
-
-    pSvc = pClient->getService(SERVICE_UUID);
-
-    if (pSvc) {
-        pChr = pSvc->getCharacteristic(CHARACTERISTIC_UUID);
-
-        if (pChr) {
-            // Read the value of the characteristic.
-            if (pChr->canRead()) {
-                std::string value = pChr->readValue();
-                printf("Characteristic value: %s\n", value.c_str());
-            }
-        }
-
-    } else {
-        printf("ABCD service not found.\n");
-    }
-
-    NimBLEDevice::deleteClient(pClient);
-    printf("Done with this device!\n");
-    return true;
-}
-
-void connectTask (void * parameter){
-    /* Loop here until we find a device we want to connect to */
-    for (;;) {
-        if (doConnect) {
-            /* Found a device we want to connect to, do it now */
-            if (connectToServer()) {
-                printf("Success!, scanning for more!\n");
-            } else {
-                printf("Failed to connect, starting scan\n");
-            }
-
-            doConnect = false;
-            NimBLEDevice::getScan()->start(scanTime, scanEndedCB);
-        }
-        vTaskDelay(pdMS_TO_TICKS(10));
-    }
-
-    vTaskDelete(NULL);
-}
-
-void app_main (void) {
-    printf("Starting NimBLE Client\n");
-    /* Create a task to handle connecting to peers */
-    xTaskCreate(connectTask, "connectTask", 5000, NULL, 1, NULL);
-
-    /* Initialize NimBLE, no device name specified as we are not advertising */
-    NimBLEDevice::init("");
-    NimBLEScan* pScan = NimBLEDevice::getScan();
-
-    /* create a callback that gets called when advertisers are found */
-    pScan->setAdvertisedDeviceCallbacks(new AdvertisedDeviceCallbacks());
-
-    /* Set scan interval (how often) and window (how long) in milliseconds */
-    pScan->setInterval(97);
-    pScan->setWindow(67);
-
-    /*  Active scan will gather scan response data from advertisers
-     *  but will use more energy from both devices
-     */
-    pScan->setActiveScan(true);
-
-    /*  Start scanning for advertisers for the scan time specified (in seconds) 0 = forever
-     *  Optional callback for when scanning stops.
-     */
-    pScan->start(scanTime, scanEndedCB);
-
-    printf("Scanning for peripherals\n");
-}

examples/Bluetooth_5/NimBLE_extended_server/CMakeLists.txt

@@ -1,7 +0,0 @@
-# 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)
-
-include($ENV{IDF_PATH}/tools/cmake/project.cmake)
-set(SUPPORTED_TARGETS esp32c3 esp32s3)
-project(NimBLE_extended_server)

examples/Bluetooth_5/NimBLE_extended_server/Makefile

@@ -1,3 +0,0 @@
-PROJECT_NAME := NimBLE_extended_server
-
-include $(IDF_PATH)/make/project.mk

examples/Bluetooth_5/NimBLE_extended_server/main/CMakeLists.txt

@@ -1,4 +0,0 @@
-set(COMPONENT_SRCS "main.cpp")
-set(COMPONENT_ADD_INCLUDEDIRS ".")
-
-register_component()

examples/Bluetooth_5/NimBLE_extended_server/main/component.mk

@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)

examples/Bluetooth_5/NimBLE_extended_server/main/main.cpp

@@ -1,139 +0,0 @@
-/** NimBLE Extended Server Demo:
- *
- *  Demonstrates the Bluetooth 5.x extended advertising capabilities.
- *
- *  This demo will advertise a long data string on the CODED and 1M Phy's and
- *  starts a server allowing connection over either PHY's. It will advertise for
- *  5 seconds then sleep for 20 seconds, if a client connects it will sleep once
- *  it has disconnected then repeats.
- *
- *  Created: on April 2 2022
- *      Author: H2zero
- *
-*/
-
-#include "NimBLEDevice.h"
-#include "esp_sleep.h"
-
-extern "C" void app_main(void);
-
-#define SERVICE_UUID        "ABCD"
-#define CHARACTERISTIC_UUID "1234"
-
-/* Time in milliseconds to advertise */
-static uint32_t advTime = 5000;
-
-/* Time to sleep between advertisements */
-static uint32_t sleepSeconds = 20;
-
-/* Primary PHY used for advertising, can be one of BLE_HCI_LE_PHY_1M or BLE_HCI_LE_PHY_CODED */
-static uint8_t primaryPhy = BLE_HCI_LE_PHY_CODED;
-
-/* Secondary PHY used for advertising and connecting,
- * can be one of BLE_HCI_LE_PHY_1M, BLE_HCI_LE_PHY_2M or BLE_HCI_LE_PHY_CODED
- */
-static uint8_t secondaryPhy = BLE_HCI_LE_PHY_1M;
-
-
-/* Handler class for server events */
-class ServerCallbacks: public NimBLEServerCallbacks {
-    void onConnect(NimBLEServer* pServer, ble_gap_conn_desc* desc) {
-        printf("Client connected: %s\n", NimBLEAddress(desc->peer_ota_addr).toString().c_str());
-    };
-
-    void onDisconnect(NimBLEServer* pServer) {
-        printf("Client disconnected - sleeping for %u seconds\n", sleepSeconds);
-        esp_deep_sleep_start();
-    };
-};
-
-/* Callback class to handle advertising events */
-class advertisingCallbacks: public NimBLEExtAdvertisingCallbacks {
-    void onStopped(NimBLEExtAdvertising* pAdv, int reason, uint8_t inst_id) {
-        /* Check the reason advertising stopped, don't sleep if client is connecting */
-        printf("Advertising instance %u stopped\n", inst_id);
-        switch (reason) {
-            case 0:
-                printf("Client connecting\n");
-                return;
-            case BLE_HS_ETIMEOUT:
-                printf("Time expired - sleeping for %u seconds\n", sleepSeconds);
-                break;
-            default:
-                break;
-        }
-
-        esp_deep_sleep_start();
-    }
-};
-
-void app_main (void) {
-    NimBLEDevice::init("Extended advertiser");
-
-    /* Create the server and add the services/characteristics/descriptors */
-    NimBLEServer *pServer = NimBLEDevice::createServer();
-    pServer->setCallbacks(new ServerCallbacks);
-
-    NimBLEService *pService = pServer->createService(SERVICE_UUID);
-    NimBLECharacteristic *pCharacteristic = pService->createCharacteristic(CHARACTERISTIC_UUID,
-                                                                           NIMBLE_PROPERTY::READ |
-                                                                           NIMBLE_PROPERTY::WRITE |
-                                                                           NIMBLE_PROPERTY::NOTIFY);
-
-    pCharacteristic->setValue("Hello World");
-
-    /* Start the services */
-    pService->start();
-
-    /*
-    * Create an extended advertisement with the instance ID 0 and set the PHY's.
-    * Multiple instances can be added as long as the instance ID is incremented.
-    */
-    NimBLEExtAdvertisement extAdv(primaryPhy, secondaryPhy);
-
-    /* Set the advertisement as connectable */
-    extAdv.setConnectable(true);
-
-    /* As per Bluetooth specification, extended advertising cannot be both scannable and connectable */
-    extAdv.setScannable(false); // The default is false, set here for demonstration.
-
-    /* Extended advertising allows for 251 bytes (minus header bytes ~20) in a single advertisement or up to 1650 if chained */
-    extAdv.setServiceData(NimBLEUUID(SERVICE_UUID), std::string("Extended Advertising Demo.\r\n"
-                                                                "Extended advertising allows for "
-                                                                "251 bytes of data in a single advertisement,\r\n"
-                                                                "or up to 1650 bytes with chaining.\r\n"
-                                                                "This example message is 226 bytes long "
-                                                                "and is using CODED_PHY for long range."));
-
-    extAdv.setCompleteServices16({NimBLEUUID(SERVICE_UUID)});
-
-    /* When extended advertising is enabled `NimBLEDevice::getAdvertising` returns a pointer to `NimBLEExtAdvertising */
-    NimBLEExtAdvertising* pAdvertising = NimBLEDevice::getAdvertising();
-
-    /* Set the callbacks for advertising events */
-    pAdvertising->setCallbacks(new advertisingCallbacks);
-
-    /*
-     * NimBLEExtAdvertising::setInstanceData takes the instance ID and
-     * a reference to a `NimBLEExtAdvertisement` object. This sets the data
-     * that will be advertised for this instance ID, returns true if successful.
-     *
-     * Note: It is safe to create the advertisement as a local variable if setInstanceData
-     * is called before exiting the code block as the data will be copied.
-     */
-    if (pAdvertising->setInstanceData(0, extAdv)) {
-        /*
-         * `NimBLEExtAdvertising::start` takes the advertisement instance ID to start
-         * and a duration in milliseconds or a max number of advertisements to send (or both).
-         */
-        if (pAdvertising->start(0, advTime)) {
-            printf("Started advertising\n");
-        } else {
-            printf("Failed to start advertising\n");
-        }
-    } else {
-        printf("Failed to register advertisment data\n");
-    }
-
-    esp_sleep_enable_timer_wakeup(sleepSeconds * 1000000);
-}

examples/Bluetooth_5/NimBLE_multi_advertiser/CMakeLists.txt

@@ -1,7 +0,0 @@
-# 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)
-
-include($ENV{IDF_PATH}/tools/cmake/project.cmake)
-set(SUPPORTED_TARGETS esp32c3 esp32s3)
-project(NimBLE_multi_advertiser)

examples/Bluetooth_5/NimBLE_multi_advertiser/Makefile

@@ -1,3 +0,0 @@
-PROJECT_NAME := NimBLE_multi_advertiser
-
-include $(IDF_PATH)/make/project.mk

examples/Bluetooth_5/NimBLE_multi_advertiser/main/CMakeLists.txt

@@ -1,4 +0,0 @@
-set(COMPONENT_SRCS "main.cpp")
-set(COMPONENT_ADD_INCLUDEDIRS ".")
-
-register_component()

examples/Bluetooth_5/NimBLE_multi_advertiser/main/component.mk

@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)

examples/Bluetooth_5/NimBLE_multi_advertiser/main/main.cpp

@@ -1,170 +0,0 @@
-/** NimBLE Multi Advertiser Demo:
- *
- *  Demonstrates the Bluetooth 5.x extended advertising capabilities.
- *
- *  This demo will advertise 2 advertisements, and extended scannable instance
- *  and a connectable legacy instance. They will advertise for 5 seconds then
- *  sleep for 20 seconds. The extended scannable instance will use the scan
- *  request callback to update it's data when a scan response is requested.
- *
- *  Created: on April 9 2022
- *      Author: H2zero
- *
-*/
-
-#include "NimBLEDevice.h"
-#include "esp_sleep.h"
-
-extern "C" void app_main(void);
-
-#define SERVICE_UUID        "ABCD"
-#define CHARACTERISTIC_UUID "1234"
-
-/* Time in milliseconds to advertise */
-static uint32_t advTime = 5000;
-
-/* Time to sleep between advertisements */
-static uint32_t sleepTime = 20;
-
-/* Primary PHY used for advertising, can be one of BLE_HCI_LE_PHY_1M or BLE_HCI_LE_PHY_CODED */
-static uint8_t primaryPhy = BLE_HCI_LE_PHY_CODED;
-
-/* Secondary PHY used for advertising and connecting,
- * can be one of BLE_HCI_LE_PHY_1M, BLE_HCI_LE_PHY_2M or BLE_HCI_LE_PHY_CODED
- */
-static uint8_t secondaryPhy = BLE_HCI_LE_PHY_1M;
-
-
-/* Handler class for server events */
-class ServerCallbacks: public NimBLEServerCallbacks {
-    void onConnect(NimBLEServer* pServer, ble_gap_conn_desc* desc) {
-        printf("Client connected: %s\n", NimBLEAddress(desc->peer_ota_addr).toString().c_str());
-    };
-
-    void onDisconnect(NimBLEServer* pServer) {
-        printf("Client disconnected\n");
-        // if still advertising we won't sleep yet.
-        if (!pServer->getAdvertising()->isAdvertising()) {
-            printf("Sleeping for %u seconds\n", sleepTime);
-            esp_deep_sleep_start();
-        }
-    };
-};
-
-/* Callback class to handle advertising events */
-class advCallbacks: public NimBLEExtAdvertisingCallbacks {
-    void onStopped(NimBLEExtAdvertising* pAdv, int reason, uint8_t inst_id) {
-        /* Check the reason advertising stopped, don't sleep if client is connecting */
-        printf("Advertising instance %u stopped\n", inst_id);
-        switch (reason) {
-            case 0:
-                printf(" client connecting\n");
-                return;
-            case BLE_HS_ETIMEOUT:
-                printf("Time expired - sleeping for %u seconds\n", sleepTime);
-                break;
-            default:
-                break;
-        }
-
-        esp_deep_sleep_start();
-    }
-
-    bool m_updatedSR = false;
-
-    void onScanRequest(NimBLEExtAdvertising* pAdv, uint8_t inst_id, NimBLEAddress addr) {
-        printf("Scan request for instance %u\n", inst_id);
-        // if the data has already been updated we don't need to change it again.
-        if (!m_updatedSR) {
-            printf("Updating scan data\n");
-            NimBLEExtAdvertisement sr;
-            sr.setServiceData(NimBLEUUID(SERVICE_UUID), std::string("Hello from scan response!"));
-            pAdv->setScanResponseData(inst_id, sr);
-            m_updatedSR = true;
-        }
-    }
-};
-
-void app_main (void) {
-    NimBLEDevice::init("Multi advertiser");
-
-    /* Create a server for our legacy advertiser */
-    NimBLEServer *pServer = NimBLEDevice::createServer();
-    pServer->setCallbacks(new ServerCallbacks);
-
-    NimBLEService *pService = pServer->createService(SERVICE_UUID);
-    NimBLECharacteristic *pCharacteristic = pService->createCharacteristic(CHARACTERISTIC_UUID,
-                                                                           NIMBLE_PROPERTY::READ |
-                                                                           NIMBLE_PROPERTY::WRITE |
-                                                                           NIMBLE_PROPERTY::NOTIFY);
-
-    pCharacteristic->setValue("Hello World");
-
-    /* Start the service */
-    pService->start();
-
-    /* Create our multi advertising instances */
-
-    // extended scannable instance advertising on coded and 1m PHY's.
-    NimBLEExtAdvertisement extScannable(primaryPhy, secondaryPhy);
-
-    // Legacy advertising as a connectable device.
-    NimBLEExtAdvertisement legacyConnectable;
-
-    // Optional scan response data.
-    NimBLEExtAdvertisement legacyScanResponse;
-
-    /* As per Bluetooth specification, extended advertising cannot be both scannable and connectable */
-    extScannable.setScannable(true);
-    extScannable.setConnectable(false);
-
-    /* Set the initial data */
-    extScannable.setServiceData(NimBLEUUID(SERVICE_UUID), std::string("Scan me!"));
-
-    /* enable the scan response callback, we will use this to update the data. */
-    extScannable.enableScanRequestCallback(true);
-
-    /* Optional custom address for this advertisment. */
-    legacyConnectable.setAddress(NimBLEAddress("DE:AD:BE:EF:BA:AD"));
-
-    /* Set the advertising data. */
-    legacyConnectable.setName("Legacy");
-    legacyConnectable.setCompleteServices16({NimBLEUUID(SERVICE_UUID)});
-
-    /* Set the legacy and connectable flags. */
-    legacyConnectable.setLegacyAdvertising(true);
-    legacyConnectable.setConnectable(true);
-
-    /* Put some data in the scan response if desired. */
-    legacyScanResponse.setServiceData(NimBLEUUID(SERVICE_UUID), "Legacy SR");
-
-    /* Get the advertising ready */
-    NimBLEExtAdvertising* pAdvertising = NimBLEDevice::getAdvertising();
-
-    /* Set the callbacks to handle advertising events */
-    pAdvertising->setCallbacks(new advCallbacks);
-
-    /* Set instance data.
-     * Up to 5 instances can be used if configured in menuconfig, instance 0 is always available.
-     *
-     * We will set the extended scannable data on instance 0 and the legacy data on instance 1.
-     * Note that the legacy scan response data needs to be set to the same instance (1).
-     */
-    if (pAdvertising->setInstanceData( 0, extScannable )  &&
-        pAdvertising->setInstanceData( 1, legacyConnectable ) &&
-        pAdvertising->setScanResponseData( 1, legacyScanResponse )) {
-        /*
-         * `NimBLEExtAdvertising::start` takes the advertisement instance ID to start
-         * and a duration in milliseconds or a max number of advertisements to send (or both).
-         */
-        if (pAdvertising->start(0, advTime) && pAdvertising->start(1, advTime)) {
-            printf("Started advertising\n");
-        } else {
-            printf("Failed to start advertising\n");
-        }
-    } else {
-        printf("Failed to register advertisment data\n");
-    }
-
-    esp_sleep_enable_timer_wakeup(sleepTime * 1000000);
-}

src/FreeRTOS.cpp

@@ -0,0 +1,316 @@
+/*
+ * FreeRTOS.cpp
+ *
+ *  Created on: Feb 24, 2017
+ *      Author: kolban
+ */
+#include "sdkconfig.h"
+#include "FreeRTOS.h"
+#include "NimBLELog.h"
+
+#include <freertos/FreeRTOS.h>   // Include the base FreeRTOS definitions
+#include <freertos/task.h>       // Include the task definitions
+#include <freertos/semphr.h>     // Include the semaphore definitions
+#include <string>
+
+static const char* LOG_TAG = "FreeRTOS";
+
+
+/**
+ * Sleep for the specified number of milliseconds.
+ * @param[in] ms The period in milliseconds for which to sleep.
+ */
+void FreeRTOS::sleep(uint32_t ms) {
+    ::vTaskDelay(ms / portTICK_PERIOD_MS);
+} // sleep
+
+
+/**
+ * Start a new task.
+ * @param[in] task The function pointer to the function to be run in the task.
+ * @param[in] taskName A string identifier for the task.
+ * @param[in] param An optional parameter to be passed to the started task.
+ * @param[in] stackSize An optional paremeter supplying the size of the stack in which to run the task.
+ */
+void FreeRTOS::startTask(void task(void*), std::string taskName, void* param, uint32_t stackSize) {
+    ::xTaskCreate(task, taskName.data(), stackSize, param, 5, NULL);
+} // startTask
+
+
+/**
+ * Delete the task.
+ * @param[in] pTask An optional handle to the task to be deleted.  If not supplied the calling task will be deleted.
+ */
+void FreeRTOS::deleteTask(TaskHandle_t pTask) {
+    ::vTaskDelete(pTask);
+} // deleteTask
+
+
+/**
+ * Get the time in milliseconds since the %FreeRTOS scheduler started.
+ * @return The time in milliseconds since the %FreeRTOS scheduler started.
+ */
+uint32_t FreeRTOS::getTimeSinceStart() {
+    return (uint32_t) (xTaskGetTickCount() * portTICK_PERIOD_MS);
+} // getTimeSinceStart
+
+
+/**
+ * @brief Wait for a semaphore to be released by trying to take it and
+ * then releasing it again.
+ * @param [in] owner A debug tag.
+ * @return The value associated with the semaphore.
+ */
+uint32_t FreeRTOS::Semaphore::wait(std::string owner) {
+    NIMBLE_LOGD(LOG_TAG, ">> wait: Semaphore waiting: %s for %s", toString().c_str(), owner.c_str());
+
+    if (m_usePthreads) {
+        pthread_mutex_lock(&m_pthread_mutex);
+    } else {
+        xSemaphoreTake(m_semaphore, portMAX_DELAY);
+    }
+
+    if (m_usePthreads) {
+        pthread_mutex_unlock(&m_pthread_mutex);
+    } else {
+        xSemaphoreGive(m_semaphore);
+    }
+
+    NIMBLE_LOGD(LOG_TAG, "<< wait: Semaphore released: %s", toString().c_str());
+    return m_value;
+} // wait
+
+
+/**
+ * @brief Wait for a semaphore to be released in a given period of time by trying to take it and
+ * then releasing it again. The value associated with the semaphore can be taken by value() call after return
+ * @param [in] owner A debug tag.
+ * @param [in] timeoutMs timeout to wait in ms.
+ * @return True if we took the semaphore within timeframe.
+ */
+bool FreeRTOS::Semaphore::timedWait(std::string owner, uint32_t timeoutMs) {
+    NIMBLE_LOGD(LOG_TAG, ">> wait: Semaphore waiting: %s for %s", toString().c_str(), owner.c_str());
+
+    if (m_usePthreads && timeoutMs != portMAX_DELAY) {
+        assert(false);  // We apparently don't have a timed wait for pthreads.
+    }
+
+    auto ret = pdTRUE;
+
+    if (m_usePthreads) {
+        pthread_mutex_lock(&m_pthread_mutex);
+    } else {
+        ret = xSemaphoreTake(m_semaphore, timeoutMs);
+    }
+
+    if (m_usePthreads) {
+        pthread_mutex_unlock(&m_pthread_mutex);
+    } else {
+        xSemaphoreGive(m_semaphore);
+    }
+
+    NIMBLE_LOGD(LOG_TAG, "<< wait: Semaphore %s released: %d", toString().c_str(), ret);
+    return ret;
+} // wait
+
+
+/**
+ * @brief Construct a semaphore, the semaphore is given when created.
+ * @param [in] name A name string to provide debugging support.
+ */
+FreeRTOS::Semaphore::Semaphore(std::string name) {
+    m_usePthreads = false;      // Are we using pThreads or FreeRTOS?
+    if (m_usePthreads) {
+        pthread_mutex_init(&m_pthread_mutex, nullptr);
+    } else {
+        //m_semaphore = xSemaphoreCreateMutex();
+        m_semaphore = xSemaphoreCreateBinary();
+        xSemaphoreGive(m_semaphore);
+    }
+
+    m_name      = name;
+    m_owner     = std::string("<N/A>");
+    m_value     = 0;
+}
+
+
+FreeRTOS::Semaphore::~Semaphore() {
+    if (m_usePthreads) {
+        pthread_mutex_destroy(&m_pthread_mutex);
+    } else {
+        vSemaphoreDelete(m_semaphore);
+    }
+}
+
+
+/**
+ * @brief Give the semaphore.
+ */
+void FreeRTOS::Semaphore::give() {
+    NIMBLE_LOGD(LOG_TAG, "Semaphore giving: %s", toString().c_str());
+    m_owner = std::string("<N/A>");
+
+    if (m_usePthreads) {
+        pthread_mutex_unlock(&m_pthread_mutex);
+    } else {
+        xSemaphoreGive(m_semaphore);
+    }
+// #if defined(ARDUINO_ARCH_ESP32) && !defined(DONT_USE_ARDUINO_BULLSHIT)
+//  FreeRTOS::sleep(10);
+// #endif
+
+} // Semaphore::give
+
+
+/**
+ * @brief Give a semaphore.
+ * The Semaphore is given with an associated value.
+ * @param [in] value The value to associate with the semaphore.
+ */
+void FreeRTOS::Semaphore::give(uint32_t value) {
+    m_value = value;
+    give();
+} // give
+
+
+/**
+ * @brief Give a semaphore from an ISR.
+ */
+void FreeRTOS::Semaphore::giveFromISR() {
+    BaseType_t higherPriorityTaskWoken;
+    if (m_usePthreads) {
+        assert(false);
+    } else {
+        xSemaphoreGiveFromISR(m_semaphore, &higherPriorityTaskWoken);
+    }
+} // giveFromISR
+
+
+/**
+ * @brief Take a semaphore.
+ * Take a semaphore and wait indefinitely.
+ * @param [in] owner The new owner (for debugging)
+ * @return True if we took the semaphore.
+ */
+bool FreeRTOS::Semaphore::take(std::string owner) {
+    NIMBLE_LOGD(LOG_TAG, "Semaphore taking: %s for %s", toString().c_str(), owner.c_str());
+    bool rc = false;
+    if (m_usePthreads) {
+        pthread_mutex_lock(&m_pthread_mutex);
+    } else {
+        rc = ::xSemaphoreTake(m_semaphore, portMAX_DELAY) == pdTRUE;
+    }
+    m_owner = owner;
+    if (rc) {
+        NIMBLE_LOGD(LOG_TAG, "Semaphore taken:  %s", toString().c_str());
+    } else {
+        NIMBLE_LOGE(LOG_TAG, "Semaphore NOT taken:  %s", toString().c_str());
+    }
+    return rc;
+} // Semaphore::take
+
+
+/**
+ * @brief Take a semaphore.
+ * Take a semaphore but return if we haven't obtained it in the given period of milliseconds.
+ * @param [in] timeoutMs Timeout in milliseconds.
+ * @param [in] owner The new owner (for debugging)
+ * @return True if we took the semaphore.
+ */
+bool FreeRTOS::Semaphore::take(uint32_t timeoutMs, std::string owner) {
+    NIMBLE_LOGD(LOG_TAG, "Semaphore taking: %s for %s", toString().c_str(), owner.c_str());
+    bool rc = false;
+    if (m_usePthreads) {
+        assert(false);  // We apparently don't have a timed wait for pthreads.
+    } else {
+        rc = ::xSemaphoreTake(m_semaphore, timeoutMs / portTICK_PERIOD_MS) == pdTRUE;
+    }
+    m_owner = owner;
+    if (rc) {
+        NIMBLE_LOGD(LOG_TAG, "Semaphore taken:  %s", toString().c_str());
+    } else {
+        NIMBLE_LOGE(LOG_TAG, "Semaphore NOT taken:  %s", toString().c_str());
+    }
+    return rc;
+} // Semaphore::take
+
+
+
+/**
+ * @brief Create a string representation of the semaphore.
+ * @return A string representation of the semaphore.
+ */
+std::string FreeRTOS::Semaphore::toString() {
+    char hex[9];
+    std::string res = "name: " + m_name + " (0x";
+    snprintf(hex, sizeof(hex), "%08lx", (uint32_t)m_semaphore);
+    res += hex;
+    res += "), owner: " + m_owner;
+    return res;
+} // toString
+
+
+/**
+ * @brief Set the name of the semaphore.
+ * @param [in] name The name of the semaphore.
+ */
+void FreeRTOS::Semaphore::setName(std::string name) {
+    m_name = name;
+} // setName
+
+
+/**
+ * @brief Create a ring buffer.
+ * @param [in] length The amount of storage to allocate for the ring buffer.
+ * @param [in] type The type of buffer.  One of RINGBUF_TYPE_NOSPLIT, RINGBUF_TYPE_ALLOWSPLIT, RINGBUF_TYPE_BYTEBUF.
+ */
+#ifdef ESP_IDF_VERSION //Quick hack to detect if using IDF version that replaced ringbuf_type_t
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 0, 0)
+    Ringbuffer::Ringbuffer(size_t length, RingbufferType_t type) {
+#else
+    Ringbuffer::Ringbuffer(size_t length, ringbuf_type_t type) {
+#endif
+#else
+    Ringbuffer::Ringbuffer(size_t length, ringbuf_type_t type) {
+#endif
+    m_handle = ::xRingbufferCreate(length, type);
+} // Ringbuffer
+
+
+Ringbuffer::~Ringbuffer() {
+    ::vRingbufferDelete(m_handle);
+} // ~Ringbuffer
+
+
+/**
+ * @brief Receive data from the buffer.
+ * @param [out] size On return, the size of data returned.
+ * @param [in] wait How long to wait.
+ * @return A pointer to the storage retrieved.
+ */
+void* Ringbuffer::receive(size_t* size, TickType_t wait) {
+    return ::xRingbufferReceive(m_handle, size, wait);
+} // receive
+
+
+/**
+ * @brief Return an item.
+ * @param [in] item The item to be returned/released.
+ */
+void Ringbuffer::returnItem(void* item) {
+    ::vRingbufferReturnItem(m_handle, item);
+} // returnItem
+
+
+/**
+ * @brief Send data to the buffer.
+ * @param [in] data The data to place into the buffer.
+ * @param [in] length The length of data to place into the buffer.
+ * @param [in] wait How long to wait before giving up.  The default is to wait indefinitely.
+ * @return
+ */
+bool Ringbuffer::send(void* data, size_t length, TickType_t wait) {
+    return ::xRingbufferSend(m_handle, data, length, wait) == pdTRUE;
+} // send
+
+

src/FreeRTOS.h

@@ -0,0 +1,89 @@
+/*
+ * FreeRTOS.h
+ *
+ *  Created on: Feb 24, 2017
+ *      Author: kolban
+ */
+
+#ifndef MAIN_FREERTOS_H_
+#define MAIN_FREERTOS_H_
+
+#include <freertos/FreeRTOS.h>   // Include the base FreeRTOS definitions.
+#include <freertos/task.h>       // Include the task definitions.
+#include <freertos/semphr.h>     // Include the semaphore definitions.
+#include <freertos/ringbuf.h>    // Include the ringbuffer definitions.
+
+#include <stdint.h>
+#include <string>
+#include <pthread.h>
+
+
+/**
+ * @brief Interface to %FreeRTOS functions.
+ */
+class FreeRTOS {
+public:
+    static void sleep(uint32_t ms);
+    static void startTask(void task(void*), std::string taskName, void* param = nullptr, uint32_t stackSize = 2048);
+    static void deleteTask(TaskHandle_t pTask = nullptr);
+
+    static uint32_t getTimeSinceStart();
+
+/**
+ * @brief A binary semaphore class that operates like a mutex, it is already given when constructed.
+ */
+    class Semaphore {
+    public:
+        Semaphore(std::string owner = "<Unknown>");
+        ~Semaphore();
+        void        give();
+        void        give(uint32_t value);
+        void        giveFromISR();
+        void        setName(std::string name);
+        bool        take(std::string owner = "<Unknown>");
+        bool        take(uint32_t timeoutMs, std::string owner = "<Unknown>");
+        std::string toString();
+        bool        timedWait(std::string owner = "<Unknown>", uint32_t timeoutMs = portMAX_DELAY);
+        uint32_t    wait(std::string owner = "<Unknown>");
+        /**
+         * @brief Get the value of the semaphore.
+         * @return The value stored if the semaphore was given with give(value);
+         */
+        uint32_t    value(){ return m_value; };
+
+    private:
+        SemaphoreHandle_t m_semaphore;
+        pthread_mutex_t   m_pthread_mutex;
+        std::string       m_name;
+        std::string       m_owner;
+        uint32_t          m_value;
+        bool              m_usePthreads;
+
+    };
+};
+
+
+/**
+ * @brief A wrapper class for a freeRTOS ringbuffer.
+ */
+class Ringbuffer {
+public:
+#ifdef ESP_IDF_VERSION //Quick hack to detect if using IDF version that replaced ringbuf_type_t
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 0, 0)
+    Ringbuffer(size_t length, RingbufferType_t type = RINGBUF_TYPE_NOSPLIT);
+#else
+    Ringbuffer(size_t length, ringbuf_type_t type = RINGBUF_TYPE_NOSPLIT);
+#endif
+#else
+    Ringbuffer(size_t length, ringbuf_type_t type = RINGBUF_TYPE_NOSPLIT);
+#endif
+    ~Ringbuffer();
+
+    void*    receive(size_t* size, TickType_t wait = portMAX_DELAY);
+    void     returnItem(void* item);
+    bool     send(void* data, size_t length, TickType_t wait = portMAX_DELAY);
+private:
+    RingbufHandle_t m_handle;
+};
+
+#endif /* MAIN_FREERTOS_H_ */

src/HIDTypes.h

@@ -45,8 +45,13 @@
 /* of data as per HID Class standard */
 
 /* Main items */
-#define HIDINPUT(size)          (0x80 | size)
-#define HIDOUTPUT(size)         (0x90 | size)
+#if defined(ARDUINO_ARCH_ESP32) && !defined(DONT_USE_ARDUINO_BULLSHIT)
+#define HIDINPUT(size)             (0x80 | size)
+#define HIDOUTPUT(size)            (0x90 | size)
+#else
+#define INPUT(size)             (0x80 | size)
+#define OUTPUT(size)            (0x90 | size)
+#endif
 #define FEATURE(size)           (0xb0 | size)
 #define COLLECTION(size)        (0xa0 | size)
 #define END_COLLECTION(size)    (0xc0 | size)

src/NimBLE2904.cpp

@@ -16,17 +16,20 @@
  * See also:
  * https://www.bluetooth.com/specifications/gatt/viewer?attributeXmlFile=org.bluetooth.descriptor.gatt.characteristic_presentation_format.xml
  */
+#include "sdkconfig.h"
+#if defined(CONFIG_BT_ENABLED)
+
 #include "nimconfig.h"
-#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
+#if defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
 
 #include "NimBLE2904.h"
 
 
-NimBLE2904::NimBLE2904(NimBLECharacteristic* pCharacteristic)
+NimBLE2904::NimBLE2904(NimBLECharacteristic* pCharacterisitic)
 : NimBLEDescriptor(NimBLEUUID((uint16_t) 0x2904),
                             BLE_GATT_CHR_F_READ,
                             sizeof(BLE2904_Data),
-                            pCharacteristic)
+                            pCharacterisitic)
 {
     m_data.m_format      = 0;
     m_data.m_exponent    = 0;
@@ -83,4 +86,5 @@ void NimBLE2904::setUnit(uint16_t unit) {
     setValue((uint8_t*) &m_data, sizeof(m_data));
 } // setUnit
 
-#endif /* CONFIG_BT_ENABLED && CONFIG_BT_NIMBLE_ROLE_PERIPHERAL */
+#endif // #if defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
+#endif

src/NimBLE2904.h

@@ -14,8 +14,11 @@
 
 #ifndef MAIN_NIMBLE2904_H_
 #define MAIN_NIMBLE2904_H_
+#include "sdkconfig.h"
+#if defined(CONFIG_BT_ENABLED)
+
 #include "nimconfig.h"
-#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
+#if defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
 
 #include "NimBLEDescriptor.h"
 
@@ -79,5 +82,6 @@ private:
     BLE2904_Data m_data;
 }; // BLE2904
 
-#endif /* CONFIG_BT_ENABLED && CONFIG_BT_NIMBLE_ROLE_PERIPHERAL */
+#endif // #if defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
+#endif /* CONFIG_BT_ENABLED */
 #endif /* MAIN_NIMBLE2904_H_ */

src/NimBLEAddress.cpp

@@ -11,8 +11,8 @@
  *  Created on: Jul 2, 2017
  *      Author: kolban
  */
-#include "nimconfig.h"
-#if defined(CONFIG_BT_ENABLED)
+#include "sdkconfig.h"
+#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_NIMBLE_ENABLED)
 
 #include <algorithm>
 
@@ -156,7 +156,7 @@ std::string NimBLEAddress::toString() const {
 
 
 /**
- * @brief Convenience operator to check if this address is equal to another.
+ * @brief Convienience operator to check if this address is equal to another.
  */
 bool NimBLEAddress::operator ==(const NimBLEAddress & rhs) const {
     return memcmp(rhs.m_address, m_address, sizeof m_address) == 0;
@@ -164,7 +164,7 @@ bool NimBLEAddress::operator ==(const NimBLEAddress & rhs) const {
 
 
 /**
- * @brief Convenience operator to check if this address is not equal to another.
+ * @brief Convienience operator to check if this address is not equal to another.
  */
 bool NimBLEAddress::operator !=(const NimBLEAddress & rhs) const {
     return !this->operator==(rhs);
@@ -186,7 +186,7 @@ NimBLEAddress::operator std::string() const {
 
 
 /**
- * @brief Convenience operator to convert the native address representation to uint_64.
+ * @brief Convienience operator to convert the native address representation to uint_64.
  */
 NimBLEAddress::operator uint64_t() const {
     uint64_t address = 0;

src/NimBLEAddress.h

@@ -14,15 +14,10 @@
 
 #ifndef COMPONENTS_NIMBLEADDRESS_H_
 #define COMPONENTS_NIMBLEADDRESS_H_
-#include "nimconfig.h"
-#if defined(CONFIG_BT_ENABLED)
+#include "sdkconfig.h"
+#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_NIMBLE_ENABLED)
 
-#if defined(CONFIG_NIMBLE_CPP_IDF)
 #include "nimble/ble.h"
-#else
-#include "nimble/nimble/include/nimble/ble.h"
-#endif
-
 /****  FIX COMPILATION ****/
 #undef min
 #undef max

src/NimBLEAdvertisedDevice.cpp

@@ -11,17 +11,17 @@
  *  Created on: Jul 3, 2017
  *      Author: kolban
  */
+#include "sdkconfig.h"
+#if defined(CONFIG_BT_ENABLED)
 
 #include "nimconfig.h"
-#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_OBSERVER)
+#if defined(CONFIG_BT_NIMBLE_ROLE_OBSERVER)
 
 #include "NimBLEDevice.h"
 #include "NimBLEAdvertisedDevice.h"
 #include "NimBLEUtils.h"
 #include "NimBLELog.h"
 
-#include <climits>
-
 static const char* LOG_TAG = "NimBLEAdvertisedDevice";
 
 
@@ -52,9 +52,9 @@ NimBLEAddress NimBLEAdvertisedDevice::getAddress() {
  * @brief Get the advertisement type.
  * @return The advertising type the device is reporting:
  * * BLE_HCI_ADV_TYPE_ADV_IND            (0) - indirect advertising
- * * BLE_HCI_ADV_TYPE_ADV_DIRECT_IND_HD  (1) - direct advertising - high duty cycle
+ * * BLE_HCI_ADV_TYPE_ADV_DIRECT_IND_HD  (1) - direct advertisng - high duty cycle
  * * BLE_HCI_ADV_TYPE_ADV_SCAN_IND       (2) - indirect scan response
- * * BLE_HCI_ADV_TYPE_ADV_NONCONN_IND    (3) - indirect advertising - not connectable
+ * * BLE_HCI_ADV_TYPE_ADV_NONCONN_IND    (3) - indirect advertisng - not connectable
  * * BLE_HCI_ADV_TYPE_ADV_DIRECT_IND_LD  (4) - direct advertising - low duty cycle
  */
 uint8_t NimBLEAdvertisedDevice::getAdvType() {
@@ -66,12 +66,12 @@ uint8_t NimBLEAdvertisedDevice::getAdvType() {
  * @brief Get the appearance.
  *
  * A %BLE device can declare its own appearance.  The appearance is how it would like to be shown to an end user
- * typically in the form of an icon.
+ * typcially in the form of an icon.
  *
  * @return The appearance of the advertised device.
  */
 uint16_t NimBLEAdvertisedDevice::getAppearance() {
-    size_t data_loc = 0;
+    uint8_t data_loc = 0;
 
     if(findAdvField(BLE_HS_ADV_TYPE_APPEARANCE, 0, &data_loc) > 0) {
         ble_hs_adv_field *field = (ble_hs_adv_field *)&m_payload[data_loc];
@@ -89,7 +89,7 @@ uint16_t NimBLEAdvertisedDevice::getAppearance() {
  * @return The advertisement interval in 0.625ms units.
  */
 uint16_t NimBLEAdvertisedDevice::getAdvInterval() {
-    size_t data_loc = 0;
+    uint8_t data_loc = 0;
 
     if(findAdvField(BLE_HS_ADV_TYPE_ADV_ITVL, 0, &data_loc) > 0) {
         ble_hs_adv_field *field = (ble_hs_adv_field *)&m_payload[data_loc];
@@ -107,7 +107,7 @@ uint16_t NimBLEAdvertisedDevice::getAdvInterval() {
  * @return The preferred min connection interval in 1.25ms units.
  */
 uint16_t NimBLEAdvertisedDevice::getMinInterval() {
-    size_t data_loc = 0;
+    uint8_t data_loc = 0;
 
     if(findAdvField(BLE_HS_ADV_TYPE_SLAVE_ITVL_RANGE, 0, &data_loc) > 0) {
         ble_hs_adv_field *field = (ble_hs_adv_field *)&m_payload[data_loc];
@@ -125,7 +125,7 @@ uint16_t NimBLEAdvertisedDevice::getMinInterval() {
  * @return The preferred max connection interval in 1.25ms units.
  */
 uint16_t NimBLEAdvertisedDevice::getMaxInterval() {
-    size_t data_loc = 0;
+    uint8_t data_loc = 0;
 
     if(findAdvField(BLE_HS_ADV_TYPE_SLAVE_ITVL_RANGE, 0, &data_loc) > 0) {
         ble_hs_adv_field *field = (ble_hs_adv_field *)&m_payload[data_loc];
@@ -143,7 +143,7 @@ uint16_t NimBLEAdvertisedDevice::getMaxInterval() {
  * @return The manufacturer data of the advertised device.
  */
 std::string NimBLEAdvertisedDevice::getManufacturerData() {
-    size_t data_loc = 0;
+    uint8_t data_loc = 0;
 
     if(findAdvField(BLE_HS_ADV_TYPE_MFG_DATA, 0, &data_loc) > 0) {
         ble_hs_adv_field *field = (ble_hs_adv_field *)&m_payload[data_loc];
@@ -161,7 +161,7 @@ std::string NimBLEAdvertisedDevice::getManufacturerData() {
  * @return The URI data.
  */
 std::string NimBLEAdvertisedDevice::getURI() {
-    size_t data_loc = 0;
+    uint8_t data_loc = 0;
 
     if(findAdvField(BLE_HS_ADV_TYPE_URI, 0, &data_loc) > 0) {
         ble_hs_adv_field *field = (ble_hs_adv_field *)&m_payload[data_loc];
@@ -179,7 +179,7 @@ std::string NimBLEAdvertisedDevice::getURI() {
  * @return The name of the advertised device.
  */
 std::string NimBLEAdvertisedDevice::getName() {
-    size_t data_loc = 0;
+    uint8_t data_loc = 0;
 
     if(findAdvField(BLE_HS_ADV_TYPE_COMP_NAME, 0, &data_loc) > 0 ||
        findAdvField(BLE_HS_ADV_TYPE_INCOMP_NAME, 0, &data_loc) > 0)
@@ -216,7 +216,7 @@ NimBLEScan* NimBLEAdvertisedDevice::getScan() {
  * @brief Get the number of target addresses.
  * @return The number of addresses.
  */
-uint8_t NimBLEAdvertisedDevice::getTargetAddressCount() {
+size_t NimBLEAdvertisedDevice::getTargetAddressCount() {
     uint8_t count = 0;
 
     count = findAdvField(BLE_HS_ADV_TYPE_PUBLIC_TGT_ADDR);
@@ -234,7 +234,7 @@ uint8_t NimBLEAdvertisedDevice::getTargetAddressCount() {
 NimBLEAddress NimBLEAdvertisedDevice::getTargetAddress(uint8_t index) {
     ble_hs_adv_field *field = nullptr;
     uint8_t count = 0;
-    size_t data_loc = ULONG_MAX;
+    uint8_t data_loc = 0xFF;
 
     index++;
     count = findAdvField(BLE_HS_ADV_TYPE_PUBLIC_TGT_ADDR, index, &data_loc);
@@ -244,7 +244,7 @@ NimBLEAddress NimBLEAdvertisedDevice::getTargetAddress(uint8_t index) {
         count = findAdvField(BLE_HS_ADV_TYPE_RANDOM_TGT_ADDR, index, &data_loc);
     }
 
-    if(count > 0 && data_loc != ULONG_MAX) {
+    if(count > 0 && data_loc != 0xFF) {
         field = (ble_hs_adv_field *)&m_payload[data_loc];
         if(field->length < index *  BLE_HS_ADV_PUBLIC_TGT_ADDR_ENTRY_LEN) {
             index -= count - field->length / BLE_HS_ADV_PUBLIC_TGT_ADDR_ENTRY_LEN;
@@ -266,9 +266,9 @@ NimBLEAddress NimBLEAdvertisedDevice::getTargetAddress(uint8_t index) {
 std::string NimBLEAdvertisedDevice::getServiceData(uint8_t index) {
     ble_hs_adv_field *field = nullptr;
     uint8_t bytes;
-    size_t data_loc = findServiceData(index, &bytes);
+    uint8_t data_loc = findServiceData(index, &bytes);
 
-    if(data_loc != ULONG_MAX) {
+    if(data_loc != 0xFF) {
         field = (ble_hs_adv_field *)&m_payload[data_loc];
         if(field->length > bytes) {
             return std::string((char*)(field->value + bytes), field->length - bytes - 1);
@@ -288,9 +288,9 @@ std::string NimBLEAdvertisedDevice::getServiceData(const NimBLEUUID &uuid) {
     ble_hs_adv_field *field = nullptr;
     uint8_t bytes;
     uint8_t index = 0;
-    size_t  data_loc = findServiceData(index, &bytes);
-    size_t  plSize = m_payload.size() - 2;
+    uint8_t data_loc = findServiceData(index, &bytes);
     uint8_t uuidBytes = uuid.bitSize() / 8;
+    uint8_t plSize = m_payload.size() - 2;
 
     while(data_loc < plSize) {
         field = (ble_hs_adv_field *)&m_payload[data_loc];
@@ -308,16 +308,16 @@ std::string NimBLEAdvertisedDevice::getServiceData(const NimBLEUUID &uuid) {
 
 
 /**
- * @brief Get the UUID of the service data at the index.
+ * @brief Get the UUID of the serice data at the index.
  * @param [in] index The index of the service data UUID requested.
  * @return The advertised service data UUID or an empty UUID if not found.
  */
 NimBLEUUID NimBLEAdvertisedDevice::getServiceDataUUID(uint8_t index) {
     ble_hs_adv_field *field = nullptr;
     uint8_t bytes;
-    size_t data_loc = findServiceData(index, &bytes);
+    uint8_t data_loc = findServiceData(index, &bytes);
 
-    if(data_loc != ULONG_MAX) {
+    if(data_loc != 0xFF) {
         field = (ble_hs_adv_field *)&m_payload[data_loc];
         if(field->length >= bytes) {
             return NimBLEUUID(field->value, bytes, false);
@@ -332,10 +332,10 @@ NimBLEUUID NimBLEAdvertisedDevice::getServiceDataUUID(uint8_t index) {
  * @brief Find the service data at the index.
  * @param [in] index The index of the service data to find.
  * @param [in] bytes A pointer to storage for the number of the bytes in the UUID.
- * @return The index in the vector where the data is located, ULONG_MAX if not found.
+ * @return The index in the vector where the data is located, 0xFF if not found.
  */
-size_t NimBLEAdvertisedDevice::findServiceData(uint8_t index, uint8_t *bytes) {
-    size_t data_loc = 0;
+uint8_t NimBLEAdvertisedDevice::findServiceData(uint8_t index, uint8_t *bytes) {
+    uint8_t data_loc = 0;
     uint8_t found = 0;
 
     *bytes = 0;
@@ -360,7 +360,7 @@ size_t NimBLEAdvertisedDevice::findServiceData(uint8_t index, uint8_t *bytes) {
         return data_loc;
     }
 
-    return ULONG_MAX;
+    return 0xFF;
 }
 
 
@@ -368,7 +368,7 @@ size_t NimBLEAdvertisedDevice::findServiceData(uint8_t index, uint8_t *bytes) {
  * @brief Get the count of advertised service data UUIDS
  * @return The number of service data UUIDS in the vector.
  */
-uint8_t NimBLEAdvertisedDevice::getServiceDataCount() {
+size_t NimBLEAdvertisedDevice::getServiceDataCount() {
     uint8_t count = 0;
 
     count += findAdvField(BLE_HS_ADV_TYPE_SVC_DATA_UUID16);
@@ -386,7 +386,7 @@ uint8_t NimBLEAdvertisedDevice::getServiceDataCount() {
  */
 NimBLEUUID NimBLEAdvertisedDevice::getServiceUUID(uint8_t index) {
     uint8_t count = 0;
-    size_t data_loc = 0;
+    uint8_t data_loc = 0;
     uint8_t uuidBytes = 0;
     uint8_t type = BLE_HS_ADV_TYPE_INCOMP_UUIDS16;
     ble_hs_adv_field *field = nullptr;
@@ -433,7 +433,7 @@ NimBLEUUID NimBLEAdvertisedDevice::getServiceUUID(uint8_t index) {
  * @brief Get the number of services advertised
  * @return The count of services in the advertising packet.
  */
-uint8_t NimBLEAdvertisedDevice::getServiceUUIDCount() {
+size_t NimBLEAdvertisedDevice::getServiceUUIDCount() {
     uint8_t count = 0;
 
     count += findAdvField(BLE_HS_ADV_TYPE_INCOMP_UUIDS16);
@@ -448,7 +448,7 @@ uint8_t NimBLEAdvertisedDevice::getServiceUUIDCount() {
 
 
 /**
- * @brief Check advertised services for existence of the required UUID
+ * @brief Check advertised services for existance of the required UUID
  * @param [in] uuid The service uuid to look for in the advertisement.
  * @return Return true if service is advertised
  */
@@ -469,7 +469,7 @@ bool NimBLEAdvertisedDevice::isAdvertisingService(const NimBLEUUID &uuid) {
  * @return The TX Power of the advertised device.
  */
 int8_t NimBLEAdvertisedDevice::getTXPower() {
-    size_t data_loc = 0;
+    uint8_t data_loc = 0;
 
     if(findAdvField(BLE_HS_ADV_TYPE_TX_PWR_LVL, 0, &data_loc) > 0) {
         ble_hs_adv_field *field = (ble_hs_adv_field *)&m_payload[data_loc];
@@ -583,60 +583,17 @@ bool NimBLEAdvertisedDevice::haveTXPower() {
 } // haveTXPower
 
 
-#if CONFIG_BT_NIMBLE_EXT_ADV
-/**
- * @brief Get the set ID of the extended advertisement.
- * @return The set ID.
- */
-uint8_t NimBLEAdvertisedDevice::getSetId() {
-    return m_sid;
-} // getSetId
-
-
-/**
- * @brief Get the primary PHY used by this advertisement.
- * @return The PHY type, one of:
- *  * BLE_HCI_LE_PHY_1M
- *  * BLE_HCI_LE_PHY_CODED
- */
-uint8_t NimBLEAdvertisedDevice::getPrimaryPhy() {
-    return m_primPhy;
-} // getPrimaryPhy
-
-
-/**
- * @brief Get the primary PHY used by this advertisement.
- * @return The PHY type, one of:
- *  * BLE_HCI_LE_PHY_1M
- *  * BLE_HCI_LE_PHY_2M
- *  * BLE_HCI_LE_PHY_CODED
- */
-uint8_t NimBLEAdvertisedDevice::getSecondaryPhy() {
-    return m_secPhy;
-} // getSecondaryPhy
-
-
-/**
- * @brief Get the periodic interval of the advertisement.
- * @return The periodic advertising interval, 0 if not periodic advertising.
- */
-uint16_t NimBLEAdvertisedDevice::getPeriodicInterval() {
-    return m_periodicItvl;
-} // getPeriodicInterval
-#endif
-
-
-uint8_t NimBLEAdvertisedDevice::findAdvField(uint8_t type, uint8_t index, size_t * data_loc) {
+uint8_t NimBLEAdvertisedDevice::findAdvField(uint8_t type, uint8_t index, uint8_t *data_loc) {
     ble_hs_adv_field *field = nullptr;
-    size_t  length = m_payload.size();
-    size_t  data   = 0;
-    uint8_t count  = 0;
+    uint8_t data = 0;
+    uint8_t length = m_payload.size();
+    uint8_t count = 0;
 
-    if (length < 3) {
+    if(length < 2) {
         return count;
     }
 
-    while (length > 2) {
+    while (length > 1) {
         field = (ble_hs_adv_field*)&m_payload[data];
 
         if (field->length >= length) {
@@ -644,7 +601,7 @@ uint8_t NimBLEAdvertisedDevice::findAdvField(uint8_t type, uint8_t index, size_t
         }
 
         if (field->type == type) {
-            switch (type) {
+            switch(type) {
                 case BLE_HS_ADV_TYPE_INCOMP_UUIDS16:
                 case BLE_HS_ADV_TYPE_COMP_UUIDS16:
                     count += field->length / 2;
@@ -670,8 +627,8 @@ uint8_t NimBLEAdvertisedDevice::findAdvField(uint8_t type, uint8_t index, size_t
                     break;
             }
 
-            if (data_loc != nullptr) {
-                if (index == 0 || count >= index) {
+            if(data_loc != nullptr) {
+                if(index == 0 || count >= index) {
                     break;
                 }
             }
@@ -681,7 +638,7 @@ uint8_t NimBLEAdvertisedDevice::findAdvField(uint8_t type, uint8_t index, size_t
         data += 1 + field->length;
     }
 
-    if (data_loc != nullptr && field != nullptr) {
+    if(data_loc != nullptr && field != nullptr) {
         *data_loc = data;
     }
 
@@ -702,13 +659,8 @@ void NimBLEAdvertisedDevice::setAddress(NimBLEAddress address) {
  * @brief Set the adFlag for this device.
  * @param [in] advType The advertisement flag data from the advertisement.
  */
-void NimBLEAdvertisedDevice::setAdvType(uint8_t advType, bool isLegacyAdv) {
+void NimBLEAdvertisedDevice::setAdvType(uint8_t advType) {
     m_advType = advType;
-#if CONFIG_BT_NIMBLE_EXT_ADV
-    m_isLegacyAdv = isLegacyAdv;
-#else
-    (void)isLegacyAdv;
-#endif
 } // setAdvType
 
 
@@ -753,10 +705,10 @@ std::string NimBLEAdvertisedDevice::toString() {
         res += val;
     }
 
-    if (haveServiceData()) {
-        uint8_t count = getServiceDataCount();
+    if(haveServiceData()) {
+        size_t count = getServiceDataCount();
         res += "\nService Data:";
-        for(uint8_t i = 0; i < count; i++) {
+        for(size_t i = 0; i < count; i++) {
             res += "\nUUID: " + std::string(getServiceDataUUID(i));
             res += ", Data: " + getServiceData(i);
         }
@@ -794,7 +746,7 @@ void NimBLEAdvertisedDevice::setPayload(const uint8_t *payload, uint8_t length,
 
 /**
  * @brief Get the length of the advertisement data in the payload.
- * @return The number of bytes in the payload that is from the advertisement.
+ * @return The number of bytes in the payload that is from the advertisment.
  */
 uint8_t NimBLEAdvertisedDevice::getAdvLength() {
     return m_advLength;
@@ -832,33 +784,6 @@ size_t NimBLEAdvertisedDevice::getPayloadLength() {
 } // getPayloadLength
 
 
-/**
- * @brief Check if this device is advertising as connectable.
- * @return True if the device is connectable.
- */
-bool NimBLEAdvertisedDevice::isConnectable() {
-#if CONFIG_BT_NIMBLE_EXT_ADV
-    if (m_isLegacyAdv) {
-        return m_advType == BLE_HCI_ADV_RPT_EVTYPE_ADV_IND ||
-               m_advType == BLE_HCI_ADV_RPT_EVTYPE_DIR_IND;
-    }
-#endif
-    return (m_advType & BLE_HCI_ADV_CONN_MASK) ||
-           (m_advType & BLE_HCI_ADV_DIRECT_MASK);
-} // isConnectable
-
-
-/**
- * @brief Check if this advertisement is a legacy or extended type
- * @return True if legacy (Bluetooth 4.x), false if extended (bluetooth 5.x).
- */
-bool NimBLEAdvertisedDevice::isLegacyAdvertisement() {
-#if CONFIG_BT_NIMBLE_EXT_ADV
-    return m_isLegacyAdv;
-# else
-    return true;
-#endif
-} // isLegacyAdvertisement
-
-#endif /* CONFIG_BT_ENABLED  && CONFIG_BT_NIMBLE_ROLE_CENTRAL */
+#endif // #if defined( CONFIG_BT_NIMBLE_ROLE_CENTRAL)
+#endif /* CONFIG_BT_ENABLED */
 

src/NimBLEAdvertisedDevice.h

@@ -14,22 +14,20 @@
 
 #ifndef COMPONENTS_NIMBLEADVERTISEDDEVICE_H_
 #define COMPONENTS_NIMBLEADVERTISEDDEVICE_H_
+#include "sdkconfig.h"
+#if defined(CONFIG_BT_ENABLED)
+
 #include "nimconfig.h"
-#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_OBSERVER)
+#if defined(CONFIG_BT_NIMBLE_ROLE_OBSERVER)
 
 #include "NimBLEAddress.h"
 #include "NimBLEScan.h"
 #include "NimBLEUUID.h"
 
-#if defined(CONFIG_NIMBLE_CPP_IDF)
 #include "host/ble_hs_adv.h"
-#else
-#include "nimble/nimble/host/include/host/ble_hs_adv.h"
-#endif
 
 #include <map>
 #include <vector>
-#include <time.h>
 
 
 class NimBLEScan;
@@ -71,7 +69,7 @@ public:
     std::string     getName();
     int             getRSSI();
     NimBLEScan*     getScan();
-    uint8_t         getServiceDataCount();
+    size_t          getServiceDataCount();
     std::string     getServiceData(uint8_t index = 0);
     std::string     getServiceData(const NimBLEUUID &uuid);
 
@@ -111,9 +109,9 @@ public:
 
     NimBLEUUID      getServiceDataUUID(uint8_t index = 0);
     NimBLEUUID      getServiceUUID(uint8_t index = 0);
-    uint8_t         getServiceUUIDCount();
+    size_t          getServiceUUIDCount();
     NimBLEAddress   getTargetAddress(uint8_t index = 0);
-    uint8_t         getTargetAddressCount();
+    size_t          getTargetAddressCount();
     int8_t          getTXPower();
     uint8_t*        getPayload();
     uint8_t         getAdvLength();
@@ -133,30 +131,16 @@ public:
     bool            haveTargetAddress();
     bool            haveURI();
     std::string     toString();
-    bool            isConnectable();
-    bool            isLegacyAdvertisement();
-#if CONFIG_BT_NIMBLE_EXT_ADV
-    uint8_t         getSetId();
-    uint8_t         getPrimaryPhy();
-    uint8_t         getSecondaryPhy();
-    uint16_t        getPeriodicInterval();
-#endif
 
 private:
     friend class NimBLEScan;
 
     void    setAddress(NimBLEAddress address);
-    void    setAdvType(uint8_t advType, bool isLegacyAdv);
+    void    setAdvType(uint8_t advType);
     void    setPayload(const uint8_t *payload, uint8_t length, bool append);
     void    setRSSI(int rssi);
-#if CONFIG_BT_NIMBLE_EXT_ADV
-    void    setSetId(uint8_t sid)              { m_sid = sid; }
-    void    setPrimaryPhy(uint8_t phy)         { m_primPhy = phy; }
-    void    setSecondaryPhy(uint8_t phy)       { m_secPhy = phy; }
-    void    setPeriodicInterval(uint16_t itvl) { m_periodicItvl = itvl; }
-#endif
-    uint8_t findAdvField(uint8_t type, uint8_t index = 0, size_t * data_loc = nullptr);
-    size_t  findServiceData(uint8_t index, uint8_t* bytes);
+    uint8_t findAdvField(uint8_t type, uint8_t index = 0, uint8_t *data_loc = nullptr);
+    uint8_t findServiceData(uint8_t index, uint8_t* bytes);
 
     NimBLEAddress   m_address = NimBLEAddress("");
     uint8_t         m_advType;
@@ -164,13 +148,6 @@ private:
     time_t          m_timestamp;
     bool            m_callbackSent;
     uint8_t         m_advLength;
-#if CONFIG_BT_NIMBLE_EXT_ADV
-    bool            m_isLegacyAdv;
-    uint8_t         m_sid;
-    uint8_t         m_primPhy;
-    uint8_t         m_secPhy;
-    uint16_t        m_periodicItvl;
-#endif
 
     std::vector<uint8_t>    m_payload;
 };
@@ -194,5 +171,6 @@ public:
     virtual void onResult(NimBLEAdvertisedDevice* advertisedDevice) = 0;
 };
 
-#endif /* CONFIG_BT_ENABLED && CONFIG_BT_NIMBLE_ROLE_OBSERVER */
+#endif // #if defined( CONFIG_BT_NIMBLE_ROLE_CENTRAL)
+#endif /* CONFIG_BT_ENABLED */
 #endif /* COMPONENTS_NIMBLEADVERTISEDDEVICE_H_ */

src/NimBLEAdvertising.cpp

@@ -13,16 +13,13 @@
  *      Author: kolban
  *
  */
-#include "nimconfig.h"
-#if (defined(CONFIG_BT_ENABLED) && \
-    defined(CONFIG_BT_NIMBLE_ROLE_BROADCASTER) && \
-    !CONFIG_BT_NIMBLE_EXT_ADV) || defined(_DOXYGEN_)
+#include "sdkconfig.h"
+#if defined(CONFIG_BT_ENABLED)
+
+#include "nimconfig.h"
+#if defined(CONFIG_BT_NIMBLE_ROLE_BROADCASTER)
 
-#if defined(CONFIG_NIMBLE_CPP_IDF)
 #include "services/gap/ble_svc_gap.h"
-#else
-#include "nimble/nimble/host/services/gap/include/services/gap/ble_svc_gap.h"
-#endif
 #include "NimBLEAdvertising.h"
 #include "NimBLEDevice.h"
 #include "NimBLEServer.h"
@@ -71,7 +68,6 @@ void NimBLEAdvertising::reset() {
     m_advDataSet                     = false;
     // Set this to non-zero to prevent auto start if host reset before started by app.
     m_duration                       = BLE_HS_FOREVER;
-    m_advCompCB                      = nullptr;
 } // reset
 
 
@@ -387,7 +383,6 @@ void NimBLEAdvertising::setScanResponseData(NimBLEAdvertisementData& advertiseme
  * @brief Start advertising.
  * @param [in] duration The duration, in seconds, to advertise, 0 == advertise forever.
  * @param [in] advCompleteCB A pointer to a callback to be invoked when advertising ends.
- * @return True if advertising started successfully.
  */
 bool NimBLEAdvertising::start(uint32_t duration, void (*advCompleteCB)(NimBLEAdvertising *pAdv)) {
     NIMBLE_LOGD(LOG_TAG, ">> Advertising start: customAdvData: %d, customScanResponseData: %d",
@@ -414,7 +409,7 @@ bool NimBLEAdvertising::start(uint32_t duration, void (*advCompleteCB)(NimBLEAdv
     // If already advertising just return
     if(ble_gap_adv_active()) {
         NIMBLE_LOGW(LOG_TAG, "Advertising already active");
-        return true;
+        return false;
     }
 
     // Save the duration incase of host reset so we can restart with the same params
@@ -434,16 +429,15 @@ bool NimBLEAdvertising::start(uint32_t duration, void (*advCompleteCB)(NimBLEAdv
     if(m_advParams.conn_mode == BLE_GAP_CONN_MODE_NON) {
         if(!m_scanResp) {
             m_advParams.disc_mode = BLE_GAP_DISC_MODE_NON;
-            // non-connectable advertising does not require AD flags.
-            m_advData.flags = 0;
+            m_advData.flags = BLE_HS_ADV_F_BREDR_UNSUP;
         }
     }
 
     int rc = 0;
 
     if (!m_customAdvData && !m_advDataSet) {
-        //start with 3 bytes for the flags data if required
-        uint8_t payloadLen = (m_advData.flags > 0) ? (2 + 1) : 0;
+        //start with 3 bytes for the flags data
+        uint8_t payloadLen = (2 + 1);
         if(m_advData.mfg_data_len > 0)
             payloadLen += (2 + m_advData.mfg_data_len);
 
@@ -628,7 +622,7 @@ bool NimBLEAdvertising::start(uint32_t duration, void (*advCompleteCB)(NimBLEAdv
                            &m_advParams,
                            (pServer != nullptr) ? NimBLEServer::handleGapEvent :
                                                   NimBLEAdvertising::handleGapEvent,
-                           (void*)this);
+                           (pServer != nullptr) ? (void*)pServer : (void*)this);
 #else
     rc = ble_gap_adv_start(NimBLEDevice::m_own_addr_type, NULL, duration,
                            &m_advParams, NimBLEAdvertising::handleGapEvent, this);
@@ -637,10 +631,6 @@ bool NimBLEAdvertising::start(uint32_t duration, void (*advCompleteCB)(NimBLEAdv
         case 0:
              break;
 
-        case BLE_HS_EALREADY:
-             NIMBLE_LOGI(LOG_TAG, "Advertisement Already active");
-             break;
-
         case BLE_HS_EINVAL:
              NIMBLE_LOGE(LOG_TAG, "Unable to advertise - Duration too long");
              break;
@@ -662,27 +652,29 @@ bool NimBLEAdvertising::start(uint32_t duration, void (*advCompleteCB)(NimBLEAdv
             break;
     }
 
+    if(rc != 0) {
+        return false;
+    }
+
     NIMBLE_LOGD(LOG_TAG, "<< Advertising start");
-    return (rc == 0 || rc == BLE_HS_EALREADY);
+    return true;
 } // start
 
 
 /**
  * @brief Stop advertising.
- * @return True if advertising stopped successfully.
  */
-bool NimBLEAdvertising::stop() {
+void NimBLEAdvertising::stop() {
     NIMBLE_LOGD(LOG_TAG, ">> stop");
 
     int rc = ble_gap_adv_stop();
     if (rc != 0 && rc != BLE_HS_EALREADY) {
         NIMBLE_LOGE(LOG_TAG, "ble_gap_adv_stop rc=%d %s",
                     rc, NimBLEUtils::returnCodeToString(rc));
-        return false;
+        return;
     }
 
     NIMBLE_LOGD(LOG_TAG, "<< stop");
-    return true;
 } // stop
 
 
@@ -758,7 +750,7 @@ int NimBLEAdvertising::handleGapEvent(struct ble_gap_event *event, void *arg) {
  */
 void NimBLEAdvertisementData::addData(const std::string &data) {
     if ((m_payload.length() + data.length()) > BLE_HS_ADV_MAX_SZ) {
-        NIMBLE_LOGE(LOG_TAG, "Advertisement data length exceeded");
+        NIMBLE_LOGE(LOG_TAG, "Advertisement data length exceded");
         return;
     }
     m_payload.append(data);
@@ -1035,4 +1027,5 @@ std::string NimBLEAdvertisementData::getPayload() {
     return m_payload;
 } // getPayload
 
-#endif /* CONFIG_BT_ENABLED && CONFIG_BT_NIMBLE_ROLE_BROADCASTER  && !CONFIG_BT_NIMBLE_EXT_ADV */
+#endif // #if defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
+#endif /* CONFIG_BT_ENABLED */

src/NimBLEAdvertising.h

@@ -14,17 +14,13 @@
 
 #ifndef MAIN_BLEADVERTISING_H_
 #define MAIN_BLEADVERTISING_H_
+#include "sdkconfig.h"
+#if defined(CONFIG_BT_ENABLED)
+
 #include "nimconfig.h"
-#if (defined(CONFIG_BT_ENABLED) && \
-    defined(CONFIG_BT_NIMBLE_ROLE_BROADCASTER) && \
-    !CONFIG_BT_NIMBLE_EXT_ADV) || defined(_DOXYGEN_)
+#if defined(CONFIG_BT_NIMBLE_ROLE_BROADCASTER)
 
-#if defined(CONFIG_NIMBLE_CPP_IDF)
 #include "host/ble_gap.h"
-#else
-#include "nimble/nimble/host/include/host/ble_gap.h"
-#endif
-
 /****  FIX COMPILATION ****/
 #undef min
 #undef max
@@ -91,7 +87,7 @@ public:
     void addServiceUUID(const char* serviceUUID);
     void removeServiceUUID(const NimBLEUUID &serviceUUID);
     bool start(uint32_t duration = 0, void (*advCompleteCB)(NimBLEAdvertising *pAdv) = nullptr);
-    bool stop();
+    void stop();
     void setAppearance(uint16_t appearance);
     void setName(const std::string &name);
     void setManufacturerData(const std::string &data);
@@ -113,7 +109,6 @@ public:
 
 private:
     friend class NimBLEDevice;
-    friend class NimBLEServer;
 
     void                    onHostSync();
     static int              handleGapEvent(struct ble_gap_event *event, void *arg);
@@ -137,5 +132,6 @@ private:
     std::vector<uint8_t>    m_uri;
 };
 
-#endif /* CONFIG_BT_ENABLED && CONFIG_BT_NIMBLE_ROLE_BROADCASTER  && !CONFIG_BT_NIMBLE_EXT_ADV */
+#endif // #if defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
+#endif /* CONFIG_BT_ENABLED */
 #endif /* MAIN_BLEADVERTISING_H_ */

src/NimBLEAttValue.h

@@ -1,447 +0,0 @@
-/*
- * NimBLEAttValue.h
- *
- *  Created: on March 18, 2021
- *      Author H2zero
- *
- */
-
-#ifndef MAIN_NIMBLEATTVALUE_H_
-#define MAIN_NIMBLEATTVALUE_H_
-#include "nimconfig.h"
-#if defined(CONFIG_BT_ENABLED)
-
-#ifdef NIMBLE_CPP_ARDUINO_STRING_AVAILABLE
-#include <Arduino.h>
-#endif
-
-#include "NimBLELog.h"
-
-/****  FIX COMPILATION ****/
-#undef min
-#undef max
-/**************************/
-
-#include <string>
-#include <vector>
-
-#ifndef CONFIG_NIMBLE_CPP_ATT_VALUE_TIMESTAMP_ENABLED
-#    define CONFIG_NIMBLE_CPP_ATT_VALUE_TIMESTAMP_ENABLED 0
-#endif
-
-#if CONFIG_NIMBLE_CPP_ATT_VALUE_TIMESTAMP_ENABLED
-#    include <time.h>
-#endif
-
-#if !defined(CONFIG_NIMBLE_CPP_ATT_VALUE_INIT_LENGTH)
-#    define CONFIG_NIMBLE_CPP_ATT_VALUE_INIT_LENGTH 20
-#elif CONFIG_NIMBLE_CPP_ATT_VALUE_INIT_LENGTH > BLE_ATT_ATTR_MAX_LEN
-#    error CONFIG_NIMBLE_CPP_ATT_VALUE_INIT_LENGTH cannot be larger than 512 (BLE_ATT_ATTR_MAX_LEN)
-#elif CONFIG_NIMBLE_CPP_ATT_VALUE_INIT_LENGTH < 1
-#    error CONFIG_NIMBLE_CPP_ATT_VALUE_INIT_LENGTH cannot be less than 1; Range = 1 : 512
-#endif
-
-
-/* Used to determine if the type passed to a template has a c_str() and length() method. */
-template <typename T, typename = void, typename = void>
-struct Has_c_str_len : std::false_type {};
-
-template <typename T>
-struct Has_c_str_len<T, decltype(void(std::declval<T &>().c_str())),
-                     decltype(void(std::declval<T &>().length()))> : std::true_type {};
-
-
-/**
- * @brief A specialized container class to hold BLE attribute values.
- * @details This class is designed to be more memory efficient than using\n
- * standard container types for value storage, while being convertible to\n
- * many different container classes.
- */
-class NimBLEAttValue
-{
-    uint8_t*     m_attr_value = nullptr;
-    uint16_t     m_attr_max_len = 0;
-    uint16_t     m_attr_len = 0;
-    uint16_t     m_capacity = 0;
-#if CONFIG_NIMBLE_CPP_ATT_VALUE_TIMESTAMP_ENABLED
-    time_t       m_timestamp = 0;
-#endif
-    void         deepCopy(const NimBLEAttValue & source);
-
-public:
-    /**
-     * @brief Default constructor.
-     * @param[in] init_len The initial size in bytes.
-     * @param[in] max_len The max size in bytes that the value can be.
-     */
-    NimBLEAttValue(uint16_t init_len = CONFIG_NIMBLE_CPP_ATT_VALUE_INIT_LENGTH,
-                   uint16_t max_len = BLE_ATT_ATTR_MAX_LEN);
-
-    /**
-     * @brief Construct with an initial value from a buffer.
-     * @param value A pointer to the initial value to set.
-     * @param[in] len The size in bytes of the value to set.
-     * @param[in] max_len The max size in bytes that the value can be.
-     */
-    NimBLEAttValue(const uint8_t *value, uint16_t len,
-                   uint16_t max_len = BLE_ATT_ATTR_MAX_LEN);
-
-    /**
-     * @brief Construct with an initializer list.
-     * @param list An initializer list containing the initial value to set.
-     * @param[in] max_len The max size in bytes that the value can be.
-     */
-    NimBLEAttValue(std::initializer_list<uint8_t> list,
-                   uint16_t max_len = BLE_ATT_ATTR_MAX_LEN)
-                   :NimBLEAttValue(list.begin(), (uint16_t)list.size(), max_len){}
-
-    /**
-     * @brief Construct with an initial value from a const char string.
-     * @param value A pointer to the initial value to set.
-     * @param[in] max_len The max size in bytes that the value can be.
-     */
-    NimBLEAttValue(const char *value, uint16_t max_len = BLE_ATT_ATTR_MAX_LEN)
-                   :NimBLEAttValue((uint8_t*)value, (uint16_t)strlen(value), max_len){}
-
-    /**
-     * @brief Construct with an initial value from a std::string.
-     * @param str A std::string containing to the initial value to set.
-     * @param[in] max_len The max size in bytes that the value can be.
-     */
-    NimBLEAttValue(const std::string str, uint16_t max_len = BLE_ATT_ATTR_MAX_LEN)
-                   :NimBLEAttValue((uint8_t*)str.data(), (uint16_t)str.length(), max_len){}
-
-    /**
-     * @brief Construct with an initial value from a std::vector<uint8_t>.
-     * @param vec A std::vector<uint8_t> containing to the initial value to set.
-     * @param[in] max_len The max size in bytes that the value can be.
-     */
-    NimBLEAttValue(const std::vector<uint8_t> vec, uint16_t max_len = BLE_ATT_ATTR_MAX_LEN)
-                   :NimBLEAttValue(&vec[0], (uint16_t)vec.size(), max_len){}
-
-#ifdef NIMBLE_CPP_ARDUINO_STRING_AVAILABLE
-    /**
-     * @brief Construct with an initial value from an Arduino String.
-     * @param str An Arduino String containing to the initial value to set.
-     * @param[in] max_len The max size in bytes that the value can be.
-     */
-    NimBLEAttValue(const String str, uint16_t max_len = BLE_ATT_ATTR_MAX_LEN)
-                   :NimBLEAttValue((uint8_t*)str.c_str(), str.length(), max_len){}
-#endif
-
-    /** @brief Copy constructor */
-    NimBLEAttValue(const NimBLEAttValue & source) { deepCopy(source); }
-
-    /** @brief Move constructor */
-    NimBLEAttValue(NimBLEAttValue && source) { *this = std::move(source); }
-
-    /** @brief Destructor */
-    ~NimBLEAttValue();
-
-    /** @brief Returns the max size in bytes */
-    uint16_t        max_size()     const   { return m_attr_max_len; }
-
-    /** @brief Returns the currently allocated capacity in bytes */
-    uint16_t        capacity()     const   { return m_capacity; }
-
-    /** @brief Returns the current length of the value in bytes */
-    uint16_t        length()       const   { return m_attr_len; }
-
-    /** @brief Returns the current size of the value in bytes */
-    uint16_t        size()         const   { return m_attr_len; }
-
-    /** @brief Returns a pointer to the internal buffer of the value */
-    const uint8_t*  data()         const   { return m_attr_value; }
-
-    /** @brief Returns a pointer to the internal buffer of the value as a const char* */
-    const char*     c_str()        const   { return (const char*)m_attr_value; }
-
-    /** @brief Iterator begin */
-    const uint8_t*  begin()        const   { return m_attr_value; }
-
-    /** @brief Iterator end */
-    const uint8_t*  end()          const   { return m_attr_value + m_attr_len; }
-
-#if CONFIG_NIMBLE_CPP_ATT_VALUE_TIMESTAMP_ENABLED
-    /** @brief Returns a timestamp of when the value was last updated */
-    time_t          getTimeStamp() const   { return m_timestamp; }
-
-    /** @brief Set the timestamp to the current time */
-    void            setTimeStamp()         { m_timestamp = time(nullptr); }
-
-    /**
-     * @brief Set the timestamp to the specified time
-     * @param[in] t The timestamp value to set
-     */
-    void            setTimeStamp(time_t t) { m_timestamp = t; }
-#else
-    time_t          getTimeStamp() const   { return 0; }
-    void            setTimeStamp()         { }
-    void            setTimeStamp(time_t t) { }
-#endif
-
-    /**
-     * @brief Set the value from a buffer
-     * @param[in] value A ponter to a buffer containing the value.
-     * @param[in] len The length of the value in bytes.
-     * @returns True if successful.
-     */
-    bool            setValue(const uint8_t *value, uint16_t len);
-
-    /**
-     * @brief Set value to the value of const char*.
-     * @param [in] s A ponter to a const char value to set.
-     */
-    bool            setValue(const char* s) {
-                         return setValue((uint8_t*)s, (uint16_t)strlen(s)); }
-
-    /**
-     * @brief Get a pointer to the value buffer with timestamp.
-     * @param[in] timestamp A ponter to a time_t variable to store the timestamp.
-     * @returns A pointer to the internal value buffer.
-     */
-    const uint8_t*  getValue(time_t *timestamp);
-
-    /**
-     * @brief Append data to the value.
-     * @param[in] value A ponter to a data buffer with the value to append.
-     * @param[in] len The length of the value to append in bytes.
-     * @returns A reference to the appended NimBLEAttValue.
-     */
-    NimBLEAttValue& append(const uint8_t *value, uint16_t len);
-
-
-    /*********************** Template Functions ************************/
-
-    /**
-     * @brief Template to set value to the value of <type\>val.
-     * @param [in] s The <type\>value to set.
-     * @details Only used for types without a `c_str()` method.
-     */
-    template<typename T>
-#ifdef _DOXYGEN_
-    bool
-#else
-    typename std::enable_if<!Has_c_str_len<T>::value, bool>::type
-#endif
-    setValue(const T &s) {
-        return setValue((uint8_t*)&s, sizeof(T));
-    }
-
-    /**
-     * @brief Template to set value to the value of <type\>val.
-     * @param [in] s The <type\>value to set.
-     * @details Only used if the <type\> has a `c_str()` method.
-     */
-    template<typename T>
-#ifdef _DOXYGEN_
-    bool
-#else
-    typename std::enable_if<Has_c_str_len<T>::value, bool>::type
-#endif
-    setValue(const T & s) {
-        return setValue((uint8_t*)s.c_str(), (uint16_t)s.length());
-    }
-
-    /**
-     * @brief Template to return the value as a <type\>.
-     * @tparam T The type to convert the data to.
-     * @param [in] timestamp A pointer to a time_t struct to store the time the value was read.
-     * @param [in] skipSizeCheck If true it will skip checking if the data size is less than\n
-     * <tt>sizeof(<type\>)</tt>.
-     * @return The data converted to <type\> or NULL if skipSizeCheck is false and the data is\n
-     * less than <tt>sizeof(<type\>)</tt>.
-     * @details <b>Use:</b> <tt>getValue<type>(&timestamp, skipSizeCheck);</tt>
-     */
-    template<typename T>
-    T   getValue(time_t *timestamp = nullptr, bool skipSizeCheck = false) {
-            if(!skipSizeCheck && size() < sizeof(T)) {
-                return T();
-            }
-            return *((T *)getValue(timestamp));
-    }
-
-
-    /*********************** Operators ************************/
-
-    /** @brief Subscript operator */
-    uint8_t operator [](int pos) const {
-        assert(pos < m_attr_len && "out of range"); 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); }
-
-    /** @brief Operator; Get the value as a std::string. */
-    operator std::string() const {
-        return std::string((char*)m_attr_value, m_attr_len); }
-
-    /** @brief Operator; Get the value as a const uint8_t*. */
-    operator const uint8_t*() const { return m_attr_value; }
-
-    /** @brief Operator; Append another NimBLEAttValue. */
-    NimBLEAttValue& operator  +=(const NimBLEAttValue & source) {
-        return append(source.data(), source.size()); }
-
-    /** @brief Operator; Set the value from a std::string source. */
-    NimBLEAttValue& operator  =(const std::string & source) {
-        setValue((uint8_t*)source.data(), (uint16_t)source.size()); return *this; }
-
-    /** @brief Move assignment operator */
-    NimBLEAttValue& operator  =(NimBLEAttValue && source);
-
-    /** @brief Copy assignment operator */
-    NimBLEAttValue& operator  =(const NimBLEAttValue & source);
-
-    /** @brief Equality operator */
-    bool operator  ==(const NimBLEAttValue & source) {
-        return (m_attr_len == source.size()) ?
-                memcmp(m_attr_value, source.data(), m_attr_len) == 0 : false; }
-
-    /** @brief Inequality operator */
-    bool operator  !=(const NimBLEAttValue & source){ return !(*this == source); }
-
-#ifdef NIMBLE_CPP_ARDUINO_STRING_AVAILABLE
-    /** @brief Operator; Get the value as an Arduino String value. */
-    operator String() const { return String((char*)m_attr_value); }
-#endif
-
-};
-
-
-inline NimBLEAttValue::NimBLEAttValue(uint16_t init_len, uint16_t max_len) {
-    m_attr_value   = (uint8_t*)calloc(init_len + 1, 1);
-    assert(m_attr_value && "No Mem");
-    m_attr_max_len = std::min(BLE_ATT_ATTR_MAX_LEN, (int)max_len);
-    m_attr_len     = 0;
-    m_capacity     = init_len;
-    setTimeStamp(0);
-}
-
-inline 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;
-}
-
-inline NimBLEAttValue::~NimBLEAttValue() {
-    if(m_attr_value != nullptr) {
-        free(m_attr_value);
-    }
-}
-
-inline NimBLEAttValue& NimBLEAttValue::operator =(NimBLEAttValue && source) {
-    if (this != &source){
-        free(m_attr_value);
-
-        m_attr_value   = source.m_attr_value;
-        m_attr_max_len = source.m_attr_max_len;
-        m_attr_len     = source.m_attr_len;
-        m_capacity     = source.m_capacity;
-        setTimeStamp(source.getTimeStamp());
-        source.m_attr_value = nullptr;
-    }
-    return *this;
-}
-
-inline NimBLEAttValue& NimBLEAttValue::operator =(const NimBLEAttValue & source) {
-    if (this != &source) {
-        deepCopy(source);
-    }
-    return *this;
-}
-
-inline void NimBLEAttValue::deepCopy(const NimBLEAttValue & source) {
-    uint8_t* res = (uint8_t*)realloc( m_attr_value, source.m_capacity + 1);
-    assert(res && "deepCopy: realloc failed");
-
-    ble_npl_hw_enter_critical();
-    m_attr_value   = res;
-    m_attr_max_len = source.m_attr_max_len;
-    m_attr_len     = source.m_attr_len;
-    m_capacity     = source.m_capacity;
-    setTimeStamp(source.getTimeStamp());
-    memcpy(m_attr_value, source.m_attr_value, m_attr_len + 1);
-    ble_npl_hw_exit_critical(0);
-}
-
-inline const uint8_t*  NimBLEAttValue::getValue(time_t *timestamp) {
-    if(timestamp != nullptr) {
-#if CONFIG_NIMBLE_CPP_ATT_VALUE_TIMESTAMP_ENABLED
-        *timestamp = m_timestamp;
-#else
-        *timestamp = 0;
-#endif
-    }
-    return m_attr_value;
-}
-
-inline bool NimBLEAttValue::setValue(const uint8_t *value, uint16_t len) {
-    if (len > m_attr_max_len) {
-        NIMBLE_LOGE("NimBLEAttValue", "value exceeds max, len=%u, max=%u",
-                     len, m_attr_max_len);
-        return false;
-    }
-
-    uint8_t *res = m_attr_value;
-    if (len > m_capacity) {
-        res = (uint8_t*)realloc(m_attr_value, (len + 1));
-        m_capacity = len;
-    }
-    assert(res && "setValue: realloc failed");
-
-#if CONFIG_NIMBLE_CPP_ATT_VALUE_TIMESTAMP_ENABLED
-    time_t t = time(nullptr);
-#else
-    time_t t = 0;
-#endif
-
-    ble_npl_hw_enter_critical();
-    m_attr_value = res;
-    memcpy(m_attr_value, value, len);
-    m_attr_value[len] = '\0';
-    m_attr_len = len;
-    setTimeStamp(t);
-    ble_npl_hw_exit_critical(0);
-    return true;
-}
-
-inline NimBLEAttValue& NimBLEAttValue::append(const uint8_t *value, uint16_t len) {
-    if (len < 1) {
-        return *this;
-    }
-
-    if ((m_attr_len + len) > m_attr_max_len) {
-        NIMBLE_LOGE("NimBLEAttValue", "val > max, len=%u, max=%u",
-                    len, m_attr_max_len);
-        return *this;
-    }
-
-    uint8_t* res = m_attr_value;
-    uint16_t new_len = m_attr_len + len;
-    if (new_len > m_capacity) {
-        res = (uint8_t*)realloc(m_attr_value, (new_len + 1));
-        m_capacity = new_len;
-    }
-    assert(res && "append: realloc failed");
-
-#if CONFIG_NIMBLE_CPP_ATT_VALUE_TIMESTAMP_ENABLED
-    time_t t = time(nullptr);
-#else
-    time_t t = 0;
-#endif
-
-    ble_npl_hw_enter_critical();
-    m_attr_value = res;
-    memcpy(m_attr_value + m_attr_len, value, len);
-    m_attr_len = new_len;
-    m_attr_value[m_attr_len] = '\0';
-    setTimeStamp(t);
-    ble_npl_hw_exit_critical(0);
-
-    return *this;
-}
-
-#endif /*(CONFIG_BT_ENABLED) */
-#endif /* MAIN_NIMBLEATTVALUE_H_ */

src/NimBLEBeacon.cpp

@@ -11,8 +11,8 @@
  *  Created on: Jan 4, 2018
  *      Author: kolban
  */
-#include "nimconfig.h"
-#if defined(CONFIG_BT_ENABLED)
+#include "sdkconfig.h"
+#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_NIMBLE_ENABLED)
 
 #include <string.h>
 #include <algorithm>
@@ -130,7 +130,7 @@ void NimBLEBeacon::setManufacturerId(uint16_t manufacturerId) {
  */
 void NimBLEBeacon::setMinor(uint16_t minor) {
     m_beaconData.minor = ENDIAN_CHANGE_U16(minor);
-} // setMinor
+} // setMinior
 
 
 /**

src/NimBLEBeacon.h

@@ -15,6 +15,7 @@
 #ifndef MAIN_NIMBLEBEACON_H_
 #define MAIN_NIMBLEBEACON_H_
 
+#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_NIMBLE_ENABLED)
 #include "NimBLEUUID.h"
 /**
  * @brief Representation of a beacon.
@@ -48,4 +49,5 @@ public:
     void        setSignalPower(int8_t signalPower);
 }; // NimBLEBeacon
 
+#endif
 #endif /* MAIN_NIMBLEBEACON_H_ */

src/NimBLECharacteristic.cpp

@@ -9,9 +9,11 @@
  *  Created on: Jun 22, 2017
  *      Author: kolban
  */
+#include "sdkconfig.h"
+#if defined(CONFIG_BT_ENABLED)
 
 #include "nimconfig.h"
-#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
+#if defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
 
 #include "NimBLECharacteristic.h"
 #include "NimBLE2904.h"
@@ -30,30 +32,27 @@ static const char* LOG_TAG = "NimBLECharacteristic";
  * @brief Construct a characteristic
  * @param [in] uuid - UUID (const char*) for the characteristic.
  * @param [in] properties - Properties for the characteristic.
- * @param [in] max_len - The maximum length in bytes that the characteristic value can hold. (Default: 512 bytes for esp32, 20 for all others).
  * @param [in] pService - pointer to the service instance this characteristic belongs to.
  */
-NimBLECharacteristic::NimBLECharacteristic(const char* uuid, uint16_t properties,
-                                           uint16_t max_len, NimBLEService* pService)
-: NimBLECharacteristic(NimBLEUUID(uuid), properties, max_len, pService) {
+NimBLECharacteristic::NimBLECharacteristic(const char* uuid, uint16_t properties, NimBLEService* pService)
+: NimBLECharacteristic(NimBLEUUID(uuid), properties, pService) {
 }
 
 /**
  * @brief Construct a characteristic
  * @param [in] uuid - UUID for the characteristic.
  * @param [in] properties - Properties for the characteristic.
- * @param [in] max_len - The maximum length in bytes that the characteristic value can hold. (Default: 512 bytes for esp32, 20 for all others).
  * @param [in] pService - pointer to the service instance this characteristic belongs to.
  */
-NimBLECharacteristic::NimBLECharacteristic(const NimBLEUUID &uuid, uint16_t properties,
-                                           uint16_t max_len, NimBLEService* pService)
-:   m_value(std::min(CONFIG_NIMBLE_CPP_ATT_VALUE_INIT_LENGTH , (int)max_len), max_len) {
-    m_uuid        = uuid;
-    m_handle      = NULL_HANDLE;
-    m_properties  = properties;
-    m_pCallbacks  = &defaultCallback;
-    m_pService    = pService;
-    m_removed     = 0;
+NimBLECharacteristic::NimBLECharacteristic(const NimBLEUUID &uuid, uint16_t properties, NimBLEService* pService) {
+    m_uuid       = uuid;
+    m_handle     = NULL_HANDLE;
+    m_properties = properties;
+    m_pCallbacks = &defaultCallback;
+    m_pService   = pService;
+    m_value      = "";
+    m_valMux     = portMUX_INITIALIZER_UNLOCKED;
+    m_timestamp  = 0;
 } // NimBLECharacteristic
 
 /**
@@ -96,63 +95,21 @@ NimBLEDescriptor* NimBLECharacteristic::createDescriptor(const NimBLEUUID &uuid,
     }
 
     addDescriptor(pDescriptor);
+
     return pDescriptor;
 } // createDescriptor
 
 
 /**
  * @brief Add a descriptor to the characteristic.
- * @param [in] pDescriptor A pointer to the descriptor to add.
+ * @param [in] A pointer to the descriptor to add.
  */
 void NimBLECharacteristic::addDescriptor(NimBLEDescriptor *pDescriptor) {
-    bool foundRemoved = false;
-
-    if(pDescriptor->m_removed > 0) {
-        for(auto& it : m_dscVec) {
-            if(it == pDescriptor) {
-                foundRemoved = true;
-                pDescriptor->m_removed = 0;
-            }
-        }
-    }
-
-    if(!foundRemoved) {
-        m_dscVec.push_back(pDescriptor);
-    }
-
     pDescriptor->setCharacteristic(this);
-    NimBLEDevice::getServer()->serviceChanged();
+    m_dscVec.push_back(pDescriptor);
 }
 
 
-/**
- * @brief Remove a descriptor from the characteristic.
- * @param[in] pDescriptor A pointer to the descriptor instance to remove from the characteristic.
- * @param[in] deleteDsc If true it will delete the descriptor instance and free it's resources.
- */
-void NimBLECharacteristic::removeDescriptor(NimBLEDescriptor *pDescriptor, bool deleteDsc) {
-    // Check if the descriptor was already removed and if so, check if this
-    // is being called to delete the object and do so if requested.
-    // Otherwise, ignore the call and return.
-    if(pDescriptor->m_removed > 0) {
-        if(deleteDsc) {
-            for(auto it = m_dscVec.begin(); it != m_dscVec.end(); ++it) {
-                if ((*it) == pDescriptor) {
-                    delete *it;
-                    m_dscVec.erase(it);
-                    break;
-                }
-            }
-        }
-
-        return;
-    }
-
-    pDescriptor->m_removed = deleteDsc ? NIMBLE_ATT_REMOVE_DELETE : NIMBLE_ATT_REMOVE_HIDE;
-    NimBLEDevice::getServer()->serviceChanged();
-} // removeDescriptor
-
-
 /**
  * @brief Return the BLE Descriptor for the given UUID.
  * @param [in] uuid The UUID of the descriptor.
@@ -234,14 +191,17 @@ NimBLEUUID NimBLECharacteristic::getUUID() {
 
 /**
  * @brief Retrieve the current value of the characteristic.
- * @return The NimBLEAttValue containing the current characteristic value.
+ * @return A std::string containing the current characteristic value.
  */
-NimBLEAttValue NimBLECharacteristic::getValue(time_t *timestamp) {
+std::string NimBLECharacteristic::getValue(time_t *timestamp) {
+    portENTER_CRITICAL(&m_valMux);
+    std::string retVal = m_value;
     if(timestamp != nullptr) {
-        m_value.getValue(timestamp);
+        *timestamp = m_timestamp;
     }
+    portEXIT_CRITICAL(&m_valMux);
 
-    return m_value;
+    return retVal;
 } // getValue
 
 
@@ -250,7 +210,11 @@ NimBLEAttValue NimBLECharacteristic::getValue(time_t *timestamp) {
  * @return The length of the current characteristic data.
  */
 size_t NimBLECharacteristic::getDataLength() {
-    return m_value.size();
+    portENTER_CRITICAL(&m_valMux);
+    size_t len = m_value.length();
+    portEXIT_CRITICAL(&m_valMux);
+
+    return len;
 }
 
 
@@ -273,38 +237,36 @@ int NimBLECharacteristic::handleGapEvent(uint16_t conn_handle, uint16_t attr_han
     if(ble_uuid_cmp(uuid, &pCharacteristic->getUUID().getNative()->u) == 0){
         switch(ctxt->op) {
             case BLE_GATT_ACCESS_OP_READ_CHR: {
-                rc = ble_gap_conn_find(conn_handle, &desc);
-                assert(rc == 0);
-
-                 // If the packet header is only 8 bytes 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 ||
-                   pCharacteristic->m_value.size() <= (ble_att_mtu(desc.conn_handle) - 3)) {
+                // If the packet header is only 8 bytes 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) {
+                    rc = ble_gap_conn_find(conn_handle, &desc);
+                    assert(rc == 0);
                     pCharacteristic->m_pCallbacks->onRead(pCharacteristic);
                     pCharacteristic->m_pCallbacks->onRead(pCharacteristic, &desc);
                 }
 
-                ble_npl_hw_enter_critical();
-                rc = os_mbuf_append(ctxt->om, pCharacteristic->m_value.data(), pCharacteristic->m_value.size());
-                ble_npl_hw_exit_critical(0);
+                portENTER_CRITICAL(&pCharacteristic->m_valMux);
+                rc = os_mbuf_append(ctxt->om, (uint8_t*)pCharacteristic->m_value.data(),
+                                    pCharacteristic->m_value.length());
+                portEXIT_CRITICAL(&pCharacteristic->m_valMux);
+
                 return rc == 0 ? 0 : BLE_ATT_ERR_INSUFFICIENT_RES;
             }
 
             case BLE_GATT_ACCESS_OP_WRITE_CHR: {
-                uint16_t att_max_len = pCharacteristic->m_value.max_size();
-
-                if (ctxt->om->om_len > att_max_len) {
+                if (ctxt->om->om_len > BLE_ATT_ATTR_MAX_LEN) {
                     return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
                 }
 
-                uint8_t buf[att_max_len];
+                uint8_t buf[BLE_ATT_ATTR_MAX_LEN];
                 size_t len = ctxt->om->om_len;
                 memcpy(buf, ctxt->om->om_data,len);
 
                 os_mbuf *next;
                 next = SLIST_NEXT(ctxt->om, om_next);
                 while(next != NULL){
-                    if((len + next->om_len) > att_max_len) {
+                    if((len + next->om_len) > BLE_ATT_ATTR_MAX_LEN) {
                         return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
                     }
                     memcpy(&buf[len], next->om_data, next->om_len);
@@ -384,65 +346,31 @@ void NimBLECharacteristic::setSubscribe(struct ble_gap_event *event) {
 
 
 /**
- * @brief Send an indication.
+ * @brief Send an indication.\n
+ * An indication is a transmission of up to the first 20 bytes of the characteristic value.\n
+ * An indication will block waiting for a positive confirmation from the client.
  */
 void NimBLECharacteristic::indicate() {
+    NIMBLE_LOGD(LOG_TAG, ">> indicate: length: %d", getDataLength());
     notify(false);
+    NIMBLE_LOGD(LOG_TAG, "<< indicate");
 } // indicate
 
-
 /**
- * @brief Send an indication.
- * @param[in] value A pointer to the data to send.
- * @param[in] length The length of the data to send.
- */
-void NimBLECharacteristic::indicate(const uint8_t* value, size_t length) {
-    notify(value, length, false);
-} // indicate
-
-
-/**
- * @brief Send an indication.
- * @param[in] value A std::vector<uint8_t> containing the value to send as the notification value.
- */
-void NimBLECharacteristic::indicate(const std::vector<uint8_t>& value) {
-    notify(value.data(), value.size(), false);
-} // indicate
-
-
-/**
- * @brief Send a notification or indication.
+ * @brief Send a notification.\n
+ * A notification is a transmission of up to the first 20 bytes of the characteristic value.\n
+ * A notification will not block; it is a fire and forget.
  * @param[in] is_notification if true sends a notification, false sends an indication.
  */
 void NimBLECharacteristic::notify(bool is_notification) {
-    notify(m_value.data(), m_value.length(), is_notification);
-} // notify
+    NIMBLE_LOGD(LOG_TAG, ">> notify: length: %d", getDataLength());
 
 
-/**
- * @brief Send a notification or indication.
- * @param[in] value A std::vector<uint8_t> containing the value to send as the notification value.
- * @param[in] is_notification if true sends a notification, false sends an indication.
- */
-void NimBLECharacteristic::notify(const std::vector<uint8_t>& value, bool is_notification) {
-    notify(value.data(), value.size(), is_notification);
-} // notify
-
-
-/**
- * @brief Send a notification or indication.
- * @param[in] value A pointer to the data to send.
- * @param[in] length The length of the data to send.
- * @param[in] is_notification if true sends a notification, false sends an indication.
- */
-void NimBLECharacteristic::notify(const uint8_t* value, size_t length, bool is_notification) {
-    NIMBLE_LOGD(LOG_TAG, ">> notify: length: %d", length);
-
     if(!(m_properties & NIMBLE_PROPERTY::NOTIFY) &&
        !(m_properties & NIMBLE_PROPERTY::INDICATE))
     {
         NIMBLE_LOGE(LOG_TAG,
-                    "<< notify-Error; Notify/indicate not enabled for characteristic: %s",
+                    "<< notify-Error; Notify/indicate not enabled for characterisitc: %s",
                     std::string(getUUID()).c_str());
     }
 
@@ -453,13 +381,15 @@ void NimBLECharacteristic::notify(const uint8_t* value, size_t length, bool is_n
 
     m_pCallbacks->onNotify(this);
 
+    std::string value = getValue();
+    size_t length = value.length();
     bool reqSec = (m_properties & BLE_GATT_CHR_F_READ_AUTHEN) ||
                   (m_properties & BLE_GATT_CHR_F_READ_AUTHOR) ||
                   (m_properties & BLE_GATT_CHR_F_READ_ENC);
     int rc = 0;
 
     for (auto &it : m_subscribedVec) {
-        uint16_t _mtu = getService()->getServer()->getPeerMTU(it.first) - 3;
+        uint16_t _mtu = getService()->getServer()->getPeerMTU(it.first);
 
         // check if connected and subscribed
         if(_mtu == 0 || it.second == 0) {
@@ -475,8 +405,8 @@ void NimBLECharacteristic::notify(const uint8_t* value, size_t length, bool is_n
             }
         }
 
-        if (length > _mtu) {
-            NIMBLE_LOGW(LOG_TAG, "- Truncating to %d bytes (maximum notify size)", _mtu);
+        if (length > _mtu - 3) {
+            NIMBLE_LOGW(LOG_TAG, "- Truncating to %d bytes (maximum notify size)", _mtu - 3);
         }
 
         if(is_notification && (!(it.second & NIMBLE_SUB_NOTIFY))) {
@@ -494,7 +424,7 @@ void NimBLECharacteristic::notify(const uint8_t* value, size_t length, bool is_n
         // don't create the m_buf until we are sure to send the data or else
         // we could be allocating a buffer that doesn't get released.
         // We also must create it in each loop iteration because it is consumed with each host call.
-        os_mbuf *om = ble_hs_mbuf_from_flat(value, length);
+        os_mbuf *om = ble_hs_mbuf_from_flat((uint8_t*)value.data(), length);
 
         if(!is_notification && (m_properties & NIMBLE_PROPERTY::INDICATE)) {
             if(!NimBLEDevice::getServer()->setIndicateWait(it.first)) {
@@ -538,30 +468,40 @@ NimBLECharacteristicCallbacks* NimBLECharacteristic::getCallbacks() {
 
 
 /**
- * @brief Set the value of the characteristic from a data buffer .
- * @param [in] data The data buffer to set for the characteristic.
- * @param [in] length The number of bytes in the data buffer.
+ * @brief Set the value of the characteristic.
+ * @param [in] data The data to set for the characteristic.
+ * @param [in] length The length of the data in bytes.
  */
 void NimBLECharacteristic::setValue(const uint8_t* data, size_t length) {
-#if CONFIG_NIMBLE_CPP_LOG_LEVEL >= 4
+#if CONFIG_LOG_DEFAULT_LEVEL > 3 || (ARDUINO_ARCH_ESP32 && !defined(DONT_USE_ARDUINO_BULLSHIT) && CORE_DEBUG_LEVEL >= 4)
     char* pHex = NimBLEUtils::buildHexData(nullptr, data, length);
-    NIMBLE_LOGD(LOG_TAG, ">> setValue: length=%d, data=%s, characteristic UUID=%s",
-                length, pHex, getUUID().toString().c_str());
+    NIMBLE_LOGD(LOG_TAG, ">> setValue: length=%d, data=%s, characteristic UUID=%s", length, pHex, getUUID().toString().c_str());
     free(pHex);
 #endif
 
-    m_value.setValue(data, length);
+    if (length > BLE_ATT_ATTR_MAX_LEN) {
+        NIMBLE_LOGE(LOG_TAG, "Size %d too large, must be no bigger than %d", length, BLE_ATT_ATTR_MAX_LEN);
+        return;
+    }
+
+    time_t t = time(nullptr);
+    portENTER_CRITICAL(&m_valMux);
+    m_value = std::string((char*)data, length);
+    m_timestamp = t;
+    portEXIT_CRITICAL(&m_valMux);
+
     NIMBLE_LOGD(LOG_TAG, "<< setValue");
 } // setValue
 
 
 /**
- * @brief Set the value of the characteristic from a `std::vector<uint8_t>`.\n
- * @param [in] vec The std::vector<uint8_t> reference to set the characteristic value from.
+ * @brief Set the value of the characteristic from string data.\n
+ * We set the value of the characteristic from the bytes contained in the string.
+ * @param [in] value the std::string value of the characteristic.
  */
-void NimBLECharacteristic::setValue(const std::vector<uint8_t>& vec) {
-    return setValue((uint8_t*)&vec[0], vec.size());
-}// setValue
+void NimBLECharacteristic::setValue(const std::string &value) {
+    setValue((uint8_t*)(value.data()), value.length());
+} // setValue
 
 
 /**
@@ -658,4 +598,6 @@ void NimBLECharacteristicCallbacks::onSubscribe(NimBLECharacteristic* pCharacter
     NIMBLE_LOGD("NimBLECharacteristicCallbacks", "onSubscribe: default");
 }
 
-#endif /* CONFIG_BT_ENABLED && CONFIG_BT_NIMBLE_ROLE_PERIPHERAL */
+
+#endif // #if defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
+#endif /* CONFIG_BT_ENABLED */

src/NimBLECharacteristic.h

@@ -13,15 +13,13 @@
 
 #ifndef MAIN_NIMBLECHARACTERISTIC_H_
 #define MAIN_NIMBLECHARACTERISTIC_H_
+#include "sdkconfig.h"
+#if defined(CONFIG_BT_ENABLED)
+
 #include "nimconfig.h"
-#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
+#if defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
 
-#if defined(CONFIG_NIMBLE_CPP_IDF)
 #include "host/ble_hs.h"
-#else
-#include "nimble/nimble/host/include/host/ble_hs.h"
-#endif
-
 /****  FIX COMPILATION ****/
 #undef min
 #undef max
@@ -44,7 +42,6 @@ typedef enum {
 
 #include "NimBLEService.h"
 #include "NimBLEDescriptor.h"
-#include "NimBLEAttValue.h"
 
 #include <string>
 #include <vector>
@@ -66,13 +63,11 @@ public:
                          uint16_t properties =
                          NIMBLE_PROPERTY::READ |
                          NIMBLE_PROPERTY::WRITE,
-                         uint16_t max_len = BLE_ATT_ATTR_MAX_LEN,
                          NimBLEService* pService = nullptr);
     NimBLECharacteristic(const NimBLEUUID &uuid,
                          uint16_t properties =
                          NIMBLE_PROPERTY::READ |
                          NIMBLE_PROPERTY::WRITE,
-                         uint16_t max_len = BLE_ATT_ATTR_MAX_LEN,
                          NimBLEService* pService = nullptr);
 
     ~NimBLECharacteristic();
@@ -80,93 +75,63 @@ public:
     uint16_t          getHandle();
     NimBLEUUID        getUUID();
     std::string       toString();
-    void              indicate();
-    void              indicate(const uint8_t* value, size_t length);
-    void              indicate(const std::vector<uint8_t>& value);
-    void              notify(bool is_notification = true);
-    void              notify(const uint8_t* value, size_t length, bool is_notification = true);
-    void              notify(const std::vector<uint8_t>& value, bool is_notification = true);
-    size_t            getSubscribedCount();
-    void              addDescriptor(NimBLEDescriptor *pDescriptor);
-    NimBLEDescriptor* getDescriptorByUUID(const char* uuid);
-    NimBLEDescriptor* getDescriptorByUUID(const NimBLEUUID &uuid);
-    NimBLEDescriptor* getDescriptorByHandle(uint16_t handle);
-    void              removeDescriptor(NimBLEDescriptor *pDescriptor, bool deleteDsc = false);
-    NimBLEService*    getService();
-    uint16_t          getProperties();
-    NimBLEAttValue    getValue(time_t *timestamp = nullptr);
-    size_t            getDataLength();
-    void              setValue(const uint8_t* data, size_t size);
-    void              setValue(const std::vector<uint8_t>& vec);
+
     void              setCallbacks(NimBLECharacteristicCallbacks* pCallbacks);
+    NimBLECharacteristicCallbacks*
+                      getCallbacks();
+
+    void              indicate();
+    void              notify(bool is_notification = true);
+    size_t            getSubscribedCount();
+
     NimBLEDescriptor* createDescriptor(const char* uuid,
                                        uint32_t properties =
                                        NIMBLE_PROPERTY::READ |
                                        NIMBLE_PROPERTY::WRITE,
-                                       uint16_t max_len = BLE_ATT_ATTR_MAX_LEN);;
+                                       uint16_t max_len = 100);
     NimBLEDescriptor* createDescriptor(const NimBLEUUID &uuid,
                                        uint32_t properties =
                                        NIMBLE_PROPERTY::READ |
                                        NIMBLE_PROPERTY::WRITE,
-                                       uint16_t max_len = BLE_ATT_ATTR_MAX_LEN);
+                                       uint16_t max_len = 100);
 
-    NimBLECharacteristicCallbacks* getCallbacks();
-
-
-    /*********************** Template Functions ************************/
+    void              addDescriptor(NimBLEDescriptor *pDescriptor);
+    NimBLEDescriptor* getDescriptorByUUID(const char* uuid);
+    NimBLEDescriptor* getDescriptorByUUID(const NimBLEUUID &uuid);
+    NimBLEDescriptor* getDescriptorByHandle(uint16_t handle);
 
+    std::string       getValue(time_t *timestamp = nullptr);
+    size_t            getDataLength();
     /**
-     * @brief Template to set the characteristic value to <type\>val.
-     * @param [in] s The value to set.
-     */
-    template<typename T>
-    void              setValue(const T &s) { m_value.setValue<T>(s); }
-
-    /**
-     * @brief Template to convert the characteristic data to <type\>.
+     * @brief A template to convert the characteristic data to <type\>.
      * @tparam T The type to convert the data to.
-     * @param [in] timestamp (Optional) A pointer to a time_t struct to store the time the value was read.
-     * @param [in] skipSizeCheck (Optional) If true it will skip checking if the data size is less than <tt>sizeof(<type\>)</tt>.
-     * @return The data converted to <type\> or NULL if skipSizeCheck is false and the data is less than <tt>sizeof(<type\>)</tt>.
+     * @param [in] timestamp A pointer to a time_t struct to store the time the value was read.
+     * @param [in] skipSizeCheck If true it will skip checking if the data size is less than <tt>sizeof(<type\>)</tt>.
+     * @return The data converted to <type\> or NULL if skipSizeCheck is false and the data is
+     * less than <tt>sizeof(<type\>)</tt>.
      * @details <b>Use:</b> <tt>getValue<type>(&timestamp, skipSizeCheck);</tt>
      */
     template<typename T>
-    T   getValue(time_t *timestamp = nullptr, bool skipSizeCheck = false) {
-        return m_value.getValue<T>(timestamp, skipSizeCheck);
+    T                 getValue(time_t *timestamp = nullptr, bool skipSizeCheck = false) {
+        std::string value = getValue();
+        if(!skipSizeCheck && value.size() < sizeof(T)) return T();
+        const char *pData = value.data();
+        return *((T *)pData);
     }
 
+    void              setValue(const uint8_t* data, size_t size);
+    void              setValue(const std::string &value);
     /**
-     * @brief Template to send a notification from a class type that has a c_str() and length() method.
-     * @tparam T The a reference to a class containing the data to send.
-     * @param[in] value The <type\>value to set.
-     * @param[in] is_notification if true sends a notification, false sends an indication.
-     * @details Only used if the <type\> has a `c_str()` method.
+     * @brief Convenience template to set the characteristic value to <type\>val.
+     * @param [in] s The value to set.
      */
     template<typename T>
-#ifdef _DOXYGEN_
-    void
-#else
-    typename std::enable_if<Has_c_str_len<T>::value, void>::type
-#endif
-    notify(const T& value, bool is_notification = true) {
-        notify((uint8_t*)value.c_str(), value.length(), is_notification);
+    void              setValue(const T &s) {
+        setValue((uint8_t*)&s, sizeof(T));
     }
 
-    /**
-     * @brief Template to send an indication from a class type that has a c_str() and length() method.
-     * @tparam T The a reference to a class containing the data to send.
-     * @param[in] value The <type\>value to set.
-     * @details Only used if the <type\> has a `c_str()` method.
-     */
-    template<typename T>
-#ifdef _DOXYGEN_
-    void
-#else
-    typename std::enable_if<Has_c_str_len<T>::value, void>::type
-#endif
-    indicate(const T& value) {
-        indicate((uint8_t*)value.c_str(), value.length());
-    }
+    NimBLEService*    getService();
+    uint16_t          getProperties();
 
 private:
 
@@ -183,9 +148,10 @@ private:
     uint16_t                       m_properties;
     NimBLECharacteristicCallbacks* m_pCallbacks;
     NimBLEService*                 m_pService;
-    NimBLEAttValue                 m_value;
+    std::string                    m_value;
     std::vector<NimBLEDescriptor*> m_dscVec;
-    uint8_t                        m_removed;
+    portMUX_TYPE                   m_valMux;
+    time_t                         m_timestamp;
 
     std::vector<std::pair<uint16_t, uint16_t>>  m_subscribedVec;
 }; // NimBLECharacteristic
@@ -217,7 +183,7 @@ public:
         ERROR_INDICATE_FAILURE
     }Status;
 
-    virtual      ~NimBLECharacteristicCallbacks();
+    virtual ~NimBLECharacteristicCallbacks();
     virtual void onRead(NimBLECharacteristic* pCharacteristic);
     virtual void onRead(NimBLECharacteristic* pCharacteristic, ble_gap_conn_desc* desc);
     virtual void onWrite(NimBLECharacteristic* pCharacteristic);
@@ -227,5 +193,6 @@ public:
     virtual void onSubscribe(NimBLECharacteristic* pCharacteristic, ble_gap_conn_desc* desc, uint16_t subValue);
 };
 
-#endif /* CONFIG_BT_ENABLED  && CONFIG_BT_NIMBLE_ROLE_PERIPHERAL */
+#endif // #if defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
+#endif /* CONFIG_BT_ENABLED */
 #endif /*MAIN_NIMBLECHARACTERISTIC_H_*/

src/NimBLEClient.cpp

@@ -11,8 +11,11 @@
  *      Author: kolban
  */
 
+#include "sdkconfig.h"
+#if defined(CONFIG_BT_ENABLED)
+
 #include "nimconfig.h"
-#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_CENTRAL)
+#if defined( CONFIG_BT_NIMBLE_ROLE_CENTRAL)
 
 #include "NimBLEClient.h"
 #include "NimBLEDevice.h"
@@ -20,13 +23,9 @@
 
 #include <string>
 #include <unordered_set>
-#include <climits>
 
-#if defined(CONFIG_NIMBLE_CPP_IDF)
 #include "nimble/nimble_port.h"
-#else
-#include "nimble/porting/nimble/include/nimble/nimble_port.h"
-#endif
+
 
 static const char* LOG_TAG = "NimBLEClient";
 static NimBLEClientCallbacks defaultCallbacks;
@@ -64,12 +63,6 @@ NimBLEClient::NimBLEClient(const NimBLEAddress &peerAddress) : m_peerAddress(pee
     m_deleteCallbacks  = false;
     m_pTaskData        = nullptr;
     m_connEstablished  = false;
-    m_lastErr          = 0;
-#if CONFIG_BT_NIMBLE_EXT_ADV
-    m_phyMask          = BLE_GAP_LE_PHY_1M_MASK |
-                         BLE_GAP_LE_PHY_2M_MASK |
-                         BLE_GAP_LE_PHY_CODED_MASK;
-#endif
 
     m_pConnParams.scan_itvl = 16;          // Scan interval in 0.625ms units (NimBLE Default)
     m_pConnParams.scan_window = 16;        // Scan window in 0.625ms units (NimBLE Default)
@@ -80,7 +73,6 @@ NimBLEClient::NimBLEClient(const NimBLEAddress &peerAddress) : m_peerAddress(pee
     m_pConnParams.min_ce_len = BLE_GAP_INITIAL_CONN_MIN_CE_LEN; // Minimum length of connection event in 0.625ms units
     m_pConnParams.max_ce_len = BLE_GAP_INITIAL_CONN_MAX_CE_LEN; // Maximum length of connection event in 0.625ms units
 
-    memset(&m_dcTimer, 0, sizeof(m_dcTimer));
     ble_npl_callout_init(&m_dcTimer, nimble_port_get_dflt_eventq(),
                          NimBLEClient::dcTimerCb, this);
 } // NimBLEClient
@@ -99,8 +91,6 @@ NimBLEClient::~NimBLEClient() {
         delete m_pClientCallbacks;
     }
 
-    ble_npl_callout_deinit(&m_dcTimer);
-
 } // ~NimBLEClient
 
 
@@ -157,35 +147,35 @@ size_t NimBLEClient::deleteService(const NimBLEUUID &uuid) {
 
 /**
  * @brief Connect to the BLE Server.
- * @param [in] deleteAttributes If true this will delete any attribute objects this client may already\n
+ * @param [in] deleteAttibutes If true this will delete any attribute objects this client may already\n
  * have created and clears the vectors after successful connection.
  * @return True on success.
  */
-bool NimBLEClient::connect(bool deleteAttributes) {
-    return connect(m_peerAddress, deleteAttributes);
+bool NimBLEClient::connect(bool deleteAttibutes) {
+    return connect(m_peerAddress, deleteAttibutes);
 }
 
 /**
  * @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
+ * @param [in] deleteAttibutes If true this will delete any attribute objects this client may already\n
  * have created and clears the vectors after successful connection.
  * @return True on success.
  */
-bool NimBLEClient::connect(NimBLEAdvertisedDevice* device, bool deleteAttributes) {
+bool NimBLEClient::connect(NimBLEAdvertisedDevice* device, bool deleteAttibutes) {
     NimBLEAddress address(device->getAddress());
-    return connect(address, deleteAttributes);
+    return connect(address, deleteAttibutes);
 }
 
 
 /**
  * @brief Connect to the BLE Server.
  * @param [in] address The address of the server.
- * @param [in] deleteAttributes If true this will delete any attribute objects this client may already\n
+ * @param [in] deleteAttibutes If true this will delete any attribute objects this client may already\n
  * have created and clears the vectors after successful connection.
  * @return True on success.
  */
-bool NimBLEClient::connect(const NimBLEAddress &address, bool deleteAttributes) {
+bool NimBLEClient::connect(const NimBLEAddress &address, bool deleteAttibutes) {
     NIMBLE_LOGD(LOG_TAG, ">> connect(%s)", address.toString().c_str());
 
     if(!NimBLEDevice::m_synced) {
@@ -215,8 +205,7 @@ bool NimBLEClient::connect(const NimBLEAddress &address, bool deleteAttributes)
         m_peerAddress = address;
     }
 
-    TaskHandle_t cur_task = xTaskGetCurrentTaskHandle();
-    ble_task_data_t taskData = {this, cur_task, 0, nullptr};
+    ble_task_data_t taskData = {this, xTaskGetCurrentTaskHandle(), 0, nullptr};
     m_pTaskData = &taskData;
     int rc = 0;
 
@@ -225,22 +214,9 @@ bool NimBLEClient::connect(const NimBLEAddress &address, bool deleteAttributes)
      *  Loop on BLE_HS_EBUSY if the scan hasn't stopped yet.
      */
     do {
-#if CONFIG_BT_NIMBLE_EXT_ADV
-        rc = ble_gap_ext_connect(NimBLEDevice::m_own_addr_type,
-                                 &peerAddr_t,
-                                 m_connectTimeout,
-                                 m_phyMask,
-                                 &m_pConnParams,
-                                 &m_pConnParams,
-                                 &m_pConnParams,
-                                 NimBLEClient::handleGapEvent,
-                                 this);
-
-#else
         rc = ble_gap_connect(NimBLEDevice::m_own_addr_type, &peerAddr_t,
                              m_connectTimeout, &m_pConnParams,
                              NimBLEClient::handleGapEvent, this);
-#endif
         switch (rc) {
             case 0:
                 break;
@@ -259,7 +235,7 @@ bool NimBLEClient::connect(const NimBLEAddress &address, bool deleteAttributes)
                 break;
 
             case BLE_HS_EALREADY:
-                // Already attempting to connect to this device, cancel the previous
+                // Already attemting to connect to this device, cancel the previous
                 // attempt and report failure here so we don't get 2 connections.
                 NIMBLE_LOGE(LOG_TAG, "Already attempting to connect to %s - cancelling",
                             std::string(m_peerAddress).c_str());
@@ -275,17 +251,11 @@ bool NimBLEClient::connect(const NimBLEAddress &address, bool deleteAttributes)
 
     } while (rc == BLE_HS_EBUSY);
 
-    m_lastErr = rc;
-
     if(rc != 0) {
         m_pTaskData = nullptr;
         return false;
     }
 
-#ifdef ulTaskNotifyValueClear
-    // Clear the task notification value to ensure we block
-    ulTaskNotifyValueClear(cur_task, ULONG_MAX);
-#endif
     // Wait for the connect timeout time +1 second for the connection to complete
     if(ulTaskNotifyTake(pdTRUE, pdMS_TO_TICKS(m_connectTimeout + 1000)) == pdFALSE) {
         m_pTaskData = nullptr;
@@ -303,7 +273,6 @@ bool NimBLEClient::connect(const NimBLEAddress &address, bool deleteAttributes)
         return false;
 
     } else if(taskData.rc != 0){
-        m_lastErr = taskData.rc;
         NIMBLE_LOGE(LOG_TAG, "Connection failed; status=%d %s",
                     taskData.rc,
                     NimBLEUtils::returnCodeToString(taskData.rc));
@@ -317,7 +286,7 @@ bool NimBLEClient::connect(const NimBLEAddress &address, bool deleteAttributes)
         NIMBLE_LOGI(LOG_TAG, "Connection established");
     }
 
-    if(deleteAttributes) {
+    if(deleteAttibutes) {
         deleteServices();
     }
 
@@ -336,8 +305,7 @@ bool NimBLEClient::connect(const NimBLEAddress &address, bool deleteAttributes)
  * @return True on success.
  */
 bool NimBLEClient::secureConnection() {
-    TaskHandle_t cur_task = xTaskGetCurrentTaskHandle();
-    ble_task_data_t taskData = {this, cur_task, 0, nullptr};
+    ble_task_data_t taskData = {this, xTaskGetCurrentTaskHandle(), 0, nullptr};
 
     int retryCount = 1;
 
@@ -346,20 +314,14 @@ bool NimBLEClient::secureConnection() {
 
         int rc = NimBLEDevice::startSecurity(m_conn_id);
         if(rc != 0){
-            m_lastErr = rc;
             m_pTaskData = nullptr;
             return false;
         }
 
-#ifdef ulTaskNotifyValueClear
-        // Clear the task notification value to ensure we block
-        ulTaskNotifyValueClear(cur_task, ULONG_MAX);
-#endif
         ulTaskNotifyTake(pdTRUE, portMAX_DELAY);
     } while (taskData.rc == (BLE_HS_ERR_HCI_BASE + BLE_ERR_PINKEY_MISSING) && retryCount--);
 
     if(taskData.rc != 0){
-        m_lastErr = taskData.rc;
         return false;
     }
 
@@ -390,8 +352,8 @@ int NimBLEClient::disconnect(uint8_t reason) {
         // We use a timer to detect a controller error in the event that it does
         // not inform the stack when disconnection is complete.
         // This is a common error in certain esp-idf versions.
-        // The disconnect timeout time is the supervision timeout time + 1 second.
-        // In the case that the event happens shortly after the supervision timeout
+        // The disconnect timeout time is the supervison timeout time + 1 second.
+        // In the case that the event happenss shortly after the supervision timeout
         // we don't want to prematurely reset the host.
         ble_npl_time_t ticks;
         ble_npl_time_ms_to_ticks((desc.supervision_timeout + 100) * 10, &ticks);
@@ -410,28 +372,12 @@ int NimBLEClient::disconnect(uint8_t reason) {
     }
 
     NIMBLE_LOGD(LOG_TAG, "<< disconnect()");
-    m_lastErr = rc;
     return rc;
 } // disconnect
 
 
-#if CONFIG_BT_NIMBLE_EXT_ADV
 /**
- * @brief Set the PHY types to use when connecting to a server.
- * @param [in] mask A bitmask indicating what PHYS to connect with.\n
- * The available bits are:
- * * 0x01 BLE_GAP_LE_PHY_1M_MASK
- * * 0x02 BLE_GAP_LE_PHY_2M_MASK
- * * 0x04 BLE_GAP_LE_PHY_CODED_MASK
- */
-void NimBLEClient::setConnectPhy(uint8_t mask) {
-    m_phyMask = mask;
-}
-#endif
-
-
-/**
- * @brief Set the connection parameters to use when connecting to a server.
+ * @brief Set the connection paramaters to use when connecting to a server.
  * @param [in] minInterval The minimum connection interval in 1.25ms units.
  * @param [in] maxInterval The maximum connection interval in 1.25ms units.
  * @param [in] latency The number of packets allowed to skip (extends max interval).
@@ -490,29 +436,6 @@ void NimBLEClient::updateConnParams(uint16_t minInterval, uint16_t maxInterval,
 } // updateConnParams
 
 
-/**
- * @brief Request an update of the data packet length.
- * * Can only be used after a connection has been established.
- * @details Sends a data length update request to the server the client is connected to.
- * The Data Length Extension (DLE) allows to increase the Data Channel Payload from 27 bytes to up to 251 bytes.
- * The server needs to support the Bluetooth 4.2 specifications, to be capable of DLE.
- * @param [in] tx_octets The preferred number of payload octets to use (Range 0x001B-0x00FB).
- */
-void NimBLEClient::setDataLen(uint16_t tx_octets) {
-#if defined(CONFIG_NIMBLE_CPP_IDF) && !defined(ESP_IDF_VERSION) || \
-  (ESP_IDF_VERSION_MAJOR * 100 + ESP_IDF_VERSION_MINOR * 10 + ESP_IDF_VERSION_PATCH) < 432
-    return;
-#else
-    uint16_t tx_time = (tx_octets + 14) * 8;
-
-    int rc = ble_gap_set_data_len(m_conn_id, tx_octets, tx_time);
-    if(rc != 0) {
-        NIMBLE_LOGE(LOG_TAG, "Set data length error: %d, %s", rc, NimBLEUtils::returnCodeToString(rc));
-    }
-#endif
-} // setDataLen
-
-
 /**
  * @brief Get detailed information about the current peer connection.
  */
@@ -589,7 +512,6 @@ int NimBLEClient::getRssi() {
     if(rc != 0) {
         NIMBLE_LOGE(LOG_TAG, "Failed to read RSSI error code: %d, %s",
                                 rc, NimBLEUtils::returnCodeToString(rc));
-        m_lastErr = rc;
         return 0;
     }
 
@@ -646,31 +568,14 @@ NimBLERemoteService* NimBLEClient::getService(const NimBLEUUID &uuid) {
             return m_servicesVector.back();
         }
 
-        // If the request was successful but 16/32 bit uuid not found
+        // If the request was successful but 16/32 bit service 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(retrieveServices(&uuid128)) {
-                if(m_servicesVector.size() > prev_size) {
-                    return m_servicesVector.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(retrieveServices(&uuid16)) {
-                    if(m_servicesVector.size() > prev_size) {
-                        return m_servicesVector.back();
-                    }
-                }
-            }
+            return getService(uuid128);
         }
     }
 
@@ -703,29 +608,13 @@ std::vector<NimBLERemoteService*>* NimBLEClient::getServices(bool refresh) {
 
 /**
  * @brief Retrieves the full database of attributes that the peripheral has available.
- * @return True if successful.
  */
-bool NimBLEClient::discoverAttributes() {
-    deleteServices();
-
-    if (!retrieveServices()){
-        return false;
-    }
-
-
-    for(auto svc: m_servicesVector) {
-        if (!svc->retrieveCharacteristics()) {
-            return false;
-        }
-
-        for(auto chr: svc->m_characteristicVector) {
-            if (!chr->retrieveDescriptors()) {
-                return false;
-            }
+void NimBLEClient::discoverAttributes() {
+    for(auto svc: *getServices(true)) {
+        for(auto chr: *svc->getCharacteristics(true)) {
+            chr->getDescriptors(true);
         }
     }
-
-    return true;
 } // discoverAttributes
 
 
@@ -750,8 +639,7 @@ bool NimBLEClient::retrieveServices(const NimBLEUUID *uuid_filter) {
     }
 
     int rc = 0;
-    TaskHandle_t cur_task = xTaskGetCurrentTaskHandle();
-    ble_task_data_t taskData = {this, cur_task, 0, nullptr};
+    ble_task_data_t taskData = {this, xTaskGetCurrentTaskHandle(), 0, nullptr};
 
     if(uuid_filter == nullptr) {
         rc = ble_gattc_disc_all_svcs(m_conn_id, NimBLEClient::serviceDiscoveredCB, &taskData);
@@ -762,18 +650,11 @@ bool NimBLEClient::retrieveServices(const NimBLEUUID *uuid_filter) {
 
     if (rc != 0) {
         NIMBLE_LOGE(LOG_TAG, "ble_gattc_disc_all_svcs: rc=%d %s", rc, NimBLEUtils::returnCodeToString(rc));
-        m_lastErr = rc;
         return false;
     }
 
-#ifdef ulTaskNotifyValueClear
-    // Clear the task notification value to ensure we block
-    ulTaskNotifyValueClear(cur_task, ULONG_MAX);
-#endif
-
     // wait until we have all the services
     ulTaskNotifyTake(pdTRUE, portMAX_DELAY);
-    m_lastErr = taskData.rc;
 
     if(taskData.rc == 0){
         NIMBLE_LOGD(LOG_TAG, "<< retrieveServices");
@@ -817,7 +698,7 @@ int NimBLEClient::serviceDiscoveredCB(
     if(error->status == BLE_HS_EDONE) {
         pTaskData->rc = 0;
     } else {
-        NIMBLE_LOGE(LOG_TAG, "serviceDiscoveredCB() rc=%d %s",
+        NIMBLE_LOGE(LOG_TAG, "characteristicDiscCB() rc=%d %s",
                              error->status,
                              NimBLEUtils::returnCodeToString(error->status));
         pTaskData->rc = error->status;
@@ -825,7 +706,7 @@ int NimBLEClient::serviceDiscoveredCB(
 
     xTaskNotifyGive(pTaskData->task);
 
-    NIMBLE_LOGD(LOG_TAG,"<< Service Discovered");
+    NIMBLE_LOGD(LOG_TAG,"<< << Service Discovered");
     return error->status;
 }
 
@@ -836,11 +717,11 @@ int NimBLEClient::serviceDiscoveredCB(
  * @param [in] characteristicUUID The characteristic whose value we wish to read.
  * @returns characteristic value or an empty string if not found
  */
-NimBLEAttValue NimBLEClient::getValue(const NimBLEUUID &serviceUUID, const NimBLEUUID &characteristicUUID) {
+std::string NimBLEClient::getValue(const NimBLEUUID &serviceUUID, const NimBLEUUID &characteristicUUID) {
     NIMBLE_LOGD(LOG_TAG, ">> getValue: serviceUUID: %s, characteristicUUID: %s",
                          serviceUUID.toString().c_str(), characteristicUUID.toString().c_str());
 
-    NimBLEAttValue ret;
+    std::string ret = "";
     NimBLERemoteService* pService = getService(serviceUUID);
 
     if(pService != nullptr) {
@@ -850,7 +731,7 @@ NimBLEAttValue NimBLEClient::getValue(const NimBLEUUID &serviceUUID, const NimBL
         }
     }
 
-    NIMBLE_LOGD(LOG_TAG, "<< getValue");
+    NIMBLE_LOGD(LOG_TAG, "<<getValue");
     return ret;
 } // getValue
 
@@ -864,7 +745,7 @@ NimBLEAttValue NimBLEClient::getValue(const NimBLEUUID &serviceUUID, const NimBL
  * @returns true if successful otherwise false
  */
 bool NimBLEClient::setValue(const NimBLEUUID &serviceUUID, const NimBLEUUID &characteristicUUID,
-                            const NimBLEAttValue &value, bool response)
+                            const std::string &value, bool response)
 {
     NIMBLE_LOGD(LOG_TAG, ">> setValue: serviceUUID: %s, characteristicUUID: %s",
                          serviceUUID.toString().c_str(), characteristicUUID.toString().c_str());
@@ -925,7 +806,7 @@ uint16_t NimBLEClient::getMTU() {
  * @param [in] arg A pointer to the client instance that registered for this callback.
  */
  /*STATIC*/
-int NimBLEClient::handleGapEvent(struct ble_gap_event *event, void *arg) {
+ int NimBLEClient::handleGapEvent(struct ble_gap_event *event, void *arg) {
     NimBLEClient* client = (NimBLEClient*)arg;
     int rc;
 
@@ -1043,14 +924,19 @@ int NimBLEClient::handleGapEvent(struct ble_gap_event *event, void *arg) {
                     NIMBLE_LOGD(LOG_TAG, "Got Notification for characteristic %s",
                                 (*characteristic)->toString().c_str());
 
-                    uint32_t data_len = OS_MBUF_PKTLEN(event->notify_rx.om);
-                    (*characteristic)->m_value.setValue(event->notify_rx.om->om_data, data_len);
+                    time_t t = time(nullptr);
+                    portENTER_CRITICAL(&(*characteristic)->m_valMux);
+                    (*characteristic)->m_value = std::string((char *)event->notify_rx.om->om_data,
+                                                             event->notify_rx.om->om_len);
+                    (*characteristic)->m_timestamp = t;
+                    portEXIT_CRITICAL(&(*characteristic)->m_valMux);
 
                     if ((*characteristic)->m_notifyCallback != nullptr) {
                         NIMBLE_LOGD(LOG_TAG, "Invoking callback for notification on characteristic %s",
                                     (*characteristic)->toString().c_str());
                         (*characteristic)->m_notifyCallback(*characteristic, event->notify_rx.om->om_data,
-                                                            data_len, !event->notify_rx.indication);
+                                                            event->notify_rx.om->om_len,
+                                                            !event->notify_rx.indication);
                     }
                     break;
                 }
@@ -1148,7 +1034,7 @@ int NimBLEClient::handleGapEvent(struct ble_gap_event *event, void *arg) {
                 NIMBLE_LOGD(LOG_TAG, "ble_sm_inject_io result: %d", rc);
 
             } else if (event->passkey.params.action == BLE_SM_IOACT_NUMCMP) {
-                NIMBLE_LOGD(LOG_TAG, "Passkey on device's display: %" PRIu32, event->passkey.params.numcmp);
+                NIMBLE_LOGD(LOG_TAG, "Passkey on device's display: %lu", event->passkey.params.numcmp);
                 pkey.action = event->passkey.params.action;
                 // Compatibility only - Do not use, should be removed the in future
                 if(NimBLEDevice::m_securityCallbacks != nullptr) {
@@ -1250,15 +1136,6 @@ std::string NimBLEClient::toString() {
 } // toString
 
 
-/**
- * @brief Get the last error code reported by the NimBLE host
- * @return int, the NimBLE error code.
- */
-int NimBLEClient::getLastError() {
-    return m_lastErr;
-} // getLastError
-
-
 void NimBLEClientCallbacks::onConnect(NimBLEClient* pClient) {
     NIMBLE_LOGD("NimBLEClientCallbacks", "onConnect: default");
 }
@@ -1293,4 +1170,5 @@ bool NimBLEClientCallbacks::onConfirmPIN(uint32_t pin){
     return true;
 }
 
-#endif /* CONFIG_BT_ENABLED && CONFIG_BT_NIMBLE_ROLE_CENTRAL */
+#endif // #if defined( CONFIG_BT_NIMBLE_ROLE_CENTRAL)
+#endif // CONFIG_BT_ENABLED

src/NimBLEClient.h

@@ -14,14 +14,16 @@
 #ifndef MAIN_NIMBLECLIENT_H_
 #define MAIN_NIMBLECLIENT_H_
 
+#include "sdkconfig.h"
+#if defined(CONFIG_BT_ENABLED)
+
 #include "nimconfig.h"
-#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_CENTRAL)
+#if defined(CONFIG_BT_NIMBLE_ROLE_CENTRAL)
 
 #include "NimBLEAddress.h"
 #include "NimBLEUUID.h"
 #include "NimBLEUtils.h"
 #include "NimBLEConnInfo.h"
-#include "NimBLEAttValue.h"
 #include "NimBLEAdvertisedDevice.h"
 #include "NimBLERemoteService.h"
 
@@ -38,9 +40,9 @@ class NimBLEAdvertisedDevice;
  */
 class NimBLEClient {
 public:
-    bool                                        connect(NimBLEAdvertisedDevice* device, bool deleteAttributes = true);
-    bool                                        connect(const NimBLEAddress &address, bool deleteAttributes = true);
-    bool                                        connect(bool deleteAttributes = true);
+    bool                                        connect(NimBLEAdvertisedDevice* device, bool deleteAttibutes = true);
+    bool                                        connect(const NimBLEAddress &address, bool deleteAttibutes = true);
+    bool                                        connect(bool deleteAttibutes = true);
     int                                         disconnect(uint8_t reason = BLE_ERR_REM_USER_CONN_TERM);
     NimBLEAddress                               getPeerAddress();
     void                                        setPeerAddress(const NimBLEAddress &address);
@@ -52,9 +54,9 @@ public:
     NimBLERemoteService*                        getService(const NimBLEUUID &uuid);
     void                                        deleteServices();
     size_t                                      deleteService(const NimBLEUUID &uuid);
-    NimBLEAttValue                              getValue(const NimBLEUUID &serviceUUID, const NimBLEUUID &characteristicUUID);
+    std::string                                 getValue(const NimBLEUUID &serviceUUID, const NimBLEUUID &characteristicUUID);
     bool                                        setValue(const NimBLEUUID &serviceUUID, const NimBLEUUID &characteristicUUID,
-                                                         const NimBLEAttValue &value, bool response = false);
+                                                         const std::string &value, bool response = false);
     NimBLERemoteCharacteristic*                 getCharacteristic(const uint16_t handle);
     bool                                        isConnected();
     void                                        setClientCallbacks(NimBLEClientCallbacks *pClientCallbacks,
@@ -69,13 +71,8 @@ public:
                                                                     uint16_t scanInterval=16, uint16_t scanWindow=16);
     void                                        updateConnParams(uint16_t minInterval, uint16_t maxInterval,
                                                                  uint16_t latency, uint16_t timeout);
-    void                                        setDataLen(uint16_t tx_octets);
-    bool                                        discoverAttributes();
+    void                                        discoverAttributes();
     NimBLEConnInfo                              getConnInfo();
-    int                                         getLastError();
-#if CONFIG_BT_NIMBLE_EXT_ADV
-    void                                        setConnectPhy(uint8_t mask);
-#endif
 
 private:
     NimBLEClient(const NimBLEAddress &peerAddress);
@@ -93,7 +90,6 @@ private:
     bool                    retrieveServices(const NimBLEUUID *uuid_filter = nullptr);
 
     NimBLEAddress           m_peerAddress;
-    int                     m_lastErr;
     uint16_t                m_conn_id;
     bool                    m_connEstablished;
     bool                    m_deleteCallbacks;
@@ -101,9 +97,6 @@ private:
     NimBLEClientCallbacks*  m_pClientCallbacks;
     ble_task_data_t*        m_pTaskData;
     ble_npl_callout         m_dcTimer;
-#if CONFIG_BT_NIMBLE_EXT_ADV
-    uint8_t                 m_phyMask;
-#endif
 
     std::vector<NimBLERemoteService*> m_servicesVector;
 
@@ -137,7 +130,7 @@ public:
      * @brief Called when server requests to update the connection parameters.
      * @param [in] pClient A pointer to the calling client object.
      * @param [in] params A pointer to the struct containing the connection parameters requested.
-     * @return True to accept the parameters.
+     * @return True to accept the parmeters.
      */
     virtual bool onConnParamsUpdateRequest(NimBLEClient* pClient, const ble_gap_upd_params* params);
 
@@ -165,5 +158,6 @@ public:
     virtual bool onConfirmPIN(uint32_t pin);
 };
 
-#endif /* CONFIG_BT_ENABLED && CONFIG_BT_NIMBLE_ROLE_CENTRAL */
+#endif // #if defined(CONFIG_BT_NIMBLE_ROLE_CENTRAL)
+#endif // CONFIG_BT_ENABLED
 #endif /* MAIN_NIMBLECLIENT_H_ */

src/NimBLEDescriptor.cpp

@@ -11,9 +11,11 @@
  *  Created on: Jun 22, 2017
  *      Author: kolban
  */
+#include "sdkconfig.h"
+#if defined(CONFIG_BT_ENABLED)
 
 #include "nimconfig.h"
-#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
+#if defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
 
 #include "NimBLEService.h"
 #include "NimBLEDescriptor.h"
@@ -28,34 +30,29 @@ static NimBLEDescriptorCallbacks defaultCallbacks;
 
 
 /**
- * @brief Construct a descriptor
- * @param [in] uuid - UUID (const char*) for the descriptor.
- * @param [in] properties - Properties for the descriptor.
- * @param [in] max_len - The maximum length in bytes that the descriptor value can hold. (Default: 512 bytes for esp32, 20 for all others).
- * @param [in] pCharacteristic - pointer to the characteristic instance this descriptor belongs to.
+ * @brief NimBLEDescriptor constructor.
  */
 NimBLEDescriptor::NimBLEDescriptor(const char* uuid, uint16_t properties, uint16_t max_len,
-                                   NimBLECharacteristic* pCharacteristic)
-: NimBLEDescriptor(NimBLEUUID(uuid), properties, max_len, pCharacteristic) {
+                                    NimBLECharacteristic* pCharacteristic)
+: NimBLEDescriptor(NimBLEUUID(uuid), max_len, properties, pCharacteristic) {
 }
 
 
 /**
- * @brief Construct a descriptor
- * @param [in] uuid - UUID (const char*) for the descriptor.
- * @param [in] properties - Properties for the descriptor.
- * @param [in] max_len - The maximum length in bytes that the descriptor value can hold. (Default: 512 bytes for esp32, 20 for all others).
- * @param [in] pCharacteristic - pointer to the characteristic instance this descriptor belongs to.
+ * @brief NimBLEDescriptor constructor.
  */
 NimBLEDescriptor::NimBLEDescriptor(NimBLEUUID uuid, uint16_t properties, uint16_t max_len,
                                     NimBLECharacteristic* pCharacteristic)
-:   m_value(std::min(CONFIG_NIMBLE_CPP_ATT_VALUE_INIT_LENGTH , (int)max_len), max_len) {
+{
     m_uuid               = uuid;
+    m_value.attr_len     = 0;                           // Initial length is 0.
+    m_value.attr_max_len = max_len;                     // Maximum length of the data.
     m_handle             = NULL_HANDLE;                 // Handle is initially unknown.
     m_pCharacteristic    = pCharacteristic;
     m_pCallbacks         = &defaultCallbacks;           // No initial callback.
+    m_value.attr_value   = (uint8_t*) calloc(max_len,1);  // Allocate storage for the value.
+    m_valMux             = portMUX_INITIALIZER_UNLOCKED;
     m_properties         = 0;
-    m_removed            = 0;
 
     if (properties & BLE_GATT_CHR_F_READ) {             // convert uint16_t properties to uint8_t
         m_properties |= BLE_ATT_F_READ;
@@ -89,6 +86,7 @@ NimBLEDescriptor::NimBLEDescriptor(NimBLEUUID uuid, uint16_t properties, uint16_
  * @brief NimBLEDescriptor destructor.
  */
 NimBLEDescriptor::~NimBLEDescriptor() {
+    free(m_value.attr_value);   // Release the storage we created in the constructor.
 } // ~NimBLEDescriptor
 
 /**
@@ -105,7 +103,7 @@ uint16_t NimBLEDescriptor::getHandle() {
  * @return The length (in bytes) of the value of this descriptor.
  */
 size_t NimBLEDescriptor::getLength() {
-    return m_value.size();
+    return m_value.attr_len;
 } // getLength
 
 
@@ -119,14 +117,10 @@ NimBLEUUID NimBLEDescriptor::getUUID() {
 
 /**
  * @brief Get the value of this descriptor.
- * @return The NimBLEAttValue of this descriptor.
+ * @return A pointer to the value of this descriptor.
  */
-NimBLEAttValue NimBLEDescriptor::getValue(time_t *timestamp) {
-    if (timestamp != nullptr) {
-        m_value.getValue(timestamp);
-    }
-
-    return m_value;
+uint8_t* NimBLEDescriptor::getValue() {
+    return m_value.attr_value;
 } // getValue
 
 
@@ -135,7 +129,7 @@ NimBLEAttValue NimBLEDescriptor::getValue(time_t *timestamp) {
  * @return A std::string instance containing a copy of the descriptor's value.
  */
 std::string NimBLEDescriptor::getStringValue() {
-    return std::string(m_value);
+    return std::string((char *) m_value.attr_value, m_value.attr_len);
 }
 
 
@@ -150,12 +144,8 @@ NimBLECharacteristic* NimBLEDescriptor::getCharacteristic() {
 
 int NimBLEDescriptor::handleGapEvent(uint16_t conn_handle, uint16_t attr_handle,
                                      struct ble_gatt_access_ctxt *ctxt, void *arg) {
-    (void)conn_handle;
-    (void)attr_handle;
-
     const ble_uuid_t *uuid;
     int rc;
-    struct ble_gap_conn_desc desc;
     NimBLEDescriptor* pDescriptor = (NimBLEDescriptor*)arg;
 
     NIMBLE_LOGD(LOG_TAG, "Descriptor %s %s event", pDescriptor->getUUID().toString().c_str(),
@@ -165,36 +155,29 @@ int NimBLEDescriptor::handleGapEvent(uint16_t conn_handle, uint16_t attr_handle,
     if(ble_uuid_cmp(uuid, &pDescriptor->getUUID().getNative()->u) == 0){
         switch(ctxt->op) {
             case BLE_GATT_ACCESS_OP_READ_DSC: {
-                rc = ble_gap_conn_find(conn_handle, &desc);
-                assert(rc == 0);
-
-                 // If the packet header is only 8 bytes 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 ||
-                   pDescriptor->m_value.size() <= (ble_att_mtu(desc.conn_handle) - 3)) {
+                // If the packet header is only 8 bytes 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) {
                     pDescriptor->m_pCallbacks->onRead(pDescriptor);
                 }
-
-                ble_npl_hw_enter_critical();
-                rc = os_mbuf_append(ctxt->om, pDescriptor->m_value.data(), pDescriptor->m_value.size());
-                ble_npl_hw_exit_critical(0);
+                portENTER_CRITICAL(&pDescriptor->m_valMux);
+                rc = os_mbuf_append(ctxt->om, pDescriptor->getValue(), pDescriptor->getLength());
+                portEXIT_CRITICAL(&pDescriptor->m_valMux);
                 return rc == 0 ? 0 : BLE_ATT_ERR_INSUFFICIENT_RES;
             }
 
             case BLE_GATT_ACCESS_OP_WRITE_DSC: {
-                uint16_t att_max_len = pDescriptor->m_value.max_size();
-
-                if (ctxt->om->om_len > att_max_len) {
+                if (ctxt->om->om_len > pDescriptor->m_value.attr_max_len) {
                     return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
                 }
 
-                uint8_t buf[att_max_len];
+                uint8_t buf[pDescriptor->m_value.attr_max_len];
                 size_t len = ctxt->om->om_len;
                 memcpy(buf, ctxt->om->om_data,len);
                 os_mbuf *next;
                 next = SLIST_NEXT(ctxt->om, om_next);
                 while(next != NULL){
-                    if((len + next->om_len) > att_max_len) {
+                    if((len + next->om_len) > pDescriptor->m_value.attr_max_len) {
                         return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
                     }
                     memcpy(&buf[len], next->om_data, next->om_len);
@@ -246,22 +229,28 @@ void NimBLEDescriptor::setHandle(uint16_t handle) {
  * @param [in] length The length of the data in bytes.
  */
 void NimBLEDescriptor::setValue(const uint8_t* data, size_t length) {
-    m_value.setValue(data, length);
+    if (length > m_value.attr_max_len) {
+        NIMBLE_LOGE(LOG_TAG, "Size %d too large, must be no bigger than %d", length, m_value.attr_max_len);
+        return;
+    }
+    portENTER_CRITICAL(&m_valMux);
+    m_value.attr_len = length;
+    memcpy(m_value.attr_value, data, length);
+    portEXIT_CRITICAL(&m_valMux);
 } // setValue
 
 
 /**
- * @brief Set the value of the descriptor from a `std::vector<uint8_t>`.\n
- * @param [in] vec The std::vector<uint8_t> reference to set the descriptor value from.
+ * @brief Set the value of the descriptor.
+ * @param [in] value The value of the descriptor in string form.
  */
-void NimBLEDescriptor::setValue(const std::vector<uint8_t>& vec) {
-    return setValue((uint8_t*)&vec[0], vec.size());
+void NimBLEDescriptor::setValue(const std::string &value) {
+    setValue((uint8_t*) value.data(), value.length());
 } // setValue
 
-
 /**
  * @brief Set the characteristic this descriptor belongs to.
- * @param [in] pChar A pointer to the characteristic this descriptor belongs to.
+ * @param [in] pChar A pointer to the characteristic this descriptior belongs to.
  */
 void NimBLEDescriptor::setCharacteristic(NimBLECharacteristic* pChar) {
     m_pCharacteristic = pChar;
@@ -287,7 +276,6 @@ NimBLEDescriptorCallbacks::~NimBLEDescriptorCallbacks() {}
  * @param [in] pDescriptor The descriptor that is the source of the event.
  */
 void NimBLEDescriptorCallbacks::onRead(NimBLEDescriptor* pDescriptor) {
-    (void)pDescriptor;
     NIMBLE_LOGD("NimBLEDescriptorCallbacks", "onRead: default");
 } // onRead
 
@@ -297,8 +285,8 @@ void NimBLEDescriptorCallbacks::onRead(NimBLEDescriptor* pDescriptor) {
  * @param [in] pDescriptor The descriptor that is the source of the event.
  */
 void NimBLEDescriptorCallbacks::onWrite(NimBLEDescriptor* pDescriptor) {
-    (void)pDescriptor;
     NIMBLE_LOGD("NimBLEDescriptorCallbacks", "onWrite: default");
 } // onWrite
 
-#endif /* CONFIG_BT_ENABLED && CONFIG_BT_NIMBLE_ROLE_PERIPHERAL */
+#endif // #if defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
+#endif /* CONFIG_BT_ENABLED */

src/NimBLEDescriptor.h

@@ -14,16 +14,25 @@
 
 #ifndef MAIN_NIMBLEDESCRIPTOR_H_
 #define MAIN_NIMBLEDESCRIPTOR_H_
+#include "sdkconfig.h"
+#if defined(CONFIG_BT_ENABLED)
 
 #include "nimconfig.h"
-#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
+#if defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
 
 #include "NimBLECharacteristic.h"
 #include "NimBLEUUID.h"
-#include "NimBLEAttValue.h"
 
 #include <string>
 
+
+typedef struct
+{
+    uint16_t attr_max_len;  /*!<  attribute max value length */
+    uint16_t attr_len;      /*!<  attribute current value length */
+    uint8_t  *attr_value;    /*!<  the pointer to attribute value */
+} attr_value_t;
+
 class NimBLEService;
 class NimBLECharacteristic;
 class NimBLEDescriptorCallbacks;
@@ -47,36 +56,24 @@ public:
     uint16_t              getHandle();
     NimBLEUUID            getUUID();
     std::string           toString();
+
     void                  setCallbacks(NimBLEDescriptorCallbacks* pCallbacks);
-    NimBLECharacteristic* getCharacteristic();
 
     size_t                getLength();
-    NimBLEAttValue        getValue(time_t *timestamp = nullptr);
+    uint8_t*              getValue();
     std::string           getStringValue();
 
     void                  setValue(const uint8_t* data, size_t size);
-    void                  setValue(const std::vector<uint8_t>& vec);
-
-    /*********************** Template Functions ************************/
+    void                  setValue(const std::string &value);
+    NimBLECharacteristic* getCharacteristic();
 
     /**
-     * @brief Template to set the characteristic value to <type\>val.
+     * @brief Convenience template to set the descriptor value to <type\>val.
      * @param [in] s The value to set.
      */
     template<typename T>
-    void setValue(const T &s) { m_value.setValue<T>(s); }
-
-    /**
-     * @brief Template to convert the descriptor data to <type\>.
-     * @tparam T The type to convert the data to.
-     * @param [in] timestamp (Optional) A pointer to a time_t struct to store the time the value was read.
-     * @param [in] skipSizeCheck (Optional) If true it will skip checking if the data size is less than <tt>sizeof(<type\>)</tt>.
-     * @return The data converted to <type\> or NULL if skipSizeCheck is false and the data is less than <tt>sizeof(<type\>)</tt>.
-     * @details <b>Use:</b> <tt>getValue<type>(&timestamp, skipSizeCheck);</tt>
-     */
-    template<typename T>
-    T getValue(time_t *timestamp = nullptr, bool skipSizeCheck = false) {
-        return m_value.getValue<T>(timestamp, skipSizeCheck);
+    void setValue(const T &s) {
+        setValue((uint8_t*)&s, sizeof(T));
     }
 
 private:
@@ -94,8 +91,8 @@ private:
     NimBLEDescriptorCallbacks* m_pCallbacks;
     NimBLECharacteristic*      m_pCharacteristic;
     uint8_t                    m_properties;
-    NimBLEAttValue             m_value;
-    uint8_t                    m_removed;
+    attr_value_t               m_value;
+    portMUX_TYPE               m_valMux;
 }; // NimBLEDescriptor
 
 
@@ -115,5 +112,6 @@ public:
 
 #include "NimBLE2904.h"
 
-#endif /* CONFIG_BT_ENABLED && CONFIG_BT_NIMBLE_ROLE_PERIPHERAL */
+#endif // #if defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
+#endif /* CONFIG_BT_ENABLED */
 #endif /* MAIN_NIMBLEDESCRIPTOR_H_ */

src/NimBLEDevice.cpp

@@ -11,45 +11,27 @@
  *  Created on: Mar 16, 2017
  *      Author: kolban
  */
+#include "sdkconfig.h"
+#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_NIMBLE_ENABLED)
 
 #include "nimconfig.h"
-#if defined(CONFIG_BT_ENABLED)
-
 #include "NimBLEDevice.h"
 #include "NimBLEUtils.h"
 
-#ifdef ESP_PLATFORM
-#  include "esp_err.h"
-#  include "esp_bt.h"
-#  include "nvs_flash.h"
-#  if defined(CONFIG_NIMBLE_CPP_IDF)
-#    include "esp_nimble_hci.h"
-#    include "nimble/nimble_port.h"
-#    include "nimble/nimble_port_freertos.h"
-#    include "host/ble_hs.h"
-#    include "host/ble_hs_pvcy.h"
-#    include "host/util/util.h"
-#    include "services/gap/ble_svc_gap.h"
-#    include "services/gatt/ble_svc_gatt.h"
-#  else
-#    include "nimble/esp_port/esp-hci/include/esp_nimble_hci.h"
-#  endif
-#else
-#  include "nimble/nimble/controller/include/controller/ble_phy.h"
-#endif
+#include "esp_err.h"
+#include "esp_bt.h"
+#include "nvs_flash.h"
+#include "esp_nimble_hci.h"
+#include "nimble/nimble_port.h"
+#include "nimble/nimble_port_freertos.h"
+#include "host/ble_hs.h"
+#include "host/ble_hs_pvcy.h"
+#include "host/util/util.h"
+#include "services/gap/ble_svc_gap.h"
+#include "services/gatt/ble_svc_gatt.h"
 
-#ifndef CONFIG_NIMBLE_CPP_IDF
-#  include "nimble/porting/nimble/include/nimble/nimble_port.h"
-#  include "nimble/porting/npl/freertos/include/nimble/nimble_port_freertos.h"
-#  include "nimble/nimble/host/include/host/ble_hs.h"
-#  include "nimble/nimble/host/include/host/ble_hs_pvcy.h"
-#  include "nimble/nimble/host/util/include/host/util/util.h"
-#  include "nimble/nimble/host/services/gap/include/services/gap/ble_svc_gap.h"
-#  include "nimble/nimble/host/services/gatt/include/services/gatt/ble_svc_gatt.h"
-#endif
-
-#if defined(ESP_PLATFORM) && defined(CONFIG_ENABLE_ARDUINO_DEPENDS)
-#  include "esp32-hal-bt.h"
+#if defined(CONFIG_ENABLE_ARDUINO_DEPENDS) && !defined(DONT_USE_ARDUINO_BULLSHIT)
+#include "esp32-hal-bt.h"
 #endif
 
 #include "NimBLELog.h"
@@ -69,11 +51,7 @@ NimBLEServer*   NimBLEDevice::m_pServer = nullptr;
 uint32_t        NimBLEDevice::m_passkey = 123456;
 bool            NimBLEDevice::m_synced = false;
 #if defined(CONFIG_BT_NIMBLE_ROLE_BROADCASTER)
-#  if CONFIG_BT_NIMBLE_EXT_ADV
-NimBLEExtAdvertising* NimBLEDevice::m_bleAdvertising = nullptr;
-#  else
 NimBLEAdvertising* NimBLEDevice::m_bleAdvertising = nullptr;
-#  endif
 #endif
 
 gap_event_handler           NimBLEDevice::m_customGapHandler = nullptr;
@@ -85,10 +63,9 @@ std::list <NimBLEAddress>   NimBLEDevice::m_ignoreList;
 std::vector<NimBLEAddress>  NimBLEDevice::m_whiteList;
 NimBLESecurityCallbacks*    NimBLEDevice::m_securityCallbacks = nullptr;
 uint8_t                     NimBLEDevice::m_own_addr_type = BLE_OWN_ADDR_PUBLIC;
-#ifdef ESP_PLATFORM
 uint16_t                    NimBLEDevice::m_scanDuplicateSize = CONFIG_BTDM_SCAN_DUPL_CACHE_SIZE;
 uint8_t                     NimBLEDevice::m_scanFilterMode = CONFIG_BTDM_SCAN_DUPL_TYPE;
-#endif
+
 
 /**
  * @brief Create a new instance of a server.
@@ -118,45 +95,6 @@ uint8_t                     NimBLEDevice::m_scanFilterMode = CONFIG_BTDM_SCAN_DU
 
 
 #if defined(CONFIG_BT_NIMBLE_ROLE_BROADCASTER)
-#  if CONFIG_BT_NIMBLE_EXT_ADV
-/**
- * @brief Get the instance of the advertising object.
- * @return A pointer to the advertising object.
- */
-NimBLEExtAdvertising* NimBLEDevice::getAdvertising() {
-    if(m_bleAdvertising == nullptr) {
-        m_bleAdvertising = new NimBLEExtAdvertising();
-    }
-    return m_bleAdvertising;
-}
-
-
-/**
- * @brief Convenience function to begin advertising.
- * @param [in] inst_id The extended advertisement instance ID to start.
- * @param [in] duration How long to advertise for in milliseconds, 0 = forever (default).
- * @param [in] max_events Maximum number of advertisement events to send, 0 = no limit (default).
- * @return True if advertising started successfully.
- */
-bool NimBLEDevice::startAdvertising(uint8_t inst_id,
-                                    int duration,
-                                    int max_events) {
-    return getAdvertising()->start(inst_id, duration, max_events);
-} // startAdvertising
-
-
-/**
- * @brief Convenience function to stop advertising a data set.
- * @param [in] inst_id The extended advertisement instance ID to stop advertising.
- * @return True if advertising stopped successfully.
- */
-bool NimBLEDevice::stopAdvertising(uint8_t inst_id) {
-    return getAdvertising()->stop(inst_id);
-} // stopAdvertising
-
-#  endif
-
-#  if !CONFIG_BT_NIMBLE_EXT_ADV || defined(_DOXYGEN_)
 /**
  * @brief Get the instance of the advertising object.
  * @return A pointer to the advertising object.
@@ -171,19 +109,17 @@ NimBLEAdvertising* NimBLEDevice::getAdvertising() {
 
 /**
  * @brief Convenience function to begin advertising.
- * @return True if advertising started successfully.
  */
-bool NimBLEDevice::startAdvertising() {
-    return getAdvertising()->start();
+void NimBLEDevice::startAdvertising() {
+    getAdvertising()->start();
 } // startAdvertising
-#  endif
+
 
 /**
- * @brief Convenience function to stop all advertising.
- * @return True if advertising stopped successfully.
+ * @brief Convenience function to stop advertising.
  */
-bool NimBLEDevice::stopAdvertising() {
-    return getAdvertising()->stop();
+void NimBLEDevice::stopAdvertising() {
+    getAdvertising()->stop();
 } // stopAdvertising
 #endif // #if defined(CONFIG_BT_NIMBLE_ROLE_BROADCASTER)
 
@@ -194,8 +130,7 @@ bool NimBLEDevice::stopAdvertising() {
  * try and release/delete it.
  */
 #if defined(CONFIG_BT_NIMBLE_ROLE_OBSERVER)
-/* STATIC */
-NimBLEScan* NimBLEDevice::getScan() {
+/* STATIC */ NimBLEScan* NimBLEDevice::getScan() {
     if (m_pScan == nullptr) {
         m_pScan = new NimBLEScan();
     }
@@ -212,8 +147,7 @@ NimBLEScan* NimBLEDevice::getScan() {
  * @return A reference to the new client object.
  */
 #if defined(CONFIG_BT_NIMBLE_ROLE_CENTRAL)
-/* STATIC */
-NimBLEClient* NimBLEDevice::createClient(NimBLEAddress peerAddress) {
+/* STATIC */ NimBLEClient* NimBLEDevice::createClient(NimBLEAddress peerAddress) {
     if(m_cList.size() >= NIMBLE_MAX_CONNECTIONS) {
         NIMBLE_LOGW(LOG_TAG,"Number of clients exceeds Max connections. Cur=%d Max=%d",
                     m_cList.size(), NIMBLE_MAX_CONNECTIONS);
@@ -231,8 +165,7 @@ NimBLEClient* NimBLEDevice::createClient(NimBLEAddress peerAddress) {
  * Checks if it is connected or trying to connect and disconnects/stops it first.
  * @param [in] pClient A pointer to the client object.
  */
-/* STATIC */
-bool NimBLEDevice::deleteClient(NimBLEClient* pClient) {
+/* STATIC */ bool NimBLEDevice::deleteClient(NimBLEClient* pClient) {
     if(pClient == nullptr) {
         return false;
     }
@@ -276,8 +209,7 @@ bool NimBLEDevice::deleteClient(NimBLEClient* pClient) {
  * @brief Get the list of created client objects.
  * @return A pointer to the list of clients.
  */
-/* STATIC */
-std::list<NimBLEClient*>* NimBLEDevice::getClientList() {
+/* STATIC */std::list<NimBLEClient*>* NimBLEDevice::getClientList() {
     return &m_cList;
 } // getClientList
 
@@ -286,8 +218,7 @@ std::list<NimBLEClient*>* NimBLEDevice::getClientList() {
  * @brief Get the number of created client objects.
  * @return Number of client objects created.
  */
-/* STATIC */
-size_t NimBLEDevice::getClientListSize() {
+/* STATIC */size_t NimBLEDevice::getClientListSize() {
     return m_cList.size();
 } // getClientList
 
@@ -297,8 +228,7 @@ size_t NimBLEDevice::getClientListSize() {
  * @param [in] conn_id The client connection ID to search for.
  * @return A pointer to the client object with the spcified connection ID.
  */
-/* STATIC */
-NimBLEClient* NimBLEDevice::getClientByID(uint16_t conn_id) {
+/* STATIC */NimBLEClient* NimBLEDevice::getClientByID(uint16_t conn_id) {
     for(auto it = m_cList.cbegin(); it != m_cList.cend(); ++it) {
         if((*it)->getConnId() == conn_id) {
             return (*it);
@@ -314,8 +244,7 @@ NimBLEClient* NimBLEDevice::getClientByID(uint16_t conn_id) {
  * @param [in] peer_addr The address of the peer to search for.
  * @return A pointer to the client object with the peer address.
  */
-/* STATIC */
-NimBLEClient* NimBLEDevice::getClientByPeerAddress(const NimBLEAddress &peer_addr) {
+/* STATIC */NimBLEClient* NimBLEDevice::getClientByPeerAddress(const NimBLEAddress &peer_addr) {
     for(auto it = m_cList.cbegin(); it != m_cList.cend(); ++it) {
         if((*it)->getPeerAddress().equals(peer_addr)) {
             return (*it);
@@ -329,8 +258,7 @@ NimBLEClient* NimBLEDevice::getClientByPeerAddress(const NimBLEAddress &peer_add
  * @brief Finds the first disconnected client in the list.
  * @return A pointer to the first client object that is not connected to a peer.
  */
-/* STATIC */
-NimBLEClient* NimBLEDevice::getDisconnectedClient() {
+/* STATIC */NimBLEClient* NimBLEDevice::getDisconnectedClient() {
     for(auto it = m_cList.cbegin(); it != m_cList.cend(); ++it) {
         if(!(*it)->isConnected()) {
             return (*it);
@@ -341,7 +269,7 @@ NimBLEClient* NimBLEDevice::getDisconnectedClient() {
 
 #endif // #if defined(CONFIG_BT_NIMBLE_ROLE_CENTRAL)
 
-#ifdef ESP_PLATFORM
+
 /**
  * @brief Set the transmission power.
  * @param [in] powerLevel The power level to set, can be one of:
@@ -367,15 +295,12 @@ NimBLEClient* NimBLEDevice::getDisconnectedClient() {
  * *   ESP_BLE_PWR_TYPE_SCAN       = 10, For scan
  * *   ESP_BLE_PWR_TYPE_DEFAULT    = 11, For default, if not set other, it will use default value
  */
-/* STATIC */
-void NimBLEDevice::setPower(esp_power_level_t powerLevel, esp_ble_power_type_t powerType) {
+/* STATIC */ void NimBLEDevice::setPower(esp_power_level_t powerLevel, esp_ble_power_type_t powerType) {
     NIMBLE_LOGD(LOG_TAG, ">> setPower: %d (type: %d)", powerLevel, powerType);
-
     esp_err_t errRc = esp_ble_tx_power_set(powerType, powerLevel);
     if (errRc != ESP_OK) {
         NIMBLE_LOGE(LOG_TAG, "esp_ble_tx_power_set: rc=%d", errRc);
     }
-
     NIMBLE_LOGD(LOG_TAG, "<< setPower");
 } // setPower
 
@@ -397,8 +322,9 @@ void NimBLEDevice::setPower(esp_power_level_t powerLevel, esp_ble_power_type_t p
  * *   ESP_BLE_PWR_TYPE_DEFAULT    = 11, For default, if not set other, it will use default value
  * @return the power level currently used by the type specified.
  */
-/* STATIC */
-int NimBLEDevice::getPower(esp_ble_power_type_t powerType) {
+
+/* STATIC */ int NimBLEDevice::getPower(esp_ble_power_type_t powerType) {
+
     switch(esp_ble_tx_power_get(powerType)) {
         case ESP_PWR_LVL_N12:
             return -12;
@@ -421,25 +347,13 @@ int NimBLEDevice::getPower(esp_ble_power_type_t powerType) {
     }
 } // getPower
 
-#else
-
-void NimBLEDevice::setPower(int dbm) {
-    ble_phy_txpwr_set(dbm);
-}
-
-
-int NimBLEDevice::getPower() {
-    return ble_phy_txpwr_get();
-}
-#endif
 
 /**
  * @brief Get our device address.
  * @return A NimBLEAddress object of our public address if we have one,
  * if not then our current random address.
  */
-/* STATIC*/
-NimBLEAddress NimBLEDevice::getAddress() {
+/* STATIC*/ NimBLEAddress NimBLEDevice::getAddress() {
     ble_addr_t addr = {BLE_ADDR_PUBLIC, 0};
 
     if(BLE_HS_ENOADDR == ble_hs_id_copy_addr(BLE_ADDR_PUBLIC, addr.val, NULL)) {
@@ -456,8 +370,7 @@ NimBLEAddress NimBLEDevice::getAddress() {
  * @brief Return a string representation of the address of this device.
  * @return A string representation of this device address.
  */
-/* STATIC */
-std::string NimBLEDevice::toString() {
+/* STATIC */ std::string NimBLEDevice::toString() {
     return getAddress().toString();
 } // toString
 
@@ -467,8 +380,7 @@ std::string NimBLEDevice::toString() {
  * @param [in] mtu Value to set local mtu:
  * * This should be larger than 23 and lower or equal to BLE_ATT_MTU_MAX = 527.
  */
-/* STATIC */
-int NimBLEDevice::setMTU(uint16_t mtu) {
+/* STATIC */int NimBLEDevice::setMTU(uint16_t mtu) {
     NIMBLE_LOGD(LOG_TAG, ">> setLocalMTU: %d", mtu);
 
     int rc =  ble_att_set_preferred_mtu(mtu);
@@ -486,13 +398,11 @@ int NimBLEDevice::setMTU(uint16_t mtu) {
  * @brief Get local MTU value set.
  * @return The current preferred MTU setting.
  */
-/* STATIC */
-uint16_t NimBLEDevice::getMTU() {
+/* STATIC */uint16_t NimBLEDevice::getMTU() {
     return ble_att_preferred_mtu();
 }
 
 
-#ifdef ESP_PLATFORM
 /**
  * @brief Set the duplicate filter cache size for filtering scanned devices.
  * @param [in] cacheSize The number of advertisements filtered before the cache is reset.\n
@@ -538,7 +448,6 @@ void NimBLEDevice::setScanFilterMode(uint8_t mode) {
 
     m_scanFilterMode = mode;
 }
-#endif
 
 #if defined(CONFIG_BT_NIMBLE_ROLE_CENTRAL) || defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
 /**
@@ -561,7 +470,7 @@ int NimBLEDevice::getNumBonds() {
 /**
  * @brief Deletes all bonding information.
  */
-/*STATIC*/
+ /*STATIC*/
 void NimBLEDevice::deleteAllBonds() {
     ble_store_clear();
 }
@@ -641,7 +550,6 @@ NimBLEAddress NimBLEDevice::getBondedAddress(int index) {
  * @param [in] address The address to check for in the whitelist.
  * @returns true if the address is in the whitelist.
  */
-/*STATIC*/
 bool NimBLEDevice::onWhiteList(const NimBLEAddress & address) {
     for (auto &it : m_whiteList) {
         if (it == address) {
@@ -658,7 +566,6 @@ bool NimBLEDevice::onWhiteList(const NimBLEAddress & address) {
  * @param [in] address The address to add to the whitelist.
  * @returns true if successful.
  */
-/*STATIC*/
 bool NimBLEDevice::whiteListAdd(const NimBLEAddress & address) {
     if (NimBLEDevice::onWhiteList(address)) {
         return true;
@@ -690,7 +597,6 @@ bool NimBLEDevice::whiteListAdd(const NimBLEAddress & address) {
  * @param [in] address The address to remove from the whitelist.
  * @returns true if successful.
  */
-/*STATIC*/
 bool NimBLEDevice::whiteListRemove(const NimBLEAddress & address) {
     if (!NimBLEDevice::onWhiteList(address)) {
         return true;
@@ -730,7 +636,6 @@ bool NimBLEDevice::whiteListRemove(const NimBLEAddress & address) {
  * @brief Gets the count of addresses in the whitelist.
  * @returns The number of addresses in the whitelist.
  */
-/*STATIC*/
 size_t NimBLEDevice::getWhiteListCount() {
     return m_whiteList.size();
 }
@@ -741,7 +646,6 @@ size_t NimBLEDevice::getWhiteListCount() {
  * @param [in] index The vector index to retrieve the address from.
  * @returns the NimBLEAddress at the whitelist index or nullptr if not found.
  */
-/*STATIC*/
 NimBLEAddress NimBLEDevice::getWhiteListAddress(size_t index) {
     if (index > m_whiteList.size()) {
         NIMBLE_LOGE(LOG_TAG, "Invalid index; %u", index);
@@ -755,8 +659,7 @@ NimBLEAddress NimBLEDevice::getWhiteListAddress(size_t index) {
  * @brief Host reset, we pass the message so we don't make calls until resynced.
  * @param [in] reason The reason code for the reset.
  */
-/* STATIC */
-void NimBLEDevice::onReset(int reason)
+/* STATIC */  void NimBLEDevice::onReset(int reason)
 {
     if(!m_synced) {
         return;
@@ -780,8 +683,7 @@ void NimBLEDevice::onReset(int reason)
 /**
  * @brief Host resynced with controller, all clear to make calls to the stack.
  */
-/* STATIC */
-void NimBLEDevice::onSync(void)
+/* STATIC */ void NimBLEDevice::onSync(void)
 {
     NIMBLE_LOGI(LOG_TAG, "NimBle host synced.");
     // This check is needed due to potentially being called multiple times in succession
@@ -794,15 +696,7 @@ void NimBLEDevice::onSync(void)
     int rc = ble_hs_util_ensure_addr(0);
     assert(rc == 0);
 
-#ifndef ESP_PLATFORM
-    rc = ble_hs_id_infer_auto(m_own_addr_type, &m_own_addr_type);
-    if (rc != 0) {
-        NIMBLE_LOGE(LOG_TAG, "error determining address type; rc=%d", rc);
-        return;
-    }
-#endif
-
-    // Yield for housekeeping before returning to operations.
+    // Yield for houskeeping before returning to operations.
     // Occasionally triggers exception without.
     taskYIELD();
 
@@ -827,11 +721,9 @@ void NimBLEDevice::onSync(void)
 /**
  * @brief The main host task.
  */
-/* STATIC */
-void NimBLEDevice::host_task(void *param)
+/* STATIC */ void NimBLEDevice::host_task(void *param)
 {
     NIMBLE_LOGI(LOG_TAG, "BLE Host Task Started");
-
     /* This function will return only when nimble_port_stop() is executed */
     nimble_port_run();
 
@@ -843,15 +735,13 @@ void NimBLEDevice::host_task(void *param)
  * @brief Initialize the %BLE environment.
  * @param [in] deviceName The device name of the device.
  */
-/* STATIC */
-void NimBLEDevice::init(const std::string &deviceName) {
+/* STATIC */ void NimBLEDevice::init(const std::string &deviceName) {
     if(!initialized){
         int rc=0;
-#ifdef ESP_PLATFORM
         esp_err_t errRc = ESP_OK;
 
-#ifdef CONFIG_ENABLE_ARDUINO_DEPENDS
-        // make sure the linker includes esp32-hal-bt.c so Arduino init doesn't release BLE memory.
+#if defined(CONFIG_ENABLE_ARDUINO_DEPENDS) && !defined(DONT_USE_ARDUINO_BULLSHIT)
+        // make sure the linker includes esp32-hal-bt.c so ardruino init doesn't release BLE memory.
         btStarted();
 #endif
 
@@ -867,19 +757,14 @@ void NimBLEDevice::init(const std::string &deviceName) {
         esp_bt_controller_mem_release(ESP_BT_MODE_CLASSIC_BT);
 
         esp_bt_controller_config_t bt_cfg = BT_CONTROLLER_INIT_CONFIG_DEFAULT();
-#if  defined (CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32S3)
-        bt_cfg.bluetooth_mode = ESP_BT_MODE_BLE;
-#else
         bt_cfg.mode = ESP_BT_MODE_BLE;
         bt_cfg.ble_max_conn = CONFIG_BT_NIMBLE_MAX_CONNECTIONS;
-#endif
         bt_cfg.normal_adv_size = m_scanDuplicateSize;
         bt_cfg.scan_duplicate_type = m_scanFilterMode;
 
         ESP_ERROR_CHECK(esp_bt_controller_init(&bt_cfg));
         ESP_ERROR_CHECK(esp_bt_controller_enable(ESP_BT_MODE_BLE));
         ESP_ERROR_CHECK(esp_nimble_hci_init());
-#endif
         nimble_port_init();
 
         // Setup callbacks for host events
@@ -898,16 +783,17 @@ void NimBLEDevice::init(const std::string &deviceName) {
 
         // Set the device name.
         rc = ble_svc_gap_device_name_set(deviceName.c_str());
+        if (rc != 0)
+            NIMBLE_LOGE(LOG_TAG, "ble_svc_gap_device_name_set() failed %i name_size=%zd", rc, deviceName.size());
         assert(rc == 0);
 
         ble_store_config_init();
 
         nimble_port_freertos_init(NimBLEDevice::host_task);
     }
-
     // Wait for host and controller to sync before returning and accepting new tasks
     while(!m_synced){
-        taskYIELD();
+        vTaskDelay(1 / portTICK_PERIOD_MS);
     }
 
     initialized = true; // Set the initialization flag to ensure we are only initialized once.
@@ -919,17 +805,18 @@ void NimBLEDevice::init(const std::string &deviceName) {
  * @param [in] clearAll If true, deletes all server/advertising/scan/client objects after deinitializing.
  * @note If clearAll is true when called, any references to the created objects become invalid.
  */
-/* STATIC */
-void NimBLEDevice::deinit(bool clearAll) {
+/* STATIC */ void NimBLEDevice::deinit(bool clearAll) {
     int ret = nimble_port_stop();
     if (ret == 0) {
         nimble_port_deinit();
-#ifdef ESP_PLATFORM
+
+#if 0
         ret = esp_nimble_hci_and_controller_deinit();
         if (ret != ESP_OK) {
             NIMBLE_LOGE(LOG_TAG, "esp_nimble_hci_and_controller_deinit() failed with error: %d", ret);
         }
 #endif
+
         initialized = false;
         m_synced = false;
 
@@ -976,7 +863,6 @@ void NimBLEDevice::deinit(bool clearAll) {
  * @brief Check if the initialization is complete.
  * @return true if initialized.
  */
-/*STATIC*/
 bool NimBLEDevice::getInitialized() {
     return initialized;
 } // getInitialized
@@ -988,8 +874,7 @@ bool NimBLEDevice::getInitialized() {
  * @param mitm If true we are capable of man in the middle protection, false if not.
  * @param sc If true we will perform secure connection pairing, false we will use legacy pairing.
  */
-/*STATIC*/
-void NimBLEDevice::setSecurityAuth(bool bonding, bool mitm, bool sc) {
+/*STATIC*/ void NimBLEDevice::setSecurityAuth(bool bonding, bool mitm, bool sc) {
     NIMBLE_LOGD(LOG_TAG, "Setting bonding: %d, mitm: %d, sc: %d",bonding,mitm,sc);
     ble_hs_cfg.sm_bonding = bonding;
     ble_hs_cfg.sm_mitm = mitm;
@@ -1006,8 +891,7 @@ void NimBLEDevice::setSecurityAuth(bool bonding, bool mitm, bool sc) {
  * * 0x08 BLE_SM_PAIR_AUTHREQ_SC
  * * 0x10 BLE_SM_PAIR_AUTHREQ_KEYPRESS  - not yet supported.
  */
-/*STATIC*/
-void NimBLEDevice::setSecurityAuth(uint8_t auth_req) {
+/*STATIC*/void NimBLEDevice::setSecurityAuth(uint8_t auth_req) {
     NimBLEDevice::setSecurityAuth((auth_req & BLE_SM_PAIR_AUTHREQ_BOND)>0,
                                 (auth_req & BLE_SM_PAIR_AUTHREQ_MITM)>0,
                                 (auth_req & BLE_SM_PAIR_AUTHREQ_SC)>0);
@@ -1023,8 +907,7 @@ void NimBLEDevice::setSecurityAuth(uint8_t auth_req) {
  * * 0x03 BLE_HS_IO_NO_INPUT_OUTPUT      NoInputNoOutput IO capability
  * * 0x04 BLE_HS_IO_KEYBOARD_DISPLAY     KeyboardDisplay Only IO capability
  */
-/*STATIC*/
-void NimBLEDevice::setSecurityIOCap(uint8_t iocap) {
+/*STATIC*/ void NimBLEDevice::setSecurityIOCap(uint8_t iocap) {
     ble_hs_cfg.sm_io_cap = iocap;
 } // setSecurityIOCap
 
@@ -1038,8 +921,7 @@ void NimBLEDevice::setSecurityIOCap(uint8_t iocap) {
  * * 0x04: BLE_SM_PAIR_KEY_DIST_SIGN
  * * 0x08: BLE_SM_PAIR_KEY_DIST_LINK
  */
-/*STATIC*/
-void NimBLEDevice::setSecurityInitKey(uint8_t init_key) {
+/*STATIC*/void NimBLEDevice::setSecurityInitKey(uint8_t init_key) {
     ble_hs_cfg.sm_our_key_dist = init_key;
 } // setsSecurityInitKey
 
@@ -1053,8 +935,7 @@ void NimBLEDevice::setSecurityInitKey(uint8_t init_key) {
  * * 0x04: BLE_SM_PAIR_KEY_DIST_SIGN
  * * 0x08: BLE_SM_PAIR_KEY_DIST_LINK
  */
-/*STATIC*/
-void NimBLEDevice::setSecurityRespKey(uint8_t resp_key) {
+/*STATIC*/void NimBLEDevice::setSecurityRespKey(uint8_t resp_key) {
     ble_hs_cfg.sm_their_key_dist = resp_key;
 } // setsSecurityRespKey
 
@@ -1063,8 +944,7 @@ void NimBLEDevice::setSecurityRespKey(uint8_t resp_key) {
  * @brief Set the passkey the server will ask for when pairing.
  * @param [in] pin The passkey to use.
  */
-/*STATIC*/
-void NimBLEDevice::setSecurityPasskey(uint32_t pin) {
+/*STATIC*/void NimBLEDevice::setSecurityPasskey(uint32_t pin) {
     m_passkey = pin;
 } // setSecurityPasskey
 
@@ -1073,8 +953,7 @@ void NimBLEDevice::setSecurityPasskey(uint32_t pin) {
  * @brief Get the current passkey used for pairing.
  * @return The current passkey.
  */
-/*STATIC*/
-uint32_t NimBLEDevice::getSecurityPasskey() {
+/*STATIC*/uint32_t NimBLEDevice::getSecurityPasskey() {
     return m_passkey;
 } // getSecurityPasskey
 
@@ -1084,13 +963,11 @@ uint32_t NimBLEDevice::getSecurityPasskey() {
  * @param [in] callbacks Pointer to NimBLESecurityCallbacks class
  * @deprecated For backward compatibility, New code should use client/server callback methods.
  */
-/*STATIC*/
 void NimBLEDevice::setSecurityCallbacks(NimBLESecurityCallbacks* callbacks) {
     NimBLEDevice::m_securityCallbacks = callbacks;
 } // setSecurityCallbacks
 
 
-#ifdef ESP_PLATFORM
 /**
  * @brief Set the own address type.
  * @param [in] own_addr_type Own Bluetooth Device address type.\n
@@ -1101,39 +978,35 @@ void NimBLEDevice::setSecurityCallbacks(NimBLESecurityCallbacks* callbacks) {
  * * 0x03: BLE_OWN_ADDR_RPA_RANDOM_DEFAULT
  * @param [in] useNRPA If true, and address type is random, uses a non-resolvable random address.
  */
-/*STATIC*/
 void NimBLEDevice::setOwnAddrType(uint8_t own_addr_type, bool useNRPA) {
     m_own_addr_type = own_addr_type;
     switch (own_addr_type) {
-#ifdef CONFIG_IDF_TARGET_ESP32
         case BLE_OWN_ADDR_PUBLIC:
             ble_hs_pvcy_rpa_config(NIMBLE_HOST_DISABLE_PRIVACY);
             break;
-#endif
         case BLE_OWN_ADDR_RANDOM:
             setSecurityInitKey(BLE_SM_PAIR_KEY_DIST_ENC | BLE_SM_PAIR_KEY_DIST_ID);
-#ifdef CONFIG_IDF_TARGET_ESP32
             ble_hs_pvcy_rpa_config(useNRPA ? NIMBLE_HOST_ENABLE_NRPA : NIMBLE_HOST_ENABLE_RPA);
-#endif
             break;
         case BLE_OWN_ADDR_RPA_PUBLIC_DEFAULT:
         case BLE_OWN_ADDR_RPA_RANDOM_DEFAULT:
             setSecurityInitKey(BLE_SM_PAIR_KEY_DIST_ENC | BLE_SM_PAIR_KEY_DIST_ID);
-#ifdef CONFIG_IDF_TARGET_ESP32
             ble_hs_pvcy_rpa_config(NIMBLE_HOST_ENABLE_RPA);
-#endif
             break;
     }
 } // setOwnAddrType
-#endif
+
 
 /**
  * @brief Start the connection securing and authorization for this connection.
  * @param conn_id The connection id of the peer device.
  * @returns NimBLE stack return code, 0 = success.
  */
-/* STATIC */
-int NimBLEDevice::startSecurity(uint16_t conn_id) {
+/* STATIC */int NimBLEDevice::startSecurity(uint16_t conn_id) {
+  /*  if(m_securityCallbacks != nullptr) {
+        m_securityCallbacks->onSecurityRequest();
+    }
+  */
     int rc = ble_gap_security_initiate(conn_id);
     if(rc != 0){
         NIMBLE_LOGE(LOG_TAG, "ble_gap_security_initiate: rc=%d %s", rc, NimBLEUtils::returnCodeToString(rc));
@@ -1148,8 +1021,7 @@ int NimBLEDevice::startSecurity(uint16_t conn_id) {
  * @param [in] address The address to look for.
  * @return True if ignoring.
  */
-/*STATIC*/
-bool NimBLEDevice::isIgnored(const NimBLEAddress &address) {
+/*STATIC*/ bool NimBLEDevice::isIgnored(const NimBLEAddress &address) {
     for(auto &it : m_ignoreList) {
         if(it.equals(address)){
             return true;
@@ -1164,8 +1036,7 @@ bool NimBLEDevice::isIgnored(const NimBLEAddress &address) {
  * @brief Add a device to the ignore list.
  * @param [in] address The address of the device we want to ignore.
  */
-/*STATIC*/
-void NimBLEDevice::addIgnored(const NimBLEAddress &address) {
+/*STATIC*/ void NimBLEDevice::addIgnored(const NimBLEAddress &address) {
     m_ignoreList.push_back(address);
 }
 
@@ -1174,8 +1045,7 @@ void NimBLEDevice::addIgnored(const NimBLEAddress &address) {
  * @brief Remove a device from the ignore list.
  * @param [in] address The address of the device we want to remove from the list.
  */
-/*STATIC*/
-void  NimBLEDevice::removeIgnored(const NimBLEAddress &address) {
+/*STATIC*/void  NimBLEDevice::removeIgnored(const NimBLEAddress &address) {
     for(auto it = m_ignoreList.begin(); it != m_ignoreList.end(); ++it) {
         if((*it).equals(address)){
             m_ignoreList.erase(it);
@@ -1189,7 +1059,6 @@ void  NimBLEDevice::removeIgnored(const NimBLEAddress &address) {
  * @brief Set a custom callback for gap events.
  * @param [in] handler The function to call when gap events occur.
  */
-/*STATIC*/
 void NimBLEDevice::setCustomGapHandler(gap_event_handler handler) {
     m_customGapHandler = handler;
     int rc = ble_gap_event_listener_register(&m_listener, m_customGapHandler, NULL);
@@ -1201,4 +1070,5 @@ void NimBLEDevice::setCustomGapHandler(gap_event_handler handler) {
     }
 } // setCustomGapHandler
 
+
 #endif // CONFIG_BT_ENABLED

src/NimBLEDevice.h

@@ -14,20 +14,17 @@
 
 #ifndef MAIN_NIMBLEDEVICE_H_
 #define MAIN_NIMBLEDEVICE_H_
+#include "sdkconfig.h"
+#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_NIMBLE_ENABLED)
 
 #include "nimconfig.h"
-#if defined(CONFIG_BT_ENABLED)
 
 #if defined(CONFIG_BT_NIMBLE_ROLE_OBSERVER)
 #include "NimBLEScan.h"
 #endif
 
 #if defined(CONFIG_BT_NIMBLE_ROLE_BROADCASTER)
-#  if CONFIG_BT_NIMBLE_EXT_ADV
-#    include "NimBLEExtAdvertising.h"
-#  else
-#    include "NimBLEAdvertising.h"
-#  endif
+#include "NimBLEAdvertising.h"
 #endif
 
 #if defined(CONFIG_BT_NIMBLE_ROLE_CENTRAL)
@@ -42,9 +39,7 @@
 #include "NimBLESecurity.h"
 #include "NimBLEAddress.h"
 
-#ifdef ESP_PLATFORM
-#  include "esp_bt.h"
-#endif
+#include "esp_bt.h"
 
 #include <map>
 #include <string>
@@ -115,17 +110,8 @@ public:
     static NimBLEServer*    getServer();
 #endif
 
-#ifdef ESP_PLATFORM
     static void             setPower(esp_power_level_t powerLevel, esp_ble_power_type_t powerType=ESP_BLE_PWR_TYPE_DEFAULT);
     static int              getPower(esp_ble_power_type_t powerType=ESP_BLE_PWR_TYPE_DEFAULT);
-    static void             setOwnAddrType(uint8_t own_addr_type, bool useNRPA=false);
-    static void             setScanDuplicateCacheSize(uint16_t cacheSize);
-    static void             setScanFilterMode(uint8_t type);
-#else
-    static void             setPower(int dbm);
-    static int              getPower();
-#endif
-
     static void             setCustomGapHandler(gap_event_handler handler);
     static void             setSecurityAuth(bool bonding, bool mitm, bool sc);
     static void             setSecurityAuth(uint8_t auth_req);
@@ -135,26 +121,20 @@ public:
     static void             setSecurityPasskey(uint32_t pin);
     static uint32_t         getSecurityPasskey();
     static void             setSecurityCallbacks(NimBLESecurityCallbacks* pCallbacks);
+    static void             setOwnAddrType(uint8_t own_addr_type, bool useNRPA=false);
     static int              startSecurity(uint16_t conn_id);
     static int              setMTU(uint16_t mtu);
     static uint16_t         getMTU();
     static bool             isIgnored(const NimBLEAddress &address);
     static void             addIgnored(const NimBLEAddress &address);
     static void             removeIgnored(const NimBLEAddress &address);
+    static void             setScanDuplicateCacheSize(uint16_t cacheSize);
+    static void             setScanFilterMode(uint8_t type);
 
 #if defined(CONFIG_BT_NIMBLE_ROLE_BROADCASTER)
-#  if CONFIG_BT_NIMBLE_EXT_ADV
-    static NimBLEExtAdvertising* getAdvertising();
-    static bool                  startAdvertising(uint8_t inst_id,
-                                                  int duration = 0,
-                                                  int max_events = 0);
-    static bool                  stopAdvertising(uint8_t inst_id);
-    static bool                  stopAdvertising();
-#  else
-    static NimBLEAdvertising*    getAdvertising();
-    static bool                  startAdvertising();
-    static bool                  stopAdvertising();
-#  endif
+    static NimBLEAdvertising* getAdvertising();
+    static void               startAdvertising();
+    static void               stopAdvertising();
 #endif
 
 #if defined( CONFIG_BT_NIMBLE_ROLE_CENTRAL)
@@ -191,10 +171,6 @@ private:
 
 #if defined(CONFIG_BT_NIMBLE_ROLE_BROADCASTER)
     friend class NimBLEAdvertising;
-#  if CONFIG_BT_NIMBLE_EXT_ADV
-    friend class NimBLEExtAdvertising;
-    friend class NimBLEExtAdvertisement;
-#  endif
 #endif
 
     static void        onReset(int reason);
@@ -211,11 +187,7 @@ private:
 #endif
 
 #if defined(CONFIG_BT_NIMBLE_ROLE_BROADCASTER)
-#  if CONFIG_BT_NIMBLE_EXT_ADV
-    static NimBLEExtAdvertising*      m_bleAdvertising;
-#  else
     static NimBLEAdvertising*         m_bleAdvertising;
-#  endif
 #endif
 
 #if defined( CONFIG_BT_NIMBLE_ROLE_CENTRAL)
@@ -227,10 +199,8 @@ private:
     static ble_gap_event_listener     m_listener;
     static gap_event_handler          m_customGapHandler;
     static uint8_t                    m_own_addr_type;
-#ifdef ESP_PLATFORM
     static uint16_t                   m_scanDuplicateSize;
     static uint8_t                    m_scanFilterMode;
-#endif
     static std::vector<NimBLEAddress> m_whiteList;
 };
 

src/NimBLEEddystoneTLM.cpp

@@ -11,14 +11,12 @@
  *  Created on: Mar 12, 2018
  *      Author: pcbreflux
  */
-
-#include "nimconfig.h"
-#if defined(CONFIG_BT_ENABLED)
+#include "sdkconfig.h"
+#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_NIMBLE_ENABLED)
 
 #include "NimBLEEddystoneTLM.h"
 #include "NimBLELog.h"
 
-#include <stdio.h>
 #include <cstring>
 
 #define ENDIAN_CHANGE_U16(x) ((((x)&0xFF00)>>8) + (((x)&0xFF)<<8))
@@ -85,8 +83,8 @@ float NimBLEEddystoneTLM::getTemp() {
 } // getTemp
 
 /**
- * @brief Get the count of advertisements sent.
- * @return The number of advertisements.
+ * @brief Get the count of advertisments sent.
+ * @return The number of advertisments.
  */
 uint32_t NimBLEEddystoneTLM::getCount() {
     return ENDIAN_CHANGE_U32(m_eddystoneData.advCount);
@@ -94,8 +92,8 @@ uint32_t NimBLEEddystoneTLM::getCount() {
 
 
 /**
- * @brief Get the advertisement time.
- * @return The advertisement time.
+ * @brief Get the advertisment time.
+ * @return The advertisment time.
  */
 uint32_t NimBLEEddystoneTLM::getTime() {
     return (ENDIAN_CHANGE_U32(m_eddystoneData.tmil)) / 10;
@@ -126,30 +124,30 @@ std::string NimBLEEddystoneTLM::toString() {
   out += " C\n";
 
   out += "Adv. Count ";
-  snprintf(val, sizeof(val), "%" PRIu32, ENDIAN_CHANGE_U32(m_eddystoneData.advCount));
+  snprintf(val, sizeof(val), "%lu", ENDIAN_CHANGE_U32(m_eddystoneData.advCount));
   out += val;
   out += "\n";
 
   out += "Time in seconds ";
-  snprintf(val, sizeof(val), "%" PRIu32, rawsec/10);
+  snprintf(val, sizeof(val), "%lu", rawsec/10);
   out += val;
   out += "\n";
 
   out += "Time ";
 
-  snprintf(val, sizeof(val), "%04" PRIu32, rawsec / 864000);
+  snprintf(val, sizeof(val), "%04lu", rawsec / 864000);
   out += val;
   out += ".";
 
-  snprintf(val, sizeof(val), "%02" PRIu32, (rawsec / 36000) % 24);
+  snprintf(val, sizeof(val), "%02lu", (rawsec / 36000) % 24);
   out += val;
   out += ":";
 
-  snprintf(val, sizeof(val), "%02" PRIu32, (rawsec / 600) % 60);
+  snprintf(val, sizeof(val), "%02lu", (rawsec / 600) % 60);
   out += val;
   out += ":";
 
-  snprintf(val, sizeof(val), "%02" PRIu32, (rawsec / 10) % 60);
+  snprintf(val, sizeof(val), "%02lu", (rawsec / 10) % 60);
   out += val;
   out += "\n";
 
@@ -158,7 +156,7 @@ std::string NimBLEEddystoneTLM::toString() {
 
 
 /**
- * @brief Set the raw data for the beacon advertisement.
+ * @brief Set the raw data for the beacon advertisment.
  * @param [in] data The raw data to advertise.
  */
 void NimBLEEddystoneTLM::setData(const std::string &data) {
@@ -208,8 +206,8 @@ void NimBLEEddystoneTLM::setTemp(float temp) {
 
 
 /**
- * @brief Set the advertisement count.
- * @param [in] advCount The advertisement number.
+ * @brief Set the advertisment count.
+ * @param [in] advCount The advertisment number.
  */
 void NimBLEEddystoneTLM::setCount(uint32_t advCount) {
     m_eddystoneData.advCount = advCount;
@@ -217,8 +215,8 @@ void NimBLEEddystoneTLM::setCount(uint32_t advCount) {
 
 
 /**
- * @brief Set the advertisement time.
- * @param [in] tmil The advertisement time in milliseconds.
+ * @brief Set the advertisment time.
+ * @param [in] tmil The advertisment time in milliseconds.
  */
 void NimBLEEddystoneTLM::setTime(uint32_t tmil) {
     m_eddystoneData.tmil = tmil;

src/NimBLEEddystoneTLM.h

@@ -15,6 +15,7 @@
 #ifndef _NimBLEEddystoneTLM_H_
 #define _NimBLEEddystoneTLM_H_
 
+#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_NIMBLE_ENABLED)
 #include "NimBLEUUID.h"
 
 #include <string>
@@ -58,4 +59,5 @@ private:
 
 }; // NimBLEEddystoneTLM
 
+#endif
 #endif /* _NimBLEEddystoneTLM_H_ */

src/NimBLEEddystoneURL.cpp

@@ -11,8 +11,8 @@
  *  Created on: Mar 12, 2018
  *      Author: pcbreflux
  */
-#include "nimconfig.h"
-#if defined(CONFIG_BT_ENABLED)
+#include "sdkconfig.h"
+#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_NIMBLE_ENABLED)
 
 #include "NimBLEEddystoneURL.h"
 #include "NimBLELog.h"
@@ -152,7 +152,7 @@ std::string NimBLEEddystoneURL::getDecodedURL() {
 
 
 /**
- * @brief Set the raw data for the beacon advertisement.
+ * @brief Set the raw data for the beacon advertisment.
  * @param [in] data The raw data to advertise.
  */
 void NimBLEEddystoneURL::setData(const std::string &data) {

src/NimBLEEddystoneURL.h

@@ -14,6 +14,7 @@
 
 #ifndef _NIMBLEEddystoneURL_H_
 #define _NIMBLEEddystoneURL_H_
+#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_NIMBLE_ENABLED)
 #include "NimBLEUUID.h"
 
 #include <string>
@@ -49,4 +50,5 @@ private:
 
 }; // NIMBLEEddystoneURL
 
+#endif
 #endif /* _NIMBLEEddystoneURL_H_ */

src/NimBLEExtAdvertising.cpp

@@ -1,870 +0,0 @@
-/*
- * NimBLEExtAdvertising.cpp
- *
- *  Created: on February 6, 2022
- *      Author H2zero
- */
-
-#include "nimconfig.h"
-#if defined(CONFIG_BT_ENABLED) && \
-    defined(CONFIG_BT_NIMBLE_ROLE_BROADCASTER) && \
-    CONFIG_BT_NIMBLE_EXT_ADV
-
-#if defined(CONFIG_NIMBLE_CPP_IDF)
-#include "services/gap/ble_svc_gap.h"
-#else
-#include "nimble/nimble/host/services/gap/include/services/gap/ble_svc_gap.h"
-#endif
-#include "NimBLEExtAdvertising.h"
-#include "NimBLEDevice.h"
-#include "NimBLEServer.h"
-#include "NimBLEUtils.h"
-#include "NimBLELog.h"
-
-static NimBLEExtAdvertisingCallbacks defaultCallbacks;
-static const char* LOG_TAG = "NimBLEExtAdvertising";
-
-
-/**
- * @brief Destructor: deletes callback instances if requested.
- */
-NimBLEExtAdvertising::~NimBLEExtAdvertising() {
-    if(m_deleteCallbacks && m_pCallbacks != &defaultCallbacks) {
-        delete m_pCallbacks;
-    }
-}
-
-
-/**
- * @brief Register the extended advertisement data.
- * @param [in] inst_id The extended advertisement instance ID to assign to this data.
- * @param [in] adv The extended advertisement instance with the data to set.
- * @return True if advertising started successfully.
- */
-bool NimBLEExtAdvertising::setInstanceData(uint8_t inst_id, NimBLEExtAdvertisement& adv) {
-    adv.m_params.sid = inst_id;
-
-    // Legacy advertising as connectable requires the scannable flag also.
-    if (adv.m_params.legacy_pdu && adv.m_params.connectable) {
-        adv.m_params.scannable = true;
-    }
-
-    // If connectable or not scannable disable the callback for scan response requests
-    if (adv.m_params.connectable || !adv.m_params.scannable) {
-        adv.m_params.scan_req_notif = false;
-    }
-
-#if defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
-    NimBLEServer* pServer = NimBLEDevice::getServer();
-    if (pServer != nullptr) {
-        if (!pServer->m_gattsStarted) {
-            pServer->start();
-        }
-    }
-
-    int rc = ble_gap_ext_adv_configure(inst_id,
-                                       &adv.m_params,
-                                       NULL,
-                                       (pServer != nullptr) ? NimBLEServer::handleGapEvent :
-                                                              NimBLEExtAdvertising::handleGapEvent,
-                                       NULL);
-#else
-    int rc = ble_gap_ext_adv_configure(inst_id,
-                                       &data.m_params,
-                                       NULL,
-                                       NimBLEExtAdvertising::handleGapEvent,
-                                       NULL);
-#endif
-
-    if (rc != 0) {
-        NIMBLE_LOGE(LOG_TAG, "Advertising config error: rc = %d", rc);
-    } else {
-        os_mbuf *buf;
-        buf = os_msys_get_pkthdr(adv.m_payload.size(), 0);
-        if (!buf) {
-            NIMBLE_LOGE(LOG_TAG, "Data buffer allocation failed");
-            return false;
-        }
-
-        rc = os_mbuf_append(buf, &adv.m_payload[0], adv.m_payload.size());
-        if (rc != 0) {
-            NIMBLE_LOGE(LOG_TAG, "Unable to copy data: rc = %d", rc);
-            return false;
-        } else {
-            if (adv.m_params.scannable && !adv.m_params.legacy_pdu) {
-                rc = ble_gap_ext_adv_rsp_set_data(inst_id, buf);
-            } else {
-                rc = ble_gap_ext_adv_set_data(inst_id, buf);
-            }
-
-            if (rc != 0) {
-                NIMBLE_LOGE(LOG_TAG, "Invalid advertisement data: rc = %d", rc);
-            } else {
-                if (adv.m_advAddress != NimBLEAddress("")) {
-                    ble_addr_t addr;
-                    memcpy(&addr.val, adv.m_advAddress.getNative(), 6);
-                    // Custom advertising address must be random.
-                    addr.type = BLE_OWN_ADDR_RANDOM;
-                    rc = ble_gap_ext_adv_set_addr(inst_id, &addr);
-                }
-
-                if (rc != 0) {
-                    NIMBLE_LOGE(LOG_TAG, "Error setting advertisement address: rc = %d", rc);
-                    return false;
-                }
-            }
-        }
-    }
-
-    return (rc == 0);
-}
-
-
-/**
- * @brief Set the scan response data for a legacy advertisement.
- * @param [in] inst_id The extended advertisement instance ID to assign to this data.
- * @param [in] lsr A reference to a NimBLEExtAdvertisement that contains the data.
- */
-bool NimBLEExtAdvertising::setScanResponseData(uint8_t inst_id, NimBLEExtAdvertisement & lsr) {
-    os_mbuf *buf = os_msys_get_pkthdr(lsr.m_payload.size(), 0);
-    if (!buf) {
-        NIMBLE_LOGE(LOG_TAG, "Data buffer allocation failed");
-        return false;
-    }
-
-    int rc = os_mbuf_append(buf, &lsr.m_payload[0], lsr.m_payload.size());
-
-    if (rc != 0) {
-        NIMBLE_LOGE(LOG_TAG, "Unable to copy scan data: rc = %d", rc);
-        return false;
-    } else {
-        rc = ble_gap_ext_adv_rsp_set_data(inst_id, buf);
-    }
-    return (rc == 0);
-}
-
-
-/**
- * @brief Start extended advertising.
- * @param [in] inst_id The extended advertisement instance ID to start.
- * @param [in] duration How long to advertise for in milliseconds, 0 = forever (default).
- * @param [in] max_events Maximum number of advertisement events to send, 0 = no limit (default).
- * @return True if advertising started successfully.
- */
-bool NimBLEExtAdvertising::start(uint8_t inst_id, int duration, int max_events) {
-    NIMBLE_LOGD(LOG_TAG, ">> Extended Advertising start");
-
-    // If Host is not synced we cannot start advertising.
-    if(!NimBLEDevice::m_synced) {
-        NIMBLE_LOGE(LOG_TAG, "Host reset, wait for sync.");
-        return false;
-    }
-
-    int rc = ble_gap_ext_adv_start(inst_id, duration / 10, max_events);
-
-    switch (rc) {
-        case 0:
-             m_advStatus[inst_id] = true;
-             break;
-
-        case BLE_HS_EINVAL:
-             NIMBLE_LOGE(LOG_TAG, "Unable to advertise - Value Error");
-             break;
-
-        case BLE_HS_EALREADY:
-             NIMBLE_LOGI(LOG_TAG, "Advertisement Already active");
-             break;
-
-        case BLE_HS_ETIMEOUT_HCI:
-        case BLE_HS_EOS:
-        case BLE_HS_ECONTROLLER:
-        case BLE_HS_ENOTSYNCED:
-             NIMBLE_LOGE(LOG_TAG, "Unable to advertise - Host Reset");
-             break;
-
-        default:
-            NIMBLE_LOGE(LOG_TAG, "Error enabling advertising; rc=%d, %s",
-                        rc, NimBLEUtils::returnCodeToString(rc));
-            break;
-    }
-
-    NIMBLE_LOGD(LOG_TAG, "<< Extended Advertising start");
-    return (rc == 0 || rc == BLE_HS_EALREADY);
-} // start
-
-
-/**
- * @brief Stop and remove this instance data from the advertisement set.
- * @param [in] inst_id The extended advertisement instance to stop advertising.
- * @return True if successful.
- */
-bool NimBLEExtAdvertising::removeInstance(uint8_t inst_id) {
-    if (stop(inst_id)) {
-        int rc =  ble_gap_ext_adv_remove(inst_id);
-        if (rc != 0 && rc != BLE_HS_EALREADY) {
-            NIMBLE_LOGE(LOG_TAG, "ble_gap_ext_adv_remove rc = %d %s",
-                        rc, NimBLEUtils::returnCodeToString(rc));
-            return false;
-        }
-        return true;
-    }
-
-    return false;
-} // removeInstance
-
-
-/**
- * @brief Stop and remove all advertising instance data.
- * @return True if successful.
- */
-bool NimBLEExtAdvertising::removeAll() {
-    if (stop()) {
-        int rc = ble_gap_ext_adv_clear();
-        if (rc == 0 || rc == BLE_HS_EALREADY) {
-            return true;
-        } else {
-            NIMBLE_LOGE(LOG_TAG, "ble_gap_ext_adv_clear rc = %d %s",
-                        rc, NimBLEUtils::returnCodeToString(rc));
-        }
-    }
-
-    return false;
-} // removeAll
-
-
-/**
- * @brief Stop advertising this instance data.
- * @param [in] inst_id The extended advertisement instance to stop advertising.
- * @return True if successful.
- */
-bool NimBLEExtAdvertising::stop(uint8_t inst_id) {
-    int rc = ble_gap_ext_adv_stop(inst_id);
-    if (rc != 0 && rc != BLE_HS_EALREADY) {
-        NIMBLE_LOGE(LOG_TAG, "ble_gap_ext_adv_stop rc = %d %s",
-                    rc, NimBLEUtils::returnCodeToString(rc));
-        return false;
-    }
-
-    m_advStatus[inst_id] = false;
-    return true;
-} // stop
-
-
-/**
- * @brief Stop all advertisements.
- * @return True if successful.
- */
-bool NimBLEExtAdvertising::stop() {
-    int rc = ble_gap_ext_adv_clear();
-    if (rc != 0 && rc != BLE_HS_EALREADY) {
-        NIMBLE_LOGE(LOG_TAG, "ble_gap_ext_adv_stop rc = %d %s",
-                    rc, NimBLEUtils::returnCodeToString(rc));
-        return false;
-    }
-
-    for(auto it : m_advStatus) {
-        it = false;
-    }
-
-    return true;
-} // stop
-
-
-/**
- * @brief Set a callback to call when the advertisement stops.
- * @param [in] pCallbacks A pointer to a callback to be invoked when an advertisement stops.
- * @param [in] deleteCallbacks if true callback class will be deleted when advertising is destructed.
- */
-void NimBLEExtAdvertising::setCallbacks(NimBLEExtAdvertisingCallbacks* pCallbacks,
-                                        bool deleteCallbacks) {
-    if (pCallbacks != nullptr){
-        m_pCallbacks = pCallbacks;
-        m_deleteCallbacks = deleteCallbacks;
-    } else {
-        m_pCallbacks = &defaultCallbacks;
-    }
-} // setCallbacks
-
-
-/**
- * @brief Check if currently advertising.
- * @param [in] inst_id The instance ID of the advertised data to get the status of.
- * @return True if advertising is active.
- */
-bool NimBLEExtAdvertising::isActive(uint8_t inst_id) {
-    return m_advStatus[inst_id];
-} // isAdvertising
-
-
-/**
- * @brief Check if any instances are currently advertising.
- * @return True if any instance is active.
- */
-bool NimBLEExtAdvertising::isAdvertising() {
-    for (auto it : m_advStatus) {
-        if (it) {
-            return true;
-        }
-    }
-    return false;
-} // isAdvertising
-
-
-/*
- * Host reset seems to clear advertising data,
- * we need clear the flag so it reloads it.
- */
-void NimBLEExtAdvertising::onHostSync() {
-    NIMBLE_LOGD(LOG_TAG, "Host re-synced");
-    for(auto it : m_advStatus) {
-        it = false;
-    }
-} // onHostSync
-
-
-/**
- * @brief Handler for gap events when not using peripheral role.
- * @param [in] event the event data.
- * @param [in] arg pointer to the advertising instance.
- */
-/*STATIC*/
-int NimBLEExtAdvertising::handleGapEvent(struct ble_gap_event *event, void *arg) {
-    (void)arg;
-    NimBLEExtAdvertising* pAdv = NimBLEDevice::getAdvertising();
-
-    switch (event->type) {
-        case BLE_GAP_EVENT_ADV_COMPLETE: {
-            switch (event->adv_complete.reason) {
-                // Don't call the callback if host reset, we want to
-                // preserve the active flag until re-sync to restart advertising.
-                case BLE_HS_ETIMEOUT_HCI:
-                case BLE_HS_EOS:
-                case BLE_HS_ECONTROLLER:
-                case BLE_HS_ENOTSYNCED:
-                    NIMBLE_LOGC(LOG_TAG, "host reset, rc = %d", event->adv_complete.reason);
-                    NimBLEDevice::onReset(event->adv_complete.reason);
-                    return 0;
-                default:
-                    break;
-            }
-            pAdv->m_advStatus[event->adv_complete.instance] = false;
-            pAdv->m_pCallbacks->onStopped(pAdv, event->adv_complete.reason,
-                                          event->adv_complete.instance);
-            break;
-        }
-
-        case BLE_GAP_EVENT_SCAN_REQ_RCVD: {
-            pAdv->m_pCallbacks->onScanRequest(pAdv, event->scan_req_rcvd.instance,
-                                              NimBLEAddress(event->scan_req_rcvd.scan_addr));
-            break;
-        }
-    }
-
-    return 0;
-} // handleGapEvent
-
-
-/** Default callback handlers */
-void NimBLEExtAdvertisingCallbacks::onStopped(NimBLEExtAdvertising *pAdv,
-                                              int reason, uint8_t inst_id) {
-    NIMBLE_LOGD("NimBLEExtAdvertisingCallbacks", "onStopped: Default");
-} // onStopped
-
-
-void NimBLEExtAdvertisingCallbacks::onScanRequest(NimBLEExtAdvertising *pAdv,
-                                                  uint8_t inst_id, NimBLEAddress addr) {
-    NIMBLE_LOGD("NimBLEExtAdvertisingCallbacks", "onScanRequest: Default");
-} // onScanRequest
-
-
-/**
- * @brief Construct a BLE extended advertisement.
- * @param [in] priPhy The primary Phy to advertise on, can be one of:
- * * BLE_HCI_LE_PHY_1M
- * * BLE_HCI_LE_PHY_CODED
- * @param [in] secPhy The secondary Phy to advertise on, can be one of:
- * * BLE_HCI_LE_PHY_1M
- * * BLE_HCI_LE_PHY_2M
- * * BLE_HCI_LE_PHY_CODED
- */
-NimBLEExtAdvertisement::NimBLEExtAdvertisement(uint8_t priPhy, uint8_t secPhy)
-:   m_advAddress("")
-{
-    memset (&m_params, 0, sizeof(m_params));
-    m_params.own_addr_type = NimBLEDevice::m_own_addr_type;
-    m_params.primary_phy   = priPhy;
-    m_params.secondary_phy = secPhy;
-    m_params.tx_power      = 127;
-} // NimBLEExtAdvertisement
-
-
-/**
- * @brief Sets wether the advertisement should use legacy (BLE 4.0, 31 bytes max) advertising.
- * @param [in] val true = using legacy advertising.
- */
-void NimBLEExtAdvertisement::setLegacyAdvertising(bool val) {
-    m_params.legacy_pdu = val;
-} // setLegacyAdvertising
-
-
-/**
- * @brief Sets wether the advertisement has scan response data available.
- * @param [in] val true = scan response is available.
- */
-void NimBLEExtAdvertisement::setScannable(bool val) {
-    m_params.scannable = val;
-} // setScannable
-
-
-
-/**
- * @brief Sets the transmission power level for this advertisement.
- * @param [in] dbm the transmission power to use in dbm.
- * @details The allowable value range depends on device hardware. \n
- * The ESP32C3 and ESP32S3 have a range of -27 to +18.
- */
-void NimBLEExtAdvertisement::setTxPower(int8_t dbm) {
-    m_params.tx_power = dbm;
-}
-
-
-/**
- * @brief Sets wether this advertisement should advertise as a connectable device.
- * @param [in] val True = connectable.
- */
-void NimBLEExtAdvertisement::setConnectable(bool val) {
-#if defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
-    m_params.connectable = val;
-#endif
-} // setConnectable
-
-
-/**
- * @brief Set the address to use for this advertisement.
- * @param [in] addr The address to use.
- */
-void NimBLEExtAdvertisement::setAddress(const NimBLEAddress & addr) {
-    m_advAddress = addr;
-    // Must use random address type.
-    m_params.own_addr_type = BLE_OWN_ADDR_RANDOM;
-}
-
-
-/**
- * @brief Sets The primary channels to advertise on.
- * @param [in] ch37 Advertise on channel 37.
- * @param [in] ch38 Advertise on channel 38.
- * @param [in] ch39 Advertise on channel 39.
- * @details This will set a bitmask using the input parameters to allow different \n
- * combinations. If all inputs are false then all 3 channels will be used.
- */
-void NimBLEExtAdvertisement::setPrimaryChannels(bool ch37, bool ch38, bool ch39) {
-    m_params.channel_map = (ch37 | (ch38 << 1) | (ch39 << 2));
-} // setPrimaryChannels
-
-
-/**
- * @brief Set the filtering for the scan filter.
- * @param [in] scanRequestWhitelistOnly If true, only allow scan requests from those on the white list.
- * @param [in] connectWhitelistOnly If true, only allow connections from those on the white list.
- */
-void NimBLEExtAdvertisement::setScanFilter(bool scanRequestWhitelistOnly, bool connectWhitelistOnly) {
-    if (!scanRequestWhitelistOnly && !connectWhitelistOnly) {
-        m_params.filter_policy = BLE_HCI_ADV_FILT_NONE;
-        return;
-    }
-    if (scanRequestWhitelistOnly && !connectWhitelistOnly) {
-        m_params.filter_policy = BLE_HCI_ADV_FILT_SCAN;
-        return;
-    }
-    if (!scanRequestWhitelistOnly && connectWhitelistOnly) {
-        m_params.filter_policy = BLE_HCI_ADV_FILT_CONN;
-        return;
-    }
-    if (scanRequestWhitelistOnly && connectWhitelistOnly) {
-        m_params.filter_policy = BLE_HCI_ADV_FILT_BOTH;
-        return;
-    }
-} // setScanFilter
-
-
-/**
- * @brief Sets the peer to directly advertise to.
- * @param [in] addr The address of the peer to direct the advertisements.
- */
-void NimBLEExtAdvertisement::setDirectedPeer(const NimBLEAddress & addr) {
-    ble_addr_t peerAddr;
-    memcpy(&peerAddr.val, addr.getNative(), 6);
-    peerAddr.type = addr.getType();
-    m_params.peer = peerAddr;
-} // setDirectedPeer
-
-
-/**
- * @brief Enable or disable direct advertisements to the peer set with `NimBLEExtAdvertisement::setDirectedPeer`
- * @param [in] val true = send directed advertisements to peer.
- * @param [in] high_duty true = use fast advertising rate, default - true.
- */
-void NimBLEExtAdvertisement::setDirected(bool val, bool high_duty) {
-    m_params.directed = val;
-    m_params.high_duty_directed = high_duty;
-} // setDirected
-
-
-/**
- * @brief Set the minimum advertising interval.
- * @param [in] mininterval Minimum value for advertising interval in 0.625ms units, 0 = use default.
- */
-void NimBLEExtAdvertisement::setMinInterval(uint32_t mininterval) {
-    m_params.itvl_min = mininterval;
-} // setMinInterval
-
-
-/**
- * @brief Set the maximum advertising interval.
- * @param [in] maxinterval Maximum value for advertising interval in 0.625ms units, 0 = use default.
- */
-void NimBLEExtAdvertisement::setMaxInterval(uint32_t maxinterval) {
-    m_params.itvl_max = maxinterval;
-} // setMaxInterval
-
-
-/**
- * @brief Set the primary advertising PHY to use
- * @param [in] phy Can be one of following constants:
- * * BLE_HCI_LE_PHY_1M
- * * BLE_HCI_LE_PHY_CODED
- */
-void NimBLEExtAdvertisement::setPrimaryPhy(uint8_t phy) {
-    m_params.primary_phy = phy;
-} // setPrimaryPhy
-
-
-/**
- * @brief Set the secondary advertising PHY to use
- * @param [in] phy Can be one of following constants:
- * * BLE_HCI_LE_PHY_1M
- * * BLE_HCI_LE_PHY_2M
- * * BLE_HCI_LE_PHY_CODED
- */
-void NimBLEExtAdvertisement::setSecondaryPhy(uint8_t phy) {
-    m_params.secondary_phy = phy;
-} // setSecondaryPhy
-
-
-/**
- * @brief Sets whether the advertisement should be anonymous.
- * @param [in] val Set to true to enable anonymous advertising.
- *
- * @details Anonymous advertising omits the device's address from the advertisement.
- */
-void NimBLEExtAdvertisement::setAnonymous(bool val) {
-    m_params.anonymous = val;
-} // setAnonymous
-
-
-/**
- * @brief Sets whether the scan response request callback should be called.
- * @param [in] enable If true the scan response request callback will be called for this advertisement.
- */
-void NimBLEExtAdvertisement::enableScanRequestCallback(bool enable) {
-    m_params.scan_req_notif = enable;
-} // enableScanRequestCallback
-
-
-/**
- * @brief Clears the data stored in this instance, does not change settings.
- * @details This will clear all data but preserves advertising parameter settings.
- */
-void NimBLEExtAdvertisement::clearData() {
-    std::vector<uint8_t> swap;
-    std::swap(m_payload, swap);
-}
-
-
-/**
- * @brief Get the size of the current data.
- */
-size_t NimBLEExtAdvertisement::getDataSize() {
-    return m_payload.size();
-} // getDataSize
-
-
-/**
- * @brief Set the advertisement data.
- * @param [in] data The data to be set as the payload.
- * @param [in] length The size of data.
- * @details This will completely replace any data that was previously set.
- */
-void NimBLEExtAdvertisement::setData(const uint8_t * data, size_t length) {
-    m_payload.assign(data, data + length);
-} // setData
-
-
-/**
- * @brief Add data to the payload to be advertised.
- * @param [in] data The data to be added to the payload.
- */
-void NimBLEExtAdvertisement::addData(const std::string &data) {
-    addData((uint8_t*)data.data(), data.length());
-} // addData
-
-
-/**
- * @brief Add data to the payload to be advertised.
- * @param [in] data The data to be added to the payload.
- * @param [in] length The size of data to be added to the payload.
- */
-void NimBLEExtAdvertisement::addData(const uint8_t * data, size_t length) {
-    m_payload.insert(m_payload.end(), data, data + length);
-} // addData
-
-
-/**
- * @brief Set the appearance.
- * @param [in] appearance The appearance code value.
- *
- * See also:
- * https://www.bluetooth.com/specifications/gatt/viewer?attributeXmlFile=org.bluetooth.characteristic.gap.appearance.xml
- */
-void NimBLEExtAdvertisement::setAppearance(uint16_t appearance) {
-    char cdata[2];
-    cdata[0] = 3;
-    cdata[1] = BLE_HS_ADV_TYPE_APPEARANCE; // 0x19
-    addData(std::string(cdata, 2) + std::string((char*) &appearance, 2));
-} // setAppearance
-
-
-/**
- * @brief Set the advertisement flags.
- * @param [in] flag The flags to be set in the advertisement.
- * * BLE_HS_ADV_F_DISC_LTD
- * * BLE_HS_ADV_F_DISC_GEN
- * * BLE_HS_ADV_F_BREDR_UNSUP - must always use with NimBLE
- */
-void NimBLEExtAdvertisement::setFlags(uint8_t flag) {
-    char cdata[3];
-    cdata[0] = 2;
-    cdata[1] = BLE_HS_ADV_TYPE_FLAGS;  // 0x01
-    cdata[2] = flag | BLE_HS_ADV_F_BREDR_UNSUP;
-    addData(std::string(cdata, 3));
-} // setFlags
-
-
-/**
- * @brief Set manufacturer specific data.
- * @param [in] data The manufacturer data to advertise.
- */
-void NimBLEExtAdvertisement::setManufacturerData(const std::string &data) {
-    char cdata[2];
-    cdata[0] = data.length() + 1;
-    cdata[1] = BLE_HS_ADV_TYPE_MFG_DATA ;  // 0xff
-    addData(std::string(cdata, 2) + data);
-} // setManufacturerData
-
-
-/**
- * @brief Set the URI to advertise.
- * @param [in] uri The uri to advertise.
- */
-void NimBLEExtAdvertisement::setURI(const std::string &uri) {
-    char cdata[2];
-    cdata[0] = uri.length() + 1;
-    cdata[1] = BLE_HS_ADV_TYPE_URI;
-    addData(std::string(cdata, 2) + uri);
-} // setURI
-
-
-/**
- * @brief Set the complete name of this device.
- * @param [in] name The name to advertise.
- */
-void NimBLEExtAdvertisement::setName(const std::string &name) {
-    char cdata[2];
-    cdata[0] = name.length() + 1;
-    cdata[1] = BLE_HS_ADV_TYPE_COMP_NAME;  // 0x09
-    addData(std::string(cdata, 2) + name);
-} // setName
-
-
-/**
- * @brief Set a single service to advertise as a complete list of services.
- * @param [in] uuid The service to advertise.
- */
-void NimBLEExtAdvertisement::setCompleteServices(const NimBLEUUID &uuid) {
-    setServices(true, uuid.bitSize(), {uuid});
-} // setCompleteServices
-
-
-/**
- * @brief Set the complete list of 16 bit services to advertise.
- * @param [in] v_uuid A vector of 16 bit UUID's to advertise.
- */
-void NimBLEExtAdvertisement::setCompleteServices16(const std::vector<NimBLEUUID>& v_uuid) {
-    setServices(true, 16, v_uuid);
-} // setCompleteServices16
-
-
-/**
- * @brief Set the complete list of 32 bit services to advertise.
- * @param [in] v_uuid A vector of 32 bit UUID's to advertise.
- */
-void NimBLEExtAdvertisement::setCompleteServices32(const std::vector<NimBLEUUID>& v_uuid) {
-    setServices(true, 32, v_uuid);
-} // setCompleteServices32
-
-
-/**
- * @brief Set a single service to advertise as a partial list of services.
- * @param [in] uuid The service to advertise.
- */
-void NimBLEExtAdvertisement::setPartialServices(const NimBLEUUID &uuid) {
-    setServices(false, uuid.bitSize(), {uuid});
-} // setPartialServices
-
-
-/**
- * @brief Set the partial list of services to advertise.
- * @param [in] v_uuid A vector of 16 bit UUID's to advertise.
- */
-void NimBLEExtAdvertisement::setPartialServices16(const std::vector<NimBLEUUID>& v_uuid) {
-    setServices(false, 16, v_uuid);
-} // setPartialServices16
-
-
-/**
- * @brief Set the partial list of services to advertise.
- * @param [in] v_uuid A vector of 32 bit UUID's to advertise.
- */
-void NimBLEExtAdvertisement::setPartialServices32(const std::vector<NimBLEUUID>& v_uuid) {
-    setServices(false, 32, v_uuid);
-} // setPartialServices32
-
-
-/**
- * @brief Utility function to create the list of service UUID's from a vector.
- * @param [in] complete If true the vector is the complete set of services.
- * @param [in] size The bit size of the UUID's in the vector. (16, 32, or 128).
- * @param [in] v_uuid The vector of service UUID's to advertise.
- */
-void NimBLEExtAdvertisement::setServices(const bool complete, const uint8_t size,
-                                             const std::vector<NimBLEUUID> &v_uuid)
-{
-    char cdata[2];
-    cdata[0] = (size / 8) * v_uuid.size() + 1;
-    switch(size) {
-        case 16:
-            cdata[1] = complete ? BLE_HS_ADV_TYPE_COMP_UUIDS16 : BLE_HS_ADV_TYPE_INCOMP_UUIDS16;
-            break;
-        case 32:
-            cdata[1] = complete ? BLE_HS_ADV_TYPE_COMP_UUIDS32 : BLE_HS_ADV_TYPE_INCOMP_UUIDS32;
-            break;
-        case 128:
-            cdata[1] = complete ? BLE_HS_ADV_TYPE_COMP_UUIDS128 : BLE_HS_ADV_TYPE_INCOMP_UUIDS128;
-            break;
-        default:
-            return;
-    }
-
-    std::string uuids;
-
-    for(auto &it : v_uuid){
-        if(it.bitSize() != size) {
-            NIMBLE_LOGE(LOG_TAG, "Service UUID(%d) invalid", size);
-            return;
-        } else {
-            switch(size) {
-                case 16:
-                    uuids += std::string((char*)&it.getNative()->u16.value, 2);
-                    break;
-                case 32:
-                    uuids += std::string((char*)&it.getNative()->u32.value, 4);
-                    break;
-                case 128:
-                    uuids += std::string((char*)&it.getNative()->u128.value, 16);
-                    break;
-                default:
-                    return;
-            }
-        }
-    }
-
-    addData(std::string(cdata, 2) + uuids);
-} // setServices
-
-
-/**
- * @brief Set the service data (UUID + data)
- * @param [in] uuid The UUID to set with the service data.
- * @param [in] data The data to be associated with the service data advertised.
- */
-void NimBLEExtAdvertisement::setServiceData(const NimBLEUUID &uuid, const std::string &data) {
-    char cdata[2];
-    switch (uuid.bitSize()) {
-        case 16: {
-            // [Len] [0x16] [UUID16] data
-            cdata[0] = data.length() + 3;
-            cdata[1] = BLE_HS_ADV_TYPE_SVC_DATA_UUID16;  // 0x16
-            addData(std::string(cdata, 2) + std::string((char*) &uuid.getNative()->u16.value, 2) + data);
-            break;
-        }
-
-        case 32: {
-            // [Len] [0x20] [UUID32] data
-            cdata[0] = data.length() + 5;
-            cdata[1] = BLE_HS_ADV_TYPE_SVC_DATA_UUID32; // 0x20
-            addData(std::string(cdata, 2) + std::string((char*) &uuid.getNative()->u32.value, 4) + data);
-            break;
-        }
-
-        case 128: {
-            // [Len] [0x21] [UUID128] data
-            cdata[0] = data.length() + 17;
-            cdata[1] = BLE_HS_ADV_TYPE_SVC_DATA_UUID128;  // 0x21
-            addData(std::string(cdata, 2) + std::string((char*) &uuid.getNative()->u128.value, 16) + data);
-            break;
-        }
-
-        default:
-            return;
-    }
-} // setServiceData
-
-
-/**
- * @brief Set the short name.
- * @param [in] name The short name of the device.
- */
-void NimBLEExtAdvertisement::setShortName(const std::string &name) {
-    char cdata[2];
-    cdata[0] = name.length() + 1;
-    cdata[1] = BLE_HS_ADV_TYPE_INCOMP_NAME;  // 0x08
-    addData(std::string(cdata, 2) + name);
-} // setShortName
-
-
-/**
- * @brief Adds Tx power level to the advertisement data.
- */
-void NimBLEExtAdvertisement::addTxPower() {
-    m_params.include_tx_power = 1;
-} // addTxPower
-
-
-/**
- * @brief Set the preferred connection interval parameters.
- * @param [in] min The minimum interval desired.
- * @param [in] max The maximum interval desired.
- */
-void NimBLEExtAdvertisement::setPreferredParams(uint16_t min, uint16_t max) {
-    uint8_t data[6];
-    data[0] = BLE_HS_ADV_SLAVE_ITVL_RANGE_LEN + 1;
-    data[1] = BLE_HS_ADV_TYPE_SLAVE_ITVL_RANGE;
-    data[2] = min;
-    data[3] = min >> 8;
-    data[4] = max;
-    data[5] = max >> 8;
-    addData(data, 6);
-} // setPreferredParams
-
-#endif /* CONFIG_BT_ENABLED && CONFIG_BT_NIMBLE_ROLE_BROADCASTER && CONFIG_BT_NIMBLE_EXT_ADV */

src/NimBLEExtAdvertising.h

@@ -1,152 +0,0 @@
-/*
- * NimBLEExtAdvertising.h
- *
- *  Created: on February 6, 2022
- *      Author H2zero
- */
-
-#ifndef MAIN_BLEEXTADVERTISING_H_
-#define MAIN_BLEEXTADVERTISING_H_
-#include "nimconfig.h"
-#if defined(CONFIG_BT_ENABLED) && \
-    defined(CONFIG_BT_NIMBLE_ROLE_BROADCASTER) && \
-    CONFIG_BT_NIMBLE_EXT_ADV
-
-#  if defined(CONFIG_NIMBLE_CPP_IDF)
-#    include "host/ble_gap.h"
-#  else
-#    include "nimble/nimble/host/include/host/ble_gap.h"
-#  endif
-
-/****  FIX COMPILATION ****/
-#undef min
-#undef max
-/**************************/
-
-#include "NimBLEAddress.h"
-#include "NimBLEUUID.h"
-
-#include <vector>
-
-class NimBLEExtAdvertisingCallbacks;
-
-
-/**
- * @brief Extended advertisement data
- */
-class NimBLEExtAdvertisement {
-public:
-    NimBLEExtAdvertisement(uint8_t priPhy = BLE_HCI_LE_PHY_1M,
-                           uint8_t secPhy = BLE_HCI_LE_PHY_1M);
-    void   setAppearance(uint16_t appearance);
-    void   setCompleteServices(const NimBLEUUID &uuid);
-    void   setCompleteServices16(const std::vector<NimBLEUUID> &v_uuid);
-    void   setCompleteServices32(const std::vector<NimBLEUUID> &v_uuid);
-    void   setFlags(uint8_t flag);
-    void   setManufacturerData(const std::string &data);
-    void   setURI(const std::string &uri);
-    void   setName(const std::string &name);
-    void   setPartialServices(const NimBLEUUID &uuid);
-    void   setPartialServices16(const std::vector<NimBLEUUID> &v_uuid);
-    void   setPartialServices32(const std::vector<NimBLEUUID> &v_uuid);
-    void   setServiceData(const NimBLEUUID &uuid, const std::string &data);
-    void   setShortName(const std::string &name);
-    void   setData(const uint8_t * data, size_t length);
-    void   addData(const std::string &data);
-    void   addData(const uint8_t * data, size_t length);
-    void   addTxPower();
-    void   setPreferredParams(uint16_t min, uint16_t max);
-    void   setLegacyAdvertising(bool val);
-    void   setConnectable(bool val);
-    void   setScannable(bool val);
-    void   setMinInterval(uint32_t mininterval);
-    void   setMaxInterval(uint32_t maxinterval);
-    void   setPrimaryPhy(uint8_t phy);
-    void   setSecondaryPhy(uint8_t phy);
-    void   setScanFilter(bool scanRequestWhitelistOnly, bool connectWhitelistOnly);
-    void   setDirectedPeer(const NimBLEAddress & addr);
-    void   setDirected(bool val, bool high_duty = true);
-    void   setAnonymous(bool val);
-    void   setPrimaryChannels(bool ch37, bool ch38, bool ch39);
-    void   setTxPower(int8_t dbm);
-    void   setAddress(const NimBLEAddress & addr);
-    void   enableScanRequestCallback(bool enable);
-    void   clearData();
-    size_t getDataSize();
-
-private:
-    friend class NimBLEExtAdvertising;
-
-    void setServices(const bool complete, const uint8_t size,
-                     const std::vector<NimBLEUUID> &v_uuid);
-
-    std::vector<uint8_t>    m_payload;
-    ble_gap_ext_adv_params  m_params;
-    NimBLEAddress           m_advAddress;
-};   // NimBLEExtAdvertisement
-
-
-/**
- * @brief Extended advertising class.
- */
-class NimBLEExtAdvertising {
-public:
-    /**
-     * @brief Construct an extended advertising object.
-     */
-    NimBLEExtAdvertising() :m_advStatus(CONFIG_BT_NIMBLE_MAX_EXT_ADV_INSTANCES + 1, false) {}
-    ~NimBLEExtAdvertising();
-    bool start(uint8_t inst_id, int duration = 0, int max_events = 0);
-    bool setInstanceData(uint8_t inst_id, NimBLEExtAdvertisement& adv);
-    bool setScanResponseData(uint8_t inst_id, NimBLEExtAdvertisement & data);
-    bool removeInstance(uint8_t inst_id);
-    bool removeAll();
-    bool stop(uint8_t inst_id);
-    bool stop();
-    bool isActive(uint8_t inst_id);
-    bool isAdvertising();
-    void setCallbacks(NimBLEExtAdvertisingCallbacks* callbacks,
-                      bool deleteCallbacks = true);
-
-private:
-    friend class NimBLEDevice;
-    friend class NimBLEServer;
-
-    void           onHostSync();
-    static int     handleGapEvent(struct ble_gap_event *event, void *arg);
-
-    bool                            m_scanResp;
-    bool                            m_deleteCallbacks;
-    NimBLEExtAdvertisingCallbacks*  m_pCallbacks;
-    ble_gap_ext_adv_params          m_advParams;
-    std::vector<bool>               m_advStatus;
-};
-
-
-/**
- * @brief Callbacks associated with NimBLEExtAdvertising class.
- */
-class NimBLEExtAdvertisingCallbacks {
-public:
-    virtual ~NimBLEExtAdvertisingCallbacks() {};
-
-    /**
-     * @brief Handle an advertising stop event.
-     * @param [in] pAdv A convenience pointer to the extended advertising interface.
-     * @param [in] reason The reason code for stopping the advertising.
-     * @param [in] inst_id The instance ID of the advertisement that was stopped.
-     */
-    virtual void onStopped(NimBLEExtAdvertising *pAdv, int reason, uint8_t inst_id);
-
-    /**
-     * @brief Handle a scan response request.
-     * This is called when a scanning device requests a scan response.
-     * @param [in] pAdv A convenience pointer to the extended advertising interface.
-     * @param [in] inst_id The instance ID of the advertisement that the scan response request was made.
-     * @param [in] addr The address of the device making the request.
-     */
-    virtual void onScanRequest(NimBLEExtAdvertising *pAdv, uint8_t inst_id, NimBLEAddress addr);
-}; // NimBLEExtAdvertisingCallbacks
-
-#endif /* CONFIG_BT_ENABLED && CONFIG_BT_NIMBLE_ROLE_BROADCASTER && CONFIG_BT_NIMBLE_EXT_ADV */
-#endif /* MAIN_BLEADVERTISING_H_ */

src/NimBLEHIDDevice.cpp

@@ -11,9 +11,11 @@
  *  Created on: Jan 03, 2018
  *      Author: chegewara
  */
+#include "sdkconfig.h"
+#if defined(CONFIG_BT_ENABLED)
 
 #include "nimconfig.h"
-#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
+#if defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
 
 #include "NimBLEHIDDevice.h"
 #include "NimBLE2904.h"
@@ -27,7 +29,7 @@ NimBLEHIDDevice::NimBLEHIDDevice(NimBLEServer* server) {
 	 * Here we create mandatory services described in bluetooth specification
 	 */
 	m_deviceInfoService = server->createService(NimBLEUUID((uint16_t) 0x180a));
-	m_hidService = server->createService(NimBLEUUID((uint16_t) 0x1812));
+	m_hidService = server->createService(NimBLEUUID((uint16_t) 0x1812), 40);
 	m_batteryService = server->createService(NimBLEUUID((uint16_t) 0x180f));
 
 	/*
@@ -99,7 +101,7 @@ void NimBLEHIDDevice::manufacturer(std::string name) {
 }
 
 /**
- * @brief Sets the Plug n Play characteristic value.
+ * @brief Sets the Plug n Play characterisc value.
  * @param [in] sig The vendor ID source number.
  * @param [in] vid The vendor ID number.
  * @param [in] pid The product ID number.
@@ -245,4 +247,5 @@ NimBLEService* NimBLEHIDDevice::batteryService() {
 	return m_batteryService;
 }
 
-#endif /* CONFIG_BT_ENABLED && CONFIG_BT_NIMBLE_ROLE_PERIPHERAL */
+#endif // #if defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
+#endif // #if defined(CONFIG_BT_ENABLED)

src/NimBLEHIDDevice.h

@@ -15,8 +15,11 @@
 #ifndef _BLEHIDDEVICE_H_
 #define _BLEHIDDEVICE_H_
 
+#include "sdkconfig.h"
+#if defined(CONFIG_BT_ENABLED)
+
 #include "nimconfig.h"
-#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_BROADCASTER)
+#if defined(CONFIG_BT_NIMBLE_ROLE_BROADCASTER)
 
 #include "NimBLECharacteristic.h"
 #include "NimBLEService.h"
@@ -81,6 +84,6 @@ private:
 	NimBLECharacteristic* 	m_protocolModeCharacteristic;	//0x2a4e
 	NimBLECharacteristic*	m_batteryLevelCharacteristic;	//0x2a19
 };
-
-#endif /* CONFIG_BT_ENABLED && CONFIG_BT_NIMBLE_ROLE_BROADCASTER */
+#endif // CONFIG_BT_NIMBLE_ROLE_BROADCASTER
+#endif // CONFIG_BT_ENABLED
 #endif /* _BLEHIDDEVICE_H_ */

src/NimBLELog.h

@@ -8,73 +8,56 @@
 #ifndef MAIN_NIMBLELOG_H_
 #define MAIN_NIMBLELOG_H_
 
-#include "nimconfig.h"
+#include "sdkconfig.h"
 
-#if defined(CONFIG_BT_ENABLED)
+#if defined(ARDUINO_ARCH_ESP32) && !defined(DONT_USE_ARDUINO_BULLSHIT)
+#include "syscfg/syscfg.h"
+#include "modlog/modlog.h"
 
-#if defined(CONFIG_NIMBLE_CPP_IDF) // using esp-idf
-#  include "esp_log.h"
-#  ifndef CONFIG_NIMBLE_CPP_LOG_LEVEL
-#    define CONFIG_NIMBLE_CPP_LOG_LEVEL 0
-#  endif
+// If Arduino is being used, strip out the colors and ignore log printing below ui setting.
+// Note: because CONFIG_LOG_DEFAULT_LEVEL is set at ERROR in Arduino we must use MODLOG_DFLT(ERROR
+// otherwise no messages will be printed above that level.
 
-#  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)
+#ifndef CORE_DEBUG_LEVEL
+#define CORE_DEBUG_LEVEL CONFIG_ARDUHAL_LOG_DEFAULT_LEVEL
+#endif
 
-#  define NIMBLE_LOGD(tag, format, ...) \
-     NIMBLE_CPP_LOG_PRINT(ESP_LOG_DEBUG, tag, format, ##__VA_ARGS__)
+#if CORE_DEBUG_LEVEL >= 4
+#define NIMBLE_LOGD( tag, format, ... ) MODLOG_DFLT(ERROR,      "D %s: "#format"\n",tag,##__VA_ARGS__)
+#else
+#define NIMBLE_LOGD( tag, format, ... ) (void)tag
+#endif
 
-#  define NIMBLE_LOGI(tag, format, ...) \
-     NIMBLE_CPP_LOG_PRINT(ESP_LOG_INFO, tag, format, ##__VA_ARGS__)
+#if CORE_DEBUG_LEVEL >= 3
+#define NIMBLE_LOGI( tag, format, ... ) MODLOG_DFLT(ERROR,      "I %s: "#format"\n",tag,##__VA_ARGS__)
+#else
+#define NIMBLE_LOGI( tag, format, ... ) (void)tag
+#endif
 
-#  define NIMBLE_LOGW(tag, format, ...) \
-     NIMBLE_CPP_LOG_PRINT(ESP_LOG_WARN, tag, format, ##__VA_ARGS__)
+#if CORE_DEBUG_LEVEL >= 2
+#define NIMBLE_LOGW( tag, format, ... ) MODLOG_DFLT(ERROR,      "W %s: "#format"\n",tag,##__VA_ARGS__)
+#else
+#define NIMBLE_LOGW( tag, format, ... ) (void)tag
+#endif
 
-#  define NIMBLE_LOGE(tag, format, ...) \
-     NIMBLE_CPP_LOG_PRINT(ESP_LOG_ERROR, tag, format, ##__VA_ARGS__)
+#if CORE_DEBUG_LEVEL >= 1
+#define NIMBLE_LOGE( tag, format, ... ) MODLOG_DFLT(ERROR,      "E %s: "#format"\n",tag,##__VA_ARGS__)
+#else
+#define NIMBLE_LOGE( tag, format, ... ) (void)tag
+#endif
 
-#  define NIMBLE_LOGC(tag, format, ...) \
-     NIMBLE_CPP_LOG_PRINT(ESP_LOG_ERROR, tag, format, ##__VA_ARGS__)
+#define NIMBLE_LOGC( tag, format, ... ) MODLOG_DFLT(CRITICAL,   "CRIT %s: "#format"\n",tag,##__VA_ARGS__)
 
-#else // using Arduino
-#  include "nimble/porting/nimble/include/syscfg/syscfg.h"
-#  include "nimble/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
-#  endif
+#else
 
-#  if CONFIG_NIMBLE_CPP_LOG_LEVEL >= 4
-#    define NIMBLE_LOGD( tag, format, ... ) console_printf("D %s: " format "\n", tag, ##__VA_ARGS__)
-#  else
-#    define NIMBLE_LOGD( tag, format, ... ) (void)tag
-#  endif
+#include "esp_log.h"
 
-#  if CONFIG_NIMBLE_CPP_LOG_LEVEL >= 3
-#    define NIMBLE_LOGI( tag, format, ... ) console_printf("I %s: " format "\n", tag, ##__VA_ARGS__)
-#  else
-#    define NIMBLE_LOGI( tag, format, ... ) (void)tag
-#  endif
+#define NIMBLE_LOGE(tag, format, ...) ESP_LOGE(tag, format, ##__VA_ARGS__)
+#define NIMBLE_LOGW(tag, format, ...) ESP_LOGW(tag, format, ##__VA_ARGS__)
+#define NIMBLE_LOGI(tag, format, ...) ESP_LOGI(tag, format, ##__VA_ARGS__)
+#define NIMBLE_LOGD(tag, format, ...) ESP_LOGD(tag, format, ##__VA_ARGS__)
+#define NIMBLE_LOGC(tag, format, ...) ESP_LOGE(tag, format, ##__VA_ARGS__)
 
-#  if CONFIG_NIMBLE_CPP_LOG_LEVEL >= 2
-#    define NIMBLE_LOGW( tag, format, ... ) console_printf("W %s: " format "\n", tag, ##__VA_ARGS__)
-#  else
-#    define NIMBLE_LOGW( tag, format, ... ) (void)tag
-#  endif
+#endif /*ARDUINO_ARCH_ESP32*/
 
-#  if CONFIG_NIMBLE_CPP_LOG_LEVEL >= 1
-#    define NIMBLE_LOGE( tag, format, ... ) console_printf("E %s: " format "\n", tag, ##__VA_ARGS__)
-#    define NIMBLE_LOGC( tag, format, ... ) console_printf("CRIT %s: " format "\n", tag, ##__VA_ARGS__)
-#  else
-#    define NIMBLE_LOGE( tag, format, ... ) (void)tag
-#    define NIMBLE_LOGC( tag, format, ... ) (void)tag
-#  endif
-
-#endif /* CONFIG_NIMBLE_CPP_IDF */
-#endif /* CONFIG_BT_ENABLED */
-#endif /* MAIN_NIMBLELOG_H_ */
+#endif /*MAIN_NIMBLELOG_H_*/

src/NimBLERemoteCharacteristic.cpp

@@ -12,15 +12,16 @@
  *      Author: kolban
  */
 
+#include "sdkconfig.h"
+#if defined(CONFIG_BT_ENABLED)
+
 #include "nimconfig.h"
-#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_CENTRAL)
+#if defined( CONFIG_BT_NIMBLE_ROLE_CENTRAL)
 
 #include "NimBLERemoteCharacteristic.h"
 #include "NimBLEUtils.h"
 #include "NimBLELog.h"
 
-#include <climits>
-
 static const char* LOG_TAG = "NimBLERemoteCharacteristic";
 
 /**
@@ -58,6 +59,8 @@ static const char* LOG_TAG = "NimBLERemoteCharacteristic";
     m_charProp           = chr->properties;
     m_pRemoteService     = pRemoteService;
     m_notifyCallback     = nullptr;
+    m_timestamp          = 0;
+    m_valMux             = portMUX_INITIALIZER_UNLOCKED;
 
     NIMBLE_LOGD(LOG_TAG, "<< NimBLERemoteCharacteristic(): %s", m_uuid.toString().c_str());
  } // NimBLERemoteCharacteristic
@@ -238,8 +241,7 @@ bool NimBLERemoteCharacteristic::retrieveDescriptors(const NimBLEUUID *uuid_filt
     }
 
     int rc = 0;
-    TaskHandle_t cur_task = xTaskGetCurrentTaskHandle();
-    ble_task_data_t taskData = {this, cur_task, 0, nullptr};
+    ble_task_data_t taskData = {this, xTaskGetCurrentTaskHandle(), 0, nullptr};
 
     // If we don't know the end handle of this characteristic retrieve the next one in the service
     // The end handle is the next characteristic definition handle -1.
@@ -254,10 +256,6 @@ bool NimBLERemoteCharacteristic::retrieveDescriptors(const NimBLEUUID *uuid_filt
             return false;
         }
 
-#ifdef ulTaskNotifyValueClear
-        // Clear the task notification value to ensure we block
-        ulTaskNotifyValueClear(cur_task, ULONG_MAX);
-#endif
         ulTaskNotifyTake(pdTRUE, portMAX_DELAY);
 
         if (taskData.rc != 0) {
@@ -266,10 +264,6 @@ bool NimBLERemoteCharacteristic::retrieveDescriptors(const NimBLEUUID *uuid_filt
         }
     }
 
-    if (m_handle == m_endHandle) {
-        return true;
-    }
-
     desc_filter_t filter = {uuid_filter, &taskData};
 
     rc = ble_gattc_disc_all_dscs(getRemoteService()->getClient()->getConnId(),
@@ -283,10 +277,6 @@ bool NimBLERemoteCharacteristic::retrieveDescriptors(const NimBLEUUID *uuid_filt
         return false;
     }
 
-#ifdef ulTaskNotifyValueClear
-    // Clear the task notification value to ensure we block
-    ulTaskNotifyValueClear(cur_task, ULONG_MAX);
-#endif
     ulTaskNotifyTake(pdTRUE, portMAX_DELAY);
 
     if (taskData.rc != 0) {
@@ -320,31 +310,14 @@ NimBLERemoteDescriptor* NimBLERemoteCharacteristic::getDescriptor(const NimBLEUU
             return m_descriptorVector.back();
         }
 
-        // If the request was successful but 16/32 bit uuid not found
+        // If the request was successful but 16/32 bit descriptor 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_descriptorVector.size() > prev_size) {
-                    return m_descriptorVector.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_descriptorVector.size() > prev_size) {
-                        return m_descriptorVector.back();
-                    }
-                }
-            }
+            return getDescriptor(uuid128);
         }
     }
 
@@ -434,12 +407,15 @@ NimBLEUUID NimBLERemoteCharacteristic::getUUID() {
  * @param [in] timestamp A pointer to a time_t struct to store the time the value was read.
  * @return The value of the remote characteristic.
  */
-NimBLEAttValue NimBLERemoteCharacteristic::getValue(time_t *timestamp) {
+std::string NimBLERemoteCharacteristic::getValue(time_t *timestamp) {
+    portENTER_CRITICAL(&m_valMux);
+    std::string value = m_value;
     if(timestamp != nullptr) {
-        *timestamp = m_value.getTimeStamp();
+        *timestamp = m_timestamp;
     }
+    portEXIT_CRITICAL(&m_valMux);
 
-    return m_value;
+    return value;
 }
 
 
@@ -487,12 +463,12 @@ float NimBLERemoteCharacteristic::readFloat() {
  * @param [in] timestamp A pointer to a time_t struct to store the time the value was read.
  * @return The value of the remote characteristic.
  */
-NimBLEAttValue NimBLERemoteCharacteristic::readValue(time_t *timestamp) {
+std::string NimBLERemoteCharacteristic::readValue(time_t *timestamp) {
     NIMBLE_LOGD(LOG_TAG, ">> readValue(): uuid: %s, handle: %d 0x%.2x",
                          getUUID().toString().c_str(), getHandle(), getHandle());
 
     NimBLEClient* pClient = getRemoteService()->getClient();
-    NimBLEAttValue value;
+    std::string value;
 
     if (!pClient->isConnected()) {
         NIMBLE_LOGE(LOG_TAG, "Disconnected");
@@ -501,8 +477,7 @@ NimBLEAttValue NimBLERemoteCharacteristic::readValue(time_t *timestamp) {
 
     int rc = 0;
     int retryCount = 1;
-    TaskHandle_t cur_task = xTaskGetCurrentTaskHandle();
-    ble_task_data_t taskData = {this, cur_task, 0, &value};
+    ble_task_data_t taskData = {this, xTaskGetCurrentTaskHandle(),0, &value};
 
     do {
         rc = ble_gattc_read_long(pClient->getConnId(), m_handle, 0,
@@ -514,10 +489,6 @@ NimBLEAttValue NimBLERemoteCharacteristic::readValue(time_t *timestamp) {
             return value;
         }
 
-#ifdef ulTaskNotifyValueClear
-        // Clear the task notification value to ensure we block
-        ulTaskNotifyValueClear(cur_task, ULONG_MAX);
-#endif
         ulTaskNotifyTake(pdTRUE, portMAX_DELAY);
         rc = taskData.rc;
 
@@ -543,11 +514,14 @@ NimBLEAttValue NimBLERemoteCharacteristic::readValue(time_t *timestamp) {
         }
     } while(rc != 0 && retryCount--);
 
-    value.setTimeStamp();
+    time_t t = time(nullptr);
+    portENTER_CRITICAL(&m_valMux);
     m_value = value;
+    m_timestamp = t;
     if(timestamp != nullptr) {
-        *timestamp = value.getTimeStamp();
+        *timestamp = m_timestamp;
     }
+    portEXIT_CRITICAL(&m_valMux);
 
     NIMBLE_LOGD(LOG_TAG, "<< readValue length: %d rc=%d", value.length(), rc);
     return value;
@@ -572,17 +546,16 @@ int NimBLERemoteCharacteristic::onReadCB(uint16_t conn_handle,
 
     NIMBLE_LOGI(LOG_TAG, "Read complete; status=%d conn_handle=%d", error->status, conn_handle);
 
-    NimBLEAttValue *valBuf = (NimBLEAttValue*)pTaskData->buf;
+    std::string *strBuf = (std::string*)pTaskData->buf;
     int rc = error->status;
 
     if(rc == 0) {
         if(attr) {
-            uint16_t data_len = OS_MBUF_PKTLEN(attr->om);
-            if((valBuf->size() + data_len) > BLE_ATT_ATTR_MAX_LEN) {
+            if(((*strBuf).length() + attr->om->om_len) > BLE_ATT_ATTR_MAX_LEN) {
                 rc = BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
             } else {
-                NIMBLE_LOGD(LOG_TAG, "Got %u bytes", data_len);
-                valBuf->append(attr->om->om_data, data_len);
+                NIMBLE_LOGD(LOG_TAG, "Got %d bytes", attr->om->om_len);
+                (*strBuf) += std::string((char*) attr->om->om_data, attr->om->om_len);
                 return 0;
             }
         }
@@ -616,7 +589,6 @@ bool NimBLERemoteCharacteristic::setNotify(uint16_t val, notify_callback notifyC
 
     NIMBLE_LOGD(LOG_TAG, "<< setNotify()");
 
-    response = true; // Always write with response as per Bluetooth core specification.
     return desc->writeValue((uint8_t *)&val, 2, response);
 } // setNotify
 
@@ -734,33 +706,22 @@ std::string NimBLERemoteCharacteristic::toString() {
 
 
 /**
- * @brief Write a new value to the remote characteristic from a std::vector<uint8_t>.
- * @param [in] vec A std::vector<uint8_t> value to write to the remote characteristic.
- * @param [in] response Whether we require a response from the write.
- * @return false if not connected or otherwise cannot perform write.
+ * @brief Write the new value for the characteristic.
+ * @param [in] newValue The new value to write.
+ * @param [in] response Do we expect a response?
+ * @return false if not connected or cant perform write for some reason.
  */
-bool NimBLERemoteCharacteristic::writeValue(const std::vector<uint8_t>& vec, bool response) {
-    return writeValue((uint8_t*)&vec[0], vec.size(), response);
+bool NimBLERemoteCharacteristic::writeValue(const std::string &newValue, bool response) {
+    return writeValue((uint8_t*)newValue.c_str(), newValue.length(), response);
 } // writeValue
 
 
 /**
- * @brief Write a new value to the remote characteristic from a const char*.
- * @param [in] char_s A character string to write to the remote characteristic.
- * @param [in] response Whether we require a response from the write.
- * @return false if not connected or otherwise cannot perform write.
- */
-bool NimBLERemoteCharacteristic::writeValue(const char* char_s, bool response) {
-    return writeValue((uint8_t*)char_s, strlen(char_s), response);
-} // writeValue
-
-
-/**
- * @brief Write a new value to the remote characteristic from a data buffer.
+ * @brief Write the new value for the characteristic from a data buffer.
  * @param [in] data A pointer to a data buffer.
  * @param [in] length The length of the data in the data buffer.
  * @param [in] response Whether we require a response from the write.
- * @return false if not connected or otherwise cannot perform write.
+ * @return false if not connected or cant perform write for some reason.
  */
 bool NimBLERemoteCharacteristic::writeValue(const uint8_t* data, size_t length, bool response) {
 
@@ -784,8 +745,7 @@ bool NimBLERemoteCharacteristic::writeValue(const uint8_t* data, size_t length,
         return (rc==0);
     }
 
-    TaskHandle_t cur_task = xTaskGetCurrentTaskHandle();
-    ble_task_data_t taskData = {this, cur_task, 0, nullptr};
+    ble_task_data_t taskData = {this, xTaskGetCurrentTaskHandle(), 0, nullptr};
 
     do {
         if(length > mtu) {
@@ -805,10 +765,6 @@ bool NimBLERemoteCharacteristic::writeValue(const uint8_t* data, size_t length,
             return false;
         }
 
-#ifdef ulTaskNotifyValueClear
-        // Clear the task notification value to ensure we block
-        ulTaskNotifyValueClear(cur_task, ULONG_MAX);
-#endif
         ulTaskNotifyTake(pdTRUE, portMAX_DELAY);
         rc = taskData.rc;
 
@@ -863,4 +819,6 @@ int NimBLERemoteCharacteristic::onWriteCB(uint16_t conn_handle,
     return 0;
 }
 
-#endif /* CONFIG_BT_ENABLED && CONFIG_BT_NIMBLE_ROLE_CENTRAL */
+
+#endif // #if defined( CONFIG_BT_NIMBLE_ROLE_CENTRAL)
+#endif /* CONFIG_BT_ENABLED */

src/NimBLERemoteCharacteristic.h

@@ -14,16 +14,17 @@
 
 #ifndef COMPONENTS_NIMBLEREMOTECHARACTERISTIC_H_
 #define COMPONENTS_NIMBLEREMOTECHARACTERISTIC_H_
+#include "sdkconfig.h"
+#if defined(CONFIG_BT_ENABLED)
 
 #include "nimconfig.h"
-#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_CENTRAL)
+#if defined( CONFIG_BT_NIMBLE_ROLE_CENTRAL)
 
 #include "NimBLERemoteService.h"
 #include "NimBLERemoteDescriptor.h"
 
 #include <vector>
 #include <functional>
-#include "NimBLELog.h"
 
 class NimBLERemoteService;
 class NimBLERemoteDescriptor;
@@ -61,82 +62,10 @@ public:
     uint16_t                                       getHandle();
     uint16_t                                       getDefHandle();
     NimBLEUUID                                     getUUID();
-    NimBLEAttValue                                 readValue(time_t *timestamp = nullptr);
-    std::string                                    toString();
-    NimBLERemoteService*                           getRemoteService();
-
-    uint8_t                                        readUInt8()  __attribute__ ((deprecated("Use template readValue<uint8_t>()")));
-    uint16_t                                       readUInt16() __attribute__ ((deprecated("Use template readValue<uint16_t>()")));
-    uint32_t                                       readUInt32() __attribute__ ((deprecated("Use template readValue<uint32_t>()")));
-    float                                          readFloat()  __attribute__ ((deprecated("Use template readValue<float>()")));
-    NimBLEAttValue                                 getValue(time_t *timestamp = nullptr);
-
-    bool                                           subscribe(bool notifications = true,
-                                                             notify_callback notifyCallback = nullptr,
-                                                             bool response = true);
-    bool                                           unsubscribe(bool response = true);
-    bool                                           registerForNotify(notify_callback notifyCallback,
-                                                                     bool notifications = true,
-                                                                     bool response = true)
-                                                                     __attribute__ ((deprecated("Use subscribe()/unsubscribe()")));
-    bool                                           writeValue(const uint8_t* data,
-                                                              size_t length,
-                                                              bool response = false);
-    bool                                           writeValue(const std::vector<uint8_t>& v, bool response = false);
-    bool                                           writeValue(const char* s, bool response = false);
-
-
-    /*********************** Template Functions ************************/
+    std::string                                    readValue(time_t *timestamp = nullptr);
 
     /**
-     * @brief Template to set the remote characteristic value to <type\>val.
-     * @param [in] s The value to write.
-     * @param [in] response True == request write response.
-     * @details Only used for non-arrays and types without a `c_str()` method.
-     */
-    template<typename T>
-#ifdef _DOXYGEN_
-    bool
-#else
-    typename std::enable_if<!std::is_array<T>::value && !Has_c_str_len<T>::value, bool>::type
-#endif
-    writeValue(const T& s, bool response = false) {
-        return writeValue((uint8_t*)&s, sizeof(T), response);
-    }
-
-    /**
-     * @brief Template to set the remote characteristic value to <type\>val.
-     * @param [in] s The value to write.
-     * @param [in] response True == request write response.
-     * @details Only used if the <type\> has a `c_str()` method.
-     */
-    template<typename T>
-#ifdef _DOXYGEN_
-    bool
-#else
-    typename std::enable_if<Has_c_str_len<T>::value, bool>::type
-#endif
-    writeValue(const T& s, bool response = false) {
-        return writeValue((uint8_t*)s.c_str(), s.length(), response);
-    }
-
-    /**
-     * @brief Template to convert the remote characteristic data to <type\>.
-     * @tparam T The type to convert the data to.
-     * @param [in] timestamp A pointer to a time_t struct to store the time the value was read.
-     * @param [in] skipSizeCheck If true it will skip checking if the data size is less than <tt>sizeof(<type\>)</tt>.
-     * @return The data converted to <type\> or NULL if skipSizeCheck is false and the data is
-     * less than <tt>sizeof(<type\>)</tt>.
-     * @details <b>Use:</b> <tt>getValue<type>(&timestamp, skipSizeCheck);</tt>
-     */
-    template<typename T>
-    T getValue(time_t *timestamp = nullptr, bool skipSizeCheck = false) {
-        if(!skipSizeCheck && m_value.size() < sizeof(T)) return T();
-        return *((T *)m_value.getValue(timestamp));
-    }
-
-    /**
-     * @brief Template to convert the remote characteristic data to <type\>.
+     * @brief A template to convert the remote characteristic data to <type\>.
      * @tparam T The type to convert the data to.
      * @param [in] timestamp A pointer to a time_t struct to store the time the value was read.
      * @param [in] skipSizeCheck If true it will skip checking if the data size is less than <tt>sizeof(<type\>)</tt>.
@@ -145,12 +74,62 @@ public:
      * @details <b>Use:</b> <tt>readValue<type>(&timestamp, skipSizeCheck);</tt>
      */
     template<typename T>
-    T readValue(time_t *timestamp = nullptr, bool skipSizeCheck = false) {
-        NimBLEAttValue value = readValue();
+    T                                              readValue(time_t *timestamp = nullptr, bool skipSizeCheck = false) {
+        std::string value = readValue(timestamp);
         if(!skipSizeCheck && value.size() < sizeof(T)) return T();
-        return *((T *)value.getValue(timestamp));
+        const char *pData = value.data();
+        return *((T *)pData);
     }
 
+    uint8_t                                        readUInt8()  __attribute__ ((deprecated("Use template readValue<uint8_t>()")));
+    uint16_t                                       readUInt16() __attribute__ ((deprecated("Use template readValue<uint16_t>()")));
+    uint32_t                                       readUInt32() __attribute__ ((deprecated("Use template readValue<uint32_t>()")));
+    float                                          readFloat()  __attribute__ ((deprecated("Use template readValue<float>()")));
+    std::string                                    getValue(time_t *timestamp = nullptr);
+
+    /**
+     * @brief A template to convert the remote characteristic data to <type\>.
+     * @tparam T The type to convert the data to.
+     * @param [in] timestamp A pointer to a time_t struct to store the time the value was read.
+     * @param [in] skipSizeCheck If true it will skip checking if the data size is less than <tt>sizeof(<type\>)</tt>.
+     * @return The data converted to <type\> or NULL if skipSizeCheck is false and the data is
+     * less than <tt>sizeof(<type\>)</tt>.
+     * @details <b>Use:</b> <tt>getValue<type>(&timestamp, skipSizeCheck);</tt>
+     */
+    template<typename T>
+    T                                              getValue(time_t *timestamp = nullptr, bool skipSizeCheck = false) {
+        std::string value = getValue(timestamp);
+        if(!skipSizeCheck && value.size() < sizeof(T)) return T();
+        const char *pData = value.data();
+        return *((T *)pData);
+    }
+
+    bool                                           subscribe(bool notifications = true,
+                                                             notify_callback notifyCallback = nullptr,
+                                                             bool response = false);
+    bool                                           unsubscribe(bool response = false);
+    bool                                           registerForNotify(notify_callback notifyCallback,
+                                                                     bool notifications = true,
+                                                                     bool response = true)
+                                                                     __attribute__ ((deprecated("Use subscribe()/unsubscribe()")));
+    bool                                           writeValue(const uint8_t* data,
+                                                              size_t length,
+                                                              bool response = false);
+    bool                                           writeValue(const std::string &newValue,
+                                                              bool response = false);
+    /**
+     * @brief Convenience template to set the remote characteristic value to <type\>val.
+     * @param [in] s The value to write.
+     * @param [in] response True == request write response.
+     */
+    template<typename T>
+    bool writeValue(const T &s, bool response = false) {
+        return writeValue((uint8_t*)&s, sizeof(T), response);
+    }
+
+    std::string                                    toString();
+    NimBLERemoteService*                           getRemoteService();
+
 private:
 
     NimBLERemoteCharacteristic(NimBLERemoteService *pRemoteservice, const struct ble_gatt_chr *chr);
@@ -179,12 +158,15 @@ private:
     uint16_t                m_defHandle;
     uint16_t                m_endHandle;
     NimBLERemoteService*    m_pRemoteService;
-    NimBLEAttValue          m_value;
+    std::string             m_value;
     notify_callback         m_notifyCallback;
+    time_t                  m_timestamp;
+    portMUX_TYPE            m_valMux;
 
     // We maintain a vector of descriptors owned by this characteristic.
     std::vector<NimBLERemoteDescriptor*> m_descriptorVector;
 }; // NimBLERemoteCharacteristic
 
-#endif /* CONFIG_BT_ENABLED && CONFIG_BT_NIMBLE_ROLE_CENTRAL */
+#endif // #if defined( CONFIG_BT_NIMBLE_ROLE_CENTRAL)
+#endif /* CONFIG_BT_ENABLED */
 #endif /* COMPONENTS_NIMBLEREMOTECHARACTERISTIC_H_ */

src/NimBLERemoteDescriptor.cpp

@@ -11,16 +11,16 @@
  *  Created on: Jul 8, 2017
  *      Author: kolban
  */
+#include "sdkconfig.h"
+#if defined(CONFIG_BT_ENABLED)
 
 #include "nimconfig.h"
-#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_CENTRAL)
+#if defined( CONFIG_BT_NIMBLE_ROLE_CENTRAL)
 
 #include "NimBLERemoteDescriptor.h"
 #include "NimBLEUtils.h"
 #include "NimBLELog.h"
 
-#include <climits>
-
 static const char* LOG_TAG = "NimBLERemoteDescriptor";
 
 /**
@@ -86,7 +86,11 @@ NimBLEUUID NimBLERemoteDescriptor::getUUID() {
  * @deprecated Use readValue<uint8_t>().
  */
 uint8_t NimBLERemoteDescriptor::readUInt8() {
-    return readValue<uint8_t>();
+    std::string value = readValue();
+    if (value.length() >= 1) {
+        return (uint8_t) value[0];
+    }
+    return 0;
 } // readUInt8
 
 
@@ -96,7 +100,11 @@ uint8_t NimBLERemoteDescriptor::readUInt8() {
  * @deprecated Use readValue<uint16_t>().
  */
 uint16_t NimBLERemoteDescriptor::readUInt16() {
-    return readValue<uint16_t>();
+    std::string value = readValue();
+    if (value.length() >= 2) {
+        return *(uint16_t*) value.data();
+    }
+    return 0;
 } // readUInt16
 
 
@@ -106,7 +114,11 @@ uint16_t NimBLERemoteDescriptor::readUInt16() {
  * @deprecated Use readValue<uint32_t>().
  */
 uint32_t NimBLERemoteDescriptor::readUInt32() {
-    return readValue<uint32_t>();
+    std::string value = readValue();
+    if (value.length() >= 4) {
+        return *(uint32_t*) value.data();
+    }
+    return 0;
 } // readUInt32
 
 
@@ -114,11 +126,11 @@ uint32_t NimBLERemoteDescriptor::readUInt32() {
  * @brief Read the value of the remote descriptor.
  * @return The value of the remote descriptor.
  */
-NimBLEAttValue NimBLERemoteDescriptor::readValue() {
+std::string NimBLERemoteDescriptor::readValue() {
     NIMBLE_LOGD(LOG_TAG, ">> Descriptor readValue: %s", toString().c_str());
 
     NimBLEClient* pClient = getRemoteCharacteristic()->getRemoteService()->getClient();
-    NimBLEAttValue value;
+    std::string value;
 
     if (!pClient->isConnected()) {
         NIMBLE_LOGE(LOG_TAG, "Disconnected");
@@ -127,8 +139,7 @@ NimBLEAttValue NimBLERemoteDescriptor::readValue() {
 
     int rc = 0;
     int retryCount = 1;
-    TaskHandle_t cur_task = xTaskGetCurrentTaskHandle();
-    ble_task_data_t taskData = {this, cur_task, 0, &value};
+    ble_task_data_t taskData = {this, xTaskGetCurrentTaskHandle(),0, &value};
 
     do {
         rc = ble_gattc_read_long(pClient->getConnId(), m_handle, 0,
@@ -140,10 +151,6 @@ NimBLEAttValue NimBLERemoteDescriptor::readValue() {
             return value;
         }
 
-#ifdef ulTaskNotifyValueClear
-        // Clear the task notification value to ensure we block
-        ulTaskNotifyValueClear(cur_task, ULONG_MAX);
-#endif
         ulTaskNotifyTake(pdTRUE, portMAX_DELAY);
         rc = taskData.rc;
 
@@ -168,7 +175,7 @@ NimBLEAttValue NimBLERemoteDescriptor::readValue() {
         }
     } while(rc != 0 && retryCount--);
 
-    NIMBLE_LOGD(LOG_TAG, "<< Descriptor readValue(): length: %u rc=%d", value.length(), rc);
+    NIMBLE_LOGD(LOG_TAG, "<< Descriptor readValue(): length: %d rc=%d", value.length(), rc);
     return value;
 } // readValue
 
@@ -181,7 +188,6 @@ int NimBLERemoteDescriptor::onReadCB(uint16_t conn_handle,
                 const struct ble_gatt_error *error,
                 struct ble_gatt_attr *attr, void *arg)
 {
-    (void)attr;
     ble_task_data_t *pTaskData = (ble_task_data_t*)arg;
     NimBLERemoteDescriptor* desc = (NimBLERemoteDescriptor*)pTaskData->pATT;
     uint16_t conn_id = desc->getRemoteCharacteristic()->getRemoteService()->getClient()->getConnId();
@@ -192,17 +198,16 @@ int NimBLERemoteDescriptor::onReadCB(uint16_t conn_handle,
 
     NIMBLE_LOGD(LOG_TAG, "Read complete; status=%d conn_handle=%d", error->status, conn_handle);
 
-    NimBLEAttValue *valBuf = (NimBLEAttValue*)pTaskData->buf;
+    std::string *strBuf = (std::string*)pTaskData->buf;
     int rc = error->status;
 
     if(rc == 0) {
         if(attr) {
-            uint16_t data_len = OS_MBUF_PKTLEN(attr->om);
-            if((valBuf->size() + data_len) > BLE_ATT_ATTR_MAX_LEN) {
+            if(((*strBuf).length() + attr->om->om_len) > BLE_ATT_ATTR_MAX_LEN) {
                 rc = BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
             } else {
-                NIMBLE_LOGD(LOG_TAG, "Got %u bytes", data_len);
-                valBuf->append(attr->om->om_data, data_len);
+                NIMBLE_LOGD(LOG_TAG, "Got %d bytes", attr->om->om_len);
+                (*strBuf) += std::string((char*) attr->om->om_data, attr->om->om_len);
                 return 0;
             }
         }
@@ -255,33 +260,11 @@ int NimBLERemoteDescriptor::onWriteCB(uint16_t conn_handle,
 
 
 /**
- * @brief Write a new value to a remote descriptor from a std::vector<uint8_t>.
- * @param [in] vec A std::vector<uint8_t> value to write to the remote descriptor.
- * @param [in] response Whether we require a response from the write.
- * @return false if not connected or otherwise cannot perform write.
- */
-bool NimBLERemoteDescriptor::writeValue(const std::vector<uint8_t>& vec, bool response) {
-    return writeValue((uint8_t*)&vec[0], vec.size(), response);
-} // writeValue
-
-
-/**
- * @brief Write a new value to the remote descriptor from a const char*.
- * @param [in] char_s A character string to write to the remote descriptor.
- * @param [in] response Whether we require a response from the write.
- * @return false if not connected or otherwise cannot perform write.
- */
-bool NimBLERemoteDescriptor::writeValue(const char* char_s, bool response) {
-    return writeValue((uint8_t*)char_s, strlen(char_s), response);
-} // writeValue
-
-
-/**
- * @brief Write a new value to a remote descriptor.
+ * @brief Write data to the BLE Remote Descriptor.
  * @param [in] data The data to send to the remote descriptor.
  * @param [in] length The length of the data to send.
  * @param [in] response True if we expect a write response.
- * @return false if not connected or otherwise cannot perform write.
+ * @return True if successful
  */
 bool NimBLERemoteDescriptor::writeValue(const uint8_t* data, size_t length, bool response) {
 
@@ -306,8 +289,7 @@ bool NimBLERemoteDescriptor::writeValue(const uint8_t* data, size_t length, bool
         return (rc == 0);
     }
 
-    TaskHandle_t cur_task = xTaskGetCurrentTaskHandle();
-    ble_task_data_t taskData = {this, cur_task, 0, nullptr};
+    ble_task_data_t taskData = {this, xTaskGetCurrentTaskHandle(), 0, nullptr};
 
     do {
         if(length > mtu) {
@@ -328,10 +310,6 @@ bool NimBLERemoteDescriptor::writeValue(const uint8_t* data, size_t length, bool
             return false;
         }
 
-#ifdef ulTaskNotifyValueClear
-        // Clear the task notification value to ensure we block
-        ulTaskNotifyValueClear(cur_task, ULONG_MAX);
-#endif
         ulTaskNotifyTake(pdTRUE, portMAX_DELAY);
         rc = taskData.rc;
 
@@ -362,4 +340,15 @@ bool NimBLERemoteDescriptor::writeValue(const uint8_t* data, size_t length, bool
 } // writeValue
 
 
-#endif /* CONFIG_BT_ENABLED && CONFIG_BT_NIMBLE_ROLE_CENTRAL */
+/**
+ * @brief Write data represented as a string to the BLE Remote Descriptor.
+ * @param [in] newValue The data to send to the remote descriptor.
+ * @param [in] response True if we expect a response.
+ * @return True if successful
+ */
+bool NimBLERemoteDescriptor::writeValue(const std::string &newValue, bool response) {
+    return writeValue((uint8_t*) newValue.data(), newValue.length(), response);
+} // writeValue
+
+#endif // #if defined( CONFIG_BT_NIMBLE_ROLE_CENTRAL)
+#endif /* CONFIG_BT_ENABLED */

src/NimBLERemoteDescriptor.h

@@ -14,9 +14,11 @@
 
 #ifndef COMPONENTS_NIMBLEREMOTEDESCRIPTOR_H_
 #define COMPONENTS_NIMBLEREMOTEDESCRIPTOR_H_
+#include "sdkconfig.h"
+#if defined(CONFIG_BT_ENABLED)
 
 #include "nimconfig.h"
-#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_CENTRAL)
+#if defined( CONFIG_BT_NIMBLE_ROLE_CENTRAL)
 
 #include "NimBLERemoteCharacteristic.h"
 
@@ -29,53 +31,10 @@ public:
     uint16_t                    getHandle();
     NimBLERemoteCharacteristic* getRemoteCharacteristic();
     NimBLEUUID                  getUUID();
-    NimBLEAttValue              readValue();
-
-    uint8_t                     readUInt8()  __attribute__ ((deprecated("Use template readValue<uint8_t>()")));
-    uint16_t                    readUInt16() __attribute__ ((deprecated("Use template readValue<uint16_t>()")));
-    uint32_t                    readUInt32() __attribute__ ((deprecated("Use template readValue<uint32_t>()")));
-    std::string                 toString(void);
-    bool                        writeValue(const uint8_t* data, size_t length, bool response = false);
-    bool                        writeValue(const std::vector<uint8_t>& v, bool response = false);
-    bool                        writeValue(const char* s, bool response = false);
-
-
-    /*********************** Template Functions ************************/
+    std::string                 readValue();
 
     /**
-     * @brief Template to set the remote descriptor value to <type\>val.
-     * @param [in] s The value to write.
-     * @param [in] response True == request write response.
-     * @details Only used for non-arrays and types without a `c_str()` method.
-     */
-    template<typename T>
-#ifdef _DOXYGEN_
-    bool
-#else
-    typename std::enable_if<!std::is_array<T>::value && !Has_c_str_len<T>::value, bool>::type
-#endif
-    writeValue(const T& s, bool response = false) {
-        return writeValue((uint8_t*)&s, sizeof(T), response);
-    }
-
-    /**
-     * @brief Template to set the remote descriptor value to <type\>val.
-     * @param [in] s The value to write.
-     * @param [in] response True == request write response.
-     * @details Only used if the <type\> has a `c_str()` method.
-     */
-    template<typename T>
-#ifdef _DOXYGEN_
-    bool
-#else
-    typename std::enable_if<Has_c_str_len<T>::value, bool>::type
-#endif
-    writeValue(const T& s, bool response = false) {
-        return writeValue((uint8_t*)s.c_str(), s.length(), response);
-    }
-
-    /**
-     * @brief Template to convert the remote descriptor data to <type\>.
+     * @brief A template to convert the remote descriptor data to <type\>.
      * @tparam T The type to convert the data to.
      * @param [in] skipSizeCheck If true it will skip checking if the data size is less than <tt>sizeof(<type\>)</tt>.
      * @return The data converted to <type\> or NULL if skipSizeCheck is false and the data is
@@ -83,10 +42,28 @@ public:
      * @details <b>Use:</b> <tt>readValue<type>(skipSizeCheck);</tt>
      */
     template<typename T>
-    T readValue(bool skipSizeCheck = false) {
-        NimBLEAttValue value = readValue();
+    T                           readValue(bool skipSizeCheck = false) {
+        std::string value = readValue();
         if(!skipSizeCheck && value.size() < sizeof(T)) return T();
-        return *((T *)value.data());
+        const char *pData = value.data();
+        return *((T *)pData);
+    }
+
+    uint8_t                     readUInt8()  __attribute__ ((deprecated("Use template readValue<uint8_t>()")));
+    uint16_t                    readUInt16() __attribute__ ((deprecated("Use template readValue<uint16_t>()")));
+    uint32_t                    readUInt32() __attribute__ ((deprecated("Use template readValue<uint32_t>()")));
+    std::string                 toString(void);
+    bool                        writeValue(const uint8_t* data, size_t length, bool response = false);
+    bool                        writeValue(const std::string &newValue, bool response = false);
+    
+    /**
+     * @brief Convenience template to set the remote descriptor value to <type\>val.
+     * @param [in] s The value to write.
+     * @param [in] response True == request write response.
+     */
+    template<typename T>
+    bool writeValue(const T &s, bool response = false) {
+        return writeValue((uint8_t*)&s, sizeof(T), response);
     }
 
 private:
@@ -104,5 +81,6 @@ private:
     NimBLERemoteCharacteristic* m_pRemoteCharacteristic;
 };
 
-#endif /* CONFIG_BT_ENABLED && CONFIG_BT_NIMBLE_ROLE_CENTRAL */
+#endif // #if defined( CONFIG_BT_NIMBLE_ROLE_CENTRAL)
+#endif /* CONFIG_BT_ENABLED */
 #endif /* COMPONENTS_NIMBLEREMOTEDESCRIPTOR_H_ */

src/NimBLERemoteService.cpp

@@ -11,17 +11,17 @@
  *  Created on: Jul 8, 2017
  *      Author: kolban
  */
+#include "sdkconfig.h"
+#if defined(CONFIG_BT_ENABLED)
 
 #include "nimconfig.h"
-#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_CENTRAL)
+#if defined( CONFIG_BT_NIMBLE_ROLE_CENTRAL)
 
 #include "NimBLERemoteService.h"
 #include "NimBLEUtils.h"
 #include "NimBLEDevice.h"
 #include "NimBLELog.h"
 
-#include <climits>
-
 static const char* LOG_TAG = "NimBLERemoteService";
 
 /**
@@ -109,31 +109,14 @@ NimBLERemoteCharacteristic* NimBLERemoteService::getCharacteristic(const NimBLEU
             return m_characteristicVector.back();
         }
 
-        // If the request was successful but 16/32 bit uuid not found
+        // If the request was successful but 16/32 bit characteristic 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 (retrieveCharacteristics(&uuid128)) {
-                if(m_characteristicVector.size() > prev_size) {
-                    return m_characteristicVector.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(retrieveCharacteristics(&uuid16)) {
-                    if(m_characteristicVector.size() > prev_size) {
-                        return m_characteristicVector.back();
-                    }
-                }
-            }
+            return getCharacteristic(uuid128);
         }
     }
 
@@ -165,7 +148,7 @@ std::vector<NimBLERemoteCharacteristic*>* NimBLERemoteService::getCharacteristic
 
 
 /**
- * @brief Callback for Characteristic discovery.
+ * @brief Callback for Characterisic discovery.
  * @return success == 0 or error code.
  */
 int NimBLERemoteService::characteristicDiscCB(uint16_t conn_handle,
@@ -215,8 +198,7 @@ bool NimBLERemoteService::retrieveCharacteristics(const NimBLEUUID *uuid_filter)
     NIMBLE_LOGD(LOG_TAG, ">> retrieveCharacteristics() for service: %s", getUUID().toString().c_str());
 
     int rc = 0;
-    TaskHandle_t cur_task = xTaskGetCurrentTaskHandle();
-    ble_task_data_t taskData = {this, cur_task, 0, nullptr};
+    ble_task_data_t taskData = {this, xTaskGetCurrentTaskHandle(), 0, nullptr};
 
     if(uuid_filter == nullptr) {
         rc = ble_gattc_disc_all_chrs(m_pClient->getConnId(),
@@ -238,10 +220,6 @@ bool NimBLERemoteService::retrieveCharacteristics(const NimBLEUUID *uuid_filter)
         return false;
     }
 
-#ifdef ulTaskNotifyValueClear
-    // Clear the task notification value to ensure we block
-    ulTaskNotifyValueClear(cur_task, ULONG_MAX);
-#endif
     ulTaskNotifyTake(pdTRUE, portMAX_DELAY);
 
     if(taskData.rc == 0){
@@ -256,9 +234,7 @@ bool NimBLERemoteService::retrieveCharacteristics(const NimBLEUUID *uuid_filter)
                 }
             }
 
-            if (m_characteristicVector.size() > 0) {
-                m_characteristicVector.back()->m_endHandle = getEndHandle();
-            }
+            m_characteristicVector.back()->m_endHandle = getEndHandle();
         }
 
         NIMBLE_LOGD(LOG_TAG, "<< retrieveCharacteristics()");
@@ -410,4 +386,6 @@ std::string NimBLERemoteService::toString() {
     return res;
 } // toString
 
-#endif /* CONFIG_BT_ENABLED && CONFIG_BT_NIMBLE_ROLE_CENTRAL */
+
+#endif // #if defined( CONFIG_BT_NIMBLE_ROLE_CENTRAL)
+#endif /* CONFIG_BT_ENABLED */

src/NimBLERemoteService.h

@@ -14,9 +14,11 @@
 
 #ifndef COMPONENTS_NIMBLEREMOTESERVICE_H_
 #define COMPONENTS_NIMBLEREMOTESERVICE_H_
+#include "sdkconfig.h"
+#if defined(CONFIG_BT_ENABLED)
 
 #include "nimconfig.h"
-#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_CENTRAL)
+#if defined( CONFIG_BT_NIMBLE_ROLE_CENTRAL)
 
 #include "NimBLEClient.h"
 #include "NimBLEUUID.h"
@@ -81,5 +83,6 @@ private:
     uint16_t            m_endHandle;
 }; // NimBLERemoteService
 
-#endif /* CONFIG_BT_ENABLED && CONFIG_BT_NIMBLE_ROLE_CENTRAL */
+#endif // #if defined( CONFIG_BT_NIMBLE_ROLE_CENTRAL)
+#endif /* CONFIG_BT_ENABLED */
 #endif /* COMPONENTS_NIMBLEREMOTESERVICE_H_ */

src/NimBLEScan.cpp

@@ -11,16 +11,17 @@
  *  Created on: Jul 1, 2017
  *      Author: kolban
  */
+#include "sdkconfig.h"
+#if defined(CONFIG_BT_ENABLED)
 
 #include "nimconfig.h"
-#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_OBSERVER)
+#if defined(CONFIG_BT_NIMBLE_ROLE_OBSERVER)
 
 #include "NimBLEScan.h"
 #include "NimBLEDevice.h"
 #include "NimBLELog.h"
 
 #include <string>
-#include <climits>
 
 static const char* LOG_TAG = "NimBLEScan";
 
@@ -34,7 +35,7 @@ NimBLEScan::NimBLEScan() {
     m_scan_params.itvl               = 0; // This is defined as the time interval from when the Controller started its last LE scan until it begins the subsequent LE scan. (units=0.625 msec)
     m_scan_params.window             = 0; // The duration of the LE scan. LE_Scan_Window shall be less than or equal to LE_Scan_Interval (units=0.625 msec)
     m_scan_params.limited            = 0; // If set, only discover devices in limited discoverable mode.
-    m_scan_params.filter_duplicates  = 1; // If set, the controller ignores all but the first advertisement from each device.
+    m_scan_params.filter_duplicates  = 0; // If set, the controller ignores all but the first advertisement from each device.
     m_pAdvertisedDeviceCallbacks     = nullptr;
     m_ignoreResults                  = false;
     m_pTaskData                      = nullptr;
@@ -56,27 +57,18 @@ NimBLEScan::~NimBLEScan() {
  * @param [in] param Parameter data for this event.
  */
 /*STATIC*/int NimBLEScan::handleGapEvent(ble_gap_event* event, void* arg) {
-    (void)arg;
-    NimBLEScan* pScan = NimBLEDevice::getScan();
+
+    NimBLEScan* pScan = (NimBLEScan*)arg;
 
     switch(event->type) {
 
-        case BLE_GAP_EVENT_EXT_DISC:
         case BLE_GAP_EVENT_DISC: {
             if(pScan->m_ignoreResults) {
                 NIMBLE_LOGI(LOG_TAG, "Scan op in progress - ignoring results");
                 return 0;
             }
-#if CONFIG_BT_NIMBLE_EXT_ADV
-            const auto& disc = event->ext_disc;
-            const bool isLegacyAdv = disc.props & BLE_HCI_ADV_LEGACY_MASK;
-            const auto event_type = isLegacyAdv ? disc.legacy_event_type : disc.props;
-#else
-            const auto& disc = event->disc;
-            const bool isLegacyAdv = true;
-            const auto event_type = disc.event_type;
-#endif
-            NimBLEAddress advertisedAddress(disc.addr);
+
+            NimBLEAddress advertisedAddress(event->disc.addr);
 
             // Examine our list of ignored addresses and stop processing if we don't want to see it or are already connected
             if(NimBLEDevice::isIgnored(advertisedAddress)) {
@@ -88,12 +80,7 @@ NimBLEScan::~NimBLEScan() {
 
             // If we've seen this device before get a pointer to it from the vector
             for(auto &it: pScan->m_scanResults.m_advertisedDevicesVector) {
-#if CONFIG_BT_NIMBLE_EXT_ADV
-                // Same address but different set ID should create a new advertised device.
-                if (it->getAddress() == advertisedAddress && it->getSetId() == disc.sid) {
-#else
-                if (it->getAddress() == advertisedAddress) {
-#endif
+                if(it->getAddress() == advertisedAddress) {
                     advertisedDevice = it;
                     break;
                 }
@@ -101,27 +88,20 @@ NimBLEScan::~NimBLEScan() {
 
             // If we haven't seen this device before; create a new instance and insert it in the vector.
             // Otherwise just update the relevant parameters of the already known device.
-            if (advertisedDevice == nullptr &&
-                (!isLegacyAdv || event_type != BLE_HCI_ADV_RPT_EVTYPE_SCAN_RSP)) {
+            if(advertisedDevice == nullptr && event->disc.event_type != BLE_HCI_ADV_RPT_EVTYPE_SCAN_RSP){
                 // Check if we have reach the scan results limit, ignore this one if so.
                 // We still need to store each device when maxResults is 0 to be able to append the scan results
-                if (pScan->m_maxResults > 0 && pScan->m_maxResults < 0xFF &&
-                   (pScan->m_scanResults.m_advertisedDevicesVector.size() >= pScan->m_maxResults)) {
+                if(pScan->m_maxResults > 0 && pScan->m_maxResults < 0xFF &&
+                  (pScan->m_scanResults.m_advertisedDevicesVector.size() >= pScan->m_maxResults))
+                {
                     return 0;
                 }
-
                 advertisedDevice = new NimBLEAdvertisedDevice();
                 advertisedDevice->setAddress(advertisedAddress);
-                advertisedDevice->setAdvType(event_type, isLegacyAdv);
-#if CONFIG_BT_NIMBLE_EXT_ADV
-                advertisedDevice->setSetId(disc.sid);
-                advertisedDevice->setPrimaryPhy(disc.prim_phy);
-                advertisedDevice->setSecondaryPhy(disc.sec_phy);
-                advertisedDevice->setPeriodicInterval(disc.periodic_adv_itvl);
-#endif
+                advertisedDevice->setAdvType(event->disc.event_type);
                 pScan->m_scanResults.m_advertisedDevicesVector.push_back(advertisedDevice);
                 NIMBLE_LOGI(LOG_TAG, "New advertiser: %s", advertisedAddress.toString().c_str());
-            } else if (advertisedDevice != nullptr) {
+            } else if(advertisedDevice != nullptr) {
                 NIMBLE_LOGI(LOG_TAG, "Updated advertiser: %s", advertisedAddress.toString().c_str());
             } else {
                 // Scan response from unknown device
@@ -129,18 +109,14 @@ NimBLEScan::~NimBLEScan() {
             }
 
             advertisedDevice->m_timestamp = time(nullptr);
-            advertisedDevice->setRSSI(disc.rssi);
-            advertisedDevice->setPayload(disc.data, disc.length_data, (isLegacyAdv &&
-                                         event_type == BLE_HCI_ADV_RPT_EVTYPE_SCAN_RSP));
+            advertisedDevice->setRSSI(event->disc.rssi);
+            advertisedDevice->setPayload(event->disc.data, event->disc.length_data, 
+            event->disc.event_type == BLE_HCI_ADV_RPT_EVTYPE_SCAN_RSP);
 
             if (pScan->m_pAdvertisedDeviceCallbacks) {
-                if (pScan->m_scan_params.filter_duplicates && advertisedDevice->m_callbackSent) {
-                    return 0;
-                }
-
                 // If not active scanning or scan response is not available
-                // or extended advertisement scanning, report the result to the callback now.
-                if(pScan->m_scan_params.passive || !isLegacyAdv ||
+                // report the result to the callback now.
+                if(pScan->m_scan_params.passive ||
                   (advertisedDevice->getAdvType() != BLE_HCI_ADV_TYPE_ADV_IND &&
                    advertisedDevice->getAdvType() != BLE_HCI_ADV_TYPE_ADV_SCAN_IND))
                 {
@@ -148,11 +124,11 @@ NimBLEScan::~NimBLEScan() {
                     pScan->m_pAdvertisedDeviceCallbacks->onResult(advertisedDevice);
 
                 // Otherwise, wait for the scan response so we can report the complete data.
-                } else if (isLegacyAdv && event_type == BLE_HCI_ADV_RPT_EVTYPE_SCAN_RSP) {
+                } else if (event->disc.event_type == BLE_HCI_ADV_RPT_EVTYPE_SCAN_RSP) {
                     advertisedDevice->m_callbackSent = true;
                     pScan->m_pAdvertisedDeviceCallbacks->onResult(advertisedDevice);
                 }
-                // If not storing results and we have invoked the callback, delete the device.
+                // If not storing results and we have invoked the callback, delete the device. 
                 if(pScan->m_maxResults == 0 && advertisedDevice->m_callbackSent) {
                     pScan->erase(advertisedAddress);
                 }
@@ -164,7 +140,7 @@ NimBLEScan::~NimBLEScan() {
             NIMBLE_LOGD(LOG_TAG, "discovery complete; reason=%d",
                         event->disc_complete.reason);
 
-            // If a device advertised with scan response available and it was not received
+            // If a device advertised with scan reponse available and it was not received
             // the callback would not have been invoked, so do it here.
             if(pScan->m_pAdvertisedDeviceCallbacks) {
                 for(auto &it : pScan->m_scanResults.m_advertisedDevicesVector) {
@@ -211,7 +187,7 @@ void NimBLEScan::setActiveScan(bool active) {
  * from devices it has not already seen.
  * @param [in] enabled If true, scanned devices will only be reported once.
  * @details The controller has a limited buffer and will start reporting
- * duplicate devices once the limit is reached.
+ * dupicate devices once the limit is reached.
  */
 void NimBLEScan::setDuplicateFilter(bool enabled) {
     m_scan_params.filter_duplicates = enabled;
@@ -236,7 +212,7 @@ void NimBLEScan::setLimitedOnly(bool enabled) {
  *      directed, connectable advertising packets not sent to the scanner.
  * * BLE_HCI_SCAN_FILT_USE_WL            (1)
  *      Scanner processes advertisements from white list only. A connectable,\n
- *      directed advertisement is ignored unless it contains scanners address.
+ *      directed advertisment is ignored unless it contains scanners address.
  * * BLE_HCI_SCAN_FILT_NO_WL_INITA       (2)
  *      Scanner process all advertising packets (white list not used). A\n
  *      connectable, directed advertisement shall not be ignored if the InitA
@@ -308,7 +284,7 @@ bool NimBLEScan::isScanning() {
  * @return True if scan started or false if there was an error.
  */
 bool NimBLEScan::start(uint32_t duration, void (*scanCompleteCB)(NimBLEScanResults), bool is_continue) {
-    NIMBLE_LOGD(LOG_TAG, ">> start: duration=%" PRIu32, duration);
+    NIMBLE_LOGD(LOG_TAG, ">> start(duration=%lu)", duration);
 
     // Save the callback to be invoked when the scan completes.
     m_scanCompleteCB = scanCompleteCB;
@@ -329,28 +305,9 @@ bool NimBLEScan::start(uint32_t duration, void (*scanCompleteCB)(NimBLEScanResul
         m_ignoreResults = true;
     }
 
-# if CONFIG_BT_NIMBLE_EXT_ADV
-    ble_gap_ext_disc_params scan_params;
-    scan_params.passive = m_scan_params.passive;
-    scan_params.itvl    = m_scan_params.itvl;
-    scan_params.window  = m_scan_params.window;
-    int rc = ble_gap_ext_disc(NimBLEDevice::m_own_addr_type,
-                              duration/10,
-                              0,
-                              m_scan_params.filter_duplicates,
-                              m_scan_params.filter_policy,
-                              m_scan_params.limited,
-                              &scan_params,
-                              &scan_params,
-                              NimBLEScan::handleGapEvent,
-                              NULL);
-#else
-    int rc = ble_gap_disc(NimBLEDevice::m_own_addr_type,
-                          duration,
-                          &m_scan_params,
-                          NimBLEScan::handleGapEvent,
-                          NULL);
-#endif
+    int rc = ble_gap_disc(NimBLEDevice::m_own_addr_type, duration, &m_scan_params,
+                          NimBLEScan::handleGapEvent, this);
+
     switch(rc) {
         case 0:
             if(!is_continue) {
@@ -401,15 +358,10 @@ NimBLEScanResults NimBLEScan::start(uint32_t duration, bool is_continue) {
         NIMBLE_LOGW(LOG_TAG, "Blocking scan called with duration = forever");
     }
 
-    TaskHandle_t cur_task = xTaskGetCurrentTaskHandle();
-    ble_task_data_t taskData = {nullptr, cur_task, 0, nullptr};
+    ble_task_data_t taskData = {nullptr, xTaskGetCurrentTaskHandle(),0, nullptr};
     m_pTaskData = &taskData;
 
     if(start(duration, nullptr, is_continue)) {
-#ifdef ulTaskNotifyValueClear
-        // Clear the task notification value to ensure we block
-        ulTaskNotifyValueClear(cur_task, ULONG_MAX);
-#endif
         ulTaskNotifyTake(pdTRUE, portMAX_DELAY);
     }
 
@@ -452,9 +404,7 @@ bool NimBLEScan::stop() {
  * @brief Clears the duplicate scan filter cache.
  */
 void NimBLEScan::clearDuplicateCache() {
-#ifdef CONFIG_IDF_TARGET_ESP32 // Not available for ESP32C3
     esp_ble_scan_dupilcate_list_flush();
-#endif
 }
 
 
@@ -582,4 +532,5 @@ NimBLEAdvertisedDevice *NimBLEScanResults::getDevice(const NimBLEAddress &addres
     return nullptr;
 }
 
-#endif /* CONFIG_BT_ENABLED && CONFIG_BT_NIMBLE_ROLE_OBSERVER */
+#endif // #if defined(CONFIG_BT_NIMBLE_ROLE_OBSERVER)
+#endif /* CONFIG_BT_ENABLED */

src/NimBLEScan.h

@@ -13,18 +13,16 @@
  */
 #ifndef COMPONENTS_NIMBLE_SCAN_H_
 #define COMPONENTS_NIMBLE_SCAN_H_
+#include "sdkconfig.h"
+#if defined(CONFIG_BT_ENABLED)
 
 #include "nimconfig.h"
-#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_OBSERVER)
+#if defined(CONFIG_BT_NIMBLE_ROLE_OBSERVER)
 
 #include "NimBLEAdvertisedDevice.h"
 #include "NimBLEUtils.h"
 
-#if defined(CONFIG_NIMBLE_CPP_IDF)
 #include "host/ble_gap.h"
-#else
-#include "nimble/nimble/host/include/host/ble_gap.h"
-#endif
 
 #include <vector>
 
@@ -99,5 +97,6 @@ private:
     uint8_t                             m_maxResults;
 };
 
-#endif /* CONFIG_BT_ENABLED CONFIG_BT_NIMBLE_ROLE_OBSERVER */
+#endif // #if defined(CONFIG_BT_NIMBLE_ROLE_OBSERVER)
+#endif /* CONFIG_BT_ENABLED */
 #endif /* COMPONENTS_NIMBLE_SCAN_H_ */

src/NimBLESecurity.cpp

@@ -12,8 +12,8 @@
  *      Author: chegewara
  */
 
-#include "nimconfig.h"
-#if defined(CONFIG_BT_ENABLED)
+#include "sdkconfig.h"
+#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_NIMBLE_ENABLED)
 
 #include "NimBLESecurity.h"
 #include "NimBLEDevice.h"
@@ -61,8 +61,8 @@ void NimBLESecurity::setCapability(esp_ble_io_cap_t iocap) {
 
 
 /**
- * @brief Sets the keys we will distribute during encryption.
- * @param [in] init_key A bitmask of the keys we will distribute.\n
+ * @brief Sets the keys we will distibute during encryption.
+ * @param [in] init_key A bitmask of the keys we will distibute.\n
  * Can be one or more of:
  * * ESP_BLE_ENC_KEY_MASK    (1 << 0)
  * * ESP_BLE_ID_KEY_MASK     (1 << 1)

src/NimBLESecurity.h

@@ -14,16 +14,10 @@
 
 #ifndef COMPONENTS_NIMBLESECURITY_H_
 #define COMPONENTS_NIMBLESECURITY_H_
+#include "sdkconfig.h"
+#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_NIMBLE_ENABLED)
 
-#include "nimconfig.h"
-#if defined(CONFIG_BT_ENABLED)
-
-#if defined(CONFIG_NIMBLE_CPP_IDF)
 #include "host/ble_gap.h"
-#else
-#include "nimble/nimble/host/include/host/ble_gap.h"
-#endif
-
 /****  FIX COMPILATION ****/
 #undef min
 #undef max

src/NimBLEServer.cpp

@@ -12,20 +12,19 @@
  *      Author: kolban
  */
 
+#include "sdkconfig.h"
+#if defined(CONFIG_BT_ENABLED)
+
 #include "nimconfig.h"
-#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
+#if defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
 
 #include "NimBLEServer.h"
 #include "NimBLEDevice.h"
 #include "NimBLELog.h"
 
-#if defined(CONFIG_NIMBLE_CPP_IDF)
 #include "services/gap/ble_svc_gap.h"
 #include "services/gatt/ble_svc_gatt.h"
-#else
-#include "nimble/nimble/host/services/gap/include/services/gap/ble_svc_gap.h"
-#include "nimble/nimble/host/services/gatt/include/services/gatt/ble_svc_gatt.h"
-#endif
+
 
 static const char* LOG_TAG = "NimBLEServer";
 static NimBLEServerCallbacks defaultCallbacks;
@@ -42,9 +41,7 @@ NimBLEServer::NimBLEServer() {
 //    m_svcChgChrHdl          = 0xffff; // Future Use
     m_pServerCallbacks      = &defaultCallbacks;
     m_gattsStarted          = false;
-#if !CONFIG_BT_NIMBLE_EXT_ADV
     m_advertiseOnDisconnect = true;
-#endif
     m_svcChanged            = false;
     m_deleteCallbacks       = true;
 } // NimBLEServer
@@ -77,20 +74,29 @@ NimBLEService* NimBLEServer::createService(const char* uuid) {
 /**
  * @brief Create a %BLE Service.
  * @param [in] uuid The UUID of the new service.
+ * @param [in] numHandles The maximum number of handles associated with this service.
+ * @param [in] inst_id if we have multiple services with the same UUID we need
+ *             to provide inst_id value different for each service.
  * @return A reference to the new service object.
  */
-NimBLEService* NimBLEServer::createService(const NimBLEUUID &uuid) {
+NimBLEService* NimBLEServer::createService(const NimBLEUUID &uuid, uint32_t numHandles, uint8_t inst_id) {
     NIMBLE_LOGD(LOG_TAG, ">> createService - %s", uuid.toString().c_str());
-
+    // TODO: add functionality to use inst_id for multiple services with same uuid
+    (void)inst_id;
     // Check that a service with the supplied UUID does not already exist.
     if(getServiceByUUID(uuid) != nullptr) {
         NIMBLE_LOGW(LOG_TAG, "Warning creating a duplicate service UUID: %s",
                              std::string(uuid).c_str());
     }
 
-    NimBLEService* pService = new NimBLEService(uuid);
-    m_svcVec.push_back(pService);
-    serviceChanged();
+    NimBLEService* pService = new NimBLEService(uuid, numHandles, this);
+    m_svcVec.push_back(pService); // Save a reference to this service being on this server.
+
+    if(m_gattsStarted) {
+        ble_svc_gatt_changed(0x0001, 0xffff);
+        m_svcChanged = true;
+        resetGATT();
+    }
 
     NIMBLE_LOGD(LOG_TAG, "<< createService");
     return pService;
@@ -141,37 +147,14 @@ NimBLEService *NimBLEServer::getServiceByHandle(uint16_t handle) {
     return nullptr;
 }
 
-
-#if CONFIG_BT_NIMBLE_EXT_ADV
-/**
- * @brief Retrieve the advertising object that can be used to advertise the existence of the server.
- * @return An advertising object.
- */
-NimBLEExtAdvertising* NimBLEServer::getAdvertising() {
-    return NimBLEDevice::getAdvertising();
-} // getAdvertising
-#endif
-
-#if !CONFIG_BT_NIMBLE_EXT_ADV || defined(_DOXYGEN_)
 /**
  * @brief Retrieve the advertising object that can be used to advertise the existence of the server.
+ *
  * @return An advertising object.
  */
 NimBLEAdvertising* NimBLEServer::getAdvertising() {
     return NimBLEDevice::getAdvertising();
 } // getAdvertising
-#endif
-
-/**
- * @brief Sends a service changed notification and resets the GATT server.
- */
-void NimBLEServer::serviceChanged() {
-    if(m_gattsStarted) {
-        m_svcChanged = true;
-        ble_svc_gatt_changed(0x0001, 0xffff);
-        resetGATT();
-    }
-}
 
 
 /**
@@ -191,7 +174,7 @@ void NimBLEServer::start() {
         abort();
     }
 
-#if CONFIG_NIMBLE_CPP_LOG_LEVEL >= 4
+#if CONFIG_LOG_DEFAULT_LEVEL > 3 || (ARDUINO_ARCH_ESP32 && !defined(DONT_USE_ARDUINO_BULLSHIT) && CORE_DEBUG_LEVEL >= 4)
     ble_gatts_show_local();
 #endif
 /*** Future use ***
@@ -253,7 +236,6 @@ int NimBLEServer::disconnect(uint16_t connId, uint8_t reason) {
 } // disconnect
 
 
-#if !CONFIG_BT_NIMBLE_EXT_ADV || defined(_DOXYGEN_)
 /**
  * @brief Set the server to automatically start advertising when a client disconnects.
  * @param [in] aod true == advertise, false == don't advertise.
@@ -261,7 +243,7 @@ int NimBLEServer::disconnect(uint16_t connId, uint8_t reason) {
 void NimBLEServer::advertiseOnDisconnect(bool aod) {
     m_advertiseOnDisconnect = aod;
 } // advertiseOnDisconnect
-#endif
+
 
 /**
  * @brief Return the number of connected clients.
@@ -337,9 +319,8 @@ NimBLEConnInfo NimBLEServer::getPeerIDInfo(uint16_t id) {
  * @param [in] param
  *
  */
-/*STATIC*/
-int NimBLEServer::handleGapEvent(struct ble_gap_event *event, void *arg) {
-    NimBLEServer* server = NimBLEDevice::getServer();
+/*STATIC*/int NimBLEServer::handleGapEvent(struct ble_gap_event *event, void *arg) {
+    NimBLEServer* server = (NimBLEServer*)arg;
     NIMBLE_LOGD(LOG_TAG, ">> handleGapEvent: %s",
                          NimBLEUtils::gapEventToString(event->type));
     int rc = 0;
@@ -351,9 +332,7 @@ int NimBLEServer::handleGapEvent(struct ble_gap_event *event, void *arg) {
             if (event->connect.status != 0) {
                 /* Connection failed; resume advertising */
                 NIMBLE_LOGE(LOG_TAG, "Connection failed");
-#if !CONFIG_BT_NIMBLE_EXT_ADV
                 NimBLEDevice::startAdvertising();
-#endif
             }
             else {
                 server->m_connectedPeersVec.push_back(event->connect.conn_handle);
@@ -373,7 +352,7 @@ int NimBLEServer::handleGapEvent(struct ble_gap_event *event, void *arg) {
 
         case BLE_GAP_EVENT_DISCONNECT: {
             // If Host reset tell the device now before returning to prevent
-            // any errors caused by calling host functions before resync.
+            // any errors caused by calling host functions before resyncing.
             switch(event->disconnect.reason) {
                 case BLE_HS_ETIMEOUT_HCI:
                 case BLE_HS_EOS:
@@ -398,11 +377,9 @@ int NimBLEServer::handleGapEvent(struct ble_gap_event *event, void *arg) {
             server->m_pServerCallbacks->onDisconnect(server);
             server->m_pServerCallbacks->onDisconnect(server, &event->disconnect.conn);
 
-#if !CONFIG_BT_NIMBLE_EXT_ADV
             if(server->m_advertiseOnDisconnect) {
                 server->startAdvertising();
             }
-#endif
             return 0;
         } // BLE_GAP_EVENT_DISCONNECT
 
@@ -439,12 +416,6 @@ int NimBLEServer::handleGapEvent(struct ble_gap_event *event, void *arg) {
             NIMBLE_LOGI(LOG_TAG, "mtu update event; conn_handle=%d mtu=%d",
                         event->mtu.conn_handle,
                         event->mtu.value);
-            rc = ble_gap_conn_find(event->mtu.conn_handle, &desc);
-            if (rc != 0) {
-                return 0;
-            }
-
-            server->m_pServerCallbacks->onMTUChange(event->mtu.value, &desc);
             return 0;
         } // BLE_GAP_EVENT_MTU
 
@@ -490,15 +461,11 @@ int NimBLEServer::handleGapEvent(struct ble_gap_event *event, void *arg) {
             return 0;
         } // BLE_GAP_EVENT_NOTIFY_TX
 
-
-        case BLE_GAP_EVENT_ADV_COMPLETE:
-#if CONFIG_BT_NIMBLE_EXT_ADV
-        case BLE_GAP_EVENT_SCAN_REQ_RCVD:
-            return NimBLEExtAdvertising::handleGapEvent(event, arg);
-#else
-            return NimBLEAdvertising::handleGapEvent(event, arg);
-#endif
-        // BLE_GAP_EVENT_ADV_COMPLETE | BLE_GAP_EVENT_SCAN_REQ_RCVD
+        case BLE_GAP_EVENT_ADV_COMPLETE: {
+            NIMBLE_LOGD(LOG_TAG, "Advertising Complete");
+            NimBLEDevice::getAdvertising()->advCompleteCB();
+            return 0;
+        }
 
         case BLE_GAP_EVENT_CONN_UPDATE: {
             NIMBLE_LOGD(LOG_TAG, "Connection parameters updated.");
@@ -557,7 +524,7 @@ int NimBLEServer::handleGapEvent(struct ble_gap_event *event, void *arg) {
                 NIMBLE_LOGD(LOG_TAG, "BLE_SM_IOACT_DISP; ble_sm_inject_io result: %d", rc);
 
             } else if (event->passkey.params.action == BLE_SM_IOACT_NUMCMP) {
-                NIMBLE_LOGD(LOG_TAG, "Passkey on device's display: %" PRIu32, event->passkey.params.numcmp);
+                NIMBLE_LOGD(LOG_TAG, "Passkey on device's display: %lu", event->passkey.params.numcmp);
                 pkey.action = event->passkey.params.action;
                 // Compatibility only - Do not use, should be removed the in future
                 if(NimBLEDevice::m_securityCallbacks != nullptr) {
@@ -636,7 +603,7 @@ void NimBLEServer::setCallbacks(NimBLEServerCallbacks* pCallbacks, bool deleteCa
  * @brief Remove a service from the server.
  *
  * @details Immediately removes access to the service by clients, sends a service changed indication,
- * and removes the service (if applicable) from the advertisements.
+ * and removes the service (if applicable) from the advertisments.
  * The service is not deleted unless the deleteSvc parameter is true, otherwise the service remains
  * available and can be re-added in the future. If desired a removed but not deleted service can
  * be deleted later by calling this method with deleteSvc set to true.
@@ -657,7 +624,7 @@ void NimBLEServer::removeService(NimBLEService* service, bool deleteSvc) {
     if(service->m_removed > 0) {
         if(deleteSvc) {
             for(auto it = m_svcVec.begin(); it != m_svcVec.end(); ++it) {
-                if ((*it) == service) {
+                if ((*it)->getUUID() == service->getUUID()) {
                     delete *it;
                     m_svcVec.erase(it);
                     break;
@@ -673,11 +640,12 @@ void NimBLEServer::removeService(NimBLEService* service, bool deleteSvc) {
         return;
     }
 
-    service->m_removed = deleteSvc ? NIMBLE_ATT_REMOVE_DELETE : NIMBLE_ATT_REMOVE_HIDE;
-    serviceChanged();
-#if !CONFIG_BT_NIMBLE_EXT_ADV
+    service->m_removed = deleteSvc ? 2 : 1;
+    m_svcChanged = true;
+
+    ble_svc_gatt_changed(0x0001, 0xffff);
+    resetGATT();
     NimBLEDevice::getAdvertising()->removeServiceUUID(service->getUUID());
-#endif
 }
 
 
@@ -703,7 +671,10 @@ void NimBLEServer::addService(NimBLEService* service) {
     }
 
     service->m_removed = 0;
-    serviceChanged();
+    m_svcChanged = true;
+
+    ble_svc_gatt_changed(0x0001, 0xffff);
+    resetGATT();
 }
 
 
@@ -722,7 +693,7 @@ void NimBLEServer::resetGATT() {
 
     for(auto it = m_svcVec.begin(); it != m_svcVec.end(); ) {
         if ((*it)->m_removed > 0) {
-            if ((*it)->m_removed == NIMBLE_ATT_REMOVE_DELETE) {
+            if ((*it)->m_removed == 2) {
                 delete *it;
                 it = m_svcVec.erase(it);
             } else {
@@ -740,53 +711,23 @@ void NimBLEServer::resetGATT() {
 }
 
 
-#if CONFIG_BT_NIMBLE_EXT_ADV
 /**
  * @brief Start advertising.
- * @param [in] inst_id The extended advertisement instance ID to start.
- * @param [in] duration How long to advertise for in milliseconds, 0 = forever (default).
- * @param [in] max_events Maximum number of advertisement events to send, 0 = no limit (default).
- * @return True if advertising started successfully.
- * @details Start the server advertising its existence.  This is a convenience function and is equivalent to
+ *
+ * Start the server advertising its existence.  This is a convenience function and is equivalent to
  * retrieving the advertising object and invoking start upon it.
  */
-bool NimBLEServer::startAdvertising(uint8_t inst_id,
-                                    int duration,
-                                    int max_events) {
-    return getAdvertising()->start(inst_id, duration, max_events);
+void NimBLEServer::startAdvertising() {
+    NimBLEDevice::startAdvertising();
 } // startAdvertising
 
 
-/**
- * @brief Convenience function to stop advertising a data set.
- * @param [in] inst_id The extended advertisement instance ID to stop advertising.
- * @return True if advertising stopped successfully.
- */
-bool NimBLEServer::stopAdvertising(uint8_t inst_id) {
-    return getAdvertising()->stop(inst_id);
-} // stopAdvertising
-#endif
-
-#if !CONFIG_BT_NIMBLE_EXT_ADV|| defined(_DOXYGEN_)
-/**
- * @brief Start advertising.
- * @return True if advertising started successfully.
- * @details Start the server advertising its existence.  This is a convenience function and is equivalent to
- * retrieving the advertising object and invoking start upon it.
- */
-bool NimBLEServer::startAdvertising() {
-    return getAdvertising()->start();
-} // startAdvertising
-#endif
-
-
 /**
  * @brief Stop advertising.
- * @return True if advertising stopped successfully.
  */
-bool NimBLEServer::stopAdvertising() {
-    return getAdvertising()->stop();
-} // stopAdvertising
+void NimBLEServer::stopAdvertising() {
+    NimBLEDevice::stopAdvertising();
+} // startAdvertising
 
 
 /**
@@ -824,31 +765,7 @@ void NimBLEServer::updateConnParams(uint16_t conn_handle,
     if(rc != 0) {
         NIMBLE_LOGE(LOG_TAG, "Update params error: %d, %s", rc, NimBLEUtils::returnCodeToString(rc));
     }
-} // updateConnParams
-
-
-/**
- * @brief Request an update of the data packet length.
- * * Can only be used after a connection has been established.
- * @details Sends a data length update request to the peer.
- * The Data Length Extension (DLE) allows to increase the Data Channel Payload from 27 bytes to up to 251 bytes.
- * The peer needs to support the Bluetooth 4.2 specifications, to be capable of DLE.
- * @param [in] conn_handle The connection handle of the peer to send the request to.
- * @param [in] tx_octets The preferred number of payload octets to use (Range 0x001B-0x00FB).
- */
-void NimBLEServer::setDataLen(uint16_t conn_handle, uint16_t tx_octets) {
-#if defined(CONFIG_NIMBLE_CPP_IDF) && !defined(ESP_IDF_VERSION) || \
-  (ESP_IDF_VERSION_MAJOR * 100 + ESP_IDF_VERSION_MINOR * 10 + ESP_IDF_VERSION_PATCH) < 432
-    return;
-#else
-    uint16_t tx_time = (tx_octets + 14) * 8;
-
-    int rc = ble_gap_set_data_len(conn_handle, tx_octets, tx_time);
-    if(rc != 0) {
-        NIMBLE_LOGE(LOG_TAG, "Set data length error: %d, %s", rc, NimBLEUtils::returnCodeToString(rc));
-    }
-#endif
-} // setDataLen
+}// updateConnParams
 
 
 bool NimBLEServer::setIndicateWait(uint16_t conn_handle) {
@@ -892,10 +809,6 @@ void NimBLEServerCallbacks::onDisconnect(NimBLEServer* pServer, ble_gap_conn_des
     NIMBLE_LOGD("NimBLEServerCallbacks", "onDisconnect(): Default");
 } // onDisconnect
 
-void NimBLEServerCallbacks::onMTUChange(uint16_t MTU, ble_gap_conn_desc* desc) {
-    NIMBLE_LOGD("NimBLEServerCallbacks", "onMTUChange(): Default");
-} // onMTUChange
-
 uint32_t NimBLEServerCallbacks::onPassKeyRequest(){
     NIMBLE_LOGD("NimBLEServerCallbacks", "onPassKeyRequest: default: 123456");
     return 123456;
@@ -918,4 +831,6 @@ bool NimBLEServerCallbacks::onConfirmPIN(uint32_t pin){
     return true;
 }
 
-#endif /* CONFIG_BT_ENABLED && CONFIG_BT_NIMBLE_ROLE_PERIPHERAL */
+
+#endif // #if defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
+#endif // CONFIG_BT_ENABLED

src/NimBLEServer.h

@@ -14,22 +14,15 @@
 
 #ifndef MAIN_NIMBLESERVER_H_
 #define MAIN_NIMBLESERVER_H_
+#include "sdkconfig.h"
+#if defined(CONFIG_BT_ENABLED)
 
 #include "nimconfig.h"
-#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
-
-#define NIMBLE_ATT_REMOVE_HIDE 1
-#define NIMBLE_ATT_REMOVE_DELETE 2
-
-#define onMtuChanged onMTUChange
+#if defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
 
 #include "NimBLEUtils.h"
 #include "NimBLEAddress.h"
-#if CONFIG_BT_NIMBLE_EXT_ADV
-#include "NimBLEExtAdvertising.h"
-#else
 #include "NimBLEAdvertising.h"
-#endif
 #include "NimBLEService.h"
 #include "NimBLESecurity.h"
 #include "NimBLEConnInfo.h"
@@ -47,22 +40,15 @@ class NimBLEServer {
 public:
     size_t                 getConnectedCount();
     NimBLEService*         createService(const char* uuid);
-    NimBLEService*         createService(const NimBLEUUID &uuid);
+    NimBLEService*         createService(const NimBLEUUID &uuid, uint32_t numHandles=15,
+                                         uint8_t inst_id=0);
     void                   removeService(NimBLEService* service, bool deleteSvc = false);
     void                   addService(NimBLEService* service);
+    NimBLEAdvertising*     getAdvertising();
     void                   setCallbacks(NimBLEServerCallbacks* pCallbacks,
                                         bool deleteCallbacks = true);
-#if CONFIG_BT_NIMBLE_EXT_ADV
-    NimBLEExtAdvertising*  getAdvertising();
-    bool                   startAdvertising(uint8_t inst_id,
-                                            int duration = 0,
-                                            int max_events = 0);
-    bool                   stopAdvertising(uint8_t inst_id);
-#else
-    NimBLEAdvertising*     getAdvertising();
-    bool                   startAdvertising();
-#endif
-    bool                   stopAdvertising();
+    void                   startAdvertising();
+    void                   stopAdvertising();
     void                   start();
     NimBLEService*         getServiceByUUID(const char* uuid, uint16_t instanceId = 0);
     NimBLEService*         getServiceByUUID(const NimBLEUUID &uuid, uint16_t instanceId = 0);
@@ -72,32 +58,22 @@ public:
     void                   updateConnParams(uint16_t conn_handle,
                                             uint16_t minInterval, uint16_t maxInterval,
                                             uint16_t latency, uint16_t timeout);
-    void                   setDataLen(uint16_t conn_handle, uint16_t tx_octets);
     uint16_t               getPeerMTU(uint16_t conn_id);
     std::vector<uint16_t>  getPeerDevices();
     NimBLEConnInfo         getPeerInfo(size_t index);
     NimBLEConnInfo         getPeerInfo(const NimBLEAddress& address);
     NimBLEConnInfo         getPeerIDInfo(uint16_t id);
-#if !CONFIG_BT_NIMBLE_EXT_ADV || defined(_DOXYGEN_)
     void                   advertiseOnDisconnect(bool);
-#endif
 
 private:
     NimBLEServer();
     ~NimBLEServer();
     friend class           NimBLECharacteristic;
-    friend class           NimBLEService;
     friend class           NimBLEDevice;
     friend class           NimBLEAdvertising;
-#if CONFIG_BT_NIMBLE_EXT_ADV
-    friend class           NimBLEExtAdvertising;
-    friend class           NimBLEExtAdvertisementData;
-#endif
 
     bool                   m_gattsStarted;
-#if !CONFIG_BT_NIMBLE_EXT_ADV
     bool                   m_advertiseOnDisconnect;
-#endif
     bool                   m_svcChanged;
     NimBLEServerCallbacks* m_pServerCallbacks;
     bool                   m_deleteCallbacks;
@@ -110,7 +86,6 @@ private:
     std::vector<NimBLECharacteristic*> m_notifyChrVec;
 
     static int             handleGapEvent(struct ble_gap_event *event, void *arg);
-    void                   serviceChanged();
     void                   resetGATT();
     bool                   setIndicateWait(uint16_t conn_handle);
     void                   clearIndicateWait(uint16_t conn_handle);
@@ -151,19 +126,11 @@ public:
      * @brief Handle a client disconnection.
      * This is called when a client discconnects.
      * @param [in] pServer A pointer to the %BLE server that received the client disconnection.
-     * @param [in] desc A pointer to the connection description structure containing information
+     * @param [in] desc A pointer to the connection description structure containig information
      * about the connection.
      */
     virtual void onDisconnect(NimBLEServer* pServer, ble_gap_conn_desc* desc);
 
-     /**
-     * @brief Called when the connection MTU changes.
-     * @param [in] MTU The new MTU value.
-     * @param [in] desc A pointer to the connection description structure containing information
-     * about the connection.
-     */
-    virtual void onMTUChange(uint16_t MTU, ble_gap_conn_desc* desc);
-
     /**
      * @brief Called when a client requests a passkey for pairing.
      * @return The passkey to be sent to the client.
@@ -188,5 +155,7 @@ public:
     virtual bool onConfirmPIN(uint32_t pin);
 }; // NimBLEServerCallbacks
 
-#endif /* CONFIG_BT_ENABLED && CONFIG_BT_NIMBLE_ROLE_PERIPHERAL */
+
+#endif // #if defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
+#endif /* CONFIG_BT_ENABLED */
 #endif /* MAIN_NIMBLESERVER_H_ */

src/NimBLEService.cpp

@@ -14,10 +14,12 @@
 
 // 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)
+#include "sdkconfig.h"
+#if defined(CONFIG_BT_ENABLED)
+
+#include "nimconfig.h"
+#if defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
 
-#include "NimBLEDevice.h"
 #include "NimBLEService.h"
 #include "NimBLEUtils.h"
 #include "NimBLELog.h"
@@ -32,19 +34,25 @@ static const char* LOG_TAG = "NimBLEService"; // Tag for logging.
 /**
  * @brief Construct an instance of the NimBLEService
  * @param [in] uuid The UUID of the service.
+ * @param [in] numHandles The maximum number of handles associated with the service.
+ * @param [in] a pointer to the server instance that this service belongs to.
  */
-NimBLEService::NimBLEService(const char* uuid)
-: NimBLEService(NimBLEUUID(uuid)) {
+NimBLEService::NimBLEService(const char* uuid, uint16_t numHandles, NimBLEServer* pServer)
+: NimBLEService(NimBLEUUID(uuid), numHandles, pServer) {
 }
 
 
 /**
  * @brief Construct an instance of the BLEService
  * @param [in] uuid The UUID of the service.
+ * @param [in] numHandles The maximum number of handles associated with the service.
+ * @param [in] a pointer to the server instance that this service belongs to.
  */
-NimBLEService::NimBLEService(const NimBLEUUID &uuid) {
+NimBLEService::NimBLEService(const NimBLEUUID &uuid, uint16_t numHandles, NimBLEServer* pServer) {
     m_uuid         = uuid;
     m_handle       = NULL_HANDLE;
+    m_pServer      = pServer;
+    m_numHandles   = numHandles;
     m_pSvcDef      = nullptr;
     m_removed      = 0;
 
@@ -110,18 +118,7 @@ NimBLEUUID NimBLEService::getUUID() {
  */
 bool NimBLEService::start() {
     NIMBLE_LOGD(LOG_TAG, ">> start(): Starting service: %s", toString().c_str());
-
-    // Rebuild the service definition if the server attributes have changed.
-    if(getServer()->m_svcChanged && m_pSvcDef != nullptr) {
-        if(m_pSvcDef[0].characteristics) {
-            if(m_pSvcDef[0].characteristics[0].descriptors) {
-                delete(m_pSvcDef[0].characteristics[0].descriptors);
-            }
-            delete(m_pSvcDef[0].characteristics);
-        }
-        delete(m_pSvcDef);
-        m_pSvcDef = nullptr;
-    }
+    int rc = 0;
 
     if(m_pSvcDef == nullptr) {
         // Nimble requires an array of services to be sent to the api
@@ -135,23 +132,8 @@ bool NimBLEService::start() {
         svc[0].uuid = &m_uuid.getNative()->u;
         svc[0].includes = NULL;
 
-        int removedCount = 0;
-        for(auto it = m_chrVec.begin(); it != m_chrVec.end(); ) {
-            if ((*it)->m_removed > 0) {
-                if ((*it)->m_removed == NIMBLE_ATT_REMOVE_DELETE) {
-                    delete *it;
-                    it = m_chrVec.erase(it);
-                } else {
-                    ++removedCount;
-                    ++it;
-                }
-                continue;
-            }
+        size_t numChrs = m_chrVec.size();
 
-            ++it;
-        }
-
-        size_t numChrs = m_chrVec.size() - removedCount;
         NIMBLE_LOGD(LOG_TAG,"Adding %d characteristics for service %s", numChrs, toString().c_str());
 
         if(!numChrs){
@@ -160,60 +142,40 @@ bool NimBLEService::start() {
             // Nimble requires the last characteristic to have it's uuid = 0 to indicate the end
             // of the characteristics for the service. We create 1 extra and set it to null
             // for this purpose.
-            pChr_a = new ble_gatt_chr_def[numChrs + 1];
-            uint8_t i = 0;
-            for(auto chr_it = m_chrVec.begin(); chr_it != m_chrVec.end(); ++chr_it) {
-                if((*chr_it)->m_removed > 0) {
-                    continue;
-                }
+            pChr_a = new ble_gatt_chr_def[numChrs+1];
+            NimBLECharacteristic* pCharacteristic = *m_chrVec.begin();
 
-                removedCount = 0;
-                for(auto it = (*chr_it)->m_dscVec.begin(); it != (*chr_it)->m_dscVec.end(); ) {
-                    if ((*it)->m_removed > 0) {
-                        if ((*it)->m_removed == NIMBLE_ATT_REMOVE_DELETE) {
-                            delete *it;
-                            it = (*chr_it)->m_dscVec.erase(it);
-                        } else {
-                            ++removedCount;
-                            ++it;
-                        }
-                        continue;
-                    }
-
-                    ++it;
-                }
-
-                size_t numDscs = (*chr_it)->m_dscVec.size() - removedCount;
+            for(uint8_t i=0; i < numChrs;) {
+                uint8_t numDscs = pCharacteristic->m_dscVec.size();
 
                 if(!numDscs){
                     pChr_a[i].descriptors = NULL;
                 } else {
                     // Must have last descriptor uuid = 0 so we have to create 1 extra
                     pDsc_a = new ble_gatt_dsc_def[numDscs+1];
-                    uint8_t d = 0;
-                    for(auto dsc_it = (*chr_it)->m_dscVec.begin(); dsc_it != (*chr_it)->m_dscVec.end(); ++dsc_it ) {
-                        if((*dsc_it)->m_removed > 0) {
-                            continue;
-                        }
-                        pDsc_a[d].uuid = &(*dsc_it)->m_uuid.getNative()->u;
-                        pDsc_a[d].att_flags = (*dsc_it)->m_properties;
+                    NimBLEDescriptor* pDescriptor = *pCharacteristic->m_dscVec.begin();
+                    for(uint8_t d=0; d < numDscs;) {
+                        pDsc_a[d].uuid = &pDescriptor->m_uuid.getNative()->u;
+                        pDsc_a[d].att_flags = pDescriptor->m_properties;
                         pDsc_a[d].min_key_size = 0;
                         pDsc_a[d].access_cb = NimBLEDescriptor::handleGapEvent;
-                        pDsc_a[d].arg = (*dsc_it);
-                        ++d;
+                        pDsc_a[d].arg = pDescriptor;
+                        d++;
+                        pDescriptor = *(pCharacteristic->m_dscVec.begin() + d);
                     }
 
                     pDsc_a[numDscs].uuid = NULL;
                     pChr_a[i].descriptors = pDsc_a;
                 }
 
-                pChr_a[i].uuid = &(*chr_it)->m_uuid.getNative()->u;
+                pChr_a[i].uuid = &pCharacteristic->m_uuid.getNative()->u;
                 pChr_a[i].access_cb = NimBLECharacteristic::handleGapEvent;
-                pChr_a[i].arg = (*chr_it);
-                pChr_a[i].flags = (*chr_it)->m_properties;
+                pChr_a[i].arg = pCharacteristic;
+                pChr_a[i].flags = pCharacteristic->m_properties;
                 pChr_a[i].min_key_size = 0;
-                pChr_a[i].val_handle = &(*chr_it)->m_handle;
-                ++i;
+                pChr_a[i].val_handle = &pCharacteristic->m_handle;
+                i++;
+                pCharacteristic = *(m_chrVec.begin() + i);
             }
 
             pChr_a[numChrs].uuid = NULL;
@@ -225,7 +187,7 @@ bool NimBLEService::start() {
         m_pSvcDef = svc;
     }
 
-    int rc = ble_gatts_count_cfg((const ble_gatt_svc_def*)m_pSvcDef);
+    rc = ble_gatts_count_cfg((const ble_gatt_svc_def*)m_pSvcDef);
     if (rc != 0) {
         NIMBLE_LOGE(LOG_TAG, "ble_gatts_count_cfg failed, rc= %d, %s", rc, NimBLEUtils::returnCodeToString(rc));
         return false;
@@ -256,11 +218,10 @@ uint16_t NimBLEService::getHandle() {
  * @brief Create a new BLE Characteristic associated with this service.
  * @param [in] uuid - The UUID of the characteristic.
  * @param [in] properties - The properties of the characteristic.
- * @param [in] max_len - The maximum length in bytes that the characteristic value can hold.
  * @return The new BLE characteristic.
  */
-NimBLECharacteristic* NimBLEService::createCharacteristic(const char* uuid, uint32_t properties, uint16_t max_len) {
-    return createCharacteristic(NimBLEUUID(uuid), properties, max_len);
+NimBLECharacteristic* NimBLEService::createCharacteristic(const char* uuid, uint32_t properties) {
+    return createCharacteristic(NimBLEUUID(uuid), properties);
 }
 
 
@@ -268,74 +229,27 @@ NimBLECharacteristic* NimBLEService::createCharacteristic(const char* uuid, uint
  * @brief Create a new BLE Characteristic associated with this service.
  * @param [in] uuid - The UUID of the characteristic.
  * @param [in] properties - The properties of the characteristic.
- * @param [in] max_len - The maximum length in bytes that the characteristic value can hold.
  * @return The new BLE characteristic.
  */
-NimBLECharacteristic* NimBLEService::createCharacteristic(const NimBLEUUID &uuid, uint32_t properties, uint16_t max_len) {
-    NimBLECharacteristic* pCharacteristic = new NimBLECharacteristic(uuid, properties, max_len, this);
+NimBLECharacteristic* NimBLEService::createCharacteristic(const NimBLEUUID &uuid, uint32_t properties) {
+    NimBLECharacteristic* pCharacteristic = new NimBLECharacteristic(uuid, properties, this);
 
     if (getCharacteristic(uuid) != nullptr) {
         NIMBLE_LOGD(LOG_TAG, "<< Adding a duplicate characteristic with UUID: %s",
                              std::string(uuid).c_str());
     }
 
-    addCharacteristic(pCharacteristic);
+    // Remember this characteristic in our vector of characteristics.
+    m_chrVec.push_back(pCharacteristic);
+
     return pCharacteristic;
 } // createCharacteristic
 
 
-/**
- * @brief Add a characteristic to the service.
- * @param[in] pCharacteristic A pointer to the characteristic instance to add to the service.
- */
 void NimBLEService::addCharacteristic(NimBLECharacteristic* pCharacteristic) {
-    bool foundRemoved = false;
-
-    if(pCharacteristic->m_removed > 0) {
-        for(auto& it : m_chrVec) {
-            if(it == pCharacteristic) {
-                foundRemoved = true;
-                pCharacteristic->m_removed = 0;
-            }
-        }
-    }
-
-    if(!foundRemoved) {
-        m_chrVec.push_back(pCharacteristic);
-    }
-
     pCharacteristic->setService(this);
-    getServer()->serviceChanged();
-} // addCharacteristic
-
-
-/**
- * @brief Remove a characteristic from the service.
- * @param[in] pCharacteristic A pointer to the characteristic instance to remove from the service.
- * @param[in] deleteChr If true it will delete the characteristic instance and free it's resources.
- */
-void NimBLEService::removeCharacteristic(NimBLECharacteristic* pCharacteristic, bool deleteChr) {
-    // Check if the characteristic was already removed and if so, check if this
-    // is being called to delete the object and do so if requested.
-    // Otherwise, ignore the call and return.
-    if(pCharacteristic->m_removed > 0) {
-        if(deleteChr) {
-            for(auto it = m_chrVec.begin(); it != m_chrVec.end(); ++it) {
-                if ((*it) == pCharacteristic) {
-                    m_chrVec.erase(it);
-                    delete *it;
-                    break;
-                }
-            }
-        }
-
-        return;
-    }
-
-    pCharacteristic->m_removed = deleteChr ? NIMBLE_ATT_REMOVE_DELETE : NIMBLE_ATT_REMOVE_HIDE;
-    getServer()->serviceChanged();
-} // removeCharacteristic
-
+    m_chrVec.push_back(pCharacteristic);
+}
 
 /**
  * @brief Get a pointer to the characteristic object with the specified UUID.
@@ -429,7 +343,8 @@ std::string NimBLEService::toString() {
  * @return The BLEServer associated with this service.
  */
 NimBLEServer* NimBLEService::getServer() {
-    return NimBLEDevice::getServer();
+    return m_pServer;
 }// getServer
 
-#endif /* CONFIG_BT_ENABLED && CONFIG_BT_NIMBLE_ROLE_PERIPHERAL */
+#endif // #if defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
+#endif // CONFIG_BT_ENABLED

src/NimBLEService.h

@@ -14,9 +14,11 @@
 
 #ifndef MAIN_NIMBLESERVICE_H_
 #define MAIN_NIMBLESERVICE_H_
+#include "sdkconfig.h"
+#if defined(CONFIG_BT_ENABLED)
 
 #include "nimconfig.h"
-#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
+#if defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
 
 #include "NimBLEServer.h"
 #include "NimBLECharacteristic.h"
@@ -34,8 +36,8 @@ class NimBLECharacteristic;
 class NimBLEService {
 public:
 
-    NimBLEService(const char* uuid);
-    NimBLEService(const NimBLEUUID &uuid);
+    NimBLEService(const char* uuid, uint16_t numHandles, NimBLEServer* pServer);
+    NimBLEService(const NimBLEUUID &uuid, uint16_t numHandles, NimBLEServer* pServer);
     ~NimBLEService();
 
     NimBLEServer*         getServer();
@@ -50,17 +52,14 @@ public:
     NimBLECharacteristic* createCharacteristic(const char* uuid,
                                               uint32_t properties =
                                               NIMBLE_PROPERTY::READ |
-                                              NIMBLE_PROPERTY::WRITE,
-                                              uint16_t max_len = BLE_ATT_ATTR_MAX_LEN);
+                                              NIMBLE_PROPERTY::WRITE);
 
     NimBLECharacteristic* createCharacteristic(const NimBLEUUID &uuid,
                                                uint32_t properties =
                                                NIMBLE_PROPERTY::READ |
-                                               NIMBLE_PROPERTY::WRITE,
-                                               uint16_t max_len = BLE_ATT_ATTR_MAX_LEN);
+                                               NIMBLE_PROPERTY::WRITE);
 
     void                  addCharacteristic(NimBLECharacteristic* pCharacteristic);
-    void                  removeCharacteristic(NimBLECharacteristic* pCharacteristic, bool deleteChr = false);
     NimBLECharacteristic* getCharacteristic(const char* uuid, uint16_t instanceId = 0);
     NimBLECharacteristic* getCharacteristic(const NimBLEUUID &uuid, uint16_t instanceId = 0);
     NimBLECharacteristic* getCharacteristicByHandle(uint16_t handle);
@@ -76,12 +75,16 @@ private:
     friend class          NimBLEDevice;
 
     uint16_t              m_handle;
+    NimBLEServer*         m_pServer;
     NimBLEUUID            m_uuid;
+    uint16_t              m_numHandles;
     ble_gatt_svc_def*     m_pSvcDef;
     uint8_t               m_removed;
     std::vector<NimBLECharacteristic*> m_chrVec;
 
 }; // NimBLEService
 
-#endif /* CONFIG_BT_ENABLED && CONFIG_BT_NIMBLE_ROLE_PERIPHERAL */
+
+#endif // #if defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
+#endif // CONFIG_BT_ENABLED
 #endif /* MAIN_NIMBLESERVICE_H_ */

src/NimBLEUUID.cpp

@@ -11,9 +11,8 @@
  *  Created on: Jun 21, 2017
  *      Author: kolban
  */
-
-#include "nimconfig.h"
-#if defined(CONFIG_BT_ENABLED)
+#include "sdkconfig.h"
+#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_NIMBLE_ENABLED)
 
 #include "NimBLEUtils.h"
 #include "NimBLEUUID.h"
@@ -235,8 +234,8 @@ const ble_uuid_any_t* NimBLEUUID::getNative() const {
 
 /**
  * @brief Convert a UUID to its 128 bit representation.
- * @details A UUID can be internally represented as 16bit, 32bit or the full 128bit.
- * This method will convert 16 or 32bit representations to the full 128bit.
+ * @details A UUID can be internally represented as 16bit, 32bit or the full 128bit.  This method
+ * will convert 16 or 32 bit representations to the full 128bit.
  * @return The NimBLEUUID converted to 128bit.
  */
 const NimBLEUUID &NimBLEUUID::to128() {
@@ -257,29 +256,6 @@ const NimBLEUUID &NimBLEUUID::to128() {
 } // to128
 
 
-/**
- * @brief Convert 128 bit UUID to its 16 bit representation.
- * @details A UUID can be internally represented as 16bit, 32bit or the full 128bit.
- * This method will convert a 128bit uuid to 16bit if it contains the ble base uuid.
- * @return The NimBLEUUID converted to 16bit if successful, otherwise the original uuid.
- */
-const NimBLEUUID& NimBLEUUID::to16() {
-    if (!m_valueSet || m_uuid.u.type == BLE_UUID_TYPE_16) {
-        return *this;
-    }
-
-    if (m_uuid.u.type == BLE_UUID_TYPE_128) {
-        uint8_t base128[] = {0xfb, 0x34, 0x9b, 0x5f, 0x80, 0x00,
-                             0x00, 0x80, 0x00, 0x10, 0x00, 0x00};
-        if (memcmp(m_uuid.u128.value, base128, sizeof(base128)) == 0 ) {
-            *this = NimBLEUUID(*(uint16_t*)(m_uuid.u128.value + 12));
-        }
-    }
-
-    return *this;
-}
-
-
 /**
  * @brief Get a string representation of the UUID.
  * @details
@@ -297,7 +273,7 @@ std::string NimBLEUUID::toString() const {
 
 
 /**
- * @brief Convenience operator to check if this UUID is equal to another.
+ * @brief Convienience operator to check if this UUID is equal to another.
  */
 bool NimBLEUUID::operator ==(const NimBLEUUID & rhs) const {
     if(m_valueSet && rhs.m_valueSet) {
@@ -336,7 +312,7 @@ bool NimBLEUUID::operator ==(const NimBLEUUID & rhs) const {
 
 
 /**
- * @brief Convenience operator to check if this UUID is not equal to another.
+ * @brief Convienience operator to check if this UUID is not equal to another.
  */
 bool NimBLEUUID::operator !=(const NimBLEUUID & rhs) const {
     return !this->operator==(rhs);
@@ -344,7 +320,7 @@ bool NimBLEUUID::operator !=(const NimBLEUUID & rhs) const {
 
 
 /**
- * @brief Convenience operator to convert this UUID to string representation.
+ * @brief Convienience operator to convert this UUID to string representation.
  * @details This allows passing NimBLEUUID to functions
  * that accept std::string and/or or it's methods as a parameter.
  */

src/NimBLEUUID.h

@@ -14,16 +14,10 @@
 
 #ifndef COMPONENTS_NIMBLEUUID_H_
 #define COMPONENTS_NIMBLEUUID_H_
+#include "sdkconfig.h"
+#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_NIMBLE_ENABLED)
 
-#include "nimconfig.h"
-#if defined(CONFIG_BT_ENABLED)
-
-#if defined(CONFIG_NIMBLE_CPP_IDF)
 #include "host/ble_uuid.h"
-#else
-#include "nimble/nimble/host/include/host/ble_uuid.h"
-#endif
-
 /****  FIX COMPILATION ****/
 #undef min
 #undef max
@@ -48,7 +42,6 @@ public:
     bool                  equals(const NimBLEUUID &uuid) const;
     const ble_uuid_any_t* getNative() const;
     const NimBLEUUID &    to128();
-    const NimBLEUUID&     to16();
     std::string           toString() const;
     static NimBLEUUID     fromString(const std::string &uuid);
 

src/NimBLEUtils.cpp

@@ -6,13 +6,12 @@
  *
  */
 
-#include "nimconfig.h"
-#if defined(CONFIG_BT_ENABLED)
+#include "sdkconfig.h"
+#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_NIMBLE_ENABLED)
 
 #include "NimBLEUtils.h"
 #include "NimBLELog.h"
-
-#include <stdlib.h>
+#include "nimconfig.h"
 
 static const char* LOG_TAG = "NimBLEUtils";
 
@@ -343,7 +342,6 @@ const char* NimBLEUtils::returnCodeToString(int rc) {
             return "Unknown";
     }
 #else // #if defined(CONFIG_NIMBLE_CPP_ENABLE_RETURN_CODE_TEXT)
-    (void)rc;
     return "";
 #endif // #if defined(CONFIG_NIMBLE_CPP_ENABLE_RETURN_CODE_TEXT)
 }
@@ -355,7 +353,7 @@ const char* NimBLEUtils::returnCodeToString(int rc) {
  * @return A string representation of the advertising flags.
  */
 const char* NimBLEUtils::advTypeToString(uint8_t advType) {
-#if defined(CONFIG_NIMBLE_CPP_ENABLE_ADVERTISEMENT_TYPE_TEXT)
+#if defined(CONFIG_NIMBLE_CPP_ENABLE_ADVERTISMENT_TYPE_TEXT)
     switch(advType) {
         case BLE_HCI_ADV_TYPE_ADV_IND :                     //0
             return "Undirected - Connectable / Scannable";
@@ -370,10 +368,9 @@ const char* NimBLEUtils::advTypeToString(uint8_t advType) {
         default:
             return "Unknown flag";
     }
-#else // #if defined(CONFIG_NIMBLE_CPP_ENABLE_ADVERTISEMENT_TYPE_TEXT)
-    (void)advType;
+#else // #if defined(CONFIG_NIMBLE_CPP_ENABLE_ADVERTISMENT_TYPE_TEXT)
     return "";
-#endif // #if defined(CONFIG_NIMBLE_CPP_ENABLE_ADVERTISEMENT_TYPE_TEXT)
+#endif // #if defined(CONFIG_NIMBLE_CPP_ENABLE_ADVERTISMENT_TYPE_TEXT)
 } // adFlagsToString
 
 
@@ -419,11 +416,8 @@ char* NimBLEUtils::buildHexData(uint8_t* target, const uint8_t* source, uint8_t
  * @param [in] arg Unused.
  */
 void NimBLEUtils::dumpGapEvent(ble_gap_event *event, void *arg){
-    (void)arg;
 #if defined(CONFIG_NIMBLE_CPP_ENABLE_GAP_EVENT_CODE_TEXT)
     NIMBLE_LOGD(LOG_TAG, "Received a GAP event: %s", gapEventToString(event->type));
-#else
-    (void)event;
 #endif
 }
 
@@ -510,7 +504,6 @@ const char* NimBLEUtils::gapEventToString(uint8_t eventType) {
             return "Unknown event type";
     }
 #else // #if defined(CONFIG_NIMBLE_CPP_ENABLE_GAP_EVENT_CODE_TEXT)
-    (void)eventType;
     return "";
 #endif // #if defined(CONFIG_NIMBLE_CPP_ENABLE_GAP_EVENT_CODE_TEXT)
 } // gapEventToString

src/NimBLEUtils.h

@@ -8,15 +8,10 @@
 
 #ifndef COMPONENTS_NIMBLEUTILS_H_
 #define COMPONENTS_NIMBLEUTILS_H_
+#include "sdkconfig.h"
+#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_NIMBLE_ENABLED)
 
-#include "nimconfig.h"
-#if defined(CONFIG_BT_ENABLED)
-
-#if defined(CONFIG_NIMBLE_CPP_IDF)
 #include "host/ble_gap.h"
-#else
-#include "nimble/nimble/host/include/host/ble_gap.h"
-#endif
 
 /****  FIX COMPILATION ****/
 #undef min
@@ -29,7 +24,7 @@ typedef struct {
     void *pATT;
     TaskHandle_t task;
     int rc;
-    void *buf;
+    std::string *buf;
 } ble_task_data_t;
 
 

src/nimconfig.h

@@ -10,68 +10,21 @@
 #include "sdkconfig.h"
 #include "nimconfig_rename.h"
 
-#if defined(CONFIG_BT_ENABLED)
-
-// Allows cpp wrapper to select the correct include paths when using esp-idf
-#define CONFIG_NIMBLE_CPP_IDF
-
-/* Cannot use client without scan */
-#if defined(CONFIG_BT_NIMBLE_ROLE_CENTRAL) && !defined(CONFIG_BT_NIMBLE_ROLE_OBSERVER)
-#define CONFIG_BT_NIMBLE_ROLE_OBSERVER
-#endif
-
-/* Cannot use server without advertise */
-#if defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL) && !defined(CONFIG_BT_NIMBLE_ROLE_BROADCASTER)
-#define CONFIG_BT_NIMBLE_ROLE_BROADCASTER
-#endif
-
-/* Enables the use of Arduino String class for attribute values */
-#if defined __has_include
-#  if __has_include (<Arduino.h>)
-#    define NIMBLE_CPP_ARDUINO_STRING_AVAILABLE
-#  endif
-#endif
-
-#endif /* CONFIG_BT_ENABLED */
-
 #ifdef _DOXYGEN_
 
 /** @brief Un-comment to change the number of simultaneous connections (esp controller max is 9) */
 #define CONFIG_BT_NIMBLE_MAX_CONNECTIONS 3
 
-/** @brief Un-comment to enable storing the timestamp when an attribute value is updated\n
- *  This allows for checking the last update time using getTimeStamp() or getValue(time_t*)\n
- *  If disabled, the timestamp returned from these functions will be 0.\n
- *  Disabling timestamps will reduce the memory used for each value.\n
- *  1 = Enabled, 0 = Disabled; Default = Disabled
- */
-#define CONFIG_NIMBLE_CPP_ATT_VALUE_TIMESTAMP_ENABLED 0
-
-/** @brief Uncomment to set the default allocation size (bytes) for each attribute if\n
- *  not specified when the constructor is called. This is also the size used when a remote\n
- *  characteristic or descriptor is constructed before a value is read/notifed.\n
- *  Increasing this will reduce reallocations but increase memory footprint.\n
- *  Default value is 20. Range: 1 : 512 (BLE_ATT_ATTR_MAX_LEN)
- */
-#define CONFIG_NIMBLE_CPP_ATT_VALUE_INIT_LENGTH 20
-
 /** @brief Un-comment to change the default MTU size */
 #define CONFIG_BT_NIMBLE_ATT_PREFERRED_MTU 255
 
 /** @brief Un-comment to change default device name */
 #define CONFIG_BT_NIMBLE_SVC_GAP_DEVICE_NAME "nimble"
 
-/** @brief Un-comment to set the debug log messages level from the NimBLE host stack.\n
- *  Values: 0 = DEBUG, 1 = INFO, 2 = WARNING, 3 = ERROR, 4 = CRITICAL, 5+ = NONE\n
+/** @brief Un-comment to see debug log messages from the NimBLE host
  *  Uses approx. 32kB of flash memory.
  */
-#define CONFIG_BT_NIMBLE_LOG_LEVEL 5
-
-/** @brief Un-comment to set the debug log messages level from the NimBLE CPP Wrapper.\n
- *  Values: 0 = NONE, 1 = ERROR, 2 = WARNING, 3 = INFO, 4+ = DEBUG\n
- *  Uses approx. 32kB of flash memory.
- */
-#define CONFIG_NIMBLE_CPP_LOG_LEVEL 0
+#define CONFIG_BT_NIMBLE_DEBUG
 
 /** @brief Un-comment to see NimBLE host return codes as text debug log messages.
  *  Uses approx. 7kB of flash memory.

src/nimconfig_rename.h

@@ -41,21 +41,13 @@
 #endif
 
 #if defined(CONFIG_SCAN_DUPLICATE_TYPE) && !defined(CONFIG_BTDM_SCAN_DUPL_TYPE)
-#define CONFIG_BTDM_SCAN_DUPL_TYPE CONFIG_SCAN_DUPLICATE_TYPE
-#endif
-
-#if defined(CONFIG_BT_CTRL_SCAN_DUPL_TYPE) && !defined(CONFIG_BTDM_SCAN_DUPL_TYPE)
-#define CONFIG_BTDM_SCAN_DUPL_TYPE CONFIG_BT_CTRL_SCAN_DUPL_TYPE
+#define CONFIG_BTDM_SCAN_DUPL_TYPE CONFIG_SCAN_DUPLICATE_TYPE 
 #endif
 
 #if defined(CONFIG_DUPLICATE_SCAN_CACHE_SIZE) && !defined(CONFIG_BTDM_SCAN_DUPL_CACHE_SIZE)
-#define CONFIG_BTDM_SCAN_DUPL_CACHE_SIZE CONFIG_DUPLICATE_SCAN_CACHE_SIZE
-#endif
-
-#if defined(CONFIG_BT_CTRL_SCAN_DUPL_CACHE_SIZE) && !defined(CONFIG_BTDM_SCAN_DUPL_CACHE_SIZE)
-#define CONFIG_BTDM_SCAN_DUPL_CACHE_SIZE CONFIG_BT_CTRL_SCAN_DUPL_CACHE_SIZE
+#define CONFIG_BTDM_SCAN_DUPL_CACHE_SIZE CONFIG_DUPLICATE_SCAN_CACHE_SIZE 
 #endif
 
 #if defined(CONFIG_NIMBLE_MAX_CONNECTIONS ) && !defined(CONFIG_BT_NIMBLE_MAX_CONNECTIONS)
-#define CONFIG_BT_NIMBLE_MAX_CONNECTIONS CONFIG_NIMBLE_MAX_CONNECTIONS
+#define CONFIG_BT_NIMBLE_MAX_CONNECTIONS CONFIG_NIMBLE_MAX_CONNECTIONS  
 #endif