Delete nimconfig

Author: lucasssvaz

libraries/NimBLE/examples/Bluetooth_5/NimBLE_extended_client/NimBLE_extended_client.ino

@@ -11,7 +11,7 @@
 #include <Arduino.h>
 #include <BLEDevice.h>
 #if !CONFIG_BT_NIMBLE_EXT_ADV
-#error Must enable extended advertising, see nimconfig.h file.
+#error Must enable extended advertising.
 #endif
 
 #define SERVICE_UUID        "ABCD"

libraries/NimBLE/examples/Bluetooth_5/NimBLE_extended_scan/NimBLE_extended_scan.ino

@@ -10,7 +10,7 @@
 #include <Arduino.h>
 #include <BLEDevice.h>
 #if !CONFIG_BT_NIMBLE_EXT_ADV
-#error Must enable extended advertising, see nimconfig.h file.
+#error Must enable extended advertising.
 #endif
 
 static uint32_t scanTime = 10 * 1000;  // In milliseconds, 0 = scan forever

libraries/NimBLE/examples/Bluetooth_5/NimBLE_extended_server/NimBLE_extended_server.ino

@@ -15,7 +15,7 @@
 #include <Arduino.h>
 #include <BLEDevice.h>
 #if !CONFIG_BT_NIMBLE_EXT_ADV
-#error Must enable extended advertising, see nimconfig.h file.
+#error Must enable extended advertising.
 #endif
 
 #include "esp_sleep.h"

libraries/NimBLE/examples/Bluetooth_5/NimBLE_multi_advertiser/NimBLE_multi_advertiser.ino

@@ -15,7 +15,7 @@
 #include <Arduino.h>
 #include <BLEDevice.h>
 #if !CONFIG_BT_NIMBLE_EXT_ADV
-#error Must enable extended advertising, see nimconfig.h file.
+#error Must enable extended advertising.
 #endif
 
 #include "esp_sleep.h"

libraries/NimBLE/src/BLE2904.cpp

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include "nimconfig.h"
+#include "sdkconfig.h"
 #if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
 
 #include "BLE2904.h"

libraries/NimBLE/src/BLE2904.h

@@ -18,7 +18,7 @@
 #ifndef NIMBLE_CPP_2904_H_
 #define NIMBLE_CPP_2904_H_
 
-#include "nimconfig.h"
+#include "sdkconfig.h"
 #if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
 
 #include "BLEDescriptor.h"

libraries/NimBLE/src/BLEAddress.cpp

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include "nimconfig.h"
+#include "sdkconfig.h"
 #if defined(CONFIG_BT_ENABLED)
 
 #include "BLEAddress.h"

libraries/NimBLE/src/BLEAddress.h

@@ -17,7 +17,7 @@
 
 #ifndef NIMBLE_CPP_ADDRESS_H_
 #define NIMBLE_CPP_ADDRESS_H_
-#include "nimconfig.h"
+#include "sdkconfig.h"
 #if defined(CONFIG_BT_ENABLED)
 
 #include "nimble/ble.h"

libraries/NimBLE/src/BLEAdvertisedDevice.cpp

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include "nimconfig.h"
+#include "sdkconfig.h"
 #if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_OBSERVER)
 
 #include "BLEDevice.h"

libraries/NimBLE/src/BLEAdvertisedDevice.h

@@ -18,7 +18,7 @@
 #ifndef NIMBLE_CPP_ADVERTISED_DEVICE_H_
 #define NIMBLE_CPP_ADVERTISED_DEVICE_H_
 
-#include "nimconfig.h"
+#include "sdkconfig.h"
 #if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_OBSERVER)
 
 #include "BLEAddress.h"

libraries/NimBLE/src/BLEAdvertisementData.cpp

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include "nimconfig.h"
+#include "sdkconfig.h"
 #if (defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_BROADCASTER) && !CONFIG_BT_NIMBLE_EXT_ADV)
 
 #include "BLEAdvertisementData.h"

libraries/NimBLE/src/BLEAdvertisementData.h

@@ -18,7 +18,7 @@
 #ifndef NIMBLE_CPP_ADVERTISEMENT_DATA_H_
 #define NIMBLE_CPP_ADVERTISEMENT_DATA_H_
 
-#include "nimconfig.h"
+#include "sdkconfig.h"
 #if (defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_BROADCASTER) && !CONFIG_BT_NIMBLE_EXT_ADV)
 
 #include <cstdint>

libraries/NimBLE/src/BLEAdvertising.cpp

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include "nimconfig.h"
+#include "sdkconfig.h"
 #if (defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_BROADCASTER) && !CONFIG_BT_NIMBLE_EXT_ADV)
 
 #include "services/gap/ble_svc_gap.h"

libraries/NimBLE/src/BLEAdvertising.h

@@ -18,7 +18,7 @@
 #ifndef NIMBLE_CPP_ADVERTISING_H_
 #define NIMBLE_CPP_ADVERTISING_H_
 
-#include "nimconfig.h"
+#include "sdkconfig.h"
 #if (defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_BROADCASTER) && !CONFIG_BT_NIMBLE_EXT_ADV)
 
 #include "host/ble_gap.h"

