[BREAKING] Refactor config to use MYNEWT macros.

This replaces the previously prefixed CONFIG_BT_X config macros with the underlying MYNEWT_VAL_X config macros that they affected.
This will prevent any redefinition issues caused by the ESP Arduino core enabling nimble and ensures that the config values are set correctly.

Author: h2zero

.github/workflows/build.yml

@@ -75,14 +75,13 @@ jobs:
             [env]
             platform = espressif32
             framework = arduino
+            build_flags = -D MYNEWT_VAL_BLE_EXT_ADV=1
 
             [env:esp32c3]
             board = esp32-c3-devkitm-1
-            build_flags = '-DCONFIG_BT_NIMBLE_EXT_ADV=1'
 
             [env:esp32s3]
             board = esp32-s3-devkitc-1
-            build_flags = '-DCONFIG_BT_NIMBLE_EXT_ADV=1'
           EOF
           cp ${{ matrix.example }}/* example/src/
           platformio run -d example
@@ -160,22 +159,19 @@ jobs:
             [env]
             platform = https://github.com/pioarduino/platform-espressif32/releases/download/stable/platform-espressif32.zip
             framework = arduino
+            build_flags = -D MYNEWT_VAL_BLE_EXT_ADV=1
 
             [env:esp32c3]
             board = esp32-c3-devkitm-1
-            build_flags = '-DCONFIG_BT_NIMBLE_EXT_ADV=1'
 
             [env:esp32s3]
             board = esp32-s3-devkitc-1
-            build_flags = '-DCONFIG_BT_NIMBLE_EXT_ADV=1'
 
             [env:esp32c6]
             board = esp32-c6-devkitc-1
-            build_flags = '-DCONFIG_BT_NIMBLE_EXT_ADV=1'
 
             [env:esp32h2]
             board = esp32-h2-devkitm-1
-            build_flags = '-DCONFIG_BT_NIMBLE_EXT_ADV=1'
           EOF
           cp ${{ matrix.example }}/* example/src/
             platformio run -d example
@@ -224,7 +220,7 @@ jobs:
       - uses: actions/checkout@v4
       - name: Set config for BT5
         run: |
-          sed -i '0,/#include \"nimconfig_rename.h\"/a #define CONFIG_BT_NIMBLE_EXT_ADV 1' ./src/nimconfig.h
+          sed -i 's|^// \(#define MYNEWT_VAL_BLE_EXT_ADV 1\)|\1|' ./src/nimconfig.h
       - name: Build BT5 arduino-esp32
         uses: arduino/[email protected]
         with:
@@ -276,7 +272,7 @@ jobs:
       - uses: actions/checkout@v4
       - name: Set config for BT5
         run: |
-          echo "-DCONFIG_BT_NIMBLE_EXT_ADV=1" > ${{ matrix.example }}/build_opt.h
+          echo "-DMYNEWT_VAL_BLE_EXT_ADV=1" > ${{ matrix.example }}/build_opt.h
       - name: Build BT5 n-able Arduino
         uses: arduino/[email protected]
         with:

docs/Doxyfile

@@ -2416,7 +2416,7 @@ INCLUDE_FILE_PATTERNS  =
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 PREDEFINED             = _DOXYGEN_ \
-                         CONFIG_BT_ENABLED \
+                         CONFIG_BT_NIMBLE_ENABLED \
                          CONFIG_BT_NIMBLE_ROLE_CENTRAL \
                          CONFIG_BT_NIMBLE_ROLE_OBSERVER \
                          CONFIG_BT_NIMBLE_ROLE_PERIPHERAL \

examples/Bluetooth_5/NimBLE_extended_client/NimBLE_extended_client.ino

@@ -10,7 +10,7 @@
 
 #include <Arduino.h>
 #include <NimBLEDevice.h>
-#if !CONFIG_BT_NIMBLE_EXT_ADV
+#if !MYNEWT_VAL(BLE_EXT_ADV)
 # error Must enable extended advertising, see nimconfig.h file.
 #endif
 

examples/Bluetooth_5/NimBLE_extended_scan/NimBLE_extended_scan.ino

@@ -9,7 +9,7 @@
 
 #include <Arduino.h>
 #include <NimBLEDevice.h>
-#if !CONFIG_BT_NIMBLE_EXT_ADV
+#if !MYNEWT_VAL(BLE_EXT_ADV)
 # error Must enable extended advertising, see nimconfig.h file.
 #endif
 

examples/Bluetooth_5/NimBLE_extended_server/NimBLE_extended_server.ino

@@ -14,7 +14,7 @@
 
 #include <Arduino.h>
 #include <NimBLEDevice.h>
-#if !CONFIG_BT_NIMBLE_EXT_ADV
+#if !MYNEWT_VAL(BLE_EXT_ADV)
 # error Must enable extended advertising, see nimconfig.h file.
 #endif
 

examples/Bluetooth_5/NimBLE_multi_advertiser/NimBLE_multi_advertiser.ino

@@ -14,7 +14,7 @@
 
 #include <Arduino.h>
 #include <NimBLEDevice.h>
-#if !CONFIG_BT_NIMBLE_EXT_ADV
+#if !MYNEWT_VAL(BLE_EXT_ADV)
 # error Must enable extended advertising, see nimconfig.h file.
 #endif
 

examples/L2CAP/L2CAP_Client/L2CAP_Client.ino

@@ -5,8 +5,8 @@
 #include <Arduino.h>
 #include <NimBLEDevice.h>
 
-#if CONFIG_BT_NIMBLE_L2CAP_COC_MAX_NUM <= 0
-# error "CONFIG_BT_NIMBLE_L2CAP_COC_MAX_NUM must be set to 1 or greater"
+#if MYNEWT_VAL(BLE_L2CAP_COC_MAX_NUM) < 1
+# error "MYNEWT_VAL_BLE_L2CAP_COC_MAX_NUM must be set to 1 or greater"
 #endif
 
 // See the following for generating UUIDs:

examples/NimBLE_Client/NimBLE_Client.ino

@@ -113,7 +113,7 @@ bool connectToServer() {
 
     /** No client to reuse? Create a new one. */
     if (!pClient) {
-        if (NimBLEDevice::getCreatedClientCount() >= NIMBLE_MAX_CONNECTIONS) {
+        if (NimBLEDevice::getCreatedClientCount() >= MYNEWT_VAL(BLE_MAX_CONNECTIONS)) {
             Serial.printf("Max clients reached - no more connections available\n");
             return false;
         }

src/NimBLE2904.cpp

@@ -16,7 +16,7 @@
  */
 
 #include "NimBLE2904.h"
-#if CONFIG_BT_ENABLED && CONFIG_BT_NIMBLE_ROLE_PERIPHERAL
+#if CONFIG_BT_NIMBLE_ENABLED && MYNEWT_VAL(BLE_ROLE_PERIPHERAL)
 
 NimBLE2904::NimBLE2904(NimBLECharacteristic* pChr)
     : NimBLEDescriptor(NimBLEUUID((uint16_t)0x2904), BLE_GATT_CHR_F_READ, sizeof(NimBLE2904Data), pChr) {
@@ -69,4 +69,4 @@ void NimBLE2904::setUnit(uint16_t unit) {
     setValue(m_data);
 } // setUnit
 
-#endif // CONFIG_BT_ENABLED && CONFIG_BT_NIMBLE_ROLE_PERIPHERAL
+#endif // CONFIG_BT_NIMBLE_ENABLED && MYNEWT_VAL(BLE_ROLE_PERIPHERAL)

src/NimBLE2904.h

@@ -18,8 +18,8 @@
 #ifndef NIMBLE_CPP_2904_H_
 #define NIMBLE_CPP_2904_H_
 
-#include "nimconfig.h"
-#if CONFIG_BT_ENABLED && CONFIG_BT_NIMBLE_ROLE_PERIPHERAL
+#include "syscfg/syscfg.h"
+#if CONFIG_BT_NIMBLE_ENABLED && MYNEWT_VAL(BLE_ROLE_PERIPHERAL)
 
 # include "NimBLEDescriptor.h"
 
@@ -79,5 +79,5 @@ class NimBLE2904 : public NimBLEDescriptor {
     NimBLE2904Data m_data{};
 }; // NimBLE2904
 
-#endif // CONFIG_BT_ENABLED && CONFIG_BT_NIMBLE_ROLE_PERIPHERAL
+#endif // CONFIG_BT_NIMBLE_ENABLED && MYNEWT_VAL(BLE_ROLE_PERIPHERAL)
 #endif // NIMBLE_CPP_2904_H_