Config rework - WIP

Author: h2zero

.github/workflows/build.yml

@@ -78,11 +78,11 @@ jobs:
 
             [env:esp32c3]
             board = esp32-c3-devkitm-1
-            build_flags = '-DCONFIG_BT_NIMBLE_EXT_ADV=1'
+            build_flags = '-DMYNEWT_VAL_BLE_EXT_ADV=1'
 
             [env:esp32s3]
             board = esp32-s3-devkitc-1
-            build_flags = '-DCONFIG_BT_NIMBLE_EXT_ADV=1'
+            build_flags = '-DMYNEWT_VAL_BLE_EXT_ADV=1'
           EOF
           cp ${{ matrix.example }}/* example/src/
           platformio run -d example
@@ -163,19 +163,19 @@ jobs:
 
             [env:esp32c3]
             board = esp32-c3-devkitm-1
-            build_flags = '-DCONFIG_BT_NIMBLE_EXT_ADV=1'
+            build_flags = '-DMYNEWT_VAL_BLE_EXT_ADV=1'
 
             [env:esp32s3]
             board = esp32-s3-devkitc-1
-            build_flags = '-DCONFIG_BT_NIMBLE_EXT_ADV=1'
+            build_flags = '-DMYNEWT_VAL_BLE_EXT_ADV=1'
 
             [env:esp32c6]
             board = esp32-c6-devkitc-1
-            build_flags = '-DCONFIG_BT_NIMBLE_EXT_ADV=1'
+            build_flags = '-DMYNEWT_VAL_BLE_EXT_ADV=1'
 
             [env:esp32h2]
             board = esp32-h2-devkitm-1
-            build_flags = '-DCONFIG_BT_NIMBLE_EXT_ADV=1'
+            build_flags = '-DMYNEWT_VAL_BLE_EXT_ADV=1'
           EOF
           cp ${{ matrix.example }}/* example/src/
             platformio run -d example

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_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_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_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_ENABLED && MYNEWT_VAL(BLE_ROLE_PERIPHERAL)
 #endif // NIMBLE_CPP_2904_H_

src/NimBLEAddress.h

@@ -18,7 +18,7 @@
 #ifndef NIMBLE_CPP_ADDRESS_H_
 #define NIMBLE_CPP_ADDRESS_H_
 
-#include "nimconfig.h"
+#include "syscfg/syscfg.h"
 #if CONFIG_BT_ENABLED
 
 # if defined(CONFIG_NIMBLE_CPP_IDF)