diff --git a/.codespellrc b/.codespellrc new file mode 100644 index 00000000..cffc2173 --- /dev/null +++ b/.codespellrc @@ -0,0 +1,9 @@ +# Source: https://github.com/arduino/tooling-project-assets/blob/main/workflow-templates/assets/spell-check/.codespellrc +# See: https://github.com/codespell-project/codespell#using-a-config-file +[codespell] +# In the event of a false positive, add the problematic word, in all lowercase, to a comma-separated list here: +ignore-words-list = , +skip = ./.git,./.licenses,__pycache__,node_modules,./go.mod,./go.sum,./package-lock.json,./poetry.lock,./yarn.lock,./extras/test +builtin = clear,informal,en-GB_to_en-US +check-filenames = +check-hidden = diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml deleted file mode 100644 index 5c30659f..00000000 --- a/.github/workflows/codespell.yml +++ /dev/null @@ -1,28 +0,0 @@ -name: codespell - -on: - push: - branches: - - main - pull_request: - # Allows you to run this workflow manually from the Actions tab - workflow_dispatch: -jobs: - codespell: - name: Check for spelling errors - runs-on: ubuntu-latest - - steps: - - name: Checkout - uses: actions/checkout@main - - # See: https://github.com/codespell-project/actions-codespell/blob/master/README.md - - name: Spell check - uses: codespell-project/actions-codespell@master - with: - check_filenames: true - check_hidden: true - # In the event of a false positive, add the word in all lower case to this file: - # ignore_words_file: ./extras/codespell-ignore-words-list.txt - skip: src/utility/STM32_WPAN - path: src diff --git a/.github/workflows/compile-examples.yml b/.github/workflows/compile-examples.yml index 86c4254f..903abc44 100644 --- a/.github/workflows/compile-examples.yml +++ b/.github/workflows/compile-examples.yml @@ -1,10 +1,21 @@ name: Compile Examples + +# See: https://docs.github.com/en/free-pro-team@latest/actions/reference/events-that-trigger-workflows on: - - push - - pull_request + push: + paths: + - ".github/workflows/compile-examples.yml" + - "examples/**" + - "src/**" + pull_request: + paths: + - ".github/workflows/compile-examples.yml" + - "examples/**" + - "src/**" + workflow_dispatch: jobs: - build: + build-for-stm32: runs-on: ubuntu-latest strategy: @@ -17,11 +28,17 @@ jobs: - STMicroelectronics:stm32:Nucleo_64:pnum=P_NUCLEO_WB55_USB_DONGLE steps: - - uses: actions/checkout@main + - uses: actions/checkout@v4 - uses: arduino/compile-sketches@v1 with: github-token: ${{ secrets.GITHUB_TOKEN }} fqbn: ${{ matrix.fqbn }} platforms: | - - source-url: https://github.com/stm32duino/BoardManagerFiles/raw/main/package_stmicroelectronics_index.json - name: STMicroelectronics:stm32 + - name: STMicroelectronics:stm32 + source-url: https://github.com/stm32duino/BoardManagerFiles/raw/main/package_stmicroelectronics_index.json + sketch-paths: | + - examples + cli-compile-flags: | + - --build-property + - build.extra_flags=-DIDB05A2_SPI_CLOCK_D3 + diff --git a/.github/workflows/spell-check.yml b/.github/workflows/spell-check.yml new file mode 100644 index 00000000..61af09cd --- /dev/null +++ b/.github/workflows/spell-check.yml @@ -0,0 +1,32 @@ +# Source: https://github.com/per1234/.github/blob/main/workflow-templates/spell-check.md +name: Spell Check + +# See: https://docs.github.com/en/actions/reference/events-that-trigger-workflows +on: + push: + pull_request: + schedule: + # Run every Tuesday at 8 AM UTC to catch new misspelling detections resulting from dictionary updates. + - cron: "0 8 * * TUE" + workflow_dispatch: + repository_dispatch: + +jobs: + spellcheck: + runs-on: ubuntu-latest + permissions: + contents: read + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Spell check + uses: codespell-project/actions-codespell@v2 + with: + check_filenames: true + check_hidden: true + # In the event of a false positive, add the word in all lower case to this file: + # ignore_words_file: ./extras/codespell-ignore-words-list.txt + skip: src/utility/STM32_WPAN + path: src diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..9bea4330 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ + +.DS_Store diff --git a/CHANGELOG b/CHANGELOG index 4844008e..d8a84716 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,11 +1,8 @@ -STM32duinoBLE 1.2.0 - 2020.02.17 -* Added support to X-NUCLEO-BNRG2A1 -* Renamed ArduinoBLE as STM32duinoBLE -* Moved the SPI Transport instance in the application code to improve portability +ArduinoBLE ?.?.? - ????.??.?? ArduinoBLE 1.1.2 - 2019.11.12 -* cordio: switch to lower power when polling with timeout +* cordio: switch to lower power when polling with timeout * Fixed issue with wrong types for disconnection event handling. Thanks @cparata ArduinoBLE 1.1.1 - 2019.09.05 diff --git a/README.md b/README.md index b6e9de98..94d95daa 100644 --- a/README.md +++ b/README.md @@ -1,33 +1,95 @@ # STM32duinoBLE -This library is a fork of ArduinoBLE library to add the support of STM32WBxx, SPBTLE-RF and SPBTLE-1S BLE modules. -It was successfully tested with the NUCLEO-WB15CC, P-NUCELO_WB55RG, STM32WB5MM-DK, X-NUCLEO-IDB05A2 or -X-NUCLEO-IDB05A1 or X-NUCLEO-BNRG2A1 expansion board and a NUCLEO-F401RE or NUCLEO-L476RG or NUCLEO-L053R8, -with B-L475E-IOT01A and with STEVAL-MKSBOX1V1. - - - In order to use this library with SM32WBxx series, you need to update the STM32WB Copro Wireless Binaries -with stm32wbxx_BLE_HCILayer_fw.bin depending of your mcu: -https://github.com/STMicroelectronics/STM32CubeWB/tree/master/Projects/STM32WB_Copro_Wireless_Binaries +This library is a fork of ArduinoBLE library to add the support of STM32WB, SPBTLE-RF, SPBTLE-1S, BLUENRG-M2SP, BLUENRG-LP and BLUENRG-M0 BLE modules. + +It was successfully tested with the [NUCLEO-WB15CC], [P-NUCLEO-WB55RG], [STM32WB5MM-DK], [X-NUCLEO-IDB05A2] or [X-NUCLEO-IDB05A1] or [X-NUCLEO-BNRG2A1] expansion board and a [NUCLEO-F401RE] or [NUCLEO-L476RG] or [NUCLEO-L053R8], with [B-L475E-IOT01A], [B-L4S5I-IOT01A], [STEVAL-MKSBOX1V1], [STEVAL-MKBOXPRO] and with [STM32L562E-DK]. + + - In order to use this library with SM32WBxx series, you need to update the STM32WB Copro Wireless Binaries with stm32wbxx_BLE_HCILayer_fw.bin depending of your mcu: + +https://github.com/STMicroelectronics/STM32CubeWB/tree/master/Projects/STM32WB_Copro_Wireless_Binaries + Each subdirectories contains binaries and Release_Notes.html which explain how to update it. - - In order to use this library with STEVAL-MKSBOX1V1, you need to update the firmware of the SPBTLE-1S BLE module -mounted on that board as described in the following wiki page: -https://github.com/stm32duino/wiki/wiki/STM32duinoBLE#stm32duinoble-with-steval_mksbox1v1 + - In order to use this library with [STEVAL-MKSBOX1V1], you need to update the firmware of the SPBTLE-1S BLE module mounted on that board as described in the following wiki page: + +https://github.com/stm32duino/Arduino_Core_STM32/wiki/STM32duinoBLE#stm32duinoble-with-steval_mksbox1v1 -- In order to use this library with X-NUCLEO-BNRG2A1, you need to update the firmware of the BLUENRG-M2SP BLE module -mounted on that expansion board as described in the following wiki page: -https://github.com/stm32duino/wiki/wiki/STM32duinoBLE#stm32duinoble-with-x-nucleo-bnrg2a1 +- In order to use this library with X-NUCLEO-BNRG2A1, you need to update the firmware of the BLUENRG-M2SP BLE module mounted on that expansion board as described in the following wiki page: + +https://github.com/stm32duino/Arduino_Core_STM32/wiki/STM32duinoBLE#stm32duinoble-with-x-nucleo-bnrg2a1 For more information about ArduinoBLE library please visit the official web page at: -https://github.com/arduino-libraries/ArduinoBLE +https://www.arduino.cc/en/Reference/ArduinoBLE # Configuration + +### STM32WB + STM32Cube_WPAN has several configuration options, which are set in the `app_conf.h`. This package has a default configuration named `app_conf_default.h`. The user can include the file `app_conf_custom.h` to customize the BLE application. Options wrapped in `#ifndef`, `#endif` in `app_conf_default.h` can be overwritten. Additional options can be added. +### Shield + +The user can include the file `ble_spi_conf.h` to define which shield and configuration to use from the following list: + + * [X-NUCLEO-IDB05A2] + * `IDB05A2_SPI_CLOCK_D3`: SPI clock on D3 + * `IDB05A2_SPI_CLOCK_D13` SPI clock on D13 + * [X-NUCLEO-IDB05A1] + * `IDB05A1_SPI_CLOCK_D3`: SPI clock on D3 + * `IDB05A1_SPI_CLOCK_D13`: SPI clock on D13 + * [X-NUCLEO-BNRG2A1] + * `BNRG2A1_SPI_CLOCK_D3`: SPI clock on D3 + * `BNRG2A1_SPI_CLOCK_D13`: SPI clock on D13 + * `CUSTOM_BLE_SPI`: define a custom configuration, it requires below definition: + * `BLE_SPI_MISO`: SPI MISO pin + * `BLE_SPI_MOSI`: SPI MOSI pin + * `BLE_SPI_CLK`: SPI CLocK pin + * `BLE_SPI_CS`: SPI Chip Select pin + * `BLE_SPI_IRQ`: SPI IRQ pin + * `BLE_SPI_FREQ`: SPI bus frequency + * `BLE_SPI_MODE`: can be one of the below `SPIMode`: + * `SPI_MODE0` + * `SPI_MODE1` + * `SPI_MODE2` + * `SPI_MODE0` + * `BLE_CHIP_TYPE`: can be one of the below `BLEChip_t`: + * `SPBTLE_RF` + * `SPBTLE_1S` + * `BLUENRG_M2SP` + * `BLUENRG_M0` + * `BLUENRG_LP` + * `BLE_RESET`: BLE reset pin + +#### Examples + +To use the [X-NUCLEO-IDB05A2] with SPI clock on D3, define in `ble_spi_conf.h`: +```C +#define IDB05A2_SPI_CLOCK_D3 +``` +This is equivalent to the below configuration using the `CUSTOM_BLE_SPI`: +```C +#define CUSTOM_BLE_SPI +#define BLE_SPI_MISO D12 +#define BLE_SPI_MOSI D11 +#define BLE_SPI_CLK D3 +#define BLE_SPI_CS A1 +#define BLE_SPI_IRQ A0 +#define BLE_SPI_FREQ 8000000 +#define BLE_SPI_MODE SPI_MODE0 +#define BLE_CHIP_TYPE BLUENRG_M0 +#define BLE_RESET D7 +``` + +#### Using a SPI BLE module on STM32WB + +If required, user can use a compatible BLE module over SPI. + +In the `ble_spi_conf.h`, define `USE_BLE_SPI`. + ## License ``` @@ -48,3 +110,19 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ``` + + +B-L475E-IOT01A: https://www.st.com/en/evaluation-tools/b-l475e-iot01a.html +B-L4S5I-IOT01A: https://www.st.com/en/evaluation-tools/b-l4s5i-iot01a.html +NUCLEO-F401RE: https://www.st.com/en/evaluation-tools/nucleo-f401re.html +NUCLEO-L053R8: https://www.st.com/en/evaluation-tools/nucleo-l053r8.html +NUCLEO-L476RG: https://www.st.com/en/evaluation-tools/nucleo-l476rg.html +NUCLEO-WB15CC: https://www.st.com/en/evaluation-tools/nucleo-wb15cc.html +P-NUCLEO-WB55RG: https://www.st.com/en/evaluation-tools/p-nucleo-wb55.html +STEVAL-MKSBOX1V1: https://www.st.com/en/evaluation-tools/steval-mksbox1v1.html +STEVAL-MKBOXPRO: https://www.st.com/en/evaluation-tools/steval-mkboxpro.html +STM32L562E-DK: https://www.st.com/en/evaluation-tools/stm32l562e-dk.html +STM32WB5MM-DK: https://www.st.com/en/evaluation-tools/stm32wb5mm-dk.html +X-NUCLEO-BNRG2A1: https://www.st.com/en/ecosystems/x-nucleo-bnrg2a1.html +X-NUCLEO-IDB05A2: https://www.st.com/en/ecosystems/x-nucleo-idb05a2.html +X-NUCLEO-IDB05A1: https://www.st.com/en/ecosystems/x-nucleo-idb05a1.html diff --git a/examples/Central/LedControl/LedControl.ino b/examples/Central/LedControl/LedControl.ino index f3441596..cbda07d1 100644 --- a/examples/Central/LedControl/LedControl.ino +++ b/examples/Central/LedControl/LedControl.ino @@ -1,22 +1,12 @@ /* LED Control - This example scans for BLE peripherals until one with the advertised service + This example scans for Bluetooth® Low Energy peripherals until one with the advertised service "19b10000-e8f2-537e-4f6c-d104768a1214" UUID is found. Once discovered and connected, - it will remotely control the BLE Peripheral's LED, when the button is pressed or released. + it will remotely control the Bluetooth® Low Energy peripheral's LED, when the button is pressed or released. The circuit: - - Boards with integrated BLE or Nucleo board plus one of BLE X-Nucleo shield:: - - B-L475E-IOT01A1 - - B_L4S5I_IOT01A - - STEVAL-MKBOXPRO - - STEVAL-MKSBOX1V1, - - NUCLEO-WB15CC - - P-NUCLEO-WB55RG - - STM32WB5MM-DK - - X-NUCLEO-IDB05A2 - - X-NUCLEO-IDB05A1 - - X-NUCLEO-BNRG2A1 + - Board with supported BLE modules. You can use it with another board that is compatible with this library and the Peripherals -> LED example. @@ -26,107 +16,30 @@ #include +// variables for button #ifdef USER_BTN -const int buttonPin = USER_BTN; // set buttonPin to on-board user button +const int buttonPin = USER_BTN; // set buttonPin to on-board button #else const int buttonPin = PC13; // set buttonPin to digital pin PC13 */ #endif - -#if defined(ARDUINO_STEVAL_MKBOXPRO) -/* STEVAL-MKBOXPRO */ -SPIClass SpiHCI(PA7, PA6, PA5); -HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_LP, PA2, PB11, PD4, 1000000, SPI_MODE3); -#if !defined(FAKE_BLELOCALDEVICE) -BLELocalDevice BLEObj(&HCISpiTransport); -BLELocalDevice& BLE = BLEObj; -#endif -#elif defined(ARDUINO_STEVAL_MKSBOX1V1) -/* STEVAL-MKSBOX1V1 */ -SPIClass SpiHCI(PC3, PD3, PD1); -HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_1S, PD0, PD4, PA8, 1000000, SPI_MODE1); -#if !defined(FAKE_BLELOCALDEVICE) -BLELocalDevice BLEObj(&HCISpiTransport); -BLELocalDevice& BLE = BLEObj; -#endif -#elif defined(ARDUINO_B_L475E_IOT01A) || defined(ARDUINO_B_L4S5I_IOT01A) -/* B-L475E-IOT01A1 or B_L4S5I_IOT01A */ -SPIClass SpiHCI(PC12, PC11, PC10); -HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, PD13, PE6, PA8, 8000000, SPI_MODE0); -#if !defined(FAKE_BLELOCALDEVICE) -BLELocalDevice BLEObj(&HCISpiTransport); -BLELocalDevice& BLE = BLEObj; -#endif -#elif defined(ARDUINO_NUCLEO_WB15CC) || defined(ARDUINO_P_NUCLEO_WB55RG) ||\ - defined(ARDUINO_STM32WB5MM_DK) || defined(ARDUINO_P_NUCLEO_WB55_USB_DONGLE) -HCISharedMemTransportClass HCISharedMemTransport; -#if !defined(FAKE_BLELOCALDEVICE) -BLELocalDevice BLEObj(&HCISharedMemTransport); -BLELocalDevice& BLE = BLEObj; -#endif -#else -/* Shield IDB05A2 with SPI clock on D3 */ -SPIClass SpiHCI(D11, D12, D3); -HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M0, A1, A0, D7, 8000000, SPI_MODE0); -#if !defined(FAKE_BLELOCALDEVICE) -BLELocalDevice BLEObj(&HCISpiTransport); -BLELocalDevice& BLE = BLEObj; -#endif -/* Shield IDB05A2 with SPI clock on D13 */ -// #define SpiHCI SPI -// HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M0, A1, A0, D7, 8000000, SPI_MODE0); -// #if !defined(FAKE_BLELOCALDEVICE) -// BLELocalDevice BLEObj(&HCISpiTransport); -// BLELocalDevice& BLE = BLEObj; -// #endif -/* Shield IDB05A1 with SPI clock on D3 */ -// SPIClass SpiHCI(D11, D12, D3); -// HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, A1, A0, D7, 8000000, SPI_MODE0); -// #if !defined(FAKE_BLELOCALDEVICE) -// BLELocalDevice BLEObj(&HCISpiTransport); -// BLELocalDevice& BLE = BLEObj; -// #endif -/* Shield IDB05A1 with SPI clock on D13 */ -// #define SpiHCI SPI -// HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, A1, A0, D7, 8000000, SPI_MODE0); -// #if !defined(FAKE_BLELOCALDEVICE) -// BLELocalDevice BLEObj(&HCISpiTransport); -// BLELocalDevice& BLE = BLEObj; -// #endif -/* Shield BNRG2A1 with SPI clock on D3 */ -// SPIClass SpiHCI(D11, D12, D3); -// HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M2SP, A1, A0, D7, 1000000, SPI_MODE1); -// #if !defined(FAKE_BLELOCALDEVICE) -// BLELocalDevice BLEObj(&HCISpiTransport); -// BLELocalDevice& BLE = BLEObj; -// #endif -/* Shield BNRG2A1 with SPI clock on D13 */ -// #define SpiHCI SPI -// HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M2SP, A1, A0, D7, 1000000, SPI_MODE1); -// #if !defined(FAKE_BLELOCALDEVICE) -// BLELocalDevice BLEObj(&HCISpiTransport); -// BLELocalDevice& BLE = BLEObj; -// #endif -#endif - -// variables for button int oldButtonState = LOW; int initialButtonState = LOW; void setup() { - Serial.begin(115200); + Serial.begin(9600); while (!Serial); // configure the button pin as input pinMode(buttonPin, INPUT_PULLUP); - // initialize the BLE hardware + // initialize the Bluetooth® Low Energy hardware BLE.begin(); // Get initial button state initialButtonState = digitalRead(buttonPin); oldButtonState = initialButtonState; - Serial.println("BLE Central - LED control"); + Serial.println("Bluetooth® Low Energy Central - LED control"); // start scanning for peripherals int ret = 1; diff --git a/examples/Central/PeripheralExplorer/PeripheralExplorer.ino b/examples/Central/PeripheralExplorer/PeripheralExplorer.ino index ad78946c..7d4841ae 100644 --- a/examples/Central/PeripheralExplorer/PeripheralExplorer.ino +++ b/examples/Central/PeripheralExplorer/PeripheralExplorer.ino @@ -1,21 +1,11 @@ /* Peripheral Explorer - This example scans for BLE peripherals until one with a particular name ("LED") + This example scans for Bluetooth® Low Energy peripherals until one with a particular name ("LED") is found. Then connects, and discovers + prints all the peripheral's attributes. The circuit: - - Boards with integrated BLE or Nucleo board plus one of BLE X-Nucleo shield:: - - B-L475E-IOT01A1 - - B_L4S5I_IOT01A - - STEVAL-MKBOXPRO - - STEVAL-MKSBOX1V1, - - NUCLEO-WB15CC - - P-NUCLEO-WB55RG - - STM32WB5MM-DK - - X-NUCLEO-IDB05A2 - - X-NUCLEO-IDB05A1 - - X-NUCLEO-BNRG2A1 + - Board with supported BLE modules. You can use it with another board that is compatible with this library and the Peripherals -> LED example. @@ -25,95 +15,18 @@ #include -#if defined(ARDUINO_STEVAL_MKBOXPRO) -/* STEVAL-MKBOXPRO */ -SPIClass SpiHCI(PA7, PA6, PA5); -HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_LP, PA2, PB11, PD4, 1000000, SPI_MODE3); -#if !defined(FAKE_BLELOCALDEVICE) -BLELocalDevice BLEObj(&HCISpiTransport); -BLELocalDevice& BLE = BLEObj; -#endif -const int buttonPin = PC13; // set buttonPin to digital pin PC13 -#elif defined(ARDUINO_STEVAL_MKSBOX1V1) -/* STEVAL-MKSBOX1V1 */ -SPIClass SpiHCI(PC3, PD3, PD1); -HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_1S, PD0, PD4, PA8, 1000000, SPI_MODE1); -#if !defined(FAKE_BLELOCALDEVICE) -BLELocalDevice BLEObj(&HCISpiTransport); -BLELocalDevice& BLE = BLEObj; -#endif -#elif defined(ARDUINO_B_L475E_IOT01A) || defined(ARDUINO_B_L4S5I_IOT01A) -/* B-L475E-IOT01A1 or B_L4S5I_IOT01A */ -SPIClass SpiHCI(PC12, PC11, PC10); -HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, PD13, PE6, PA8, 8000000, SPI_MODE0); -#if !defined(FAKE_BLELOCALDEVICE) -BLELocalDevice BLEObj(&HCISpiTransport); -BLELocalDevice& BLE = BLEObj; -#endif -#elif defined(ARDUINO_NUCLEO_WB15CC) || defined(ARDUINO_P_NUCLEO_WB55RG) ||\ - defined(ARDUINO_STM32WB5MM_DK) || defined(ARDUINO_P_NUCLEO_WB55_USB_DONGLE) -HCISharedMemTransportClass HCISharedMemTransport; -#if !defined(FAKE_BLELOCALDEVICE) -BLELocalDevice BLEObj(&HCISharedMemTransport); -BLELocalDevice& BLE = BLEObj; -#endif -#else -/* Shield IDB05A2 with SPI clock on D3 */ -SPIClass SpiHCI(D11, D12, D3); -HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M0, A1, A0, D7, 8000000, SPI_MODE0); -#if !defined(FAKE_BLELOCALDEVICE) -BLELocalDevice BLEObj(&HCISpiTransport); -BLELocalDevice& BLE = BLEObj; -#endif -/* Shield IDB05A2 with SPI clock on D13 */ -// #define SpiHCI SPI -// HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M0, A1, A0, D7, 8000000, SPI_MODE0); -// #if !defined(FAKE_BLELOCALDEVICE) -// BLELocalDevice BLEObj(&HCISpiTransport); -// BLELocalDevice& BLE = BLEObj; -// #endif -/* Shield IDB05A1 with SPI clock on D3 */ -// SPIClass SpiHCI(D11, D12, D3); -// HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, A1, A0, D7, 8000000, SPI_MODE0); -// #if !defined(FAKE_BLELOCALDEVICE) -// BLELocalDevice BLEObj(&HCISpiTransport); -// BLELocalDevice& BLE = BLEObj; -// #endif -/* Shield IDB05A1 with SPI clock on D13 */ -// #define SpiHCI SPI -// HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, A1, A0, D7, 8000000, SPI_MODE0); -// #if !defined(FAKE_BLELOCALDEVICE) -// BLELocalDevice BLEObj(&HCISpiTransport); -// BLELocalDevice& BLE = BLEObj; -// #endif -/* Shield BNRG2A1 with SPI clock on D3 */ -// SPIClass SpiHCI(D11, D12, D3); -// HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M2SP, A1, A0, D7, 1000000, SPI_MODE1); -// #if !defined(FAKE_BLELOCALDEVICE) -// BLELocalDevice BLEObj(&HCISpiTransport); -// BLELocalDevice& BLE = BLEObj; -// #endif -/* Shield BNRG2A1 with SPI clock on D13 */ -// #define SpiHCI SPI -// HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M2SP, A1, A0, D7, 1000000, SPI_MODE1); -// #if !defined(FAKE_BLELOCALDEVICE) -// BLELocalDevice BLEObj(&HCISpiTransport); -// BLELocalDevice& BLE = BLEObj; -// #endif -#endif - void setup() { - Serial.begin(115200); + Serial.begin(9600); while (!Serial); // begin initialization if (!BLE.begin()) { - Serial.println("starting BLE failed!"); + Serial.println("starting Bluetooth® Low Energy module failed!"); while (1); } - Serial.println("BLE Central - Peripheral Explorer"); + Serial.println("Bluetooth® Low Energy Central - Peripheral Explorer"); // start scanning for peripherals int ret = 1; diff --git a/examples/Central/Scan/Scan.ino b/examples/Central/Scan/Scan.ino index fbbb7a9e..ca6b2b9a 100644 --- a/examples/Central/Scan/Scan.ino +++ b/examples/Central/Scan/Scan.ino @@ -1,115 +1,29 @@ /* Scan - This example scans for BLE peripherals and prints out their advertising details: + This example scans for Bluetooth® Low Energy peripherals and prints out their advertising details: address, local name, advertised service UUID's. The circuit: - - Boards with integrated BLE or Nucleo board plus one of BLE X-Nucleo shield:: - - B-L475E-IOT01A1 - - B_L4S5I_IOT01A - - STEVAL-MKBOXPRO - - STEVAL-MKSBOX1V1, - - NUCLEO-WB15CC - - P-NUCLEO-WB55RG - - STM32WB5MM-DK - - X-NUCLEO-IDB05A2 - - X-NUCLEO-IDB05A1 - - X-NUCLEO-BNRG2A1 + - Board with supported BLE modules. This example code is in the public domain. */ #include -#if defined(ARDUINO_STEVAL_MKBOXPRO) -/* STEVAL-MKBOXPRO */ -SPIClass SpiHCI(PA7, PA6, PA5); -HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_LP, PA2, PB11, PD4, 1000000, SPI_MODE3); -#if !defined(FAKE_BLELOCALDEVICE) -BLELocalDevice BLEObj(&HCISpiTransport); -BLELocalDevice& BLE = BLEObj; -#endif -#elif defined(ARDUINO_STEVAL_MKSBOX1V1) -/* STEVAL-MKSBOX1V1 */ -SPIClass SpiHCI(PC3, PD3, PD1); -HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_1S, PD0, PD4, PA8, 1000000, SPI_MODE1); -#if !defined(FAKE_BLELOCALDEVICE) -BLELocalDevice BLEObj(&HCISpiTransport); -BLELocalDevice& BLE = BLEObj; -#endif -#elif defined(ARDUINO_B_L475E_IOT01A) || defined(ARDUINO_B_L4S5I_IOT01A) -/* B-L475E-IOT01A1 or B_L4S5I_IOT01A */ -SPIClass SpiHCI(PC12, PC11, PC10); -HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, PD13, PE6, PA8, 8000000, SPI_MODE0); -#if !defined(FAKE_BLELOCALDEVICE) -BLELocalDevice BLEObj(&HCISpiTransport); -BLELocalDevice& BLE = BLEObj; -#endif -#elif defined(ARDUINO_NUCLEO_WB15CC) || defined(ARDUINO_P_NUCLEO_WB55RG) ||\ - defined(ARDUINO_STM32WB5MM_DK) || defined(ARDUINO_P_NUCLEO_WB55_USB_DONGLE) -HCISharedMemTransportClass HCISharedMemTransport; -#if !defined(FAKE_BLELOCALDEVICE) -BLELocalDevice BLEObj(&HCISharedMemTransport); -BLELocalDevice& BLE = BLEObj; -#endif -#else -/* Shield IDB05A2 with SPI clock on D3 */ -SPIClass SpiHCI(D11, D12, D3); -HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M0, A1, A0, D7, 8000000, SPI_MODE0); -#if !defined(FAKE_BLELOCALDEVICE) -BLELocalDevice BLEObj(&HCISpiTransport); -BLELocalDevice& BLE = BLEObj; -#endif -/* Shield IDB05A2 with SPI clock on D13 */ -// #define SpiHCI SPI -// HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M0, A1, A0, D7, 8000000, SPI_MODE0); -// #if !defined(FAKE_BLELOCALDEVICE) -// BLELocalDevice BLEObj(&HCISpiTransport); -// BLELocalDevice& BLE = BLEObj; -// #endif -/* Shield IDB05A1 with SPI clock on D3 */ -// SPIClass SpiHCI(D11, D12, D3); -// HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, A1, A0, D7, 8000000, SPI_MODE0); -// #if !defined(FAKE_BLELOCALDEVICE) -// BLELocalDevice BLEObj(&HCISpiTransport); -// BLELocalDevice& BLE = BLEObj; -// #endif -/* Shield IDB05A1 with SPI clock on D13 */ -// #define SpiHCI SPI -// HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, A1, A0, D7, 8000000, SPI_MODE0); -// #if !defined(FAKE_BLELOCALDEVICE) -// BLELocalDevice BLEObj(&HCISpiTransport); -// BLELocalDevice& BLE = BLEObj; -// #endif -/* Shield BNRG2A1 with SPI clock on D3 */ -// SPIClass SpiHCI(D11, D12, D3); -// HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M2SP, A1, A0, D7, 1000000, SPI_MODE1); -// #if !defined(FAKE_BLELOCALDEVICE) -// BLELocalDevice BLEObj(&HCISpiTransport); -// BLELocalDevice& BLE = BLEObj; -// #endif -/* Shield BNRG2A1 with SPI clock on D13 */ -// #define SpiHCI SPI -// HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M2SP, A1, A0, D7, 1000000, SPI_MODE1); -// #if !defined(FAKE_BLELOCALDEVICE) -// BLELocalDevice BLEObj(&HCISpiTransport); -// BLELocalDevice& BLE = BLEObj; -// #endif -#endif - void setup() { - Serial.begin(115200); + Serial.begin(9600); while (!Serial); // begin initialization if (!BLE.begin()) { - Serial.println("starting BLE failed!"); + Serial.println("starting Bluetooth® Low Energy module failed!"); while (1); } - Serial.println("BLE Central scan"); + Serial.println("Bluetooth® Low Energy Central scan"); // start scanning for peripherals int ret = 1; diff --git a/examples/Central/ScanCallback/ScanCallback.ino b/examples/Central/ScanCallback/ScanCallback.ino index 6ee70e17..cc33ee85 100644 --- a/examples/Central/ScanCallback/ScanCallback.ino +++ b/examples/Central/ScanCallback/ScanCallback.ino @@ -1,117 +1,31 @@ /* Scan Callback - This example scans for BLE peripherals and prints out their advertising details: + This example scans for Bluetooth® Low Energy peripherals and prints out their advertising details: address, local name, advertised service UUIDs. Unlike the Scan example, it uses the callback style APIs and disables filtering so the peripheral discovery is reported for every single advertisement it makes. The circuit: - - Boards with integrated BLE or Nucleo board plus one of BLE X-Nucleo shield:: - - B-L475E-IOT01A1 - - B_L4S5I_IOT01A - - STEVAL-MKBOXPRO - - STEVAL-MKSBOX1V1, - - NUCLEO-WB15CC - - P-NUCLEO-WB55RG - - STM32WB5MM-DK - - X-NUCLEO-IDB05A2 - - X-NUCLEO-IDB05A1 - - X-NUCLEO-BNRG2A1 + - Board with supported BLE modules. This example code is in the public domain. */ #include -#if defined(ARDUINO_STEVAL_MKBOXPRO) -/* STEVAL-MKBOXPRO */ -SPIClass SpiHCI(PA7, PA6, PA5); -HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_LP, PA2, PB11, PD4, 1000000, SPI_MODE3); -#if !defined(FAKE_BLELOCALDEVICE) -BLELocalDevice BLEObj(&HCISpiTransport); -BLELocalDevice& BLE = BLEObj; -#endif -#elif defined(ARDUINO_STEVAL_MKSBOX1V1) -/* STEVAL-MKSBOX1V1 */ -SPIClass SpiHCI(PC3, PD3, PD1); -HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_1S, PD0, PD4, PA8, 1000000, SPI_MODE1); -#if !defined(FAKE_BLELOCALDEVICE) -BLELocalDevice BLEObj(&HCISpiTransport); -BLELocalDevice& BLE = BLEObj; -#endif -#elif defined(ARDUINO_B_L475E_IOT01A) || defined(ARDUINO_B_L4S5I_IOT01A) -/* B-L475E-IOT01A1 or B_L4S5I_IOT01A */ -SPIClass SpiHCI(PC12, PC11, PC10); -HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, PD13, PE6, PA8, 8000000, SPI_MODE0); -#if !defined(FAKE_BLELOCALDEVICE) -BLELocalDevice BLEObj(&HCISpiTransport); -BLELocalDevice& BLE = BLEObj; -#endif -#elif defined(ARDUINO_NUCLEO_WB15CC) || defined(ARDUINO_P_NUCLEO_WB55RG) ||\ - defined(ARDUINO_STM32WB5MM_DK) || defined(ARDUINO_P_NUCLEO_WB55_USB_DONGLE) -HCISharedMemTransportClass HCISharedMemTransport; -#if !defined(FAKE_BLELOCALDEVICE) -BLELocalDevice BLEObj(&HCISharedMemTransport); -BLELocalDevice& BLE = BLEObj; -#endif -#else -/* Shield IDB05A2 with SPI clock on D3 */ -SPIClass SpiHCI(D11, D12, D3); -HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M0, A1, A0, D7, 8000000, SPI_MODE0); -#if !defined(FAKE_BLELOCALDEVICE) -BLELocalDevice BLEObj(&HCISpiTransport); -BLELocalDevice& BLE = BLEObj; -#endif -/* Shield IDB05A2 with SPI clock on D13 */ -// #define SpiHCI SPI -// HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M0, A1, A0, D7, 8000000, SPI_MODE0); -// #if !defined(FAKE_BLELOCALDEVICE) -// BLELocalDevice BLEObj(&HCISpiTransport); -// BLELocalDevice& BLE = BLEObj; -// #endif -/* Shield IDB05A1 with SPI clock on D3 */ -// SPIClass SpiHCI(D11, D12, D3); -// HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, A1, A0, D7, 8000000, SPI_MODE0); -// #if !defined(FAKE_BLELOCALDEVICE) -// BLELocalDevice BLEObj(&HCISpiTransport); -// BLELocalDevice& BLE = BLEObj; -// #endif -/* Shield IDB05A1 with SPI clock on D13 */ -// #define SpiHCI SPI -// HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, A1, A0, D7, 8000000, SPI_MODE0); -// #if !defined(FAKE_BLELOCALDEVICE) -// BLELocalDevice BLEObj(&HCISpiTransport); -// BLELocalDevice& BLE = BLEObj; -// #endif -/* Shield BNRG2A1 with SPI clock on D3 */ -// SPIClass SpiHCI(D11, D12, D3); -// HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M2SP, A1, A0, D7, 1000000, SPI_MODE1); -// #if !defined(FAKE_BLELOCALDEVICE) -// BLELocalDevice BLEObj(&HCISpiTransport); -// BLELocalDevice& BLE = BLEObj; -// #endif -/* Shield BNRG2A1 with SPI clock on D13 */ -// #define SpiHCI SPI -// HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M2SP, A1, A0, D7, 1000000, SPI_MODE1); -// #if !defined(FAKE_BLELOCALDEVICE) -// BLELocalDevice BLEObj(&HCISpiTransport); -// BLELocalDevice& BLE = BLEObj; -// #endif -#endif - void setup() { - Serial.begin(115200); + Serial.begin(9600); while (!Serial); // begin initialization if (!BLE.begin()) { - Serial.println("starting BLE failed!"); + Serial.println("starting Bluetooth® Low Energy module failed!"); while (1); } - Serial.println("BLE Central scan callback"); + Serial.println("Bluetooth® Low Energy Central scan callback"); // set the discovered event handle BLE.setEventHandler(BLEDiscovered, bleCentralDiscoverHandler); diff --git a/examples/Central/SensorTagButton/SensorTagButton.ino b/examples/Central/SensorTagButton/SensorTagButton.ino index 6199933b..f063ac68 100644 --- a/examples/Central/SensorTagButton/SensorTagButton.ino +++ b/examples/Central/SensorTagButton/SensorTagButton.ino @@ -1,24 +1,14 @@ /* SensorTag Button - This example scans for BLE peripherals until a TI SensorTag is discovered. + This example scans for Bluetooth® Low Energy peripherals until a TI SensorTag is discovered. It then connects to it, discovers the attributes of the 0xffe0 service, subscribes to the Simple Key Characteristic (UUID 0xffe1). When a button is pressed on the SensorTag a notification is received and the button state is outputted to the Serial Monitor when one is pressed. The circuit: - - Boards with integrated BLE or Nucleo board plus one of BLE X-Nucleo shield:: - - B-L475E-IOT01A1 - - B_L4S5I_IOT01A - - STEVAL-MKBOXPRO - - STEVAL-MKSBOX1V1, - - NUCLEO-WB15CC - - P-NUCLEO-WB55RG - - STM32WB5MM-DK - - X-NUCLEO-IDB05A2 - - X-NUCLEO-IDB05A1 - - X-NUCLEO-BNRG2A1 + - Board with supported BLE modules. - TI SensorTag This example code is in the public domain. @@ -26,94 +16,18 @@ #include -#if defined(ARDUINO_STEVAL_MKBOXPRO) -/* STEVAL-MKBOXPRO */ -SPIClass SpiHCI(PA7, PA6, PA5); -HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_LP, PA2, PB11, PD4, 1000000, SPI_MODE3); -#if !defined(FAKE_BLELOCALDEVICE) -BLELocalDevice BLEObj(&HCISpiTransport); -BLELocalDevice& BLE = BLEObj; -#endif -#elif defined(ARDUINO_STEVAL_MKSBOX1V1) -/* STEVAL-MKSBOX1V1 */ -SPIClass SpiHCI(PC3, PD3, PD1); -HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_1S, PD0, PD4, PA8, 1000000, SPI_MODE1); -#if !defined(FAKE_BLELOCALDEVICE) -BLELocalDevice BLEObj(&HCISpiTransport); -BLELocalDevice& BLE = BLEObj; -#endif -#elif defined(ARDUINO_B_L475E_IOT01A) || defined(ARDUINO_B_L4S5I_IOT01A) -/* B-L475E-IOT01A1 or B_L4S5I_IOT01A */ -SPIClass SpiHCI(PC12, PC11, PC10); -HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, PD13, PE6, PA8, 8000000, SPI_MODE0); -#if !defined(FAKE_BLELOCALDEVICE) -BLELocalDevice BLEObj(&HCISpiTransport); -BLELocalDevice& BLE = BLEObj; -#endif -#elif defined(ARDUINO_NUCLEO_WB15CC) || defined(ARDUINO_P_NUCLEO_WB55RG) ||\ - defined(ARDUINO_STM32WB5MM_DK) || defined(ARDUINO_P_NUCLEO_WB55_USB_DONGLE) -HCISharedMemTransportClass HCISharedMemTransport; -#if !defined(FAKE_BLELOCALDEVICE) -BLELocalDevice BLEObj(&HCISharedMemTransport); -BLELocalDevice& BLE = BLEObj; -#endif -#else -/* Shield IDB05A2 with SPI clock on D3 */ -SPIClass SpiHCI(D11, D12, D3); -HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M0, A1, A0, D7, 8000000, SPI_MODE0); -#if !defined(FAKE_BLELOCALDEVICE) -BLELocalDevice BLEObj(&HCISpiTransport); -BLELocalDevice& BLE = BLEObj; -#endif -/* Shield IDB05A2 with SPI clock on D13 */ -// #define SpiHCI SPI -// HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M0, A1, A0, D7, 8000000, SPI_MODE0); -// #if !defined(FAKE_BLELOCALDEVICE) -// BLELocalDevice BLEObj(&HCISpiTransport); -// BLELocalDevice& BLE = BLEObj; -// #endif -/* Shield IDB05A1 with SPI clock on D3 */ -// SPIClass SpiHCI(D11, D12, D3); -// HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, A1, A0, D7, 8000000, SPI_MODE0); -// #if !defined(FAKE_BLELOCALDEVICE) -// BLELocalDevice BLEObj(&HCISpiTransport); -// BLELocalDevice& BLE = BLEObj; -// #endif -/* Shield IDB05A1 with SPI clock on D13 */ -// #define SpiHCI SPI -// HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, A1, A0, D7, 8000000, SPI_MODE0); -// #if !defined(FAKE_BLELOCALDEVICE) -// BLELocalDevice BLEObj(&HCISpiTransport); -// BLELocalDevice& BLE = BLEObj; -// #endif -/* Shield BNRG2A1 with SPI clock on D3 */ -// SPIClass SpiHCI(D11, D12, D3); -// HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M2SP, A1, A0, D7, 1000000, SPI_MODE1); -// #if !defined(FAKE_BLELOCALDEVICE) -// BLELocalDevice BLEObj(&HCISpiTransport); -// BLELocalDevice& BLE = BLEObj; -// #endif -/* Shield BNRG2A1 with SPI clock on D13 */ -// #define SpiHCI SPI -// HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M2SP, A1, A0, D7, 1000000, SPI_MODE1); -// #if !defined(FAKE_BLELOCALDEVICE) -// BLELocalDevice BLEObj(&HCISpiTransport); -// BLELocalDevice& BLE = BLEObj; -// #endif -#endif - void setup() { - Serial.begin(115200); + Serial.begin(9600); while (!Serial); // begin initialization if (!BLE.begin()) { - Serial.println("starting BLE failed!"); + Serial.println("starting Bluetooth® Low Energy module failed!"); while (1); } - Serial.println("BLE Central - SensorTag button"); + Serial.println("Bluetooth® Low Energy Central - SensorTag button"); Serial.println("Make sure to turn on the device."); // start scanning for peripherals diff --git a/examples/Peripheral/Advertising/EnhancedAdvertising/EnhancedAdvertising.ino b/examples/Peripheral/Advertising/EnhancedAdvertising/EnhancedAdvertising.ino new file mode 100644 index 00000000..806c41bd --- /dev/null +++ b/examples/Peripheral/Advertising/EnhancedAdvertising/EnhancedAdvertising.ino @@ -0,0 +1,44 @@ +#include + +BLEService myService("fff0"); +BLEIntCharacteristic myCharacteristic("fff1", BLERead | BLEBroadcast); + +// Advertising parameters should have a global scope. Do NOT define them in 'setup' or in 'loop' +const uint8_t manufactData[4] = {0x01, 0x02, 0x03, 0x04}; +const uint8_t serviceData[3] = {0x00, 0x01, 0x02}; + +void setup() { + Serial.begin(9600); + while (!Serial); + + if (!BLE.begin()) { + Serial.println("failed to initialize BLE!"); + while (1); + } + + myService.addCharacteristic(myCharacteristic); + BLE.addService(myService); + + // Build scan response data packet + BLEAdvertisingData scanData; + // Set parameters for scan response packet + scanData.setLocalName("Test enhanced advertising"); + // Copy set parameters in the actual scan response packet + BLE.setScanResponseData(scanData); + + // Build advertising data packet + BLEAdvertisingData advData; + // Set parameters for advertising packet + advData.setManufacturerData(0x004C, manufactData, sizeof(manufactData)); + advData.setAdvertisedService(myService); + advData.setAdvertisedServiceData(0xfff0, serviceData, sizeof(serviceData)); + // Copy set parameters in the actual advertising packet + BLE.setAdvertisingData(advData); + + BLE.advertise(); + Serial.println("advertising ..."); +} + +void loop() { + BLE.poll(); +} diff --git a/examples/Peripheral/Advertising/RawDataAdvertising/RawDataAdvertising.ino b/examples/Peripheral/Advertising/RawDataAdvertising/RawDataAdvertising.ino new file mode 100644 index 00000000..88b17e29 --- /dev/null +++ b/examples/Peripheral/Advertising/RawDataAdvertising/RawDataAdvertising.ino @@ -0,0 +1,41 @@ +#include + +BLEService myService("fff0"); +BLEIntCharacteristic myCharacteristic("fff1", BLERead | BLEBroadcast); + +// Advertising parameters should have a global scope. Do NOT define them in 'setup' or in 'loop' +const uint8_t completeRawAdvertisingData[] = {0x02,0x01,0x06,0x09,0xff,0x01,0x01,0x00,0x01,0x02,0x03,0x04,0x05}; + +void setup() { + Serial.begin(9600); + while (!Serial); + + if (!BLE.begin()) { + Serial.println("failed to initialize BLE!"); + while (1); + } + + myService.addCharacteristic(myCharacteristic); + BLE.addService(myService); + + // Build advertising data packet + BLEAdvertisingData advData; + // If a packet has a raw data parameter, then all the other parameters of the packet will be ignored + advData.setRawData(completeRawAdvertisingData, sizeof(completeRawAdvertisingData)); + // Copy set parameters in the actual advertising packet + BLE.setAdvertisingData(advData); + + // Build scan response data packet + BLEAdvertisingData scanData; + scanData.setLocalName("Test advertising raw data"); + // Copy set parameters in the actual scan response packet + BLE.setScanResponseData(scanData); + + BLE.advertise(); + + Serial.println("advertising ..."); +} + +void loop() { + BLE.poll(); +} diff --git a/examples/Peripheral/BatteryMonitor/BatteryMonitor.ino b/examples/Peripheral/BatteryMonitor/BatteryMonitor.ino new file mode 100644 index 00000000..3413127e --- /dev/null +++ b/examples/Peripheral/BatteryMonitor/BatteryMonitor.ino @@ -0,0 +1,105 @@ +/* + Battery Monitor + + This example creates a Bluetooth® Low Energy peripheral with the standard battery service and + level characteristic. The A0 pin is used to calculate the battery level. + + The circuit: + - Board with supported BLE modules. + + You can use a generic Bluetooth® Low Energy central app, like LightBlue (iOS and Android) or + nRF Connect (Android), to interact with the services and characteristics + created in this sketch. + + This example code is in the public domain. +*/ + +#include + + // Bluetooth® Low Energy Battery Service +BLEService batteryService("180F"); + +// Bluetooth® Low Energy Battery Level Characteristic +BLEUnsignedCharCharacteristic batteryLevelChar("2A19", // standard 16-bit characteristic UUID + BLERead | BLENotify); // remote clients will be able to get notifications if this characteristic changes + +int oldBatteryLevel = 0; // last battery level reading from analog input +long previousMillis = 0; // last time the battery level was checked, in ms + +void setup() { + Serial.begin(9600); // initialize serial communication + while (!Serial); + + pinMode(LED_BUILTIN, OUTPUT); // initialize the built-in LED pin to indicate when a central is connected + + // begin initialization + if (!BLE.begin()) { + Serial.println("starting BLE failed!"); + + while (1); + } + + /* Set a local name for the Bluetooth® Low Energy device + This name will appear in advertising packets + and can be used by remote devices to identify this Bluetooth® Low Energy device + The name can be changed but maybe be truncated based on space left in advertisement packet + */ + BLE.setLocalName("BatteryMonitor"); + BLE.setAdvertisedService(batteryService); // add the service UUID + batteryService.addCharacteristic(batteryLevelChar); // add the battery level characteristic + BLE.addService(batteryService); // Add the battery service + batteryLevelChar.writeValue(oldBatteryLevel); // set initial value for this characteristic + + /* Start advertising Bluetooth® Low Energy. It will start continuously transmitting Bluetooth® Low Energy + advertising packets and will be visible to remote Bluetooth® Low Energy central devices + until it receives a new connection */ + + // start advertising + BLE.advertise(); + + Serial.println("Bluetooth® device active, waiting for connections..."); +} + +void loop() { + // wait for a Bluetooth® Low Energy central + BLEDevice central = BLE.central(); + + // if a central is connected to the peripheral: + if (central) { + Serial.print("Connected to central: "); + // print the central's BT address: + Serial.println(central.address()); + // turn on the LED to indicate the connection: + digitalWrite(LED_BUILTIN, HIGH); + + // check the battery level every 200 ms + // while the central is connected: + while (central.connected()) { + long currentMillis = millis(); + // if 200 ms have passed, check the battery level: + if (currentMillis - previousMillis >= 200) { + previousMillis = currentMillis; + updateBatteryLevel(); + } + } + // when the central disconnects, turn off the LED: + digitalWrite(LED_BUILTIN, LOW); + Serial.print("Disconnected from central: "); + Serial.println(central.address()); + } +} + +void updateBatteryLevel() { + /* Read the current voltage level on the A0 analog input pin. + This is used here to simulate the charge level of a battery. + */ + int battery = analogRead(A0); + int batteryLevel = map(battery, 0, 1023, 0, 100); + + if (batteryLevel != oldBatteryLevel) { // if the battery level has changed + Serial.print("Battery Level % is now: "); // print it + Serial.println(batteryLevel); + batteryLevelChar.writeValue(batteryLevel); // and update the battery level characteristic + oldBatteryLevel = batteryLevel; // save the level for next comparison + } +} diff --git a/examples/Peripheral/ButtonLED/ButtonLED.ino b/examples/Peripheral/ButtonLED/ButtonLED.ino index 59e19451..8ae7d665 100644 --- a/examples/Peripheral/ButtonLED/ButtonLED.ino +++ b/examples/Peripheral/ButtonLED/ButtonLED.ino @@ -1,24 +1,14 @@ /* Button LED - This example creates a BLE peripheral with service that contains a + This example creates a Bluetooth® Low Energy peripheral with service that contains a characteristic to control an LED and another characteristic that represents the state of the button. The circuit: - - Boards with integrated BLE or Nucleo board plus one of BLE X-Nucleo shield:: - - B-L475E-IOT01A1 - - B_L4S5I_IOT01A - - STEVAL-MKBOXPRO - - STEVAL-MKSBOX1V1, - - NUCLEO-WB15CC - - P-NUCLEO-WB55RG - - STM32WB5MM-DK - - X-NUCLEO-IDB05A2 - - X-NUCLEO-IDB05A1 - - X-NUCLEO-BNRG2A1 - - You can use a generic BLE central app, like LightBlue (iOS and Android) or + - Board with supported BLE modules. + + You can use a generic Bluetooth® Low Energy central app, like LightBlue (iOS and Android) or nRF Connect (Android), to interact with the services and characteristics created in this sketch. @@ -27,90 +17,13 @@ #include +const int ledPin = LED_BUILTIN; // set ledPin to on-board LED #ifdef USER_BTN -const int buttonPin = USER_BTN; // set buttonPin to on-board user button +const int buttonPin = USER_BTN; // set buttonPin to on-board button #else const int buttonPin = PC13; // set buttonPin to digital pin PC13 */ #endif -#if defined(ARDUINO_STEVAL_MKBOXPRO) -/* STEVAL-MKBOXPRO */ -SPIClass SpiHCI(PA7, PA6, PA5); -HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_LP, PA2, PB11, PD4, 1000000, SPI_MODE3); -#if !defined(FAKE_BLELOCALDEVICE) -BLELocalDevice BLEObj(&HCISpiTransport); -BLELocalDevice& BLE = BLEObj; -#endif -#elif defined(ARDUINO_STEVAL_MKSBOX1V1) -/* STEVAL-MKSBOX1V1 */ -SPIClass SpiHCI(PC3, PD3, PD1); -HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_1S, PD0, PD4, PA8, 1000000, SPI_MODE1); -#if !defined(FAKE_BLELOCALDEVICE) -BLELocalDevice BLEObj(&HCISpiTransport); -BLELocalDevice& BLE = BLEObj; -#endif -#elif defined(ARDUINO_B_L475E_IOT01A) || defined(ARDUINO_B_L4S5I_IOT01A) -/* B-L475E-IOT01A1 or B_L4S5I_IOT01A */ -SPIClass SpiHCI(PC12, PC11, PC10); -HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, PD13, PE6, PA8, 8000000, SPI_MODE0); -#if !defined(FAKE_BLELOCALDEVICE) -BLELocalDevice BLEObj(&HCISpiTransport); -BLELocalDevice& BLE = BLEObj; -#endif -#elif defined(ARDUINO_NUCLEO_WB15CC) || defined(ARDUINO_P_NUCLEO_WB55RG) ||\ - defined(ARDUINO_STM32WB5MM_DK) || defined(ARDUINO_P_NUCLEO_WB55_USB_DONGLE) -HCISharedMemTransportClass HCISharedMemTransport; -#if !defined(FAKE_BLELOCALDEVICE) -BLELocalDevice BLEObj(&HCISharedMemTransport); -BLELocalDevice& BLE = BLEObj; -#endif -#else -/* Shield IDB05A2 with SPI clock on D3 */ -SPIClass SpiHCI(D11, D12, D3); -HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M0, A1, A0, D7, 8000000, SPI_MODE0); -#if !defined(FAKE_BLELOCALDEVICE) -BLELocalDevice BLEObj(&HCISpiTransport); -BLELocalDevice& BLE = BLEObj; -#endif -/* Shield IDB05A2 with SPI clock on D13 */ -// #define SpiHCI SPI -// HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M0, A1, A0, D7, 8000000, SPI_MODE0); -// #if !defined(FAKE_BLELOCALDEVICE) -// BLELocalDevice BLEObj(&HCISpiTransport); -// BLELocalDevice& BLE = BLEObj; -// #endif -/* Shield IDB05A1 with SPI clock on D3 */ -// SPIClass SpiHCI(D11, D12, D3); -// HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, A1, A0, D7, 8000000, SPI_MODE0); -// #if !defined(FAKE_BLELOCALDEVICE) -// BLELocalDevice BLEObj(&HCISpiTransport); -// BLELocalDevice& BLE = BLEObj; -// #endif -/* Shield IDB05A1 with SPI clock on D13 */ -// #define SpiHCI SPI -// HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, A1, A0, D7, 8000000, SPI_MODE0); -// #if !defined(FAKE_BLELOCALDEVICE) -// BLELocalDevice BLEObj(&HCISpiTransport); -// BLELocalDevice& BLE = BLEObj; -// #endif -/* Shield BNRG2A1 with SPI clock on D3 */ -// SPIClass SpiHCI(D11, D12, D3); -// HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M2SP, A1, A0, D7, 1000000, SPI_MODE1); -// #if !defined(FAKE_BLELOCALDEVICE) -// BLELocalDevice BLEObj(&HCISpiTransport); -// BLELocalDevice& BLE = BLEObj; -// #endif -/* Shield BNRG2A1 with SPI clock on D13 */ -// #define SpiHCI SPI -// HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M2SP, A1, A0, D7, 1000000, SPI_MODE1); -// #if !defined(FAKE_BLELOCALDEVICE) -// BLELocalDevice BLEObj(&HCISpiTransport); -// BLELocalDevice& BLE = BLEObj; -// #endif -#endif - -const int ledPin = LED_BUILTIN; // set ledPin to on-board LED - BLEService ledService("19B10010-E8F2-537E-4F6C-D104768A1214"); // create service // create switch characteristic and allow remote device to read and write @@ -119,7 +32,7 @@ BLEByteCharacteristic ledCharacteristic("19B10011-E8F2-537E-4F6C-D104768A1214", BLEByteCharacteristic buttonCharacteristic("19B10012-E8F2-537E-4F6C-D104768A1214", BLERead | BLENotify); void setup() { - Serial.begin(115200); + Serial.begin(9600); while (!Serial); pinMode(ledPin, OUTPUT); // use the LED as an output @@ -127,7 +40,7 @@ void setup() { // begin initialization if (!BLE.begin()) { - Serial.println("starting BLE failed!"); + Serial.println("starting Bluetooth® Low Energy module failed!"); while (1); } @@ -150,11 +63,11 @@ void setup() { // start advertising BLE.advertise(); - Serial.println("Bluetooth device active, waiting for connections..."); + Serial.println("Bluetooth® device active, waiting for connections..."); } void loop() { - // poll for BLE events + // poll for Bluetooth® Low Energy events BLE.poll(); // read the current button pin state diff --git a/examples/Peripheral/CallbackLED/CallbackLED.ino b/examples/Peripheral/CallbackLED/CallbackLED.ino index 0a94d092..8bb90106 100644 --- a/examples/Peripheral/CallbackLED/CallbackLED.ino +++ b/examples/Peripheral/CallbackLED/CallbackLED.ino @@ -1,24 +1,14 @@ /* Callback LED - This example creates a BLE peripheral with service that contains a + This example creates a Bluetooth® Low Energy peripheral with service that contains a characteristic to control an LED. The callback features of the library are used. The circuit: - - Boards with integrated BLE or Nucleo board plus one of BLE X-Nucleo shield:: - - B-L475E-IOT01A1 - - B_L4S5I_IOT01A - - STEVAL-MKBOXPRO - - STEVAL-MKSBOX1V1, - - NUCLEO-WB15CC - - P-NUCLEO-WB55RG - - STM32WB5MM-DK - - X-NUCLEO-IDB05A2 - - X-NUCLEO-IDB05A1 - - X-NUCLEO-BNRG2A1 - - You can use a generic BLE central app, like LightBlue (iOS and Android) or + - Board with supported BLE modules. + + You can use a generic Bluetooth® Low Energy central app, like LightBlue (iOS and Android) or nRF Connect (Android), to interact with the services and characteristics created in this sketch. @@ -27,82 +17,6 @@ #include -#if defined(ARDUINO_STEVAL_MKBOXPRO) -/* STEVAL-MKBOXPRO */ -SPIClass SpiHCI(PA7, PA6, PA5); -HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_LP, PA2, PB11, PD4, 1000000, SPI_MODE3); -#if !defined(FAKE_BLELOCALDEVICE) -BLELocalDevice BLEObj(&HCISpiTransport); -BLELocalDevice& BLE = BLEObj; -#endif -#elif defined(ARDUINO_STEVAL_MKSBOX1V1) -/* STEVAL-MKSBOX1V1 */ -SPIClass SpiHCI(PC3, PD3, PD1); -HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_1S, PD0, PD4, PA8, 1000000, SPI_MODE1); -#if !defined(FAKE_BLELOCALDEVICE) -BLELocalDevice BLEObj(&HCISpiTransport); -BLELocalDevice& BLE = BLEObj; -#endif -#elif defined(ARDUINO_B_L475E_IOT01A) || defined(ARDUINO_B_L4S5I_IOT01A) -/* B-L475E-IOT01A1 or B_L4S5I_IOT01A */ -SPIClass SpiHCI(PC12, PC11, PC10); -HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, PD13, PE6, PA8, 8000000, SPI_MODE0); -#if !defined(FAKE_BLELOCALDEVICE) -BLELocalDevice BLEObj(&HCISpiTransport); -BLELocalDevice& BLE = BLEObj; -#endif -#elif defined(ARDUINO_NUCLEO_WB15CC) || defined(ARDUINO_P_NUCLEO_WB55RG) ||\ - defined(ARDUINO_STM32WB5MM_DK) || defined(ARDUINO_P_NUCLEO_WB55_USB_DONGLE) -HCISharedMemTransportClass HCISharedMemTransport; -#if !defined(FAKE_BLELOCALDEVICE) -BLELocalDevice BLEObj(&HCISharedMemTransport); -BLELocalDevice& BLE = BLEObj; -#endif -#else -/* Shield IDB05A2 with SPI clock on D3 */ -SPIClass SpiHCI(D11, D12, D3); -HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M0, A1, A0, D7, 8000000, SPI_MODE0); -#if !defined(FAKE_BLELOCALDEVICE) -BLELocalDevice BLEObj(&HCISpiTransport); -BLELocalDevice& BLE = BLEObj; -#endif -/* Shield IDB05A2 with SPI clock on D13 */ -// #define SpiHCI SPI -// HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M0, A1, A0, D7, 8000000, SPI_MODE0); -// #if !defined(FAKE_BLELOCALDEVICE) -// BLELocalDevice BLEObj(&HCISpiTransport); -// BLELocalDevice& BLE = BLEObj; -// #endif -/* Shield IDB05A1 with SPI clock on D3 */ -// SPIClass SpiHCI(D11, D12, D3); -// HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, A1, A0, D7, 8000000, SPI_MODE0); -// #if !defined(FAKE_BLELOCALDEVICE) -// BLELocalDevice BLEObj(&HCISpiTransport); -// BLELocalDevice& BLE = BLEObj; -// #endif -/* Shield IDB05A1 with SPI clock on D13 */ -// #define SpiHCI SPI -// HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, A1, A0, D7, 8000000, SPI_MODE0); -// #if !defined(FAKE_BLELOCALDEVICE) -// BLELocalDevice BLEObj(&HCISpiTransport); -// BLELocalDevice& BLE = BLEObj; -// #endif -/* Shield BNRG2A1 with SPI clock on D3 */ -// SPIClass SpiHCI(D11, D12, D3); -// HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M2SP, A1, A0, D7, 1000000, SPI_MODE1); -// #if !defined(FAKE_BLELOCALDEVICE) -// BLELocalDevice BLEObj(&HCISpiTransport); -// BLELocalDevice& BLE = BLEObj; -// #endif -/* Shield BNRG2A1 with SPI clock on D13 */ -// #define SpiHCI SPI -// HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M2SP, A1, A0, D7, 1000000, SPI_MODE1); -// #if !defined(FAKE_BLELOCALDEVICE) -// BLELocalDevice BLEObj(&HCISpiTransport); -// BLELocalDevice& BLE = BLEObj; -// #endif -#endif - BLEService ledService("19B10000-E8F2-537E-4F6C-D104768A1214"); // create service // create switch characteristic and allow remote device to read and write @@ -111,14 +25,14 @@ BLEByteCharacteristic switchCharacteristic("19B10001-E8F2-537E-4F6C-D104768A1214 const int ledPin = LED_BUILTIN; // pin to use for the LED void setup() { - Serial.begin(115200); + Serial.begin(9600); while (!Serial); pinMode(ledPin, OUTPUT); // use the LED pin as an output // begin initialization if (!BLE.begin()) { - Serial.println("starting BLE failed!"); + Serial.println("starting Bluetooth® Low Energy module failed!"); while (1); } @@ -146,11 +60,11 @@ void setup() { // start advertising BLE.advertise(); - Serial.println(("Bluetooth device active, waiting for connections...")); + Serial.println(("Bluetooth® device active, waiting for connections...")); } void loop() { - // poll for BLE events + // poll for Bluetooth® Low Energy events BLE.poll(); } diff --git a/examples/Peripheral/LED/LED.ino b/examples/Peripheral/LED/LED.ino index 442350d0..7223365f 100644 --- a/examples/Peripheral/LED/LED.ino +++ b/examples/Peripheral/LED/LED.ino @@ -1,115 +1,30 @@ /* LED - This example creates a BLE peripheral with service that contains a + This example creates a Bluetooth® Low Energy peripheral with service that contains a characteristic to control an LED. The circuit: - - Boards with integrated BLE or Nucleo board plus one of BLE X-Nucleo shield:: - - B-L475E-IOT01A1 - - B_L4S5I_IOT01A - - STEVAL-MKBOXPRO - - STEVAL-MKSBOX1V1, - - NUCLEO-WB15CC - - P-NUCLEO-WB55RG - - STM32WB5MM-DK - - X-NUCLEO-IDB05A2 - - X-NUCLEO-IDB05A1 - - X-NUCLEO-BNRG2A1 - - You can use a generic BLE central app, like LightBlue (iOS and Android) or + - Board with supported BLE modules. + + You can use a generic Bluetooth® Low Energy central app, like LightBlue (iOS and Android) or nRF Connect (Android), to interact with the services and characteristics created in this sketch. This example code is in the public domain. */ + #include -#if defined(ARDUINO_STEVAL_MKBOXPRO) -/* STEVAL-MKBOXPRO */ -SPIClass SpiHCI(PA7, PA6, PA5); -HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_LP, PA2, PB11, PD4, 1000000, SPI_MODE3); -#if !defined(FAKE_BLELOCALDEVICE) -BLELocalDevice BLEObj(&HCISpiTransport); -BLELocalDevice& BLE = BLEObj; -#endif -#elif defined(ARDUINO_STEVAL_MKSBOX1V1) -/* STEVAL-MKSBOX1V1 */ -SPIClass SpiHCI(PC3, PD3, PD1); -HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_1S, PD0, PD4, PA8, 1000000, SPI_MODE1); -#if !defined(FAKE_BLELOCALDEVICE) -BLELocalDevice BLEObj(&HCISpiTransport); -BLELocalDevice& BLE = BLEObj; -#endif -#elif defined(ARDUINO_B_L475E_IOT01A) || defined(ARDUINO_B_L4S5I_IOT01A) -/* B-L475E-IOT01A1 or B_L4S5I_IOT01A */ -SPIClass SpiHCI(PC12, PC11, PC10); -HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, PD13, PE6, PA8, 8000000, SPI_MODE0); -#if !defined(FAKE_BLELOCALDEVICE) -BLELocalDevice BLEObj(&HCISpiTransport); -BLELocalDevice& BLE = BLEObj; -#endif -#elif defined(ARDUINO_NUCLEO_WB15CC) || defined(ARDUINO_P_NUCLEO_WB55RG) ||\ - defined(ARDUINO_STM32WB5MM_DK) || defined(ARDUINO_P_NUCLEO_WB55_USB_DONGLE) -HCISharedMemTransportClass HCISharedMemTransport; -#if !defined(FAKE_BLELOCALDEVICE) -BLELocalDevice BLEObj(&HCISharedMemTransport); -BLELocalDevice& BLE = BLEObj; -#endif -#else -/* Shield IDB05A2 with SPI clock on D3 */ -SPIClass SpiHCI(D11, D12, D3); -HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M0, A1, A0, D7, 8000000, SPI_MODE0); -#if !defined(FAKE_BLELOCALDEVICE) -BLELocalDevice BLEObj(&HCISpiTransport); -BLELocalDevice& BLE = BLEObj; -#endif -/* Shield IDB05A2 with SPI clock on D13 */ -// #define SpiHCI SPI -// HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M0, A1, A0, D7, 8000000, SPI_MODE0); -// #if !defined(FAKE_BLELOCALDEVICE) -// BLELocalDevice BLEObj(&HCISpiTransport); -// BLELocalDevice& BLE = BLEObj; -// #endif -/* Shield IDB05A1 with SPI clock on D3 */ -// SPIClass SpiHCI(D11, D12, D3); -// HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, A1, A0, D7, 8000000, SPI_MODE0); -// #if !defined(FAKE_BLELOCALDEVICE) -// BLELocalDevice BLEObj(&HCISpiTransport); -// BLELocalDevice& BLE = BLEObj; -// #endif -/* Shield IDB05A1 with SPI clock on D13 */ -// #define SpiHCI SPI -// HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, A1, A0, D7, 8000000, SPI_MODE0); -// #if !defined(FAKE_BLELOCALDEVICE) -// BLELocalDevice BLEObj(&HCISpiTransport); -// BLELocalDevice& BLE = BLEObj; -// #endif -/* Shield BNRG2A1 with SPI clock on D3 */ -// SPIClass SpiHCI(D11, D12, D3); -// HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M2SP, A1, A0, D7, 1000000, SPI_MODE1); -// #if !defined(FAKE_BLELOCALDEVICE) -// BLELocalDevice BLEObj(&HCISpiTransport); -// BLELocalDevice& BLE = BLEObj; -// #endif -/* Shield BNRG2A1 with SPI clock on D13 */ -// #define SpiHCI SPI -// HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M2SP, A1, A0, D7, 1000000, SPI_MODE1); -// #if !defined(FAKE_BLELOCALDEVICE) -// BLELocalDevice BLEObj(&HCISpiTransport); -// BLELocalDevice& BLE = BLEObj; -// #endif -#endif - -BLEService ledService("19B10000-E8F2-537E-4F6C-D104768A1214"); // BLE LED Service - -// BLE LED Switch Characteristic - custom 128-bit UUID, read and writable by central +BLEService ledService("19B10000-E8F2-537E-4F6C-D104768A1214"); // Bluetooth® Low Energy LED Service + +// Bluetooth® Low Energy LED Switch Characteristic - custom 128-bit UUID, read and writable by central BLEByteCharacteristic switchCharacteristic("19B10001-E8F2-537E-4F6C-D104768A1214", BLERead | BLEWrite); const int ledPin = LED_BUILTIN; // pin to use for the LED void setup() { - Serial.begin(115200); + Serial.begin(9600); while (!Serial); // set LED pin to output mode @@ -117,7 +32,7 @@ void setup() { // begin initialization if (!BLE.begin()) { - Serial.println("starting BLE failed!"); + Serial.println("starting Bluetooth® Low Energy module failed!"); while (1); } @@ -132,7 +47,7 @@ void setup() { // add service BLE.addService(ledService); - // set the initial value for the characeristic: + // set the initial value for the characteristic: switchCharacteristic.writeValue(0); // start advertising @@ -142,7 +57,7 @@ void setup() { } void loop() { - // listen for BLE peripherals to connect: + // listen for Bluetooth® Low Energy peripherals to connect: BLEDevice central = BLE.central(); // if a central is connected to peripheral: diff --git a/extras/arduino-ble-parser.py b/extras/arduino-ble-parser.py deleted file mode 100644 index 8f678711..00000000 --- a/extras/arduino-ble-parser.py +++ /dev/null @@ -1,85 +0,0 @@ -''' -Convert ArduinoBLE debug files into Btsnoop files ready to be analyzed using wireshark or hcidump -Btsnoop file format reference - https://www.fte.com/WebHelpII/Sodera/Content/Technical_Information/BT_Snoop_File_Format.htm -''' - -import os -import argparse - -DEBUG = False - -parser = argparse.ArgumentParser() -parser.add_argument('-i', dest='inputPath', type=str, required=True, help='input file containing debug log') -parser.add_argument('-o', dest='outputPath', type=str, required=True, help='result file that will contain the btsnoop encoded debug file') -args = parser.parse_args() - -# Extract only hci debug messages -def extractHCIDebugPrint(inputPath, outputPath): - inputFile = open(inputPath, 'r') - outputFile = open(outputPath, 'w') - for inputLine in inputFile: - lineItems = inputLine.split() - if (len(lineItems) < 7) or (lineItems[1] != "->") or (lineItems[2] != "HCI"): - if (len(lineItems) < 4) or (lineItems[0] != "HCI") or ((lineItems[3] != "<-") and (lineItems[3] != "->")): - continue - outputFile.write(inputLine) - outputFile.close() - -# Return packet in btsnoop format -def buildBinaryPacket(hciMessage, hciDirection, hciType): - commandFlag = 1 if (hciType == "COMMAND" or hciType == "EVENT") else 0 - directionFlag = 0 if (hciDirection == "TX") else 1 - flagHex = ("0" * 7) + str((commandFlag * 2) + directionFlag) - timestampHex = "0" * 16 - packetDropHex = "0" * 8 - dataLengthHex = format( (int(len(hciMessage) / 2)), 'x') - packetLengthHex = ("0" * (8 - len(dataLengthHex))) + dataLengthHex - binaryPacket = bytearray.fromhex(packetLengthHex + packetLengthHex + flagHex + packetDropHex + timestampHex + hciMessage) - if DEBUG: - print(len(hciMessage)) - print(dataLengthHex) - print(packetLengthHex) - print(flagHex) - print('\n') - return binaryPacket - -def buildBinaryHeader(): - defaultHeader = "6274736e6f6f700000000001000003ea" - binaryHeader = bytearray.fromhex(defaultHeader) - return binaryHeader - -def convertToBtsnoop(inputPath, outputPath): - # Open output file and write the Btsnoop header - outputFile = open(outputPath,'wb') - header = buildBinaryHeader() - outputFile.write(header) - - # Open input file containing HCI debug packets - inputFile = open(inputPath, 'r') - for inputLine in inputFile: - lineItems = inputLine.split() - # For a safer script, do not use indexes but look for symbols in the line - baseIndex = lineItems.index("HCI") - hciMessage = lineItems[baseIndex + 4] - hciDirection = lineItems[baseIndex + 2] - hciType = lineItems[baseIndex + 1] - # Build and write the encoded line - btsnoopPacket = buildBinaryPacket(hciMessage, hciDirection, hciType) - outputFile.write(btsnoopPacket) - if DEBUG: - print(hciDirection) - print(hciMessage) - print(hciType) - print('\n') - outputFile.close() - -inputPath = args.inputPath -outputPath = args.outputPath -tempFile = "temp-debug-print.txt" -# Run -extractHCIDebugPrint(inputPath,tempFile) -convertToBtsnoop(tempFile, outputPath) -# Delete temp file -os.remove(tempFile) - diff --git a/extras/test/.gitignore b/extras/test/.gitignore deleted file mode 100644 index c795b054..00000000 --- a/extras/test/.gitignore +++ /dev/null @@ -1 +0,0 @@ -build \ No newline at end of file diff --git a/extras/test/CMakeLists.txt b/extras/test/CMakeLists.txt deleted file mode 100644 index bbba16ca..00000000 --- a/extras/test/CMakeLists.txt +++ /dev/null @@ -1,126 +0,0 @@ -########################################################################## - -set(CMAKE_VERBOSE_MAKEFILE ON) -cmake_minimum_required(VERSION 2.8) - -########################################################################## - -project(testArduinoBLE) - -########################################################################## - -set(CMAKE_CXX_STANDARD 11) -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) - -########################################################################## - -set(COMMON_TEST_SRCS - src/test_main.cpp - src/Arduino.cpp - src/util/itoa.c - src/util/TestUtil.cpp - src/util/String.cpp - src/util/Common.cpp -) - -set(DUT_SRCS - ../../src/utility/BLEUuid.cpp - ../../src/BLEDevice.cpp - ../../src/BLECharacteristic.cpp - ../../src/BLEDescriptor.cpp - ../../src/BLEService.cpp - ../../src/BLEAdvertisingData.cpp - ../../src/utility/ATT.cpp - ../../src/utility/GAP.cpp - ../../src/utility/HCI.cpp - ../../src/utility/GATT.cpp - ../../src/utility/L2CAPSignaling.cpp - ../../src/local/BLELocalAttribute.cpp - ../../src/local/BLELocalCharacteristic.cpp - ../../src/local/BLELocalDescriptor.cpp - ../../src/local/BLELocalDevice.cpp - ../../src/local/BLELocalService.cpp - ../../src/remote/BLERemoteAttribute.cpp - ../../src/remote/BLERemoteCharacteristic.cpp - ../../src/remote/BLERemoteDescriptor.cpp - ../../src/remote/BLERemoteDevice.cpp - ../../src/remote/BLERemoteService.cpp - ../../src/BLEStringCharacteristic.cpp - ../../src/BLETypedCharacteristics.cpp -) - -set(TEST_TARGET_UUID_SRCS - # Test files - ${COMMON_TEST_SRCS} - src/test_uuid/test_uuid.cpp - # DUT files - #${DUT_SRCS} - ../../src/utility/BLEUuid.cpp -) - -set(TEST_TARGET_DISC_DEVICE_SRCS - # Test files - ${COMMON_TEST_SRCS} - src/test_discovered_device/test_discovered_device.cpp - # DUT files - ${DUT_SRCS} - # Fake classes files - src/util/HCIFakeTransport.cpp - src/test_discovered_device/FakeGAP.cpp -) - -set(TEST_TARGET_ADVERTISING_DATA_SRCS - # Test files - ${COMMON_TEST_SRCS} - src/test_advertising_data/test_advertising_data.cpp - src/test_advertising_data/test_service.cpp - src/test_advertising_data/test_local_name.cpp - src/test_advertising_data/test_manufacturer.cpp - # DUT files - ${DUT_SRCS} - # Fake classes files - src/util/HCIFakeTransport.cpp - src/test_advertising_data/FakeBLELocalDevice.cpp -) - -########################################################################## - -set(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} "--coverage") -set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "--coverage") - -########################################################################## - -add_executable(TEST_TARGET_UUID ${TEST_TARGET_UUID_SRCS}) -add_executable(TEST_TARGET_DISC_DEVICE ${TEST_TARGET_DISC_DEVICE_SRCS}) -add_executable(TEST_TARGET_ADVERTISING_DATA ${TEST_TARGET_ADVERTISING_DATA_SRCS}) - -########################################################################## - -include_directories(include) -include_directories(include/util) -include_directories(../../src) -include_directories(../../src/local) -include_directories(../../src/remote) -include_directories(../../src/utility) -include_directories(external/catch/v2.12.1/include) - -target_include_directories(TEST_TARGET_DISC_DEVICE PUBLIC include/test_discovered_device) -target_include_directories(TEST_TARGET_ADVERTISING_DATA PUBLIC include/test_advertising_data) - -########################################################################## - -target_compile_definitions(TEST_TARGET_DISC_DEVICE PUBLIC FAKE_GAP) -target_compile_definitions(TEST_TARGET_ADVERTISING_DATA PUBLIC FAKE_BLELOCALDEVICE) - -########################################################################## - -# Build unit tests as a post build step -add_custom_command(TARGET TEST_TARGET_UUID POST_BUILD - COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/TEST_TARGET_UUID -) -add_custom_command(TARGET TEST_TARGET_DISC_DEVICE POST_BUILD - COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/TEST_TARGET_DISC_DEVICE -) -add_custom_command(TARGET TEST_TARGET_ADVERTISING_DATA POST_BUILD - COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/TEST_TARGET_ADVERTISING_DATA -) diff --git a/extras/test/external/catch/v2.12.1/include/catch.hpp b/extras/test/external/catch/v2.12.1/include/catch.hpp deleted file mode 100644 index 1d2c9bb6..00000000 --- a/extras/test/external/catch/v2.12.1/include/catch.hpp +++ /dev/null @@ -1,17698 +0,0 @@ -/* - * Catch v2.12.1 - * Generated: 2020-04-21 19:29:20.964532 - * ---------------------------------------------------------- - * This file has been merged from multiple headers. Please don't edit it directly - * Copyright (c) 2020 Two Blue Cubes Ltd. All rights reserved. - * - * Distributed under the Boost Software License, Version 1.0. (See accompanying - * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - */ -#ifndef TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED -#define TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED -// start catch.hpp - - -#define CATCH_VERSION_MAJOR 2 -#define CATCH_VERSION_MINOR 12 -#define CATCH_VERSION_PATCH 1 - -#ifdef __clang__ -# pragma clang system_header -#elif defined __GNUC__ -# pragma GCC system_header -#endif - -// start catch_suppress_warnings.h - -#ifdef __clang__ -# ifdef __ICC // icpc defines the __clang__ macro -# pragma warning(push) -# pragma warning(disable: 161 1682) -# else // __ICC -# pragma clang diagnostic push -# pragma clang diagnostic ignored "-Wpadded" -# pragma clang diagnostic ignored "-Wswitch-enum" -# pragma clang diagnostic ignored "-Wcovered-switch-default" -# endif -#elif defined __GNUC__ - // Because REQUIREs trigger GCC's -Wparentheses, and because still - // supported version of g++ have only buggy support for _Pragmas, - // Wparentheses have to be suppressed globally. -# pragma GCC diagnostic ignored "-Wparentheses" // See #674 for details - -# pragma GCC diagnostic push -# pragma GCC diagnostic ignored "-Wunused-variable" -# pragma GCC diagnostic ignored "-Wpadded" -#endif -// end catch_suppress_warnings.h -#if defined(CATCH_CONFIG_MAIN) || defined(CATCH_CONFIG_RUNNER) -# define CATCH_IMPL -# define CATCH_CONFIG_ALL_PARTS -#endif - -// In the impl file, we want to have access to all parts of the headers -// Can also be used to sanely support PCHs -#if defined(CATCH_CONFIG_ALL_PARTS) -# define CATCH_CONFIG_EXTERNAL_INTERFACES -# if defined(CATCH_CONFIG_DISABLE_MATCHERS) -# undef CATCH_CONFIG_DISABLE_MATCHERS -# endif -# if !defined(CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER) -# define CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER -# endif -#endif - -#if !defined(CATCH_CONFIG_IMPL_ONLY) -// start catch_platform.h - -#ifdef __APPLE__ -# include -# if TARGET_OS_OSX == 1 -# define CATCH_PLATFORM_MAC -# elif TARGET_OS_IPHONE == 1 -# define CATCH_PLATFORM_IPHONE -# endif - -#elif defined(linux) || defined(__linux) || defined(__linux__) -# define CATCH_PLATFORM_LINUX - -#elif defined(WIN32) || defined(__WIN32__) || defined(_WIN32) || defined(_MSC_VER) || defined(__MINGW32__) -# define CATCH_PLATFORM_WINDOWS -#endif - -// end catch_platform.h - -#ifdef CATCH_IMPL -# ifndef CLARA_CONFIG_MAIN -# define CLARA_CONFIG_MAIN_NOT_DEFINED -# define CLARA_CONFIG_MAIN -# endif -#endif - -// start catch_user_interfaces.h - -namespace Catch { - unsigned int rngSeed(); -} - -// end catch_user_interfaces.h -// start catch_tag_alias_autoregistrar.h - -// start catch_common.h - -// start catch_compiler_capabilities.h - -// Detect a number of compiler features - by compiler -// The following features are defined: -// -// CATCH_CONFIG_COUNTER : is the __COUNTER__ macro supported? -// CATCH_CONFIG_WINDOWS_SEH : is Windows SEH supported? -// CATCH_CONFIG_POSIX_SIGNALS : are POSIX signals supported? -// CATCH_CONFIG_DISABLE_EXCEPTIONS : Are exceptions enabled? -// **************** -// Note to maintainers: if new toggles are added please document them -// in configuration.md, too -// **************** - -// In general each macro has a _NO_ form -// (e.g. CATCH_CONFIG_NO_POSIX_SIGNALS) which disables the feature. -// Many features, at point of detection, define an _INTERNAL_ macro, so they -// can be combined, en-mass, with the _NO_ forms later. - -#ifdef __cplusplus - -# if (__cplusplus >= 201402L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201402L) -# define CATCH_CPP14_OR_GREATER -# endif - -# if (__cplusplus >= 201703L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201703L) -# define CATCH_CPP17_OR_GREATER -# endif - -#endif - -#if defined(__cpp_lib_uncaught_exceptions) -# define CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS -#endif - -// We have to avoid both ICC and Clang, because they try to mask themselves -// as gcc, and we want only GCC in this block -#if defined(__GNUC__) && !defined(__clang__) && !defined(__ICC) -# define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION _Pragma( "GCC diagnostic push" ) -# define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION _Pragma( "GCC diagnostic pop" ) - -# define CATCH_INTERNAL_IGNORE_BUT_WARN(...) (void)__builtin_constant_p(__VA_ARGS__) - -#endif - -#if defined(__clang__) - -# define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION _Pragma( "clang diagnostic push" ) -# define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION _Pragma( "clang diagnostic pop" ) - -// As of this writing, IBM XL's implementation of __builtin_constant_p has a bug -// which results in calls to destructors being emitted for each temporary, -// without a matching initialization. In practice, this can result in something -// like `std::string::~string` being called on an uninitialized value. -// -// For example, this code will likely segfault under IBM XL: -// ``` -// REQUIRE(std::string("12") + "34" == "1234") -// ``` -// -// Therefore, `CATCH_INTERNAL_IGNORE_BUT_WARN` is not implemented. -# if !defined(__ibmxl__) -# define CATCH_INTERNAL_IGNORE_BUT_WARN(...) (void)__builtin_constant_p(__VA_ARGS__) /* NOLINT(cppcoreguidelines-pro-type-vararg) */ -# endif - -# define CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \ - _Pragma( "clang diagnostic ignored \"-Wexit-time-destructors\"" ) \ - _Pragma( "clang diagnostic ignored \"-Wglobal-constructors\"") - -# define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS \ - _Pragma( "clang diagnostic ignored \"-Wparentheses\"" ) - -# define CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS \ - _Pragma( "clang diagnostic ignored \"-Wunused-variable\"" ) - -# define CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS \ - _Pragma( "clang diagnostic ignored \"-Wgnu-zero-variadic-macro-arguments\"" ) - -# define CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \ - _Pragma( "clang diagnostic ignored \"-Wunused-template\"" ) - -#endif // __clang__ - -//////////////////////////////////////////////////////////////////////////////// -// Assume that non-Windows platforms support posix signals by default -#if !defined(CATCH_PLATFORM_WINDOWS) - #define CATCH_INTERNAL_CONFIG_POSIX_SIGNALS -#endif - -//////////////////////////////////////////////////////////////////////////////// -// We know some environments not to support full POSIX signals -#if defined(__CYGWIN__) || defined(__QNX__) || defined(__EMSCRIPTEN__) || defined(__DJGPP__) - #define CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS -#endif - -#ifdef __OS400__ -# define CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS -# define CATCH_CONFIG_COLOUR_NONE -#endif - -//////////////////////////////////////////////////////////////////////////////// -// Android somehow still does not support std::to_string -#if defined(__ANDROID__) -# define CATCH_INTERNAL_CONFIG_NO_CPP11_TO_STRING -# define CATCH_INTERNAL_CONFIG_ANDROID_LOGWRITE -#endif - -//////////////////////////////////////////////////////////////////////////////// -// Not all Windows environments support SEH properly -#if defined(__MINGW32__) -# define CATCH_INTERNAL_CONFIG_NO_WINDOWS_SEH -#endif - -//////////////////////////////////////////////////////////////////////////////// -// PS4 -#if defined(__ORBIS__) -# define CATCH_INTERNAL_CONFIG_NO_NEW_CAPTURE -#endif - -//////////////////////////////////////////////////////////////////////////////// -// Cygwin -#ifdef __CYGWIN__ - -// Required for some versions of Cygwin to declare gettimeofday -// see: http://stackoverflow.com/questions/36901803/gettimeofday-not-declared-in-this-scope-cygwin -# define _BSD_SOURCE -// some versions of cygwin (most) do not support std::to_string. Use the libstd check. -// https://gcc.gnu.org/onlinedocs/gcc-4.8.2/libstdc++/api/a01053_source.html line 2812-2813 -# if !((__cplusplus >= 201103L) && defined(_GLIBCXX_USE_C99) \ - && !defined(_GLIBCXX_HAVE_BROKEN_VSWPRINTF)) - -# define CATCH_INTERNAL_CONFIG_NO_CPP11_TO_STRING - -# endif -#endif // __CYGWIN__ - -//////////////////////////////////////////////////////////////////////////////// -// Visual C++ -#if defined(_MSC_VER) - -# define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION __pragma( warning(push) ) -# define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION __pragma( warning(pop) ) - -# if _MSC_VER >= 1900 // Visual Studio 2015 or newer -# define CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS -# endif - -// Universal Windows platform does not support SEH -// Or console colours (or console at all...) -# if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP) -# define CATCH_CONFIG_COLOUR_NONE -# else -# define CATCH_INTERNAL_CONFIG_WINDOWS_SEH -# endif - -// MSVC traditional preprocessor needs some workaround for __VA_ARGS__ -// _MSVC_TRADITIONAL == 0 means new conformant preprocessor -// _MSVC_TRADITIONAL == 1 means old traditional non-conformant preprocessor -# if !defined(__clang__) // Handle Clang masquerading for msvc -# if !defined(_MSVC_TRADITIONAL) || (defined(_MSVC_TRADITIONAL) && _MSVC_TRADITIONAL) -# define CATCH_INTERNAL_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR -# endif // MSVC_TRADITIONAL -# endif // __clang__ - -#endif // _MSC_VER - -#if defined(_REENTRANT) || defined(_MSC_VER) -// Enable async processing, as -pthread is specified or no additional linking is required -# define CATCH_INTERNAL_CONFIG_USE_ASYNC -#endif // _MSC_VER - -//////////////////////////////////////////////////////////////////////////////// -// Check if we are compiled with -fno-exceptions or equivalent -#if defined(__EXCEPTIONS) || defined(__cpp_exceptions) || defined(_CPPUNWIND) -# define CATCH_INTERNAL_CONFIG_EXCEPTIONS_ENABLED -#endif - -//////////////////////////////////////////////////////////////////////////////// -// DJGPP -#ifdef __DJGPP__ -# define CATCH_INTERNAL_CONFIG_NO_WCHAR -#endif // __DJGPP__ - -//////////////////////////////////////////////////////////////////////////////// -// Embarcadero C++Build -#if defined(__BORLANDC__) - #define CATCH_INTERNAL_CONFIG_POLYFILL_ISNAN -#endif - -//////////////////////////////////////////////////////////////////////////////// - -// Use of __COUNTER__ is suppressed during code analysis in -// CLion/AppCode 2017.2.x and former, because __COUNTER__ is not properly -// handled by it. -// Otherwise all supported compilers support COUNTER macro, -// but user still might want to turn it off -#if ( !defined(__JETBRAINS_IDE__) || __JETBRAINS_IDE__ >= 20170300L ) - #define CATCH_INTERNAL_CONFIG_COUNTER -#endif - -//////////////////////////////////////////////////////////////////////////////// - -// RTX is a special version of Windows that is real time. -// This means that it is detected as Windows, but does not provide -// the same set of capabilities as real Windows does. -#if defined(UNDER_RTSS) || defined(RTX64_BUILD) - #define CATCH_INTERNAL_CONFIG_NO_WINDOWS_SEH - #define CATCH_INTERNAL_CONFIG_NO_ASYNC - #define CATCH_CONFIG_COLOUR_NONE -#endif - -#if !defined(_GLIBCXX_USE_C99_MATH_TR1) -#define CATCH_INTERNAL_CONFIG_GLOBAL_NEXTAFTER -#endif - -// Various stdlib support checks that require __has_include -#if defined(__has_include) - // Check if string_view is available and usable - #if __has_include() && defined(CATCH_CPP17_OR_GREATER) - # define CATCH_INTERNAL_CONFIG_CPP17_STRING_VIEW - #endif - - // Check if optional is available and usable - # if __has_include() && defined(CATCH_CPP17_OR_GREATER) - # define CATCH_INTERNAL_CONFIG_CPP17_OPTIONAL - # endif // __has_include() && defined(CATCH_CPP17_OR_GREATER) - - // Check if byte is available and usable - # if __has_include() && defined(CATCH_CPP17_OR_GREATER) - # define CATCH_INTERNAL_CONFIG_CPP17_BYTE - # endif // __has_include() && defined(CATCH_CPP17_OR_GREATER) - - // Check if variant is available and usable - # if __has_include() && defined(CATCH_CPP17_OR_GREATER) - # if defined(__clang__) && (__clang_major__ < 8) - // work around clang bug with libstdc++ https://bugs.llvm.org/show_bug.cgi?id=31852 - // fix should be in clang 8, workaround in libstdc++ 8.2 - # include - # if defined(__GLIBCXX__) && defined(_GLIBCXX_RELEASE) && (_GLIBCXX_RELEASE < 9) - # define CATCH_CONFIG_NO_CPP17_VARIANT - # else - # define CATCH_INTERNAL_CONFIG_CPP17_VARIANT - # endif // defined(__GLIBCXX__) && defined(_GLIBCXX_RELEASE) && (_GLIBCXX_RELEASE < 9) - # else - # define CATCH_INTERNAL_CONFIG_CPP17_VARIANT - # endif // defined(__clang__) && (__clang_major__ < 8) - # endif // __has_include() && defined(CATCH_CPP17_OR_GREATER) -#endif // defined(__has_include) - -#if defined(CATCH_INTERNAL_CONFIG_COUNTER) && !defined(CATCH_CONFIG_NO_COUNTER) && !defined(CATCH_CONFIG_COUNTER) -# define CATCH_CONFIG_COUNTER -#endif -#if defined(CATCH_INTERNAL_CONFIG_WINDOWS_SEH) && !defined(CATCH_CONFIG_NO_WINDOWS_SEH) && !defined(CATCH_CONFIG_WINDOWS_SEH) && !defined(CATCH_INTERNAL_CONFIG_NO_WINDOWS_SEH) -# define CATCH_CONFIG_WINDOWS_SEH -#endif -// This is set by default, because we assume that unix compilers are posix-signal-compatible by default. -#if defined(CATCH_INTERNAL_CONFIG_POSIX_SIGNALS) && !defined(CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS) && !defined(CATCH_CONFIG_NO_POSIX_SIGNALS) && !defined(CATCH_CONFIG_POSIX_SIGNALS) -# define CATCH_CONFIG_POSIX_SIGNALS -#endif -// This is set by default, because we assume that compilers with no wchar_t support are just rare exceptions. -#if !defined(CATCH_INTERNAL_CONFIG_NO_WCHAR) && !defined(CATCH_CONFIG_NO_WCHAR) && !defined(CATCH_CONFIG_WCHAR) -# define CATCH_CONFIG_WCHAR -#endif - -#if !defined(CATCH_INTERNAL_CONFIG_NO_CPP11_TO_STRING) && !defined(CATCH_CONFIG_NO_CPP11_TO_STRING) && !defined(CATCH_CONFIG_CPP11_TO_STRING) -# define CATCH_CONFIG_CPP11_TO_STRING -#endif - -#if defined(CATCH_INTERNAL_CONFIG_CPP17_OPTIONAL) && !defined(CATCH_CONFIG_NO_CPP17_OPTIONAL) && !defined(CATCH_CONFIG_CPP17_OPTIONAL) -# define CATCH_CONFIG_CPP17_OPTIONAL -#endif - -#if defined(CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS) && !defined(CATCH_CONFIG_NO_CPP17_UNCAUGHT_EXCEPTIONS) && !defined(CATCH_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS) -# define CATCH_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS -#endif - -#if defined(CATCH_INTERNAL_CONFIG_CPP17_STRING_VIEW) && !defined(CATCH_CONFIG_NO_CPP17_STRING_VIEW) && !defined(CATCH_CONFIG_CPP17_STRING_VIEW) -# define CATCH_CONFIG_CPP17_STRING_VIEW -#endif - -#if defined(CATCH_INTERNAL_CONFIG_CPP17_VARIANT) && !defined(CATCH_CONFIG_NO_CPP17_VARIANT) && !defined(CATCH_CONFIG_CPP17_VARIANT) -# define CATCH_CONFIG_CPP17_VARIANT -#endif - -#if defined(CATCH_INTERNAL_CONFIG_CPP17_BYTE) && !defined(CATCH_CONFIG_NO_CPP17_BYTE) && !defined(CATCH_CONFIG_CPP17_BYTE) -# define CATCH_CONFIG_CPP17_BYTE -#endif - -#if defined(CATCH_CONFIG_EXPERIMENTAL_REDIRECT) -# define CATCH_INTERNAL_CONFIG_NEW_CAPTURE -#endif - -#if defined(CATCH_INTERNAL_CONFIG_NEW_CAPTURE) && !defined(CATCH_INTERNAL_CONFIG_NO_NEW_CAPTURE) && !defined(CATCH_CONFIG_NO_NEW_CAPTURE) && !defined(CATCH_CONFIG_NEW_CAPTURE) -# define CATCH_CONFIG_NEW_CAPTURE -#endif - -#if !defined(CATCH_INTERNAL_CONFIG_EXCEPTIONS_ENABLED) && !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS) -# define CATCH_CONFIG_DISABLE_EXCEPTIONS -#endif - -#if defined(CATCH_INTERNAL_CONFIG_POLYFILL_ISNAN) && !defined(CATCH_CONFIG_NO_POLYFILL_ISNAN) && !defined(CATCH_CONFIG_POLYFILL_ISNAN) -# define CATCH_CONFIG_POLYFILL_ISNAN -#endif - -#if defined(CATCH_INTERNAL_CONFIG_USE_ASYNC) && !defined(CATCH_INTERNAL_CONFIG_NO_ASYNC) && !defined(CATCH_CONFIG_NO_USE_ASYNC) && !defined(CATCH_CONFIG_USE_ASYNC) -# define CATCH_CONFIG_USE_ASYNC -#endif - -#if defined(CATCH_INTERNAL_CONFIG_ANDROID_LOGWRITE) && !defined(CATCH_CONFIG_NO_ANDROID_LOGWRITE) && !defined(CATCH_CONFIG_ANDROID_LOGWRITE) -# define CATCH_CONFIG_ANDROID_LOGWRITE -#endif - -#if defined(CATCH_INTERNAL_CONFIG_GLOBAL_NEXTAFTER) && !defined(CATCH_CONFIG_NO_GLOBAL_NEXTAFTER) && !defined(CATCH_CONFIG_GLOBAL_NEXTAFTER) -# define CATCH_CONFIG_GLOBAL_NEXTAFTER -#endif - -// Even if we do not think the compiler has that warning, we still have -// to provide a macro that can be used by the code. -#if !defined(CATCH_INTERNAL_START_WARNINGS_SUPPRESSION) -# define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION -#endif -#if !defined(CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION) -# define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION -#endif -#if !defined(CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS) -# define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS -#endif -#if !defined(CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS) -# define CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS -#endif -#if !defined(CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS) -# define CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS -#endif -#if !defined(CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS) -# define CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS -#endif - -// The goal of this macro is to avoid evaluation of the arguments, but -// still have the compiler warn on problems inside... -#if !defined(CATCH_INTERNAL_IGNORE_BUT_WARN) -# define CATCH_INTERNAL_IGNORE_BUT_WARN(...) -#endif - -#if defined(__APPLE__) && defined(__apple_build_version__) && (__clang_major__ < 10) -# undef CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS -#elif defined(__clang__) && (__clang_major__ < 5) -# undef CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS -#endif - -#if !defined(CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS) -# define CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS -#endif - -#if defined(CATCH_CONFIG_DISABLE_EXCEPTIONS) -#define CATCH_TRY if ((true)) -#define CATCH_CATCH_ALL if ((false)) -#define CATCH_CATCH_ANON(type) if ((false)) -#else -#define CATCH_TRY try -#define CATCH_CATCH_ALL catch (...) -#define CATCH_CATCH_ANON(type) catch (type) -#endif - -#if defined(CATCH_INTERNAL_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR) && !defined(CATCH_CONFIG_NO_TRADITIONAL_MSVC_PREPROCESSOR) && !defined(CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR) -#define CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR -#endif - -// end catch_compiler_capabilities.h -#define INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line ) name##line -#define INTERNAL_CATCH_UNIQUE_NAME_LINE( name, line ) INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line ) -#ifdef CATCH_CONFIG_COUNTER -# define INTERNAL_CATCH_UNIQUE_NAME( name ) INTERNAL_CATCH_UNIQUE_NAME_LINE( name, __COUNTER__ ) -#else -# define INTERNAL_CATCH_UNIQUE_NAME( name ) INTERNAL_CATCH_UNIQUE_NAME_LINE( name, __LINE__ ) -#endif - -#include -#include -#include - -// We need a dummy global operator<< so we can bring it into Catch namespace later -struct Catch_global_namespace_dummy {}; -std::ostream& operator<<(std::ostream&, Catch_global_namespace_dummy); - -namespace Catch { - - struct CaseSensitive { enum Choice { - Yes, - No - }; }; - - class NonCopyable { - NonCopyable( NonCopyable const& ) = delete; - NonCopyable( NonCopyable && ) = delete; - NonCopyable& operator = ( NonCopyable const& ) = delete; - NonCopyable& operator = ( NonCopyable && ) = delete; - - protected: - NonCopyable(); - virtual ~NonCopyable(); - }; - - struct SourceLineInfo { - - SourceLineInfo() = delete; - SourceLineInfo( char const* _file, std::size_t _line ) noexcept - : file( _file ), - line( _line ) - {} - - SourceLineInfo( SourceLineInfo const& other ) = default; - SourceLineInfo& operator = ( SourceLineInfo const& ) = default; - SourceLineInfo( SourceLineInfo&& ) noexcept = default; - SourceLineInfo& operator = ( SourceLineInfo&& ) noexcept = default; - - bool empty() const noexcept { return file[0] == '\0'; } - bool operator == ( SourceLineInfo const& other ) const noexcept; - bool operator < ( SourceLineInfo const& other ) const noexcept; - - char const* file; - std::size_t line; - }; - - std::ostream& operator << ( std::ostream& os, SourceLineInfo const& info ); - - // Bring in operator<< from global namespace into Catch namespace - // This is necessary because the overload of operator<< above makes - // lookup stop at namespace Catch - using ::operator<<; - - // Use this in variadic streaming macros to allow - // >> +StreamEndStop - // as well as - // >> stuff +StreamEndStop - struct StreamEndStop { - std::string operator+() const; - }; - template - T const& operator + ( T const& value, StreamEndStop ) { - return value; - } -} - -#define CATCH_INTERNAL_LINEINFO \ - ::Catch::SourceLineInfo( __FILE__, static_cast( __LINE__ ) ) - -// end catch_common.h -namespace Catch { - - struct RegistrarForTagAliases { - RegistrarForTagAliases( char const* alias, char const* tag, SourceLineInfo const& lineInfo ); - }; - -} // end namespace Catch - -#define CATCH_REGISTER_TAG_ALIAS( alias, spec ) \ - CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \ - CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \ - namespace{ Catch::RegistrarForTagAliases INTERNAL_CATCH_UNIQUE_NAME( AutoRegisterTagAlias )( alias, spec, CATCH_INTERNAL_LINEINFO ); } \ - CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION - -// end catch_tag_alias_autoregistrar.h -// start catch_test_registry.h - -// start catch_interfaces_testcase.h - -#include - -namespace Catch { - - class TestSpec; - - struct ITestInvoker { - virtual void invoke () const = 0; - virtual ~ITestInvoker(); - }; - - class TestCase; - struct IConfig; - - struct ITestCaseRegistry { - virtual ~ITestCaseRegistry(); - virtual std::vector const& getAllTests() const = 0; - virtual std::vector const& getAllTestsSorted( IConfig const& config ) const = 0; - }; - - bool isThrowSafe( TestCase const& testCase, IConfig const& config ); - bool matchTest( TestCase const& testCase, TestSpec const& testSpec, IConfig const& config ); - std::vector filterTests( std::vector const& testCases, TestSpec const& testSpec, IConfig const& config ); - std::vector const& getAllTestCasesSorted( IConfig const& config ); - -} - -// end catch_interfaces_testcase.h -// start catch_stringref.h - -#include -#include -#include -#include - -namespace Catch { - - /// A non-owning string class (similar to the forthcoming std::string_view) - /// Note that, because a StringRef may be a substring of another string, - /// it may not be null terminated. - class StringRef { - public: - using size_type = std::size_t; - using const_iterator = const char*; - - private: - static constexpr char const* const s_empty = ""; - - char const* m_start = s_empty; - size_type m_size = 0; - - public: // construction - constexpr StringRef() noexcept = default; - - StringRef( char const* rawChars ) noexcept; - - constexpr StringRef( char const* rawChars, size_type size ) noexcept - : m_start( rawChars ), - m_size( size ) - {} - - StringRef( std::string const& stdString ) noexcept - : m_start( stdString.c_str() ), - m_size( stdString.size() ) - {} - - explicit operator std::string() const { - return std::string(m_start, m_size); - } - - public: // operators - auto operator == ( StringRef const& other ) const noexcept -> bool; - auto operator != (StringRef const& other) const noexcept -> bool { - return !(*this == other); - } - - auto operator[] ( size_type index ) const noexcept -> char { - assert(index < m_size); - return m_start[index]; - } - - public: // named queries - constexpr auto empty() const noexcept -> bool { - return m_size == 0; - } - constexpr auto size() const noexcept -> size_type { - return m_size; - } - - // Returns the current start pointer. If the StringRef is not - // null-terminated, throws std::domain_exception - auto c_str() const -> char const*; - - public: // substrings and searches - // Returns a substring of [start, start + length). - // If start + length > size(), then the substring is [start, size()). - // If start > size(), then the substring is empty. - auto substr( size_type start, size_type length ) const noexcept -> StringRef; - - // Returns the current start pointer. May not be null-terminated. - auto data() const noexcept -> char const*; - - constexpr auto isNullTerminated() const noexcept -> bool { - return m_start[m_size] == '\0'; - } - - public: // iterators - constexpr const_iterator begin() const { return m_start; } - constexpr const_iterator end() const { return m_start + m_size; } - }; - - auto operator += ( std::string& lhs, StringRef const& sr ) -> std::string&; - auto operator << ( std::ostream& os, StringRef const& sr ) -> std::ostream&; - - constexpr auto operator "" _sr( char const* rawChars, std::size_t size ) noexcept -> StringRef { - return StringRef( rawChars, size ); - } -} // namespace Catch - -constexpr auto operator "" _catch_sr( char const* rawChars, std::size_t size ) noexcept -> Catch::StringRef { - return Catch::StringRef( rawChars, size ); -} - -// end catch_stringref.h -// start catch_preprocessor.hpp - - -#define CATCH_RECURSION_LEVEL0(...) __VA_ARGS__ -#define CATCH_RECURSION_LEVEL1(...) CATCH_RECURSION_LEVEL0(CATCH_RECURSION_LEVEL0(CATCH_RECURSION_LEVEL0(__VA_ARGS__))) -#define CATCH_RECURSION_LEVEL2(...) CATCH_RECURSION_LEVEL1(CATCH_RECURSION_LEVEL1(CATCH_RECURSION_LEVEL1(__VA_ARGS__))) -#define CATCH_RECURSION_LEVEL3(...) CATCH_RECURSION_LEVEL2(CATCH_RECURSION_LEVEL2(CATCH_RECURSION_LEVEL2(__VA_ARGS__))) -#define CATCH_RECURSION_LEVEL4(...) CATCH_RECURSION_LEVEL3(CATCH_RECURSION_LEVEL3(CATCH_RECURSION_LEVEL3(__VA_ARGS__))) -#define CATCH_RECURSION_LEVEL5(...) CATCH_RECURSION_LEVEL4(CATCH_RECURSION_LEVEL4(CATCH_RECURSION_LEVEL4(__VA_ARGS__))) - -#ifdef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR -#define INTERNAL_CATCH_EXPAND_VARGS(...) __VA_ARGS__ -// MSVC needs more evaluations -#define CATCH_RECURSION_LEVEL6(...) CATCH_RECURSION_LEVEL5(CATCH_RECURSION_LEVEL5(CATCH_RECURSION_LEVEL5(__VA_ARGS__))) -#define CATCH_RECURSE(...) CATCH_RECURSION_LEVEL6(CATCH_RECURSION_LEVEL6(__VA_ARGS__)) -#else -#define CATCH_RECURSE(...) CATCH_RECURSION_LEVEL5(__VA_ARGS__) -#endif - -#define CATCH_REC_END(...) -#define CATCH_REC_OUT - -#define CATCH_EMPTY() -#define CATCH_DEFER(id) id CATCH_EMPTY() - -#define CATCH_REC_GET_END2() 0, CATCH_REC_END -#define CATCH_REC_GET_END1(...) CATCH_REC_GET_END2 -#define CATCH_REC_GET_END(...) CATCH_REC_GET_END1 -#define CATCH_REC_NEXT0(test, next, ...) next CATCH_REC_OUT -#define CATCH_REC_NEXT1(test, next) CATCH_DEFER ( CATCH_REC_NEXT0 ) ( test, next, 0) -#define CATCH_REC_NEXT(test, next) CATCH_REC_NEXT1(CATCH_REC_GET_END test, next) - -#define CATCH_REC_LIST0(f, x, peek, ...) , f(x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1) ) ( f, peek, __VA_ARGS__ ) -#define CATCH_REC_LIST1(f, x, peek, ...) , f(x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST0) ) ( f, peek, __VA_ARGS__ ) -#define CATCH_REC_LIST2(f, x, peek, ...) f(x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1) ) ( f, peek, __VA_ARGS__ ) - -#define CATCH_REC_LIST0_UD(f, userdata, x, peek, ...) , f(userdata, x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1_UD) ) ( f, userdata, peek, __VA_ARGS__ ) -#define CATCH_REC_LIST1_UD(f, userdata, x, peek, ...) , f(userdata, x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST0_UD) ) ( f, userdata, peek, __VA_ARGS__ ) -#define CATCH_REC_LIST2_UD(f, userdata, x, peek, ...) f(userdata, x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1_UD) ) ( f, userdata, peek, __VA_ARGS__ ) - -// Applies the function macro `f` to each of the remaining parameters, inserts commas between the results, -// and passes userdata as the first parameter to each invocation, -// e.g. CATCH_REC_LIST_UD(f, x, a, b, c) evaluates to f(x, a), f(x, b), f(x, c) -#define CATCH_REC_LIST_UD(f, userdata, ...) CATCH_RECURSE(CATCH_REC_LIST2_UD(f, userdata, __VA_ARGS__, ()()(), ()()(), ()()(), 0)) - -#define CATCH_REC_LIST(f, ...) CATCH_RECURSE(CATCH_REC_LIST2(f, __VA_ARGS__, ()()(), ()()(), ()()(), 0)) - -#define INTERNAL_CATCH_EXPAND1(param) INTERNAL_CATCH_EXPAND2(param) -#define INTERNAL_CATCH_EXPAND2(...) INTERNAL_CATCH_NO## __VA_ARGS__ -#define INTERNAL_CATCH_DEF(...) INTERNAL_CATCH_DEF __VA_ARGS__ -#define INTERNAL_CATCH_NOINTERNAL_CATCH_DEF -#define INTERNAL_CATCH_STRINGIZE(...) INTERNAL_CATCH_STRINGIZE2(__VA_ARGS__) -#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR -#define INTERNAL_CATCH_STRINGIZE2(...) #__VA_ARGS__ -#define INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS(param) INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_REMOVE_PARENS(param)) -#else -// MSVC is adding extra space and needs another indirection to expand INTERNAL_CATCH_NOINTERNAL_CATCH_DEF -#define INTERNAL_CATCH_STRINGIZE2(...) INTERNAL_CATCH_STRINGIZE3(__VA_ARGS__) -#define INTERNAL_CATCH_STRINGIZE3(...) #__VA_ARGS__ -#define INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS(param) (INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_REMOVE_PARENS(param)) + 1) -#endif - -#define INTERNAL_CATCH_MAKE_NAMESPACE2(...) ns_##__VA_ARGS__ -#define INTERNAL_CATCH_MAKE_NAMESPACE(name) INTERNAL_CATCH_MAKE_NAMESPACE2(name) - -#define INTERNAL_CATCH_REMOVE_PARENS(...) INTERNAL_CATCH_EXPAND1(INTERNAL_CATCH_DEF __VA_ARGS__) - -#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR -#define INTERNAL_CATCH_MAKE_TYPE_LIST2(...) decltype(get_wrapper()) -#define INTERNAL_CATCH_MAKE_TYPE_LIST(...) INTERNAL_CATCH_MAKE_TYPE_LIST2(INTERNAL_CATCH_REMOVE_PARENS(__VA_ARGS__)) -#else -#define INTERNAL_CATCH_MAKE_TYPE_LIST2(...) INTERNAL_CATCH_EXPAND_VARGS(decltype(get_wrapper())) -#define INTERNAL_CATCH_MAKE_TYPE_LIST(...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_MAKE_TYPE_LIST2(INTERNAL_CATCH_REMOVE_PARENS(__VA_ARGS__))) -#endif - -#define INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(...)\ - CATCH_REC_LIST(INTERNAL_CATCH_MAKE_TYPE_LIST,__VA_ARGS__) - -#define INTERNAL_CATCH_REMOVE_PARENS_1_ARG(_0) INTERNAL_CATCH_REMOVE_PARENS(_0) -#define INTERNAL_CATCH_REMOVE_PARENS_2_ARG(_0, _1) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_1_ARG(_1) -#define INTERNAL_CATCH_REMOVE_PARENS_3_ARG(_0, _1, _2) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_2_ARG(_1, _2) -#define INTERNAL_CATCH_REMOVE_PARENS_4_ARG(_0, _1, _2, _3) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_3_ARG(_1, _2, _3) -#define INTERNAL_CATCH_REMOVE_PARENS_5_ARG(_0, _1, _2, _3, _4) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_4_ARG(_1, _2, _3, _4) -#define INTERNAL_CATCH_REMOVE_PARENS_6_ARG(_0, _1, _2, _3, _4, _5) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_5_ARG(_1, _2, _3, _4, _5) -#define INTERNAL_CATCH_REMOVE_PARENS_7_ARG(_0, _1, _2, _3, _4, _5, _6) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_6_ARG(_1, _2, _4, _5, _6) -#define INTERNAL_CATCH_REMOVE_PARENS_8_ARG(_0, _1, _2, _3, _4, _5, _6, _7) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_7_ARG(_1, _2, _3, _4, _5, _6, _7) -#define INTERNAL_CATCH_REMOVE_PARENS_9_ARG(_0, _1, _2, _3, _4, _5, _6, _7, _8) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_8_ARG(_1, _2, _3, _4, _5, _6, _7, _8) -#define INTERNAL_CATCH_REMOVE_PARENS_10_ARG(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_9_ARG(_1, _2, _3, _4, _5, _6, _7, _8, _9) -#define INTERNAL_CATCH_REMOVE_PARENS_11_ARG(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_10_ARG(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10) - -#define INTERNAL_CATCH_VA_NARGS_IMPL(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, N, ...) N - -#define INTERNAL_CATCH_TYPE_GEN\ - template struct TypeList {};\ - template\ - constexpr auto get_wrapper() noexcept -> TypeList { return {}; }\ - template class...> struct TemplateTypeList{};\ - template class...Cs>\ - constexpr auto get_wrapper() noexcept -> TemplateTypeList { return {}; }\ - template\ - struct append;\ - template\ - struct rewrap;\ - template class, typename...>\ - struct create;\ - template class, typename>\ - struct convert;\ - \ - template \ - struct append { using type = T; };\ - template< template class L1, typename...E1, template class L2, typename...E2, typename...Rest>\ - struct append, L2, Rest...> { using type = typename append, Rest...>::type; };\ - template< template class L1, typename...E1, typename...Rest>\ - struct append, TypeList, Rest...> { using type = L1; };\ - \ - template< template class Container, template class List, typename...elems>\ - struct rewrap, List> { using type = TypeList>; };\ - template< template class Container, template class List, class...Elems, typename...Elements>\ - struct rewrap, List, Elements...> { using type = typename append>, typename rewrap, Elements...>::type>::type; };\ - \ - template