libraries/NimBLE/src/BLEAttValue.cpp

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include "nimconfig.h"
+#include "sdkconfig.h"
 #if defined(CONFIG_BT_ENABLED)
 
 #include "nimble/nimble_npl.h"
@@ -33,7 +33,6 @@ BLEAttValue::BLEAttValue(uint16_t init_len, uint16_t max_len)
     m_timestamp{}
 #endif
 {
-  NIMBLE_CPP_DEBUG_ASSERT(m_attr_value);
   if (m_attr_value == nullptr) {
     log_e(LOG_TAG, "Failed to calloc ctx");
   }
@@ -80,7 +79,6 @@ BLEAttValue &BLEAttValue::operator=(const BLEAttValue &source) {
 // Copy all the data from the source object to this object, including allocated space.
 void BLEAttValue::deepCopy(const BLEAttValue &source) {
   uint8_t *res = static_cast<uint8_t *>(realloc(m_attr_value, source.m_capacity + 1));
-  NIMBLE_CPP_DEBUG_ASSERT(res);
   if (res == nullptr) {
     log_e(LOG_TAG, "Failed to realloc deepCopy");
     return;
@@ -120,7 +118,6 @@ BLEAttValue &BLEAttValue::append(const uint8_t *value, uint16_t len) {
     res = static_cast<uint8_t *>(realloc(m_attr_value, (new_len + 1)));
     m_capacity = new_len;
   }
-  NIMBLE_CPP_DEBUG_ASSERT(res);
   if (res == nullptr) {
     log_e(LOG_TAG, "Failed to realloc append");
     return *this;
@@ -144,7 +141,6 @@ BLEAttValue &BLEAttValue::append(const uint8_t *value, uint16_t len) {
 }
 
 uint8_t BLEAttValue::operator[](int pos) const {
-  NIMBLE_CPP_DEBUG_ASSERT(pos < m_attr_len);
   if (pos >= m_attr_len) {
     log_e(LOG_TAG, "pos >= len, pos=%u, len=%u", pos, m_attr_len);
     return 0;

libraries/NimBLE/src/BLEAttValue.h

@@ -17,12 +17,10 @@
 
 #ifndef NIMBLE_CPP_ATTVALUE_H
 #define NIMBLE_CPP_ATTVALUE_H
-#include "nimconfig.h"
+#include "sdkconfig.h"
 #if defined(CONFIG_BT_ENABLED)
 
-#ifdef NIMBLE_CPP_ARDUINO_STRING_AVAILABLE
 #include <Arduino.h>
-#endif
 
 #include <string>
 #include <vector>
@@ -117,14 +115,12 @@ class BLEAttValue {
      */
   BLEAttValue(const std::vector<uint8_t> vec, uint16_t max_len = BLE_ATT_ATTR_MAX_LEN) : BLEAttValue(&vec[0], 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.
      */
   BLEAttValue(const String str, uint16_t max_len = BLE_ATT_ATTR_MAX_LEN) : BLEAttValue(reinterpret_cast<const uint8_t *>(str.c_str()), str.length(), max_len) {}
-#endif
 
   /** @brief Copy constructor */
   BLEAttValue(const BLEAttValue &source) {
@@ -365,12 +361,10 @@ class BLEAttValue {
     return !(*this == source);
   }
 
-#ifdef 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
 };
 
 #endif /*(CONFIG_BT_ENABLED) */

libraries/NimBLE/src/BLEAttribute.h

@@ -18,7 +18,7 @@
 #ifndef NIMBLE_CPP_ATTRIBUTE_H_
 #define NIMBLE_CPP_ATTRIBUTE_H_
 
-#include "nimconfig.h"
+#include "sdkconfig.h"
 #if defined(CONFIG_BT_ENABLED) && (defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL) || defined(CONFIG_BT_NIMBLE_ROLE_CENTRAL))
 
 #include "BLEUUID.h"

libraries/NimBLE/src/BLEBeacon.cpp

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include "nimconfig.h"
+#include "sdkconfig.h"
 #if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_BROADCASTER)
 
 #include "BLEBeacon.h"

libraries/NimBLE/src/BLEBeacon.h

@@ -18,7 +18,7 @@
 #ifndef NIMBLE_CPP_BEACON_H_
 #define NIMBLE_CPP_BEACON_H_
 
-#include "nimconfig.h"
+#include "sdkconfig.h"
 #if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_BROADCASTER)
 
 class BLEUUID;

libraries/NimBLE/src/BLECharacteristic.cpp

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include "nimconfig.h"
+#include "sdkconfig.h"
 #if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
 
 #include "BLECharacteristic.h"

libraries/NimBLE/src/BLECharacteristic.h

@@ -17,7 +17,7 @@
 
 #ifndef NIMBLE_CPP_CHARACTERISTIC_H_
 #define NIMBLE_CPP_CHARACTERISTIC_H_
-#include "nimconfig.h"
+#include "sdkconfig.h"
 #if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
 
 class BLECharacteristicCallbacks;

libraries/NimBLE/src/BLEClient.cpp

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include "nimconfig.h"
+#include "sdkconfig.h"
 #if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_CENTRAL)
 
 #include "BLEClient.h"

libraries/NimBLE/src/BLEClient.h

@@ -18,7 +18,7 @@
 #ifndef NIMBLE_CPP_CLIENT_H_
 #define NIMBLE_CPP_CLIENT_H_
 
-#include "nimconfig.h"
+#include "sdkconfig.h"
 #if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_CENTRAL)
 
 #include "host/ble_gap.h"

libraries/NimBLE/src/BLEDescriptor.cpp

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include "nimconfig.h"
+#include "sdkconfig.h"
 #if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
 
 #include "BLEService.h"

libraries/NimBLE/src/BLEDescriptor.h

@@ -18,7 +18,7 @@
 #ifndef NIMBLE_CPP_DESCRIPTOR_H_
 #define NIMBLE_CPP_DESCRIPTOR_H_
 
-#include "nimconfig.h"
+#include "sdkconfig.h"
 #if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
 
 #include "BLELocalValueAttribute.h"

libraries/NimBLE/src/BLEDevice.cpp

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include "nimconfig.h"
+#include "sdkconfig.h"
 #if defined(CONFIG_BT_ENABLED)
 
 #include "BLEDevice.h"
@@ -1194,17 +1194,4 @@ std::string BLEDevice::toString() {
   return getAddress().toString();
 }  // toString
 
-#if CONFIG_NIMBLE_CPP_DEBUG_ASSERT_ENABLED
-/**
- * @brief Debug assert - weak function.
- * @param [in] file The file where the assert occurred.
- * @param [in] line The line number where the assert occurred.
- */
-void nimble_cpp_assert(const char *file, unsigned line) {
-  console_printf("Assertion failed at %s:%u\n", file, line);
-  ble_npl_time_delay(10);
-  abort();
-}
-#endif  // CONFIG_NIMBLE_CPP_DEBUG_ASSERT_ENABLED
-
 #endif  // CONFIG_BT_ENABLED

libraries/NimBLE/src/BLEDevice.h

@@ -18,7 +18,7 @@
 #ifndef NIMBLE_CPP_DEVICE_H_
 #define NIMBLE_CPP_DEVICE_H_
 
-#include "nimconfig.h"
+#include "sdkconfig.h"
 #if defined(CONFIG_BT_ENABLED)
 #ifndef CONFIG_IDF_TARGET_ESP32P4
 #include <esp_bt.h>

libraries/NimBLE/src/BLEEddystoneTLM.cpp

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include "nimconfig.h"
+#include "sdkconfig.h"
 #if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_BROADCASTER)
 
 #include "BLEEddystoneTLM.h"

libraries/NimBLE/src/BLEEddystoneTLM.h

@@ -18,7 +18,7 @@
 #ifndef NIMBLE_CPP_EDDYSTONETLM_H_
 #define NIMBLE_CPP_EDDYSTONETLM_H_
 
-#include "nimconfig.h"
+#include "sdkconfig.h"
 #if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_BROADCASTER)
 
 class BLEUUID;

libraries/NimBLE/src/BLEExtAdvertising.cpp

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include "nimconfig.h"
+#include "sdkconfig.h"
 #if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_BROADCASTER) && CONFIG_BT_NIMBLE_EXT_ADV
 
 #include "services/gap/ble_svc_gap.h"

libraries/NimBLE/src/BLEExtAdvertising.h

@@ -18,7 +18,7 @@
 #ifndef NIMBLE_CPP_EXTADVERTISING_H_
 #define NIMBLE_CPP_EXTADVERTISING_H_
 
-#include "nimconfig.h"
+#include "sdkconfig.h"
 #if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_BROADCASTER) && CONFIG_BT_NIMBLE_EXT_ADV
 
 #include "host/ble_gap.h"

libraries/NimBLE/src/BLEHIDDevice.cpp

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include "nimconfig.h"
+#include "sdkconfig.h"
 #if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
 
 #include "BLEHIDDevice.h"

libraries/NimBLE/src/BLEHIDDevice.h

@@ -18,7 +18,7 @@
 #ifndef NIMBLE_CPP_HIDDEVICE_H_
 #define NIMBLE_CPP_HIDDEVICE_H_
 
-#include "nimconfig.h"
+#include "sdkconfig.h"
 #if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_BROADCASTER) && defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
 
 #include <stdint.h>

libraries/NimBLE/src/BLELocalAttribute.h

@@ -18,7 +18,7 @@
 #ifndef NIMBLE_CPP_LOCAL_ATTRIBUTE_H_
 #define NIMBLE_CPP_LOCAL_ATTRIBUTE_H_
 
-#include "nimconfig.h"
+#include "sdkconfig.h"
 #if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
 
 #include "BLEAttribute.h"

libraries/NimBLE/src/BLELocalValueAttribute.h

@@ -18,7 +18,7 @@
 #ifndef NIMBLE_LOCAL_VALUE_ATTRIBUTE_H_
 #define NIMBLE_LOCAL_VALUE_ATTRIBUTE_H_
 
-#include "nimconfig.h"
+#include "sdkconfig.h"
 #if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
 
 #include "host/ble_hs.h"