Skip to content

[Bugfix] Arduino detection for headers. #1124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
h2zero wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[Bugfix] Arduino detection for headers. #1124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 13 additions & 11 deletions src/NimBLEAttValue.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,13 @@
#include "syscfg/syscfg.h"
#if CONFIG_BT_NIMBLE_ENABLED

# ifdef NIMBLE_CPP_ARDUINO_STRING_AVAILABLE
# include <Arduino.h>
/* Enables the use of Arduino String class for attribute values */
# ifndef NIMBLE_CPP_ARDUINO_STRING_AVAILABLE
# define NIMBLE_CPP_ARDUINO_STRING_AVAILABLE (__has_include(<Arduino.h>))
# endif

# if NIMBLE_CPP_ARDUINO_STRING_AVAILABLE
# include <WString.h>
# endif

# include <string>
Expand Down Expand Up @@ -78,8 +83,7 @@ template <typename T, typename = void>
struct Has_value_type : std::false_type {};

template <typename T>
struct Has_value_type<T, decltype(void(sizeof(typename T::value_type)))>
: std::true_type {};
struct Has_value_type<T, decltype(void(sizeof(typename T::value_type)))> : std::true_type {};

/**
* @brief A specialized container class to hold BLE attribute values.
Expand All @@ -103,7 +107,8 @@ class NimBLEAttValue {
* @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 = MYNEWT_VAL(NIMBLE_CPP_ATT_VALUE_INIT_LENGTH), uint16_t max_len = BLE_ATT_ATTR_MAX_LEN);
NimBLEAttValue(uint16_t init_len = MYNEWT_VAL(NIMBLE_CPP_ATT_VALUE_INIT_LENGTH),
uint16_t max_len = BLE_ATT_ATTR_MAX_LEN);

/**
* @brief Construct with an initial value from a buffer.
Expand Down Expand Up @@ -145,7 +150,7 @@ class NimBLEAttValue {
NimBLEAttValue(const std::vector<uint8_t> vec, uint16_t max_len = BLE_ATT_ATTR_MAX_LEN)
: NimBLEAttValue(&vec[0], vec.size(), max_len) {}

# ifdef NIMBLE_CPP_ARDUINO_STRING_AVAILABLE
# if 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.
Expand Down Expand Up @@ -292,10 +297,7 @@ class NimBLEAttValue {
typename std::enable_if<Has_data_size<T>::value && Has_value_type<T>::value, bool>::type
# endif
setValue(const T& v) {
return setValue(
reinterpret_cast<const uint8_t*>(v.data()),
v.size() * sizeof(typename T::value_type)
);
return setValue(reinterpret_cast<const uint8_t*>(v.data()), v.size() * sizeof(typename T::value_type));
}

/**
Expand Down Expand Up @@ -398,7 +400,7 @@ class NimBLEAttValue {
/** @brief Inequality operator */
bool operator!=(const NimBLEAttValue& source) const { return !(*this == source); }

# ifdef NIMBLE_CPP_ARDUINO_STRING_AVAILABLE
# if NIMBLE_CPP_ARDUINO_STRING_AVAILABLE
/** @brief Operator; Get the value as an Arduino String value. */
operator String() const { return String(reinterpret_cast<char*>(m_attr_value)); }
# endif
Expand Down
4 changes: 4 additions & 0 deletions src/NimBLEStream.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@
# include <type_traits>
# include <cstdarg>

# ifndef NIMBLE_CPP_ARDUINO_STRING_AVAILABLE
# define NIMBLE_CPP_ARDUINO_STRING_AVAILABLE (__has_include(<Arduino.h>))
# endif

# if NIMBLE_CPP_ARDUINO_STRING_AVAILABLE
# include <Stream.h>
# else
Expand Down
7 changes: 0 additions & 7 deletions src/nimconfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,13 +215,6 @@
# define CONFIG_BT_NIMBLE_LEGACY_VHCI_ENABLE (1)
#endif // ESP_PLATFORM

/* 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 (1)
# endif
#endif

/* Required macros for all supported devices */

#ifndef CONFIG_BT_NIMBLE_ENABLED
Expand Down
Loading