From 29861193f31221645a9b8c70fac8acc49e8ebb61 Mon Sep 17 00:00:00 2001
From: Paolo Calao <paolo.calao@gmail.com>
Date: Mon, 2 Nov 2020 15:30:38 +0100
Subject: [PATCH 001/112] Add enhanced advertising examples

While the old way of preparing advertising data is still supported, an alternative enhanced method to build advertising packets is now available.
It consists in defining and configuring an object of type 'BLEAdvertisingData' to build the desired packet.
When it has been configured, by setting the appropriate parameters, it can be used to populate the advertising data packet or the scan response data packet.
Following this way, the user can decide in which packet each parameter should be put.
Also, it is now possible to configure an advertising packet (advertising or scan response) by passing a raw data packet.
If an advertising packet has a raw data parameter set, all its other parameters will be ignored.

Also, advertising parameters such as manufacturer data, service data or raw data should have a GLOBAL scope, because they are passed as pointers and are not copied internally.
---
 .../EnhancedAdvertising.ino                   | 44 +++++++++++++++++++
 .../RawDataAdvertising/RawDataAdvertising.ino | 41 +++++++++++++++++
 2 files changed, 85 insertions(+)
 create mode 100644 examples/Peripheral/Advertising/EnhancedAdvertising/EnhancedAdvertising.ino
 create mode 100644 examples/Peripheral/Advertising/RawDataAdvertising/RawDataAdvertising.ino

diff --git a/examples/Peripheral/Advertising/EnhancedAdvertising/EnhancedAdvertising.ino b/examples/Peripheral/Advertising/EnhancedAdvertising/EnhancedAdvertising.ino
new file mode 100644
index 00000000..979b69a8
--- /dev/null
+++ b/examples/Peripheral/Advertising/EnhancedAdvertising/EnhancedAdvertising.ino
@@ -0,0 +1,44 @@
+#include <ArduinoBLE.h>
+
+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..d025dd62
--- /dev/null
+++ b/examples/Peripheral/Advertising/RawDataAdvertising/RawDataAdvertising.ino
@@ -0,0 +1,41 @@
+#include <ArduinoBLE.h>
+
+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();
+}

From c66379882f727276b74c319c1ec9fa824fc96bf1 Mon Sep 17 00:00:00 2001
From: unknownconstant <unknownconstant>
Date: Fri, 1 Jan 2021 11:22:34 +0000
Subject: [PATCH 002/112] Initial - encrypted read

---
 src/ArduinoBLE.h               |   1 +
 src/BLEProperty.h              |  40 ++-
 src/local/BLELocalDevice.cpp   |   4 +
 src/local/BLELocalDevice.h     |   1 +
 src/utility/ATT.cpp            | 132 +++++++-
 src/utility/ATT.h              |  23 +-
 src/utility/HCI.cpp            | 571 ++++++++++++++++++++++++++++-----
 src/utility/HCI.h              |  37 ++-
 src/utility/L2CAPSignaling.cpp | 204 +++++++++++-
 src/utility/L2CAPSignaling.h   |  22 ++
 src/utility/btct.cpp           | 322 +++++++++++++++++++
 src/utility/btct.h             |  26 ++
 12 files changed, 1301 insertions(+), 82 deletions(-)
 create mode 100644 src/utility/btct.cpp
 create mode 100644 src/utility/btct.h

diff --git a/src/ArduinoBLE.h b/src/ArduinoBLE.h
index dc6e8188..588d5cb1 100644
--- a/src/ArduinoBLE.h
+++ b/src/ArduinoBLE.h
@@ -24,5 +24,6 @@
 #include "BLEProperty.h"
 #include "BLEStringCharacteristic.h"
 #include "BLETypedCharacteristics.h"
+#include "utility/btct.h"
 
 #endif
diff --git a/src/BLEProperty.h b/src/BLEProperty.h
index 6cdd888f..aeee4c85 100644
--- a/src/BLEProperty.h
+++ b/src/BLEProperty.h
@@ -17,6 +17,8 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
+// #include <stdint.h>
+
 #ifndef _BLE_PROPERTY_H_
 #define _BLE_PROPERTY_H_
 
@@ -26,7 +28,43 @@ enum BLEProperty {
   BLEWriteWithoutResponse = 0x04,
   BLEWrite                = 0x08,
   BLENotify               = 0x10,
-  BLEIndicate             = 0x20
+  BLEIndicate             = 0x20,
+  BLEAuth                 = 1 << 6,
+  BLEExtProp              = 1 << 7,
+};
+
+#define    ESP_GATT_CHAR_PROP_BIT_BROADCAST    (1 << 0)       /* 0x01 */    /* relate to BTA_GATT_CHAR_PROP_BIT_BROADCAST in bta/bta_gatt_api.h */
+#define    ESP_GATT_CHAR_PROP_BIT_READ         (1 << 1)       /* 0x02 */    /* relate to BTA_GATT_CHAR_PROP_BIT_READ in bta/bta_gatt_api.h */
+#define    ESP_GATT_CHAR_PROP_BIT_WRITE_NR     (1 << 2)       /* 0x04 */    /* relate to BTA_GATT_CHAR_PROP_BIT_WRITE_NR in bta/bta_gatt_api.h */
+#define    ESP_GATT_CHAR_PROP_BIT_WRITE        (1 << 3)       /* 0x08 */    /* relate to BTA_GATT_CHAR_PROP_BIT_WRITE in bta/bta_gatt_api.h */
+#define    ESP_GATT_CHAR_PROP_BIT_NOTIFY       (1 << 4)       /* 0x10 */    /* relate to BTA_GATT_CHAR_PROP_BIT_NOTIFY in bta/bta_gatt_api.h */
+#define    ESP_GATT_CHAR_PROP_BIT_INDICATE     (1 << 5)       /* 0x20 */    /* relate to BTA_GATT_CHAR_PROP_BIT_INDICATE in bta/bta_gatt_api.h */
+#define    ESP_GATT_CHAR_PROP_BIT_AUTH         (1 << 6)       /* 0x40 */    /* relate to BTA_GATT_CHAR_PROP_BIT_AUTH in bta/bta_gatt_api.h */
+#define    ESP_GATT_CHAR_PROP_BIT_EXT_PROP     (1 << 7)       /* 0x80 */    /* relate to BTA_GATT_CHAR_PROP_BIT_EXT_PROP in bta/bta_gatt_api.h */
+
+#define    ESP_GATT_PERM_READ                  (1 << 0)   /* bit 0 -  0x0001 */    /* relate to BTA_GATT_PERM_READ in bta/bta_gatt_api.h */
+#define    ESP_GATT_PERM_READ_ENCRYPTED        (1 << 1)   /* bit 1 -  0x0002 */    /* relate to BTA_GATT_PERM_READ_ENCRYPTED in bta/bta_gatt_api.h */
+#define    ESP_GATT_PERM_READ_ENC_MITM         (1 << 2)   /* bit 2 -  0x0004 */    /* relate to BTA_GATT_PERM_READ_ENC_MITM in bta/bta_gatt_api.h */
+#define    ESP_GATT_PERM_WRITE                 (1 << 4)   /* bit 4 -  0x0010 */    /* relate to BTA_GATT_PERM_WRITE in bta/bta_gatt_api.h */
+#define    ESP_GATT_PERM_WRITE_ENCRYPTED       (1 << 5)   /* bit 5 -  0x0020 */    /* relate to BTA_GATT_PERM_WRITE_ENCRYPTED in bta/bta_gatt_api.h */
+#define    ESP_GATT_PERM_WRITE_ENC_MITM        (1 << 6)   /* bit 6 -  0x0040 */    /* relate to BTA_GATT_PERM_WRITE_ENC_MITM in bta/bta_gatt_api.h */
+#define    ESP_GATT_PERM_WRITE_SIGNED          (1 << 7)   /* bit 7 -  0x0080 */    /* relate to BTA_GATT_PERM_WRITE_SIGNED in bta/bta_gatt_api.h */
+#define    ESP_GATT_PERM_WRITE_SIGNED_MITM     (1 << 8)   /* bit 8 -  0x0100 */    /* relate to BTA_GATT_PERM_WRITE_SIGNED_MITM in bta/bta_gatt_api.h */
+#define    ESP_GATT_PERM_READ_AUTHORIZATION    (1 << 9)   /* bit 9 -  0x0200 */
+#define    ESP_GATT_PERM_WRITE_AUTHORIZATION   (1 << 10)  /* bit 10 - 0x0400 */
+
+enum BLE_GATT_PERM_ {
+  READ                = 1 << 0,
+  READ_ENCRYPTED      = 1 << 1,
+  READ_ENC_MITM       = 1 << 2,
+  WRITE               = 1 << 4,
+  WRITE_ENCRYPTED     = 1 << 5,
+  WRITE_ENC_MITM      = 1 << 6,
+  WRITE_SIGNED        = 1 << 7,
+  WRITE_SIGNED_MITM   = 1 << 8,
+  READ_AUTHORIZATION  = 1 << 9,
+  WRITE_AUTHORIZATION = 1 << 10,
 };
 
+
 #endif
diff --git a/src/local/BLELocalDevice.cpp b/src/local/BLELocalDevice.cpp
index 57477e23..e83c4b0d 100644
--- a/src/local/BLELocalDevice.cpp
+++ b/src/local/BLELocalDevice.cpp
@@ -107,6 +107,10 @@ int BLELocalDevice::begin()
     end();
     return 0;
   }
+  if (HCI.setLeEventMask(0x00000000000001FF) != 0) {
+    end();
+    return 0;
+  }
 
   uint16_t pktLen;
   uint8_t maxPkt;
diff --git a/src/local/BLELocalDevice.h b/src/local/BLELocalDevice.h
index 20837c14..1a927420 100644
--- a/src/local/BLELocalDevice.h
+++ b/src/local/BLELocalDevice.h
@@ -74,6 +74,7 @@ class BLELocalDevice {
 
   void debug(Stream& stream);
   void noDebug();
+  uint8_t BDaddress[6];
 
 private:
 };
diff --git a/src/utility/ATT.cpp b/src/utility/ATT.cpp
index 2696960e..af0129a7 100644
--- a/src/utility/ATT.cpp
+++ b/src/utility/ATT.cpp
@@ -95,6 +95,7 @@ ATTClass::ATTClass() :
     memset(_peers[i].address, 0x00, sizeof(_peers[i].address));
     _peers[i].mtu = 23;
     _peers[i].device = NULL;
+    _peers[i].encryption = 0x0;
   }
 
   memset(_eventHandlers, 0x00, sizeof(_eventHandlers));
@@ -267,12 +268,22 @@ void ATTClass::handleData(uint16_t connectionHandle, uint8_t dlen, uint8_t data[
 
   uint16_t mtu = this->mtu(connectionHandle);
 
+#ifdef _BLE_TRACE_
+  Serial.print("data opcode: 0x");
+  Serial.println(opcode, HEX);
+#endif
   switch (opcode) {
     case ATT_OP_ERROR:
+#ifdef _BLE_TRACE_
+      Serial.println("[Info] data error");
+#endif
       error(connectionHandle, dlen, data);
       break;
 
     case ATT_OP_MTU_REQ:
+#ifdef _BLE_TRACE_
+      Serial.println("MTU");
+#endif
       mtuReq(connectionHandle, dlen, data);
       break;
 
@@ -281,6 +292,9 @@ void ATTClass::handleData(uint16_t connectionHandle, uint8_t dlen, uint8_t data[
       break;
 
     case ATT_OP_FIND_INFO_REQ:
+#ifdef _BLE_TRACE_
+      Serial.println("Find info");
+#endif
       findInfoReq(connectionHandle, mtu, dlen, data);
       break;
 
@@ -293,6 +307,9 @@ void ATTClass::handleData(uint16_t connectionHandle, uint8_t dlen, uint8_t data[
       break;
 
     case ATT_OP_READ_BY_TYPE_REQ:
+#ifdef _BLE_TRACE_
+      Serial.println("By type");
+#endif
       readByTypeReq(connectionHandle, mtu, dlen, data);
       break;
 
@@ -319,6 +336,9 @@ void ATTClass::handleData(uint16_t connectionHandle, uint8_t dlen, uint8_t data[
 
     case ATT_OP_WRITE_REQ:
     case ATT_OP_WRITE_CMD:
+#ifdef _BLE_TRACE_
+      Serial.println("Write req");
+#endif
       writeReqOrCmd(connectionHandle, mtu, opcode, dlen, data);
       break;
 
@@ -346,6 +366,9 @@ void ATTClass::handleData(uint16_t connectionHandle, uint8_t dlen, uint8_t data[
     case ATT_OP_READ_MULTI_REQ:
     case ATT_OP_SIGNED_WRITE_CMD:
     default:
+#ifdef _BLE_TRACE_
+      Serial.println("[Info] Unhandled dara");
+#endif
       sendError(connectionHandle, opcode, 0x00, ATT_ECODE_REQ_NOT_SUPP);
       break;
   }
@@ -398,6 +421,10 @@ void ATTClass::removeConnection(uint16_t handle, uint8_t /*reason*/)
   _peers[peerIndex].addressType = 0x00;
   memset(_peers[peerIndex].address, 0x00, sizeof(_peers[peerIndex].address));
   _peers[peerIndex].mtu = 23;
+  _peers[peerIndex].encryption = PEER_ENCRYPTION::NO_ENCRYPTION;
+  _peers[peerIndex].IOCap[0] = 0;
+  _peers[peerIndex].IOCap[1] = 0;
+  _peers[peerIndex].IOCap[2] = 0;
 
   if (_peers[peerIndex].device) {
     delete _peers[peerIndex].device;
@@ -807,6 +834,14 @@ void ATTClass::readByGroupReq(uint16_t connectionHandle, uint16_t mtu, uint8_t d
     uint16_t endHandle;
     uint16_t uuid;
   } *readByGroupReq = (ReadByGroupReq*)data;
+#ifdef _BLE_TRACE_
+  Serial.print("readByGroupReq: start: 0x");
+  Serial.println(readByGroupReq->startHandle,HEX);
+  Serial.print("readByGroupReq: end: 0x");
+  Serial.println(readByGroupReq->endHandle,HEX);
+  Serial.print("readByGroupReq: UUID: 0x");
+  Serial.println(readByGroupReq->uuid,HEX);
+#endif
 
   if (dlen != sizeof(ReadByGroupReq) || (readByGroupReq->uuid != BLETypeService && readByGroupReq->uuid != 0x2801)) {
     sendError(connectionHandle, ATT_OP_READ_BY_GROUP_REQ, readByGroupReq->startHandle, ATT_ECODE_UNSUPP_GRP_TYPE);
@@ -819,7 +854,10 @@ void ATTClass::readByGroupReq(uint16_t connectionHandle, uint16_t mtu, uint8_t d
   response[0] = ATT_OP_READ_BY_GROUP_RESP;
   response[1] = 0x00;
   responseLength = 2;
-
+#ifdef _BLE_TRACE_
+  Serial.print("readByGroupReq: attrcount: ");
+  Serial.println(GATT.attributeCount());
+#endif
   for (uint16_t i = (readByGroupReq->startHandle - 1); i < GATT.attributeCount() && i <= (readByGroupReq->endHandle - 1); i++) {
     BLELocalAttribute* attribute = GATT.attribute(i);
 
@@ -906,6 +944,8 @@ void ATTClass::readOrReadBlobReq(uint16_t connectionHandle, uint16_t mtu, uint8_
       return;
     }
   }
+  /// if auth error, hold the response in a buffer.
+  bool holdResponse = false;
 
   uint16_t handle = *(uint16_t*)data;
   uint16_t offset = (opcode == ATT_OP_READ_REQ) ? 0 : *(uint16_t*)&data[sizeof(handle)];
@@ -962,6 +1002,11 @@ void ATTClass::readOrReadBlobReq(uint16_t connectionHandle, uint16_t mtu, uint8_
         sendError(connectionHandle, opcode, handle, ATT_ECODE_READ_NOT_PERM);
         return;
       }
+      // If characteristic requires encryption send error & hold response until encrypted
+      if ((characteristic->properties() & BLEAuth) > 0 && (getPeerEncryption(connectionHandle) & PEER_ENCRYPTION::ENCRYPTED_AES)==0) {
+        holdResponse = true;
+        sendError(connectionHandle, opcode, handle, ATT_ECODE_INSUFF_ENC);
+      }
 
       uint16_t valueLength = characteristic->valueLength();
 
@@ -994,8 +1039,12 @@ void ATTClass::readOrReadBlobReq(uint16_t connectionHandle, uint16_t mtu, uint8_
     memcpy(&response[responseLength], descriptor->value() + offset, valueLength);
     responseLength += valueLength;
   }
-  
-  HCI.sendAclPkt(connectionHandle, ATT_CID, responseLength, response);
+  if(holdResponse){
+    memcpy(holdBuffer, response, responseLength);
+    holdBufferSize = responseLength;
+  }else{
+    HCI.sendAclPkt(connectionHandle, ATT_CID, responseLength, response);
+  }
 }
 
 void ATTClass::readResp(uint16_t connectionHandle, uint8_t dlen, uint8_t data[])
@@ -1687,4 +1736,81 @@ void ATTClass::writeCmd(uint16_t connectionHandle, uint16_t handle, const uint8_
   sendReq(connectionHandle, &writeReq, 3 + dataLen, NULL);
 }
 
+// Set encryption state for a peer
+int ATTClass::setPeerEncryption(uint16_t connectionHandle, uint8_t encryption){
+  for(int i=0; i<ATT_MAX_PEERS; i++){
+    if(_peers[i].connectionHandle != connectionHandle){
+      continue;
+    }
+    _peers[i].encryption = encryption;
+    return 1;
+  }
+  return 0;
+}
+// Set the IO capabilities for a peer
+int ATTClass::setPeerIOCap(uint16_t connectionHandle, uint8_t IOCap[3]){
+  for(int i=0; i<ATT_MAX_PEERS; i++){
+    if(_peers[i].connectionHandle != connectionHandle){
+      continue;
+    }
+    memcpy(_peers[i].IOCap, IOCap, 3);
+    return 1;
+  }
+  return 0;
+}
+// Return the connection handle for the first peer that is requesting encryption
+uint16_t ATTClass::getPeerEncrptingConnectionHandle(){
+  for(int i=0; i<ATT_MAX_PEERS; i++){
+    if(_peers[i].encryption & PEER_ENCRYPTION::REQUESTED_ENCRYPTION > 0){
+      return _peers[i].connectionHandle;
+    }
+  }
+  return ATT_MAX_PEERS + 1;
+}
+// Get the encryption state for a particular peer / connection handle
+uint8_t ATTClass::getPeerEncryption(uint16_t connectionHandle) {
+  for(int i=0; i<ATT_MAX_PEERS; i++){
+    if(_peers[i].connectionHandle != connectionHandle){continue;}
+    return _peers[i].encryption;
+  }
+  return 0;
+}
+// Get the IOCapabilities for a peer
+int ATTClass::getPeerIOCap(uint16_t connectionHandle, uint8_t IOCap[3]) {
+  for(int i=0; i<ATT_MAX_PEERS; i++){
+    if(_peers[i].connectionHandle != connectionHandle){continue;}
+    // return _peers[i].encryption;
+    memcpy(IOCap, _peers[i].IOCap, 3);
+  }
+  return 0;
+}
+// Get the BD_ADDR for a peer
+int ATTClass::getPeerAddr(uint16_t connectionHandle, uint8_t peerAddr[])
+{
+  for(int i=0; i<ATT_MAX_PEERS; i++)
+  {
+    if(_peers[i].connectionHandle != connectionHandle){continue;}
+    memcpy(peerAddr, _peers[i].address,6);
+    return 1;
+  }
+  return 0;
+}
+// Get the BD_ADDR for a peer in the format needed by f6 for pairing.
+int ATTClass::getPeerAddrWithType(uint16_t connectionHandle, uint8_t peerAddr[])
+{
+  for(int i=0; i<ATT_MAX_PEERS; i++)
+  {
+    if(_peers[i].connectionHandle != connectionHandle){continue;}
+    for(int k=0; k<6; k++){
+      peerAddr[6-k] = _peers[i].address[k];
+    }
+    if(_peers[i].addressType){
+      peerAddr[0] = 0x01;
+    }else{
+      peerAddr[0] = 0x00;
+    }
+    return 1;
+  }
+  return 0;
+}
 ATTClass ATT;
diff --git a/src/utility/ATT.h b/src/utility/ATT.h
index 6a1611aa..834557f9 100644
--- a/src/utility/ATT.h
+++ b/src/utility/ATT.h
@@ -25,6 +25,7 @@
 #include "BLEDevice.h"
 
 #define ATT_CID       0x0004
+#define BLE_CTL       0x0008
 
 #if defined(ARDUINO_PORTENTA_H7_M4) || defined(ARDUINO_PORTENTA_H7_M7)
 #define ATT_MAX_PEERS 7
@@ -34,6 +35,16 @@
 #define ATT_MAX_PEERS 3
 #endif
 
+enum PEER_ENCRYPTION {
+  NO_ENCRYPTION         = 0,
+  REQUESTED_ENCRYPTION  = 1 << 0,
+  SENT_PUBKEY           = 1 << 1,
+  DH_KEY_CALULATED      = 1 << 2,
+  RECEIVED_DH_CHECK     = 1 << 3,
+  SENT_DH_CHECK         = 1 << 4,
+  ENCRYPTED_AES         = 1 << 7
+};
+
 class BLERemoteDevice;
 
 class ATTClass {
@@ -76,7 +87,15 @@ class ATTClass {
   int readReq(uint16_t connectionHandle, uint16_t handle, uint8_t responseBuffer[]);
   int writeReq(uint16_t connectionHandle, uint16_t handle, const uint8_t* data, uint8_t dataLen, uint8_t responseBuffer[]);
   void writeCmd(uint16_t connectionHandle, uint16_t handle, const uint8_t* data, uint8_t dataLen);
-
+  int setPeerEncryption(uint16_t connectionHandle, uint8_t encryption);
+  uint8_t getPeerEncryption(uint16_t connectionHandle);
+  uint16_t getPeerEncrptingConnectionHandle();
+  int getPeerAddr(uint16_t connectionHandle, uint8_t peerAddr[]);
+  int getPeerAddrWithType(uint16_t connectionHandle, uint8_t peerAddr[]);
+  int setPeerIOCap(uint16_t connectionHandle, uint8_t IOCap[]);
+  int getPeerIOCap(uint16_t connectionHandle, uint8_t IOCap[]);
+  uint8_t holdBuffer[64];
+  uint8_t holdBufferSize;
 private:
   void error(uint16_t connectionHandle, uint8_t dlen, uint8_t data[]);
   void mtuReq(uint16_t connectionHandle, uint8_t dlen, uint8_t data[]);
@@ -119,6 +138,8 @@ class ATTClass {
     uint8_t address[6];
     uint16_t mtu;
     BLERemoteDevice* device;
+    uint8_t encryption;
+    uint8_t IOCap[3];
   } _peers[ATT_MAX_PEERS];
 
   volatile bool _cnf;
diff --git a/src/utility/HCI.cpp b/src/utility/HCI.cpp
index 0234803f..f95baaa7 100644
--- a/src/utility/HCI.cpp
+++ b/src/utility/HCI.cpp
@@ -21,27 +21,25 @@
 #include "GAP.h"
 #include "HCITransport.h"
 #include "L2CAPSignaling.h"
-
+#include "btct.h"
 #include "HCI.h"
 
-#define HCI_COMMAND_PKT 0x01
-#define HCI_ACLDATA_PKT 0x02
-#define HCI_EVENT_PKT   0x04
+#define HCI_COMMAND_PKT   0x01
+#define HCI_ACLDATA_PKT   0x02
+#define HCI_EVENT_PKT     0x04
+#define HCI_SECURITY_PKT  0x06
 
-#define EVT_DISCONN_COMPLETE 0x05
-#define EVT_CMD_COMPLETE     0xe
-#define EVT_CMD_STATUS       0x0f
-#define EVT_NUM_COMP_PKTS    0x13
-#define EVT_LE_META_EVENT    0x3e
+#define EVT_DISCONN_COMPLETE  0x05
+#define EVT_ENCRYPTION_CHANGE 0x08
+#define EVT_CMD_COMPLETE      0x0e
+#define EVT_CMD_STATUS        0x0f
+#define EVT_NUM_COMP_PKTS     0x13
+#define EVT_UNKNOWN           0x10
+#define EVT_LE_META_EVENT     0x3e
 
 #define EVT_LE_CONN_COMPLETE      0x01
 #define EVT_LE_ADVERTISING_REPORT 0x02
 
-#define OGF_LINK_CTL           0x01
-#define OGF_HOST_CTL           0x03
-#define OGF_INFO_PARAM         0x04
-#define OGF_STATUS_PARAM       0x05
-#define OGF_LE_CTL             0x08
 
 // OGF_LINK_CTL
 #define OCF_DISCONNECT         0x0006
@@ -72,6 +70,29 @@
 
 #define HCI_OE_USER_ENDED_CONNECTION 0x13
 
+String metaEventToString(LE_META_EVENT event)
+{
+  switch(event){
+    case CONN_COMPLETE: return F("CONN_COMPLETE");
+    case ADVERTISING_REPORT: return F("ADVERTISING_REPORT");
+    case LONG_TERM_KEY_REQUEST: return F("LE_LONG_TERM_KEY_REQUEST");
+    case READ_LOCAL_P256_COMPLETE: return F("READ_LOCAL_P256_COMPLETE");
+    case GENERATE_DH_KEY_COMPLETE: return F("GENERATE_DH_KEY_COMPLETE");
+    default: return "event unknown";
+  }
+}
+String commandToString(LE_COMMAND command){
+  switch (command)
+  {
+    case ENCRYPT: return F("ENCRYPT");
+    case LONG_TERM_KEY_REPLY: return F("LONG_TERM_KEY_REPLY");
+    case READ_LOCAL_P256: return F("READ_LOCAL_P256");
+    case GENERATE_DH_KEY_V1: return F("GENERATE_DH_KEY_V1");
+    case GENERATE_DH_KEY_V2: return F("GENERATE_DH_KEY_V2");
+    default: return "UNKNOWN";
+  }
+}
+
 HCIClass::HCIClass() :
   _debug(NULL),
   _recvIndex(0),
@@ -203,6 +224,17 @@ int HCIClass::readBdAddr(uint8_t addr[6])
   return result;
 }
 
+int HCIClass::readBdAddr(){
+  uint8_t response[6];
+  int result = readBdAddr(response);
+  if(result==0){
+    for(int i=0; i<6; i++){
+      localAddr[5-i] = _cmdResponse[i];
+    }
+  }
+  return result;
+}
+
 int HCIClass::readRssi(uint16_t handle)
 {
   int result = sendCommand(OGF_STATUS_PARAM << 10 | OCF_READ_RSSI, sizeof(handle), &handle);
@@ -226,6 +258,11 @@ int HCIClass::setEventMask(uint64_t eventMask)
 {
   return sendCommand(OGF_HOST_CTL << 10 | OCF_SET_EVENT_MASK, sizeof(eventMask), &eventMask);
 }
+// Set LE Event mask
+int HCIClass::setLeEventMask(uint64_t leEventMask)
+{
+  return sendCommand(OGF_LE_CTL << 10 | 0x01, sizeof(leEventMask), &leEventMask);
+}
 
 int HCIClass::readLeBufferSize(uint16_t& pktLen, uint8_t& maxPkt)
 {
@@ -434,6 +471,14 @@ int HCIClass::sendAclPkt(uint16_t handle, uint8_t cid, uint8_t plen, void* data)
   if (_debug) {
     dumpPkt("HCI ACLDATA TX -> ", sizeof(aclHdr) + plen, txBuffer);
   }
+#ifdef _BLE_TRACE_
+  Serial.print("Data tx -> ");
+  for(int i=0; i< sizeof(aclHdr) + plen;i++){
+    Serial.print(" 0x");
+    Serial.print(txBuffer[i],HEX);
+  }
+  Serial.println(".");
+#endif
 
   _pendingPkt++;
   HCITransport.write(txBuffer, sizeof(aclHdr) + plen);
@@ -476,7 +521,15 @@ int HCIClass::sendCommand(uint16_t opcode, uint8_t plen, void* parameters)
   if (_debug) {
     dumpPkt("HCI COMMAND TX -> ", sizeof(pktHdr) + plen, txBuffer);
   }
-
+#ifdef _BLE_TRACE_
+  Serial.print("Command tx -> ");
+  for(int i=0; i< sizeof(pktHdr) + plen;i++){
+    Serial.print(" 0x");
+    Serial.print(txBuffer[i],HEX);
+    
+  }
+  Serial.println("");
+#endif
   HCITransport.write(txBuffer, sizeof(pktHdr) + plen);
 
   _cmdCompleteOpcode = 0xffff;
@@ -498,6 +551,9 @@ void HCIClass::handleAclDataPkt(uint8_t /*plen*/, uint8_t pdata[])
     uint16_t cid;
   } *aclHdr = (HCIACLHdr*)pdata;
 
+#ifdef _BLE_TRACE_
+  Serial.println("Received data");
+#endif
   uint16_t aclFlags = (aclHdr->handle & 0xf000) >> 12;
 
   if ((aclHdr->dlen - 4) != aclHdr->len) {
@@ -530,8 +586,18 @@ void HCIClass::handleAclDataPkt(uint8_t /*plen*/, uint8_t pdata[])
       ATT.handleData(aclHdr->handle & 0x0fff, aclHdr->len, &_recvBuffer[1 + sizeof(HCIACLHdr)]);
     }
   } else if (aclHdr->cid == SIGNALING_CID) {
+#ifdef _BLE_TRACE_
+    Serial.println("Signalling");
+#endif
     L2CAPSignaling.handleData(aclHdr->handle & 0x0fff, aclHdr->len, &_recvBuffer[1 + sizeof(HCIACLHdr)]);
-  } else {
+  } else if (aclHdr->cid == SECURITY_CID){
+    // Security manager
+#ifdef _BLE_TRACE_
+    Serial.println("Security data");
+#endif
+    L2CAPSignaling.handleSecurityData(aclHdr->handle & 0x0fff, aclHdr->len, &_recvBuffer[1 + sizeof(HCIACLHdr)]);
+
+  }else {
     struct __attribute__ ((packed)) {
       uint8_t op;
       uint8_t id;
@@ -540,6 +606,10 @@ void HCIClass::handleAclDataPkt(uint8_t /*plen*/, uint8_t pdata[])
       uint16_t localCid;
       uint16_t remoteCid;
     } l2capRejectCid= { 0x01, 0x00, 0x006, 0x0002, aclHdr->cid, 0x0000 };
+#ifdef _BLE_TRACE_
+    Serial.print("rejecting packet cid: 0x");
+    Serial.println(aclHdr->cid,HEX);
+#endif
 
     sendAclPkt(aclHdr->handle & 0x0fff, 0x0005, sizeof(l2capRejectCid), &l2capRejectCid);
   }
@@ -560,8 +630,13 @@ void HCIClass::handleEventPkt(uint8_t /*plen*/, uint8_t pdata[])
     uint8_t evt;
     uint8_t plen;
   } *eventHdr = (HCIEventHdr*)pdata;
+#ifdef _BLE_TRACE_
+  Serial.print("HCI event: ");
+  Serial.println(eventHdr->evt, HEX);
+#endif
 
-  if (eventHdr->evt == EVT_DISCONN_COMPLETE) {
+  if (eventHdr->evt == EVT_DISCONN_COMPLETE)
+  {
     struct __attribute__ ((packed)) DisconnComplete {
       uint8_t status;
       uint16_t handle;
@@ -572,99 +647,447 @@ void HCIClass::handleEventPkt(uint8_t /*plen*/, uint8_t pdata[])
     L2CAPSignaling.removeConnection(disconnComplete->handle, disconnComplete->reason);
 
     HCI.leSetAdvertiseEnable(0x01);
-  } else if (eventHdr->evt == EVT_CMD_COMPLETE) {
+  }
+  else if (eventHdr->evt == EVT_ENCRYPTION_CHANGE)
+  {
+    struct __attribute__ ((packed)) EncryptionChange {
+      uint8_t status;
+      uint16_t connectionHandle;
+      uint8_t enabled;
+    } *encryptionChange = (EncryptionChange*)&pdata[sizeof(HCIEventHdr)];
+#ifdef _BLE_TRACE_
+    Serial.println("[Info] Encryption changed");
+    Serial.print("status : ");
+    btct.printBytes(&encryptionChange->status,1);
+    Serial.print("handle : ");
+    btct.printBytes((uint8_t*)&encryptionChange->connectionHandle,2);
+    Serial.print("enabled: ");
+    btct.printBytes(&encryptionChange->enabled,1);
+#endif
+    if(encryptionChange->enabled>0){
+      ATT.setPeerEncryption(encryptionChange->connectionHandle, PEER_ENCRYPTION::ENCRYPTED_AES);
+    }else{
+      ATT.setPeerEncryption(encryptionChange->connectionHandle, PEER_ENCRYPTION::NO_ENCRYPTION);
+    }
+    if(ATT.holdBufferSize>0){
+      HCI.sendAclPkt(encryptionChange->connectionHandle, ATT_CID, ATT.holdBufferSize, ATT.holdBuffer);
+      ATT.holdBufferSize = 0;
+    }
+  }
+  else if (eventHdr->evt == EVT_CMD_COMPLETE)
+  {
     struct __attribute__ ((packed)) CmdComplete {
       uint8_t ncmd;
       uint16_t opcode;
       uint8_t status;
     } *cmdCompleteHeader = (CmdComplete*)&pdata[sizeof(HCIEventHdr)];
-
+#ifdef _BLE_TRACE_
+    Serial.print("E ncmd:   0x");
+    Serial.println(cmdCompleteHeader->ncmd,HEX);
+    Serial.print("E opcode: 0x");
+    Serial.println(cmdCompleteHeader->opcode, HEX);
+    Serial.print("E status: 0x");
+    Serial.println(cmdCompleteHeader->status, HEX);
+#endif
     _cmdCompleteOpcode = cmdCompleteHeader->opcode;
     _cmdCompleteStatus = cmdCompleteHeader->status;
     _cmdResponseLen = pdata[1] - sizeof(CmdComplete);
     _cmdResponse = &pdata[sizeof(HCIEventHdr) + sizeof(CmdComplete)];
 
-  } else if (eventHdr->evt == EVT_CMD_STATUS) {
+  }
+  else if (eventHdr->evt == EVT_CMD_STATUS)
+  {
     struct __attribute__ ((packed)) CmdStatus {
       uint8_t status;
       uint8_t ncmd;
       uint16_t opcode;
     } *cmdStatusHeader = (CmdStatus*)&pdata[sizeof(HCIEventHdr)];
 
+#ifdef _BLE_TRACE_
+    Serial.print("F n cmd:  0x");
+    Serial.println(cmdStatusHeader->ncmd, HEX);
+    Serial.print("F status: 0x");
+    Serial.println(cmdStatusHeader->status, HEX);
+    Serial.print("F opcode: 0x");
+    Serial.println(cmdStatusHeader->opcode, HEX);
+#endif
     _cmdCompleteOpcode = cmdStatusHeader->opcode;
     _cmdCompleteStatus = cmdStatusHeader->status;
     _cmdResponseLen = 0;
-  } else if (eventHdr->evt == EVT_NUM_COMP_PKTS) {
+  }
+  else if (eventHdr->evt == EVT_NUM_COMP_PKTS)
+  {
     uint8_t numHandles = pdata[sizeof(HCIEventHdr)];
     uint16_t* data = (uint16_t*)&pdata[sizeof(HCIEventHdr) + sizeof(numHandles)];
 
     for (uint8_t i = 0; i < numHandles; i++) {
       handleNumCompPkts(data[0], data[1]);
-
+#ifdef _BLE_TRACE_
+      Serial.print("Outstanding packets: ");
+      Serial.println(_pendingPkt);
+      Serial.print("Data[0]: 0x");
+      Serial.println(data[0]);
+      Serial.print("Data[1]: 0x");
+      Serial.println(data[1]);
+#endif
       data += 2;
     }
-  } else if (eventHdr->evt == EVT_LE_META_EVENT) {
+  }
+  else if(eventHdr->evt == 0x10)
+  {
+    struct __attribute__ ((packed)) CmdHardwareError {
+      uint8_t hardwareCode;
+    } *cmdHardwareError = (CmdHardwareError*)&pdata[sizeof(HCIEventHdr)];
+#ifdef _BLE_TRACE_
+    Serial.print("Bluetooth hardware error.");
+    Serial.print(" Code: 0x");
+    Serial.println(cmdHardwareError->hardwareCode, HEX);
+#endif
+  }
+  else if (eventHdr->evt == EVT_LE_META_EVENT)
+  {
     struct __attribute__ ((packed)) LeMetaEventHeader {
       uint8_t subevent;
     } *leMetaHeader = (LeMetaEventHeader*)&pdata[sizeof(HCIEventHdr)];
+#ifdef _BLE_TRACE_
+    Serial.print("\tSubEvent: 0x");
+    Serial.println(leMetaHeader->subevent,HEX);
+#endif
+    switch((LE_META_EVENT)leMetaHeader->subevent){
+      case CONN_COMPLETE:{
+        struct __attribute__ ((packed)) EvtLeConnectionComplete {
+          uint8_t status;
+          uint16_t handle;
+          uint8_t role;
+          uint8_t peerBdaddrType;
+          uint8_t peerBdaddr[6];
+          uint16_t interval;
+          uint16_t latency;
+          uint16_t supervisionTimeout;
+          uint8_t masterClockAccuracy;
+        } *leConnectionComplete = (EvtLeConnectionComplete*)&pdata[sizeof(HCIEventHdr) + sizeof(LeMetaEventHeader)];
+      
+        if (leConnectionComplete->status == 0x00) {
+          ATT.addConnection(leConnectionComplete->handle,
+                            leConnectionComplete->role,
+                            leConnectionComplete->peerBdaddrType,
+                            leConnectionComplete->peerBdaddr,
+                            leConnectionComplete->interval,
+                            leConnectionComplete->latency,
+                            leConnectionComplete->supervisionTimeout,
+                            leConnectionComplete->masterClockAccuracy);
+
+          L2CAPSignaling.addConnection(leConnectionComplete->handle,
+                                leConnectionComplete->role,
+                                leConnectionComplete->peerBdaddrType,
+                                leConnectionComplete->peerBdaddr,
+                                leConnectionComplete->interval,
+                                leConnectionComplete->latency,
+                                leConnectionComplete->supervisionTimeout,
+                                leConnectionComplete->masterClockAccuracy);
+        }
+        break;
+      }
+      case ADVERTISING_REPORT:{
+        struct __attribute__ ((packed)) EvtLeAdvertisingReport {
+          uint8_t status;
+          uint8_t type;
+          uint8_t peerBdaddrType;
+          uint8_t peerBdaddr[6];
+          uint8_t eirLength;
+          uint8_t eirData[31];
+        } *leAdvertisingReport = (EvtLeAdvertisingReport*)&pdata[sizeof(HCIEventHdr) + sizeof(LeMetaEventHeader)];
+
+        if (leAdvertisingReport->status == 0x01) {
+          // last byte is RSSI
+          int8_t rssi = leAdvertisingReport->eirData[leAdvertisingReport->eirLength];
+
+          GAP.handleLeAdvertisingReport(leAdvertisingReport->type,
+                                        leAdvertisingReport->peerBdaddrType,
+                                        leAdvertisingReport->peerBdaddr,
+                                        leAdvertisingReport->eirLength,
+                                        leAdvertisingReport->eirData,
+                                        rssi);
+        }
+        break;
+      }
+      case LONG_TERM_KEY_REQUEST:
+      {
+        struct __attribute__ ((packed)) LTKRequest
+        {
+          uint8_t subEventCode;
+          uint16_t connectionHandle;
+          uint8_t randomNumber[8];
+          uint8_t encryptedDiversifier[2];
+        } *ltkRequest = (LTKRequest*)&pdata[sizeof(HCIEventHdr)];
+#ifdef _BLE_TRACE_
+        Serial.println("LTK request received");
+        Serial.print("Connection Handle: ");
+        btct.printBytes((uint8_t*)&ltkRequest->connectionHandle,2);
+        Serial.print("Random Number    : ");
+        btct.printBytes(ltkRequest->randomNumber,8);
+        Serial.print("EDIV           : ");
+        btct.printBytes(ltkRequest->encryptedDiversifier,2);
+#endif
 
-    if (leMetaHeader->subevent == EVT_LE_CONN_COMPLETE) {
-      struct __attribute__ ((packed)) EvtLeConnectionComplete {
-        uint8_t status;
-        uint16_t handle;
-        uint8_t role;
-        uint8_t peerBdaddrType;
-        uint8_t peerBdaddr[6];
-        uint16_t interval;
-        uint16_t latency;
-        uint16_t supervisionTimeout;
-        uint8_t masterClockAccuracy;
-      } *leConnectionComplete = (EvtLeConnectionComplete*)&pdata[sizeof(HCIEventHdr) + sizeof(LeMetaEventHeader)];
-    
-      if (leConnectionComplete->status == 0x00) {
-        ATT.addConnection(leConnectionComplete->handle,
-                          leConnectionComplete->role,
-                          leConnectionComplete->peerBdaddrType,
-                          leConnectionComplete->peerBdaddr,
-                          leConnectionComplete->interval,
-                          leConnectionComplete->latency,
-                          leConnectionComplete->supervisionTimeout,
-                          leConnectionComplete->masterClockAccuracy);
-
-        L2CAPSignaling.addConnection(leConnectionComplete->handle,
-                              leConnectionComplete->role,
-                              leConnectionComplete->peerBdaddrType,
-                              leConnectionComplete->peerBdaddr,
-                              leConnectionComplete->interval,
-                              leConnectionComplete->latency,
-                              leConnectionComplete->supervisionTimeout,
-                              leConnectionComplete->masterClockAccuracy);
+        // Send our LTK back
+        struct __attribute__ ((packed)) LTKReply
+        {
+          uint16_t connectionHandle;
+          uint8_t LTK[16];
+        } ltkReply = {0,0};
+        ltkReply.connectionHandle = ATT.getPeerEncrptingConnectionHandle();
+        for(int i=0; i<16; i++) ltkReply.LTK[15-i] = HCI.LTK[i];
+        int result = sendCommand(OGF_LE_CTL << 10 | LE_COMMAND::LONG_TERM_KEY_REPLY,sizeof(ltkReply), &ltkReply);
+
+#ifdef _BLE_TRACE_
+        Serial.println("Sending LTK as: ");
+        btct.printBytes(ltkReply.LTK,16);
+#endif
+
+        if(result == 0){
+          struct __attribute__ ((packed)) LTKReplyResult
+          {
+            uint8_t status;
+            uint16_t connectionHandle;
+          } ltkReplyResult = {0,0};
+          memcpy(&ltkReplyResult, _cmdResponse, 3);
+
+#ifdef _BLE_TRACE_
+          Serial.println("LTK send success");
+          Serial.print("status     : ");
+          btct.printBytes(&ltkReplyResult.status,1);
+          Serial.print("Conn Handle: ");
+          btct.printBytes((uint8_t*)&ltkReplyResult.connectionHandle,2);
+#endif
+        }else{
+#ifdef _BLE_TRACE_
+          Serial.print("Failed to send LTK...: ");
+          btct.printBytes((uint8_t*)&result,2);
+#endif
+        }
+        break;
       }
-    } else if (leMetaHeader->subevent == EVT_LE_ADVERTISING_REPORT) {
-      struct __attribute__ ((packed)) EvtLeAdvertisingReport {
-        uint8_t status;
-        uint8_t type;
-        uint8_t peerBdaddrType;
-        uint8_t peerBdaddr[6];
-        uint8_t eirLength;
-        uint8_t eirData[31];
-      } *leAdvertisingReport = (EvtLeAdvertisingReport*)&pdata[sizeof(HCIEventHdr) + sizeof(LeMetaEventHeader)];
-
-      if (leAdvertisingReport->status == 0x01) {
-        // last byte is RSSI
-        int8_t rssi = leAdvertisingReport->eirData[leAdvertisingReport->eirLength];
-
-        GAP.handleLeAdvertisingReport(leAdvertisingReport->type,
-                                      leAdvertisingReport->peerBdaddrType,
-                                      leAdvertisingReport->peerBdaddr,
-                                      leAdvertisingReport->eirLength,
-                                      leAdvertisingReport->eirData,
-                                      rssi);
+      case REMOTE_CONN_PARAM_REQ:
+      {
+        struct __attribute__ ((packed)) RemoteConnParamReq {
+          uint8_t subEventCode;
+          uint16_t connectionHandle;
+          uint16_t intervalMin;
+          uint16_t intervalMax;
+          uint16_t latency;
+          uint16_t timeOut;
+        } *remoteConnParamReq = (RemoteConnParamReq*)&pdata[sizeof(HCIEventHdr)];
+#ifdef _BLE_TRACE_
+        Serial.println("--- Remtoe conn param req");
+        Serial.print("Handle      : ");
+        btct.printBytes((uint8_t*)&remoteConnParamReq->connectionHandle,2);
+        Serial.print("Interval min: ");
+        btct.printBytes((uint8_t*)&remoteConnParamReq->intervalMin,2);
+        Serial.print("Interval max: ");
+        btct.printBytes((uint8_t*)&remoteConnParamReq->intervalMax,2);
+        Serial.print("Latency     : ");
+        btct.printBytes((uint8_t*)&remoteConnParamReq->latency,2);
+        Serial.print("Timeout     : ");
+        btct.printBytes((uint8_t*)&remoteConnParamReq->timeOut,2);
+#endif
+        
+        struct __attribute__ ((packed)) RemoteConnParamReqReply {
+          uint16_t connectionHandle;
+          uint16_t intervalMin;
+          uint16_t intervalMax;
+          uint16_t latency;
+          uint16_t timeOut;
+          uint16_t minLength;
+          uint16_t maxLength;
+        } remoteConnParamReqReply;
+        memcpy(&remoteConnParamReqReply, &remoteConnParamReq->connectionHandle, sizeof(remoteConnParamReq-1));
+        remoteConnParamReqReply.minLength = 0x000F;
+        remoteConnParamReqReply.maxLength = 0x0FFF;
+        sendCommand(OGF_LE_CTL << 10 | 0x20, sizeof(remoteConnParamReqReply), &remoteConnParamReqReply);
+        break;
+      }
+      case READ_LOCAL_P256_COMPLETE:
+      {
+        struct __attribute__ ((packed)) EvtReadLocalP256Complete{
+          uint8_t subEventCode;
+          uint8_t status;
+          uint8_t localPublicKey[64];
+        } *evtReadLocalP256Complete = (EvtReadLocalP256Complete*)&pdata[sizeof(HCIEventHdr)];
+        if(evtReadLocalP256Complete->status == 0x0){
+#ifdef _BLE_TRACE_
+          Serial.println("Key read success");
+#endif
+          struct __attribute__ ((packed)) PairingPublicKey
+          {
+            uint8_t code;
+            uint8_t publicKey[64];
+          } pairingPublicKey = {CONNECTION_PAIRING_PUBLIC_KEY,0};
+          memcpy(pairingPublicKey.publicKey,evtReadLocalP256Complete->localPublicKey,64);
+
+          // Send the local public key to the remote
+          uint16_t connectionHandle = ATT.getPeerEncrptingConnectionHandle();
+          if(connectionHandle>ATT_MAX_PEERS){
+#ifdef _BLE_TRACE_
+            Serial.println("failed to find connection handle");
+#endif
+            break;
+          }
+          HCI.sendAclPkt(connectionHandle,SECURITY_CID,sizeof(PairingPublicKey),&pairingPublicKey);
+          uint8_t encryption = ATT.getPeerEncryption(connectionHandle) | PEER_ENCRYPTION::SENT_PUBKEY;
+          ATT.setPeerEncryption(connectionHandle, encryption);
+          
+
+          uint8_t Z = 0;
+          for(int i=0; i<16; i++){
+            Nb[i] = rand(); //// Should use ESP or ECCx08
+          }
+#ifdef _BLE_TRACE_
+          Serial.print("nb: ");
+          btct.printBytes(Nb, 16);
+#endif
+          struct __attribute__ ((packed)) F4Params
+          {
+            uint8_t U[32];
+            uint8_t V[32];
+            uint8_t Z;
+          } f4Params = {0,0,Z};
+          for(int i=0; i<32; i++){
+            f4Params.U[31-i] = pairingPublicKey.publicKey[i]; 
+            f4Params.V[31-i] = HCI.remotePublicKeyBuffer[i];
+          }
+          
+          struct __attribute__ ((packed)) PairingConfirm
+          {
+            uint8_t code;
+            uint8_t cb[16];
+          } pairingConfirm = {CONNECTION_PAIRING_CONFIRM,0};
+          
+          btct.AES_CMAC(Nb,(unsigned char *)&f4Params,sizeof(f4Params),pairingConfirm.cb);
+
+#ifdef _BLE_TRACE_
+          Serial.print("cb: ");
+          btct.printBytes(pairingConfirm.cb, 16);
+#endif
 
+          uint8_t cb_temp[sizeof(pairingConfirm.cb)];
+          for(int i=0; i<sizeof(pairingConfirm.cb);i++){
+            cb_temp[sizeof(pairingConfirm.cb)-1-i] = pairingConfirm.cb[i];
+          }
+          /// cb wa back to front.
+          memcpy(pairingConfirm.cb,cb_temp,sizeof(pairingConfirm.cb));
+
+          // Send Pairing confirm response
+          HCI.sendAclPkt(connectionHandle, SECURITY_CID, sizeof(pairingConfirm), &pairingConfirm);
+          // Start calculating DH Key 
+          uint8_t remotePublicKeyReversed[sizeof(HCI.remotePublicKeyBuffer)];
+          for(int i=0; i<sizeof(HCI.remotePublicKeyBuffer); i++){
+            remotePublicKeyReversed[sizeof(HCI.remotePublicKeyBuffer)-i] = HCI.remotePublicKeyBuffer[i];
+          }
+          
+          HCI.sendCommand( (OGF_LE_CTL << 10) | LE_COMMAND::GENERATE_DH_KEY_V1, sizeof(HCI.remotePublicKeyBuffer), HCI.remotePublicKeyBuffer);
+        }else{
+#ifdef _BLE_TRACE_
+          Serial.print("Key read error: 0x");
+          Serial.println(evtReadLocalP256Complete->status,HEX);
+          for(int i=0; i<64; i++){
+            Serial.print(" 0x");
+            Serial.print(evtReadLocalP256Complete->localPublicKey[i],HEX);
+          }
+          Serial.println(".");
+#endif
+        }
+        break;
+      }
+      case GENERATE_DH_KEY_COMPLETE:
+      {
+        struct __attribute__ ((packed)) EvtLeDHKeyComplete{
+          uint8_t subEventCode;
+          uint8_t status;
+          uint8_t DHKey[32];
+        } *evtLeDHKeyComplete = (EvtLeDHKeyComplete*)&pdata[sizeof(HCIEventHdr)];
+        if(evtLeDHKeyComplete->status == 0x0){
+#ifdef _BLE_TRACE_
+          Serial.println("DH key generated");
+#endif
+          uint16_t connectionHandle = ATT.getPeerEncrptingConnectionHandle();
+          if(connectionHandle>ATT_MAX_PEERS){
+#ifdef _BLE_TRACE_
+            Serial.println("Failed to find connection handle DH key check");
+#endif
+            break;
+          }
+          
+          uint8_t encryption = ATT.getPeerEncryption(connectionHandle);
+          
+          for(int i=0; i<32; i++) DHKey[31-i] = evtLeDHKeyComplete->DHKey[i];
+
+#ifdef _BLE_TRACE_
+          Serial.println("Stored our DHKey:");
+          btct.printBytes(DHKey,32);
+#endif
+          encryption |= PEER_ENCRYPTION::DH_KEY_CALULATED;
+          ATT.setPeerEncryption(connectionHandle, encryption);
+#ifdef _BLE_TRACE_
+          if(encryption | PEER_ENCRYPTION::RECEIVED_DH_CHECK){
+            Serial.println("Recieved DHKey check already so calculate f5, f6.");
+          }else{
+            Serial.println("Waiting on other DHKey check before calculating.");
+          }
+        }else{
+          Serial.print("Key generation error: 0x");
+          Serial.println(evtLeDHKeyComplete->status, HEX);
+#endif
+        }
+        break;
+      }
+      default:
+      {
+#ifdef _BLE_TRACE_
+        Serial.println("[Info] Unhandled meta event");
+#endif
       }
     }
+  }else{
+#ifdef _BLE_TRACE_
+    Serial.println("[Info] Unhandled event");
+#endif
   }
 }
+int HCIClass::leEncrypt(uint8_t* key, uint8_t* plaintext, uint8_t* status, uint8_t* ciphertext){
+  struct __attribute__ ((packed)) LeEncryptCommand
+  {
+    uint8_t key[16];
+    uint8_t plaintext[16];
+  } leEncryptCommand = {0,0};
+  for(int i=0; i<16; i++){
+    leEncryptCommand.key[15-i] = key[i];
+    leEncryptCommand.plaintext[15-i] = plaintext[i];
+  }
+  
+  int res = sendCommand(OGF_LE_CTL << 10 | LE_COMMAND::ENCRYPT, sizeof(leEncryptCommand), &leEncryptCommand);
+  if(res == 0){
+#ifdef _BLE_TRACE_
+    Serial.print("Copying from command Response length: ");
+    Serial.println(_cmdResponseLen);
+    Serial.println(".");
+    for(int i=0; i<20; i++){
+        Serial.print(" 0x");
+        Serial.print(_cmdResponse[i],HEX);
+    }
+    Serial.println(".");
+#endif
+    for(int i=0; i<16; i++){
+      ciphertext[15-i] = _cmdResponse[i];
+    }
+    return 1;
+  }
+#ifdef _BLE_TRACE_
+  Serial.print("Error with AES: 0x");
+  Serial.println(res, HEX);
+#endif
+  return res;
+}
 
 void HCIClass::dumpPkt(const char* prefix, uint8_t plen, uint8_t pdata[])
 {
diff --git a/src/utility/HCI.h b/src/utility/HCI.h
index 86ec679c..c58b7572 100644
--- a/src/utility/HCI.h
+++ b/src/utility/HCI.h
@@ -22,6 +22,30 @@
 
 #include <Arduino.h>
 
+#define OGF_LINK_CTL           0x01
+#define OGF_HOST_CTL           0x03
+#define OGF_INFO_PARAM         0x04
+#define OGF_STATUS_PARAM       0x05
+#define OGF_LE_CTL             0x08
+
+enum LE_COMMAND {
+  ENCRYPT             = 0x0017,
+  LONG_TERM_KEY_REPLY = 0x001A,
+  READ_LOCAL_P256     = 0x0025,
+  GENERATE_DH_KEY_V1  = 0x0026,
+  GENERATE_DH_KEY_V2  = 0x005E
+};
+enum LE_META_EVENT {
+  CONN_COMPLETE             = 0x01,
+  ADVERTISING_REPORT        = 0x02,
+  LONG_TERM_KEY_REQUEST     = 0x05,
+  REMOTE_CONN_PARAM_REQ     = 0x06,
+  READ_LOCAL_P256_COMPLETE  = 0x08,
+  GENERATE_DH_KEY_COMPLETE  = 0x09
+};
+String metaEventToString(LE_META_EVENT event);
+String commandToString(LE_COMMAND command);
+
 class HCIClass {
 public:
   HCIClass();
@@ -37,10 +61,12 @@ class HCIClass {
   int readLocalVersion(uint8_t& hciVer, uint16_t& hciRev, uint8_t& lmpVer,
                        uint16_t& manufacturer, uint16_t& lmpSubVer);
   int readBdAddr(uint8_t addr[6]);
+  int readBdAddr();
 
   int readRssi(uint16_t handle);
 
   int setEventMask(uint64_t eventMask);
+  int setLeEventMask(uint64_t leEventMask);
 
   int readLeBufferSize(uint16_t& pktLen, uint8_t& maxPkt);
   int leSetRandomAddress(uint8_t addr[6]);
@@ -62,7 +88,7 @@ class HCIClass {
   int leConnUpdate(uint16_t handle, uint16_t minInterval, uint16_t maxInterval, 
                   uint16_t latency, uint16_t supervisionTimeout);
   int leCancelConn();
-
+  int leEncrypt(uint8_t* Key, uint8_t* plaintext, uint8_t* status, uint8_t* ciphertext);
 
   int sendAclPkt(uint16_t handle, uint8_t cid, uint8_t plen, void* data);
 
@@ -71,8 +97,15 @@ class HCIClass {
   void debug(Stream& stream);
   void noDebug();
 
-private:
+  // TODO: Send command be private again & use ATT implementation within ATT.
   int sendCommand(uint16_t opcode, uint8_t plen = 0, void* parameters = NULL);
+  uint8_t remotePublicKeyBuffer[64];
+  uint8_t Na[16];
+  uint8_t Nb[16];
+  uint8_t DHKey[32];
+  uint8_t localAddr[6];
+  uint8_t LTK[16];
+private:
 
   void handleAclDataPkt(uint8_t plen, uint8_t pdata[]);
   void handleNumCompPkts(uint16_t handle, uint16_t numPkts);
diff --git a/src/utility/L2CAPSignaling.cpp b/src/utility/L2CAPSignaling.cpp
index f650cab2..45208514 100644
--- a/src/utility/L2CAPSignaling.cpp
+++ b/src/utility/L2CAPSignaling.cpp
@@ -18,7 +18,8 @@
 */
 
 #include "HCI.h"
-
+#include "ATT.h"
+#include "btct.h"
 #include "L2CAPSignaling.h"
 
 #define CONNECTION_PARAMETER_UPDATE_REQUEST  0x12
@@ -97,6 +98,207 @@ void L2CAPSignalingClass::handleData(uint16_t connectionHandle, uint8_t dlen, ui
     connectionParameterUpdateResponse(connectionHandle, identifier, length, data);
   }
 }
+void L2CAPSignalingClass::handleSecurityData(uint16_t connectionHandle, uint8_t dlen, uint8_t data[])
+{
+  struct __attribute__ ((packed)) L2CAPSignalingHdr {
+    uint8_t code;
+    uint8_t data[64];
+  } *l2capSignalingHdr = (L2CAPSignalingHdr*)data;
+#ifdef _BLE_TRACE_
+  Serial.print("dlen: ");
+  Serial.println(dlen);
+#endif
+  uint8_t code = l2capSignalingHdr->code;
+
+#ifdef _BLE_TRACE_
+  Serial.print("handleSecurityData: code: 0x");
+  Serial.println(code, HEX);
+  Serial.print("rx security:");
+  btct.printBytes(data,dlen);
+#endif
+  if (code == CONNECTION_PAIRING_REQUEST) {
+    // 0x1
+    struct __attribute__ ((packed)) PairingRequest {
+      uint8_t ioCapability;
+      uint8_t oobDataFlag;
+      uint8_t authReq;
+      uint8_t maxEncSize;
+      uint8_t initiatorKeyDistribution;
+      uint8_t responderKeyDistribution;
+    } *pairingRequest = (PairingRequest*)l2capSignalingHdr->data;
+    
+    uint8_t peerIOCap[3];
+    peerIOCap[0] = pairingRequest->authReq;
+    peerIOCap[1] = pairingRequest->oobDataFlag;
+    peerIOCap[2] = pairingRequest->ioCapability;
+    ATT.setPeerIOCap(connectionHandle, peerIOCap);
+
+    struct __attribute__ ((packed)) PairingResponse {
+      uint8_t code;
+      uint8_t ioCapability;
+      uint8_t oobDataFlag;
+      uint8_t authReq;
+      uint8_t maxEncSize;
+      uint8_t initiatorKeyDistribution;
+      uint8_t responderKeyDistribution;
+    } response = { CONNECTION_PAIRING_RESPONSE, LOCAL_IOCAP, 0, LOCAL_AUTHREQ, 0x10, 0b1011, 0b1011};
+
+    HCI.sendAclPkt(connectionHandle, 0x06, sizeof(response), &response);
+  }
+  else if (code == CONNECTION_PAIRING_RANDOM)
+  {
+    struct __attribute__ ((packed)) PairingRandom {
+      uint8_t Na[16];
+    } *pairingRandom = (PairingRandom*)l2capSignalingHdr->data;
+    for(int i=0; i<16; i++){
+      HCI.Na[15-i] = pairingRandom->Na[i];
+    }
+#ifdef _BLE_TRACE_
+    Serial.println("[Info] Pairing random.");
+#endif
+    struct __attribute__ ((packed)) PairingResponse {
+      uint8_t code;
+      uint8_t Nb[16];
+    } response = { CONNECTION_PAIRING_RANDOM, 0};
+    for(int i=0; i< 16; i++) response.Nb[15-i] = HCI.Nb[i];
+
+    HCI.sendAclPkt(connectionHandle, 0x06, sizeof(response), &response);
+  }
+  else if (code == CONNECTION_PAIRING_RESPONSE)
+  {
+  }
+  else if(code == CONNECTION_PAIRING_FAILED)
+  {
+    struct __attribute__ ((packed)) PairingFailed
+    {
+      uint8_t code;
+      uint8_t reason;
+    } *pairingFailed = (PairingFailed*)data;
+#ifdef _BLE_TRACE_
+    Serial.print("Pairing failed with code: 0x");
+    Serial.println(pairingFailed->reason,HEX);
+#endif
+  }
+  else if (code == CONNECTION_PAIRING_PUBLIC_KEY){
+    /// Received a public key
+    struct __attribute__ ((packed)) ConnectionPairingPublicKey {
+      uint8_t x[32];
+      uint8_t y[32];
+    } *connectionPairingPublicKey = (ConnectionPairingPublicKey*)l2capSignalingHdr->data;
+    struct __attribute__ ((packed)) GenerateDHKeyCommand {
+      uint8_t x[32];
+      uint8_t y[32];
+    } generateDHKeyCommand = {
+      0x00,
+      0x00,
+    };
+    memcpy(generateDHKeyCommand.x,connectionPairingPublicKey->x,32);
+    memcpy(generateDHKeyCommand.y,connectionPairingPublicKey->y,32);
+    struct __attribute__ ((packed)) ReadPublicKeyCommand {
+      uint8_t code;
+    } readPublicKeyCommand = {
+      LE_COMMAND::READ_LOCAL_P256,
+    };
+
+    if(ATT.setPeerEncryption(connectionHandle,PEER_ENCRYPTION::REQUESTED_ENCRYPTION)){
+#ifdef _BLE_TRACE_
+      Serial.println("[Info] Pairing public key");
+      Serial.println("Requested encryption stored.");
+#endif
+    }else{
+#ifdef _BLE_TRACE_
+      Serial.println("[Info] Pairing public key");
+      Serial.print("Failed to store encryption request with handle: 0x");
+      Serial.println(connectionHandle,HEX);
+#endif
+    }
+    
+    memcpy(HCI.remotePublicKeyBuffer,&generateDHKeyCommand,sizeof(generateDHKeyCommand));
+    HCI.sendCommand( (OGF_LE_CTL << 10 )| LE_COMMAND::READ_LOCAL_P256, 0);
+  }
+  else if(code == CONNECTION_PAIRING_DHKEY_CHECK)
+  {
+    uint8_t RemoteDHKeyCheck[16];
+    uint8_t BD_ADDR_REMOTE[7];
+    ATT.getPeerAddrWithType(connectionHandle, BD_ADDR_REMOTE);
+    for(int i=0; i<16; i++) RemoteDHKeyCheck[15-i] = l2capSignalingHdr->data[i];
+    uint8_t encryptionState = ATT.getPeerEncryption(connectionHandle) | PEER_ENCRYPTION::RECEIVED_DH_CHECK;
+
+
+#ifdef _BLE_TRACE_
+    Serial.println("[Info] DH Key check");
+    Serial.print("Remote DHKey Check: ");
+    btct.printBytes(RemoteDHKeyCheck, 16);
+#endif
+
+    HCI.readBdAddr();
+    ATT.setPeerEncryption(connectionHandle, encryptionState);
+    if(encryptionState & PEER_ENCRYPTION::DH_KEY_CALULATED > 0){
+      // We've already calculated the DHKey so we can calculate our check and send it.
+      
+      uint8_t MacKey[16];
+      uint8_t localAddress[7];
+      
+      memcpy(&localAddress[1],HCI.localAddr,6);
+      localAddress[0] = 0; // IOT 33 uses a static address
+
+      btct.f5(HCI.DHKey,HCI.Na,HCI.Nb,BD_ADDR_REMOTE,localAddress,MacKey,HCI.LTK);
+
+      uint8_t Ea[16];
+      uint8_t Eb[16];
+      uint8_t R[16];
+      uint8_t MasterIOCap[3];
+      uint8_t SlaveIOCap[3] = {LOCAL_AUTHREQ, 0x0, LOCAL_IOCAP};
+      
+      ATT.getPeerIOCap(connectionHandle, MasterIOCap);
+      for(int i=0; i<16; i++) R[i] = 0;
+      
+      btct.f6(MacKey, HCI.Na,HCI.Nb,R, MasterIOCap, BD_ADDR_REMOTE, localAddress, Ea);
+      btct.f6(MacKey, HCI.Nb,HCI.Na,R, SlaveIOCap, localAddress, BD_ADDR_REMOTE, Eb);
+
+
+#ifdef _BLE_TRACE_
+      Serial.println("Calculate f5, f6:");
+      Serial.print("DH          : ");
+      btct.printBytes(HCI.DHKey,32);
+      Serial.println("Na        : ");
+      btct.printBytes(HCI.Na,16);
+      Serial.println("Nb        : ");
+      btct.printBytes(HCI.Nb,16);
+      Serial.print("MAC         : ");
+      btct.printBytes(MacKey,16);
+      // Serial.print("Expected MAC: ");
+      // printBytes(EXPECTED_MAC, 16);
+      Serial.print("LTK         : ");
+      btct.printBytes(HCI.LTK,16);
+      // Serial.print("Expected LTK: ");
+      // printBytes(EXPECTED_LTK, 16);
+      Serial.print("Expected Ex : ");
+      btct.printBytes(RemoteDHKeyCheck, 16);
+      Serial.print("Ea          : ");
+      btct.printBytes(Ea, 16);
+      Serial.print("Eb          : ");
+      btct.printBytes(Eb,16);
+      Serial.print("Local Addr  : ");
+      btct.printBytes(localAddress, 7);
+      Serial.print("LocalIOCap  : ");
+      btct.printBytes(SlaveIOCap, 3);
+      Serial.print("MasterAddr  : ");
+      btct.printBytes(BD_ADDR_REMOTE, 7);
+      Serial.print("MasterIOCAP : ");
+      btct.printBytes(MasterIOCap, 3);
+      Serial.println("Send Eb Back.");
+#endif
+
+      uint8_t ret[17];
+      ret[0] = 0x0d;
+      for(int i=0; i<sizeof(Eb); i++){
+        ret[sizeof(Eb)-i] = Eb[i];
+      }
+      HCI.sendAclPkt(connectionHandle, 0x06, sizeof(ret), ret );
+    }
+  }
+}
 
 void L2CAPSignalingClass::removeConnection(uint8_t /*handle*/, uint16_t /*reason*/)
 {
diff --git a/src/utility/L2CAPSignaling.h b/src/utility/L2CAPSignaling.h
index 349ffb85..0bda92fe 100644
--- a/src/utility/L2CAPSignaling.h
+++ b/src/utility/L2CAPSignaling.h
@@ -23,6 +23,26 @@
 #include <Arduino.h>
 
 #define SIGNALING_CID 0x0005
+#define SECURITY_CID 0x0006
+
+
+#define CONNECTION_PAIRING_REQUEST        0x01
+#define CONNECTION_PAIRING_RESPONSE       0x02
+#define CONNECTION_PAIRING_CONFIRM        0x03
+#define CONNECTION_PAIRING_RANDOM         0x04
+#define CONNECTION_PAIRING_FAILED         0x05
+#define CONNECTION_ENCRYPTION_INFORMATION 0x06
+#define CONNECTION_MASTER_IDENTIFICATION  0x07
+#define CONNECTION_IDENTITY_INFORMATION   0x08
+#define CONNECTION_IDENTITY_ADDRESS       0x09
+#define CONNECTION_SIGNING_INFORMATION    0x0A
+#define CONNECTION_SECURITY_REQUEST       0x0B
+#define CONNECTION_PAIRING_PUBLIC_KEY     0x0C
+#define CONNECTION_PAIRING_DHKEY_CHECK    0x0D
+#define CONNECTION_PAIRING_KEYPRESS       0x0E
+
+#define LOCAL_AUTHREQ 0b00101101
+#define LOCAL_IOCAP   0x3
 
 class L2CAPSignalingClass {
 public:
@@ -36,6 +56,8 @@ class L2CAPSignalingClass {
 
   void handleData(uint16_t connectionHandle, uint8_t dlen, uint8_t data[]);
 
+  void handleSecurityData(uint16_t connectionHandle, uint8_t dlen, uint8_t data[]);
+
   void removeConnection(uint8_t handle, uint16_t reason);
 
   void setConnectionInterval(uint16_t minInterval, uint16_t maxInterval);
diff --git a/src/utility/btct.cpp b/src/utility/btct.cpp
new file mode 100644
index 00000000..8fad5173
--- /dev/null
+++ b/src/utility/btct.cpp
@@ -0,0 +1,322 @@
+#include "btct.h"
+#include <Arduino.h>
+#include "HCI.h"
+#include "ArduinoBLE.h"
+BluetoothCryptoToolbox::BluetoothCryptoToolbox(){}
+//    In step 1, AES-128 with key K is applied to an all-zero input block.
+//    In step 2, K1 is derived through the following operation:
+//    If the most significant bit of L is equal to 0, K1 is the left-shift
+//    of L by 1 bit.
+//    Otherwise, K1 is the exclusive-OR of const_Rb and the left-shift of L
+//    by 1 bit.
+//    In step 3, K2 is derived through the following operation:
+//    If the most significant bit of K1 is equal to 0, K2 is the left-shift
+//    of K1 by 1 bit.
+//    Otherwise, K2 is the exclusive-OR of const_Rb and the left-shift of
+//    K1 by 1 bit.
+//    In step 4, (K1,K2) := Generate_Subkey(K) is returned.
+unsigned char const_Rb[16] = {
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x87
+  };
+
+#define DHKEY_LENGTH 32
+#define N_LEN 16
+#define ADDR_LEN 6
+#define LEN_LTK 16
+#define LEN_MAC_KEY 16
+
+void BluetoothCryptoToolbox::printBytes(uint8_t bytes[], uint8_t length){
+    for(int i=0; i<length; i++){
+        if(i>0){
+            Serial.print(", 0x");
+        }else{
+            Serial.print("0x");
+        }
+        Serial.print(bytes[i],HEX);
+    }
+    Serial.print('\n');
+}
+int BluetoothCryptoToolbox::f5(uint8_t DHKey[],uint8_t N_master[], uint8_t N_slave[],
+            uint8_t BD_ADDR_master[], uint8_t BD_ADDR_slave[], uint8_t MacKey[], uint8_t LTK[])
+{
+    uint8_t SALT[16] = {0x6C, 0x88, 0x83, 0x91, 0xAA, 0xF5, 0xA5, 0x38, 0x60, 0x37, 0x0B, 0xDB, 0x5A, 0x60, 0x83, 0xBE};
+    uint8_t keyID[4] = {0x62, 0x74, 0x6c, 0x65};
+    uint8_t length[2];
+    length[0] = 0x01;
+    length[1] = 0x00;
+#ifdef _BLE_TRACE_
+    Serial.print("Starting f5 calculation");
+    Serial.print("Using DHKey:  ");
+    printBytes(DHKey, DHKEY_LENGTH);
+    Serial.print("Using N_Master: ");
+    printBytes(N_master, N_LEN);
+    Serial.print("Using N_Slave:  ");
+    printBytes(N_slave, N_LEN);
+
+    Serial.println("Using BD_ADDR_MASTER: ");
+    printBytes(BD_ADDR_master, ADDR_LEN);
+    Serial.println("Using BD_ADDR_SLAVE:  ");
+    printBytes(BD_ADDR_slave, ADDR_LEN);
+#endif
+
+    uint8_t ADD_M[7];
+    uint8_t ADD_S[7];
+    uint8_t T[16];
+
+    for(int i=0; i<6; i++){
+        ADD_M[1+i] = BD_ADDR_master[i];
+        ADD_M[0] = 0x00;
+        ADD_S[i+1] = BD_ADDR_slave[i];
+        ADD_S[0] = 0x00;
+    }
+    struct __attribute__ ((packed)) CmacInput
+    {
+        uint8_t counter;
+        uint8_t keyID[4];
+        uint8_t N1[16];
+        uint8_t N2[16];
+        uint8_t A1[7];
+        uint8_t A2[7];
+        uint8_t length[2];
+    } cmacInput = {0,0,0,0,0,0,0};
+    cmacInput.counter = 0;
+    memcpy(cmacInput.keyID, keyID, 4);
+    memcpy(cmacInput.N1,N_master,16);
+    memcpy(cmacInput.N2,N_slave,16);
+    memcpy(cmacInput.A1,BD_ADDR_master,7);
+    memcpy(cmacInput.A2,BD_ADDR_slave,7);
+    memcpy(cmacInput.length,length,2);
+    AES_CMAC(SALT, DHKey, 32, T);
+
+    AES_CMAC(T, (uint8_t*)&cmacInput,sizeof(cmacInput), MacKey);
+    cmacInput.counter=1;
+    AES_CMAC(T, (uint8_t*)&cmacInput, sizeof(cmacInput), LTK);
+
+    return 1;
+}
+int BluetoothCryptoToolbox::f6(uint8_t W[], uint8_t N1[],uint8_t N2[],uint8_t R[], uint8_t IOCap[], uint8_t A1[], uint8_t A2[], uint8_t Ex[])
+{
+    struct __attribute__ ((packed)) F6Input
+    {
+        uint8_t N1[16];
+        uint8_t N2[16];
+        uint8_t R[16];
+        uint8_t IOCap[3];
+        uint8_t A1[7];
+        uint8_t A2[7];
+    } f6Input = {0,0,0,0,0,0};
+
+    memcpy(f6Input.N1, N1, 16);
+    memcpy(f6Input.N2, N2, 16);
+    memcpy(f6Input.R, R, 16);
+    memcpy(f6Input.IOCap, IOCap, 3);
+    memcpy(f6Input.A1, A1, 7);
+    memcpy(f6Input.A2, A2, 7);
+
+
+    AES_CMAC(W, (uint8_t*)&f6Input, sizeof(f6Input),Ex);
+    return 1;
+}
+// AES_CMAC from RFC
+void BluetoothCryptoToolbox::AES_CMAC ( unsigned char *key, unsigned char *input, int length,
+                  unsigned char *mac )
+{
+    unsigned char       X[16],Y[16], M_last[16], padded[16];
+    unsigned char       K1[16], K2[16];
+    int         n, i, flag;
+    generateSubkey(key,K1,K2);
+
+    n = (length+15) / 16;       /* n is number of rounds */
+
+    if ( n == 0 ) {
+        n = 1;
+        flag = 0;
+    } else {
+        if ( (length%16) == 0 ) { /* last block is a complete block */
+            flag = 1;
+        } else { /* last block is not complete block */
+            flag = 0;
+        }
+    }
+
+    if ( flag ) { /* last block is complete block */
+        xor_128(&input[16*(n-1)],K1,M_last);
+    } else {
+        padding(&input[16*(n-1)],padded,length%16);
+        xor_128(padded,K2,M_last);
+    }
+
+    for ( i=0; i<16; i++ ) X[i] = 0;
+    for ( i=0; i<n-1; i++ ) {
+        xor_128(X,&input[16*i],Y); /* Y := Mi (+) X  */
+        AES_128(key,Y,X);      /* X := AES-128(KEY, Y); */
+    }
+
+    xor_128(X,M_last,Y);
+    AES_128(key,Y,X);
+
+    for ( i=0; i<16; i++ ) {
+        mac[i] = X[i];
+    }
+}
+// Paddinng function from RFC
+void BluetoothCryptoToolbox::padding( unsigned char *lastb, unsigned char *pad, int length )
+{
+    int j;
+    /* original last block */
+    for ( j=0; j<16; j++ ) {
+        if ( j < length ) {
+            pad[j] = lastb[j];
+        } else if ( j == length ) {
+            pad[j] = 0x80;
+        } else {
+            pad[j] = 0x00;
+        }
+    }
+}
+// Generate subkey from RFC
+void BluetoothCryptoToolbox::generateSubkey(uint8_t* key, uint8_t* K1, uint8_t* K2){
+    unsigned char L[16];
+    unsigned char Z[16];
+    unsigned char tmp[16];
+    int i;
+
+    for ( i=0; i<16; i++ ) Z[i] = 0;
+
+    AES_128(key,Z,L);
+
+    if ( (L[0] & 0x80) == 0 ) { /* If MSB(L) = 0, then K1 = L << 1 */
+        leftshift_onebit(L,K1);
+    } else {    /* Else K1 = ( L << 1 ) (+) Rb */
+
+        leftshift_onebit(L,tmp);
+        xor_128(tmp,const_Rb,K1);
+    }
+
+    if ( (K1[0] & 0x80) == 0 ) {
+        leftshift_onebit(K1,K2);
+    } else {
+        leftshift_onebit(K1,tmp);
+        xor_128(tmp,const_Rb,K2);
+    }
+    return;
+}
+// Use BLE AES function - restart bluetooth if crash
+int BluetoothCryptoToolbox::AES_128(uint8_t* key, uint8_t* data_in, uint8_t* data_out){
+    uint8_t status = 0;
+    int n = 0;
+    int tries = 30;
+    while(HCI.leEncrypt(key,data_in, &status, data_out)!=1&&n<tries){
+        Serial.print("AES failed... retrying: ");
+        Serial.println(n);
+        BLE.end();
+        delay(200);
+        BLE.begin();
+        n++;
+        delay(100*n);
+    }
+    if(n==tries){
+        Serial.println("something went wrong with AES.");
+        return 0;
+    }
+    return 1;
+}
+// Tests AES CMAC
+#ifdef _BLE_TRACE_
+void BluetoothCryptoToolbox::test(){
+    unsigned char L[16];
+    unsigned char Z[16];
+    unsigned char tmp[16];
+    int i;
+
+    for ( i=0; i<16; i++ ) Z[i] = 0x00;
+    uint8_t k[16]            = {0x2b, 0x7e, 0x15, 0x16, 0x28, 0xae, 0xd2, 0xa6, 0xab, 0xf7, 0x15, 0x88, 0x09, 0xcf, 0x4f, 0x3c};
+    
+    Serial.println("AES Plaintext:");
+    for(int i=0; i<16; i++){
+        Serial.print(" 0x");
+        Serial.print(Z[i],HEX);
+    }
+    Serial.println(".");
+    uint8_t expected_aes[16] = {0x7d, 0xf7, 0x6b, 0x0c, 0x1a, 0xb8, 0x99, 0xb3, 0x3e, 0x42, 0xf0, 0x47, 0xb9, 0x1b, 0x54, 0x6f};
+
+    AES_128(k, Z, L);
+    for(int i=0; i<16; i++){
+        Serial.print(" 0x");
+        Serial.print(L[i],HEX);
+    }
+    Serial.println(".");
+    for(int i=0; i<16; i++){
+        Serial.print(" 0x");
+        Serial.print(expected_aes[i],HEX);
+    }
+    Serial.println(".");
+
+    uint8_t k1[16];
+    uint8_t k2[16];
+    generateSubkey(k,k1,k2);
+    uint8_t expected_k1[16]  = {0xfb, 0xee, 0xd6, 0x18, 0x35, 0x71, 0x33, 0x66, 0x7c, 0x85, 0xe0, 0x8f, 0x72, 0x36, 0xa8, 0xde};
+    uint8_t expected_k2[16]  = {0xf7, 0xdd, 0xac, 0x30, 0x6a, 0xe2, 0x66, 0xcc, 0xf9, 0x0b, 0xc1, 0x1e, 0xe4, 0x6d, 0x51, 0x3b};
+
+    for(int i=0; i<16; i++){
+        Serial.print(" 0x");
+        Serial.print(k2[i],HEX);
+    }
+    Serial.println(".");
+    for(int i=0; i<16; i++){
+        Serial.print(" 0x");
+        Serial.print(expected_k2[i],HEX);
+    }
+    Serial.println(".");
+    for(int i=0; i<16; i++){
+        Serial.print(" 0x");
+        Serial.print(k1[i],HEX);
+    }
+    Serial.println(".");
+    for(int i=0; i<16; i++){
+        Serial.print(" 0x");
+        Serial.print(expected_k1[i],HEX);
+    }
+    Serial.println(".");
+
+    uint8_t m[40] = {0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96, 0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a, 0xae, 0x2d, 0x8a, 0x57, 0x1e, 0x03, 0xac, 0x9c, 0x9e, 0xb7, 0x6f, 0xac, 0x45, 0xaf, 0x8e, 0x51, 0x30, 0xc8, 0x1c, 0x46, 0xa3, 0x5c, 0xe4, 0x11};
+    uint8_t mac[16];
+    uint8_t expected_mac[16] = {0xdf, 0xa6, 0x67, 0x47, 0xde, 0x9a, 0xe6, 0x30, 0x30, 0xca, 0x32, 0x61, 0x14, 0x97, 0xc8, 0x27};
+    AES_CMAC(k,m,40,mac);
+
+    for(int i=0; i<16; i++){
+        Serial.print(" 0x");
+        Serial.print(mac[i],HEX);
+    }
+    Serial.println(".");
+    for(int i=0; i<16; i++){
+        Serial.print(" 0x");
+        Serial.print(expected_mac[i],HEX);
+    }
+    Serial.println(".");
+}
+#endif
+// From RFC
+void BluetoothCryptoToolbox::leftshift_onebit(unsigned char *input,unsigned char *output)
+{
+    int i;
+    unsigned char overflow = 0;
+
+    for ( i=15; i>=0; i-- ) {
+        output[i] = input[i] << 1;
+        output[i] |= overflow;
+        overflow = (input[i] & 0x80)?1:0;
+    }
+    return;
+}
+// From RFC
+void BluetoothCryptoToolbox::xor_128(unsigned char *a, unsigned char *b, unsigned char *out)
+{
+    int i;
+    for (i=0;i<16; i++)
+    {
+        out[i] = a[i] ^ b[i];
+    }
+}
+BluetoothCryptoToolbox btct;
\ No newline at end of file
diff --git a/src/utility/btct.h b/src/utility/btct.h
new file mode 100644
index 00000000..87e515af
--- /dev/null
+++ b/src/utility/btct.h
@@ -0,0 +1,26 @@
+#ifndef _BTCT_H_
+#define _BTCT_H_
+#include <Arduino.h>
+
+// Implementation of functions defined in BTLE standard
+class BluetoothCryptoToolbox{
+public:
+    BluetoothCryptoToolbox();
+    void printBytes(uint8_t bytes[], uint8_t length);
+    void generateSubkey(uint8_t* K, uint8_t* K1, uint8_t* K2);
+    void AES_CMAC ( unsigned char *key, unsigned char *input, int length,
+                  unsigned char *mac );
+    int f5(uint8_t DHKey[],uint8_t N_master[], uint8_t N_slave[],
+            uint8_t BD_ADDR_master[], uint8_t BD_ADDR_slave[], uint8_t MacKey[], uint8_t LTK[]);
+    int f6(uint8_t W[], uint8_t N1[],uint8_t N2[],uint8_t R[], uint8_t IOCap[], uint8_t A1[], uint8_t A2[], uint8_t Ex[]);
+    void test();
+    void testF5();
+    void testF6();
+private:
+    int AES_128(uint8_t key[], uint8_t data_in[], uint8_t data_out[]);
+    void leftshift_onebit(unsigned char *input,unsigned char *output);
+    void xor_128(unsigned char *a, unsigned char *b, unsigned char *out);
+    void padding ( unsigned char *lastb, unsigned char *pad, int length );
+};
+extern BluetoothCryptoToolbox btct;
+#endif
\ No newline at end of file

From 97571e37dfb16f84db83050d638af61f6b37f368 Mon Sep 17 00:00:00 2001
From: unknownconstant <unknownconstant>
Date: Fri, 1 Jan 2021 14:41:48 +0000
Subject: [PATCH 003/112] With write encryptionn requirement

---
 src/utility/ATT.cpp | 59 +++++++++++++++++++++++++++++++++++++++++++--
 src/utility/ATT.h   |  3 +++
 src/utility/HCI.cpp | 16 +++++++++---
 3 files changed, 72 insertions(+), 6 deletions(-)

diff --git a/src/utility/ATT.cpp b/src/utility/ATT.cpp
index 4c755615..5bd5e2aa 100644
--- a/src/utility/ATT.cpp
+++ b/src/utility/ATT.cpp
@@ -276,6 +276,8 @@ void ATTClass::handleData(uint16_t connectionHandle, uint8_t dlen, uint8_t data[
     case ATT_OP_ERROR:
 #ifdef _BLE_TRACE_
       Serial.println("[Info] data error");
+      // Serial.print("Error: ");
+      // btct.printBytes(data, dlen);
 #endif
       error(connectionHandle, dlen, data);
       break;
@@ -559,6 +561,7 @@ bool ATTClass::handleNotify(uint16_t handle, const uint8_t* value, int length)
     memcpy(&notification[notificationLength], value, length);
     notificationLength += length;
 
+    /// TODO: Set encyption requirement on notify.
     HCI.sendAclPkt(_peers[i].connectionHandle, ATT_CID, notificationLength, notification);
 
     numNotifications++;
@@ -1214,6 +1217,7 @@ void ATTClass::writeReqOrCmd(uint16_t connectionHandle, uint16_t mtu, uint8_t op
   uint8_t* value = &data[sizeof(handle)];
 
   BLELocalAttribute* attribute = GATT.attribute(handle - 1);
+  bool holdResponse = false;
 
   if (attribute->type() == BLETypeCharacteristic) {
     BLELocalCharacteristic* characteristic = (BLELocalCharacteristic*)attribute;
@@ -1226,10 +1230,33 @@ void ATTClass::writeReqOrCmd(uint16_t connectionHandle, uint16_t mtu, uint8_t op
       }
       return;
     }
+    // Check permssion
+    if((characteristic->properties() & BLEProperty::BLEAuth)> 0 && (getPeerEncryption(connectionHandle) & PEER_ENCRYPTION::ENCRYPTED_AES) == 0){
+      holdResponse = true;
+      sendError(connectionHandle, ATT_OP_WRITE_REQ, handle, ATT_ECODE_INSUFF_ENC);
+    }
 
     for (int i = 0; i < ATT_MAX_PEERS; i++) {
       if (_peers[i].connectionHandle == connectionHandle) {
-        characteristic->writeValue(BLEDevice(_peers[i].addressType, _peers[i].address), value, valueLength);
+        if(holdResponse){
+          
+          writeBufferSize = 0;
+          memcpy(writeBuffer, &handle, 2);
+          writeBufferSize+=2;
+
+          writeBuffer[writeBufferSize++] = _peers[i].addressType;
+
+          memcpy(&writeBuffer[writeBufferSize], _peers[i].address, sizeof(_peers[i].address));
+          writeBufferSize += sizeof(_peers[i].address);
+          
+          writeBuffer[writeBufferSize] = valueLength;
+          writeBufferSize += sizeof(valueLength);
+
+          memcpy(&writeBuffer[writeBufferSize], value, valueLength);
+          writeBufferSize += valueLength;
+        }else{
+          characteristic->writeValue(BLEDevice(_peers[i].addressType, _peers[i].address), value, valueLength);
+        }
         break;
       }
     }
@@ -1276,8 +1303,36 @@ void ATTClass::writeReqOrCmd(uint16_t connectionHandle, uint16_t mtu, uint8_t op
     response[0] = ATT_OP_WRITE_RESP;
     responseLength = 1;
 
-    HCI.sendAclPkt(connectionHandle, ATT_CID, responseLength, response);
+    if(holdResponse){
+      memcpy(holdBuffer, response, responseLength);
+      holdBufferSize = responseLength;
+    }else{
+      HCI.sendAclPkt(connectionHandle, ATT_CID, responseLength, response);
+    }
+  }
+}
+int ATTClass::processWriteBuffer(){
+  if(writeBufferSize==0){
+    return 0;
   }
+
+  struct __attribute__ ((packed)) WriteBuffer {
+    uint16_t handle;
+    uint8_t addressType;
+    uint8_t address[6];
+    uint8_t valueLength;
+    uint8_t value[];
+  } *writeBufferStruct = (WriteBuffer*)&ATT.writeBuffer;
+  // uint8_t value[writeBufferStruct->valueLength];
+  // memcpy(value, writeBufferStruct->value, writeBufferStruct->valueLength);
+  BLELocalAttribute* attribute = GATT.attribute(writeBufferStruct->handle-1);
+  BLELocalCharacteristic* characteristic = (BLELocalCharacteristic*)attribute;
+#ifdef _BLE_TRACE_
+  Serial.println("Writing value");
+#endif
+  characteristic->writeValue(BLEDevice(writeBufferStruct->addressType, writeBufferStruct->address), writeBufferStruct->value, writeBufferStruct->valueLength);
+  writeBufferSize = 0;
+  return 1;
 }
 
 void ATTClass::writeResp(uint16_t connectionHandle, uint8_t dlen, uint8_t data[])
diff --git a/src/utility/ATT.h b/src/utility/ATT.h
index a7d802d1..09d396ca 100644
--- a/src/utility/ATT.h
+++ b/src/utility/ATT.h
@@ -95,7 +95,10 @@ class ATTClass {
   virtual int setPeerIOCap(uint16_t connectionHandle, uint8_t IOCap[]);
   virtual int getPeerIOCap(uint16_t connectionHandle, uint8_t IOCap[]);
   uint8_t holdBuffer[64];
+  uint8_t writeBuffer[64];
   uint8_t holdBufferSize;
+  uint8_t writeBufferSize;
+  virtual int processWriteBuffer();
 private:
   virtual void error(uint16_t connectionHandle, uint8_t dlen, uint8_t data[]);
   virtual void mtuReq(uint16_t connectionHandle, uint8_t dlen, uint8_t data[]);
diff --git a/src/utility/HCI.cpp b/src/utility/HCI.cpp
index bd02764b..805a2c3d 100644
--- a/src/utility/HCI.cpp
+++ b/src/utility/HCI.cpp
@@ -666,13 +666,20 @@ void HCIClass::handleEventPkt(uint8_t /*plen*/, uint8_t pdata[])
 #endif
     if(encryptionChange->enabled>0){
       ATT.setPeerEncryption(encryptionChange->connectionHandle, PEER_ENCRYPTION::ENCRYPTED_AES);
+      if(ATT.writeBufferSize > 0){
+        ATT.processWriteBuffer();
+      }
+      if(ATT.holdBufferSize>0){
+#ifdef _BLE_TRACE_
+        Serial.print("Sending queued response size: ");
+        Serial.println(ATT.holdBufferSize);
+#endif
+        HCI.sendAclPkt(encryptionChange->connectionHandle, ATT_CID, ATT.holdBufferSize, ATT.holdBuffer);
+        ATT.holdBufferSize = 0;
+      }
     }else{
       ATT.setPeerEncryption(encryptionChange->connectionHandle, PEER_ENCRYPTION::NO_ENCRYPTION);
     }
-    if(ATT.holdBufferSize>0){
-      HCI.sendAclPkt(encryptionChange->connectionHandle, ATT_CID, ATT.holdBufferSize, ATT.holdBuffer);
-      ATT.holdBufferSize = 0;
-    }
   }
   else if (eventHdr->evt == EVT_CMD_COMPLETE)
   {
@@ -940,6 +947,7 @@ void HCIClass::handleEventPkt(uint8_t /*plen*/, uint8_t pdata[])
 
           uint8_t Z = 0;
           for(int i=0; i<16; i++){
+            /// TODO: Implement secure random
             Nb[i] = rand(); //// Should use ESP or ECCx08
           }
 #ifdef _BLE_TRACE_

From fa42bb26cf49216b359999df944df4b868ae137a Mon Sep 17 00:00:00 2001
From: unknownconstant <unknownconstant>
Date: Sat, 2 Jan 2021 20:15:00 +0000
Subject: [PATCH 004/112] Write encryption & visible LTK / IRK

---
 .../EncryptedBatteryMonitor.ino               | 209 ++++++++++++
 src/BLECharacteristic.cpp                     |   8 +-
 src/BLECharacteristic.h                       |   4 +-
 src/BLEProperty.h                             |  11 +-
 src/BLETypedCharacteristic.h                  |   6 +-
 src/BLETypedCharacteristics.cpp               |  28 +-
 src/BLETypedCharacteristics.h                 |  28 +-
 src/local/BLELocalCharacteristic.cpp          |  18 +-
 src/local/BLELocalCharacteristic.h            |   6 +-
 src/local/BLELocalDevice.cpp                  |  69 +++-
 src/local/BLELocalDevice.h                    |   7 +-
 src/remote/BLERemoteCharacteristic.cpp        |   5 +-
 src/remote/BLERemoteCharacteristic.h          |   4 +-
 src/utility/ATT.cpp                           |  45 ++-
 src/utility/ATT.h                             |  19 +-
 src/utility/HCI.cpp                           | 315 +++++++++++++++++-
 src/utility/HCI.h                             |  17 +
 src/utility/L2CAPSignaling.cpp                |  45 ++-
 src/utility/btct.cpp                          |  32 ++
 src/utility/btct.h                            |   2 +
 src/utility/keyDistribution.cpp               |  24 ++
 src/utility/keyDistribution.h                 |  29 ++
 22 files changed, 855 insertions(+), 76 deletions(-)
 create mode 100644 examples/Peripheral/EncryptedBatteryMonitor/EncryptedBatteryMonitor.ino
 create mode 100644 src/utility/keyDistribution.cpp
 create mode 100644 src/utility/keyDistribution.h

diff --git a/examples/Peripheral/EncryptedBatteryMonitor/EncryptedBatteryMonitor.ino b/examples/Peripheral/EncryptedBatteryMonitor/EncryptedBatteryMonitor.ino
new file mode 100644
index 00000000..338a374e
--- /dev/null
+++ b/examples/Peripheral/EncryptedBatteryMonitor/EncryptedBatteryMonitor.ino
@@ -0,0 +1,209 @@
+/*
+  Battery Monitor
+
+  This example creates a BLE peripheral with the standard battery service and
+  level characteristic. The A0 pin is used to calculate the battery level.
+
+  The circuit:
+  - Arduino MKR WiFi 1010, Arduino Uno WiFi Rev2 board, Arduino Nano 33 IoT,
+    Arduino Nano 33 BLE, or Arduino Nano 33 BLE Sense board.
+
+  You can use a generic BLE 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 <ArduinoBLE.h>
+
+
+ // BLE Battery Service
+BLEService batteryService("180F");
+
+// BLE 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
+BLEStringCharacteristic stringcharacteristic("183E", BLERead | BLEWrite, 31);
+
+
+// Add BLEEncryption tag to require pairing. This controls the LED.
+BLEUnsignedCharCharacteristic secretValue("2a3F", BLERead | BLEWrite | BLEEncryption);
+
+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
+
+
+  Serial.println("Serial connected");
+
+  // IRKs are keys that identify the true owner of a random mac address.
+  // Add IRKs of devices you are bonded with.
+  BLE.setGetIRKs([](uint8_t* nIRKs, uint8_t** BADDR_TYPES, uint8_t*** BDAddrs, uint8_t*** IRKs){
+    // Set to number of devices
+    *nIRKs       = 2;
+
+    *BDAddrs     = new uint8_t*[*nIRKs];
+    *IRKs        = new uint8_t*[*nIRKs];
+    *BADDR_TYPES = new uint8_t[*nIRKs];
+
+    // Set these to the mac and IRK for your bonded devices as printed in the serial console after bonding.
+    uint8_t iPhoneMac [6]   =  {0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+    uint8_t iPhoneIRK[16]   = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+
+    uint8_t iPadMac[6]      = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+    uint8_t iPadIRK[16]     = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+
+
+    (*BADDR_TYPES)[0] = 0;
+    (*IRKs)[0] = new uint8_t[16];
+    memcpy((*IRKs)[0],iPhoneIRK,16);
+    (*BDAddrs)[0] = new uint8_t[6]; 
+    memcpy((*BDAddrs)[0], iPhoneMac, 6);
+
+
+    (*BADDR_TYPES)[1] = 0;
+    (*IRKs)[1] = new uint8_t[16];
+    memcpy((*IRKs)[1],iPadIRK,16);
+    (*BDAddrs)[1] = new uint8_t[6];
+    memcpy((*BDAddrs)[1], iPadMac, 6);
+
+
+    return 1;
+  });
+  // The LTK is the secret key which is used to encrypt bluetooth traffic
+  BLE.setGetLTK([](uint8_t* address, uint8_t* LTK){
+    // address is input
+    Serial.print("Recieved request for address: ");
+    btct.printBytes(address,6);
+
+    // Set these to the MAC and LTK of your devices after bonding.
+    uint8_t iPhoneMac [6]   = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+    uint8_t iPhoneLTK[16]   = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+    uint8_t iPadMac [6]     = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+    uint8_t iPadLTK[16]     = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+    
+
+    if(memcmp(iPhoneMac, address, 6)==0){
+      memcpy(LTK, iPhoneLTK, 16);
+      return 1;
+    }else if(memcmp(iPadMac, address, 6)==0){
+      memcpy(LTK, iPadLTK, 16);
+    }
+    return 0;
+  });
+  BLE.setStoreIRK([](uint8_t* address, uint8_t* IRK){
+    Serial.print(F("New device with MAC : "));
+    btct.printBytes(address,6);
+    Serial.print(F("Need to store IRK   : "));
+    btct.printBytes(IRK,16);
+    return 1;
+  });
+  BLE.setStoreLTK([](uint8_t* address, uint8_t* LTK){
+    Serial.print(F("New device with MAC : "));
+    btct.printBytes(address,6);
+    Serial.print(F("Need to store LTK   : "));
+    btct.printBytes(LTK,16);
+    return 1;
+  });
+
+  while(1){// begin initialization
+    if (!BLE.begin()) {
+      Serial.println("starting BLE failed!");
+      delay(200);
+      continue;
+    }
+    Serial.println("BT init");
+    delay(200);
+    
+    /* Set a local name for the BLE device
+       This name will appear in advertising packets
+       and can be used by remote devices to identify this BLE device
+       The name can be changed but maybe be truncated based on space left in advertisement packet
+    */
+
+    BLE.setDeviceName("Arduino");
+    BLE.setLocalName("BatteryMonitor");
+
+    BLE.setAdvertisedService(batteryService); // add the service UUID
+    batteryService.addCharacteristic(batteryLevelChar); // add the battery level characteristic
+    batteryService.addCharacteristic(stringcharacteristic);
+    batteryService.addCharacteristic(secretValue);
+
+    BLE.addService(batteryService); // Add the battery service
+    batteryLevelChar.writeValue(oldBatteryLevel); // set initial value for this characteristic
+    char* stringCharValue = new char[32];
+    stringCharValue = "string";
+    stringcharacteristic.writeValue(stringCharValue);
+    secretValue.writeValue(0);
+    
+    delay(1000);
+  
+    /* Start advertising BLE.  It will start continuously transmitting BLE
+       advertising packets and will be visible to remote BLE central devices
+       until it receives a new connection */
+  
+    // start advertising
+    if(!BLE.advertise()){
+      Serial.println("failed to advertise bluetooth.");
+      BLE.stopAdvertise();
+      delay(500);
+    }else{
+      Serial.println("advertising...");
+      break;
+    }
+    BLE.end();
+    delay(100);
+  }
+}
+
+
+void loop() {
+  // wait for a BLE 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());
+
+    // check the battery level every 200ms
+    // while the central is connected:
+    while (central.connected()) {
+      long currentMillis = millis();
+      // if 200ms have passed, check the battery level:
+      if (currentMillis - previousMillis >= 1000) {
+        previousMillis = currentMillis;
+        updateBatteryLevel();
+        if(secretValue.value()>0){
+          digitalWrite(13,HIGH);
+        }else{
+          digitalWrite(13,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/src/BLECharacteristic.cpp b/src/BLECharacteristic.cpp
index 9a07cb9d..1cfbf489 100644
--- a/src/BLECharacteristic.cpp
+++ b/src/BLECharacteristic.cpp
@@ -47,13 +47,13 @@ BLECharacteristic::BLECharacteristic(BLERemoteCharacteristic* remote) :
   }
 }
 
-BLECharacteristic::BLECharacteristic(const char* uuid, uint8_t properties, int valueSize, bool fixedLength) :
-  BLECharacteristic(new BLELocalCharacteristic(uuid, properties, valueSize, fixedLength))
+BLECharacteristic::BLECharacteristic(const char* uuid, uint16_t permissions, int valueSize, bool fixedLength) :
+  BLECharacteristic(new BLELocalCharacteristic(uuid, permissions, valueSize, fixedLength))
 {
 }
 
-BLECharacteristic::BLECharacteristic(const char* uuid, uint8_t properties, const char* value) :
-  BLECharacteristic(new BLELocalCharacteristic(uuid, properties, value))
+BLECharacteristic::BLECharacteristic(const char* uuid, uint16_t permissions, const char* value) :
+  BLECharacteristic(new BLELocalCharacteristic(uuid, permissions, value))
 {
 }
 
diff --git a/src/BLECharacteristic.h b/src/BLECharacteristic.h
index 2ac30b05..da9721e0 100644
--- a/src/BLECharacteristic.h
+++ b/src/BLECharacteristic.h
@@ -45,8 +45,8 @@ class BLERemoteCharacteristic;
 class BLECharacteristic  {
 public:
   BLECharacteristic();
-  BLECharacteristic(const char* uuid, uint8_t properties, int valueSize, bool fixedLength = false);
-  BLECharacteristic(const char* uuid, uint8_t properties, const char* value);
+  BLECharacteristic(const char* uuid, uint16_t permissions, int valueSize, bool fixedLength = false);
+  BLECharacteristic(const char* uuid, uint16_t permissions, const char* value);
   BLECharacteristic(const BLECharacteristic& other);
   virtual ~BLECharacteristic();
 
diff --git a/src/BLEProperty.h b/src/BLEProperty.h
index aeee4c85..434bd2aa 100644
--- a/src/BLEProperty.h
+++ b/src/BLEProperty.h
@@ -29,10 +29,19 @@ enum BLEProperty {
   BLEWrite                = 0x08,
   BLENotify               = 0x10,
   BLEIndicate             = 0x20,
-  BLEAuth                 = 1 << 6,
+  BLEAuthSignedWrite      = 1 << 6,
   BLEExtProp              = 1 << 7,
 };
 
+enum BLEPermission {
+  BLEEncryption         = 1 << 9,
+  BLEAuthentication     = 1 << 10,
+  BLEAuthorization      = 1 << 11,
+  // BLEWriteEncryption        = 1 << 11,
+  // BLEWriteAuthentication    = 1 << 12,
+  // BLEWriteAuthorization     = 1 << 13,
+};
+
 #define    ESP_GATT_CHAR_PROP_BIT_BROADCAST    (1 << 0)       /* 0x01 */    /* relate to BTA_GATT_CHAR_PROP_BIT_BROADCAST in bta/bta_gatt_api.h */
 #define    ESP_GATT_CHAR_PROP_BIT_READ         (1 << 1)       /* 0x02 */    /* relate to BTA_GATT_CHAR_PROP_BIT_READ in bta/bta_gatt_api.h */
 #define    ESP_GATT_CHAR_PROP_BIT_WRITE_NR     (1 << 2)       /* 0x04 */    /* relate to BTA_GATT_CHAR_PROP_BIT_WRITE_NR in bta/bta_gatt_api.h */
diff --git a/src/BLETypedCharacteristic.h b/src/BLETypedCharacteristic.h
index d6e6e4a1..7777d360 100644
--- a/src/BLETypedCharacteristic.h
+++ b/src/BLETypedCharacteristic.h
@@ -25,7 +25,7 @@
 template<typename T> class BLETypedCharacteristic : public BLECharacteristic
 {
 public:
-  BLETypedCharacteristic(const char* uuid, unsigned char properties);
+  BLETypedCharacteristic(const char* uuid, unsigned int permissions);
 
   int writeValue(T value);
   int setValue(T value) { return writeValue(value); }
@@ -43,8 +43,8 @@ template<typename T> class BLETypedCharacteristic : public BLECharacteristic
   T byteSwap(T value);
 };
 
-template<typename T> BLETypedCharacteristic<T>::BLETypedCharacteristic(const char* uuid, unsigned char properties) :
-  BLECharacteristic(uuid, properties, sizeof(T), true)
+template<typename T> BLETypedCharacteristic<T>::BLETypedCharacteristic(const char* uuid, unsigned int permissions) :
+  BLECharacteristic(uuid, permissions, sizeof(T), true)
 {
   T value;
   memset(&value, 0x00, sizeof(value));
diff --git a/src/BLETypedCharacteristics.cpp b/src/BLETypedCharacteristics.cpp
index 976f6159..800574eb 100644
--- a/src/BLETypedCharacteristics.cpp
+++ b/src/BLETypedCharacteristics.cpp
@@ -21,72 +21,72 @@
 
 #include "BLETypedCharacteristics.h"
 
-BLEBoolCharacteristic::BLEBoolCharacteristic(const char* uuid, unsigned char properties) :
+BLEBoolCharacteristic::BLEBoolCharacteristic(const char* uuid, unsigned int properties) :
   BLETypedCharacteristic<bool>(uuid, properties)
 {
 }
 
-BLEBooleanCharacteristic::BLEBooleanCharacteristic(const char* uuid, unsigned char properties) :
+BLEBooleanCharacteristic::BLEBooleanCharacteristic(const char* uuid, unsigned int properties) :
   BLETypedCharacteristic<bool>(uuid, properties)
 {
 }
 
-BLECharCharacteristic::BLECharCharacteristic(const char* uuid, unsigned char properties) :
+BLECharCharacteristic::BLECharCharacteristic(const char* uuid, unsigned int properties) :
   BLETypedCharacteristic<char>(uuid, properties)
 {
 }
 
-BLEUnsignedCharCharacteristic::BLEUnsignedCharCharacteristic(const char* uuid, unsigned char properties) :
+BLEUnsignedCharCharacteristic::BLEUnsignedCharCharacteristic(const char* uuid, unsigned int properties) :
   BLETypedCharacteristic<unsigned char>(uuid, properties)
 {
 }
 
-BLEByteCharacteristic::BLEByteCharacteristic(const char* uuid, unsigned char properties) :
+BLEByteCharacteristic::BLEByteCharacteristic(const char* uuid, unsigned int properties) :
   BLETypedCharacteristic<byte>(uuid, properties)
 {
 }
 
-BLEShortCharacteristic::BLEShortCharacteristic(const char* uuid, unsigned char properties) :
+BLEShortCharacteristic::BLEShortCharacteristic(const char* uuid, unsigned int properties) :
   BLETypedCharacteristic<short>(uuid, properties)
 {
 }
 
-BLEUnsignedShortCharacteristic::BLEUnsignedShortCharacteristic(const char* uuid, unsigned char properties) :
+BLEUnsignedShortCharacteristic::BLEUnsignedShortCharacteristic(const char* uuid, unsigned int properties) :
   BLETypedCharacteristic<unsigned short>(uuid, properties)
 {
 }
 
-BLEWordCharacteristic::BLEWordCharacteristic(const char* uuid, unsigned char properties) :
+BLEWordCharacteristic::BLEWordCharacteristic(const char* uuid, unsigned int properties) :
   BLETypedCharacteristic<word>(uuid, properties)
 {
 }
 
-BLEIntCharacteristic::BLEIntCharacteristic(const char* uuid, unsigned char properties) :
+BLEIntCharacteristic::BLEIntCharacteristic(const char* uuid, unsigned int properties) :
   BLETypedCharacteristic<int>(uuid, properties) 
 {
 }
 
-BLEUnsignedIntCharacteristic::BLEUnsignedIntCharacteristic(const char* uuid, unsigned char properties) :
+BLEUnsignedIntCharacteristic::BLEUnsignedIntCharacteristic(const char* uuid, unsigned int properties) :
   BLETypedCharacteristic<unsigned int>(uuid, properties)
 {
 }
 
-BLELongCharacteristic::BLELongCharacteristic(const char* uuid, unsigned char properties) :
+BLELongCharacteristic::BLELongCharacteristic(const char* uuid, unsigned int properties) :
   BLETypedCharacteristic<long>(uuid, properties)
 {
 }
 
-BLEUnsignedLongCharacteristic::BLEUnsignedLongCharacteristic(const char* uuid, unsigned char properties) :
+BLEUnsignedLongCharacteristic::BLEUnsignedLongCharacteristic(const char* uuid, unsigned int properties) :
   BLETypedCharacteristic<unsigned long>(uuid, properties)
 {
 }
 
-BLEFloatCharacteristic::BLEFloatCharacteristic(const char* uuid, unsigned char properties) :
+BLEFloatCharacteristic::BLEFloatCharacteristic(const char* uuid, unsigned int properties) :
   BLETypedCharacteristic<float>(uuid, properties)
 {
 }
 
-BLEDoubleCharacteristic::BLEDoubleCharacteristic(const char* uuid, unsigned char properties) :
+BLEDoubleCharacteristic::BLEDoubleCharacteristic(const char* uuid, unsigned int properties) :
   BLETypedCharacteristic<double>(uuid, properties)
 {
 }
diff --git a/src/BLETypedCharacteristics.h b/src/BLETypedCharacteristics.h
index 465fc046..df8482cf 100644
--- a/src/BLETypedCharacteristics.h
+++ b/src/BLETypedCharacteristics.h
@@ -24,72 +24,72 @@
 
 class BLEBoolCharacteristic : public BLETypedCharacteristic<bool> {
 public:
-  BLEBoolCharacteristic(const char* uuid, unsigned char properties);
+  BLEBoolCharacteristic(const char* uuid, unsigned int permissions);
 };
 
 class BLEBooleanCharacteristic : public BLETypedCharacteristic<boolean> {
 public:
-  BLEBooleanCharacteristic(const char* uuid, unsigned char properties);
+  BLEBooleanCharacteristic(const char* uuid, unsigned int permissions);
 };
 
 class BLECharCharacteristic : public BLETypedCharacteristic<char> {
 public:
-  BLECharCharacteristic(const char* uuid, unsigned char properties);
+  BLECharCharacteristic(const char* uuid, unsigned int permissions);
 };
 
 class BLEUnsignedCharCharacteristic : public BLETypedCharacteristic<unsigned char> {
 public:
-  BLEUnsignedCharCharacteristic(const char* uuid, unsigned char properties);
+  BLEUnsignedCharCharacteristic(const char* uuid, unsigned int permissions);
 };
 
 class BLEByteCharacteristic : public BLETypedCharacteristic<byte> {
 public:
-  BLEByteCharacteristic(const char* uuid, unsigned char properties);
+  BLEByteCharacteristic(const char* uuid, unsigned int permissions);
 };
 
 class BLEShortCharacteristic : public BLETypedCharacteristic<short> {
 public:
-  BLEShortCharacteristic(const char* uuid, unsigned char properties);
+  BLEShortCharacteristic(const char* uuid, unsigned int permissions);
 };
 
 class BLEUnsignedShortCharacteristic : public BLETypedCharacteristic<unsigned short> {
 public:
-  BLEUnsignedShortCharacteristic(const char* uuid, unsigned char properties);
+  BLEUnsignedShortCharacteristic(const char* uuid, unsigned int permissions);
 };
 
 class BLEWordCharacteristic : public BLETypedCharacteristic<word> {
 public:
-  BLEWordCharacteristic(const char* uuid, unsigned char properties);
+  BLEWordCharacteristic(const char* uuid, unsigned int permissions);
 };
 
 class BLEIntCharacteristic : public BLETypedCharacteristic<int> {
 public:
-  BLEIntCharacteristic(const char* uuid, unsigned char properties);
+  BLEIntCharacteristic(const char* uuid, unsigned int permissions);
 };
 
 class BLEUnsignedIntCharacteristic : public BLETypedCharacteristic<unsigned int> {
 public:
-  BLEUnsignedIntCharacteristic(const char* uuid, unsigned char properties);
+  BLEUnsignedIntCharacteristic(const char* uuid, unsigned int permissions);
 };
 
 class BLELongCharacteristic : public BLETypedCharacteristic<long> {
 public:
-  BLELongCharacteristic(const char* uuid, unsigned char properties);
+  BLELongCharacteristic(const char* uuid, unsigned int permissions);
 };
 
 class BLEUnsignedLongCharacteristic : public BLETypedCharacteristic<unsigned long> {
 public:
-  BLEUnsignedLongCharacteristic(const char* uuid, unsigned char properties);
+  BLEUnsignedLongCharacteristic(const char* uuid, unsigned int permissions);
 };
 
 class BLEFloatCharacteristic : public BLETypedCharacteristic<float> {
 public:
-  BLEFloatCharacteristic(const char* uuid, unsigned char properties);
+  BLEFloatCharacteristic(const char* uuid, unsigned int permissions);
 };
 
 class BLEDoubleCharacteristic : public BLETypedCharacteristic<double> {
 public:
-  BLEDoubleCharacteristic(const char* uuid, unsigned char properties);
+  BLEDoubleCharacteristic(const char* uuid, unsigned int permissions);
 };
 
 #endif
diff --git a/src/local/BLELocalCharacteristic.cpp b/src/local/BLELocalCharacteristic.cpp
index 333d00b2..2cd801b2 100644
--- a/src/local/BLELocalCharacteristic.cpp
+++ b/src/local/BLELocalCharacteristic.cpp
@@ -29,20 +29,21 @@
 
 #include "BLELocalCharacteristic.h"
 
-BLELocalCharacteristic::BLELocalCharacteristic(const char* uuid, uint8_t properties, int valueSize, bool fixedLength) :
+BLELocalCharacteristic::BLELocalCharacteristic(const char* uuid, uint16_t permissions, int valueSize, bool fixedLength) :
   BLELocalAttribute(uuid),
-  _properties(properties),
+  _properties((uint8_t)(permissions&0x000FF)),
   _valueSize(min(valueSize, 512)),
   _valueLength(0),
   _fixedLength(fixedLength),
   _handle(0x0000),
   _broadcast(false),
   _written(false),
-  _cccdValue(0x0000)
+  _cccdValue(0x0000),
+  _permissions((uint8_t)((permissions&0xFF00)>>8))
 {
   memset(_eventHandlers, 0x00, sizeof(_eventHandlers));
 
-  if (properties & (BLENotify | BLEIndicate)) {
+  if (permissions & (BLENotify | BLEIndicate)) {
     BLELocalDescriptor* cccd = new BLELocalDescriptor("2902", (uint8_t*)&_cccdValue, sizeof(_cccdValue));
   
     _descriptors.add(cccd);
@@ -51,12 +52,11 @@ BLELocalCharacteristic::BLELocalCharacteristic(const char* uuid, uint8_t propert
   _value = (uint8_t*)malloc(valueSize);
 }
 
-BLELocalCharacteristic::BLELocalCharacteristic(const char* uuid, uint8_t properties, const char* value) :
-  BLELocalCharacteristic(uuid, properties, strlen(value))
+BLELocalCharacteristic::BLELocalCharacteristic(const char* uuid, uint16_t permissions, const char* value) :
+  BLELocalCharacteristic(uuid, permissions, strlen(value))
 {
   writeValue(value);
 }
-
 BLELocalCharacteristic::~BLELocalCharacteristic()
 {
   for (unsigned int i = 0; i < descriptorCount(); i++) {
@@ -84,6 +84,10 @@ uint8_t BLELocalCharacteristic::properties() const
   return _properties;
 }
 
+uint8_t BLELocalCharacteristic::permissions() const {
+  return _permissions;
+}
+
 int BLELocalCharacteristic::valueSize() const
 {
   return _valueSize;
diff --git a/src/local/BLELocalCharacteristic.h b/src/local/BLELocalCharacteristic.h
index ee42390a..331cdd5c 100644
--- a/src/local/BLELocalCharacteristic.h
+++ b/src/local/BLELocalCharacteristic.h
@@ -33,13 +33,14 @@ class BLELocalDescriptor;
 
 class BLELocalCharacteristic : public BLELocalAttribute {
 public:
-  BLELocalCharacteristic(const char* uuid, uint8_t properties, int valueSize, bool fixedLength = false);
-  BLELocalCharacteristic(const char* uuid, uint8_t properties, const char* value);
+  BLELocalCharacteristic(const char* uuid, uint16_t permissions, int valueSize, bool fixedLength = false);
+  BLELocalCharacteristic(const char* uuid, uint16_t permissions, const char* value);
   virtual ~BLELocalCharacteristic();
 
   virtual enum BLEAttributeType type() const;
 
   uint8_t properties() const;
+  uint8_t permissions() const;
 
   int valueSize() const;
   const uint8_t* value() const;
@@ -75,6 +76,7 @@ class BLELocalCharacteristic : public BLELocalAttribute {
 
 private:
   uint8_t  _properties;
+  uint8_t  _permissions;
   int      _valueSize;
   uint8_t* _value;
   uint16_t  _valueLength;
diff --git a/src/local/BLELocalDevice.cpp b/src/local/BLELocalDevice.cpp
index df11e971..49cc6603 100644
--- a/src/local/BLELocalDevice.cpp
+++ b/src/local/BLELocalDevice.cpp
@@ -108,7 +108,7 @@ int BLELocalDevice::begin()
     end();
     return 0;
   }
-  if (HCI.setLeEventMask(0x00000000000001FF) != 0) {
+  if (HCI.setLeEventMask(0x00000000000003FF) != 0) {
     end();
     return 0;
   }
@@ -121,6 +121,59 @@ int BLELocalDevice::begin()
     return 0;
   }
 
+  /// The HCI should allow automatic address resolution.
+
+  // // If we have callbacks to rememember bonded devices:
+  // if(HCI._getIRKs!=0){
+  //   uint8_t nIRKs = 0;
+  //   uint8_t** BADDR_Type = new uint8_t*;
+  //   uint8_t*** BADDRs = new uint8_t**;
+  //   uint8_t*** IRKs = new uint8_t**;
+  //   uint8_t* memcheck;
+
+
+  //   if(!HCI._getIRKs(&nIRKs, BADDR_Type, BADDRs, IRKs)){
+  //     Serial.println("error");
+  //   }
+  //   for(int i=0; i<nIRKs; i++){
+  //     Serial.print("Baddr type: ");
+  //     Serial.println((*BADDR_Type)[i]);
+  //     Serial.print("BADDR:");
+  //     for(int k=0; k<6; k++){
+  //       Serial.print(", 0x");
+  //       Serial.print((*BADDRs)[i][k],HEX);
+  //     }
+  //     Serial.println();
+  //     Serial.print("IRK:");
+  //     for(int k=0; k<16; k++){
+  //       Serial.print(", 0x");
+  //       Serial.print((*IRKs)[i][k],HEX);
+  //     }
+  //     Serial.println();
+
+  //     // save this 
+  //     uint8_t zeros[16];
+  //     for(int k=0; k<16; k++) zeros[15-k] = 0;
+      
+  //     // HCI.leAddResolvingAddress((*BADDR_Type)[i],(*BADDRs)[i],(*IRKs)[i], zeros);
+
+  //     delete[] (*BADDRs)[i];
+  //     delete[] (*IRKs)[i];
+  //   }
+  //   delete[] (*BADDR_Type);
+  //   delete BADDR_Type;
+  //   delete[] (*BADDRs);
+  //   delete BADDRs;
+  //   delete[] (*IRKs);
+  //   delete IRKs;
+    
+  //   memcheck = new uint8_t[1];
+  //   Serial.print("nIRK location: 0x");
+  //   Serial.println((int)memcheck,HEX);
+  //   delete[] memcheck;
+
+  // }
+
   GATT.begin();
 
   return 1;
@@ -342,6 +395,20 @@ void BLELocalDevice::setTimeout(unsigned long timeout)
   ATT.setTimeout(timeout);
 }
 
+
+void BLELocalDevice::setGetIRKs(int (*getIRKs)(uint8_t* nIRKs, uint8_t** BADDR_type, uint8_t*** BADDRs, uint8_t*** IRKs)){
+  HCI._getIRKs = getIRKs;
+}
+void BLELocalDevice::setGetLTK(int (*getLTK)(uint8_t* BADDR, uint8_t* LTK)){
+  HCI._getLTK = getLTK;
+}
+void BLELocalDevice::setStoreLTK(int (*storeLTK)(uint8_t*, uint8_t*)){
+  HCI._storeLTK = storeLTK;
+}
+void BLELocalDevice::setStoreIRK(int (*storeIRK)(uint8_t*, uint8_t*)){
+  HCI._storeIRK = storeIRK;
+}
+
 void BLELocalDevice::debug(Stream& stream)
 {
   HCI.debug(stream);
diff --git a/src/local/BLELocalDevice.h b/src/local/BLELocalDevice.h
index bcca86a9..22a5f589 100644
--- a/src/local/BLELocalDevice.h
+++ b/src/local/BLELocalDevice.h
@@ -80,7 +80,12 @@ class BLELocalDevice {
 
   virtual void debug(Stream& stream);
   virtual void noDebug();
-  
+
+/// TODO: Put in actual variable names
+  virtual void setStoreIRK(int (*storeIRK)(uint8_t*, uint8_t*));
+  virtual void setGetIRKs(int (*getIRKs)(uint8_t* nIRKs, uint8_t** BADDR_type, uint8_t*** BADDRs, uint8_t*** IRKs));
+  virtual void setStoreLTK(int (*storeLTK)(uint8_t*, uint8_t*));
+  virtual void setGetLTK(int (*getLTK)(uint8_t*, uint8_t*));
   uint8_t BDaddress[6];
   
 protected:
diff --git a/src/remote/BLERemoteCharacteristic.cpp b/src/remote/BLERemoteCharacteristic.cpp
index bbd98ddf..e8ac733f 100644
--- a/src/remote/BLERemoteCharacteristic.cpp
+++ b/src/remote/BLERemoteCharacteristic.cpp
@@ -24,11 +24,12 @@
 #include "BLERemoteCharacteristic.h"
 
 BLERemoteCharacteristic::BLERemoteCharacteristic(const uint8_t uuid[], uint8_t uuidLen, uint16_t connectionHandle,
-                                                  uint16_t startHandle, uint8_t properties, uint16_t valueHandle) :
+                                                  uint16_t startHandle, uint16_t permissions, uint16_t valueHandle) :
   BLERemoteAttribute(uuid, uuidLen),
   _connectionHandle(connectionHandle),
   _startHandle(startHandle),
-  _properties(properties),
+  _properties((uint8_t)(permissions & 0x00FF)),
+  _permissions((uint8_t)((permissions & 0xFF00)>>8)),
   _valueHandle(valueHandle),
   _value(NULL),
   _valueLength(0),
diff --git a/src/remote/BLERemoteCharacteristic.h b/src/remote/BLERemoteCharacteristic.h
index d0ac09bc..b53ab031 100644
--- a/src/remote/BLERemoteCharacteristic.h
+++ b/src/remote/BLERemoteCharacteristic.h
@@ -29,10 +29,11 @@
 
 class BLERemoteCharacteristic : public BLERemoteAttribute {
 public:
-  BLERemoteCharacteristic(const uint8_t uuid[], uint8_t uuidLen, uint16_t connectionHandle, uint16_t startHandle, uint8_t properties, uint16_t valueHandle);
+  BLERemoteCharacteristic(const uint8_t uuid[], uint8_t uuidLen, uint16_t connectionHandle, uint16_t startHandle, uint16_t permissions, uint16_t valueHandle);
   virtual ~BLERemoteCharacteristic();
 
   uint8_t properties() const;
+  uint8_t permissions() const;
 
   const uint8_t* value() const;
   int valueLength() const;
@@ -66,6 +67,7 @@ class BLERemoteCharacteristic : public BLERemoteAttribute {
   uint16_t _connectionHandle;
   uint16_t _startHandle;
   uint8_t _properties;
+  uint8_t _permissions;
   uint16_t _valueHandle;
 
   uint8_t* _value;
diff --git a/src/utility/ATT.cpp b/src/utility/ATT.cpp
index 5bd5e2aa..6ef6bc31 100644
--- a/src/utility/ATT.cpp
+++ b/src/utility/ATT.cpp
@@ -253,6 +253,15 @@ void ATTClass::addConnection(uint16_t handle, uint8_t role, uint8_t peerBdaddrTy
   _peers[peerIndex].mtu = 23;
   _peers[peerIndex].addressType = peerBdaddrType;
   memcpy(_peers[peerIndex].address, peerBdaddr, sizeof(_peers[peerIndex].address));
+  uint8_t BDADDr[6];
+  for(int i=0; i<6; i++) BDADDr[5-i] = peerBdaddr[i];
+  if(HCI.tryResolveAddress(BDADDr,_peers[peerIndex].resolvedAddress)){
+#ifdef _BLE_TRACE_
+    Serial.println("Found match.");
+#endif
+  }else{
+    memset(_peers[peerIndex].resolvedAddress, 0, 6);
+  }
 
   if (_eventHandlers[BLEConnected]) {
     _eventHandlers[BLEConnected](BLEDevice(peerBdaddrType, peerBdaddr));
@@ -515,6 +524,7 @@ bool ATTClass::disconnect()
     _peers[i].role = 0x00;
     _peers[i].addressType = 0x00;
     memset(_peers[i].address, 0x00, sizeof(_peers[i].address));
+    memset(_peers[i].resolvedAddress, 0x00, sizeof(_peers[i].resolvedAddress));
     _peers[i].mtu = 23;
 
     if (_peers[i].device) {
@@ -1007,7 +1017,8 @@ void ATTClass::readOrReadBlobReq(uint16_t connectionHandle, uint16_t mtu, uint8_
         return;
       }
       // If characteristic requires encryption send error & hold response until encrypted
-      if ((characteristic->properties() & BLEAuth) > 0 && (getPeerEncryption(connectionHandle) & PEER_ENCRYPTION::ENCRYPTED_AES)==0) {
+      if ((characteristic->permissions() & (BLEPermission::BLEEncryption >> 8)) > 0 &&
+          (getPeerEncryption(connectionHandle) & PEER_ENCRYPTION::ENCRYPTED_AES)==0 ) {
         holdResponse = true;
         sendError(connectionHandle, opcode, handle, ATT_ECODE_INSUFF_ENC);
       }
@@ -1231,7 +1242,8 @@ void ATTClass::writeReqOrCmd(uint16_t connectionHandle, uint16_t mtu, uint8_t op
       return;
     }
     // Check permssion
-    if((characteristic->properties() & BLEProperty::BLEAuth)> 0 && (getPeerEncryption(connectionHandle) & PEER_ENCRYPTION::ENCRYPTED_AES) == 0){
+    if((characteristic->permissions() &( BLEPermission::BLEEncryption >> 8)) > 0 && 
+       (getPeerEncryption(connectionHandle) & PEER_ENCRYPTION::ENCRYPTED_AES) == 0){
       holdResponse = true;
       sendError(connectionHandle, ATT_OP_WRITE_REQ, handle, ATT_ECODE_INSUFF_ENC);
     }
@@ -1817,7 +1829,7 @@ int ATTClass::setPeerIOCap(uint16_t connectionHandle, uint8_t IOCap[3]){
 // Return the connection handle for the first peer that is requesting encryption
 uint16_t ATTClass::getPeerEncrptingConnectionHandle(){
   for(int i=0; i<ATT_MAX_PEERS; i++){
-    if(_peers[i].encryption & PEER_ENCRYPTION::REQUESTED_ENCRYPTION > 0){
+    if((_peers[i].encryption & PEER_ENCRYPTION::REQUESTED_ENCRYPTION) > 0){
       return _peers[i].connectionHandle;
     }
   }
@@ -1861,7 +1873,7 @@ int ATTClass::getPeerAddrWithType(uint16_t connectionHandle, uint8_t peerAddr[])
       peerAddr[6-k] = _peers[i].address[k];
     }
     if(_peers[i].addressType){
-      peerAddr[0] = 0x01;
+      peerAddr[0] = _peers[i].addressType;
     }else{
       peerAddr[0] = 0x00;
     }
@@ -1869,6 +1881,31 @@ int ATTClass::getPeerAddrWithType(uint16_t connectionHandle, uint8_t peerAddr[])
   }
   return 0;
 }
+// Get the resolved address for a peer if it exists
+int ATTClass::getPeerResolvedAddress(uint16_t connectionHandle, uint8_t resolvedAddress[]){
+  for(int i=0; i<ATT_MAX_PEERS; i++)
+  {
+    if(_peers[i].connectionHandle != connectionHandle){continue;}
+
+    bool allZero=true;
+    for(int k=0; k<6; k++){
+      if(_peers[i].resolvedAddress[k] == 0){
+        continue;
+      }else{
+        allZero = false;
+        break;
+      }
+    }
+
+    if(allZero){
+      return 0;
+    }
+
+    memcpy(resolvedAddress, _peers[i].resolvedAddress, 6);
+    return 1;
+  }
+  return 0;
+}
 
 #if !defined(FAKE_ATT)
 ATTClass ATTObj;
diff --git a/src/utility/ATT.h b/src/utility/ATT.h
index 09d396ca..1c8910c3 100644
--- a/src/utility/ATT.h
+++ b/src/utility/ATT.h
@@ -23,6 +23,7 @@
 #include <Arduino.h>
 
 #include "BLEDevice.h"
+#include "keyDistribution.h"
 
 #define ATT_CID       0x0004
 #define BLE_CTL       0x0008
@@ -37,11 +38,12 @@
 
 enum PEER_ENCRYPTION {
   NO_ENCRYPTION         = 0,
-  REQUESTED_ENCRYPTION  = 1 << 0,
-  SENT_PUBKEY           = 1 << 1,
-  DH_KEY_CALULATED      = 1 << 2,
-  RECEIVED_DH_CHECK     = 1 << 3,
-  SENT_DH_CHECK         = 1 << 4,
+  PAIRING_REQUEST       = 1 << 0,
+  REQUESTED_ENCRYPTION  = 1 << 1,
+  SENT_PUBKEY           = 1 << 2,
+  DH_KEY_CALULATED      = 1 << 3,
+  RECEIVED_DH_CHECK     = 1 << 4,
+  SENT_DH_CHECK         = 1 << 5,
   ENCRYPTED_AES         = 1 << 7
 };
 
@@ -94,11 +96,17 @@ class ATTClass {
   virtual int getPeerAddrWithType(uint16_t connectionHandle, uint8_t peerAddr[]);
   virtual int setPeerIOCap(uint16_t connectionHandle, uint8_t IOCap[]);
   virtual int getPeerIOCap(uint16_t connectionHandle, uint8_t IOCap[]);
+  virtual int getPeerResolvedAddress(uint16_t connectionHandle, uint8_t* resolvedAddress);
   uint8_t holdBuffer[64];
   uint8_t writeBuffer[64];
   uint8_t holdBufferSize;
   uint8_t writeBufferSize;
   virtual int processWriteBuffer();
+  KeyDistribution remoteKeyDistribution;
+  KeyDistribution localKeyDistribution;
+  uint8_t peerIRK[16];
+  /// This is just a random number... Not sure it has use unless privacy mode is active.
+  uint8_t localIRK[16] = {0x54,0x83,0x63,0x7c,0xc5,0x1e,0xf7,0xec,0x32,0xdd,0xad,0x51,0x89,0x4b,0x9e,0x07};
 private:
   virtual void error(uint16_t connectionHandle, uint8_t dlen, uint8_t data[]);
   virtual void mtuReq(uint16_t connectionHandle, uint8_t dlen, uint8_t data[]);
@@ -139,6 +147,7 @@ class ATTClass {
     uint8_t role;
     uint8_t addressType;
     uint8_t address[6];
+    uint8_t resolvedAddress[6];
     uint16_t mtu;
     BLERemoteDevice* device;
     uint8_t encryption;
diff --git a/src/utility/HCI.cpp b/src/utility/HCI.cpp
index 805a2c3d..c3d66848 100644
--- a/src/utility/HCI.cpp
+++ b/src/utility/HCI.cpp
@@ -34,6 +34,7 @@
 #define EVT_CMD_COMPLETE      0x0e
 #define EVT_CMD_STATUS        0x0f
 #define EVT_NUM_COMP_PKTS     0x13
+#define EVT_RETURN_LINK_KEYS  0x15
 #define EVT_UNKNOWN           0x10
 #define EVT_LE_META_EVENT     0x3e
 
@@ -449,6 +450,161 @@ int HCIClass::leConnUpdate(uint16_t handle, uint16_t minInterval, uint16_t maxIn
 
   return sendCommand(OGF_LE_CTL << 10 | OCF_LE_CONN_UPDATE, sizeof(leConnUpdateData), &leConnUpdateData);
 }
+int HCIClass::saveNewAddress(uint8_t addressType, uint8_t* address, uint8_t* peerIrk, uint8_t* localIrk){
+  if(_storeIRK!=0){
+    _storeIRK(address, peerIrk);
+  }
+  // Again... this should work 
+  // leAddResolvingAddress(addressType, address, peerIrk, localIrk);
+}
+int HCIClass::leAddResolvingAddress(uint8_t addressType, uint8_t* peerAddress, uint8_t* peerIrk, uint8_t* localIrk){
+  leStopResolvingAddresses();
+
+  struct __attribute__ ((packed)) AddDevice {
+    uint8_t peerAddressType;
+    uint8_t peerAddress[6];
+    uint8_t peerIRK[16];
+    uint8_t localIRK[16];
+  } addDevice;
+  addDevice.peerAddressType = addressType;
+  for(int i=0; i<6; i++) addDevice.peerAddress[5-i] = peerAddress[i];
+  for(int i=0; i<16; i++) {
+    addDevice.peerIRK[15-i]  = peerIrk[i];
+    addDevice.localIRK[15-i] = localIrk[i];
+  }
+  Serial.print("ADDTYPE    :");
+  btct.printBytes(&addDevice.peerAddressType,1);
+  Serial.print("adddddd    :");
+  btct.printBytes(addDevice.peerAddress,6);
+  Serial.print("Peer IRK   :");
+  btct.printBytes(addDevice.peerIRK,16);
+  Serial.print("localIRK   :");
+  btct.printBytes(addDevice.localIRK,16);
+  sendCommand(OGF_LE_CTL << 10 | 0x27, sizeof(addDevice), &addDevice); 
+
+  leStartResolvingAddresses();
+}
+int HCIClass::leStopResolvingAddresses(){
+    uint8_t enable = 0;
+    return HCI.sendCommand(OGF_LE_CTL << 10 | 0x2D, 1,&enable); // Disable address resolution
+}
+int HCIClass::leStartResolvingAddresses(){
+  uint8_t enable = 1;
+  return HCI.sendCommand(OGF_LE_CTL << 10 | 0x2D, 1,&enable); // Disable address resolution
+}
+int HCIClass::leReadPeerResolvableAddress(uint8_t peerAddressType, uint8_t* peerIdentityAddress, uint8_t* peerResolvableAddress){
+  struct __attribute__ ((packed)) Request {
+    uint8_t addressType;
+    uint8_t identityAddress[6];
+  } request;
+  request.addressType = peerAddressType;
+  for(int i=0; i<6; i++) request.identityAddress[5-i] = peerIdentityAddress[i];
+  
+
+  int res = sendCommand(OGF_LE_CTL << 10 | 0x2B, sizeof(request), &request);
+  Serial.print("res: 0x");
+  Serial.println(res, HEX);
+  if(res==0){
+    struct __attribute__ ((packed)) Response {
+      uint8_t status;
+      uint8_t peerResolvableAddress[6];
+    } *response = (Response*)_cmdResponse;
+    Serial.print("Address resolution status: 0x");
+    Serial.println(response->status, HEX);
+    Serial.print("peer resolvable address: ");
+    btct.printBytes(response->peerResolvableAddress,6);
+  }
+  return res;
+}
+
+int HCIClass::writeLK(uint8_t peerAddress[], uint8_t LK[]){
+  struct __attribute__ ((packed)) StoreLK {
+    uint8_t nKeys;
+    uint8_t BD_ADDR[6];
+    uint8_t LTK[16];
+  } storeLK;
+  storeLK.nKeys = 1;
+  memcpy(storeLK.BD_ADDR, peerAddress, 6);
+  for(int i=0; i<16; i++) storeLK.LTK[15-i] = LK[i];
+  HCI.sendCommand(OGF_HOST_CTL << 10 | 0x11, sizeof(storeLK), &storeLK);
+}
+int HCIClass::readStoredLKs(){
+  uint8_t BD_ADDR[6];
+  readStoredLK(BD_ADDR, 1);
+}
+int HCIClass::readStoredLK(uint8_t BD_ADDR[], uint8_t read_all ){
+  struct __attribute__ ((packed)) Request {
+    uint8_t BD_ADDR[6];
+    uint8_t read_a;
+  } request = {0,0};
+  for(int i=0; i<6; i++) request.BD_ADDR[5-i] = BD_ADDR[i];
+  request.read_a = read_all;
+  return sendCommand(OGF_HOST_CTL << 10 | 0xD, sizeof(request), &request);
+}
+
+int HCIClass::tryResolveAddress(uint8_t* BDAddr, uint8_t* address){
+  uint8_t iphone[16] = {0xA6, 0xD2, 0xD, 0xD3, 0x4F, 0x13, 0x42, 0x4F, 0xE1, 0xC1, 0xFD, 0x22, 0x2E, 0xC5, 0x6A, 0x2D};
+  uint8_t irk[16];
+  for(int i=0; i<16; i++) irk[15-i] = iphone[i];
+  bool foundMatch = false;
+  if(HCI._getIRKs!=0){
+    uint8_t nIRKs = 0;
+    uint8_t** BDAddrType = new uint8_t*;
+    uint8_t*** BADDRs = new uint8_t**;
+    uint8_t*** IRKs = new uint8_t**;
+    uint8_t* memcheck;
+
+
+    if(!HCI._getIRKs(&nIRKs, BDAddrType, BADDRs, IRKs)){
+      Serial.println("error getting IRKs.");
+    }
+    for(int i=0; i<nIRKs; i++){
+      if(!foundMatch){
+#ifdef _BLE_TRACE_
+        Serial.print("BDAddr type:      : 0x");
+        Serial.println((*BDAddrType)[i],HEX);
+        Serial.print("BDAddr            : ");
+        btct.printBytes((*BADDRs)[i],6);
+        Serial.print("IRK               : ");
+        btct.printBytes((*IRKs)[i],16);
+#endif
+        uint8_t hashresult[3];
+        btct.ah((*IRKs)[i], BDAddr, hashresult);
+#ifdef _BLE_TRACE_
+        Serial.print("hash match        : ");
+        btct.printBytes(hashresult,3);
+        Serial.print("                  : ");
+        btct.printBytes(&BDAddr[3],3);
+#endif
+
+        for(int k=0; k<3; k++){
+          if(hashresult[k] == BDAddr[3 + k]){
+            foundMatch = true;
+          }else{
+            foundMatch = false;
+            break;
+          }
+        }
+        if(foundMatch){
+          memcpy(address, (*BADDRs)[i],6);
+        }
+      }
+      delete[] (*BADDRs)[i];
+      delete[] (*IRKs)[i];
+    }
+    delete[] (*BDAddrType);
+    delete BDAddrType;
+    delete[] (*BADDRs);
+    delete BADDRs;
+    delete[] (*IRKs);
+    delete IRKs;
+    
+    if(foundMatch){
+      return 1;
+    }
+  }
+  return 0;
+}
 
 int HCIClass::sendAclPkt(uint16_t handle, uint8_t cid, uint8_t plen, void* data)
 {
@@ -665,6 +821,58 @@ void HCIClass::handleEventPkt(uint8_t /*plen*/, uint8_t pdata[])
     btct.printBytes(&encryptionChange->enabled,1);
 #endif
     if(encryptionChange->enabled>0){
+      // 0001 1110
+      if((ATT.getPeerEncryption(encryptionChange->connectionHandle)&PEER_ENCRYPTION::PAIRING_REQUEST)>0){
+        if(ATT.localKeyDistribution.EncKey()){
+#ifdef _BLE_TRACE_
+          Serial.println("Enc key set but sould be ignored");
+#endif
+        }else{
+#ifdef _BLE_TRACE_
+          Serial.println("No enc key distribution");
+#endif
+        }
+        // From page 1681 bluetooth standard - order matters
+        if(ATT.localKeyDistribution.IdKey()){
+          /// We shall distribute IRK and address using identity information 
+          {
+            uint8_t response[17];
+            response[0] = CONNECTION_IDENTITY_INFORMATION; // Identity information.
+            for(int i=0; i<16; i++) response[16-i] = ATT.localIRK[i];
+            HCI.sendAclPkt(encryptionChange->connectionHandle, SECURITY_CID, sizeof(response), response);
+#ifdef _BLE_TRACE_
+            Serial.println("Distribute ID Key");
+#endif
+          }
+          {
+            uint8_t response[8];
+            response[0] = CONNECTION_IDENTITY_ADDRESS; // Identity address information
+            response[1] = 0x00; // Static local address
+            for(int i=0; i<6; i++) response[7-i] = HCI.localAddr[i];
+            HCI.sendAclPkt(encryptionChange->connectionHandle, SECURITY_CID, sizeof(response), response);
+          }
+        }
+        if(ATT.localKeyDistribution.SignKey()){
+          /// We shall distribut CSRK
+#ifdef _BLE_TRACE_
+          Serial.println("We shall distribute CSRK // not implemented");
+#endif
+
+        }else{
+          // Serial.println("We don't want to distribute CSRK");
+        }
+        if(ATT.localKeyDistribution.LinkKey()){
+#ifdef _BLE_TRACE_
+          Serial.println("We would like to use LTK to generate BR/EDR // not implemented");
+#endif
+        }
+      }else{
+#ifdef _BLE_TRACE_
+        Serial.println("Reconnection, not pairing so no keys");
+        Serial.println(ATT.getPeerEncryption(encryptionChange->connectionHandle),HEX);
+#endif
+      }
+
       ATT.setPeerEncryption(encryptionChange->connectionHandle, PEER_ENCRYPTION::ENCRYPTED_AES);
       if(ATT.writeBufferSize > 0){
         ATT.processWriteBuffer();
@@ -740,6 +948,27 @@ void HCIClass::handleEventPkt(uint8_t /*plen*/, uint8_t pdata[])
       data += 2;
     }
   }
+  else if(eventHdr->evt == EVT_RETURN_LINK_KEYS)
+  {
+    uint8_t num_keys = (uint8_t)pdata[sizeof(HCIEventHdr)];
+    // Serial.print("N keys: ");
+    // Serial.println(num_keys);
+    uint8_t BD_ADDRs[num_keys][6];
+    uint8_t LKs[num_keys][16];
+    auto nAddresss = [pdata](uint8_t nAddr)->uint8_t*{
+      return (uint8_t*) &pdata[sizeof(HCIEventHdr)] + 1 + nAddr*6 + nAddr*16;
+    };
+    auto nLK = [pdata](uint8_t nLK)->uint8_t*{
+      return (uint8_t*) &pdata[sizeof(HCIEventHdr)] + 1 + (nLK+1)*6 + nLK*16;
+    };
+    // Serial.println("Stored LKs are: ");
+    // for(int i=0; i<num_keys; i++){
+    //   Serial.print("Address : ");
+    //   btct.printBytes(nAddresss(i),6);
+    //   Serial.print("LK      : ");
+    //   btct.printBytes(nLK(i),16);
+    // }
+  }
   else if(eventHdr->evt == 0x10)
   {
     struct __attribute__ ((packed)) CmdHardwareError {
@@ -761,6 +990,57 @@ void HCIClass::handleEventPkt(uint8_t /*plen*/, uint8_t pdata[])
     Serial.println(leMetaHeader->subevent,HEX);
 #endif
     switch((LE_META_EVENT)leMetaHeader->subevent){
+      case 0x0A:{
+        struct __attribute__ ((packed)) EvtLeConnectionComplete {
+          uint8_t status;
+          uint16_t handle;
+          uint8_t role;
+          uint8_t peerBdaddrType;
+          uint8_t peerBdaddr[6];
+          uint8_t localResolvablePrivateAddress[6];
+          uint8_t peerResolvablePrivateAddress[6];
+          uint16_t interval;
+          uint16_t latency;
+          uint16_t supervisionTimeout;
+          uint8_t masterClockAccuracy;
+        } *leConnectionComplete = (EvtLeConnectionComplete*)&pdata[sizeof(HCIEventHdr) + sizeof(LeMetaEventHeader)];
+      
+        if (leConnectionComplete->status == 0x00) {
+          ATT.addConnection(leConnectionComplete->handle,
+                            leConnectionComplete->role,
+                            leConnectionComplete->peerBdaddrType,
+                            leConnectionComplete->peerBdaddr,
+                            leConnectionComplete->interval,
+                            leConnectionComplete->latency,
+                            leConnectionComplete->supervisionTimeout,
+                            leConnectionComplete->masterClockAccuracy);
+
+          L2CAPSignaling.addConnection(leConnectionComplete->handle,
+                                leConnectionComplete->role,
+                                leConnectionComplete->peerBdaddrType,
+                                leConnectionComplete->peerBdaddr,
+                                leConnectionComplete->interval,
+                                leConnectionComplete->latency,
+                                leConnectionComplete->supervisionTimeout,
+                                leConnectionComplete->masterClockAccuracy);
+        }
+        // uint8_t address[6];
+        // uint8_t BDAddr[6];
+        // for(int i=0; i<6; i++) BDAddr[5-i] = leConnectionComplete->peerBdaddr[i];
+        // leReadPeerResolvableAddress(leConnectionComplete->peerBdaddrType,BDAddr,address);
+        // Serial.print("Resolving address: ");
+        // btct.printBytes(BDAddr, 6);
+        // Serial.print("BT answer         : ");
+        // btct.printBytes(address, 6);
+
+#ifdef _BLE_TRACE_
+        Serial.print("Resolved peer     : ");
+        btct.printBytes(leConnectionComplete->peerResolvablePrivateAddress,6);
+        Serial.print("Resolved local    : ");
+        btct.printBytes(leConnectionComplete->localResolvablePrivateAddress,6);
+#endif
+        break;
+      }
       case CONN_COMPLETE:{
         struct __attribute__ ((packed)) EvtLeConnectionComplete {
           uint8_t status;
@@ -793,6 +1073,14 @@ void HCIClass::handleEventPkt(uint8_t /*plen*/, uint8_t pdata[])
                                 leConnectionComplete->supervisionTimeout,
                                 leConnectionComplete->masterClockAccuracy);
         }
+        uint8_t address[6];
+        uint8_t BDAddr[6];
+        for(int i=0; i<6; i++) BDAddr[5-i] = leConnectionComplete->peerBdaddr[i];
+        // leReadPeerResolvableAddress(leConnectionComplete->peerBdaddrType,BDAddr,address);
+        // Serial.print("Resolving address: ");
+        // btct.printBytes(BDAddr, 6);
+        // Serial.print("BT answer         : ");
+        // btct.printBytes(address, 6);
         break;
       }
       case ADVERTISING_REPORT:{
@@ -818,8 +1106,7 @@ void HCIClass::handleEventPkt(uint8_t /*plen*/, uint8_t pdata[])
         }
         break;
       }
-      case LONG_TERM_KEY_REQUEST:
-      {
+      case LONG_TERM_KEY_REQUEST:{
         struct __attribute__ ((packed)) LTKRequest
         {
           uint8_t subEventCode;
@@ -836,14 +1123,25 @@ void HCIClass::handleEventPkt(uint8_t /*plen*/, uint8_t pdata[])
         Serial.print("EDIV           : ");
         btct.printBytes(ltkRequest->encryptedDiversifier,2);
 #endif
-
+        // Load our LTK for this connection.
+        uint8_t peerAddr[7];
+        uint8_t resolvableAddr[6];
+        ATT.getPeerAddrWithType(ltkRequest->connectionHandle, peerAddr);
+        
+        if(ATT.getPeerResolvedAddress(ltkRequest->connectionHandle, resolvableAddr)
+          && !((ATT.getPeerEncryption(ltkRequest->connectionHandle) & PEER_ENCRYPTION::PAIRING_REQUEST)>0)){
+          _getLTK(resolvableAddr, HCI.LTK);
+        }else{
+          _getLTK(&peerAddr[1], HCI.LTK);
+        }
+        // }
         // Send our LTK back
         struct __attribute__ ((packed)) LTKReply
         {
           uint16_t connectionHandle;
           uint8_t LTK[16];
         } ltkReply = {0,0};
-        ltkReply.connectionHandle = ATT.getPeerEncrptingConnectionHandle();
+        ltkReply.connectionHandle = ltkRequest->connectionHandle;
         for(int i=0; i<16; i++) ltkReply.LTK[15-i] = HCI.LTK[i];
         int result = sendCommand(OGF_LE_CTL << 10 | LE_COMMAND::LONG_TERM_KEY_REPLY,sizeof(ltkReply), &ltkReply);
 
@@ -875,8 +1173,7 @@ void HCIClass::handleEventPkt(uint8_t /*plen*/, uint8_t pdata[])
         }
         break;
       }
-      case REMOTE_CONN_PARAM_REQ:
-      {
+      case REMOTE_CONN_PARAM_REQ:{
         struct __attribute__ ((packed)) RemoteConnParamReq {
           uint8_t subEventCode;
           uint16_t connectionHandle;
@@ -914,8 +1211,7 @@ void HCIClass::handleEventPkt(uint8_t /*plen*/, uint8_t pdata[])
         sendCommand(OGF_LE_CTL << 10 | 0x20, sizeof(remoteConnParamReqReply), &remoteConnParamReqReply);
         break;
       }
-      case READ_LOCAL_P256_COMPLETE:
-      {
+      case READ_LOCAL_P256_COMPLETE:{
         struct __attribute__ ((packed)) EvtReadLocalP256Complete{
           uint8_t subEventCode;
           uint8_t status;
@@ -1007,8 +1303,7 @@ void HCIClass::handleEventPkt(uint8_t /*plen*/, uint8_t pdata[])
         }
         break;
       }
-      case GENERATE_DH_KEY_COMPLETE:
-      {
+      case GENERATE_DH_KEY_COMPLETE:{
         struct __attribute__ ((packed)) EvtLeDHKeyComplete{
           uint8_t subEventCode;
           uint8_t status;
diff --git a/src/utility/HCI.h b/src/utility/HCI.h
index 0b9c8302..de15bdf8 100644
--- a/src/utility/HCI.h
+++ b/src/utility/HCI.h
@@ -90,6 +90,17 @@ class HCIClass {
   virtual int leCancelConn();
   virtual int leEncrypt(uint8_t* Key, uint8_t* plaintext, uint8_t* status, uint8_t* ciphertext);
 
+  virtual int saveNewAddress(uint8_t addressType, uint8_t* address, uint8_t* peerIrk, uint8_t* remoteIrk);
+  virtual int leAddResolvingAddress(uint8_t addressType, uint8_t* address, uint8_t* peerIrk, uint8_t* remoteIrk);
+  virtual int leStopResolvingAddresses();
+  virtual int leStartResolvingAddresses();
+  virtual int leReadPeerResolvableAddress(uint8_t peerAddressType, uint8_t* peerIdentityAddress, uint8_t* peerResolvableAddress);
+
+  virtual int readStoredLKs();
+  virtual int readStoredLK(uint8_t BD_ADDR[], uint8_t read_all = 0);
+  virtual int writeLK(uint8_t peerAddress[], uint8_t LK[]);
+  virtual int tryResolveAddress(uint8_t* BDAddr, uint8_t* address);
+
   virtual int sendAclPkt(uint16_t handle, uint8_t cid, uint8_t plen, void* data);
 
   virtual int disconnect(uint16_t handle);
@@ -105,6 +116,12 @@ class HCIClass {
   uint8_t DHKey[32];
   uint8_t localAddr[6];
   uint8_t LTK[16];
+
+  int (*_storeIRK)(uint8_t* address, uint8_t* peerIrk);
+  int (*_getIRKs)(uint8_t* nIRKs,uint8_t** BADDR_type, uint8_t*** BADDRs, uint8_t*** IRKs);
+  int (*_storeLTK)(uint8_t*, uint8_t*);
+  int (*_getLTK)(uint8_t*, uint8_t*);
+
 private:
 
   virtual void handleAclDataPkt(uint8_t plen, uint8_t pdata[]);
diff --git a/src/utility/L2CAPSignaling.cpp b/src/utility/L2CAPSignaling.cpp
index 3779eb29..512e7665 100644
--- a/src/utility/L2CAPSignaling.cpp
+++ b/src/utility/L2CAPSignaling.cpp
@@ -21,6 +21,7 @@
 #include "ATT.h"
 #include "btct.h"
 #include "L2CAPSignaling.h"
+#include "keyDistribution.h"
 
 #define CONNECTION_PARAMETER_UPDATE_REQUEST  0x12
 #define CONNECTION_PARAMETER_UPDATE_RESPONSE 0x13
@@ -137,13 +138,22 @@ void L2CAPSignalingClass::handleSecurityData(uint16_t connectionHandle, uint8_t
       uint8_t initiatorKeyDistribution;
       uint8_t responderKeyDistribution;
     } *pairingRequest = (PairingRequest*)l2capSignalingHdr->data;
+
+
+    ATT.remoteKeyDistribution = KeyDistribution(pairingRequest->initiatorKeyDistribution);
+    ATT.localKeyDistribution = KeyDistribution(pairingRequest->responderKeyDistribution);
+    KeyDistribution rkd(pairingRequest->responderKeyDistribution);
     
     uint8_t peerIOCap[3];
     peerIOCap[0] = pairingRequest->authReq;
     peerIOCap[1] = pairingRequest->oobDataFlag;
     peerIOCap[2] = pairingRequest->ioCapability;
     ATT.setPeerIOCap(connectionHandle, peerIOCap);
-
+    ATT.setPeerEncryption(connectionHandle, ATT.getPeerEncryption(connectionHandle) | PEER_ENCRYPTION::PAIRING_REQUEST);
+#ifdef _BLE_TRACE_
+    Serial.print("Peer encryption : 0b");
+    Serial.print(ATT.getPeerEncryption(connectionHandle), BIN);
+#endif
     struct __attribute__ ((packed)) PairingResponse {
       uint8_t code;
       uint8_t ioCapability;
@@ -154,7 +164,7 @@ void L2CAPSignalingClass::handleSecurityData(uint16_t connectionHandle, uint8_t
       uint8_t responderKeyDistribution;
     } response = { CONNECTION_PAIRING_RESPONSE, LOCAL_IOCAP, 0, LOCAL_AUTHREQ, 0x10, 0b1011, 0b1011};
 
-    HCI.sendAclPkt(connectionHandle, 0x06, sizeof(response), &response);
+    HCI.sendAclPkt(connectionHandle, SECURITY_CID, sizeof(response), &response);
   }
   else if (code == CONNECTION_PAIRING_RANDOM)
   {
@@ -173,7 +183,7 @@ void L2CAPSignalingClass::handleSecurityData(uint16_t connectionHandle, uint8_t
     } response = { CONNECTION_PAIRING_RANDOM, 0};
     for(int i=0; i< 16; i++) response.Nb[15-i] = HCI.Nb[i];
 
-    HCI.sendAclPkt(connectionHandle, 0x06, sizeof(response), &response);
+    HCI.sendAclPkt(connectionHandle, SECURITY_CID, sizeof(response), &response);
   }
   else if (code == CONNECTION_PAIRING_RESPONSE)
   {
@@ -190,6 +200,31 @@ void L2CAPSignalingClass::handleSecurityData(uint16_t connectionHandle, uint8_t
     Serial.println(pairingFailed->reason,HEX);
 #endif
   }
+  else if (code == CONNECTION_IDENTITY_INFORMATION){
+    struct __attribute__ ((packed)) IdentityInformation {
+      uint8_t code;
+      uint8_t PeerIRK[16];
+    } *identityInformation = (IdentityInformation*)data;
+    for(int i=0; i<16; i++) ATT.peerIRK[15-i] = identityInformation->PeerIRK[i];
+#ifdef _BLE_TRACE_
+    Serial.println("Saved peer IRK");
+#endif
+  }
+  else if (code == CONNECTION_IDENTITY_ADDRESS){
+    struct __attribute__ ((packed)) IdentityAddress {
+      uint8_t code;
+      uint8_t addressType;
+      uint8_t address[6];
+    } *identityAddress = (IdentityAddress*)data;
+    // we can save this information now.
+    uint8_t peerAddress[6];
+    for(int i; i<6; i++) peerAddress[5-i] = identityAddress->address[i];
+
+    HCI.saveNewAddress(identityAddress->addressType, peerAddress, ATT.peerIRK, ATT.localIRK);
+    if(HCI._storeLTK!=0){
+      HCI._storeLTK(peerAddress, HCI.LTK);
+    }
+  }
   else if (code == CONNECTION_PAIRING_PUBLIC_KEY){
     /// Received a public key
     struct __attribute__ ((packed)) ConnectionPairingPublicKey {
@@ -211,7 +246,7 @@ void L2CAPSignalingClass::handleSecurityData(uint16_t connectionHandle, uint8_t
       LE_COMMAND::READ_LOCAL_P256,
     };
 
-    if(ATT.setPeerEncryption(connectionHandle,PEER_ENCRYPTION::REQUESTED_ENCRYPTION)){
+    if(ATT.setPeerEncryption(connectionHandle, ATT.getPeerEncryption(connectionHandle) | PEER_ENCRYPTION::REQUESTED_ENCRYPTION)){
 #ifdef _BLE_TRACE_
       Serial.println("[Info] Pairing public key");
       Serial.println("Requested encryption stored.");
@@ -244,7 +279,7 @@ void L2CAPSignalingClass::handleSecurityData(uint16_t connectionHandle, uint8_t
 
     HCI.readBdAddr();
     ATT.setPeerEncryption(connectionHandle, encryptionState);
-    if(encryptionState & PEER_ENCRYPTION::DH_KEY_CALULATED > 0){
+    if((encryptionState & PEER_ENCRYPTION::DH_KEY_CALULATED) > 0){
       // We've already calculated the DHKey so we can calculate our check and send it.
       
       uint8_t MacKey[16];
diff --git a/src/utility/btct.cpp b/src/utility/btct.cpp
index 8fad5173..d78e328e 100644
--- a/src/utility/btct.cpp
+++ b/src/utility/btct.cpp
@@ -119,6 +119,38 @@ int BluetoothCryptoToolbox::f6(uint8_t W[], uint8_t N1[],uint8_t N2[],uint8_t R[
     return 1;
 }
 // AES_CMAC from RFC
+int BluetoothCryptoToolbox::ah(uint8_t k[16], uint8_t r[3], uint8_t* result)
+{
+    uint8_t r_[16];
+    int i=0;
+    for(i=0; i<16; i++) r_[i] = 0;
+    for(i=0; i<3; i++)  r_[i+13] = r[i];
+    uint8_t intermediate[16];
+    AES_128(k,r_,intermediate);
+    for(i=0; i<3; i++){
+        result[i] = intermediate[i+13];
+    }
+    return 1;
+}
+void BluetoothCryptoToolbox::testAh()
+{
+    uint8_t irk[16] = {0xec,0x02,0x34,0xa3,0x57,0xc8,0xad,0x05,0x34,0x10,0x10,0xa6,0x0a,0x39,0x7d,0x9b};         
+    uint8_t r[3]   = {0x70,0x81,0x94};
+    uint8_t expected_AES[16] = {0x15,0x9d,0x5f,0xb7,0x2e,0xbe,0x23,0x11,0xa4,0x8c,0x1b,0xdc,0xc4,0x0d,0xfb,0xaa};
+    uint8_t expected_final[3] = {0x0d,0xfb,0xaa};
+    
+    for(int i=0; i<3; i++) r[2-i] = expected_final[3+i];
+    uint8_t ourResult[3];
+    ah(irk, expected_final, ourResult);
+
+
+    Serial.print("Expected   : ");
+    printBytes(&expected_final[3], 3);
+    Serial.print("Actual     : ");
+    printBytes(ourResult, 3);
+}
+
+
 void BluetoothCryptoToolbox::AES_CMAC ( unsigned char *key, unsigned char *input, int length,
                   unsigned char *mac )
 {
diff --git a/src/utility/btct.h b/src/utility/btct.h
index 87e515af..43c0b0d6 100644
--- a/src/utility/btct.h
+++ b/src/utility/btct.h
@@ -13,9 +13,11 @@ class BluetoothCryptoToolbox{
     int f5(uint8_t DHKey[],uint8_t N_master[], uint8_t N_slave[],
             uint8_t BD_ADDR_master[], uint8_t BD_ADDR_slave[], uint8_t MacKey[], uint8_t LTK[]);
     int f6(uint8_t W[], uint8_t N1[],uint8_t N2[],uint8_t R[], uint8_t IOCap[], uint8_t A1[], uint8_t A2[], uint8_t Ex[]);
+    int ah(uint8_t k[16], uint8_t r[3], uint8_t result[3]);
     void test();
     void testF5();
     void testF6();
+    void testAh();
 private:
     int AES_128(uint8_t key[], uint8_t data_in[], uint8_t data_out[]);
     void leftshift_onebit(unsigned char *input,unsigned char *output);
diff --git a/src/utility/keyDistribution.cpp b/src/utility/keyDistribution.cpp
new file mode 100644
index 00000000..1a9fe099
--- /dev/null
+++ b/src/utility/keyDistribution.cpp
@@ -0,0 +1,24 @@
+#include "keyDistribution.h"
+
+KeyDistribution::KeyDistribution(){}
+KeyDistribution::KeyDistribution(uint8_t octet):_octet(octet){}
+
+#define ENCKEY  0b00000001
+#define IDKEY   0b00000010
+#define SIGNKEY 0b00000100
+#define LINKKEY 0b00001000
+void KeyDistribution::setOctet( uint8_t octet){_octet = octet;}
+uint8_t KeyDistribution::getOctet() {return _octet;}
+// Ignored when SMP is on LE transport
+bool KeyDistribution::EncKey(){ return (_octet & ENCKEY)>0;}
+// Device shall distribute IRK using Identity information command followed by its address using Identity address information
+bool KeyDistribution::IdKey(){ return  (_octet & IDKEY)>0;}
+// Device shall distribute CSRK using signing information command
+bool KeyDistribution::SignKey(){ return (_octet & SIGNKEY)>0;}
+// Device would like to derive BR/EDR from LTK
+bool KeyDistribution::LinkKey(){ return (_octet & LINKKEY)>0;}
+
+void KeyDistribution::setEncKey(bool state) { _octet= state? _octet|ENCKEY  : _octet&~ENCKEY;}
+void KeyDistribution::setIdKey(bool state)  { _octet= state? _octet|IDKEY   : _octet&~IDKEY;}
+void KeyDistribution::setSignKey(bool state){ _octet= state? _octet|SIGNKEY : _octet&~SIGNKEY;}
+void KeyDistribution::setLinkKey(bool state){ _octet= state? _octet|LINKKEY : _octet&~LINKKEY;}
\ No newline at end of file
diff --git a/src/utility/keyDistribution.h b/src/utility/keyDistribution.h
new file mode 100644
index 00000000..d78fcc1a
--- /dev/null
+++ b/src/utility/keyDistribution.h
@@ -0,0 +1,29 @@
+#ifndef _KEY_DISTRIBUTION_H_
+#define _KEY_DISTRIBUTION_H_
+#include <Arduino.h>
+
+class KeyDistribution{
+public:
+    KeyDistribution();
+    KeyDistribution(uint8_t octet);
+    void setOctet( uint8_t octet);
+    uint8_t getOctet();
+    // Ignored when SMP is on LE transport
+    bool EncKey();
+    // Device shall distribute IRK using Identity information command followed by its address using Identity address information
+    bool IdKey();
+    // Device shall distribute CSRK using signing information command
+    bool SignKey();
+    // Device would like to derive BR/EDR from LTK
+    bool LinkKey();
+
+    void setEncKey(bool state);
+    void setIdKey(bool state);
+    void setSignKey(bool state);
+    void setLinkKey(bool state);
+private:
+    uint8_t _octet;
+    // 1.   IRK by the slave2.   BD ADDR by the slave3.   CSRK by the slave4.   IRK by the master5.   BD_ADDR by the master6.   CSRK by the master
+};
+
+#endif
\ No newline at end of file

From 1431f3de4f6a4d733b1438bb3fe72a3ea2b614d9 Mon Sep 17 00:00:00 2001
From: unknownconstant <unknownconstant>
Date: Sat, 2 Jan 2021 23:08:27 +0000
Subject: [PATCH 005/112] Fixed packet fragmentation

---
 src/utility/HCI.cpp             | 21 +++++++++++++----
 src/utility/L2CAPSignaling.cpp  | 13 +++++++++--
 src/utility/bitDescriptions.cpp | 30 ++++++++++++++++++++++++
 src/utility/bitDescriptions.h   | 41 +++++++++++++++++++++++++++++++++
 src/utility/keyDistribution.cpp |  2 +-
 5 files changed, 100 insertions(+), 7 deletions(-)
 create mode 100644 src/utility/bitDescriptions.cpp
 create mode 100644 src/utility/bitDescriptions.h

diff --git a/src/utility/HCI.cpp b/src/utility/HCI.cpp
index c3d66848..376cfb9c 100644
--- a/src/utility/HCI.cpp
+++ b/src/utility/HCI.cpp
@@ -707,9 +707,7 @@ void HCIClass::handleAclDataPkt(uint8_t /*plen*/, uint8_t pdata[])
     uint16_t cid;
   } *aclHdr = (HCIACLHdr*)pdata;
 
-#ifdef _BLE_TRACE_
-  Serial.println("Received data");
-#endif
+
   uint16_t aclFlags = (aclHdr->handle & 0xf000) >> 12;
 
   if ((aclHdr->dlen - 4) != aclHdr->len) {
@@ -729,6 +727,17 @@ void HCIClass::handleAclDataPkt(uint8_t /*plen*/, uint8_t pdata[])
   }
 
   if ((aclHdr->dlen - 4) != aclHdr->len) {
+#ifdef _BLE_TRACE_
+    Serial.println("Don't have full packet yet");
+    Serial.print("Handle: ");
+    btct.printBytes((uint8_t*)&aclHdr->handle,2);
+    Serial.print("dlen: ");
+    btct.printBytes((uint8_t*)&aclHdr->dlen,2);
+    Serial.print("len: ");
+    btct.printBytes((uint8_t*)&aclHdr->len,2);
+    Serial.print("cid: ");
+    btct.printBytes((uint8_t*)&aclHdr->cid,2);
+#endif
     // don't have the full packet yet
     return;
   }
@@ -751,7 +760,11 @@ void HCIClass::handleAclDataPkt(uint8_t /*plen*/, uint8_t pdata[])
 #ifdef _BLE_TRACE_
     Serial.println("Security data");
 #endif
-    L2CAPSignaling.handleSecurityData(aclHdr->handle & 0x0fff, aclHdr->len, &_recvBuffer[1 + sizeof(HCIACLHdr)]);
+    if (aclFlags == 0x1){
+      L2CAPSignaling.handleSecurityData(aclHdr->handle & 0x0fff, aclHdr->len, &_aclPktBuffer[sizeof(HCIACLHdr)]);
+    }else{
+      L2CAPSignaling.handleSecurityData(aclHdr->handle & 0x0fff, aclHdr->len, &_recvBuffer[1 + sizeof(HCIACLHdr)]);
+    }
 
   }else {
     struct __attribute__ ((packed)) {
diff --git a/src/utility/L2CAPSignaling.cpp b/src/utility/L2CAPSignaling.cpp
index 512e7665..7d9c2c47 100644
--- a/src/utility/L2CAPSignaling.cpp
+++ b/src/utility/L2CAPSignaling.cpp
@@ -22,7 +22,7 @@
 #include "btct.h"
 #include "L2CAPSignaling.h"
 #include "keyDistribution.h"
-
+#include "bitDescriptions.h"
 #define CONNECTION_PARAMETER_UPDATE_REQUEST  0x12
 #define CONNECTION_PARAMETER_UPDATE_RESPONSE 0x13
 
@@ -143,6 +143,15 @@ void L2CAPSignalingClass::handleSecurityData(uint16_t connectionHandle, uint8_t
     ATT.remoteKeyDistribution = KeyDistribution(pairingRequest->initiatorKeyDistribution);
     ATT.localKeyDistribution = KeyDistribution(pairingRequest->responderKeyDistribution);
     KeyDistribution rkd(pairingRequest->responderKeyDistribution);
+    AuthReq req(pairingRequest->authReq);
+#ifdef _BLE_TRACE_
+    Serial.print("Req has properties: ");
+    Serial.print(req.Bonding()?"bonding, ":"no bonding, ");
+    Serial.print(req.CT2()?"CT2, ":"no CT2, ");
+    Serial.print(req.KeyPress()?"KeyPress, ":"no KeyPress, ");
+    Serial.print(req.MITM()?"MITM, ":"no MITM, ");
+    Serial.print(req.SC()?"SC, ":"no SC, ");
+#endif
     
     uint8_t peerIOCap[3];
     peerIOCap[0] = pairingRequest->authReq;
@@ -152,7 +161,7 @@ void L2CAPSignalingClass::handleSecurityData(uint16_t connectionHandle, uint8_t
     ATT.setPeerEncryption(connectionHandle, ATT.getPeerEncryption(connectionHandle) | PEER_ENCRYPTION::PAIRING_REQUEST);
 #ifdef _BLE_TRACE_
     Serial.print("Peer encryption : 0b");
-    Serial.print(ATT.getPeerEncryption(connectionHandle), BIN);
+    Serial.println(ATT.getPeerEncryption(connectionHandle), BIN);
 #endif
     struct __attribute__ ((packed)) PairingResponse {
       uint8_t code;
diff --git a/src/utility/bitDescriptions.cpp b/src/utility/bitDescriptions.cpp
new file mode 100644
index 00000000..bf896bc1
--- /dev/null
+++ b/src/utility/bitDescriptions.cpp
@@ -0,0 +1,30 @@
+#include "bitDescriptions.h"
+
+
+#define BONDING_BIT  0b00000001
+#define MITM_BIT     0b00000100
+#define SC_BIT       0b00001000
+#define KEYPRESS_BIT 0b00010000
+#define CT2_BIT      0b00100000
+
+
+AuthReq::AuthReq(){}
+AuthReq::AuthReq(uint8_t octet):_octet(octet){}
+bool AuthReq::Bonding(){ return (_octet & BONDING_BIT)>0;}
+bool AuthReq::MITM(){ return (_octet & MITM_BIT)>0;}
+bool AuthReq::SC(){ return (_octet & SC_BIT)>0;}
+bool AuthReq::KeyPress(){ return (_octet & KEYPRESS_BIT)>0;}
+bool AuthReq::CT2(){ return (_octet & CT2_BIT)>0;}
+
+
+void AuthReq::setBonding(bool state) { _octet= state? _octet|BONDING_BIT  : _octet&~BONDING_BIT;}
+void AuthReq::setMITM(bool state)  { _octet= state? _octet|MITM_BIT   : _octet&~MITM_BIT;}
+void AuthReq::setSC(bool state){ _octet= state? _octet|SC_BIT : _octet&~SC_BIT;}
+void AuthReq::setKeyPress(bool state){ _octet= state? _octet|KEYPRESS_BIT : _octet&~KEYPRESS_BIT;}
+void AuthReq::setCT2(bool state){ _octet= state? _octet|CT2_BIT : _octet&~CT2_BIT;}
+
+uint8_t _octet;
+
+
+void AuthReq::setOctet( uint8_t octet){_octet = octet;}
+uint8_t AuthReq::getOctet() {return _octet;}
diff --git a/src/utility/bitDescriptions.h b/src/utility/bitDescriptions.h
new file mode 100644
index 00000000..6d32c52a
--- /dev/null
+++ b/src/utility/bitDescriptions.h
@@ -0,0 +1,41 @@
+#ifndef _BIT_DESCRIPTIONS_H_
+#define _BIT_DESCRIPTIONS_H_
+#include <Arduino.h>
+
+class AuthReq{
+public:
+    AuthReq();
+    AuthReq(uint8_t octet);
+    void setOctet( uint8_t octet);
+    uint8_t getOctet();
+
+
+    // The Bonding_Flags field is a 2-bit field that indicates the type of bonding being requested by the initiating device
+    bool Bonding();
+    // The MITM field is a 1-bit flag that is set to one if the device is requesting MITM protection
+    bool MITM();
+    // The SC field is a 1 bit flag. If LE Secure Connections pairing is supported by the device, then the SC field shall be set to 1, otherwise it shall be set to 0.
+    bool SC();
+    // The keypress field is a 1-bit flag that is used only in the Passkey Entry protocol and shall be ignored in other protocols.
+    bool KeyPress();
+    // The CT2 field is a 1-bit flag that shall be set to 1 upon transmission to indicate support for the h7 function.
+    bool CT2();
+
+    void setBonding(bool state);
+    void setMITM(bool state);
+    void setSC(bool state);
+    void setKeyPress(bool state);
+    void setCT2(bool state);
+private:
+    uint8_t _octet;
+};
+
+enum IOCap {
+    DisplayOnly,
+    DisplayYesNo,
+    KeyboardOnly,
+    NoInputNoOutput,
+    KeyboardDisplay
+};
+
+#endif
\ No newline at end of file
diff --git a/src/utility/keyDistribution.cpp b/src/utility/keyDistribution.cpp
index 1a9fe099..f754366c 100644
--- a/src/utility/keyDistribution.cpp
+++ b/src/utility/keyDistribution.cpp
@@ -1,6 +1,6 @@
 #include "keyDistribution.h"
 
-KeyDistribution::KeyDistribution(){}
+KeyDistribution::KeyDistribution():_octet(0){}
 KeyDistribution::KeyDistribution(uint8_t octet):_octet(octet){}
 
 #define ENCKEY  0b00000001

From 6ef59a51a0bf12a12a76e4311ce6080a9f1bbfc4 Mon Sep 17 00:00:00 2001
From: unknownconstant <unknownconstant>
Date: Sun, 3 Jan 2021 20:02:31 +0000
Subject: [PATCH 006/112] Android bugfix

---
 .../EncryptedBatteryMonitor.ino               | 50 ++++++++++---------
 src/utility/ATT.cpp                           |  5 +-
 src/utility/HCI.cpp                           |  7 +--
 src/utility/L2CAPSignaling.cpp                |  8 +--
 4 files changed, 39 insertions(+), 31 deletions(-)

diff --git a/examples/Peripheral/EncryptedBatteryMonitor/EncryptedBatteryMonitor.ino b/examples/Peripheral/EncryptedBatteryMonitor/EncryptedBatteryMonitor.ino
index 338a374e..d4953b03 100644
--- a/examples/Peripheral/EncryptedBatteryMonitor/EncryptedBatteryMonitor.ino
+++ b/examples/Peripheral/EncryptedBatteryMonitor/EncryptedBatteryMonitor.ino
@@ -44,34 +44,34 @@ void setup() {
 
   // IRKs are keys that identify the true owner of a random mac address.
   // Add IRKs of devices you are bonded with.
-  BLE.setGetIRKs([](uint8_t* nIRKs, uint8_t** BADDR_TYPES, uint8_t*** BDAddrs, uint8_t*** IRKs){
+  BLE.setGetIRKs([](uint8_t* nIRKs, uint8_t** BDaddrTypes, uint8_t*** BDAddrs, uint8_t*** IRKs){
     // Set to number of devices
     *nIRKs       = 2;
 
     *BDAddrs     = new uint8_t*[*nIRKs];
     *IRKs        = new uint8_t*[*nIRKs];
-    *BADDR_TYPES = new uint8_t[*nIRKs];
+    *BDaddrTypes = new uint8_t[*nIRKs];
 
     // Set these to the mac and IRK for your bonded devices as printed in the serial console after bonding.
-    uint8_t iPhoneMac [6]   =  {0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-    uint8_t iPhoneIRK[16]   = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+    uint8_t device1Mac[6]    = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+    uint8_t device1IRK[16]   = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 
-    uint8_t iPadMac[6]      = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-    uint8_t iPadIRK[16]     = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+    uint8_t device2Mac[6]    = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+    uint8_t device2IRK[16]   = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 
 
-    (*BADDR_TYPES)[0] = 0;
-    (*IRKs)[0] = new uint8_t[16];
-    memcpy((*IRKs)[0],iPhoneIRK,16);
+    (*BDaddrTypes)[0] = 0; // Type 0 is for pubc address, type 1 is for static random
     (*BDAddrs)[0] = new uint8_t[6]; 
-    memcpy((*BDAddrs)[0], iPhoneMac, 6);
+    (*IRKs)[0]    = new uint8_t[16];
+    memcpy((*IRKs)[0]   , device1IRK,16);
+    memcpy((*BDAddrs)[0], device1Mac, 6);
 
 
-    (*BADDR_TYPES)[1] = 0;
-    (*IRKs)[1] = new uint8_t[16];
-    memcpy((*IRKs)[1],iPadIRK,16);
+    (*BDaddrTypes)[1] = 0;
     (*BDAddrs)[1] = new uint8_t[6];
-    memcpy((*BDAddrs)[1], iPadMac, 6);
+    (*IRKs)[1]    = new uint8_t[16];
+    memcpy((*IRKs)[1]   , device2IRK,16);
+    memcpy((*BDAddrs)[1], device2Mac, 6);
 
 
     return 1;
@@ -83,17 +83,18 @@ void setup() {
     btct.printBytes(address,6);
 
     // Set these to the MAC and LTK of your devices after bonding.
-    uint8_t iPhoneMac [6]   = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-    uint8_t iPhoneLTK[16]   = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-    uint8_t iPadMac [6]     = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-    uint8_t iPadLTK[16]     = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+    uint8_t device1Mac[6]  = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+    uint8_t device1LTK[16] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+    uint8_t device2Mac[6]  = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+    uint8_t device2LTK[16] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
     
 
-    if(memcmp(iPhoneMac, address, 6)==0){
-      memcpy(LTK, iPhoneLTK, 16);
+    if(memcmp(device1Mac, address, 6) == 0) {
+      memcpy(LTK, device1LTK, 16);
+      return 1;
+    }else if(memcmp(device2Mac, address, 6) == 0) {
+      memcpy(LTK, device2LTK, 16);
       return 1;
-    }else if(memcmp(iPadMac, address, 6)==0){
-      memcpy(LTK, iPadLTK, 16);
     }
     return 0;
   });
@@ -112,7 +113,8 @@ void setup() {
     return 1;
   });
 
-  while(1){// begin initialization
+  while(1){
+    // begin initialization
     if (!BLE.begin()) {
       Serial.println("starting BLE failed!");
       delay(200);
@@ -135,7 +137,7 @@ void setup() {
     batteryService.addCharacteristic(stringcharacteristic);
     batteryService.addCharacteristic(secretValue);
 
-    BLE.addService(batteryService); // Add the battery service
+    BLE.addService(batteryService);               // Add the battery service
     batteryLevelChar.writeValue(oldBatteryLevel); // set initial value for this characteristic
     char* stringCharValue = new char[32];
     stringCharValue = "string";
diff --git a/src/utility/ATT.cpp b/src/utility/ATT.cpp
index 6ef6bc31..18556413 100644
--- a/src/utility/ATT.cpp
+++ b/src/utility/ATT.cpp
@@ -260,7 +260,10 @@ void ATTClass::addConnection(uint16_t handle, uint8_t role, uint8_t peerBdaddrTy
     Serial.println("Found match.");
 #endif
   }else{
-    memset(_peers[peerIndex].resolvedAddress, 0, 6);
+#ifdef _BLE_TRACE_
+    Serial.println("No matching MAC");
+#endif
+    memset(&_peers[peerIndex].resolvedAddress, 0, 6);
   }
 
   if (_eventHandlers[BLEConnected]) {
diff --git a/src/utility/HCI.cpp b/src/utility/HCI.cpp
index 376cfb9c..4dc78460 100644
--- a/src/utility/HCI.cpp
+++ b/src/utility/HCI.cpp
@@ -1218,10 +1218,11 @@ void HCIClass::handleEventPkt(uint8_t /*plen*/, uint8_t pdata[])
           uint16_t minLength;
           uint16_t maxLength;
         } remoteConnParamReqReply;
-        memcpy(&remoteConnParamReqReply, &remoteConnParamReq->connectionHandle, sizeof(remoteConnParamReq-1));
+        memcpy(&remoteConnParamReqReply, &remoteConnParamReq->connectionHandle, sizeof(RemoteConnParamReq)-1);
+
         remoteConnParamReqReply.minLength = 0x000F;
         remoteConnParamReqReply.maxLength = 0x0FFF;
-        sendCommand(OGF_LE_CTL << 10 | 0x20, sizeof(remoteConnParamReqReply), &remoteConnParamReqReply);
+        sendCommand(OGF_LE_CTL << 10 | 0x20, sizeof(RemoteConnParamReqReply), &remoteConnParamReqReply);
         break;
       }
       case READ_LOCAL_P256_COMPLETE:{
@@ -1381,7 +1382,7 @@ int HCIClass::leEncrypt(uint8_t* key, uint8_t* plaintext, uint8_t* status, uint8
     leEncryptCommand.plaintext[15-i] = plaintext[i];
   }
   
-  int res = sendCommand(OGF_LE_CTL << 10 | LE_COMMAND::ENCRYPT, sizeof(leEncryptCommand), &leEncryptCommand);
+  int res = sendCommand(OGF_LE_CTL << 10 | LE_COMMAND::ENCRYPT, 32, &leEncryptCommand);
   if(res == 0){
 #ifdef _BLE_TRACE_
     Serial.print("Copying from command Response length: ");
diff --git a/src/utility/L2CAPSignaling.cpp b/src/utility/L2CAPSignaling.cpp
index 7d9c2c47..f7f93b84 100644
--- a/src/utility/L2CAPSignaling.cpp
+++ b/src/utility/L2CAPSignaling.cpp
@@ -144,6 +144,8 @@ void L2CAPSignalingClass::handleSecurityData(uint16_t connectionHandle, uint8_t
     ATT.localKeyDistribution = KeyDistribution(pairingRequest->responderKeyDistribution);
     KeyDistribution rkd(pairingRequest->responderKeyDistribution);
     AuthReq req(pairingRequest->authReq);
+    KeyDistribution responseKD = KeyDistribution();
+    responseKD.setIdKey(true);
 #ifdef _BLE_TRACE_
     Serial.print("Req has properties: ");
     Serial.print(req.Bonding()?"bonding, ":"no bonding, ");
@@ -171,7 +173,7 @@ void L2CAPSignalingClass::handleSecurityData(uint16_t connectionHandle, uint8_t
       uint8_t maxEncSize;
       uint8_t initiatorKeyDistribution;
       uint8_t responderKeyDistribution;
-    } response = { CONNECTION_PAIRING_RESPONSE, LOCAL_IOCAP, 0, LOCAL_AUTHREQ, 0x10, 0b1011, 0b1011};
+    } response = { CONNECTION_PAIRING_RESPONSE, LOCAL_IOCAP, 0, LOCAL_AUTHREQ, 0x10, responseKD.getOctet(), responseKD.getOctet()};
 
     HCI.sendAclPkt(connectionHandle, SECURITY_CID, sizeof(response), &response);
   }
@@ -316,9 +318,9 @@ void L2CAPSignalingClass::handleSecurityData(uint16_t connectionHandle, uint8_t
       Serial.println("Calculate f5, f6:");
       Serial.print("DH          : ");
       btct.printBytes(HCI.DHKey,32);
-      Serial.println("Na        : ");
+      Serial.print("Na        : ");
       btct.printBytes(HCI.Na,16);
-      Serial.println("Nb        : ");
+      Serial.print("Nb        : ");
       btct.printBytes(HCI.Nb,16);
       Serial.print("MAC         : ");
       btct.printBytes(MacKey,16);

From 0aa2e87a7c322931793657b8096afd8930a312d4 Mon Sep 17 00:00:00 2001
From: eltos <eltos@outlook.de>
Date: Sun, 3 Jan 2021 23:25:59 +0100
Subject: [PATCH 007/112] Handle remote DHKey confirmation before own DHKey

---
 src/utility/HCI.cpp            | 74 +++++++++++++++++++++++++++++++++-
 src/utility/HCI.h              |  1 +
 src/utility/L2CAPSignaling.cpp | 12 +++++-
 3 files changed, 83 insertions(+), 4 deletions(-)

diff --git a/src/utility/HCI.cpp b/src/utility/HCI.cpp
index 4dc78460..014e25a3 100644
--- a/src/utility/HCI.cpp
+++ b/src/utility/HCI.cpp
@@ -1345,13 +1345,83 @@ void HCIClass::handleEventPkt(uint8_t /*plen*/, uint8_t pdata[])
 #endif
           encryption |= PEER_ENCRYPTION::DH_KEY_CALULATED;
           ATT.setPeerEncryption(connectionHandle, encryption);
+
+          if((encryption & PEER_ENCRYPTION::RECEIVED_DH_CHECK) > 0){
+#ifdef _BLE_TRACE_
+            Serial.println("Recieved DHKey check already so calculate f5, f6 now.");
+#endif
+	  
+	  uint8_t BD_ADDR_REMOTE[7];
+            ATT.getPeerAddrWithType(connectionHandle, BD_ADDR_REMOTE);
+    
+	  
+	  uint8_t MacKey[16];
+            uint8_t localAddress[7];
+            
+            memcpy(&localAddress[1],HCI.localAddr,6);
+            localAddress[0] = 0; // IOT 33 uses a static address
+            
+            btct.f5(HCI.DHKey,HCI.Na,HCI.Nb,BD_ADDR_REMOTE,localAddress,MacKey,HCI.LTK);
+            
+            uint8_t Ea[16];
+            uint8_t Eb[16];
+            uint8_t R[16];
+            uint8_t MasterIOCap[3];
+            uint8_t SlaveIOCap[3] = {LOCAL_AUTHREQ, 0x0, LOCAL_IOCAP};
+            
+            ATT.getPeerIOCap(connectionHandle, MasterIOCap);
+            for(int i=0; i<16; i++) R[i] = 0;
+            
+            btct.f6(MacKey, HCI.Na,HCI.Nb,R, MasterIOCap, BD_ADDR_REMOTE, localAddress, Ea);
+            btct.f6(MacKey, HCI.Nb,HCI.Na,R, SlaveIOCap, localAddress, BD_ADDR_REMOTE, Eb);
+
+
 #ifdef _BLE_TRACE_
-          if(encryption | PEER_ENCRYPTION::RECEIVED_DH_CHECK){
-            Serial.println("Recieved DHKey check already so calculate f5, f6.");
+            Serial.println("Calculate f5, f6:");
+            Serial.print("DH          : ");
+            btct.printBytes(HCI.DHKey,32);
+            Serial.print("Na        : ");
+            btct.printBytes(HCI.Na,16);
+            Serial.print("Nb        : ");
+            btct.printBytes(HCI.Nb,16);
+            Serial.print("MAC         : ");
+            btct.printBytes(MacKey,16);
+            // Serial.print("Expected MAC: ");
+            // printBytes(EXPECTED_MAC, 16);
+            Serial.print("LTK         : ");
+            btct.printBytes(HCI.LTK,16);
+            // Serial.print("Expected LTK: ");
+            // printBytes(EXPECTED_LTK, 16);
+            Serial.print("Expected Ex : ");
+            btct.printBytes(HCI.remoteDHKeyCheckBuffer, 16);
+            Serial.print("Ea          : ");
+            btct.printBytes(Ea, 16);
+            Serial.print("Eb          : ");
+            btct.printBytes(Eb,16);
+            Serial.print("Local Addr  : ");
+            btct.printBytes(localAddress, 7);
+            Serial.print("LocalIOCap  : ");
+            btct.printBytes(SlaveIOCap, 3);
+            Serial.print("MasterAddr  : ");
+            btct.printBytes(BD_ADDR_REMOTE, 7);
+            Serial.print("MasterIOCAP : ");
+            btct.printBytes(MasterIOCap, 3);
+            Serial.println("Send Eb Back.");
+#endif
+            uint8_t ret[17];
+            ret[0] = 0x0d;
+            for(int i=0; i<sizeof(Eb); i++){
+              ret[sizeof(Eb)-i] = Eb[i];
+            }
+            HCI.sendAclPkt(connectionHandle, 0x06, sizeof(ret), ret );
+            ATT.setPeerEncryption(connectionHandle, encryption | PEER_ENCRYPTION::SENT_DH_CHECK);
           }else{
+#ifdef _BLE_TRACE_
             Serial.println("Waiting on other DHKey check before calculating.");
+#endif
           }
         }else{
+#ifdef _BLE_TRACE_
           Serial.print("Key generation error: 0x");
           Serial.println(evtLeDHKeyComplete->status, HEX);
 #endif
diff --git a/src/utility/HCI.h b/src/utility/HCI.h
index de15bdf8..4ed9e82e 100644
--- a/src/utility/HCI.h
+++ b/src/utility/HCI.h
@@ -111,6 +111,7 @@ class HCIClass {
   // TODO: Send command be private again & use ATT implementation within ATT.
   virtual int sendCommand(uint16_t opcode, uint8_t plen = 0, void* parameters = NULL);
   uint8_t remotePublicKeyBuffer[64];
+  uint8_t remoteDHKeyCheckBuffer[16];
   uint8_t Na[16];
   uint8_t Nb[16];
   uint8_t DHKey[32];
diff --git a/src/utility/L2CAPSignaling.cpp b/src/utility/L2CAPSignaling.cpp
index f7f93b84..60152a7d 100644
--- a/src/utility/L2CAPSignaling.cpp
+++ b/src/utility/L2CAPSignaling.cpp
@@ -290,7 +290,14 @@ void L2CAPSignalingClass::handleSecurityData(uint16_t connectionHandle, uint8_t
 
     HCI.readBdAddr();
     ATT.setPeerEncryption(connectionHandle, encryptionState);
-    if((encryptionState & PEER_ENCRYPTION::DH_KEY_CALULATED) > 0){
+    if((encryptionState & PEER_ENCRYPTION::DH_KEY_CALULATED) == 0){
+#ifdef _BLE_TRACE_
+      Serial.println("DHKey not yet ready, will calculate f5, f6 later");
+#endif
+      // store RemoteDHKeyCheck for later check
+      memcpy(HCI.remoteDHKeyCheckBuffer,RemoteDHKeyCheck,16);
+
+    } else {
       // We've already calculated the DHKey so we can calculate our check and send it.
       
       uint8_t MacKey[16];
@@ -312,7 +319,7 @@ void L2CAPSignalingClass::handleSecurityData(uint16_t connectionHandle, uint8_t
       
       btct.f6(MacKey, HCI.Na,HCI.Nb,R, MasterIOCap, BD_ADDR_REMOTE, localAddress, Ea);
       btct.f6(MacKey, HCI.Nb,HCI.Na,R, SlaveIOCap, localAddress, BD_ADDR_REMOTE, Eb);
-
+      
 
 #ifdef _BLE_TRACE_
       Serial.println("Calculate f5, f6:");
@@ -353,6 +360,7 @@ void L2CAPSignalingClass::handleSecurityData(uint16_t connectionHandle, uint8_t
         ret[sizeof(Eb)-i] = Eb[i];
       }
       HCI.sendAclPkt(connectionHandle, 0x06, sizeof(ret), ret );
+      ATT.setPeerEncryption(connectionHandle, encryptionState | PEER_ENCRYPTION::SENT_DH_CHECK);
     }
   }
 }

From 750b7f179546520f6929db2485fd40ba747ebe2f Mon Sep 17 00:00:00 2001
From: eltos <eltos@outlook.de>
Date: Sun, 3 Jan 2021 23:45:38 +0100
Subject: [PATCH 008/112] Actually check remote DHKey

---
 src/utility/HCI.cpp            | 35 +++++++++++++++++++++++++++------
 src/utility/L2CAPSignaling.cpp | 36 +++++++++++++++++++++++++++-------
 2 files changed, 58 insertions(+), 13 deletions(-)

diff --git a/src/utility/HCI.cpp b/src/utility/HCI.cpp
index 014e25a3..157ed7d3 100644
--- a/src/utility/HCI.cpp
+++ b/src/utility/HCI.cpp
@@ -24,6 +24,8 @@
 #include "btct.h"
 #include "HCI.h"
 
+//#define _BLE_TRACE_
+
 #define HCI_COMMAND_PKT   0x01
 #define HCI_ACLDATA_PKT   0x02
 #define HCI_EVENT_PKT     0x04
@@ -1408,13 +1410,34 @@ void HCIClass::handleEventPkt(uint8_t /*plen*/, uint8_t pdata[])
             btct.printBytes(MasterIOCap, 3);
             Serial.println("Send Eb Back.");
 #endif
-            uint8_t ret[17];
-            ret[0] = 0x0d;
-            for(int i=0; i<sizeof(Eb); i++){
-              ret[sizeof(Eb)-i] = Eb[i];
+            // Check if RemoteDHKeyCheck = Ea
+            bool EaCheck = true;
+            for(int i = 0; i < 16; i++){
+              if (Ea[i] != HCI.remoteDHKeyCheckBuffer[i]){	        
+                EaCheck = false;
+              }
+            }
+            
+            if (EaCheck){
+              // Send our confirmation value to complete authentication stage 2
+              uint8_t ret[17];
+              ret[0] = CONNECTION_PAIRING_DHKEY_CHECK;
+              for(int i=0; i<sizeof(Eb); i++){
+                ret[sizeof(Eb)-i] = Eb[i];
+              }
+              HCI.sendAclPkt(connectionHandle, SECURITY_CID, sizeof(ret), ret );
+              ATT.setPeerEncryption(connectionHandle, encryption | PEER_ENCRYPTION::SENT_DH_CHECK);
+	    
+	  } else {
+              // If check fails, abort
+#ifdef _BLE_TRACE_
+        Serial.println("Error: DHKey check failed - Aborting");
+#endif
+              uint8_t ret[2] = {CONNECTION_PAIRING_FAILED, 0x0B}; // DHKey Check Faile
+              HCI.sendAclPkt(connectionHandle, SECURITY_CID, sizeof(ret), ret);
+              ATT.setPeerEncryption(connectionHandle, NO_ENCRYPTION);
             }
-            HCI.sendAclPkt(connectionHandle, 0x06, sizeof(ret), ret );
-            ATT.setPeerEncryption(connectionHandle, encryption | PEER_ENCRYPTION::SENT_DH_CHECK);
+	  
           }else{
 #ifdef _BLE_TRACE_
             Serial.println("Waiting on other DHKey check before calculating.");
diff --git a/src/utility/L2CAPSignaling.cpp b/src/utility/L2CAPSignaling.cpp
index 60152a7d..322bd13d 100644
--- a/src/utility/L2CAPSignaling.cpp
+++ b/src/utility/L2CAPSignaling.cpp
@@ -26,6 +26,8 @@
 #define CONNECTION_PARAMETER_UPDATE_REQUEST  0x12
 #define CONNECTION_PARAMETER_UPDATE_RESPONSE 0x13
 
+//#define _BLE_TRACE_
+
 L2CAPSignalingClass::L2CAPSignalingClass() :
   _minInterval(0),
   _maxInterval(0),
@@ -353,14 +355,34 @@ void L2CAPSignalingClass::handleSecurityData(uint16_t connectionHandle, uint8_t
       btct.printBytes(MasterIOCap, 3);
       Serial.println("Send Eb Back.");
 #endif
-
-      uint8_t ret[17];
-      ret[0] = 0x0d;
-      for(int i=0; i<sizeof(Eb); i++){
-        ret[sizeof(Eb)-i] = Eb[i];
+      
+      // Check if RemoteDHKeyCheck = Ea
+      bool EaCheck = true;
+      for(int i = 0; i < 16; i++){
+        if (Ea[i] != RemoteDHKeyCheck[i]){	        
+	EaCheck = false;
+        }
+      }
+      
+      if (EaCheck){
+        // Send our confirmation value to complete authentication stage 2
+        uint8_t ret[17];
+        ret[0] = CONNECTION_PAIRING_DHKEY_CHECK;
+        for(int i=0; i<sizeof(Eb); i++){
+          ret[sizeof(Eb)-i] = Eb[i];
+        }
+        HCI.sendAclPkt(connectionHandle, SECURITY_CID, sizeof(ret), ret );
+        ATT.setPeerEncryption(connectionHandle, encryptionState | PEER_ENCRYPTION::SENT_DH_CHECK);
+      
+      } else {
+        // If check fails, abort
+#ifdef _BLE_TRACE_
+        Serial.println("Error: DHKey check failed - Aborting");
+#endif
+        uint8_t ret[2] = {CONNECTION_PAIRING_FAILED, 0x0B}; // DHKey Check Faile
+        HCI.sendAclPkt(connectionHandle, SECURITY_CID, sizeof(ret), ret);
+        ATT.setPeerEncryption(connectionHandle, NO_ENCRYPTION);
       }
-      HCI.sendAclPkt(connectionHandle, 0x06, sizeof(ret), ret );
-      ATT.setPeerEncryption(connectionHandle, encryptionState | PEER_ENCRYPTION::SENT_DH_CHECK);
     }
   }
 }

From 915e9140db2cbb84aa300982e6b13645eea6d8e8 Mon Sep 17 00:00:00 2001
From: eltos <eltos@outlook.de>
Date: Mon, 4 Jan 2021 11:07:36 +0100
Subject: [PATCH 009/112] Move LTK signaling and confirm to separate method

---
 src/utility/HCI.cpp            |  89 +------------------
 src/utility/HCI.h              |   2 +
 src/utility/L2CAPSignaling.cpp | 150 +++++++++++++++------------------
 src/utility/L2CAPSignaling.h   |   6 ++
 4 files changed, 80 insertions(+), 167 deletions(-)

diff --git a/src/utility/HCI.cpp b/src/utility/HCI.cpp
index 157ed7d3..4c97f79d 100644
--- a/src/utility/HCI.cpp
+++ b/src/utility/HCI.cpp
@@ -1337,7 +1337,6 @@ void HCIClass::handleEventPkt(uint8_t /*plen*/, uint8_t pdata[])
             break;
           }
           
-          uint8_t encryption = ATT.getPeerEncryption(connectionHandle);
           
           for(int i=0; i<32; i++) DHKey[31-i] = evtLeDHKeyComplete->DHKey[i];
 
@@ -1345,98 +1344,14 @@ void HCIClass::handleEventPkt(uint8_t /*plen*/, uint8_t pdata[])
           Serial.println("Stored our DHKey:");
           btct.printBytes(DHKey,32);
 #endif
-          encryption |= PEER_ENCRYPTION::DH_KEY_CALULATED;
+          uint8_t encryption = ATT.getPeerEncryption(connectionHandle) | PEER_ENCRYPTION::DH_KEY_CALULATED;
           ATT.setPeerEncryption(connectionHandle, encryption);
 
           if((encryption & PEER_ENCRYPTION::RECEIVED_DH_CHECK) > 0){
 #ifdef _BLE_TRACE_
             Serial.println("Recieved DHKey check already so calculate f5, f6 now.");
 #endif
-	  
-	  uint8_t BD_ADDR_REMOTE[7];
-            ATT.getPeerAddrWithType(connectionHandle, BD_ADDR_REMOTE);
-    
-	  
-	  uint8_t MacKey[16];
-            uint8_t localAddress[7];
-            
-            memcpy(&localAddress[1],HCI.localAddr,6);
-            localAddress[0] = 0; // IOT 33 uses a static address
-            
-            btct.f5(HCI.DHKey,HCI.Na,HCI.Nb,BD_ADDR_REMOTE,localAddress,MacKey,HCI.LTK);
-            
-            uint8_t Ea[16];
-            uint8_t Eb[16];
-            uint8_t R[16];
-            uint8_t MasterIOCap[3];
-            uint8_t SlaveIOCap[3] = {LOCAL_AUTHREQ, 0x0, LOCAL_IOCAP};
-            
-            ATT.getPeerIOCap(connectionHandle, MasterIOCap);
-            for(int i=0; i<16; i++) R[i] = 0;
-            
-            btct.f6(MacKey, HCI.Na,HCI.Nb,R, MasterIOCap, BD_ADDR_REMOTE, localAddress, Ea);
-            btct.f6(MacKey, HCI.Nb,HCI.Na,R, SlaveIOCap, localAddress, BD_ADDR_REMOTE, Eb);
-
-
-#ifdef _BLE_TRACE_
-            Serial.println("Calculate f5, f6:");
-            Serial.print("DH          : ");
-            btct.printBytes(HCI.DHKey,32);
-            Serial.print("Na        : ");
-            btct.printBytes(HCI.Na,16);
-            Serial.print("Nb        : ");
-            btct.printBytes(HCI.Nb,16);
-            Serial.print("MAC         : ");
-            btct.printBytes(MacKey,16);
-            // Serial.print("Expected MAC: ");
-            // printBytes(EXPECTED_MAC, 16);
-            Serial.print("LTK         : ");
-            btct.printBytes(HCI.LTK,16);
-            // Serial.print("Expected LTK: ");
-            // printBytes(EXPECTED_LTK, 16);
-            Serial.print("Expected Ex : ");
-            btct.printBytes(HCI.remoteDHKeyCheckBuffer, 16);
-            Serial.print("Ea          : ");
-            btct.printBytes(Ea, 16);
-            Serial.print("Eb          : ");
-            btct.printBytes(Eb,16);
-            Serial.print("Local Addr  : ");
-            btct.printBytes(localAddress, 7);
-            Serial.print("LocalIOCap  : ");
-            btct.printBytes(SlaveIOCap, 3);
-            Serial.print("MasterAddr  : ");
-            btct.printBytes(BD_ADDR_REMOTE, 7);
-            Serial.print("MasterIOCAP : ");
-            btct.printBytes(MasterIOCap, 3);
-            Serial.println("Send Eb Back.");
-#endif
-            // Check if RemoteDHKeyCheck = Ea
-            bool EaCheck = true;
-            for(int i = 0; i < 16; i++){
-              if (Ea[i] != HCI.remoteDHKeyCheckBuffer[i]){	        
-                EaCheck = false;
-              }
-            }
-            
-            if (EaCheck){
-              // Send our confirmation value to complete authentication stage 2
-              uint8_t ret[17];
-              ret[0] = CONNECTION_PAIRING_DHKEY_CHECK;
-              for(int i=0; i<sizeof(Eb); i++){
-                ret[sizeof(Eb)-i] = Eb[i];
-              }
-              HCI.sendAclPkt(connectionHandle, SECURITY_CID, sizeof(ret), ret );
-              ATT.setPeerEncryption(connectionHandle, encryption | PEER_ENCRYPTION::SENT_DH_CHECK);
-	    
-	  } else {
-              // If check fails, abort
-#ifdef _BLE_TRACE_
-        Serial.println("Error: DHKey check failed - Aborting");
-#endif
-              uint8_t ret[2] = {CONNECTION_PAIRING_FAILED, 0x0B}; // DHKey Check Faile
-              HCI.sendAclPkt(connectionHandle, SECURITY_CID, sizeof(ret), ret);
-              ATT.setPeerEncryption(connectionHandle, NO_ENCRYPTION);
-            }
+            L2CAPSignaling.smCalculateLTKandConfirm(connectionHandle, HCI.remoteDHKeyCheckBuffer);
 	  
           }else{
 #ifdef _BLE_TRACE_
diff --git a/src/utility/HCI.h b/src/utility/HCI.h
index 4ed9e82e..522570d3 100644
--- a/src/utility/HCI.h
+++ b/src/utility/HCI.h
@@ -22,6 +22,8 @@
 
 #include <Arduino.h>
 
+#include "L2CAPSignaling.h"
+
 #define OGF_LINK_CTL           0x01
 #define OGF_HOST_CTL           0x03
 #define OGF_INFO_PARAM         0x04
diff --git a/src/utility/L2CAPSignaling.cpp b/src/utility/L2CAPSignaling.cpp
index 322bd13d..4adeaa0d 100644
--- a/src/utility/L2CAPSignaling.cpp
+++ b/src/utility/L2CAPSignaling.cpp
@@ -278,11 +278,8 @@ void L2CAPSignalingClass::handleSecurityData(uint16_t connectionHandle, uint8_t
   else if(code == CONNECTION_PAIRING_DHKEY_CHECK)
   {
     uint8_t RemoteDHKeyCheck[16];
-    uint8_t BD_ADDR_REMOTE[7];
-    ATT.getPeerAddrWithType(connectionHandle, BD_ADDR_REMOTE);
     for(int i=0; i<16; i++) RemoteDHKeyCheck[15-i] = l2capSignalingHdr->data[i];
-    uint8_t encryptionState = ATT.getPeerEncryption(connectionHandle) | PEER_ENCRYPTION::RECEIVED_DH_CHECK;
-
+    
 
 #ifdef _BLE_TRACE_
     Serial.println("[Info] DH Key check");
@@ -290,7 +287,9 @@ void L2CAPSignalingClass::handleSecurityData(uint16_t connectionHandle, uint8_t
     btct.printBytes(RemoteDHKeyCheck, 16);
 #endif
 
-    HCI.readBdAddr();
+    
+    
+    uint8_t encryptionState = ATT.getPeerEncryption(connectionHandle) | PEER_ENCRYPTION::RECEIVED_DH_CHECK;
     ATT.setPeerEncryption(connectionHandle, encryptionState);
     if((encryptionState & PEER_ENCRYPTION::DH_KEY_CALULATED) == 0){
 #ifdef _BLE_TRACE_
@@ -301,89 +300,80 @@ void L2CAPSignalingClass::handleSecurityData(uint16_t connectionHandle, uint8_t
 
     } else {
       // We've already calculated the DHKey so we can calculate our check and send it.
+      smCalculateLTKandConfirm(connectionHandle, RemoteDHKeyCheck);
       
-      uint8_t MacKey[16];
-      uint8_t localAddress[7];
-      
-      memcpy(&localAddress[1],HCI.localAddr,6);
-      localAddress[0] = 0; // IOT 33 uses a static address
+    }
+  }
+}
 
-      btct.f5(HCI.DHKey,HCI.Na,HCI.Nb,BD_ADDR_REMOTE,localAddress,MacKey,HCI.LTK);
-
-      uint8_t Ea[16];
-      uint8_t Eb[16];
-      uint8_t R[16];
-      uint8_t MasterIOCap[3];
-      uint8_t SlaveIOCap[3] = {LOCAL_AUTHREQ, 0x0, LOCAL_IOCAP};
-      
-      ATT.getPeerIOCap(connectionHandle, MasterIOCap);
-      for(int i=0; i<16; i++) R[i] = 0;
-      
-      btct.f6(MacKey, HCI.Na,HCI.Nb,R, MasterIOCap, BD_ADDR_REMOTE, localAddress, Ea);
-      btct.f6(MacKey, HCI.Nb,HCI.Na,R, SlaveIOCap, localAddress, BD_ADDR_REMOTE, Eb);
-      
+void L2CAPSignalingClass::smCalculateLTKandConfirm(uint16_t handle, uint8_t expectedEa[])
+{ // Authentication stage 2: LTK Calculation
+  
+  uint8_t localAddress[7];
+  uint8_t remoteAddress[7];
+  ATT.getPeerAddrWithType(handle, remoteAddress);
+  
+  HCI.readBdAddr();
+  memcpy(&localAddress[1],HCI.localAddr,6);
+  localAddress[0] = 0; // IOT 33 uses a static address // TODO: confirm for Nano BLE
+
+  // Compute the LTK and MacKey
+  uint8_t MacKey[16];
+  btct.f5(HCI.DHKey, HCI.Na, HCI.Nb, remoteAddress, localAddress, MacKey, HCI.LTK);
+
+  // Compute Ea and Eb
+  uint8_t Ea[16];
+  uint8_t Eb[16];
+  uint8_t R[16];
+  uint8_t MasterIOCap[3];
+  uint8_t SlaveIOCap[3] = {LOCAL_AUTHREQ, 0x0, LOCAL_IOCAP};
+  
+  ATT.getPeerIOCap(handle, MasterIOCap);
+  for(int i=0; i<16; i++) R[i] = 0;
+  
+  btct.f6(MacKey, HCI.Na,HCI.Nb,R, MasterIOCap, remoteAddress, localAddress, Ea);
+  btct.f6(MacKey, HCI.Nb,HCI.Na,R, SlaveIOCap, localAddress, remoteAddress, Eb);
 
 #ifdef _BLE_TRACE_
-      Serial.println("Calculate f5, f6:");
-      Serial.print("DH          : ");
-      btct.printBytes(HCI.DHKey,32);
-      Serial.print("Na        : ");
-      btct.printBytes(HCI.Na,16);
-      Serial.print("Nb        : ");
-      btct.printBytes(HCI.Nb,16);
-      Serial.print("MAC         : ");
-      btct.printBytes(MacKey,16);
-      // Serial.print("Expected MAC: ");
-      // printBytes(EXPECTED_MAC, 16);
-      Serial.print("LTK         : ");
-      btct.printBytes(HCI.LTK,16);
-      // Serial.print("Expected LTK: ");
-      // printBytes(EXPECTED_LTK, 16);
-      Serial.print("Expected Ex : ");
-      btct.printBytes(RemoteDHKeyCheck, 16);
-      Serial.print("Ea          : ");
-      btct.printBytes(Ea, 16);
-      Serial.print("Eb          : ");
-      btct.printBytes(Eb,16);
-      Serial.print("Local Addr  : ");
-      btct.printBytes(localAddress, 7);
-      Serial.print("LocalIOCap  : ");
-      btct.printBytes(SlaveIOCap, 3);
-      Serial.print("MasterAddr  : ");
-      btct.printBytes(BD_ADDR_REMOTE, 7);
-      Serial.print("MasterIOCAP : ");
-      btct.printBytes(MasterIOCap, 3);
-      Serial.println("Send Eb Back.");
+  Serial.println("Calculate and confirm LTK via f5, f6:");
+  Serial.print("DHKey      : ");  btct.printBytes(HCI.DHKey,32);
+  Serial.print("Na         : ");  btct.printBytes(HCI.Na,16);
+  Serial.print("Nb         : ");  btct.printBytes(HCI.Nb,16);
+  Serial.print("MacKey     : ");  btct.printBytes(MacKey,16);
+  Serial.print("LTK        : ");  btct.printBytes(HCI.LTK,16);
+  Serial.print("Expected Ea: ");  btct.printBytes(expectedEa, 16);
+  Serial.print("Ea         : ");  btct.printBytes(Ea, 16);
+  Serial.print("Eb         : ");  btct.printBytes(Eb,16);
+  Serial.print("Local Addr : ");  btct.printBytes(localAddress, 7);
+  Serial.print("LocalIOCap : ");  btct.printBytes(SlaveIOCap, 3);
+  Serial.print("MasterAddr : ");  btct.printBytes(remoteAddress, 7);
+  Serial.print("MasterIOCAP: ");  btct.printBytes(MasterIOCap, 3);
 #endif
       
-      // Check if RemoteDHKeyCheck = Ea
-      bool EaCheck = true;
-      for(int i = 0; i < 16; i++){
-        if (Ea[i] != RemoteDHKeyCheck[i]){	        
-	EaCheck = false;
-        }
-      }
-      
-      if (EaCheck){
-        // Send our confirmation value to complete authentication stage 2
-        uint8_t ret[17];
-        ret[0] = CONNECTION_PAIRING_DHKEY_CHECK;
-        for(int i=0; i<sizeof(Eb); i++){
-          ret[sizeof(Eb)-i] = Eb[i];
-        }
-        HCI.sendAclPkt(connectionHandle, SECURITY_CID, sizeof(ret), ret );
-        ATT.setPeerEncryption(connectionHandle, encryptionState | PEER_ENCRYPTION::SENT_DH_CHECK);
-      
-      } else {
-        // If check fails, abort
+  // Check if Ea = expectedEa
+  if (memcmp(Ea, expectedEa, 16) == 0){
+    // Check ok
+    // Send our confirmation value to complete authentication stage 2
+    uint8_t ret[17];
+    ret[0] = CONNECTION_PAIRING_DHKEY_CHECK;
+    for(int i=0; i<sizeof(Eb); i++){
+      ret[sizeof(Eb)-i] = Eb[i];
+    }
+    HCI.sendAclPkt(handle, SECURITY_CID, sizeof(ret), ret );
+    uint8_t encryption = ATT.getPeerEncryption(handle) | PEER_ENCRYPTION::SENT_DH_CHECK;
+    ATT.setPeerEncryption(handle, encryption);
 #ifdef _BLE_TRACE_
-        Serial.println("Error: DHKey check failed - Aborting");
+    Serial.println("DHKey check ok - send Eb back");
+#endif
+
+  } else {
+    // Check failed, abort pairing
+    uint8_t ret[2] = {CONNECTION_PAIRING_FAILED, 0x0B}; // 0x0B = DHKey Check Failed
+    HCI.sendAclPkt(handle, SECURITY_CID, sizeof(ret), ret);
+    ATT.setPeerEncryption(handle, NO_ENCRYPTION);
+#ifdef _BLE_TRACE_
+    Serial.println("Error: DHKey check failed - Aborting");
 #endif
-        uint8_t ret[2] = {CONNECTION_PAIRING_FAILED, 0x0B}; // DHKey Check Faile
-        HCI.sendAclPkt(connectionHandle, SECURITY_CID, sizeof(ret), ret);
-        ATT.setPeerEncryption(connectionHandle, NO_ENCRYPTION);
-      }
-    }
   }
 }
 
diff --git a/src/utility/L2CAPSignaling.h b/src/utility/L2CAPSignaling.h
index b7177be3..7fc64d4f 100644
--- a/src/utility/L2CAPSignaling.h
+++ b/src/utility/L2CAPSignaling.h
@@ -64,10 +64,16 @@ class L2CAPSignalingClass {
 
   virtual void setSupervisionTimeout(uint16_t supervisionTimeout);
 
+
+
+  virtual void smCalculateLTKandConfirm(uint16_t handle, uint8_t expectedEa[]);
+
+
 private:
   virtual void connectionParameterUpdateRequest(uint16_t handle, uint8_t identifier, uint8_t dlen, uint8_t data[]);
   virtual void connectionParameterUpdateResponse(uint16_t handle, uint8_t identifier, uint8_t dlen, uint8_t data[]);
 
+
 private:
   uint16_t _minInterval;
   uint16_t _maxInterval;

From f54e7a246b117af37f1abd16673971a60f6d7bd6 Mon Sep 17 00:00:00 2001
From: eltos <eltos@outlook.de>
Date: Mon, 4 Jan 2021 12:20:06 +0100
Subject: [PATCH 010/112] Add method to control and query pairing

---
 .../EncryptedBatteryMonitor.ino               |  67 +++++++----
 keywords.txt                                  |   3 +
 src/local/BLELocalDevice.cpp                  |  26 +++++
 src/local/BLELocalDevice.h                    |  10 ++
 src/utility/ATT.cpp                           |  26 +++++
 src/utility/ATT.h                             |   2 +
 src/utility/L2CAPSignaling.cpp                | 105 +++++++++++-------
 src/utility/L2CAPSignaling.h                  |  13 ++-
 8 files changed, 190 insertions(+), 62 deletions(-)

diff --git a/examples/Peripheral/EncryptedBatteryMonitor/EncryptedBatteryMonitor.ino b/examples/Peripheral/EncryptedBatteryMonitor/EncryptedBatteryMonitor.ino
index d4953b03..fd40f5ee 100644
--- a/examples/Peripheral/EncryptedBatteryMonitor/EncryptedBatteryMonitor.ino
+++ b/examples/Peripheral/EncryptedBatteryMonitor/EncryptedBatteryMonitor.ino
@@ -18,6 +18,14 @@
 #include <ArduinoBLE.h>
 
 
+#define PAIR_BUTTON D3        // button for pairing
+#define PAIR_LED 24           // LED used to signal pairing
+#define PAIR_LED_ON LOW       // Blue LED on Nano BLE has inverted logic
+#define PAIR_INTERVAL 30000   // interval for pairing after button press in ms
+
+#define CTRL_LED LED_BUILTIN
+
+
  // BLE Battery Service
 BLEService batteryService("180F");
 
@@ -31,13 +39,17 @@ BLEStringCharacteristic stringcharacteristic("183E", BLERead | BLEWrite, 31);
 BLEUnsignedCharCharacteristic secretValue("2a3F", BLERead | BLEWrite | BLEEncryption);
 
 int oldBatteryLevel = 0;  // last battery level reading from analog input
-long previousMillis = 0;  // last time the battery level was checked, in ms
+unsigned long previousMillis = 0;  // last time the battery level was checked, in ms
+unsigned long pairingStarted = 0;  // pairing start time when button is pressed
+bool wasConnected = 0;
 
 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
+  pinMode(CTRL_LED, OUTPUT); // initialize the built-in LED pin to indicate when a central is connected
+  pinMode(PAIR_LED, OUTPUT);
+  pinMode(PAIR_BUTTON, INPUT_PULLUP);
 
 
   Serial.println("Serial connected");
@@ -145,6 +157,9 @@ void setup() {
     secretValue.writeValue(0);
     
     delay(1000);
+
+    // prevent pairing until button is pressed (will show a pairing rejected message)
+    BLE.setPairable(false);
   
     /* Start advertising BLE.  It will start continuously transmitting BLE
        advertising packets and will be visible to remote BLE central devices
@@ -169,30 +184,44 @@ void loop() {
   // wait for a BLE central
   BLEDevice central = BLE.central();
 
+
+  // If button is pressed, allow pairing for 30 sec
+  if (!BLE.pairable() && digitalRead(PAIR_BUTTON) == LOW){
+    pairingStarted = millis();
+    BLE.setPairable(Pairable::ONCE);
+    Serial.println("Accepting pairing for 30s");
+  } else if (BLE.pairable() && millis() > pairingStarted + PAIR_INTERVAL){
+    BLE.setPairable(false);
+    Serial.println("No longer accepting pairing");
+  }
+  // Make LED blink while pairing is allowed
+  digitalWrite(PAIR_LED, (BLE.pairable() ? (millis()%400)<200 : BLE.paired()) ? PAIR_LED_ON : !PAIR_LED_ON); 
+
+
   // 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());
+  if (central && central.connected()) {
+    if (!wasConnected){
+      wasConnected = true;
+      Serial.print("Connected to central: ");
+      // print the central's BT address:
+      Serial.println(central.address());
+    }
 
     // check the battery level every 200ms
     // while the central is connected:
-    while (central.connected()) {
-      long currentMillis = millis();
-      // if 200ms have passed, check the battery level:
-      if (currentMillis - previousMillis >= 1000) {
-        previousMillis = currentMillis;
-        updateBatteryLevel();
-        if(secretValue.value()>0){
-          digitalWrite(13,HIGH);
-        }else{
-          digitalWrite(13,LOW);
-        }
-      }
+    long currentMillis = millis();
+    // if 200ms have passed, check the battery level:
+    if (currentMillis - previousMillis >= 1000) {
+      previousMillis = currentMillis;
+      updateBatteryLevel();
+      digitalWrite(CTRL_LED, secretValue.value()>0 ? HIGH : LOW);
     }
+  } else if (wasConnected){
+    wasConnected = false;
     Serial.print("Disconnected from central: ");
     Serial.println(central.address());
   }
+    
 }
 
 void updateBatteryLevel() {
@@ -208,4 +237,4 @@ void updateBatteryLevel() {
     batteryLevelChar.writeValue(batteryLevel);  // and update the battery level characteristic
     oldBatteryLevel = batteryLevel;           // save the level for next comparison
   }
-}
+}
\ No newline at end of file
diff --git a/keywords.txt b/keywords.txt
index 464cac72..effdfbca 100644
--- a/keywords.txt
+++ b/keywords.txt
@@ -77,9 +77,12 @@ setEventHandler	KEYWORD2
 setAdvertisingInterval	KEYWORD2
 setConnectionInterval	KEYWORD2
 setConnectable	KEYWORD2
+setPairable	KEYWORD2
 setTimeout	KEYWORD2
 debug	KEYWORD2
 noDebug	KEYWORD2
+pairable	KEYWORD2
+paired	KEYWORD2
 
 properties	KEYWORD2
 valueSize	KEYWORD2
diff --git a/src/local/BLELocalDevice.cpp b/src/local/BLELocalDevice.cpp
index 49cc6603..029fb488 100644
--- a/src/local/BLELocalDevice.cpp
+++ b/src/local/BLELocalDevice.cpp
@@ -214,6 +214,16 @@ bool BLELocalDevice::connected() const
   return ATT.connected();
 }
 
+/*
+ * Whether there is at least one paired device
+ */
+bool BLELocalDevice::paired()
+{
+  HCI.poll();
+
+  return ATT.paired();
+}
+
 bool BLELocalDevice::disconnect()
 {
   return ATT.disconnect();
@@ -395,6 +405,22 @@ void BLELocalDevice::setTimeout(unsigned long timeout)
   ATT.setTimeout(timeout);
 }
 
+/*
+ * Control whether pairing is allowed or rejected
+ * Use true/false or the Pairable enum
+ */
+void BLELocalDevice::setPairable(uint8_t pairable)
+{
+  L2CAPSignaling.setPairingEnabled(pairable);
+}
+
+/*
+ * Whether pairing is currently allowed
+ */
+bool BLELocalDevice::pairable()
+{
+  return L2CAPSignaling.isPairingEnabled();
+}
 
 void BLELocalDevice::setGetIRKs(int (*getIRKs)(uint8_t* nIRKs, uint8_t** BADDR_type, uint8_t*** BADDRs, uint8_t*** IRKs)){
   HCI._getIRKs = getIRKs;
diff --git a/src/local/BLELocalDevice.h b/src/local/BLELocalDevice.h
index 22a5f589..0c471938 100644
--- a/src/local/BLELocalDevice.h
+++ b/src/local/BLELocalDevice.h
@@ -24,6 +24,12 @@
 #include "BLEService.h"
 #include "BLEAdvertisingData.h"
 
+enum Pairable {
+  NO = 0,
+  YES = 1,
+  ONCE = 2,
+};
+
 class BLELocalDevice {
 public:
   BLELocalDevice();
@@ -80,6 +86,10 @@ class BLELocalDevice {
 
   virtual void debug(Stream& stream);
   virtual void noDebug();
+  
+  virtual void setPairable(uint8_t pairable);
+  virtual bool pairable();
+  virtual bool paired();
 
 /// TODO: Put in actual variable names
   virtual void setStoreIRK(int (*storeIRK)(uint8_t*, uint8_t*));
diff --git a/src/utility/ATT.cpp b/src/utility/ATT.cpp
index 18556413..a5166217 100644
--- a/src/utility/ATT.cpp
+++ b/src/utility/ATT.cpp
@@ -497,6 +497,32 @@ bool ATTClass::connected(uint16_t handle) const
   return false;
 }
 
+/*
+ * Return true if any of the known devices is paired (peer encrypted)
+ * Does not check if the paired device is also connected
+ */
+bool ATTClass::paired() const
+{
+  for(int i=0; i<ATT_MAX_PEERS; i++){
+    if((_peers[i].encryption & PEER_ENCRYPTION::ENCRYPTED_AES) > 0){
+      return true;
+    }
+  }
+  return false;
+}
+
+/*
+ * Return true if the specified device is paired (peer encrypted)
+ */
+bool ATTClass::paired(uint16_t handle) const
+{  
+  for(int i=0; i<ATT_MAX_PEERS; i++){
+    if(_peers[i].connectionHandle != handle){continue;}
+    return (_peers[i].encryption & PEER_ENCRYPTION::ENCRYPTED_AES) > 0;
+  }
+  return false; // unknown handle
+}
+
 uint16_t ATTClass::mtu(uint16_t handle) const
 {
   for (int i = 0; i < ATT_MAX_PEERS; i++) {
diff --git a/src/utility/ATT.h b/src/utility/ATT.h
index 1c8910c3..c9f007f9 100644
--- a/src/utility/ATT.h
+++ b/src/utility/ATT.h
@@ -75,6 +75,8 @@ class ATTClass {
   virtual bool connected() const;
   virtual bool connected(uint8_t addressType, const uint8_t address[6]) const;
   virtual bool connected(uint16_t handle) const;
+  virtual bool paired() const;
+  virtual bool paired(uint16_t handle) const;
   virtual uint16_t mtu(uint16_t handle) const;
 
   virtual bool disconnect();
diff --git a/src/utility/L2CAPSignaling.cpp b/src/utility/L2CAPSignaling.cpp
index 4adeaa0d..622f2178 100644
--- a/src/utility/L2CAPSignaling.cpp
+++ b/src/utility/L2CAPSignaling.cpp
@@ -32,6 +32,7 @@ L2CAPSignalingClass::L2CAPSignalingClass() :
   _minInterval(0),
   _maxInterval(0),
   _supervisionTimeout(0)
+  ,_pairing_enabled(1)
 {
 }
 
@@ -131,53 +132,64 @@ void L2CAPSignalingClass::handleSecurityData(uint16_t connectionHandle, uint8_t
   btct.printBytes(data,dlen);
 #endif
   if (code == CONNECTION_PAIRING_REQUEST) {
-    // 0x1
-    struct __attribute__ ((packed)) PairingRequest {
-      uint8_t ioCapability;
-      uint8_t oobDataFlag;
-      uint8_t authReq;
-      uint8_t maxEncSize;
-      uint8_t initiatorKeyDistribution;
-      uint8_t responderKeyDistribution;
-    } *pairingRequest = (PairingRequest*)l2capSignalingHdr->data;
-
-
-    ATT.remoteKeyDistribution = KeyDistribution(pairingRequest->initiatorKeyDistribution);
-    ATT.localKeyDistribution = KeyDistribution(pairingRequest->responderKeyDistribution);
-    KeyDistribution rkd(pairingRequest->responderKeyDistribution);
-    AuthReq req(pairingRequest->authReq);
-    KeyDistribution responseKD = KeyDistribution();
-    responseKD.setIdKey(true);
+	  
+    if (isPairingEnabled()){
+      if (_pairing_enabled >= 2) _pairing_enabled = 0;  // 2 = pair once only
+      
+      // 0x1
+      struct __attribute__ ((packed)) PairingRequest {
+        uint8_t ioCapability;
+        uint8_t oobDataFlag;
+        uint8_t authReq;
+        uint8_t maxEncSize;
+        uint8_t initiatorKeyDistribution;
+        uint8_t responderKeyDistribution;
+      } *pairingRequest = (PairingRequest*)l2capSignalingHdr->data;
+     
+     
+      ATT.remoteKeyDistribution = KeyDistribution(pairingRequest->initiatorKeyDistribution);
+      ATT.localKeyDistribution = KeyDistribution(pairingRequest->responderKeyDistribution);
+      KeyDistribution rkd(pairingRequest->responderKeyDistribution);
+      AuthReq req(pairingRequest->authReq);
+      KeyDistribution responseKD = KeyDistribution();
+      responseKD.setIdKey(true);
 #ifdef _BLE_TRACE_
-    Serial.print("Req has properties: ");
-    Serial.print(req.Bonding()?"bonding, ":"no bonding, ");
-    Serial.print(req.CT2()?"CT2, ":"no CT2, ");
-    Serial.print(req.KeyPress()?"KeyPress, ":"no KeyPress, ");
-    Serial.print(req.MITM()?"MITM, ":"no MITM, ");
-    Serial.print(req.SC()?"SC, ":"no SC, ");
+      Serial.print("Req has properties: ");
+      Serial.print(req.Bonding()?"bonding, ":"no bonding, ");
+      Serial.print(req.CT2()?"CT2, ":"no CT2, ");
+      Serial.print(req.KeyPress()?"KeyPress, ":"no KeyPress, ");
+      Serial.print(req.MITM()?"MITM, ":"no MITM, ");
+      Serial.print(req.SC()?"SC, ":"no SC, ");
 #endif
     
-    uint8_t peerIOCap[3];
-    peerIOCap[0] = pairingRequest->authReq;
-    peerIOCap[1] = pairingRequest->oobDataFlag;
-    peerIOCap[2] = pairingRequest->ioCapability;
-    ATT.setPeerIOCap(connectionHandle, peerIOCap);
-    ATT.setPeerEncryption(connectionHandle, ATT.getPeerEncryption(connectionHandle) | PEER_ENCRYPTION::PAIRING_REQUEST);
+      uint8_t peerIOCap[3];
+      peerIOCap[0] = pairingRequest->authReq;
+      peerIOCap[1] = pairingRequest->oobDataFlag;
+      peerIOCap[2] = pairingRequest->ioCapability;
+      ATT.setPeerIOCap(connectionHandle, peerIOCap);
+      ATT.setPeerEncryption(connectionHandle, ATT.getPeerEncryption(connectionHandle) | PEER_ENCRYPTION::PAIRING_REQUEST);
 #ifdef _BLE_TRACE_
-    Serial.print("Peer encryption : 0b");
-    Serial.println(ATT.getPeerEncryption(connectionHandle), BIN);
+      Serial.print("Peer encryption : 0b");
+      Serial.println(ATT.getPeerEncryption(connectionHandle), BIN);
 #endif
-    struct __attribute__ ((packed)) PairingResponse {
-      uint8_t code;
-      uint8_t ioCapability;
-      uint8_t oobDataFlag;
-      uint8_t authReq;
-      uint8_t maxEncSize;
-      uint8_t initiatorKeyDistribution;
-      uint8_t responderKeyDistribution;
-    } response = { CONNECTION_PAIRING_RESPONSE, LOCAL_IOCAP, 0, LOCAL_AUTHREQ, 0x10, responseKD.getOctet(), responseKD.getOctet()};
-
-    HCI.sendAclPkt(connectionHandle, SECURITY_CID, sizeof(response), &response);
+      struct __attribute__ ((packed)) PairingResponse {
+        uint8_t code;
+        uint8_t ioCapability;
+        uint8_t oobDataFlag;
+        uint8_t authReq;
+        uint8_t maxEncSize;
+        uint8_t initiatorKeyDistribution;
+        uint8_t responderKeyDistribution;
+      } response = { CONNECTION_PAIRING_RESPONSE, LOCAL_IOCAP, 0, LOCAL_AUTHREQ, 0x10, responseKD.getOctet(), responseKD.getOctet()};
+     
+      HCI.sendAclPkt(connectionHandle, SECURITY_CID, sizeof(response), &response);
+      
+    } else {
+      // Pairing not enabled
+      uint8_t ret[2] = {CONNECTION_PAIRING_FAILED, 0x05}; // reqect pairing
+      HCI.sendAclPkt(connectionHandle, SECURITY_CID, sizeof(ret), ret);
+      ATT.setPeerEncryption(connectionHandle, NO_ENCRYPTION);
+    }
   }
   else if (code == CONNECTION_PAIRING_RANDOM)
   {
@@ -392,6 +404,15 @@ void L2CAPSignalingClass::setSupervisionTimeout(uint16_t supervisionTimeout)
   _supervisionTimeout = supervisionTimeout;
 }
 
+void L2CAPSignalingClass::setPairingEnabled(uint8_t enabled)
+{
+  _pairing_enabled = enabled;
+}
+bool L2CAPSignalingClass::isPairingEnabled()
+{
+  return _pairing_enabled > 0;
+}
+
 void L2CAPSignalingClass::connectionParameterUpdateRequest(uint16_t handle, uint8_t identifier, uint8_t dlen, uint8_t data[])
 {
   struct __attribute__ ((packed)) L2CAPConnectionParameterUpdateRequest {
diff --git a/src/utility/L2CAPSignaling.h b/src/utility/L2CAPSignaling.h
index 7fc64d4f..f8a361ee 100644
--- a/src/utility/L2CAPSignaling.h
+++ b/src/utility/L2CAPSignaling.h
@@ -41,8 +41,15 @@
 #define CONNECTION_PAIRING_DHKEY_CHECK    0x0D
 #define CONNECTION_PAIRING_KEYPRESS       0x0E
 
+#define IOCAP_DISPLAY_ONLY         0x00
+#define IOCAP_DISPLAY_YES_NO       0x01
+#define IOCAP_KEYBOARD_ONLY        0x02
+#define IOCAP_NO_INPUT_NO_OUTPUT   0x03
+#define IOCAP_KEYBOARD_DISPLAY     0x04
+
+
 #define LOCAL_AUTHREQ 0b00101101
-#define LOCAL_IOCAP   0x3
+#define LOCAL_IOCAP   IOCAP_NO_INPUT_NO_OUTPUT // will use JustWorks pairing
 
 class L2CAPSignalingClass {
 public:
@@ -63,6 +70,9 @@ class L2CAPSignalingClass {
   virtual void setConnectionInterval(uint16_t minInterval, uint16_t maxInterval);
 
   virtual void setSupervisionTimeout(uint16_t supervisionTimeout);
+  
+  virtual void setPairingEnabled(uint8_t enabled);
+  virtual bool isPairingEnabled();
 
 
 
@@ -78,6 +88,7 @@ class L2CAPSignalingClass {
   uint16_t _minInterval;
   uint16_t _maxInterval;
   uint16_t _supervisionTimeout;
+  uint8_t _pairing_enabled;
 };
 
 extern L2CAPSignalingClass& L2CAPSignaling;

From d9fb4bcfbf394d98aac93b9b3d4b087552cf4a22 Mon Sep 17 00:00:00 2001
From: unknownconstant <unknownconstant>
Date: Mon, 4 Jan 2021 19:04:01 +0000
Subject: [PATCH 011/112] Secure random & reject unknown LTK

---
 src/local/BLELocalDevice.h     |  18 +++--
 src/utility/HCI.cpp            | 132 +++++++++++++++++++++++----------
 src/utility/HCI.h              |  30 +++++---
 src/utility/L2CAPSignaling.cpp |  18 +++--
 4 files changed, 137 insertions(+), 61 deletions(-)

diff --git a/src/local/BLELocalDevice.h b/src/local/BLELocalDevice.h
index 22a5f589..d06664da 100644
--- a/src/local/BLELocalDevice.h
+++ b/src/local/BLELocalDevice.h
@@ -81,11 +81,19 @@ class BLELocalDevice {
   virtual void debug(Stream& stream);
   virtual void noDebug();
 
-/// TODO: Put in actual variable names
-  virtual void setStoreIRK(int (*storeIRK)(uint8_t*, uint8_t*));
-  virtual void setGetIRKs(int (*getIRKs)(uint8_t* nIRKs, uint8_t** BADDR_type, uint8_t*** BADDRs, uint8_t*** IRKs));
-  virtual void setStoreLTK(int (*storeLTK)(uint8_t*, uint8_t*));
-  virtual void setGetLTK(int (*getLTK)(uint8_t*, uint8_t*));
+  // address - The mac to store
+  // IRK - The IRK to store with this mac
+  virtual void setStoreIRK(int (*storeIRK)(uint8_t* address, uint8_t* IRK));
+  // nIRKs      - the number of IRKs being provided.
+  // BDAddrType - an array containing the type of each address (0 public, 1 static random)
+  // BDAddrs    - an array containing the list of addresses
+  virtual void setGetIRKs(int (*getIRKs)(uint8_t* nIRKs, uint8_t** BDAddrType, uint8_t*** BDAddrs, uint8_t*** IRKs));
+  // address - the address to store [6 bytes]
+  // LTK - the LTK to store with this mac [16 bytes]
+  virtual void setStoreLTK(int (*storeLTK)(uint8_t* address, uint8_t* LTK));
+  // address - The mac address needing its LTK
+  // LTK - 16 octet LTK for the mac address
+  virtual void setGetLTK(int (*getLTK)(uint8_t* address, uint8_t* LTK));
   uint8_t BDaddress[6];
   
 protected:
diff --git a/src/utility/HCI.cpp b/src/utility/HCI.cpp
index 4dc78460..1a604d79 100644
--- a/src/utility/HCI.cpp
+++ b/src/utility/HCI.cpp
@@ -23,6 +23,8 @@
 #include "L2CAPSignaling.h"
 #include "btct.h"
 #include "HCI.h"
+#include "bitDescriptions.h"
+// #define _BLE_TRACE_
 
 #define HCI_COMMAND_PKT   0x01
 #define HCI_ACLDATA_PKT   0x02
@@ -1139,50 +1141,63 @@ void HCIClass::handleEventPkt(uint8_t /*plen*/, uint8_t pdata[])
         // Load our LTK for this connection.
         uint8_t peerAddr[7];
         uint8_t resolvableAddr[6];
+        uint8_t foundLTK;
         ATT.getPeerAddrWithType(ltkRequest->connectionHandle, peerAddr);
         
-        if(ATT.getPeerResolvedAddress(ltkRequest->connectionHandle, resolvableAddr)
-          && !((ATT.getPeerEncryption(ltkRequest->connectionHandle) & PEER_ENCRYPTION::PAIRING_REQUEST)>0)){
-          _getLTK(resolvableAddr, HCI.LTK);
+        if((ATT.getPeerEncryption(ltkRequest->connectionHandle) & PEER_ENCRYPTION::PAIRING_REQUEST)>0){
+          // Pairing request - LTK is one in buffer already
+          foundLTK = 1;
         }else{
-          _getLTK(&peerAddr[1], HCI.LTK);
+          if(ATT.getPeerResolvedAddress(ltkRequest->connectionHandle, resolvableAddr)){
+            foundLTK = getLTK(resolvableAddr, HCI.LTK);
+          }else{
+            foundLTK = getLTK(&peerAddr[1], HCI.LTK);
+          }
         }
-        // }
+        // } //2d
         // Send our LTK back
-        struct __attribute__ ((packed)) LTKReply
-        {
-          uint16_t connectionHandle;
-          uint8_t LTK[16];
-        } ltkReply = {0,0};
-        ltkReply.connectionHandle = ltkRequest->connectionHandle;
-        for(int i=0; i<16; i++) ltkReply.LTK[15-i] = HCI.LTK[i];
-        int result = sendCommand(OGF_LE_CTL << 10 | LE_COMMAND::LONG_TERM_KEY_REPLY,sizeof(ltkReply), &ltkReply);
-
-#ifdef _BLE_TRACE_
-        Serial.println("Sending LTK as: ");
-        btct.printBytes(ltkReply.LTK,16);
-#endif
-
-        if(result == 0){
-          struct __attribute__ ((packed)) LTKReplyResult
+        if(foundLTK){
+          struct __attribute__ ((packed)) LTKReply
           {
-            uint8_t status;
             uint16_t connectionHandle;
-          } ltkReplyResult = {0,0};
-          memcpy(&ltkReplyResult, _cmdResponse, 3);
-
-#ifdef _BLE_TRACE_
-          Serial.println("LTK send success");
-          Serial.print("status     : ");
-          btct.printBytes(&ltkReplyResult.status,1);
-          Serial.print("Conn Handle: ");
-          btct.printBytes((uint8_t*)&ltkReplyResult.connectionHandle,2);
-#endif
+            uint8_t LTK[16];
+          } ltkReply = {0,0};
+          ltkReply.connectionHandle = ltkRequest->connectionHandle;
+          for(int i=0; i<16; i++) ltkReply.LTK[15-i] = HCI.LTK[i];
+          int result = sendCommand(OGF_LE_CTL << 10 | LE_COMMAND::LONG_TERM_KEY_REPLY,sizeof(ltkReply), &ltkReply);
+
+  #ifdef _BLE_TRACE_
+          Serial.println("Sending LTK as: ");
+          btct.printBytes(ltkReply.LTK,16);
+  #endif
+
+          if(result == 0){
+            struct __attribute__ ((packed)) LTKReplyResult
+            {
+              uint8_t status;
+              uint16_t connectionHandle;
+            } ltkReplyResult = {0,0};
+            memcpy(&ltkReplyResult, _cmdResponse, 3);
+
+  #ifdef _BLE_TRACE_
+            Serial.println("LTK send success");
+            Serial.print("status     : ");
+            btct.printBytes(&ltkReplyResult.status,1);
+            Serial.print("Conn Handle: ");
+            btct.printBytes((uint8_t*)&ltkReplyResult.connectionHandle,2);
+  #endif
+          }else{
+  #ifdef _BLE_TRACE_
+            Serial.print("Failed to send LTK...: ");
+            btct.printBytes((uint8_t*)&result,2);
+  #endif
+          }
         }else{
+          /// do LTK rejection
 #ifdef _BLE_TRACE_
-          Serial.print("Failed to send LTK...: ");
-          btct.printBytes((uint8_t*)&result,2);
+          Serial.println("LTK not found, rejecting");
 #endif
+          sendCommand(OGF_LE_CTL << 10 | LE_COMMAND::LONG_TERM_KEY_NEGATIVE_REPLY,2, &ltkRequest->connectionHandle);
         }
         break;
       }
@@ -1256,10 +1271,10 @@ void HCIClass::handleEventPkt(uint8_t /*plen*/, uint8_t pdata[])
           
 
           uint8_t Z = 0;
-          for(int i=0; i<16; i++){
-            /// TODO: Implement secure random
-            Nb[i] = rand(); //// Should use ESP or ECCx08
-          }
+          
+          HCI.leRand(Nb);
+          HCI.leRand(&Nb[8]);
+          
 #ifdef _BLE_TRACE_
           Serial.print("nb: ");
           btct.printBytes(Nb, 16);
@@ -1405,6 +1420,47 @@ int HCIClass::leEncrypt(uint8_t* key, uint8_t* plaintext, uint8_t* status, uint8
 #endif
   return res;
 }
+int HCIClass::leRand(uint8_t rand[]){
+  int res = sendCommand(OGF_LE_CTL << 10 | LE_COMMAND::RANDOM);
+  if(res == 0){
+    memcpy(rand,_cmdResponse, 8); /// backwards but it's a random number
+  }
+  return res;
+}
+int HCIClass::getLTK(uint8_t* address, uint8_t* LTK){
+  if(_getLTK!=0){
+    return _getLTK(address, LTK);
+  }else{
+    return 0;
+  }
+}
+int HCIClass::storeIRK(uint8_t* address, uint8_t* IRK){
+  if(_storeIRK!=0){
+    return _storeIRK(address, IRK);
+  }else{
+    return 0;
+  }
+}
+int HCIClass::storeLTK(uint8_t* address, uint8_t* LTK){
+  if(_storeLTK!=0){
+    return _storeLTK(address, LTK);
+  }else{
+    return 0;
+  }
+}
+
+/// Stub function to generate parameters for local authreq
+AuthReq HCIClass::localAuthreq(){
+  // If get, set, IRK, LTK all set then we can bond.
+  AuthReq local = AuthReq();
+  if(_storeIRK!=0 && _storeLTK!=0 && _getLTK!=0 && _getIRKs!=0){
+    local.setBonding(true);
+  }
+  local.setSC(true);
+  local.setMITM(true);
+  local.setCT2(true);
+  return LOCAL_AUTHREQ;
+}
 
 void HCIClass::dumpPkt(const char* prefix, uint8_t plen, uint8_t pdata[])
 {
diff --git a/src/utility/HCI.h b/src/utility/HCI.h
index de15bdf8..b8671303 100644
--- a/src/utility/HCI.h
+++ b/src/utility/HCI.h
@@ -21,6 +21,7 @@
 #define _HCI_H_
 
 #include <Arduino.h>
+#include "bitDescriptions.h"
 
 #define OGF_LINK_CTL           0x01
 #define OGF_HOST_CTL           0x03
@@ -29,11 +30,13 @@
 #define OGF_LE_CTL             0x08
 
 enum LE_COMMAND {
-  ENCRYPT             = 0x0017,
-  LONG_TERM_KEY_REPLY = 0x001A,
-  READ_LOCAL_P256     = 0x0025,
-  GENERATE_DH_KEY_V1  = 0x0026,
-  GENERATE_DH_KEY_V2  = 0x005E
+  ENCRYPT                      = 0x0017,
+  RANDOM                       = 0x0018,
+  LONG_TERM_KEY_REPLY          = 0x001A,
+  LONG_TERM_KEY_NEGATIVE_REPLY = 0x1B,
+  READ_LOCAL_P256              = 0x0025,
+  GENERATE_DH_KEY_V1           = 0x0026,
+  GENERATE_DH_KEY_V2           = 0x005E
 };
 enum LE_META_EVENT {
   CONN_COMPLETE             = 0x01,
@@ -89,6 +92,9 @@ class HCIClass {
                   uint16_t latency, uint16_t supervisionTimeout);
   virtual int leCancelConn();
   virtual int leEncrypt(uint8_t* Key, uint8_t* plaintext, uint8_t* status, uint8_t* ciphertext);
+  // Generate a 64 bit random number
+  virtual int leRand(uint8_t rand[]);
+  virtual AuthReq localAuthreq();
 
   virtual int saveNewAddress(uint8_t addressType, uint8_t* address, uint8_t* peerIrk, uint8_t* remoteIrk);
   virtual int leAddResolvingAddress(uint8_t addressType, uint8_t* address, uint8_t* peerIrk, uint8_t* remoteIrk);
@@ -108,7 +114,7 @@ class HCIClass {
   virtual void debug(Stream& stream);
   virtual void noDebug();
 
-  // TODO: Send command be private again & use ATT implementation within ATT.
+  // TODO: Send command be private again & use ATT implementation of send command within ATT.
   virtual int sendCommand(uint16_t opcode, uint8_t plen = 0, void* parameters = NULL);
   uint8_t remotePublicKeyBuffer[64];
   uint8_t Na[16];
@@ -116,11 +122,13 @@ class HCIClass {
   uint8_t DHKey[32];
   uint8_t localAddr[6];
   uint8_t LTK[16];
-
-  int (*_storeIRK)(uint8_t* address, uint8_t* peerIrk);
-  int (*_getIRKs)(uint8_t* nIRKs,uint8_t** BADDR_type, uint8_t*** BADDRs, uint8_t*** IRKs);
-  int (*_storeLTK)(uint8_t*, uint8_t*);
-  int (*_getLTK)(uint8_t*, uint8_t*);
+  virtual int getLTK(uint8_t* address, uint8_t* LTK);
+  virtual int storeLTK(uint8_t* address, uint8_t* LTK);
+  virtual int storeIRK(uint8_t* address, uint8_t* IRK);
+  int (*_storeIRK)(uint8_t* address, uint8_t* peerIrk) = 0;
+  int (*_getIRKs)(uint8_t* nIRKs,uint8_t** BADDR_type, uint8_t*** BADDRs, uint8_t*** IRKs) = 0;
+  int (*_storeLTK)(uint8_t*, uint8_t*) = 0;
+  int (*_getLTK)(uint8_t*, uint8_t*) = 0;
 
 private:
 
diff --git a/src/utility/L2CAPSignaling.cpp b/src/utility/L2CAPSignaling.cpp
index f7f93b84..9d9efd81 100644
--- a/src/utility/L2CAPSignaling.cpp
+++ b/src/utility/L2CAPSignaling.cpp
@@ -26,6 +26,9 @@
 #define CONNECTION_PARAMETER_UPDATE_REQUEST  0x12
 #define CONNECTION_PARAMETER_UPDATE_RESPONSE 0x13
 
+
+// #define _BLE_TRACE_
+
 L2CAPSignalingClass::L2CAPSignalingClass() :
   _minInterval(0),
   _maxInterval(0),
@@ -139,13 +142,14 @@ void L2CAPSignalingClass::handleSecurityData(uint16_t connectionHandle, uint8_t
       uint8_t responderKeyDistribution;
     } *pairingRequest = (PairingRequest*)l2capSignalingHdr->data;
 
-
-    ATT.remoteKeyDistribution = KeyDistribution(pairingRequest->initiatorKeyDistribution);
-    ATT.localKeyDistribution = KeyDistribution(pairingRequest->responderKeyDistribution);
-    KeyDistribution rkd(pairingRequest->responderKeyDistribution);
-    AuthReq req(pairingRequest->authReq);
     KeyDistribution responseKD = KeyDistribution();
     responseKD.setIdKey(true);
+
+    ATT.remoteKeyDistribution = responseKD;// KeyDistribution(pairingRequest->initiatorKeyDistribution);
+    ATT.localKeyDistribution = responseKD; //KeyDistribution(pairingRequest->responderKeyDistribution);
+    // KeyDistribution rkd(pairingRequest->responderKeyDistribution);
+    AuthReq req(pairingRequest->authReq);
+    
 #ifdef _BLE_TRACE_
     Serial.print("Req has properties: ");
     Serial.print(req.Bonding()?"bonding, ":"no bonding, ");
@@ -173,7 +177,7 @@ void L2CAPSignalingClass::handleSecurityData(uint16_t connectionHandle, uint8_t
       uint8_t maxEncSize;
       uint8_t initiatorKeyDistribution;
       uint8_t responderKeyDistribution;
-    } response = { CONNECTION_PAIRING_RESPONSE, LOCAL_IOCAP, 0, LOCAL_AUTHREQ, 0x10, responseKD.getOctet(), responseKD.getOctet()};
+    } response = { CONNECTION_PAIRING_RESPONSE, LOCAL_IOCAP, 0, HCI.localAuthreq().getOctet(), 0x10, responseKD.getOctet(), responseKD.getOctet()};
 
     HCI.sendAclPkt(connectionHandle, SECURITY_CID, sizeof(response), &response);
   }
@@ -305,7 +309,7 @@ void L2CAPSignalingClass::handleSecurityData(uint16_t connectionHandle, uint8_t
       uint8_t Eb[16];
       uint8_t R[16];
       uint8_t MasterIOCap[3];
-      uint8_t SlaveIOCap[3] = {LOCAL_AUTHREQ, 0x0, LOCAL_IOCAP};
+      uint8_t SlaveIOCap[3] = {HCI.localAuthreq().getOctet(), 0x0, LOCAL_IOCAP};
       
       ATT.getPeerIOCap(connectionHandle, MasterIOCap);
       for(int i=0; i<16; i++) R[i] = 0;

From e2868a7108fec2bd6349c48ee556e5fe446daad0 Mon Sep 17 00:00:00 2001
From: unknownconstant <unknownconstant>
Date: Thu, 7 Jan 2021 10:43:23 +0000
Subject: [PATCH 012/112] Pairing code & binary confirm callbacks

---
 src/local/BLELocalDevice.cpp   |  6 ++++
 src/local/BLELocalDevice.h     |  3 ++
 src/utility/ATT.cpp            |  2 ++
 src/utility/HCI.cpp            | 15 +++++++++-
 src/utility/HCI.h              |  4 +++
 src/utility/L2CAPSignaling.cpp | 54 ++++++++++++++++++++++++++++++++--
 src/utility/L2CAPSignaling.h   |  2 +-
 src/utility/btct.cpp           | 36 +++++++++++++++++++++++
 src/utility/btct.h             |  2 ++
 9 files changed, 120 insertions(+), 4 deletions(-)

diff --git a/src/local/BLELocalDevice.cpp b/src/local/BLELocalDevice.cpp
index 029fb488..d83c1cb3 100644
--- a/src/local/BLELocalDevice.cpp
+++ b/src/local/BLELocalDevice.cpp
@@ -434,6 +434,12 @@ void BLELocalDevice::setStoreLTK(int (*storeLTK)(uint8_t*, uint8_t*)){
 void BLELocalDevice::setStoreIRK(int (*storeIRK)(uint8_t*, uint8_t*)){
   HCI._storeIRK = storeIRK;
 }
+void BLELocalDevice::setDisplayCode(void (*displayCode)(uint32_t confirmationCode)){
+  HCI._displayCode = displayCode;
+}
+void BLELocalDevice::setBinaryConfirmPairing(bool (*binaryConfirmPairing)()){
+  HCI._binaryConfirmPairing = binaryConfirmPairing;
+}
 
 void BLELocalDevice::debug(Stream& stream)
 {
diff --git a/src/local/BLELocalDevice.h b/src/local/BLELocalDevice.h
index 75e7dc31..6c45c063 100644
--- a/src/local/BLELocalDevice.h
+++ b/src/local/BLELocalDevice.h
@@ -104,6 +104,9 @@ class BLELocalDevice {
   // address - The mac address needing its LTK
   // LTK - 16 octet LTK for the mac address
   virtual void setGetLTK(int (*getLTK)(uint8_t* address, uint8_t* LTK));
+
+  virtual void setDisplayCode(void (*displayCode)(uint32_t confirmationCode));
+  virtual void setBinaryConfirmPairing(bool (*binaryConfirmPairing)());
   uint8_t BDaddress[6];
   
 protected:
diff --git a/src/utility/ATT.cpp b/src/utility/ATT.cpp
index a5166217..91ffeed0 100644
--- a/src/utility/ATT.cpp
+++ b/src/utility/ATT.cpp
@@ -81,6 +81,8 @@
 #define ATT_ECODE_UNSUPP_GRP_TYPE      0x10
 #define ATT_ECODE_INSUFF_RESOURCES     0x11
 
+// #define _BLE_TRACE_
+
 ATTClass::ATTClass() :
   _maxMtu(23),
   _timeout(5000),
diff --git a/src/utility/HCI.cpp b/src/utility/HCI.cpp
index 9bcec4e1..82303ed3 100644
--- a/src/utility/HCI.cpp
+++ b/src/utility/HCI.cpp
@@ -26,7 +26,6 @@
 #include "bitDescriptions.h"
 // #define _BLE_TRACE_
 
-//#define _BLE_TRACE_
 
 #define HCI_COMMAND_PKT   0x01
 #define HCI_ACLDATA_PKT   0x02
@@ -1258,6 +1257,7 @@ void HCIClass::handleEventPkt(uint8_t /*plen*/, uint8_t pdata[])
             uint8_t publicKey[64];
           } pairingPublicKey = {CONNECTION_PAIRING_PUBLIC_KEY,0};
           memcpy(pairingPublicKey.publicKey,evtReadLocalP256Complete->localPublicKey,64);
+          memcpy(localPublicKeyBuffer,      evtReadLocalP256Complete->localPublicKey,64);
 
           // Send the local public key to the remote
           uint16_t connectionHandle = ATT.getPeerEncrptingConnectionHandle();
@@ -1456,6 +1456,19 @@ int HCIClass::storeLTK(uint8_t* address, uint8_t* LTK){
     return 0;
   }
 }
+uint8_t HCIClass::localIOCap(){
+  if(_displayCode!=0){
+    /// We have a display
+    if(_binaryConfirmPairing!=0){
+      return IOCAP_DISPLAY_YES_NO;
+    }else{
+      return IOCAP_DISPLAY_ONLY;
+    }
+  }else{
+    // We have no display
+    return IOCAP_NO_INPUT_NO_OUTPUT;
+  }
+}
 
 /// Stub function to generate parameters for local authreq
 AuthReq HCIClass::localAuthreq(){
diff --git a/src/utility/HCI.h b/src/utility/HCI.h
index f2bc535e..af46265a 100644
--- a/src/utility/HCI.h
+++ b/src/utility/HCI.h
@@ -97,6 +97,7 @@ class HCIClass {
   // Generate a 64 bit random number
   virtual int leRand(uint8_t rand[]);
   virtual AuthReq localAuthreq();
+  virtual uint8_t localIOCap();
 
   virtual int saveNewAddress(uint8_t addressType, uint8_t* address, uint8_t* peerIrk, uint8_t* remoteIrk);
   virtual int leAddResolvingAddress(uint8_t addressType, uint8_t* address, uint8_t* peerIrk, uint8_t* remoteIrk);
@@ -119,6 +120,7 @@ class HCIClass {
   // TODO: Send command be private again & use ATT implementation of send command within ATT.
   virtual int sendCommand(uint16_t opcode, uint8_t plen = 0, void* parameters = NULL);
   uint8_t remotePublicKeyBuffer[64];
+  uint8_t localPublicKeyBuffer[64];
   uint8_t remoteDHKeyCheckBuffer[16];
   uint8_t Na[16];
   uint8_t Nb[16];
@@ -132,6 +134,8 @@ class HCIClass {
   int (*_getIRKs)(uint8_t* nIRKs,uint8_t** BADDR_type, uint8_t*** BADDRs, uint8_t*** IRKs) = 0;
   int (*_storeLTK)(uint8_t*, uint8_t*) = 0;
   int (*_getLTK)(uint8_t*, uint8_t*) = 0;
+  void (*_displayCode)(uint32_t confirmationCode) = 0;
+  bool (*_binaryConfirmPairing)() = 0;
 
 private:
 
diff --git a/src/utility/L2CAPSignaling.cpp b/src/utility/L2CAPSignaling.cpp
index f7712051..2ef08b62 100644
--- a/src/utility/L2CAPSignaling.cpp
+++ b/src/utility/L2CAPSignaling.cpp
@@ -180,7 +180,7 @@ void L2CAPSignalingClass::handleSecurityData(uint16_t connectionHandle, uint8_t
         uint8_t maxEncSize;
         uint8_t initiatorKeyDistribution;
         uint8_t responderKeyDistribution;
-      } response = { CONNECTION_PAIRING_RESPONSE, LOCAL_IOCAP, 0, HCI.localAuthreq().getOctet(), 0x10, responseKD.getOctet(), responseKD.getOctet()};
+      } response = { CONNECTION_PAIRING_RESPONSE, HCI.localIOCap(), 0, HCI.localAuthreq().getOctet(), 0x10, responseKD.getOctet(), responseKD.getOctet()};
      
       HCI.sendAclPkt(connectionHandle, SECURITY_CID, sizeof(response), &response);
       
@@ -209,6 +209,55 @@ void L2CAPSignalingClass::handleSecurityData(uint16_t connectionHandle, uint8_t
     for(int i=0; i< 16; i++) response.Nb[15-i] = HCI.Nb[i];
 
     HCI.sendAclPkt(connectionHandle, SECURITY_CID, sizeof(response), &response);
+
+    // We now have all needed for compare value
+    uint8_t g2Result[4];
+    uint8_t U[32];
+    uint8_t V[32];
+    
+    for(int i=0; i<32; i++){
+      U[31-i] = HCI.remotePublicKeyBuffer[i];
+      V[31-i] = HCI.localPublicKeyBuffer[i];
+    }
+
+    btct.g2(U,V,HCI.Na,HCI.Nb, g2Result);
+    uint32_t result = 0;
+    for(int i=0; i<4; i++) result += g2Result[3-i] << 8*i;
+
+#ifdef _BLE_TRACE_
+    Serial.print("U      : ");
+    btct.printBytes(U,32);
+    Serial.print("V      : ");
+    btct.printBytes(V,32);
+    Serial.print("X      : ");
+    btct.printBytes(X,16);
+    Serial.print("Y      : ");
+    btct.printBytes(Y,16);
+    Serial.print("g2res  : ");
+    btct.printBytes(g2Result,4);
+    Serial.print("Result : ");
+    Serial.println(result);
+#endif
+
+    if(HCI._displayCode!=0){
+      HCI._displayCode(result%1000000);
+    }
+    if(HCI._binaryConfirmPairing!=0){
+      if(!HCI._binaryConfirmPairing()){
+#ifdef _BLE_TRACE_
+        Serial.println("User rejection");
+#endif
+        uint8_t rejection[2];
+        rejection[0] = CONNECTION_PAIRING_FAILED;
+        rejection[1] = 0x0C; // Numeric comparison failed
+        HCI.sendAclPkt(connectionHandle, SECURITY_CID, 2, rejection);
+        ATT.setPeerEncryption(connectionHandle, PEER_ENCRYPTION::NO_ENCRYPTION);
+      }else{
+#ifdef _BLE_TRACE_
+        Serial.println("User did confirm");
+#endif
+      }
+    }
   }
   else if (code == CONNECTION_PAIRING_RESPONSE)
   {
@@ -224,6 +273,7 @@ void L2CAPSignalingClass::handleSecurityData(uint16_t connectionHandle, uint8_t
     Serial.print("Pairing failed with code: 0x");
     Serial.println(pairingFailed->reason,HEX);
 #endif
+    ATT.setPeerEncryption(connectionHandle, PEER_ENCRYPTION::NO_ENCRYPTION);
   }
   else if (code == CONNECTION_IDENTITY_INFORMATION){
     struct __attribute__ ((packed)) IdentityInformation {
@@ -338,7 +388,7 @@ void L2CAPSignalingClass::smCalculateLTKandConfirm(uint16_t handle, uint8_t expe
   uint8_t Eb[16];
   uint8_t R[16];
   uint8_t MasterIOCap[3];
-  uint8_t SlaveIOCap[3] = {HCI.localAuthreq().getOctet(), 0x0, LOCAL_IOCAP};
+  uint8_t SlaveIOCap[3] = {HCI.localAuthreq().getOctet(), 0x0, HCI.localIOCap()};
   
   ATT.getPeerIOCap(handle, MasterIOCap);
   for(int i=0; i<16; i++) R[i] = 0;
diff --git a/src/utility/L2CAPSignaling.h b/src/utility/L2CAPSignaling.h
index f8a361ee..26042167 100644
--- a/src/utility/L2CAPSignaling.h
+++ b/src/utility/L2CAPSignaling.h
@@ -49,7 +49,7 @@
 
 
 #define LOCAL_AUTHREQ 0b00101101
-#define LOCAL_IOCAP   IOCAP_NO_INPUT_NO_OUTPUT // will use JustWorks pairing
+// #define LOCAL_IOCAP   IOCAP_DISPLAY_ONLY // will use JustWorks pairing
 
 class L2CAPSignalingClass {
 public:
diff --git a/src/utility/btct.cpp b/src/utility/btct.cpp
index d78e328e..b4faf053 100644
--- a/src/utility/btct.cpp
+++ b/src/utility/btct.cpp
@@ -150,6 +150,42 @@ void BluetoothCryptoToolbox::testAh()
     printBytes(ourResult, 3);
 }
 
+int BluetoothCryptoToolbox::g2(uint8_t U[], uint8_t V[], uint8_t X[], uint8_t Y[], uint8_t out[4])
+{
+    struct __attribute__ ((packed)) CmacInput {
+        uint8_t U[32];
+        uint8_t V[32];
+        uint8_t Y[16];
+    } cmacInput= {0,0,0};
+    memcpy(cmacInput.U,U,32);
+    memcpy(cmacInput.V,V,32);
+    memcpy(cmacInput.Y,Y,16);
+    uint8_t intermediate[16];
+    AES_CMAC(X,(uint8_t*)&cmacInput,sizeof(CmacInput),intermediate);
+    memcpy(out,&intermediate[12],4);
+    return 1;
+}
+void BluetoothCryptoToolbox::testg2(){
+    uint8_t U[32] = {0x20,0xb0,0x03,0xd2,0xf2,0x97,0xbe,0x2c,0x5e,0x2c,0x83,0xa7,0xe9,0xf9,0xa5,0xb9,0xef,0xf4,0x91,0x11,0xac,0xf4,0xfd,0xdb,0xcc,0x03,0x01,0x48,0x0e,0x35,0x9d,0xe6};
+    uint8_t V[32] = {0x55,0x18,0x8b,0x3d,0x32,0xf6,0xbb,0x9a,0x90,0x0a,0xfc,0xfb,0xee,0xd4,0xe7,0x2a,0x59,0xcb,0x9a,0xc2,0xf1,0x9d,0x7c,0xfb,0x6b,0x4f,0xdd,0x49,0xf4,0x7f,0xc5,0xfd};
+    uint8_t X[16] = {0xd5,0xcb,0x84,0x54,0xd1,0x77,0x73,0x3e,0xff,0xff,0xb2,0xec,0x71,0x2b,0xae,0xab};
+    uint8_t Y[16] = {0xa6,0xe8,0xe7,0xcc,0x25,0xa7,0x5f,0x6e,0x21,0x65,0x83,0xf7,0xff,0x3d,0xc4,0xcf};
+    uint8_t AES[16] = {0x15,0x36,0xd1,0x8d,0xe3,0xd2,0x0d,0xf9,0x9b,0x70,0x44,0xc1,0x2f,0x9e,0xd5,0xba};
+    uint8_t out[4];
+    
+    
+    uint32_t expected = 0;
+    g2(U,V,X,Y,out);
+    uint32_t result = 0;
+    for(int i=0; i<4; i++) result += out[i] << 8*i;
+
+    Serial.print("Expected :     ");
+    Serial.println(expected);
+    Serial.print("Result   : ");
+    Serial.println(result);
+    Serial.println();
+
+}
 
 void BluetoothCryptoToolbox::AES_CMAC ( unsigned char *key, unsigned char *input, int length,
                   unsigned char *mac )
diff --git a/src/utility/btct.h b/src/utility/btct.h
index 43c0b0d6..08f8f192 100644
--- a/src/utility/btct.h
+++ b/src/utility/btct.h
@@ -13,11 +13,13 @@ class BluetoothCryptoToolbox{
     int f5(uint8_t DHKey[],uint8_t N_master[], uint8_t N_slave[],
             uint8_t BD_ADDR_master[], uint8_t BD_ADDR_slave[], uint8_t MacKey[], uint8_t LTK[]);
     int f6(uint8_t W[], uint8_t N1[],uint8_t N2[],uint8_t R[], uint8_t IOCap[], uint8_t A1[], uint8_t A2[], uint8_t Ex[]);
+    int g2(uint8_t U[], uint8_t V[], uint8_t X[], uint8_t Y[], uint8_t out[4]);
     int ah(uint8_t k[16], uint8_t r[3], uint8_t result[3]);
     void test();
     void testF5();
     void testF6();
     void testAh();
+    void testg2();
 private:
     int AES_128(uint8_t key[], uint8_t data_in[], uint8_t data_out[]);
     void leftshift_onebit(unsigned char *input,unsigned char *output);

From 6b08d21480d00d2842f6641cf06d7aa48a7ec219 Mon Sep 17 00:00:00 2001
From: unknownconstant <unknownconstant>
Date: Thu, 7 Jan 2021 10:48:26 +0000
Subject: [PATCH 013/112] Updated example sketch

---
 .../EncryptedBatteryMonitor.ino               | 27 ++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/examples/Peripheral/EncryptedBatteryMonitor/EncryptedBatteryMonitor.ino b/examples/Peripheral/EncryptedBatteryMonitor/EncryptedBatteryMonitor.ino
index fd40f5ee..dd3afbf6 100644
--- a/examples/Peripheral/EncryptedBatteryMonitor/EncryptedBatteryMonitor.ino
+++ b/examples/Peripheral/EncryptedBatteryMonitor/EncryptedBatteryMonitor.ino
@@ -18,7 +18,7 @@
 #include <ArduinoBLE.h>
 
 
-#define PAIR_BUTTON D3        // button for pairing
+#define PAIR_BUTTON 3        // button for pairing
 #define PAIR_LED 24           // LED used to signal pairing
 #define PAIR_LED_ON LOW       // Blue LED on Nano BLE has inverted logic
 #define PAIR_INTERVAL 30000   // interval for pairing after button press in ms
@@ -42,6 +42,7 @@ int oldBatteryLevel = 0;  // last battery level reading from analog input
 unsigned long previousMillis = 0;  // last time the battery level was checked, in ms
 unsigned long pairingStarted = 0;  // pairing start time when button is pressed
 bool wasConnected = 0;
+bool acceptOrReject = true;
 
 void setup() {
   Serial.begin(9600);    // initialize serial communication
@@ -53,6 +54,30 @@ void setup() {
 
 
   Serial.println("Serial connected");
+  
+  // Callback function with confirmation code when new device is pairing.
+  BLE.setDisplayCode([](uint32_t confirmCode){
+    Serial.println("New device pairing request.");
+    Serial.print("Confirm code matches pairing device: ");
+    char code[6];
+    sprintf(code, "%06d", confirmCode);
+    Serial.println(code);
+  });
+  
+  // Callback to allow accepting or rejecting pairing
+  BLE.setBinaryConfirmPairing([&acceptOrReject](){
+    Serial.print("Should we confirm pairing? ");
+    delay(5000);
+    if(acceptOrReject){
+      acceptOrReject = false;
+      Serial.println("yes");
+      return true;
+    }else{
+      acceptOrReject = true;
+      Serial.println("no");
+      return false;
+    }
+  });
 
   // IRKs are keys that identify the true owner of a random mac address.
   // Add IRKs of devices you are bonded with.

From 3dd53d1ba67450a26a80ec6768667a662d157496 Mon Sep 17 00:00:00 2001
From: unknownconstant <unknownconstant>
Date: Sun, 24 Jan 2021 10:03:17 +0000
Subject: [PATCH 014/112] Spellcheck fixes

---
 .../EncryptedBatteryMonitor/EncryptedBatteryMonitor.ino       | 2 +-
 src/local/BLELocalDevice.cpp                                  | 2 +-
 src/utility/ATT.cpp                                           | 2 +-
 src/utility/HCI.cpp                                           | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/examples/Peripheral/EncryptedBatteryMonitor/EncryptedBatteryMonitor.ino b/examples/Peripheral/EncryptedBatteryMonitor/EncryptedBatteryMonitor.ino
index dd3afbf6..9f9d453b 100644
--- a/examples/Peripheral/EncryptedBatteryMonitor/EncryptedBatteryMonitor.ino
+++ b/examples/Peripheral/EncryptedBatteryMonitor/EncryptedBatteryMonitor.ino
@@ -116,7 +116,7 @@ void setup() {
   // The LTK is the secret key which is used to encrypt bluetooth traffic
   BLE.setGetLTK([](uint8_t* address, uint8_t* LTK){
     // address is input
-    Serial.print("Recieved request for address: ");
+    Serial.print("Received request for address: ");
     btct.printBytes(address,6);
 
     // Set these to the MAC and LTK of your devices after bonding.
diff --git a/src/local/BLELocalDevice.cpp b/src/local/BLELocalDevice.cpp
index d83c1cb3..8c1758b0 100644
--- a/src/local/BLELocalDevice.cpp
+++ b/src/local/BLELocalDevice.cpp
@@ -123,7 +123,7 @@ int BLELocalDevice::begin()
 
   /// The HCI should allow automatic address resolution.
 
-  // // If we have callbacks to rememember bonded devices:
+  // // If we have callbacks to remember bonded devices:
   // if(HCI._getIRKs!=0){
   //   uint8_t nIRKs = 0;
   //   uint8_t** BADDR_Type = new uint8_t*;
diff --git a/src/utility/ATT.cpp b/src/utility/ATT.cpp
index 91ffeed0..f6ab392f 100644
--- a/src/utility/ATT.cpp
+++ b/src/utility/ATT.cpp
@@ -602,7 +602,7 @@ bool ATTClass::handleNotify(uint16_t handle, const uint8_t* value, int length)
     memcpy(&notification[notificationLength], value, length);
     notificationLength += length;
 
-    /// TODO: Set encyption requirement on notify.
+    /// TODO: Set encryption requirement on notify.
     HCI.sendAclPkt(_peers[i].connectionHandle, ATT_CID, notificationLength, notification);
 
     numNotifications++;
diff --git a/src/utility/HCI.cpp b/src/utility/HCI.cpp
index 82303ed3..96948b85 100644
--- a/src/utility/HCI.cpp
+++ b/src/utility/HCI.cpp
@@ -841,7 +841,7 @@ void HCIClass::handleEventPkt(uint8_t /*plen*/, uint8_t pdata[])
       if((ATT.getPeerEncryption(encryptionChange->connectionHandle)&PEER_ENCRYPTION::PAIRING_REQUEST)>0){
         if(ATT.localKeyDistribution.EncKey()){
 #ifdef _BLE_TRACE_
-          Serial.println("Enc key set but sould be ignored");
+          Serial.println("Enc key set but should be ignored");
 #endif
         }else{
 #ifdef _BLE_TRACE_
@@ -1364,7 +1364,7 @@ void HCIClass::handleEventPkt(uint8_t /*plen*/, uint8_t pdata[])
 
           if((encryption & PEER_ENCRYPTION::RECEIVED_DH_CHECK) > 0){
 #ifdef _BLE_TRACE_
-            Serial.println("Recieved DHKey check already so calculate f5, f6 now.");
+            Serial.println("Received DHKey check already so calculate f5, f6 now.");
 #endif
             L2CAPSignaling.smCalculateLTKandConfirm(connectionHandle, HCI.remoteDHKeyCheckBuffer);
 	  

From 55d5bf2c0dea092b8efbec9b444432a68a86c4f3 Mon Sep 17 00:00:00 2001
From: Tim Lossen <tim@lossen.de>
Date: Sat, 26 Dec 2020 22:05:11 +0100
Subject: [PATCH 015/112] add access to raw advertisement data

---
 src/BLEDevice.cpp | 11 +++++++++++
 src/BLEDevice.h   |  2 ++
 2 files changed, 13 insertions(+)

diff --git a/src/BLEDevice.cpp b/src/BLEDevice.cpp
index fa806104..4fb2562d 100644
--- a/src/BLEDevice.cpp
+++ b/src/BLEDevice.cpp
@@ -184,6 +184,17 @@ String BLEDevice::advertisedServiceUuid(int index) const
   return serviceUuid;
 }
 
+int BLEDevice::advertisementData(uint8_t value[], int length)
+{
+  if (_eirDataLength > length) return 0;  // Check that buffer size is sufficient
+
+  if (_eirDataLength) {
+    memcpy(value, _eirData, _eirDataLength);
+  }
+
+  return _eirDataLength;
+}
+
 int BLEDevice::rssi()
 {
   uint16_t handle = ATT.connectionHandle(_addressType, _address);
diff --git a/src/BLEDevice.h b/src/BLEDevice.h
index cbe79c71..508d46c1 100644
--- a/src/BLEDevice.h
+++ b/src/BLEDevice.h
@@ -59,6 +59,8 @@ class BLEDevice {
   String advertisedServiceUuid() const;
   String advertisedServiceUuid(int index) const;
 
+  int advertisementData(uint8_t value[], int length);
+
   virtual int rssi();
 
   bool connect();

From a9550cf9a27334db6e71cbddc6be0348274bd541 Mon Sep 17 00:00:00 2001
From: Paolo Calao <paolo.calao@gmail.com>
Date: Tue, 20 Apr 2021 17:24:22 +0200
Subject: [PATCH 016/112] Saturate length of retrieved advertisement data

---
 src/BLEDevice.cpp | 10 +++++-----
 src/BLEDevice.h   |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/BLEDevice.cpp b/src/BLEDevice.cpp
index 4fb2562d..4ac0785f 100644
--- a/src/BLEDevice.cpp
+++ b/src/BLEDevice.cpp
@@ -184,15 +184,15 @@ String BLEDevice::advertisedServiceUuid(int index) const
   return serviceUuid;
 }
 
-int BLEDevice::advertisementData(uint8_t value[], int length)
+int BLEDevice::advertisementData(uint8_t value[], int length) const
 {
-  if (_eirDataLength > length) return 0;  // Check that buffer size is sufficient
+  if (length > _eirDataLength) length = _eirDataLength;
 
-  if (_eirDataLength) {
-    memcpy(value, _eirData, _eirDataLength);
+  if (length) {
+    memcpy(value, _eirData, length);
   }
 
-  return _eirDataLength;
+  return length;
 }
 
 int BLEDevice::rssi()
diff --git a/src/BLEDevice.h b/src/BLEDevice.h
index 508d46c1..84fb8f15 100644
--- a/src/BLEDevice.h
+++ b/src/BLEDevice.h
@@ -59,7 +59,7 @@ class BLEDevice {
   String advertisedServiceUuid() const;
   String advertisedServiceUuid(int index) const;
 
-  int advertisementData(uint8_t value[], int length);
+  int advertisementData(uint8_t value[], int length) const;
 
   virtual int rssi();
 

From bd492be549e05f48679d4fa797f99e1370bb7eaa Mon Sep 17 00:00:00 2001
From: Paolo Calao <paolo.calao@gmail.com>
Date: Tue, 20 Apr 2021 17:34:37 +0200
Subject: [PATCH 017/112] Add advertisement data auxiliary functions

---
 src/BLEDevice.cpp | 10 ++++++++++
 src/BLEDevice.h   |  2 ++
 2 files changed, 12 insertions(+)

diff --git a/src/BLEDevice.cpp b/src/BLEDevice.cpp
index 4ac0785f..31fae719 100644
--- a/src/BLEDevice.cpp
+++ b/src/BLEDevice.cpp
@@ -184,6 +184,16 @@ String BLEDevice::advertisedServiceUuid(int index) const
   return serviceUuid;
 }
 
+bool BLEDevice::hasAdvertisementData() const
+{
+  return (_eirDataLength > 0);
+}
+
+int BLEDevice::advertisementDataLength() const
+{
+  return _eirDataLength;
+}
+
 int BLEDevice::advertisementData(uint8_t value[], int length) const
 {
   if (length > _eirDataLength) length = _eirDataLength;
diff --git a/src/BLEDevice.h b/src/BLEDevice.h
index 84fb8f15..054c49bc 100644
--- a/src/BLEDevice.h
+++ b/src/BLEDevice.h
@@ -59,6 +59,8 @@ class BLEDevice {
   String advertisedServiceUuid() const;
   String advertisedServiceUuid(int index) const;
 
+  bool hasAdvertisementData() const;
+  int advertisementDataLength() const;
   int advertisementData(uint8_t value[], int length) const;
 
   virtual int rssi();

From b5d1b738d2b28ee513e841e93cd3ea88dccaba28 Mon Sep 17 00:00:00 2001
From: per1234 <accounts@perglass.com>
Date: Wed, 28 Apr 2021 02:16:05 -0700
Subject: [PATCH 018/112] Add Nano RP2040 Connect to "smoke test" examples
 compilation CI workflow

---
 .github/workflows/compile-examples.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/compile-examples.yml b/.github/workflows/compile-examples.yml
index abb566da..a14882ff 100644
--- a/.github/workflows/compile-examples.yml
+++ b/.github/workflows/compile-examples.yml
@@ -14,6 +14,7 @@ jobs:
           - arduino:samd:nano_33_iot
           - arduino:megaavr:uno2018:mode=on
           - arduino:mbed:nano33ble
+          - arduino:mbed_nano:nanorp2040connect
 
     steps:
       - uses: actions/checkout@v2

From e080601da73f5ec8cf8a6d999783c0c1c5593945 Mon Sep 17 00:00:00 2001
From: Paolo Calao <paolo.calao@gmail.com>
Date: Tue, 20 Apr 2021 17:53:05 +0200
Subject: [PATCH 019/112] Add retrieval of manufacturer data

---
 src/BLEDevice.cpp | 43 +++++++++++++++++++++++++++++++++++++++++++
 src/BLEDevice.h   |  4 ++++
 2 files changed, 47 insertions(+)

diff --git a/src/BLEDevice.cpp b/src/BLEDevice.cpp
index 31fae719..5f64c1d6 100644
--- a/src/BLEDevice.cpp
+++ b/src/BLEDevice.cpp
@@ -205,6 +205,49 @@ int BLEDevice::advertisementData(uint8_t value[], int length) const
   return length;
 }
 
+bool BLEDevice::hasManufacturerData() const
+{
+  return (manufacturerDataLength() > 0);
+}
+
+int BLEDevice::manufacturerDataLength() const
+{
+  int length = 0;
+
+  for (int i = 0; i < _eirDataLength;) {
+    int eirLength = _eirData[i++];
+    int eirType = _eirData[i++];
+
+    if (eirType == 0xFF) {
+      length = (eirLength - 1);
+      break;
+    }
+
+    i += (eirLength - 1);
+  }
+
+  return length;
+}
+
+int BLEDevice::manufacturerData(uint8_t value[], int length) const
+{
+  for (int i = 0; i < _eirDataLength;) {
+    int eirLength = _eirData[i++];
+    int eirType = _eirData[i++];
+
+    if (eirType == 0xFF) {
+      if (length > (eirLength - 1)) length = (eirLength - 1);
+
+      memcpy(value, &_eirData[i], length);
+      break;
+    }
+
+    i += (eirLength - 1);
+  }
+
+  return length;
+}
+
 int BLEDevice::rssi()
 {
   uint16_t handle = ATT.connectionHandle(_addressType, _address);
diff --git a/src/BLEDevice.h b/src/BLEDevice.h
index 054c49bc..bf710744 100644
--- a/src/BLEDevice.h
+++ b/src/BLEDevice.h
@@ -63,6 +63,10 @@ class BLEDevice {
   int advertisementDataLength() const;
   int advertisementData(uint8_t value[], int length) const;
 
+  bool hasManufacturerData() const;
+  int manufacturerDataLength() const;
+  int manufacturerData(uint8_t value[], int length) const;
+
   virtual int rssi();
 
   bool connect();

From e1b0d81c279f1d75ecb0cc87cc4daa88adf6a096 Mon Sep 17 00:00:00 2001
From: LiamAljundi <46995170+LiamAljundi@users.noreply.github.com>
Date: Fri, 6 Aug 2021 11:43:08 +0200
Subject: [PATCH 020/112] moved BLE library to markdown

---
 docs/api.md    | 3826 ++++++++++++++++++++++++++++++++++++++++++++++++
 docs/readme.md |   91 ++
 2 files changed, 3917 insertions(+)
 create mode 100644 docs/api.md
 create mode 100644 docs/readme.md

diff --git a/docs/api.md b/docs/api.md
new file mode 100644
index 00000000..fc0e9c07
--- /dev/null
+++ b/docs/api.md
@@ -0,0 +1,3826 @@
+# ArduinoBLE library
+
+## BLE class
+
+Used to enable the BLE module.
+
+### `begin()`
+
+Initializes the BLE device.
+
+#### Syntax
+
+```
+BLE.begin()
+
+```
+
+#### Parameters
+
+None
+
+Returns
+1 on success, 0 on failure.
+
+#### Example
+
+```Arduino
+…
+  // begin initialization
+  if (!BLE.begin()) {
+    Serial.println("starting BLE failed!");
+
+    while (1);
+  }
+…
+
+```
+
+### `end()`
+
+Stops the BLE device.
+
+#### Syntax
+
+```
+BLE.end()
+
+```
+
+#### Parameters
+
+None
+
+Returns
+Nothing
+
+#### Example
+
+```Arduino
+…
+  // begin initialization
+  if (!BLE.begin()) {
+    Serial.println("starting BLE failed!");
+
+    while (1);
+  }
+
+  // ....
+
+  BLE.end();
+…
+
+```
+
+### `poll()`
+
+Poll for BLE radio events and handle them.
+
+#### Syntax
+
+```
+BLE.poll() BLE.poll(timeout)
+
+```
+
+#### Parameters
+
+**timeout**: optional timeout in ms, to wait for event. If not specified defaults to 0 ms.
+
+Returns
+Nothing
+
+#### Example
+
+```Arduino
+…
+  // assign event handlers for connected, disconnected to peripheral
+  BLE.setEventHandler(BLEConnected, blePeripheralConnectHandler);
+  BLE.setEventHandler(BLEDisconnected, blePeripheralDisconnectHandler);
+
+  // …
+
+  BLE.poll();
+…
+
+```
+
+### `setEventHandler()`
+
+Set the event handler (callback) function that will be called when the specified event occurs.
+
+#### Syntax
+
+```
+BLE.setEventHandler(eventType, callback)
+
+```
+
+#### Parameters
+
+**eventType**: event type (BLEConnected, BLEDisconnected)
+**callback**: function to call when event occurs
+Returns
+Nothing.
+
+#### Example
+
+```Arduino
+…
+  // begin initialization
+  if (!BLE.begin()) {
+    Serial.println("starting BLE failed!");
+
+    while (1);
+  }
+
+  // ...
+
+  // assign event handlers for connected, disconnected to peripheral
+  BLE.setEventHandler(BLEConnected, blePeripheralConnectHandler);
+  BLE.setEventHandler(BLEDisconnected, blePeripheralDisconnectHandler);
+
+  // …
+
+
+void blePeripheralConnectHandler(BLEDevice central) {
+  // central connected event handler
+  Serial.print("Connected event, central: ");
+  Serial.println(central.address());
+}
+
+void blePeripheralDisconnectHandler(BLEDevice central) {
+  // central disconnected event handler
+  Serial.print("Disconnected event, central: ");
+  Serial.println(central.address());
+}
+…
+
+```
+
+### `connected()`
+
+Query if another BLE device is connected
+
+#### Syntax
+
+```
+BLE.connected()
+
+```
+
+#### Parameters
+
+None
+
+Returns
+**true** if another BLE device is connected, otherwise **false**.
+
+#### Example
+
+```Arduino
+…
+    // while the central is still connected to peripheral:
+    while (BLE.connected()) {
+
+       // ...
+    }
+…
+
+```
+
+### `disconnect()`
+
+Disconnect any BLE devices that are connected
+
+#### Syntax
+
+```
+BLE.disconnect()
+
+```
+
+#### Parameters
+
+None
+
+Returns
+**true** if any BLE device that was previously connected was disconnected, otherwise **false**.
+
+#### Example
+
+```Arduino
+…
+  if (BLE.connected()) {
+    // …
+
+    BLE.disconnect();
+  }
+…
+
+```
+
+### `address()`
+
+Query the Bluetooth address of the BLE device.
+
+#### Syntax
+
+```
+BLE.address()
+
+```
+
+#### Parameters
+
+None
+
+Returns
+The **Bluetooth address** of the BLE device (as a String).
+
+#### Example
+
+```Arduino
+…
+  **String** address = BLE.address();
+
+  Serial.print(“Local address is: “);
+  Serial.println(address);
+…
+
+```
+
+### `rssi()`
+
+Query the RSSI (Received signal strength indication) of the connected BLE device.
+
+#### Syntax
+
+```
+BLE.rssi()
+
+```
+
+#### Parameters
+
+None
+
+Returns
+The **RSSI** of the connected BLE device, 127 if no BLE device is connected.
+
+#### Example
+
+```Arduino
+…
+  if (BLE.connected()) {
+    // …
+
+   Serial.print(“RSSI = “);
+    Serial.println(BLE.rssi());
+  }
+…
+
+```
+
+### `setAdvertisedServiceUuid()`
+
+Set the advertised service UUID used when advertising.
+
+#### Syntax
+
+```
+BLE.setAdvertisedServiceUuid(uuid)
+
+```
+
+#### Parameters
+
+**uuid:** 16-bit or 128-bit BLE UUID in **String** format
+
+Returns
+Nothing
+
+#### Example
+
+```Arduino
+…
+  // begin initialization
+  if (!BLE.begin()) {
+    Serial.println("starting BLE failed!");
+
+    while (1);
+  }
+
+  BLE.setAdvertisedServiceUuid(“19B10000-E8F2-537E-4F6C-D104768A1214");
+
+  // ...  
+
+  // start advertising
+  BLE.advertise();
+…
+
+```
+
+### `setAdvertisedService()`
+
+Set the advertised service UUID used when advertising to the value of the BLEService provided.
+
+#### Syntax
+
+```
+BLE.setAdvertisedService(bleService)
+
+```
+
+#### Parameters
+
+**bleService:** BLEService to use UUID from
+
+Returns
+Nothing
+
+#### Example
+
+```Arduino
+…
+BLEService ledService("19B10000-E8F2-537E-4F6C-D104768A1214"); // BLE LED Service
+
+// ...
+
+  // begin initialization
+  if (!BLE.begin()) {
+    Serial.println("starting BLE failed!");
+
+    while (1);
+  }
+
+  BLE.setAdvertisedService(ledService);
+
+  // ...  
+
+  // start advertising
+  BLE.advertise();
+…
+
+```
+
+### `setManufacturerData()`
+
+Set the manufacturer data value used when advertising.
+
+#### Syntax
+
+```
+BLE.setManufacturerData(data, length)
+
+```
+
+#### Parameters
+
+**data:** byte array containing manufacturer data
+**length:** length of manufacturer data array
+
+Returns
+Nothing
+
+#### Example
+
+```Arduino
+…
+ // begin initialization
+  if (!BLE.begin()) {
+    Serial.println("starting BLE failed!");
+
+    while (1);
+  }
+
+  byte data[5] = { 0x01, 0x02, 0x03, 0x04, 0x05};
+
+  BLE.setManufacturerData(data, 5);
+
+  // ...  
+
+  // start advertising
+  BLE.advertise();
+
+…
+
+```
+
+### `setLocalName()`
+
+Set the local value used when advertising.
+
+#### Syntax
+
+```
+BLE.setLocalName(name)
+
+```
+
+#### Parameters
+
+**name:** local name value to use when advertising
+
+Returns
+Nothing
+
+#### Example
+
+```Arduino
+…
+ // begin initialization
+  if (!BLE.begin()) {
+    Serial.println("starting BLE failed!");
+
+    while (1);
+  }
+
+  BLE.setLocalName("LED");
+
+  // ...  
+
+  // start advertising
+  BLE.advertise();
+
+…
+
+```
+
+### `setDeviceName()`
+
+Set the device name in the built in device name characteristic. If not set, the value defaults “Arduino”.
+
+#### Syntax
+
+```
+BLE.setDeviceName(name)
+
+```
+
+#### Parameters
+
+**name:** device name value
+
+Returns
+Nothing
+
+#### Example
+
+```Arduino
+…
+ // begin initialization
+  if (!BLE.begin()) {
+    Serial.println("starting BLE failed!");
+
+    while (1);
+  }
+
+  BLE.setDeviceName("LED");
+
+  // ...  
+
+  // start advertising
+  BLE.advertise();
+
+…
+
+```
+
+### `setAppearance()`
+
+Set the appearance in the built in appearance characteristic. If not set, the value defaults 0x0000.
+
+#### Syntax
+
+```
+BLE.setAppearance(appearance)
+
+```
+
+#### Parameters
+
+**appearance:** appearance value
+
+Returns
+Nothing
+
+#### Example
+
+```Arduino
+…
+ // begin initialization
+  if (!BLE.begin()) {
+    Serial.println("starting BLE failed!");
+
+    while (1);
+  }
+
+  BLE.setAppearance(0x8000);
+
+  // ...  
+
+  // start advertising
+  BLE.advertise();
+
+…
+
+```
+
+### `addService()`
+
+Add a BLEService to the set of services the BLE device provides
+
+#### Syntax
+
+```
+BLE.addService(service)
+
+```
+
+#### Parameters
+
+**service:** BLEService to add
+
+Returns
+Nothing
+
+#### Example
+
+```Arduino
+…
+BLEService ledService("19B10000-E8F2-537E-4F6C-D104768A1214"); // BLE LED Service
+
+// …
+
+ // begin initialization
+  if (!BLE.begin()) {
+    Serial.println("starting BLE failed!");
+
+    while (1);
+  }
+
+  // ...
+
+  BLE.addService(ledService);
+
+  // ...  
+…
+
+```
+
+### `advertise()`
+
+Start advertising.
+
+#### Syntax
+
+```
+BLE.advertise()
+
+```
+
+#### Parameters
+
+None
+
+Returns
+1 on success, 0 on failure.
+
+#### Example
+
+```Arduino
+…
+  // begin initialization
+  if (!BLE.begin()) {
+    Serial.println("starting BLE failed!");
+
+    while (1);
+  }
+
+  // ...
+
+  BLE.advertise();
+
+  // ...  
+…
+
+```
+
+### `stopAdvertise()`
+
+Stop advertising.
+
+#### Syntax
+
+```
+BLE.stopAdvertise()
+
+```
+
+#### Parameters
+
+None
+
+Returns
+Nothing
+
+#### Example
+
+```Arduino
+…
+  // begin initialization
+  if (!BLE.begin()) {
+    Serial.println("starting BLE failed!");
+
+    while (1);
+  }
+
+  // ...
+
+  BLE.advertise();
+
+  // ...  
+
+  BLE.stopAdvertise();
+…
+
+```
+
+### `central()`
+
+Query the central BLE device connected.
+
+#### Syntax
+
+```
+BLE.central()
+
+```
+
+#### Parameters
+
+None
+
+Returns
+**BLEDevice** representing the central.
+
+#### Example
+
+```Arduino
+…
+  // listen for BLE peripherals to connect:
+  BLEDevice central = BLE.central();
+
+  // if a central is connected to peripheral:
+  if (central) {
+    Serial.print("Connected to central: ");
+    // print the central's MAC address:
+    Serial.println(central.address());
+
+    // …
+  }
+…
+
+```
+
+### `setAdvertisingInterval()`
+
+Set the advertising interval in units of 0.625 ms. Defaults to 100ms (160 * 0.625 ms) if not provided.
+
+#### Syntax
+
+```
+BLE.setAdvertisingInterval(advertisingInterval)
+
+```
+
+#### Parameters
+
+**advertisingInterval:** advertising interval in units of 0.625 ms
+
+Returns
+Nothing.
+
+#### Example
+
+```Arduino
+…
+  // begin initialization
+  if (!BLE.begin()) {
+    Serial.println("starting BLE failed!");
+
+    while (1);
+  }
+
+  // ...
+
+  BLE.setAdvertisingInterval(320); // 200 * 0.625 ms
+
+  BLE.advertise();
+…
+
+```
+
+### `setConnectionInterval()`
+
+Set the minimum and maximum desired connection intervals in units of 1.25 ms.
+
+#### Syntax
+
+```
+BLE.setConnectionInterval(minimum, maximum)
+
+```
+
+#### Parameters
+
+**minimum:** minimum desired connection interval in units of 1.25 ms
+**maximum:** maximum desired connection interval in units of 1.25 ms
+
+Returns
+Nothing.
+
+#### Example
+
+```Arduino
+…
+  // begin initialization
+  if (!BLE.begin()) {
+    Serial.println("starting BLE failed!");
+
+    while (1);
+  }
+
+  // ...
+
+  BLE.setConnectionInterval(0x0006, 0x0c80); // 7.5 ms minimum, 4 s maximum
+
+…
+
+```
+
+### `setConnectable()`
+
+Set if the device is connectable after advertising, defaults to **true**.
+
+#### Syntax
+
+```
+BLE.setConnectable(connectable)
+
+```
+
+#### Parameters
+
+**true**: the device will be connectable when advertising
+**false**: the device will NOT be connectable when advertising
+
+Returns
+Nothing.
+
+#### Example
+
+```Arduino
+…
+  // begin initialization
+  if (!BLE.begin()) {
+    Serial.println("starting BLE failed!");
+
+    while (1);
+  }
+
+  // ...
+
+  BLE.setConnectable(false); // make the device unconnectable when advertising
+
+…
+
+```
+
+### `scan()`
+
+Start scanning for BLE devices that are advertising.
+
+#### Syntax
+
+```
+BLE.scan()
+BLE.scan(withDuplicates)
+
+```
+
+#### Parameters
+
+**withDuplicates:** optional, defaults to **false**. If **true**, advertisements received more than once will not be filtered
+
+Returns
+1 on success, 0 on failure.
+
+#### Example
+
+```Arduino
+…
+  // begin initialization
+  if (!BLE.begin()) {
+    Serial.println("starting BLE failed!");
+
+    while (1);
+  }
+
+  Serial.println("BLE Central scan");
+
+  // start scanning for peripheral
+  BLE.scan();
+
+  // …
+
+  BLEDevice peripheral = BLE.available();
+
+  if (peripheral) {
+     // ...
+  }
+…
+
+```
+
+### `scanForName()`
+
+Start scanning for BLE devices that are advertising with a particular (local) name.
+
+#### Syntax
+
+```
+BLE.scanForName(name)
+BLE.scanForName(name, withDuplicates)
+
+```
+
+#### Parameters
+
+**name:** (local) name of device (as a **String**) to filter for
+**withDuplicates:** optional, defaults to **false**. If **true**, advertisements received more than once will not be filtered.
+
+Returns
+1 on success, 0 on failure.
+
+#### Example
+
+```Arduino
+…
+  // begin initialization
+  if (!BLE.begin()) {
+    Serial.println("starting BLE failed!");
+
+    while (1);
+  }
+
+  Serial.println("BLE Central scan");
+
+  // start scanning for peripheral
+  BLE.scanForName("LED");
+
+  // …
+
+  BLEDevice peripheral = BLE.available();
+
+  if (peripheral) {
+     // ...
+  }
+…
+
+```
+
+### `scanForAddress()`
+
+Start scanning for BLE devices that are advertising with a particular (Bluetooth) address.
+
+#### Syntax
+
+```
+BLE.scanForAddress(address)
+BLE.scanForAddress(address, withDuplicates)
+
+```
+
+#### Parameters
+
+**address:** (Bluetooth) address (as a String) to filter for
+**withDuplicates:** optional, defaults to **false**. If **true**, advertisements received more than once will not be filtered
+
+Returns
+1 on success, 0 on failure.
+
+#### Example
+
+```Arduino
+…
+  // begin initialization
+  if (!BLE.begin()) {
+    Serial.println("starting BLE failed!");
+
+    while (1);
+  }
+
+  Serial.println("BLE Central scan");
+
+  // start scanning for peripheral
+  BLE.scanForAddress("aa:bb:cc:ee:dd:ff");
+
+  // …
+
+  BLEDevice peripheral = BLE.available();
+
+  if (peripheral) {
+     // ...
+  }
+…
+
+```
+
+### `scanForUuid()`
+
+Start scanning for BLE devices that are advertising with a particular (service) UUID.
+
+#### Syntax
+
+```
+BLE.scanForUuid(uuid)
+BLE.scanForUuid(uuid, withDuplicates)
+
+```
+
+#### Parameters
+
+**uuid:** (service) UUID (as a **String**) to filter for
+**withDuplicates:** optional, defaults to **false**. If **true**, advertisements received more than once will not be filtered.
+
+Returns
+1 on success, 0 on failure.
+
+#### Example
+
+```Arduino
+…
+  // begin initialization
+  if (!BLE.begin()) {
+    Serial.println("starting BLE failed!");
+
+    while (1);
+  }
+
+  Serial.println("BLE Central scan");
+
+  // start scanning for peripheral
+  BLE.scanForUuid("aa10");
+
+  // …
+
+  BLEDevice peripheral = BLE.available();
+
+  if (peripheral) {
+     // ...
+  }
+…
+
+```
+
+### `stopScan()`
+
+Stop scanning for BLE devices that are advertising.
+
+#### Syntax
+
+```
+BLE.stopScan()
+
+```
+
+#### Parameters
+
+None
+
+Returns
+Nothing
+
+#### Example
+
+```Arduino
+…
+  // begin initialization
+  if (!BLE.begin()) {
+    Serial.println("starting BLE failed!");
+
+    while (1);
+  }
+
+  Serial.println("BLE Central scan");
+
+  // start scanning for peripheral
+  BLE.scan();
+
+  // …
+  BLE.stopScan();
+…
+
+```
+
+### `available()`
+
+Query for a discovered BLE device that was found during scanning.
+
+#### Syntax
+
+```
+BLE.available()
+
+```
+
+#### Parameters
+
+Nothing
+
+Returns
+**BLEDevice** representing the discovered device.
+
+#### Example
+
+```Arduino
+…
+  // begin initialization
+  if (!BLE.begin()) {
+    Serial.println("starting BLE failed!");
+
+    while (1);
+  }
+
+  Serial.println("BLE Central scan");
+
+  // start scanning for peripheral
+  BLE.scan();
+
+  // …
+
+  BLEDevice peripheral = BLE.available();
+
+  if (peripheral) {
+     // ...
+  }
+…
+
+```
+
+## BLEDevice Class
+
+Used to get information about the devices connected or discovered while scanning
+
+### `poll()`
+
+Poll for BLE radio events for the specified BLE device and handle them.
+
+#### Syntax
+
+```
+bleDevice.poll()
+bleDevice.poll(timeout)
+
+```
+
+#### Parameters
+
+**timeout**: optional timeout in ms, to wait for event. If not specified defaults to 0 ms.
+
+Returns
+Nothing
+
+#### Example
+
+```Arduino
+…
+  // listen for BLE centrals to connect:
+  BLEDevice central = BLE.central();
+
+  // if a central is connected to peripheral:
+  if (central) {
+    // …
+
+   central.poll();
+
+    // ...
+  }
+…
+
+```
+
+### `connected()`
+
+Query if a BLE device is connected
+
+#### Syntax
+
+```
+bleDevice.connected()
+
+```
+
+#### Parameters
+
+None
+
+Returns
+**true** if the BLE device is connected, otherwise **false**.
+
+#### Example
+
+```Arduino
+…
+  // listen for BLE centrals to connect:
+  BLEDevice central = BLE.central();
+
+    // while the central is still connected
+    while (central.connected()) {
+
+       // ...
+    }
+…
+
+```
+
+### `disconnect()`
+
+Disconnect the BLE device, if connected
+
+#### Syntax
+
+```
+bleDevice.disconnect()
+
+```
+
+#### Parameters
+
+None
+
+Returns
+**true** if the BLE device was disconnected, otherwise **false**.
+
+#### Example
+
+```Arduino
+…
+ // listen for BLE centrals to connect:
+  BLEDevice central = BLE.central();
+
+  // …
+
+  central.disconnect();
+…
+
+```
+
+### `address()`
+
+Query the Bluetooth address of the BLE device.
+
+#### Syntax
+
+```
+bleDevice.address()
+
+```
+
+#### Parameters
+
+None
+
+Returns
+The **Bluetooth address** of the BLE device (as a String).
+
+#### Example
+
+```Arduino
+…
+  // listen for BLE peripherals to connect:
+  BLEDevice central = BLE.central();
+
+  // if a central is connected to peripheral:
+  if (central) {
+    Serial.print("Connected to central: ");
+    // print the central's MAC address:
+    Serial.println(central.address());
+
+    // ….
+  }
+…
+
+```
+
+### `rssi()`
+
+Query the RSSI (Received signal strength indication) of the BLE device.
+
+#### Syntax
+
+```
+bleDevice.rssi()
+
+```
+
+#### Parameters
+
+None
+
+Returns
+The **RSSI** of the connected BLE device, 127 if the BLE device is not connected.
+
+#### Example
+
+```Arduino
+…
+  if (bleDevice.connected()) {
+    // …
+
+    Serial.print(“RSSI = “);
+    Serial.println(bleDevice.rssi());
+  }
+…
+
+```
+
+### `characteristic()`
+
+Get a BLECharacteristic representing a BLE characteristic the device provides.
+
+#### Syntax
+
+```
+bleDevice.characteristic(index)
+bleDevice.characteristic(uuid)
+bleDevice.characteristic(uuid, index)
+
+```
+
+#### Parameters
+
+**index**: index of characteristic
+**uuid**: uuid (as a **String**)
+
+Returns
+**BLECharacteristic** for provided parameters
+
+#### Example
+
+```Arduino
+…
+  // begin initialization
+  if (!BLE.begin()) {
+    Serial.println("starting BLE failed!");
+
+    while (1);
+  }
+
+  Serial.println("BLE Central scan");
+
+  // start scanning for peripheral
+  BLE.scan();
+
+  // …
+
+  BLEDevice peripheral = BLE.available();
+
+  if (peripheral) {
+    // ...
+
+    Serial.println("Connecting ...");
+
+    if (peripheral.connect()) {
+      Serial.println("Connected");
+    } else {
+      Serial.println("Failed to connect!");
+      return;
+    }
+
+    // discover peripheral attributes
+    Serial.println("Discovering attributes ...");
+    if (peripheral.discoverAttributes()) {
+      Serial.println("Attributes discovered");
+    } else {
+      Serial.println("Attribute discovery failed!");
+      peripheral.disconnect();
+      return;
+    }
+
+    BLECharacteristic batteryLevelCharacterisic = peripheral.characteristic("2a19");
+
+    if (batteryLevelCharacterisic) {
+      // use the characteristic
+    } else {
+      Serial.println("Peripheral does NOT have battery level characteristic");
+    }
+
+    // ...
+  }
+…
+
+```
+
+### `discoverAttributes()`
+
+Discover all of the attributes of BLE device.
+
+#### Syntax
+
+```
+bleDevice.discoverAttributes()
+
+```
+
+#### Parameters
+
+None
+
+Returns
+**true**, if successful, **false** on failure.
+
+#### Example
+
+```Arduino
+…
+  // begin initialization
+  if (!BLE.begin()) {
+    Serial.println("starting BLE failed!");
+
+    while (1);
+  }
+
+  Serial.println("BLE Central scan");
+
+  // start scanning for peripheral
+  BLE.scan();
+
+  // …
+
+  BLEDevice peripheral = BLE.available();
+
+  if (peripheral) {
+    // ...
+
+    Serial.println("Connecting ...");
+
+    if (peripheral.connect()) {
+      Serial.println("Connected");
+    } else {
+      Serial.println("Failed to connect!");
+      return;
+    }
+
+    // discover peripheral attributes
+    Serial.println("Discovering attributes ...");
+    if (peripheral.discoverAttributes()) {
+      Serial.println("Attributes discovered");
+    } else {
+      Serial.println("Attribute discovery failed!");
+      peripheral.disconnect();
+      return;
+    }
+
+    // ...
+  }
+…
+
+```
+
+### `discoverService()`
+
+Discover the attributes of a particular service on the BLE device.
+
+#### Syntax
+
+```
+bleDevice.discoverService(serviceUuid)
+
+```
+
+#### Parameters
+
+**serviceUuid:** service UUID to discover (as a **String**)
+
+Returns
+**true**, if successful, **false** on failure.
+
+#### Example
+
+```Arduino
+…
+  // begin initialization
+  if (!BLE.begin()) {
+    Serial.println("starting BLE failed!");
+
+    while (1);
+  }
+
+  Serial.println("BLE Central scan");
+
+  // start scanning for peripheral
+  BLE.scan();
+
+  // …
+
+  BLEDevice peripheral = BLE.available();
+
+  if (peripheral) {
+    // ...
+
+    Serial.println("Connecting ...");
+
+    if (peripheral.connect()) {
+      Serial.println("Connected");
+    } else {
+      Serial.println("Failed to connect!");
+      return;
+    }
+
+    // discover service attributes
+    Serial.println("Discovering service attributes ...");
+    if (peripheral.serviceUuid("fffe")) {
+      Serial.println("Service attributes discovered");
+    } else {
+      Serial.println("Service attribute discovery failed!");
+      peripheral.disconnect();
+      return;
+    }
+
+    // ...
+  }
+…
+
+```
+
+### `deviceName()`
+
+Query the device name (BLE characteristic UUID 0x2a00) of a BLE device.
+
+#### Syntax
+
+```
+bleDevice.deviceName()
+
+```
+
+#### Parameters
+
+None
+
+Returns
+**Device name** (as a String).
+
+#### Example
+
+```Arduino
+…
+  // begin initialization
+  if (!BLE.begin()) {
+    Serial.println("starting BLE failed!");
+
+    while (1);
+  }
+
+  Serial.println("BLE Central scan");
+
+  // start scanning for peripheral
+  BLE.scan();
+
+  // …
+
+  BLEDevice peripheral = BLE.available();
+
+  if (peripheral) {
+    // ...
+
+    Serial.println("Connecting ...");
+
+    if (peripheral.connect()) {
+      Serial.println("Connected");
+    } else {
+      Serial.println("Failed to connect!");
+      return;
+    }
+
+    // discover peripheral attributes
+    Serial.println("Discovering attributes ...");
+    if (peripheral.discoverAttributes()) {
+      Serial.println("Attributes discovered");
+    } else {
+      Serial.println("Attribute discovery failed!");
+      peripheral.disconnect();
+      return;
+    }
+
+    // read and print device name of peripheral
+    Serial.println();
+    Serial.print("Device name: ");
+    Serial.println(peripheral.deviceName());
+    Serial.print("Appearance: 0x");
+    Serial.println(peripheral.appearance(), HEX);
+    Serial.println();
+
+    // ...
+  }
+…
+
+```
+
+### `appearance()`
+
+Query the appearance (BLE characteristic UUID 0x2a01) of a BLE device.
+
+#### Syntax
+
+```
+bleDevice.appearance()
+
+```
+
+#### Parameters
+
+None
+
+Returns
+**Appearance value** (as a number).
+
+#### Example
+
+```Arduino
+…
+  // begin initialization
+  if (!BLE.begin()) {
+    Serial.println("starting BLE failed!");
+
+    while (1);
+  }
+
+  Serial.println("BLE Central scan");
+
+  // start scanning for peripheral
+  BLE.scan();
+
+  // …
+
+  BLEDevice peripheral = BLE.available();
+
+  if (peripheral) {
+    // ...
+
+    Serial.println("Connecting ...");
+
+    if (peripheral.connect()) {
+      Serial.println("Connected");
+    } else {
+      Serial.println("Failed to connect!");
+      return;
+    }
+
+    // discover peripheral attributes
+    Serial.println("Discovering attributes ...");
+    if (peripheral.discoverAttributes()) {
+      Serial.println("Attributes discovered");
+    } else {
+      Serial.println("Attribute discovery failed!");
+      peripheral.disconnect();
+      return;
+    }
+
+    // read and print device name of peripheral
+    Serial.println();
+    Serial.print("Device name: ");
+    Serial.println(peripheral.deviceName());
+    Serial.print("Appearance: 0x");
+    Serial.println(peripheral.appearance(), HEX);
+    Serial.println();
+
+    // ...
+  }
+…
+
+```
+
+### `serviceCount()`
+
+Query the number of services discovered for the BLE device.
+
+#### Syntax
+
+```
+bleDevice.serviceCount()
+
+```
+
+#### Parameters
+
+None
+
+Returns
+The number of **services discovered** for the BLE device.
+
+#### Example
+
+```Arduino
+…
+  // begin initialization
+  if (!BLE.begin()) {
+    Serial.println("starting BLE failed!");
+
+    while (1);
+  }
+
+  Serial.println("BLE Central scan");
+
+  // start scanning for peripheral
+  BLE.scan();
+
+  // …
+
+  BLEDevice peripheral = BLE.available();
+
+  if (peripheral) {
+    // ...
+
+    Serial.println("Connecting ...");
+
+    if (peripheral.connect()) {
+      Serial.println("Connected");
+    } else {
+      Serial.println("Failed to connect!");
+      return;
+    }
+
+    // discover peripheral attributes
+    Serial.println("Discovering attributes ...");
+    if (peripheral.discoverAttributes()) {
+      Serial.println("Attributes discovered");
+    } else {
+      Serial.println("Attribute discovery failed!");
+      peripheral.disconnect();
+      return;
+    }
+
+    int serviceCount = peripheral.serviceCount();
+
+    Serial.print(serviceCount);
+    Serial.println(" services discovered");
+
+    // ...
+  }
+…
+
+```
+
+### `hasService()`
+
+Query if the BLE device has a particular service.
+
+#### Syntax
+
+```
+bleDevice.hasService(uuid)
+bleDevice.hasService(uuid, index)
+
+```
+
+#### Parameters
+
+**uuid**: uuid to check (as a **String**)
+**index**: optional, index of service to check if the device provides more than on. Defaults to 0, if not provided.
+
+Returns
+**true**, if the device provides the service, **false** otherwise.
+
+#### Example
+
+```Arduino
+…
+  // begin initialization
+  if (!BLE.begin()) {
+    Serial.println("starting BLE failed!");
+
+    while (1);
+  }
+
+  Serial.println("BLE Central scan");
+
+  // start scanning for peripheral
+  BLE.scan();
+
+  // …
+
+  BLEDevice peripheral = BLE.available();
+
+  if (peripheral) {
+    // ...
+
+    Serial.println("Connecting ...");
+
+    if (peripheral.connect()) {
+      Serial.println("Connected");
+    } else {
+      Serial.println("Failed to connect!");
+      return;
+    }
+
+    // discover peripheral attributes
+    Serial.println("Discovering attributes ...");
+    if (peripheral.discoverAttributes()) {
+      Serial.println("Attributes discovered");
+    } else {
+      Serial.println("Attribute discovery failed!");
+      peripheral.disconnect();
+      return;
+    }
+
+    if (peripheral.hasService("180f")) {
+      Serial.println("Peripheral has battery service");
+    }
+
+    // ...
+  }
+…
+
+```
+
+### `service()`
+
+Get a BLEService representing a BLE service the device provides.
+
+#### Syntax
+
+```
+bleDevice.service(index)
+bleDevice.service(uuid)
+bleDevice.service(uuid, index)
+
+```
+
+#### Parameters
+
+**index**: index of service
+**uuid**: uuid (as a **String**)
+
+Returns
+**BLEService** for provided parameters
+
+#### Example
+
+```Arduino
+…
+  // begin initialization
+  if (!BLE.begin()) {
+    Serial.println("starting BLE failed!");
+
+    while (1);
+  }
+
+  Serial.println("BLE Central scan");
+
+  // start scanning for peripheral
+  BLE.scan();
+
+  // …
+
+  BLEDevice peripheral = BLE.available();
+
+  if (peripheral) {
+    // ...
+
+    Serial.println("Connecting ...");
+
+    if (peripheral.connect()) {
+      Serial.println("Connected");
+    } else {
+      Serial.println("Failed to connect!");
+      return;
+    }
+
+    // discover peripheral attributes
+    Serial.println("Discovering attributes ...");
+    if (peripheral.discoverAttributes()) {
+      Serial.println("Attributes discovered");
+    } else {
+      Serial.println("Attribute discovery failed!");
+      peripheral.disconnect();
+      return;
+    }
+
+    BLEService batteryService = peripheral.service("180f");
+
+    if (batteryService) {
+      // use the service
+    } else {
+      Serial.println("Peripheral does NOT have battery service");
+    }
+
+    // ...
+  }
+…
+
+```
+
+### `characteristicCount()`
+
+Query the number of characteristics discovered for the BLE device.
+
+#### Syntax
+
+```
+bleDevice.characteristicCount()
+
+```
+
+#### Parameters
+
+None
+
+Returns
+The **number of characteristics** discovered for the BLE device.
+
+#### Example
+
+```Arduino
+…
+  // begin initialization
+  if (!BLE.begin()) {
+    Serial.println("starting BLE failed!");
+
+    while (1);
+  }
+
+  Serial.println("BLE Central scan");
+
+  // start scanning for peripheral
+  BLE.scan();
+
+  // …
+
+  BLEDevice peripheral = BLE.available();
+
+  if (peripheral) {
+    // ...
+
+    Serial.println("Connecting ...");
+
+    if (peripheral.connect()) {
+      Serial.println("Connected");
+    } else {
+      Serial.println("Failed to connect!");
+      return;
+    }
+
+    // discover peripheral attributes
+    Serial.println("Discovering attributes ...");
+    if (peripheral.discoverAttributes()) {
+      Serial.println("Attributes discovered");
+    } else {
+      Serial.println("Attribute discovery failed!");
+      peripheral.disconnect();
+      return;
+    }
+
+    int characteristicCount = peripheral.characteristicCount();
+
+    Serial.print(characteristicCount);
+    Serial.println(" characteristis discovered");
+
+    // ...
+  }
+…
+
+```
+
+### `hasCharacteristic()`
+
+Query if the BLE device has a particular characteristic.
+
+#### Syntax
+
+```
+bleDevice.hasCharacteristic(uuid)
+bleDevice.hasCharacteristic(uuid, index)
+
+```
+
+#### Parameters
+
+**uuid**: uuid to check (as a **String**)
+**index**: optional, index of characteristic to check if the device provides more than on. Defaults to 0, if not provided.
+
+Returns
+**true**, if the device provides the characteristic, **false** otherwise.
+
+#### Example
+
+```Arduino
+…
+  // begin initialization
+  if (!BLE.begin()) {
+    Serial.println("starting BLE failed!");
+
+    while (1);
+  }
+
+  Serial.println("BLE Central scan");
+
+  // start scanning for peripheral
+  BLE.scan();
+
+  // …
+
+  BLEDevice peripheral = BLE.available();
+
+  if (peripheral) {
+    // ...
+
+    Serial.println("Connecting ...");
+
+    if (peripheral.connect()) {
+      Serial.println("Connected");
+    } else {
+      Serial.println("Failed to connect!");
+      return;
+    }
+
+    // discover peripheral attributes
+    Serial.println("Discovering attributes ...");
+    if (peripheral.discoverAttributes()) {
+      Serial.println("Attributes discovered");
+    } else {
+      Serial.println("Attribute discovery failed!");
+      peripheral.disconnect();
+      return;
+    }
+
+    if (peripheral.hasCharacteristic("2a19")) {
+      Serial.println("Peripheral has battery level characteristic");
+    }
+
+    // ...
+  }
+…
+
+```
+
+### `hasLocalName()`
+
+Query if a discovered BLE device is advertising a local name.
+
+#### Syntax
+
+```
+bleDevice.hasLocalName()
+
+```
+
+#### Parameters
+
+Nothing
+
+Returns
+**true**, if the device is advertising a local name, **false** otherwise.
+
+#### Example
+
+```Arduino
+…
+  // begin initialization
+  if (!BLE.begin()) {
+    Serial.println("starting BLE failed!");
+
+    while (1);
+  }
+
+  Serial.println("BLE Central scan");
+
+  // start scanning for peripheral
+  BLE.scan();
+
+  // …
+
+  BLEDevice peripheral = BLE.available();
+
+  if (peripheral) {
+    // ...
+
+    // print the local name, if present
+    if (peripheral.hasLocalName()) {
+      Serial.print("Local Name: ");
+      Serial.println(peripheral.localName());
+    }
+
+    // ...
+  }
+…
+
+```
+
+### `hasAdvertisedServiceUuid()`
+
+Query if a discovered BLE device is advertising a service UUID.
+
+#### Syntax
+
+```
+bleDevice.hasAdvertisedServiceUuid()
+bleDevice.hasAdvertisedServiceUuid(index)
+
+```
+
+#### Parameters
+
+**index**: optional, defaults to 0, the index of the service UUID, if the device is advertising more than one.
+
+Returns
+**true**, if the device is advertising a service UUID, **false** otherwise.
+
+#### Example
+
+```Arduino
+…
+  // begin initialization
+  if (!BLE.begin()) {
+    Serial.println("starting BLE failed!");
+
+    while (1);
+  }
+
+  Serial.println("BLE Central scan");
+
+  // start scanning for peripheral
+  BLE.scan();
+
+  // …
+
+  BLEDevice peripheral = BLE.available();
+
+  if (peripheral) {
+    // ...
+
+    // print the advertised service UUIDs, if present
+    if (peripheral.hasAdvertisedServiceUuid()) {
+      Serial.print("Service UUIDs: ");
+      for (int i = 0; i < peripheral.advertisedServiceUuidCount(); i++) {
+        Serial.print(peripheral.advertisedServiceUuid(i));
+        Serial.print(" ");
+      }
+      Serial.println();
+    }
+
+    // ...
+  }
+…
+
+```
+
+### `advertisedServiceUuidCount()`
+
+Query the number of advertised services a discovered BLE device is advertising.
+
+#### Syntax
+
+```
+bleDevice.advertisedServiceUuidCount()
+
+```
+
+#### Parameters
+
+None
+
+Returns
+The **number of advertised services** a discovered BLE device is advertising.
+
+#### Example
+
+```Arduino
+…
+  // begin initialization
+  if (!BLE.begin()) {
+    Serial.println("starting BLE failed!");
+
+    while (1);
+  }
+
+  Serial.println("BLE Central scan");
+
+  // start scanning for peripheral
+  BLE.scan();
+
+  // …
+
+  BLEDevice peripheral = BLE.available();
+
+  if (peripheral) {
+    // ...
+
+    // print the advertised service UUIDs, if present
+    if (peripheral.hasAdvertisedServiceUuid()) {
+      Serial.print("Service UUIDs: ");
+      for (int i = 0; i < peripheral.advertisedServiceUuidCount(); i++) {
+        Serial.print(peripheral.advertisedServiceUuid(i));
+        Serial.print(" ");
+      }
+      Serial.println();
+    }
+
+    // ...
+  }
+…
+
+```
+
+### `localName()`
+
+Query the local name a discovered BLE device is advertising with.
+
+#### Syntax
+
+```
+bleDevice.localName()
+
+```
+
+#### Parameters
+
+Nothing
+
+Returns
+**Advertised local name** (as a String).
+
+#### Example
+
+```Arduino
+…
+  // begin initialization
+  if (!BLE.begin()) {
+    Serial.println("starting BLE failed!");
+
+    while (1);
+  }
+
+  Serial.println("BLE Central scan");
+
+  // start scanning for peripheral
+  BLE.scan();
+
+  // …
+
+  BLEDevice peripheral = BLE.available();
+
+  if (peripheral) {
+    // ...
+
+    // print the local name, if present
+    if (peripheral.hasLocalName()) {
+      Serial.print("Local Name: ");
+      Serial.println(peripheral.localName());
+    }
+
+    // ...
+  }
+…
+
+```
+
+### `advertisedServiceUuid()`
+
+Query an advertised service UUID discovered BLE device is advertising.
+
+#### Syntax
+
+```
+bleDevice.advertisedServiceUuid()
+bleDevice.advertisedServiceUuid(index)
+
+```
+
+#### Parameters
+
+**index**: optional, defaults to 0, the index of the **service UUID**, if the device is advertising more than one.
+
+Returns
+Advertised service **UUID** (as a String).
+
+#### Example
+
+```Arduino
+…
+  // begin initialization
+  if (!BLE.begin()) {
+    Serial.println("starting BLE failed!");
+
+    while (1);
+  }
+
+  Serial.println("BLE Central scan");
+
+  // start scanning for peripheral
+  BLE.scan();
+
+  // …
+
+  BLEDevice peripheral = BLE.available();
+
+  if (peripheral) {
+    // ...
+
+    // print the advertised service UUIDs, if present
+    if (peripheral.hasAdvertisedServiceUuid()) {
+      Serial.print("Service UUIDs: ");
+      for (int i = 0; i < peripheral.advertisedServiceUuidCount(); i++) {
+        Serial.print(peripheral.advertisedServiceUuid(i));
+        Serial.print(" ");
+      }
+      Serial.println();
+    }
+
+    // ...
+  }
+…
+
+```
+
+### `connect()`
+
+Connect to a BLE device.
+
+#### Syntax
+
+```
+bleDevice.connect()
+
+```
+
+#### Parameters
+
+None
+
+Returns
+**true**, if the connection was successful, **false** otherwise.
+
+#### Example
+
+```Arduino
+…
+  // begin initialization
+  if (!BLE.begin()) {
+    Serial.println("starting BLE failed!");
+
+    while (1);
+  }
+
+  Serial.println("BLE Central scan");
+
+  // start scanning for peripheral
+  BLE.scan();
+
+  // …
+
+  BLEDevice peripheral = BLE.available();
+
+  if (peripheral) {
+    // ...
+
+    Serial.println("Connecting ...");
+
+    if (peripheral.connect()) {
+      Serial.println("Connected");
+    } else {
+      Serial.println("Failed to connect!");
+      return;
+    }
+
+    // ...
+  }
+…
+
+```
+
+## BLEService Class
+
+Used to enable the services board provides or interact with services a remote board provides.
+
+### `BLEService()`
+
+Create a new BLE service.
+
+#### Syntax
+
+```
+BLEService(uuid)
+
+```
+
+#### Parameters
+
+**uuid**: 16-bit or 128-bit UUID in **String** format
+
+Returns
+New **BLEService** with the specified **UUID**
+
+#### Example
+
+```Arduino
+…
+BLEService ledService("19B10000-E8F2-537E-4F6C-D104768A1214"); // BLE LED Service
+…
+
+```
+
+### `uuid()`
+
+Query the UUID of the specified BLEService.
+
+#### Syntax
+
+```
+bleService.uuid()
+
+```
+
+#### Parameters
+
+None
+
+Returns
+UUID of the BLE service as a **String**.
+
+#### Example
+
+```Arduino
+…
+BLEService ledService("19B10000-E8F2-537E-4F6C-D104768A1214"); // BLE LED Service
+
+// …
+Serial.print(“LED service UUID = “);
+Serial.println(ledService.uuid());
+
+…
+
+```
+
+### `addCharacteristic()`
+
+Add a BLECharateristic to the BLE service.
+
+#### Syntax
+
+```
+bleService.addCharacteristic(bleCharacteristic)
+
+```
+
+#### Parameters
+
+None
+
+Returns
+Nothing
+
+#### Example
+
+```Arduino
+…
+BLEService ledService("19B10000-E8F2-537E-4F6C-D104768A1214"); // BLE LED Service
+
+// BLE LED Switch Characteristic - custom 128-bit UUID, readable and writable by central
+BLECharacteristic switchCharacteristic("19B10001-E8F2-537E-4F6C-D104768A1214", BLERead | BLEWrite, 1);
+
+
+// …
+
+// add the characteristic to the service
+ledService.addCharacteristic(switchCharacteristic);
+
+…
+
+```
+
+### `characteristicCount()`
+
+Query the number of characteristics discovered for the BLE service.
+
+#### Syntax
+
+```
+bleService.characteristicCount()
+
+```
+
+#### Parameters
+
+None
+
+Returns
+The **number of characteristics** discovered for the BLE service.
+
+#### Example
+
+```Arduino
+…
+  // begin initialization
+  if (!BLE.begin()) {
+    Serial.println("starting BLE failed!");
+
+    while (1);
+  }
+
+  Serial.println("BLE Central scan");
+
+  // start scanning for peripheral
+  BLE.scan();
+
+  // …
+
+  BLEDevice peripheral = BLE.available();
+
+  if (peripheral) {
+    // ...
+
+    Serial.println("Connecting ...");
+
+    if (peripheral.connect()) {
+      Serial.println("Connected");
+    } else {
+      Serial.println("Failed to connect!");
+      return;
+    }
+
+    // discover peripheral attributes
+    Serial.println("Discovering attributes ...");
+    if (peripheral.discoverAttributes()) {
+      Serial.println("Attributes discovered");
+    } else {
+      Serial.println("Attribute discovery failed!");
+      peripheral.disconnect();
+      return;
+    }
+
+    BLEService batteryService = peripheral.service("180f");
+
+    if (batteryService) {
+      // use the service
+      int characteristicCount = batteryService.characteristicCount();
+
+      Serial.print(characteristicCount);
+      Serial.println(" characteristics discovered in battery service");
+    } else {
+      Serial.println("Peripheral does NOT have battery service");
+    }
+
+    // ...
+  }
+…
+
+```
+
+### `hasCharacteristic()`
+
+Query if the BLE service has a particular characteristic.
+
+#### Syntax
+
+```
+bleService.hasCharacteristic(uuid)
+bleService.hasCharacteristic(uuid, index)
+
+```
+
+#### Parameters
+
+**uuid**: uuid to check (as a **String**)
+**index**: optional, index of characteristic to check if the device provides more than on. Defaults to 0, if not provided.
+
+Returns
+**true**, if the service provides the characteristic, **false** otherwise.
+
+#### Example
+
+```Arduino
+…
+  // begin initialization
+  if (!BLE.begin()) {
+    Serial.println("starting BLE failed!");
+
+    while (1);
+  }
+
+  Serial.println("BLE Central scan");
+
+  // start scanning for peripheral
+  BLE.scan();
+
+  // …
+  BLEDevice peripheral = BLE.available();
+
+  if (peripheral) {
+    // ...
+
+    Serial.println("Connecting ...");
+
+    if (peripheral.connect()) {
+      Serial.println("Connected");
+    } else {
+      Serial.println("Failed to connect!");
+      return;
+    }
+
+    // discover peripheral attributes
+    Serial.println("Discovering attributes ...");
+    if (peripheral.discoverAttributes()) {
+      Serial.println("Attributes discovered");
+    } else {
+      Serial.println("Attribute discovery failed!");
+      peripheral.disconnect();
+      return;
+    }
+
+    BLEService batteryService = peripheral.service("180f");
+
+    if (batteryService) {
+      // use the service
+      if (batteryService.hasCharacteristic("2a19")) {
+        Serial.println("Battery service has battery level characteristic");
+      }
+    } else {
+      Serial.println("Peripheral does NOT have battery service");
+    }
+
+    // ...
+  }
+…
+
+```
+
+### `characteristic()`
+
+Get a BLECharacteristic representing a BLE characteristic the service provides.
+
+#### Syntax
+
+```
+bleService.characteristic(index)
+bleService.characteristic(uuid)
+bleService.characteristic(uuid, index)
+
+```
+
+#### Parameters
+
+**index**: index of characteristic
+**uuid**: uuid (as a **String**)
+
+Returns
+**BLECharacteristic** for provided parameters
+
+#### Example
+
+```Arduino
+…
+  // begin initialization
+  if (!BLE.begin()) {
+    Serial.println("starting BLE failed!");
+
+    while (1);
+  }
+
+  Serial.println("BLE Central scan");
+
+  // start scanning for peripheral
+  BLE.scan();
+
+  // …
+
+  BLEDevice peripheral = BLE.available();
+
+  if (peripheral) {
+    // ...
+
+    Serial.println("Connecting ...");
+
+    if (peripheral.connect()) {
+      Serial.println("Connected");
+    } else {
+      Serial.println("Failed to connect!");
+      return;
+    }
+
+    // discover peripheral attributes
+    Serial.println("Discovering attributes ...");
+    if (peripheral.discoverAttributes()) {
+      Serial.println("Attributes discovered");
+    } else {
+      Serial.println("Attribute discovery failed!");
+      peripheral.disconnect();
+      return;
+    }
+
+    BLEService batteryService = peripheral.service("180f");
+
+    if (batteryService) {
+      // use the service
+      BLECharacteristic batteryLevelCharacterisic = peripheral.characteristic("2a19");
+
+      if (batteryLevelCharacterisic) {
+        // use the characteristic
+      } else {
+        Serial.println("Peripheral does NOT have battery level characteristic");
+      }
+    } else {
+      Serial.println("Peripheral does NOT have battery service");
+    }
+
+    // ...
+  }
+…
+
+```
+
+## BLECharacteristic Class
+
+Used to enable the characteristics board offers in a service or interact with characteristics a remote board provides.
+
+### `BLECharacteristic()`
+
+Create a new BLE characteristic.
+
+#### Syntax
+
+```
+BLECharacteristic(uuid, properties, value, valueSize)
+BLECharacteristic(uuid, properties, stringValue)
+
+BLEBoolCharacteristic(uuid, properties)
+BLEBooleanCharacteristic(uuid, properties)
+BLECharCharacteristic(uuid, properties)
+BLEUnsignedCharCharacteristic(uuid, properties)
+BLEByteCharacteristic(uuid, properties)
+BLEShortCharacteristic(uuid, properties)
+BLEUnsignedShortCharacteristic(uuid, properties)
+BLEWordCharacteristic(uuid, properties)
+BLEIntCharacteristic(uuid, properties)
+BLEUnsignedIntCharacteristic(uuid, properties)
+BLELongCharacteristic(uuid, properties)
+BLEUnsignedLongCharacteristic(uuid, properties)
+BLEFloatCharacteristic(uuid, properties)
+BLEDoubleCharacteristic(uuid, properties)
+```
+
+#### Parameters
+
+**uuid**: 16-bit or 128-bit UUID in **String** format
+**properties**: mask of the properties (BLEBroadcast, BLERead, BLEWriteWithoutResponse, BLEWrite, BLENotify, BLEIndicate)
+**valueSize**: (maximum) size of characteristic value
+**stringValue**: value as a string
+
+Returns
+New **BLECharacteristic** with the specified **UUID** and value
+
+#### Example
+
+```Arduino
+…
+// BLE 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
+
+…
+
+```
+
+### `uuid()`
+
+Query the UUID of the specified BLECharacteristic.
+
+#### Syntax
+
+```
+bleCharacteristic.uuid()
+
+```
+
+#### Parameters
+
+None
+
+Returns
+**UUID** of the BLE service as a **String**.
+
+#### Example
+
+```Arduino
+…
+// BLE LED Switch Characteristic - custom 128-bit UUID, read and writable by central
+BLEByteCharacteristic switchCharacteristic("19B10001-E8F2-537E-4F6C-D104768A1214", BLERead | BLEWrite);
+
+// …
+Serial.print(“Switch characteristic UUID = “);
+Serial.println(switchCharacteristic.uuid());
+
+…
+
+```
+
+### `properties()`
+
+Query the property mask of the specified BLECharacteristic.
+
+#### Syntax
+
+```
+bleCharacteristic.properties()
+
+```
+
+#### Parameters
+
+None
+
+Returns
+**Properties of the characteristic masked** (BLEBroadcast, BLERead, BLEWriteWithoutResponse, BLEWrite, BLENotify, BLEIndicate)
+
+#### Example
+
+```Arduino
+…
+// BLE LED Switch Characteristic - custom 128-bit UUID, read and writable by central
+BLEByteCharacteristic switchCharacteristic("19B10001-E8F2-537E-4F6C-D104768A1214", BLERead | BLEWrite);
+
+// …
+byte properties = switchCharacteristic.properties();
+
+if (properties & BLERead) {
+  // characteristic is readable ...
+}
+
+if (properties & (BLEWrite | BLEWriteWithoutResponse)) {
+  // characteristic is writable ...
+}
+…
+
+```
+
+### `valueSize()`
+
+Query the maximum value size of the specified BLECharacteristic.
+
+#### Syntax
+
+```
+bleCharacteristic.valueSize()
+
+```
+
+#### Parameters
+
+None
+
+Returns
+The **maximum value** size of the characteristic (in bytes)
+
+#### Example
+
+```Arduino
+…
+// BLE LED Switch Characteristic - custom 128-bit UUID, read and writable by central
+BLEByteCharacteristic switchCharacteristic("19B10001-E8F2-537E-4F6C-D104768A1214", BLERead | BLEWrite);
+
+// …
+
+Serial.print(“value size = “);
+Serial.println(switchCharacteristic.valueSize());
+…
+
+```
+
+### `value()`
+
+Query the current value of the specified BLECharacteristic.
+
+#### Syntax
+
+```
+bleCharacteristic.value()
+
+```
+
+#### Parameters
+
+None
+
+Returns
+The **current value** of the characteristic, value type depends on the constructor used
+
+#### Example
+
+```Arduino
+…
+// BLE LED Switch Characteristic - custom 128-bit UUID, read and writable by central
+BLEByteCharacteristic switchCharacteristic("19B10001-E8F2-537E-4F6C-D104768A1214", BLERead | BLEWrite);
+
+// …
+
+      if (switchCharacteristic.value()) {   // any value other than 0
+          Serial.println("LED on");
+          digitalWrite(ledPin, HIGH);         // will turn the LED on
+        } else {                              // a 0 value
+          Serial.println(F("LED off"));
+          digitalWrite(ledPin, LOW);          // will turn the LED off
+        }
+
+…
+
+```
+
+### `valueLength()`
+
+Query the current value size of the specified BLECharacteristic.
+
+#### Syntax
+
+```
+bleCharacteristic.valueLength()
+
+```
+
+#### Parameters
+
+None
+
+Returns
+The **current value** size of the characteristic (in bytes)
+
+#### Example
+
+```Arduino
+…
+// BLE LED Switch Characteristic - custom 128-bit UUID, read and writable by central
+BLEByteCharacteristic switchCharacteristic("19B10001-E8F2-537E-4F6C-D104768A1214", BLERead | BLEWrite);
+
+// …
+
+Serial.print(“value length = “);
+Serial.println(switchCharacteristic.valueLength());
+…
+
+```
+
+### `readValue()`
+
+Read the current value of the characteristic. If the characteristic is on a remote device, a read request will be sent.
+
+#### Syntax
+
+```
+bleCharacteristic.readValue(buffer, length)
+bleCharacteristic.readValue(value)
+
+```
+
+#### Parameters
+
+**buffer:** byte array to read value into length: size of buffer argument in bytes 
+**value**: variable to read value into (by reference)
+
+Returns
+Number of bytes read
+
+#### Example
+
+```Arduino
+…
+  while (peripheral.connected()) {
+    // while the peripheral is connected
+
+    // check if the value of the simple key characteristic has been updated
+    if (simpleKeyCharacteristic.valueUpdated()) {
+      // yes, get the value, characteristic is 1 byte so use byte value
+      byte value = 0;
+
+      simpleKeyCharacteristic.readValue(value);
+
+      if (value & 0x01) {
+        // first bit corresponds to the right button
+        Serial.println("Right button pressed");
+      }
+
+      if (value & 0x02) {
+        // second bit corresponds to the left button
+        Serial.println("Left button pressed");
+      }
+    }
+  }
+…
+
+```
+
+### `writeValue()`
+
+Write the value of the characteristic. If the characteristic is on a remote device, a write request or command will be sent.
+
+#### Syntax
+
+```
+bleCharacteristic.writeValue(buffer, length)
+bleCharacteristic.writeValue(value)
+
+```
+
+#### Parameters
+
+**buffer**: byte array to write value with
+**length**: number of bytes of the buffer argument to write
+**value**: value to write
+
+Returns
+1 on success, 0 on failure
+
+#### Example
+
+```Arduino
+…
+    // read the button pin
+    int buttonState = digitalRead(buttonPin);
+
+    if (oldButtonState != buttonState) {
+      // button changed
+      oldButtonState = buttonState;
+
+      if (buttonState) {
+        Serial.println("button pressed");
+
+        // button is pressed, write 0x01 to turn the LED on
+        ledCharacteristic.writeValue((byte)0x01);
+      } else {
+        Serial.println("button released");
+
+        // button is released, write 0x00 to turn the LED off
+        ledCharacteristic.writeValue((byte)0x00);
+      }
+    }
+…
+
+```
+
+### `setEventHandler()`
+
+Set the event handler (callback) function that will be called when the specified event occurs.
+
+#### Syntax
+
+```
+bleCharacteristic.setEventHandler(eventType, callback)
+
+```
+
+#### Parameters
+
+**eventType**: event type (BLESubscribed, BLEUnsubscribed, BLERead, BLEWritten) 
+**callback**: function to call when the event occurs
+
+Returns
+Nothing
+
+#### Example
+
+```Arduino
+…
+// create switch characteristic and allow remote device to read and write
+BLEByteCharacteristic switchCharacteristic("19B10001-E8F2-537E-4F6C-D104768A1214", BLERead | BLEWrite);
+
+
+// …
+
+  // assign event handlers for characteristic
+  switchCharacteristic.setEventHandler(BLEWritten, switchCharacteristicWritten);
+
+// …
+
+void switchCharacteristicWritten(BLEDevice central, BLECharacteristic characteristic) {
+  // central wrote new value to characteristic, update LED
+  Serial.print("Characteristic event, written: ");
+
+  if (switchCharacteristic.value()) {
+    Serial.println("LED on");
+    digitalWrite(ledPin, HIGH);
+  } else {
+    Serial.println("LED off");
+    digitalWrite(ledPin, LOW);
+  }
+}
+
+  …
+
+```
+
+### `broadcast()`
+
+Broadcast the characteristics value as service data when advertising.
+
+#### Syntax
+
+```
+bleCharacteristic.broadcast()
+
+```
+
+#### Parameters
+
+None
+
+Returns
+1 on success, 0 on failure
+
+#### Example
+
+```Arduino
+…
+// create button characteristic and allow remote device to get notifications
+BLEByteCharacteristic buttonCharacteristic("19B10012-E8F2-537E-4F6C-D104768A1214", BLERead | BLENotify | BLEBroadcast);
+
+// …
+
+buttonCharacteristic.broadcast();
+
+…
+
+```
+
+### `written()`
+
+Query if the characteristic value has been written by another BLE device.
+
+#### Syntax
+
+```
+bleCharacteristic.written()
+
+```
+
+#### Parameters
+
+None
+
+Returns
+**true** if the characteristic value has been written by another BLE device, **false** otherwise
+
+#### Example
+
+```Arduino
+…
+// BLE LED Switch Characteristic - custom 128-bit UUID, read and writable by central
+BLEByteCharacteristic switchCharacteristic("19B10001-E8F2-537E-4F6C-D104768A1214", BLERead | BLEWrite);
+
+
+// …
+
+ // listen for BLE peripherals to connect:
+  BLEDevice central = BLE.central();
+
+  // if a central is connected to peripheral:
+  if (central) {
+    Serial.print("Connected to central: ");
+    // print the central's MAC address:
+    Serial.println(central.address());
+
+    // while the central is still connected to peripheral:
+    while (central.connected()) {
+      // if the remote device wrote to the characteristic,
+      // use the value to control the LED:
+      if (switchCharacteristic.written()) {
+        if (switchCharacteristic.value()) {   // any value other than 0
+          Serial.println("LED on");
+          digitalWrite(ledPin, HIGH);         // will turn the LED on
+        } else {                              // a 0 value
+          Serial.println(F("LED off"));
+          digitalWrite(ledPin, LOW);          // will turn the LED off
+        }
+      }
+    }
+
+    // when the central disconnects, print it out:
+    Serial.print(F("Disconnected from central: "));
+    Serial.println(central.address());
+  }
+
+
+…
+
+```
+
+### `subscribed()`
+
+Query if the characteristic has been subscribed to by another BLE device.
+
+#### Syntax
+
+```
+bleCharacteristic.subscribed()
+
+```
+
+#### Parameters
+
+None
+
+Returns
+**true** if the characteristic value has been subscribed to by another BLE device, **false** otherwise
+
+#### Example
+
+```Arduino
+…
+// BLE 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
+
+
+
+// …
+
+  if (batteryLevelChar.subscribed()) {
+     // set a new value , that well be pushed to subscribed BLE devices
+    batteryLevelChar.writeValue(0xab);
+  }
+…
+
+```
+
+### `addDescriptor()`
+
+Add a BLEDescriptor to the characteristic.
+
+#### Syntax
+
+```
+bleCharacteristic.addDescriptor(bleDescriptor)
+
+```
+
+#### Parameters
+
+**bleDescriptor**: descriptor to add to the characteristic
+
+Returns
+Nothing
+
+#### Example
+
+```Arduino
+…
+// BLE 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
+
+BLEDescriptor batteryLevelDescriptor("2901", "millis");
+
+
+
+// …
+
+  batteryLevelChar.addDescriptor(batteryLevelDescriptor);
+…
+
+```
+
+### `descriptorCount`
+
+Query the number of BLE descriptors discovered for the characteristic.
+
+#### Syntax
+
+```
+bleCharacteristic.descriptorCount()
+
+```
+
+#### Parameters
+
+None
+
+Returns
+The **number of BLE descriptors** discovered for the characteristic
+
+#### Example
+
+```Arduino
+…
+ // loop the descriptors of the characteristic and explore each
+  for (int i = 0; i < characteristic.descriptorCount(); i++) {
+    BLEDescriptor descriptor = characteristic.descriptor(i);
+
+    // ...
+  }
+…
+
+```
+
+### `hasDescriptor`
+
+Check if a characteristic has a particular descriptor.
+
+#### Syntax
+
+```
+bleCharacteristic.hasDescriptor(uuid)
+bleCharacteristic.hasDescriptor(uuid, index)
+
+```
+
+#### Parameters
+
+**index**: index of descriptor
+**uuid**: uuid (as a **String**)
+
+Returns
+**true**, if the characteristic has a matching descriptor, otherwise **false**.
+
+#### Example
+
+```Arduino
+…
+  if (characteristic.hasDescriptor("2901")) {
+    Serial.println("characteristic has description descriptor");
+  }
+…
+
+```
+
+### `descriptor()`
+
+Get a BLEDescriptor that represents a characteristics BLE descriptor.
+
+#### Syntax
+
+```
+bleCharacteristic.descriptor(index)
+bleCharacteristic.descriptor(uuid)
+bleCharacteristic.descriptor(uuid, index)
+
+```
+
+#### Parameters
+
+**index**: index of descriptor
+**uuid**: uuid (as a **String**)
+
+Returns
+BLEDescriptor that represents a characteristics BLE descriptor
+
+#### Example
+
+```Arduino
+…
+  if (characteristic.hasDescriptor("2901")) {
+    Serial.println("characteristic has description descriptor");
+  }
+…
+
+```
+
+### `canRead()`
+
+Query if a BLE characteristic is readable.
+
+#### Syntax
+
+```
+bleCharacteristic.canRead()
+
+```
+
+#### Parameters
+
+None
+
+Returns
+**true**, if characteristic is readable, **false** otherwise
+
+#### Example
+
+```Arduino
+…
+  if (characteristic.canRead("2901")) {
+    Serial.println("characteristic is readable");
+  }
+…
+
+```
+
+read
+
+Perform a read request for the characteristic.
+
+#### Syntax
+
+```
+bleCharacteristic.read()
+
+```
+
+#### Parameters
+
+None
+
+Returns
+**true**, if successful, **false** on failure
+
+#### Example
+
+```Arduino
+…
+  if (characteristic.read()) {
+    Serial.println("characteristic value read");
+
+    // ...
+  } else {
+    Serial.println("error reading characteristic value");
+  }
+…
+
+```
+
+### `canWrite()`
+
+Query if a BLE characteristic is writable.
+
+#### Syntax
+
+```
+bleCharacteristic.canWrite()
+
+```
+
+#### Parameters
+
+None
+
+Returns
+**true**, if characteristic is writable, **false** otherwise
+
+#### Example
+
+```Arduino
+…
+  if (characteristic.canWrite()) {
+    Serial.println("characteristic is writable");
+  }
+…
+
+```
+
+### `canSubscribe()`
+
+Query if a BLE characteristic is subscribable.
+
+#### Syntax
+
+```
+bleCharacteristic.canSubscribe()
+
+```
+
+#### Parameters
+
+None
+
+Returns
+**true**, if characteristic is subscribable, **false** otherwise
+
+#### Example
+
+```Arduino
+…
+  if (characteristic.canSubscribe()) {
+    Serial.println("characteristic is subscribable");
+  }
+…
+
+```
+
+### `subscribe()`
+
+Subscribe to a BLE characteristics notification or indications.
+
+#### Syntax
+
+```
+bleCharacteristic.subscribe()
+
+```
+
+#### Parameters
+
+None
+
+Returns
+**true**, on success, **false** on failure
+
+#### Example
+
+```Arduino
+…
+  // ...
+
+  // retrieve the simple key characteristic
+  BLECharacteristic simpleKeyCharacteristic = peripheral.characteristic("ffe1");
+
+  // subscribe to the simple key characteristic
+  Serial.println("Subscribing to simple key characteristic ...");
+  if (!simpleKeyCharacteristic) {
+    Serial.println("no simple key characteristic found!");
+    peripheral.disconnect();
+    return;
+  } else if (!simpleKeyCharacteristic.canSubscribe()) {
+    Serial.println("simple key characteristic is not subscribable!");
+    peripheral.disconnect();
+    return;
+  } else if (!simpleKeyCharacteristic.subscribe()) {
+    Serial.println("subscription failed!");
+    peripheral.disconnect();
+    return;
+  }
+
+  // ...
+…
+
+```
+
+### `canUnsubscribe()`
+
+Query if a BLE characteristic is unsubscribable.
+
+#### Syntax
+
+```
+bleCharacteristic.canUnsubscribe()
+
+```
+
+#### Parameters
+
+None
+
+Returns
+**true**, if characteristic is unsubscribable, **false** otherwise
+
+#### Example
+
+```Arduino
+…
+  if (characteristic.canUnsubscribe()) {
+    Serial.println("characteristic is unsubscribable");
+  }
+…
+
+```
+
+### `unsubscribe()`
+
+Unsubscribe to a BLE characteristics notifications or indications.
+
+#### Syntax
+
+```
+bleCharacteristic.unsubscribe()
+
+```
+
+#### Parameters
+
+None
+
+Returns
+**true**, on success, **false** on failure
+
+#### Example
+
+```Arduino
+…
+  // ...
+
+  // retrieve the simple key characteristic
+  BLECharacteristic simpleKeyCharacteristic = peripheral.characteristic("ffe1");
+
+  // subscribe to the simple key characteristic
+  Serial.println("Subscribing to simple key characteristic ...");
+  if (!simpleKeyCharacteristic) {
+    Serial.println("no simple key characteristic found!");
+    peripheral.disconnect();
+    return;
+  } else if (!simpleKeyCharacteristic.canSubscribe()) {
+    Serial.println("simple key characteristic is not subscribable!");
+    peripheral.disconnect();
+    return;
+  } else if (!simpleKeyCharacteristic.subscribe()) {
+    Serial.println("subscription failed!");
+    peripheral.disconnect();
+    return;
+  }
+
+  // ...
+
+  simpleKeyCharacteristic.unsubscribe();
+…
+
+```
+
+### `valueUpdated()`
+
+Has the characteristics value been updated via a notification or indication.
+
+#### Syntax
+
+```
+bleCharacteristic.valueUpdated()
+
+```
+
+#### Parameters
+
+None
+
+Returns
+**true**, if the characteristics value been updated via a notification or indication
+
+#### Example
+
+```Arduino
+…
+  while (peripheral.connected()) {
+    // while the peripheral is connected
+
+    // check if the value of the simple key characteristic has been updated
+    if (simpleKeyCharacteristic.valueUpdated()) {
+      // yes, get the value, characteristic is 1 byte so use byte value
+      byte value = 0;
+
+      simpleKeyCharacteristic.readValue(value);
+
+      if (value & 0x01) {
+        // first bit corresponds to the right button
+        Serial.println("Right button pressed");
+      }
+
+      if (value & 0x02) {
+        // second bit corresponds to the left button
+        Serial.println("Left button pressed");
+      }
+    }
+  }
+…
+
+```
+
+## BLEDescriptor Class
+
+Used to describe a characteristic the board offers
+
+### `BLEDescriptor()`
+
+Create a new BLE descriptor.
+
+#### Syntax
+
+```
+BLEDescriptor(uuid, value, valueSize)
+BLEDescriptor(uuid, stringValue)
+
+```
+
+#### Parameters
+
+**uuid**: 16-bit or 128-bit UUID in string format
+**value**: byte array value
+**valueSize**: size of byte array value
+**stringValue**: value as a string
+
+Returns
+New **BLEDescriptor** with the specified **UUID** and value
+
+#### Example
+
+```Arduino
+…
+BLEDescriptor millisLabelDescriptor("2901", "millis");
+…
+
+```
+
+### `uuid()`
+
+Query the UUID of the specified BLEDescriptor.
+
+#### Syntax
+
+```
+bleDescriptor.uuid()
+
+```
+
+#### Parameters
+
+None
+
+Returns
+**UUID** of the BLE descriptor (as a String).
+
+#### Example
+
+```Arduino
+…
+BLEDescriptor millisLabelDescriptor("2901", "millis");
+
+// …
+Serial.print(“millis label descriptor UUID = “);
+Serial.println(millisLabelDescriptor.uuid());
+
+…
+
+```
+
+### `valueSize()`
+
+Query the value size of the specified BLEDescriptor.
+
+#### Syntax
+
+```
+bleDescriptor.valueSize()
+
+```
+
+#### Parameters
+
+None
+
+Returns
+**Value size** (in bytes) of the BLE descriptor.
+
+#### Example
+
+```Arduino
+…
+BLEDescriptor millisLabelDescriptor("2901", "millis");
+
+// …
+Serial.print(“millis label descriptor value size = “);
+Serial.println(millisLabelDescriptor.valueSize());
+
+…
+
+```
+
+### `valueLength()`
+
+Query the length, in bytes, of the descriptor current value.
+
+#### Syntax
+
+```
+bleDescriptor.valueLength()
+
+```
+
+#### Parameters
+
+None
+
+Returns
+**Length of descriptor** value in bytes.
+
+#### Example
+
+```Arduino
+…
+  // read the descriptor value
+  descriptor.read();
+
+  // print out the value of the descriptor
+  Serial.print(", value 0x");
+  printData(descriptor.value(), descriptor.valueLength());
+
+  // ...
+
+  void printData(const unsigned char data[], int length) {
+    for (int i = 0; i < length; i++) {
+      unsigned char b = data[i];
+
+      if (b < 16) {
+        Serial.print("0");
+      }
+
+      Serial.print(b, HEX);
+    }
+  }
+…
+
+```
+
+### `value()`
+
+Query the value of the specified BLEDescriptor.
+
+#### Syntax
+
+```
+bleDescriptor.value()
+
+```
+
+#### Parameters
+
+None
+
+Returns
+Value byte array of the **BLE descriptor**.
+
+#### Example
+
+```Arduino
+…
+BLEDescriptor millisLabelDescriptor("2901", "millis");
+
+// …
+
+  int descriptorValueSize = millisLabelDescriptor.valueSize();
+  byte descriptorValue[descriptorValueSize];
+
+  for (int i = 0; i < descriptorValueSize; i++) {
+    descriptorValue[i] = millisLabelDescriptor.value()[i];
+  }
+
+…
+
+```
+
+### `readValue()`
+
+Read the current value of the descriptor. If the descriptor is on a remote device, a read request will be sent.
+
+#### Syntax
+
+```
+bleDescriptor.readValue(buffer, length)
+bleDescriptor.readValue(value)
+
+```
+
+#### Parameters
+
+**buffer**: byte array to read value into
+**length**: size of buffer argument in bytes
+**value**: variable to read value into (by reference)
+
+Returns
+**Number of bytes** read
+
+#### Example
+
+```Arduino
+…
+  byte value = 0;
+
+  /get the value, descriptor is 1 byte so use byte value    
+  descriptor.readValue(value);
+…
+
+```
+
+### `read()`
+
+Perform a read request for the descriptor.
+
+#### Syntax
+
+```
+bleDescriptor.read()
+
+```
+
+#### Parameters
+
+None
+
+Returns
+**true**, if successful, **false** on failure
+
+#### Example
+
+```Arduino
+…
+  if (descriptor.read()) {
+    Serial.println("descriptor value read");
+
+    // ...
+  } else {
+    Serial.println("error reading descriptor value");
+  }
+…
+```
diff --git a/docs/readme.md b/docs/readme.md
new file mode 100644
index 00000000..86949a50
--- /dev/null
+++ b/docs/readme.md
@@ -0,0 +1,91 @@
+# ArduinoBLE library
+
+This library supports all the Arduino boards that have the hardware enabled for BLE and Bluetooth 4.0 and above; these include Nano 33 BLE, Arduino NANO 33 IoT, Uno WiFi Rev 2, MKR WiFi 1010.
+
+To use this library
+``#include <ArduinoBLE.h>``
+
+## A quick introduction to BLE
+
+Bluetooth 4.0 includes both traditional Bluetooth, now labeled "Bluetooth Classic", and the Bluetooth Low Energy (Bluetooth LE, or BLE). BLE is optimized for low power use at low data rates, and was designed to operate from simple lithium coin cell batteries.
+
+Unlike standard bluetooth communication basically based on an asynchronous serial connection (UART) a Bluetooth LE radio acts like a community bulletin board. The computers that connect to it are like community members that read the bulletin board. Each radio acts as either the bulletin board or the reader. If your radio is a bulletin board (called a peripheral device in Bluetooth LE parlance) it posts data for all radios in the community to read. If your radio is a reader (called a central device in Blueooth LE terms) it reads from any of the bulletin boards (peripheral devices) that have information about which it cares. You can also think of peripheral devices as the servers in a client-server transaction, because they contain the information that reader radios ask for. Similarly, central devices are the clients of the Bluetooth LE world because they read information available from the peripherals.
+
+![Communication between central and peripheral devices](www.arduino.cc/en/uploads/Reference/ble-bulletin-board-model.png)
+
+Think of a Bluetooth LE peripheral device as a bulletin board and central devices as viewers of the board. Central devices view the services, get the data, then move on. Each transaction is quick (a few milliseconds), so multiple central devices can get data from one peripheral.
+
+The information presented by a peripheral is structured as **services**, each of which is subdivided into **characteristics**. You can think of services as the notices on a bulletin board, and characteristics as the individual paragraphs of those notices. If you're a peripheral device, you just update each service characteristic when it needs updating and don't worry about whether the central devices read them or not. If you're a central device, you connect to the peripheral then read the boxes you want. If a given characteristic is readable and writable, then the peripheral and central can both change it.
+
+## Notify
+
+The Bluetooth LE specification includes a mechanism known as **notify** that lets you know when data's changed. When notify on a characteristic is enabled and the sender writes to it, the new value is automatically sent to the receiver, without the receiver explicitly issuing a read command. This is commonly used for streaming data such as accelerometer or other sensor readings. There's a variation on this specification called **indicate** which works similarly, but in the indicate specification, the reader sends an acknowledgement of the pushed data.
+
+The client-server structure of Bluetooth LE, combined with the notify characteristic, is generally called a **publish-and-subscribe model**.
+
+## Update a characteristic
+
+Your peripheral should update characteristics when there's a significant change to them. For example, when a switch changes from off to on, update its characteristic. When an analog sensor changes by a significant amount, update its characteristic.
+
+Just as with writing to a characteristic, you could update your characteristics on a regular interval, but this wastes processing power and energy if the characteristic has not changed.
+
+## Central and Peripheral Devices
+
+**Central** devices are **clients**. They read and write data from peripheral devices. **Peripheral** devices are **servers**. They provide data from sensors as readable characteristics, and provide read/writable characteristics to control actuators like motors, lights, and so forth.
+
+## Services, characteristics, and UUIDs
+
+A BLE peripheral will provide **services**, which in turn provide **characteristics**. You can define your own services, or use [standard services](https://developer.bluetooth.org/gatt/services/Pages/ServicesHome.aspx).
+
+Services are identified by unique numbers known as UUIDs. You know about UUIDs from other contexts. Standard services have a 16-bit UUID and custom services have a 128-bit UUID. The ability to define services and characteristics depends on the radio you're using and its firmware.
+
+## Service design patterns
+
+A characteristic value can be up to 512 bytes long. This is a key constraint in designing services. Given this limit, you should consider how best to store data about your sensors and actuators most effectively for your application. The simplest design pattern is to store one sensor or actuator value per characteristic, in ASCII encoded values.
+
+|**Characteristic**|**Value**|
+|------------------|---------|
+|Accelerometer X|200|
+|Accelerometer Y|134|
+|Accelerometer Z|150|
+
+This is also the most expensive in memory terms, and would take the longest to read. But it's the simplest for development and debugging.
+
+You could also combine readings into a single characteristic, when a given sensor or actuator has multiple values associated with it.
+
+|**Characteristic**|**Value**|
+|------------------|---------|
+|Motor Speed, Direction|150,1|
+|Accelerometer X, Y, Z|200,133,150|
+
+This is more efficient, but you need to be careful not to exceed the 512-byte limit. The accelerometer characteristic above, for example, takes 11 bytes as a ASCII-encoded string.
+
+## Read/write/notify/indicate
+
+There are 4 things a central device can do with a characteristic:
+
+- **Read:** ask the peripheral to send back the current value of the characteristic. Often used for characteristics that don't change very often, for example characteristics used for configuration, version numbers, etc.
+- **Write:** modify the value of the characteristic. Often used for things that are like commands, for example telling the peripheral to turn a motor on or off.
+- **Indicate** and **Notify:** ask the peripheral to continuously send updated values of the characteristic, without the central having to constantly ask for it.
+
+## Advertising and GAP
+
+BLE devices let other devices know that they exist by advertising using the **General Advertising Profile (GAP)**. Advertising packets can contain a device name, some other information, and also a list of the services it provides.
+
+Advertising packets have a limited size. You will only be able to fit a single 128-bit service UUID in the packet. Make sure the device name is not too long, or you won't even be able to fit that.
+
+You can provide additional services that are not advertised. Central devices will learn about these through the connection/bonding process. Non-advertised services cannot be used to discover devices, though. Sometimes this is not an issue. For example, you may have a custom peripheral device with a custom service, but in your central device app you may know that it also provides the Battery Service and other services.
+
+## GATT
+
+The Bluetooth LE protocol operates on multiple layers. **General Attribute Profile (GATT)** is the layer that defines services and characteristics and enables read/write/notify/indicate operations on them. When reading more about GATT, you may encounter GATT concepts of a "server" and "client". These don't always correspond to central and peripherals. In most cases, though, the peripheral is the GATT server (since it provides the services and characteristics), while the central is the GATT client.
+
+## Library structure
+
+As the library enables multiple types of functionality, there are a number of different classes.
+
+- BLE used to enable the BLE module.
+- BLEDevice used to get information about the devices connected or discovered while scanning.
+- BLEService used to enable the services board provides or interact with services a remote board provides.
+- BLECharacteristic used to enable the characteristics board offers in a service or interact with characteristics a remote board provides.
+- BLEDescriptor used to describe a characteristic the board offers.

From ceb39326ec0c7801d8ff9a468057a616dfdcbbb8 Mon Sep 17 00:00:00 2001
From: LiamAljundi <46995170+LiamAljundi@users.noreply.github.com>
Date: Mon, 23 Aug 2021 11:44:35 +0200
Subject: [PATCH 021/112] updated content

---
 docs/api.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/api.md b/docs/api.md
index fc0e9c07..8356b310 100644
--- a/docs/api.md
+++ b/docs/api.md
@@ -3783,6 +3783,7 @@ Returns
 
 #### Example
 
+
 ```Arduino
 …
   byte value = 0;

From 21a332fa2a37be592c536da1f6e560276e92b321 Mon Sep 17 00:00:00 2001
From: LiamAljundi <46995170+LiamAljundi@users.noreply.github.com>
Date: Tue, 24 Aug 2021 11:07:18 +0200
Subject: [PATCH 022/112] fixed suggestions from Karl's review

---
 docs/api.md | 782 ++++++++++++++++++++++++++--------------------------
 1 file changed, 391 insertions(+), 391 deletions(-)

diff --git a/docs/api.md b/docs/api.md
index 8356b310..dab294ab 100644
--- a/docs/api.md
+++ b/docs/api.md
@@ -19,20 +19,20 @@ BLE.begin()
 
 None
 
-Returns
+#### Returns
 1 on success, 0 on failure.
 
 #### Example
 
-```Arduino
-…
+```arduino
+
   // begin initialization
   if (!BLE.begin()) {
     Serial.println("starting BLE failed!");
 
     while (1);
   }
-…
+
 
 ```
 
@@ -51,13 +51,13 @@ BLE.end()
 
 None
 
-Returns
+#### Returns
 Nothing
 
 #### Example
 
-```Arduino
-…
+```arduino
+
   // begin initialization
   if (!BLE.begin()) {
     Serial.println("starting BLE failed!");
@@ -68,7 +68,7 @@ Nothing
   // ....
 
   BLE.end();
-…
+
 
 ```
 
@@ -87,21 +87,21 @@ BLE.poll() BLE.poll(timeout)
 
 **timeout**: optional timeout in ms, to wait for event. If not specified defaults to 0 ms.
 
-Returns
+#### Returns
 Nothing
 
 #### Example
 
-```Arduino
-…
+```arduino
+
   // assign event handlers for connected, disconnected to peripheral
   BLE.setEventHandler(BLEConnected, blePeripheralConnectHandler);
   BLE.setEventHandler(BLEDisconnected, blePeripheralDisconnectHandler);
 
-  // …
+  
 
   BLE.poll();
-…
+
 
 ```
 
@@ -120,13 +120,13 @@ BLE.setEventHandler(eventType, callback)
 
 **eventType**: event type (BLEConnected, BLEDisconnected)
 **callback**: function to call when event occurs
-Returns
+#### Returns
 Nothing.
 
 #### Example
 
-```Arduino
-…
+```arduino
+
   // begin initialization
   if (!BLE.begin()) {
     Serial.println("starting BLE failed!");
@@ -140,7 +140,7 @@ Nothing.
   BLE.setEventHandler(BLEConnected, blePeripheralConnectHandler);
   BLE.setEventHandler(BLEDisconnected, blePeripheralDisconnectHandler);
 
-  // …
+  
 
 
 void blePeripheralConnectHandler(BLEDevice central) {
@@ -154,7 +154,7 @@ void blePeripheralDisconnectHandler(BLEDevice central) {
   Serial.print("Disconnected event, central: ");
   Serial.println(central.address());
 }
-…
+
 
 ```
 
@@ -173,19 +173,19 @@ BLE.connected()
 
 None
 
-Returns
+#### Returns
 **true** if another BLE device is connected, otherwise **false**.
 
 #### Example
 
-```Arduino
-…
+```arduino
+
     // while the central is still connected to peripheral:
     while (BLE.connected()) {
 
        // ...
     }
-…
+
 
 ```
 
@@ -204,19 +204,19 @@ BLE.disconnect()
 
 None
 
-Returns
+#### Returns
 **true** if any BLE device that was previously connected was disconnected, otherwise **false**.
 
 #### Example
 
-```Arduino
-…
+```arduino
+
   if (BLE.connected()) {
-    // …
+    
 
     BLE.disconnect();
   }
-…
+
 
 ```
 
@@ -235,18 +235,18 @@ BLE.address()
 
 None
 
-Returns
+#### Returns
 The **Bluetooth address** of the BLE device (as a String).
 
 #### Example
 
-```Arduino
-…
+```arduino
+
   **String** address = BLE.address();
 
   Serial.print(“Local address is: “);
   Serial.println(address);
-…
+
 
 ```
 
@@ -265,20 +265,20 @@ BLE.rssi()
 
 None
 
-Returns
+#### Returns
 The **RSSI** of the connected BLE device, 127 if no BLE device is connected.
 
 #### Example
 
-```Arduino
-…
+```arduino
+
   if (BLE.connected()) {
-    // …
+    
 
    Serial.print(“RSSI = “);
     Serial.println(BLE.rssi());
   }
-…
+
 
 ```
 
@@ -297,13 +297,13 @@ BLE.setAdvertisedServiceUuid(uuid)
 
 **uuid:** 16-bit or 128-bit BLE UUID in **String** format
 
-Returns
+#### Returns
 Nothing
 
 #### Example
 
-```Arduino
-…
+```arduino
+
   // begin initialization
   if (!BLE.begin()) {
     Serial.println("starting BLE failed!");
@@ -317,7 +317,7 @@ Nothing
 
   // start advertising
   BLE.advertise();
-…
+
 
 ```
 
@@ -336,13 +336,13 @@ BLE.setAdvertisedService(bleService)
 
 **bleService:** BLEService to use UUID from
 
-Returns
+#### Returns
 Nothing
 
 #### Example
 
-```Arduino
-…
+```arduino
+
 BLEService ledService("19B10000-E8F2-537E-4F6C-D104768A1214"); // BLE LED Service
 
 // ...
@@ -360,7 +360,7 @@ BLEService ledService("19B10000-E8F2-537E-4F6C-D104768A1214"); // BLE LED Servic
 
   // start advertising
   BLE.advertise();
-…
+
 
 ```
 
@@ -380,13 +380,13 @@ BLE.setManufacturerData(data, length)
 **data:** byte array containing manufacturer data
 **length:** length of manufacturer data array
 
-Returns
+#### Returns
 Nothing
 
 #### Example
 
-```Arduino
-…
+```arduino
+
  // begin initialization
   if (!BLE.begin()) {
     Serial.println("starting BLE failed!");
@@ -403,7 +403,7 @@ Nothing
   // start advertising
   BLE.advertise();
 
-…
+
 
 ```
 
@@ -422,13 +422,13 @@ BLE.setLocalName(name)
 
 **name:** local name value to use when advertising
 
-Returns
+#### Returns
 Nothing
 
 #### Example
 
-```Arduino
-…
+```arduino
+
  // begin initialization
   if (!BLE.begin()) {
     Serial.println("starting BLE failed!");
@@ -443,7 +443,7 @@ Nothing
   // start advertising
   BLE.advertise();
 
-…
+
 
 ```
 
@@ -462,13 +462,13 @@ BLE.setDeviceName(name)
 
 **name:** device name value
 
-Returns
+#### Returns
 Nothing
 
 #### Example
 
-```Arduino
-…
+```arduino
+
  // begin initialization
   if (!BLE.begin()) {
     Serial.println("starting BLE failed!");
@@ -483,7 +483,7 @@ Nothing
   // start advertising
   BLE.advertise();
 
-…
+
 
 ```
 
@@ -502,13 +502,13 @@ BLE.setAppearance(appearance)
 
 **appearance:** appearance value
 
-Returns
+#### Returns
 Nothing
 
 #### Example
 
-```Arduino
-…
+```arduino
+
  // begin initialization
   if (!BLE.begin()) {
     Serial.println("starting BLE failed!");
@@ -523,7 +523,7 @@ Nothing
   // start advertising
   BLE.advertise();
 
-…
+
 
 ```
 
@@ -542,16 +542,16 @@ BLE.addService(service)
 
 **service:** BLEService to add
 
-Returns
+#### Returns
 Nothing
 
 #### Example
 
-```Arduino
-…
+```arduino
+
 BLEService ledService("19B10000-E8F2-537E-4F6C-D104768A1214"); // BLE LED Service
 
-// …
+
 
  // begin initialization
   if (!BLE.begin()) {
@@ -565,7 +565,7 @@ BLEService ledService("19B10000-E8F2-537E-4F6C-D104768A1214"); // BLE LED Servic
   BLE.addService(ledService);
 
   // ...  
-…
+
 
 ```
 
@@ -584,13 +584,13 @@ BLE.advertise()
 
 None
 
-Returns
+#### Returns
 1 on success, 0 on failure.
 
 #### Example
 
-```Arduino
-…
+```arduino
+
   // begin initialization
   if (!BLE.begin()) {
     Serial.println("starting BLE failed!");
@@ -603,7 +603,7 @@ Returns
   BLE.advertise();
 
   // ...  
-…
+
 
 ```
 
@@ -622,13 +622,13 @@ BLE.stopAdvertise()
 
 None
 
-Returns
+#### Returns
 Nothing
 
 #### Example
 
-```Arduino
-…
+```arduino
+
   // begin initialization
   if (!BLE.begin()) {
     Serial.println("starting BLE failed!");
@@ -643,7 +643,7 @@ Nothing
   // ...  
 
   BLE.stopAdvertise();
-…
+
 
 ```
 
@@ -662,13 +662,13 @@ BLE.central()
 
 None
 
-Returns
+#### Returns
 **BLEDevice** representing the central.
 
 #### Example
 
-```Arduino
-…
+```arduino
+
   // listen for BLE peripherals to connect:
   BLEDevice central = BLE.central();
 
@@ -678,9 +678,9 @@ Returns
     // print the central's MAC address:
     Serial.println(central.address());
 
-    // …
+    
   }
-…
+
 
 ```
 
@@ -699,13 +699,13 @@ BLE.setAdvertisingInterval(advertisingInterval)
 
 **advertisingInterval:** advertising interval in units of 0.625 ms
 
-Returns
+#### Returns
 Nothing.
 
 #### Example
 
-```Arduino
-…
+```arduino
+
   // begin initialization
   if (!BLE.begin()) {
     Serial.println("starting BLE failed!");
@@ -718,7 +718,7 @@ Nothing.
   BLE.setAdvertisingInterval(320); // 200 * 0.625 ms
 
   BLE.advertise();
-…
+
 
 ```
 
@@ -738,13 +738,13 @@ BLE.setConnectionInterval(minimum, maximum)
 **minimum:** minimum desired connection interval in units of 1.25 ms
 **maximum:** maximum desired connection interval in units of 1.25 ms
 
-Returns
+#### Returns
 Nothing.
 
 #### Example
 
-```Arduino
-…
+```arduino
+
   // begin initialization
   if (!BLE.begin()) {
     Serial.println("starting BLE failed!");
@@ -756,7 +756,7 @@ Nothing.
 
   BLE.setConnectionInterval(0x0006, 0x0c80); // 7.5 ms minimum, 4 s maximum
 
-…
+
 
 ```
 
@@ -776,13 +776,13 @@ BLE.setConnectable(connectable)
 **true**: the device will be connectable when advertising
 **false**: the device will NOT be connectable when advertising
 
-Returns
+#### Returns
 Nothing.
 
 #### Example
 
-```Arduino
-…
+```arduino
+
   // begin initialization
   if (!BLE.begin()) {
     Serial.println("starting BLE failed!");
@@ -794,7 +794,7 @@ Nothing.
 
   BLE.setConnectable(false); // make the device unconnectable when advertising
 
-…
+
 
 ```
 
@@ -814,13 +814,13 @@ BLE.scan(withDuplicates)
 
 **withDuplicates:** optional, defaults to **false**. If **true**, advertisements received more than once will not be filtered
 
-Returns
+#### Returns
 1 on success, 0 on failure.
 
 #### Example
 
-```Arduino
-…
+```arduino
+
   // begin initialization
   if (!BLE.begin()) {
     Serial.println("starting BLE failed!");
@@ -833,14 +833,14 @@ Returns
   // start scanning for peripheral
   BLE.scan();
 
-  // …
+  
 
   BLEDevice peripheral = BLE.available();
 
   if (peripheral) {
      // ...
   }
-…
+
 
 ```
 
@@ -861,13 +861,13 @@ BLE.scanForName(name, withDuplicates)
 **name:** (local) name of device (as a **String**) to filter for
 **withDuplicates:** optional, defaults to **false**. If **true**, advertisements received more than once will not be filtered.
 
-Returns
+#### Returns
 1 on success, 0 on failure.
 
 #### Example
 
-```Arduino
-…
+```arduino
+
   // begin initialization
   if (!BLE.begin()) {
     Serial.println("starting BLE failed!");
@@ -880,14 +880,14 @@ Returns
   // start scanning for peripheral
   BLE.scanForName("LED");
 
-  // …
+  
 
   BLEDevice peripheral = BLE.available();
 
   if (peripheral) {
      // ...
   }
-…
+
 
 ```
 
@@ -908,13 +908,13 @@ BLE.scanForAddress(address, withDuplicates)
 **address:** (Bluetooth) address (as a String) to filter for
 **withDuplicates:** optional, defaults to **false**. If **true**, advertisements received more than once will not be filtered
 
-Returns
+#### Returns
 1 on success, 0 on failure.
 
 #### Example
 
-```Arduino
-…
+```arduino
+
   // begin initialization
   if (!BLE.begin()) {
     Serial.println("starting BLE failed!");
@@ -927,14 +927,14 @@ Returns
   // start scanning for peripheral
   BLE.scanForAddress("aa:bb:cc:ee:dd:ff");
 
-  // …
+  
 
   BLEDevice peripheral = BLE.available();
 
   if (peripheral) {
      // ...
   }
-…
+
 
 ```
 
@@ -955,13 +955,13 @@ BLE.scanForUuid(uuid, withDuplicates)
 **uuid:** (service) UUID (as a **String**) to filter for
 **withDuplicates:** optional, defaults to **false**. If **true**, advertisements received more than once will not be filtered.
 
-Returns
+#### Returns
 1 on success, 0 on failure.
 
 #### Example
 
-```Arduino
-…
+```arduino
+
   // begin initialization
   if (!BLE.begin()) {
     Serial.println("starting BLE failed!");
@@ -974,14 +974,14 @@ Returns
   // start scanning for peripheral
   BLE.scanForUuid("aa10");
 
-  // …
+  
 
   BLEDevice peripheral = BLE.available();
 
   if (peripheral) {
      // ...
   }
-…
+
 
 ```
 
@@ -1000,13 +1000,13 @@ BLE.stopScan()
 
 None
 
-Returns
+#### Returns
 Nothing
 
 #### Example
 
-```Arduino
-…
+```arduino
+
   // begin initialization
   if (!BLE.begin()) {
     Serial.println("starting BLE failed!");
@@ -1019,9 +1019,9 @@ Nothing
   // start scanning for peripheral
   BLE.scan();
 
-  // …
+  
   BLE.stopScan();
-…
+
 
 ```
 
@@ -1040,13 +1040,13 @@ BLE.available()
 
 Nothing
 
-Returns
+#### Returns
 **BLEDevice** representing the discovered device.
 
 #### Example
 
-```Arduino
-…
+```arduino
+
   // begin initialization
   if (!BLE.begin()) {
     Serial.println("starting BLE failed!");
@@ -1059,14 +1059,14 @@ Returns
   // start scanning for peripheral
   BLE.scan();
 
-  // …
+  
 
   BLEDevice peripheral = BLE.available();
 
   if (peripheral) {
      // ...
   }
-…
+
 
 ```
 
@@ -1090,25 +1090,25 @@ bleDevice.poll(timeout)
 
 **timeout**: optional timeout in ms, to wait for event. If not specified defaults to 0 ms.
 
-Returns
+#### Returns
 Nothing
 
 #### Example
 
-```Arduino
-…
+```arduino
+
   // listen for BLE centrals to connect:
   BLEDevice central = BLE.central();
 
   // if a central is connected to peripheral:
   if (central) {
-    // …
+    
 
    central.poll();
 
     // ...
   }
-…
+
 
 ```
 
@@ -1127,13 +1127,13 @@ bleDevice.connected()
 
 None
 
-Returns
+#### Returns
 **true** if the BLE device is connected, otherwise **false**.
 
 #### Example
 
-```Arduino
-…
+```arduino
+
   // listen for BLE centrals to connect:
   BLEDevice central = BLE.central();
 
@@ -1142,7 +1142,7 @@ Returns
 
        // ...
     }
-…
+
 
 ```
 
@@ -1161,20 +1161,20 @@ bleDevice.disconnect()
 
 None
 
-Returns
+#### Returns
 **true** if the BLE device was disconnected, otherwise **false**.
 
 #### Example
 
-```Arduino
-…
+```arduino
+
  // listen for BLE centrals to connect:
   BLEDevice central = BLE.central();
 
-  // …
+  
 
   central.disconnect();
-…
+
 
 ```
 
@@ -1193,13 +1193,13 @@ bleDevice.address()
 
 None
 
-Returns
+#### Returns
 The **Bluetooth address** of the BLE device (as a String).
 
 #### Example
 
-```Arduino
-…
+```arduino
+
   // listen for BLE peripherals to connect:
   BLEDevice central = BLE.central();
 
@@ -1209,9 +1209,9 @@ The **Bluetooth address** of the BLE device (as a String).
     // print the central's MAC address:
     Serial.println(central.address());
 
-    // ….
+    .
   }
-…
+
 
 ```
 
@@ -1230,20 +1230,20 @@ bleDevice.rssi()
 
 None
 
-Returns
+#### Returns
 The **RSSI** of the connected BLE device, 127 if the BLE device is not connected.
 
 #### Example
 
-```Arduino
-…
+```arduino
+
   if (bleDevice.connected()) {
-    // …
+    
 
     Serial.print(“RSSI = “);
     Serial.println(bleDevice.rssi());
   }
-…
+
 
 ```
 
@@ -1265,13 +1265,13 @@ bleDevice.characteristic(uuid, index)
 **index**: index of characteristic
 **uuid**: uuid (as a **String**)
 
-Returns
+#### Returns
 **BLECharacteristic** for provided parameters
 
 #### Example
 
-```Arduino
-…
+```arduino
+
   // begin initialization
   if (!BLE.begin()) {
     Serial.println("starting BLE failed!");
@@ -1284,7 +1284,7 @@ Returns
   // start scanning for peripheral
   BLE.scan();
 
-  // …
+  
 
   BLEDevice peripheral = BLE.available();
 
@@ -1320,7 +1320,7 @@ Returns
 
     // ...
   }
-…
+
 
 ```
 
@@ -1339,13 +1339,13 @@ bleDevice.discoverAttributes()
 
 None
 
-Returns
+#### Returns
 **true**, if successful, **false** on failure.
 
 #### Example
 
-```Arduino
-…
+```arduino
+
   // begin initialization
   if (!BLE.begin()) {
     Serial.println("starting BLE failed!");
@@ -1358,7 +1358,7 @@ Returns
   // start scanning for peripheral
   BLE.scan();
 
-  // …
+  
 
   BLEDevice peripheral = BLE.available();
 
@@ -1386,7 +1386,7 @@ Returns
 
     // ...
   }
-…
+
 
 ```
 
@@ -1405,13 +1405,13 @@ bleDevice.discoverService(serviceUuid)
 
 **serviceUuid:** service UUID to discover (as a **String**)
 
-Returns
+#### Returns
 **true**, if successful, **false** on failure.
 
 #### Example
 
-```Arduino
-…
+```arduino
+
   // begin initialization
   if (!BLE.begin()) {
     Serial.println("starting BLE failed!");
@@ -1424,7 +1424,7 @@ Returns
   // start scanning for peripheral
   BLE.scan();
 
-  // …
+  
 
   BLEDevice peripheral = BLE.available();
 
@@ -1452,7 +1452,7 @@ Returns
 
     // ...
   }
-…
+
 
 ```
 
@@ -1471,13 +1471,13 @@ bleDevice.deviceName()
 
 None
 
-Returns
+#### Returns
 **Device name** (as a String).
 
 #### Example
 
-```Arduino
-…
+```arduino
+
   // begin initialization
   if (!BLE.begin()) {
     Serial.println("starting BLE failed!");
@@ -1490,7 +1490,7 @@ Returns
   // start scanning for peripheral
   BLE.scan();
 
-  // …
+  
 
   BLEDevice peripheral = BLE.available();
 
@@ -1526,7 +1526,7 @@ Returns
 
     // ...
   }
-…
+
 
 ```
 
@@ -1545,13 +1545,13 @@ bleDevice.appearance()
 
 None
 
-Returns
+#### Returns
 **Appearance value** (as a number).
 
 #### Example
 
-```Arduino
-…
+```arduino
+
   // begin initialization
   if (!BLE.begin()) {
     Serial.println("starting BLE failed!");
@@ -1564,7 +1564,7 @@ Returns
   // start scanning for peripheral
   BLE.scan();
 
-  // …
+  
 
   BLEDevice peripheral = BLE.available();
 
@@ -1600,7 +1600,7 @@ Returns
 
     // ...
   }
-…
+
 
 ```
 
@@ -1619,13 +1619,13 @@ bleDevice.serviceCount()
 
 None
 
-Returns
+#### Returns
 The number of **services discovered** for the BLE device.
 
 #### Example
 
-```Arduino
-…
+```arduino
+
   // begin initialization
   if (!BLE.begin()) {
     Serial.println("starting BLE failed!");
@@ -1638,7 +1638,7 @@ The number of **services discovered** for the BLE device.
   // start scanning for peripheral
   BLE.scan();
 
-  // …
+  
 
   BLEDevice peripheral = BLE.available();
 
@@ -1671,7 +1671,7 @@ The number of **services discovered** for the BLE device.
 
     // ...
   }
-…
+
 
 ```
 
@@ -1692,13 +1692,13 @@ bleDevice.hasService(uuid, index)
 **uuid**: uuid to check (as a **String**)
 **index**: optional, index of service to check if the device provides more than on. Defaults to 0, if not provided.
 
-Returns
+#### Returns
 **true**, if the device provides the service, **false** otherwise.
 
 #### Example
 
-```Arduino
-…
+```arduino
+
   // begin initialization
   if (!BLE.begin()) {
     Serial.println("starting BLE failed!");
@@ -1711,7 +1711,7 @@ Returns
   // start scanning for peripheral
   BLE.scan();
 
-  // …
+  
 
   BLEDevice peripheral = BLE.available();
 
@@ -1743,7 +1743,7 @@ Returns
 
     // ...
   }
-…
+
 
 ```
 
@@ -1765,13 +1765,13 @@ bleDevice.service(uuid, index)
 **index**: index of service
 **uuid**: uuid (as a **String**)
 
-Returns
+#### Returns
 **BLEService** for provided parameters
 
 #### Example
 
-```Arduino
-…
+```arduino
+
   // begin initialization
   if (!BLE.begin()) {
     Serial.println("starting BLE failed!");
@@ -1784,7 +1784,7 @@ Returns
   // start scanning for peripheral
   BLE.scan();
 
-  // …
+  
 
   BLEDevice peripheral = BLE.available();
 
@@ -1820,7 +1820,7 @@ Returns
 
     // ...
   }
-…
+
 
 ```
 
@@ -1839,13 +1839,13 @@ bleDevice.characteristicCount()
 
 None
 
-Returns
+#### Returns
 The **number of characteristics** discovered for the BLE device.
 
 #### Example
 
-```Arduino
-…
+```arduino
+
   // begin initialization
   if (!BLE.begin()) {
     Serial.println("starting BLE failed!");
@@ -1858,7 +1858,7 @@ The **number of characteristics** discovered for the BLE device.
   // start scanning for peripheral
   BLE.scan();
 
-  // …
+  
 
   BLEDevice peripheral = BLE.available();
 
@@ -1891,7 +1891,7 @@ The **number of characteristics** discovered for the BLE device.
 
     // ...
   }
-…
+
 
 ```
 
@@ -1912,13 +1912,13 @@ bleDevice.hasCharacteristic(uuid, index)
 **uuid**: uuid to check (as a **String**)
 **index**: optional, index of characteristic to check if the device provides more than on. Defaults to 0, if not provided.
 
-Returns
+#### Returns
 **true**, if the device provides the characteristic, **false** otherwise.
 
 #### Example
 
-```Arduino
-…
+```arduino
+
   // begin initialization
   if (!BLE.begin()) {
     Serial.println("starting BLE failed!");
@@ -1931,7 +1931,7 @@ Returns
   // start scanning for peripheral
   BLE.scan();
 
-  // …
+  
 
   BLEDevice peripheral = BLE.available();
 
@@ -1963,7 +1963,7 @@ Returns
 
     // ...
   }
-…
+
 
 ```
 
@@ -1982,13 +1982,13 @@ bleDevice.hasLocalName()
 
 Nothing
 
-Returns
+#### Returns
 **true**, if the device is advertising a local name, **false** otherwise.
 
 #### Example
 
-```Arduino
-…
+```arduino
+
   // begin initialization
   if (!BLE.begin()) {
     Serial.println("starting BLE failed!");
@@ -2001,7 +2001,7 @@ Returns
   // start scanning for peripheral
   BLE.scan();
 
-  // …
+  
 
   BLEDevice peripheral = BLE.available();
 
@@ -2016,7 +2016,7 @@ Returns
 
     // ...
   }
-…
+
 
 ```
 
@@ -2036,13 +2036,13 @@ bleDevice.hasAdvertisedServiceUuid(index)
 
 **index**: optional, defaults to 0, the index of the service UUID, if the device is advertising more than one.
 
-Returns
+#### Returns
 **true**, if the device is advertising a service UUID, **false** otherwise.
 
 #### Example
 
-```Arduino
-…
+```arduino
+
   // begin initialization
   if (!BLE.begin()) {
     Serial.println("starting BLE failed!");
@@ -2055,7 +2055,7 @@ Returns
   // start scanning for peripheral
   BLE.scan();
 
-  // …
+  
 
   BLEDevice peripheral = BLE.available();
 
@@ -2074,7 +2074,7 @@ Returns
 
     // ...
   }
-…
+
 
 ```
 
@@ -2093,13 +2093,13 @@ bleDevice.advertisedServiceUuidCount()
 
 None
 
-Returns
+#### Returns
 The **number of advertised services** a discovered BLE device is advertising.
 
 #### Example
 
-```Arduino
-…
+```arduino
+
   // begin initialization
   if (!BLE.begin()) {
     Serial.println("starting BLE failed!");
@@ -2112,7 +2112,7 @@ The **number of advertised services** a discovered BLE device is advertising.
   // start scanning for peripheral
   BLE.scan();
 
-  // …
+  
 
   BLEDevice peripheral = BLE.available();
 
@@ -2131,7 +2131,7 @@ The **number of advertised services** a discovered BLE device is advertising.
 
     // ...
   }
-…
+
 
 ```
 
@@ -2150,13 +2150,13 @@ bleDevice.localName()
 
 Nothing
 
-Returns
+#### Returns
 **Advertised local name** (as a String).
 
 #### Example
 
-```Arduino
-…
+```arduino
+
   // begin initialization
   if (!BLE.begin()) {
     Serial.println("starting BLE failed!");
@@ -2169,7 +2169,7 @@ Returns
   // start scanning for peripheral
   BLE.scan();
 
-  // …
+  
 
   BLEDevice peripheral = BLE.available();
 
@@ -2184,7 +2184,7 @@ Returns
 
     // ...
   }
-…
+
 
 ```
 
@@ -2204,13 +2204,13 @@ bleDevice.advertisedServiceUuid(index)
 
 **index**: optional, defaults to 0, the index of the **service UUID**, if the device is advertising more than one.
 
-Returns
+#### Returns
 Advertised service **UUID** (as a String).
 
 #### Example
 
-```Arduino
-…
+```arduino
+
   // begin initialization
   if (!BLE.begin()) {
     Serial.println("starting BLE failed!");
@@ -2223,7 +2223,7 @@ Advertised service **UUID** (as a String).
   // start scanning for peripheral
   BLE.scan();
 
-  // …
+  
 
   BLEDevice peripheral = BLE.available();
 
@@ -2242,7 +2242,7 @@ Advertised service **UUID** (as a String).
 
     // ...
   }
-…
+
 
 ```
 
@@ -2261,13 +2261,13 @@ bleDevice.connect()
 
 None
 
-Returns
+#### Returns
 **true**, if the connection was successful, **false** otherwise.
 
 #### Example
 
-```Arduino
-…
+```arduino
+
   // begin initialization
   if (!BLE.begin()) {
     Serial.println("starting BLE failed!");
@@ -2280,7 +2280,7 @@ Returns
   // start scanning for peripheral
   BLE.scan();
 
-  // …
+  
 
   BLEDevice peripheral = BLE.available();
 
@@ -2298,7 +2298,7 @@ Returns
 
     // ...
   }
-…
+
 
 ```
 
@@ -2321,15 +2321,15 @@ BLEService(uuid)
 
 **uuid**: 16-bit or 128-bit UUID in **String** format
 
-Returns
+#### Returns
 New **BLEService** with the specified **UUID**
 
 #### Example
 
-```Arduino
-…
+```arduino
+
 BLEService ledService("19B10000-E8F2-537E-4F6C-D104768A1214"); // BLE LED Service
-…
+
 
 ```
 
@@ -2348,20 +2348,20 @@ bleService.uuid()
 
 None
 
-Returns
+#### Returns
 UUID of the BLE service as a **String**.
 
 #### Example
 
-```Arduino
-…
+```arduino
+
 BLEService ledService("19B10000-E8F2-537E-4F6C-D104768A1214"); // BLE LED Service
 
-// …
+
 Serial.print(“LED service UUID = “);
 Serial.println(ledService.uuid());
 
-…
+
 
 ```
 
@@ -2380,25 +2380,25 @@ bleService.addCharacteristic(bleCharacteristic)
 
 None
 
-Returns
+#### Returns
 Nothing
 
 #### Example
 
-```Arduino
-…
+```arduino
+
 BLEService ledService("19B10000-E8F2-537E-4F6C-D104768A1214"); // BLE LED Service
 
 // BLE LED Switch Characteristic - custom 128-bit UUID, readable and writable by central
 BLECharacteristic switchCharacteristic("19B10001-E8F2-537E-4F6C-D104768A1214", BLERead | BLEWrite, 1);
 
 
-// …
+
 
 // add the characteristic to the service
 ledService.addCharacteristic(switchCharacteristic);
 
-…
+
 
 ```
 
@@ -2417,13 +2417,13 @@ bleService.characteristicCount()
 
 None
 
-Returns
+#### Returns
 The **number of characteristics** discovered for the BLE service.
 
 #### Example
 
-```Arduino
-…
+```arduino
+
   // begin initialization
   if (!BLE.begin()) {
     Serial.println("starting BLE failed!");
@@ -2436,7 +2436,7 @@ The **number of characteristics** discovered for the BLE service.
   // start scanning for peripheral
   BLE.scan();
 
-  // …
+  
 
   BLEDevice peripheral = BLE.available();
 
@@ -2476,7 +2476,7 @@ The **number of characteristics** discovered for the BLE service.
 
     // ...
   }
-…
+
 
 ```
 
@@ -2497,13 +2497,13 @@ bleService.hasCharacteristic(uuid, index)
 **uuid**: uuid to check (as a **String**)
 **index**: optional, index of characteristic to check if the device provides more than on. Defaults to 0, if not provided.
 
-Returns
+#### Returns
 **true**, if the service provides the characteristic, **false** otherwise.
 
 #### Example
 
-```Arduino
-…
+```arduino
+
   // begin initialization
   if (!BLE.begin()) {
     Serial.println("starting BLE failed!");
@@ -2516,7 +2516,7 @@ Returns
   // start scanning for peripheral
   BLE.scan();
 
-  // …
+  
   BLEDevice peripheral = BLE.available();
 
   if (peripheral) {
@@ -2554,7 +2554,7 @@ Returns
 
     // ...
   }
-…
+
 
 ```
 
@@ -2576,13 +2576,13 @@ bleService.characteristic(uuid, index)
 **index**: index of characteristic
 **uuid**: uuid (as a **String**)
 
-Returns
+#### Returns
 **BLECharacteristic** for provided parameters
 
 #### Example
 
-```Arduino
-…
+```arduino
+
   // begin initialization
   if (!BLE.begin()) {
     Serial.println("starting BLE failed!");
@@ -2595,7 +2595,7 @@ Returns
   // start scanning for peripheral
   BLE.scan();
 
-  // …
+  
 
   BLEDevice peripheral = BLE.available();
 
@@ -2638,7 +2638,7 @@ Returns
 
     // ...
   }
-…
+
 
 ```
 
@@ -2679,18 +2679,18 @@ BLEDoubleCharacteristic(uuid, properties)
 **valueSize**: (maximum) size of characteristic value
 **stringValue**: value as a string
 
-Returns
+#### Returns
 New **BLECharacteristic** with the specified **UUID** and value
 
 #### Example
 
-```Arduino
-…
+```arduino
+
 // BLE 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
 
-…
+
 
 ```
 
@@ -2709,21 +2709,21 @@ bleCharacteristic.uuid()
 
 None
 
-Returns
+#### Returns
 **UUID** of the BLE service as a **String**.
 
 #### Example
 
-```Arduino
-…
+```arduino
+
 // BLE LED Switch Characteristic - custom 128-bit UUID, read and writable by central
 BLEByteCharacteristic switchCharacteristic("19B10001-E8F2-537E-4F6C-D104768A1214", BLERead | BLEWrite);
 
-// …
+
 Serial.print(“Switch characteristic UUID = “);
 Serial.println(switchCharacteristic.uuid());
 
-…
+
 
 ```
 
@@ -2742,17 +2742,17 @@ bleCharacteristic.properties()
 
 None
 
-Returns
+#### Returns
 **Properties of the characteristic masked** (BLEBroadcast, BLERead, BLEWriteWithoutResponse, BLEWrite, BLENotify, BLEIndicate)
 
 #### Example
 
-```Arduino
-…
+```arduino
+
 // BLE LED Switch Characteristic - custom 128-bit UUID, read and writable by central
 BLEByteCharacteristic switchCharacteristic("19B10001-E8F2-537E-4F6C-D104768A1214", BLERead | BLEWrite);
 
-// …
+
 byte properties = switchCharacteristic.properties();
 
 if (properties & BLERead) {
@@ -2762,7 +2762,7 @@ if (properties & BLERead) {
 if (properties & (BLEWrite | BLEWriteWithoutResponse)) {
   // characteristic is writable ...
 }
-…
+
 
 ```
 
@@ -2781,21 +2781,21 @@ bleCharacteristic.valueSize()
 
 None
 
-Returns
+#### Returns
 The **maximum value** size of the characteristic (in bytes)
 
 #### Example
 
-```Arduino
-…
+```arduino
+
 // BLE LED Switch Characteristic - custom 128-bit UUID, read and writable by central
 BLEByteCharacteristic switchCharacteristic("19B10001-E8F2-537E-4F6C-D104768A1214", BLERead | BLEWrite);
 
-// …
+
 
 Serial.print(“value size = “);
 Serial.println(switchCharacteristic.valueSize());
-…
+
 
 ```
 
@@ -2814,17 +2814,17 @@ bleCharacteristic.value()
 
 None
 
-Returns
+#### Returns
 The **current value** of the characteristic, value type depends on the constructor used
 
 #### Example
 
-```Arduino
-…
+```arduino
+
 // BLE LED Switch Characteristic - custom 128-bit UUID, read and writable by central
 BLEByteCharacteristic switchCharacteristic("19B10001-E8F2-537E-4F6C-D104768A1214", BLERead | BLEWrite);
 
-// …
+
 
       if (switchCharacteristic.value()) {   // any value other than 0
           Serial.println("LED on");
@@ -2834,7 +2834,7 @@ BLEByteCharacteristic switchCharacteristic("19B10001-E8F2-537E-4F6C-D104768A1214
           digitalWrite(ledPin, LOW);          // will turn the LED off
         }
 
-…
+
 
 ```
 
@@ -2853,21 +2853,21 @@ bleCharacteristic.valueLength()
 
 None
 
-Returns
+#### Returns
 The **current value** size of the characteristic (in bytes)
 
 #### Example
 
-```Arduino
-…
+```arduino
+
 // BLE LED Switch Characteristic - custom 128-bit UUID, read and writable by central
 BLEByteCharacteristic switchCharacteristic("19B10001-E8F2-537E-4F6C-D104768A1214", BLERead | BLEWrite);
 
-// …
+
 
 Serial.print(“value length = “);
 Serial.println(switchCharacteristic.valueLength());
-…
+
 
 ```
 
@@ -2888,13 +2888,13 @@ bleCharacteristic.readValue(value)
 **buffer:** byte array to read value into length: size of buffer argument in bytes 
 **value**: variable to read value into (by reference)
 
-Returns
+#### Returns
 Number of bytes read
 
 #### Example
 
-```Arduino
-…
+```arduino
+
   while (peripheral.connected()) {
     // while the peripheral is connected
 
@@ -2916,7 +2916,7 @@ Number of bytes read
       }
     }
   }
-…
+
 
 ```
 
@@ -2938,13 +2938,13 @@ bleCharacteristic.writeValue(value)
 **length**: number of bytes of the buffer argument to write
 **value**: value to write
 
-Returns
+#### Returns
 1 on success, 0 on failure
 
 #### Example
 
-```Arduino
-…
+```arduino
+
     // read the button pin
     int buttonState = digitalRead(buttonPin);
 
@@ -2964,7 +2964,7 @@ Returns
         ledCharacteristic.writeValue((byte)0x00);
       }
     }
-…
+
 
 ```
 
@@ -2984,23 +2984,23 @@ bleCharacteristic.setEventHandler(eventType, callback)
 **eventType**: event type (BLESubscribed, BLEUnsubscribed, BLERead, BLEWritten) 
 **callback**: function to call when the event occurs
 
-Returns
+#### Returns
 Nothing
 
 #### Example
 
-```Arduino
-…
+```arduino
+
 // create switch characteristic and allow remote device to read and write
 BLEByteCharacteristic switchCharacteristic("19B10001-E8F2-537E-4F6C-D104768A1214", BLERead | BLEWrite);
 
 
-// …
+
 
   // assign event handlers for characteristic
   switchCharacteristic.setEventHandler(BLEWritten, switchCharacteristicWritten);
 
-// …
+
 
 void switchCharacteristicWritten(BLEDevice central, BLECharacteristic characteristic) {
   // central wrote new value to characteristic, update LED
@@ -3015,7 +3015,7 @@ void switchCharacteristicWritten(BLEDevice central, BLECharacteristic characteri
   }
 }
 
-  …
+  
 
 ```
 
@@ -3034,21 +3034,21 @@ bleCharacteristic.broadcast()
 
 None
 
-Returns
+#### Returns
 1 on success, 0 on failure
 
 #### Example
 
-```Arduino
-…
+```arduino
+
 // create button characteristic and allow remote device to get notifications
 BLEByteCharacteristic buttonCharacteristic("19B10012-E8F2-537E-4F6C-D104768A1214", BLERead | BLENotify | BLEBroadcast);
 
-// …
+
 
 buttonCharacteristic.broadcast();
 
-…
+
 
 ```
 
@@ -3067,18 +3067,18 @@ bleCharacteristic.written()
 
 None
 
-Returns
+#### Returns
 **true** if the characteristic value has been written by another BLE device, **false** otherwise
 
 #### Example
 
-```Arduino
-…
+```arduino
+
 // BLE LED Switch Characteristic - custom 128-bit UUID, read and writable by central
 BLEByteCharacteristic switchCharacteristic("19B10001-E8F2-537E-4F6C-D104768A1214", BLERead | BLEWrite);
 
 
-// …
+
 
  // listen for BLE peripherals to connect:
   BLEDevice central = BLE.central();
@@ -3110,7 +3110,7 @@ BLEByteCharacteristic switchCharacteristic("19B10001-E8F2-537E-4F6C-D104768A1214
   }
 
 
-…
+
 
 ```
 
@@ -3129,26 +3129,26 @@ bleCharacteristic.subscribed()
 
 None
 
-Returns
+#### Returns
 **true** if the characteristic value has been subscribed to by another BLE device, **false** otherwise
 
 #### Example
 
-```Arduino
-…
+```arduino
+
 // BLE 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
 
 
 
-// …
+
 
   if (batteryLevelChar.subscribed()) {
      // set a new value , that well be pushed to subscribed BLE devices
     batteryLevelChar.writeValue(0xab);
   }
-…
+
 
 ```
 
@@ -3167,13 +3167,13 @@ bleCharacteristic.addDescriptor(bleDescriptor)
 
 **bleDescriptor**: descriptor to add to the characteristic
 
-Returns
+#### Returns
 Nothing
 
 #### Example
 
-```Arduino
-…
+```arduino
+
 // BLE 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
@@ -3182,10 +3182,10 @@ BLEDescriptor batteryLevelDescriptor("2901", "millis");
 
 
 
-// …
+
 
   batteryLevelChar.addDescriptor(batteryLevelDescriptor);
-…
+
 
 ```
 
@@ -3204,20 +3204,20 @@ bleCharacteristic.descriptorCount()
 
 None
 
-Returns
+#### Returns
 The **number of BLE descriptors** discovered for the characteristic
 
 #### Example
 
-```Arduino
-…
+```arduino
+
  // loop the descriptors of the characteristic and explore each
   for (int i = 0; i < characteristic.descriptorCount(); i++) {
     BLEDescriptor descriptor = characteristic.descriptor(i);
 
     // ...
   }
-…
+
 
 ```
 
@@ -3238,17 +3238,17 @@ bleCharacteristic.hasDescriptor(uuid, index)
 **index**: index of descriptor
 **uuid**: uuid (as a **String**)
 
-Returns
+#### Returns
 **true**, if the characteristic has a matching descriptor, otherwise **false**.
 
 #### Example
 
-```Arduino
-…
+```arduino
+
   if (characteristic.hasDescriptor("2901")) {
     Serial.println("characteristic has description descriptor");
   }
-…
+
 
 ```
 
@@ -3270,17 +3270,17 @@ bleCharacteristic.descriptor(uuid, index)
 **index**: index of descriptor
 **uuid**: uuid (as a **String**)
 
-Returns
+#### Returns
 BLEDescriptor that represents a characteristics BLE descriptor
 
 #### Example
 
-```Arduino
-…
+```arduino
+
   if (characteristic.hasDescriptor("2901")) {
     Serial.println("characteristic has description descriptor");
   }
-…
+
 
 ```
 
@@ -3299,17 +3299,17 @@ bleCharacteristic.canRead()
 
 None
 
-Returns
+#### Returns
 **true**, if characteristic is readable, **false** otherwise
 
 #### Example
 
-```Arduino
-…
+```arduino
+
   if (characteristic.canRead("2901")) {
     Serial.println("characteristic is readable");
   }
-…
+
 
 ```
 
@@ -3328,13 +3328,13 @@ bleCharacteristic.read()
 
 None
 
-Returns
+#### Returns
 **true**, if successful, **false** on failure
 
 #### Example
 
-```Arduino
-…
+```arduino
+
   if (characteristic.read()) {
     Serial.println("characteristic value read");
 
@@ -3342,7 +3342,7 @@ Returns
   } else {
     Serial.println("error reading characteristic value");
   }
-…
+
 
 ```
 
@@ -3361,17 +3361,17 @@ bleCharacteristic.canWrite()
 
 None
 
-Returns
+#### Returns
 **true**, if characteristic is writable, **false** otherwise
 
 #### Example
 
-```Arduino
-…
+```arduino
+
   if (characteristic.canWrite()) {
     Serial.println("characteristic is writable");
   }
-…
+
 
 ```
 
@@ -3390,17 +3390,17 @@ bleCharacteristic.canSubscribe()
 
 None
 
-Returns
+#### Returns
 **true**, if characteristic is subscribable, **false** otherwise
 
 #### Example
 
-```Arduino
-…
+```arduino
+
   if (characteristic.canSubscribe()) {
     Serial.println("characteristic is subscribable");
   }
-…
+
 
 ```
 
@@ -3419,13 +3419,13 @@ bleCharacteristic.subscribe()
 
 None
 
-Returns
+#### Returns
 **true**, on success, **false** on failure
 
 #### Example
 
-```Arduino
-…
+```arduino
+
   // ...
 
   // retrieve the simple key characteristic
@@ -3448,7 +3448,7 @@ Returns
   }
 
   // ...
-…
+
 
 ```
 
@@ -3467,17 +3467,17 @@ bleCharacteristic.canUnsubscribe()
 
 None
 
-Returns
+#### Returns
 **true**, if characteristic is unsubscribable, **false** otherwise
 
 #### Example
 
-```Arduino
-…
+```arduino
+
   if (characteristic.canUnsubscribe()) {
     Serial.println("characteristic is unsubscribable");
   }
-…
+
 
 ```
 
@@ -3496,13 +3496,13 @@ bleCharacteristic.unsubscribe()
 
 None
 
-Returns
+#### Returns
 **true**, on success, **false** on failure
 
 #### Example
 
-```Arduino
-…
+```arduino
+
   // ...
 
   // retrieve the simple key characteristic
@@ -3527,7 +3527,7 @@ Returns
   // ...
 
   simpleKeyCharacteristic.unsubscribe();
-…
+
 
 ```
 
@@ -3546,13 +3546,13 @@ bleCharacteristic.valueUpdated()
 
 None
 
-Returns
+#### Returns
 **true**, if the characteristics value been updated via a notification or indication
 
 #### Example
 
-```Arduino
-…
+```arduino
+
   while (peripheral.connected()) {
     // while the peripheral is connected
 
@@ -3574,7 +3574,7 @@ Returns
       }
     }
   }
-…
+
 
 ```
 
@@ -3601,15 +3601,15 @@ BLEDescriptor(uuid, stringValue)
 **valueSize**: size of byte array value
 **stringValue**: value as a string
 
-Returns
+#### Returns
 New **BLEDescriptor** with the specified **UUID** and value
 
 #### Example
 
-```Arduino
-…
+```arduino
+
 BLEDescriptor millisLabelDescriptor("2901", "millis");
-…
+
 
 ```
 
@@ -3628,20 +3628,20 @@ bleDescriptor.uuid()
 
 None
 
-Returns
+#### Returns
 **UUID** of the BLE descriptor (as a String).
 
 #### Example
 
-```Arduino
-…
+```arduino
+
 BLEDescriptor millisLabelDescriptor("2901", "millis");
 
-// …
+
 Serial.print(“millis label descriptor UUID = “);
 Serial.println(millisLabelDescriptor.uuid());
 
-…
+
 
 ```
 
@@ -3660,20 +3660,20 @@ bleDescriptor.valueSize()
 
 None
 
-Returns
+#### Returns
 **Value size** (in bytes) of the BLE descriptor.
 
 #### Example
 
-```Arduino
-…
+```arduino
+
 BLEDescriptor millisLabelDescriptor("2901", "millis");
 
-// …
+
 Serial.print(“millis label descriptor value size = “);
 Serial.println(millisLabelDescriptor.valueSize());
 
-…
+
 
 ```
 
@@ -3692,13 +3692,13 @@ bleDescriptor.valueLength()
 
 None
 
-Returns
+#### Returns
 **Length of descriptor** value in bytes.
 
 #### Example
 
-```Arduino
-…
+```arduino
+
   // read the descriptor value
   descriptor.read();
 
@@ -3719,7 +3719,7 @@ Returns
       Serial.print(b, HEX);
     }
   }
-…
+
 
 ```
 
@@ -3738,16 +3738,16 @@ bleDescriptor.value()
 
 None
 
-Returns
+#### Returns
 Value byte array of the **BLE descriptor**.
 
 #### Example
 
-```Arduino
-…
+```arduino
+
 BLEDescriptor millisLabelDescriptor("2901", "millis");
 
-// …
+
 
   int descriptorValueSize = millisLabelDescriptor.valueSize();
   byte descriptorValue[descriptorValueSize];
@@ -3756,7 +3756,7 @@ BLEDescriptor millisLabelDescriptor("2901", "millis");
     descriptorValue[i] = millisLabelDescriptor.value()[i];
   }
 
-…
+
 
 ```
 
@@ -3778,19 +3778,19 @@ bleDescriptor.readValue(value)
 **length**: size of buffer argument in bytes
 **value**: variable to read value into (by reference)
 
-Returns
+#### Returns
 **Number of bytes** read
 
 #### Example
 
 
-```Arduino
-…
+```arduino
+
   byte value = 0;
 
   /get the value, descriptor is 1 byte so use byte value    
   descriptor.readValue(value);
-…
+
 
 ```
 
@@ -3809,13 +3809,13 @@ bleDescriptor.read()
 
 None
 
-Returns
+#### Returns
 **true**, if successful, **false** on failure
 
 #### Example
 
-```Arduino
-…
+```arduino
+
   if (descriptor.read()) {
     Serial.println("descriptor value read");
 
@@ -3823,5 +3823,5 @@ Returns
   } else {
     Serial.println("error reading descriptor value");
   }
-…
+
 ```

From 236aeda3009545d9efa540b9b992843449d9a5a6 Mon Sep 17 00:00:00 2001
From: Andrea Richetta <a.richetta@arduino.cc>
Date: Mon, 30 Aug 2021 10:27:39 +0200
Subject: [PATCH 023/112] updated library properties and readme

added mbed_nicla as compatible architecture to avoid warning during compilation.

updated readme adding compatibility with Nicla Sense ME
---
 .gitignore         | 2 ++
 docs/readme.md     | 2 +-
 library.properties | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)
 create mode 100644 .gitignore

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/docs/readme.md b/docs/readme.md
index 86949a50..e9e36fc3 100644
--- a/docs/readme.md
+++ b/docs/readme.md
@@ -1,6 +1,6 @@
 # ArduinoBLE library
 
-This library supports all the Arduino boards that have the hardware enabled for BLE and Bluetooth 4.0 and above; these include Nano 33 BLE, Arduino NANO 33 IoT, Uno WiFi Rev 2, MKR WiFi 1010.
+This library supports all the Arduino boards that have the hardware enabled for BLE and Bluetooth 4.0 and above; these include Nano 33 BLE, Arduino NANO 33 IoT, Uno WiFi Rev 2, MKR WiFi 1010, Nicla Sense ME.
 
 To use this library
 ``#include <ArduinoBLE.h>``
diff --git a/library.properties b/library.properties
index b6d464cc..601474c6 100644
--- a/library.properties
+++ b/library.properties
@@ -2,9 +2,9 @@ name=ArduinoBLE
 version=1.2.1
 author=Arduino
 maintainer=Arduino <info@arduino.cc>
-sentence=Enables BLE connectivity on the Arduino MKR WiFi 1010, Arduino UNO WiFi Rev.2, Arduino Nano 33 IoT, and Arduino Nano 33 BLE.
+sentence=Enables BLE connectivity on the Arduino MKR WiFi 1010, Arduino UNO WiFi Rev.2, Arduino Nano 33 IoT, Arduino Nano 33 BLE and Nicla Sense ME.
 paragraph=This library supports creating a BLE peripheral and BLE central mode.
 category=Communication
 url=https://www.arduino.cc/en/Reference/ArduinoBLE
-architectures=samd,megaavr,mbed,apollo3,mbed_nano,mbed_portenta
+architectures=samd,megaavr,mbed,apollo3,mbed_nano,mbed_portenta,mbed_nicla
 includes=ArduinoBLE.h

From b15524683d8d0f66095e97f2ae1cbdaa08425918 Mon Sep 17 00:00:00 2001
From: Lukas Kvasnica <ikv@vranet.cz>
Date: Wed, 8 Dec 2021 07:56:49 +0100
Subject: [PATCH 024/112] fix of bad indexing in ATTClass::handleNotifyOrInd
 which affected BLE in central mode

---
 src/utility/ATT.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/utility/ATT.cpp b/src/utility/ATT.cpp
index a1028f76..bca006c5 100644
--- a/src/utility/ATT.cpp
+++ b/src/utility/ATT.cpp
@@ -1359,14 +1359,14 @@ void ATTClass::handleNotifyOrInd(uint16_t connectionHandle, uint8_t opcode, uint
     uint16_t handle;
   } *handleNotifyOrInd = (HandleNotifyOrInd*)data;
 
-  uint8_t handle = handleNotifyOrInd->handle;
+  uint16_t handle = handleNotifyOrInd->handle;
 
-  for (int i = 0; i < ATT_MAX_PEERS; i++) {
-    if (_peers[i].connectionHandle != connectionHandle) {
+  for (int peer = 0; peer < ATT_MAX_PEERS; peer++) {
+    if (_peers[peer].connectionHandle != connectionHandle) {
       continue;
     }
 
-    BLERemoteDevice* device = _peers[i].device;
+    BLERemoteDevice* device = _peers[peer].device;
 
     if (!device) {
       break;
@@ -1384,7 +1384,7 @@ void ATTClass::handleNotifyOrInd(uint16_t connectionHandle, uint8_t opcode, uint
           BLERemoteCharacteristic* c = s->characteristic(j);
 
           if (c->valueHandle() == handle) {
-            c->writeValue(BLEDevice(_peers[i].addressType, _peers[i].address), &data[2], dlen - 2);
+            c->writeValue(BLEDevice(_peers[peer].addressType, _peers[peer].address), &data[2], dlen - 2);
           }
         }
 

From c8de77559a95aca5a022e1bde7936a01223afd7b Mon Sep 17 00:00:00 2001
From: Frederic Pillon <frederic.pillon@st.com>
Date: Tue, 14 Dec 2021 13:13:38 +0100
Subject: [PATCH 025/112] Replace boolean with standard bool (#42)

https://github.com/arduino/Arduino/issues/4673

Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
---
 examples/Peripheral/ButtonLED/ButtonLED.ino | 2 +-
 src/BLETypedCharacteristics.h               | 2 +-
 src/utility/ATT.cpp                         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/Peripheral/ButtonLED/ButtonLED.ino b/examples/Peripheral/ButtonLED/ButtonLED.ino
index bd373731..659d466a 100644
--- a/examples/Peripheral/ButtonLED/ButtonLED.ino
+++ b/examples/Peripheral/ButtonLED/ButtonLED.ino
@@ -72,7 +72,7 @@ void loop() {
   char buttonValue = digitalRead(buttonPin);
 
   // has the value changed since the last read
-  boolean buttonChanged = (buttonCharacteristic.value() != buttonValue);
+  bool buttonChanged = (buttonCharacteristic.value() != buttonValue);
 
   if (buttonChanged) {
     // button state changed, update characteristics
diff --git a/src/BLETypedCharacteristics.h b/src/BLETypedCharacteristics.h
index 465fc046..8bd98c78 100644
--- a/src/BLETypedCharacteristics.h
+++ b/src/BLETypedCharacteristics.h
@@ -27,7 +27,7 @@ class BLEBoolCharacteristic : public BLETypedCharacteristic<bool> {
   BLEBoolCharacteristic(const char* uuid, unsigned char properties);
 };
 
-class BLEBooleanCharacteristic : public BLETypedCharacteristic<boolean> {
+class BLEBooleanCharacteristic : public BLETypedCharacteristic<bool> {
 public:
   BLEBooleanCharacteristic(const char* uuid, unsigned char properties);
 };
diff --git a/src/utility/ATT.cpp b/src/utility/ATT.cpp
index bca006c5..5e298081 100644
--- a/src/utility/ATT.cpp
+++ b/src/utility/ATT.cpp
@@ -1143,7 +1143,7 @@ void ATTClass::readByTypeResp(uint16_t connectionHandle, uint8_t dlen, uint8_t d
 
 void ATTClass::writeReqOrCmd(uint16_t connectionHandle, uint16_t mtu, uint8_t op, uint8_t dlen, uint8_t data[])
 {
-  boolean withResponse = (op == ATT_OP_WRITE_REQ);
+  bool withResponse = (op == ATT_OP_WRITE_REQ);
 
   if (dlen < sizeof(uint16_t)) {
     if (withResponse) {

From 14596d4154f5394214bb984fa17953401467bcf6 Mon Sep 17 00:00:00 2001
From: Alexander Entinger <cto@lxrobotics.com>
Date: Tue, 14 Dec 2021 13:15:24 +0100
Subject: [PATCH 026/112] Adding sync-labels workflow for sharing one set of
 labels across all repos. (#212)

---
 .github/workflows/sync-labels.yml | 138 ++++++++++++++++++++++++++++++
 1 file changed, 138 insertions(+)
 create mode 100644 .github/workflows/sync-labels.yml

diff --git a/.github/workflows/sync-labels.yml b/.github/workflows/sync-labels.yml
new file mode 100644
index 00000000..fe53570f
--- /dev/null
+++ b/.github/workflows/sync-labels.yml
@@ -0,0 +1,138 @@
+# Source: https://github.com/arduino/tooling-project-assets/blob/main/workflow-templates/sync-labels.md
+name: Sync Labels
+
+# See: https://docs.github.com/en/actions/reference/events-that-trigger-workflows
+on:
+  push:
+    paths:
+      - ".github/workflows/sync-labels.ya?ml"
+      - ".github/label-configuration-files/*.ya?ml"
+  pull_request:
+    paths:
+      - ".github/workflows/sync-labels.ya?ml"
+      - ".github/label-configuration-files/*.ya?ml"
+  schedule:
+    # Run daily at 8 AM UTC to sync with changes to shared label configurations.
+    - cron: "0 8 * * *"
+  workflow_dispatch:
+  repository_dispatch:
+
+env:
+  CONFIGURATIONS_FOLDER: .github/label-configuration-files
+  CONFIGURATIONS_ARTIFACT: label-configuration-files
+
+jobs:
+  check:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Download JSON schema for labels configuration file
+        id: download-schema
+        uses: carlosperate/download-file-action@v1.0.3
+        with:
+          file-url: https://raw.githubusercontent.com/arduino/tooling-project-assets/main/workflow-templates/assets/sync-labels/arduino-tooling-gh-label-configuration-schema.json
+          location: ${{ runner.temp }}/label-configuration-schema
+
+      - name: Install JSON schema validator
+        run: |
+          sudo npm install \
+            --global \
+            ajv-cli \
+            ajv-formats
+
+      - name: Validate local labels configuration
+        run: |
+          # See: https://github.com/ajv-validator/ajv-cli#readme
+          ajv validate \
+            --all-errors \
+            -c ajv-formats \
+            -s "${{ steps.download-schema.outputs.file-path }}" \
+            -d "${{ env.CONFIGURATIONS_FOLDER }}/*.{yml,yaml}"
+
+  download:
+    needs: check
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        filename:
+          # Filenames of the shared configurations to apply to the repository in addition to the local configuration.
+          # https://github.com/arduino/tooling-project-assets/blob/main/workflow-templates/assets/sync-labels
+          - universal.yml
+
+    steps:
+      - name: Download
+        uses: carlosperate/download-file-action@v1.0.3
+        with:
+          file-url: https://raw.githubusercontent.com/arduino/tooling-project-assets/main/workflow-templates/assets/sync-labels/${{ matrix.filename }}
+
+      - name: Pass configuration files to next job via workflow artifact
+        uses: actions/upload-artifact@v2
+        with:
+          path: |
+            *.yaml
+            *.yml
+          if-no-files-found: error
+          name: ${{ env.CONFIGURATIONS_ARTIFACT }}
+
+  sync:
+    needs: download
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Set environment variables
+        run: |
+          # See: https://docs.github.com/en/actions/reference/workflow-commands-for-github-actions#setting-an-environment-variable
+          echo "MERGED_CONFIGURATION_PATH=${{ runner.temp }}/labels.yml" >> "$GITHUB_ENV"
+
+      - name: Determine whether to dry run
+        id: dry-run
+        if: >
+          github.event_name == 'pull_request' ||
+          (
+            (
+              github.event_name == 'push' ||
+              github.event_name == 'workflow_dispatch'
+            ) &&
+            github.ref != format('refs/heads/{0}', github.event.repository.default_branch)
+          )
+        run: |
+          # Use of this flag in the github-label-sync command will cause it to only check the validity of the
+          # configuration.
+          echo "::set-output name=flag::--dry-run"
+
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Download configuration files artifact
+        uses: actions/download-artifact@v2
+        with:
+          name: ${{ env.CONFIGURATIONS_ARTIFACT }}
+          path: ${{ env.CONFIGURATIONS_FOLDER }}
+
+      - name: Remove unneeded artifact
+        uses: geekyeggo/delete-artifact@v1
+        with:
+          name: ${{ env.CONFIGURATIONS_ARTIFACT }}
+
+      - name: Merge label configuration files
+        run: |
+          # Merge all configuration files
+          shopt -s extglob
+          cat "${{ env.CONFIGURATIONS_FOLDER }}"/*.@(yml|yaml) > "${{ env.MERGED_CONFIGURATION_PATH }}"
+
+      - name: Install github-label-sync
+        run: sudo npm install --global github-label-sync
+
+      - name: Sync labels
+        env:
+          GITHUB_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          # See: https://github.com/Financial-Times/github-label-sync
+          github-label-sync \
+            --labels "${{ env.MERGED_CONFIGURATION_PATH }}" \
+            ${{ steps.dry-run.outputs.flag }} \
+            ${{ github.repository }}

From af4d848a7fbab355f3be1e12f5e45462f0b889ce Mon Sep 17 00:00:00 2001
From: per1234 <accounts@perglass.com>
Date: Mon, 20 Dec 2021 04:57:32 -0800
Subject: [PATCH 027/112] Use major version ref of
 `carlosperate/download-file-action` (#215)

The `carlosperate/download-file-action` action is used in the GitHub Actions workflows as a convenient way to download
external resources.

A major version ref has been added to that repository. It will always point to the latest release of the "1" major
version series. This means it is no longer necessary to do a full pin of the action version in use as before.

Use of the major version ref will cause the workflow to use a stable version of the action, while also benefiting from
ongoing development to the action up until such time as a new major release of an action is made. At that time we would
need to evaluate whether any changes to the workflow are required by the breaking change that triggered the major
release before manually updating the major ref (e.g., uses: `carlosperate/download-file-action@v2`). I think this
approach strikes the right balance between stability and maintainability for these workflows.
---
 .github/workflows/sync-labels.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/sync-labels.yml b/.github/workflows/sync-labels.yml
index fe53570f..3ee6febd 100644
--- a/.github/workflows/sync-labels.yml
+++ b/.github/workflows/sync-labels.yml
@@ -31,7 +31,7 @@ jobs:
 
       - name: Download JSON schema for labels configuration file
         id: download-schema
-        uses: carlosperate/download-file-action@v1.0.3
+        uses: carlosperate/download-file-action@v1
         with:
           file-url: https://raw.githubusercontent.com/arduino/tooling-project-assets/main/workflow-templates/assets/sync-labels/arduino-tooling-gh-label-configuration-schema.json
           location: ${{ runner.temp }}/label-configuration-schema
@@ -65,7 +65,7 @@ jobs:
 
     steps:
       - name: Download
-        uses: carlosperate/download-file-action@v1.0.3
+        uses: carlosperate/download-file-action@v1
         with:
           file-url: https://raw.githubusercontent.com/arduino/tooling-project-assets/main/workflow-templates/assets/sync-labels/${{ matrix.filename }}
 

From 95b24499a0946994ee5fe2eab6eec15c87c6fc76 Mon Sep 17 00:00:00 2001
From: per1234 <accounts@perglass.com>
Date: Mon, 20 Dec 2021 04:59:05 -0800
Subject: [PATCH 028/112] Configure Dependabot to check for outdated actions
 used in workflows (#216)

Dependabot will periodically check the versions of all actions used in the repository's workflows. If any are found to
be outdated, it will submit a pull request to update them.

NOTE: Dependabot's PRs will occasionally propose to pin to the patch version of the action (e.g., updating
`uses: foo/bar@v1` to `uses: foo/bar@v2.3.4`). When the action author has provided a major version ref, use that instead
(e.g., `uses: foo/bar@v2`). Dependabot will automatically close its PR once the workflow has been updated.

More information:
https://docs.github.com/en/github/administering-a-repository/keeping-your-actions-up-to-date-with-dependabot
---
 .github/dependabot.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 .github/dependabot.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 00000000..f2bfa724
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,13 @@
+# See: https://docs.github.com/en/code-security/supply-chain-security/configuration-options-for-dependency-updates#about-the-dependabotyml-file
+version: 2
+
+updates:
+  # Configure check for outdated GitHub Actions actions in workflows.
+  # Source: https://github.com/arduino/tooling-project-assets/blob/main/workflow-templates/assets/dependabot/README.md
+  # See: https://docs.github.com/en/code-security/supply-chain-security/keeping-your-actions-up-to-date-with-dependabot
+  - package-ecosystem: github-actions
+    directory: / # Check the repository's workflows under /.github/workflows/
+    schedule:
+      interval: daily
+    labels:
+      - "topic: infrastructure"

From 8d4d1dcca552f33871181fa18f6558b016ab16a2 Mon Sep 17 00:00:00 2001
From: BBear <13687227078@163.com>
Date: Wed, 22 Dec 2021 13:52:58 +0800
Subject: [PATCH 029/112] fix potential arrary overflow problem of _recvBuffer
 (#214)

* fix potential arrary overflow problem of _recvBuffer

* Update src/utility/HCI.cpp

make the code eaiser to read

Co-authored-by: Alexander Entinger <consulting@lxrobotics.com>

* optimize code of potential overflow _recvBuffer

* add the debug msg when the _recvBuffer overflow

Co-authored-by: Alexander Entinger <consulting@lxrobotics.com>
---
 src/utility/HCI.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/utility/HCI.cpp b/src/utility/HCI.cpp
index 233dd1a5..f158d035 100644
--- a/src/utility/HCI.cpp
+++ b/src/utility/HCI.cpp
@@ -112,6 +112,13 @@ void HCIClass::poll(unsigned long timeout)
 
   while (HCITransport.available()) {
     byte b = HCITransport.read();
+	
+    if (_recvIndex >= sizeof(_recvBuffer)) {
+        _recvIndex = 0;
+        if (_debug) {
+            _debug->println("_recvBuffer overflow");
+        }
+    }
 
     _recvBuffer[_recvIndex++] = b;
 

From ed61a17cbbffafb3dc77cfd0d70ad7da46c5c9cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karl=20S=C3=B6derby?=
 <35461661+karlsoderby@users.noreply.github.com>
Date: Wed, 23 Feb 2022 16:27:14 +0100
Subject: [PATCH 030/112] Bluetooth trademark fix

---
 README.md                                     |   4 +-
 docs/api.md                                   | 279 +++++++++---------
 docs/readme.md                                |  24 +-
 examples/Central/LedControl/LedControl.ino    |   8 +-
 .../PeripheralExplorer/PeripheralExplorer.ino |   6 +-
 examples/Central/Scan/Scan.ino                |   6 +-
 .../Central/ScanCallback/ScanCallback.ino     |   6 +-
 .../SensorTagButton/SensorTagButton.ino       |   6 +-
 .../BatteryMonitor/BatteryMonitor.ino         |  20 +-
 examples/Peripheral/ButtonLED/ButtonLED.ino   |  10 +-
 .../Peripheral/CallbackLED/CallbackLED.ino    |  10 +-
 examples/Peripheral/LED/LED.ino               |  12 +-
 library.properties                            |   4 +-
 13 files changed, 198 insertions(+), 197 deletions(-)

diff --git a/README.md b/README.md
index b2f649ca..9ec934a3 100644
--- a/README.md
+++ b/README.md
@@ -2,9 +2,9 @@
 
 [![Compile Examples Status](https://github.com/arduino-libraries/ArduinoBLE/workflows/Compile%20Examples/badge.svg)](https://github.com/arduino-libraries/ArduinoBLE/actions?workflow=Compile+Examples) [![Spell Check Status](https://github.com/arduino-libraries/ArduinoBLE/workflows/Spell%20Check/badge.svg)](https://github.com/arduino-libraries/ArduinoBLE/actions?workflow=Spell+Check)
 
-Enables BLE connectivity on the Arduino MKR WiFi 1010, Arduino UNO WiFi Rev.2, Arduino Nano 33 IoT, and Arduino Nano 33 BLE.
+Enables Bluetooth® Low Energy connectivity on the Arduino MKR WiFi 1010, Arduino UNO WiFi Rev.2, Arduino Nano 33 IoT, and Arduino Nano 33 BLE.
 
-This library supports creating a BLE peripheral and BLE central mode.
+This library supports creating a Bluetooth® Low Energy peripheral & central mode.
 
 For the Arduino MKR WiFi 1010, Arduino UNO WiFi Rev.2, and Arduino Nano 33 IoT boards, it requires the NINA module to be running [Arduino NINA-W102 firmware](https://github.com/arduino/nina-fw) v1.2.0 or later.
 
diff --git a/docs/api.md b/docs/api.md
index dab294ab..df285806 100644
--- a/docs/api.md
+++ b/docs/api.md
@@ -2,11 +2,11 @@
 
 ## BLE class
 
-Used to enable the BLE module.
+Used to enable the Bluetooth® Low Energy module.
 
 ### `begin()`
 
-Initializes the BLE device.
+Initializes the Bluetooth® Low Energy device.
 
 #### Syntax
 
@@ -28,7 +28,7 @@ None
 
   // begin initialization
   if (!BLE.begin()) {
-    Serial.println("starting BLE failed!");
+    Serial.println("starting Bluetooth® Low Energy module failed!");
 
     while (1);
   }
@@ -38,7 +38,7 @@ None
 
 ### `end()`
 
-Stops the BLE device.
+Stops the Bluetooth® Low Energy device.
 
 #### Syntax
 
@@ -60,7 +60,7 @@ Nothing
 
   // begin initialization
   if (!BLE.begin()) {
-    Serial.println("starting BLE failed!");
+    Serial.println("starting Bluetooth® Low Energy module failed!");
 
     while (1);
   }
@@ -74,12 +74,13 @@ Nothing
 
 ### `poll()`
 
-Poll for BLE radio events and handle them.
+Poll for Bluetooth® Low Energy radio events and handle them.
 
 #### Syntax
 
 ```
-BLE.poll() BLE.poll(timeout)
+BLE.poll() 
+BLE.poll(timeout)
 
 ```
 
@@ -129,7 +130,7 @@ Nothing.
 
   // begin initialization
   if (!BLE.begin()) {
-    Serial.println("starting BLE failed!");
+    Serial.println("starting Bluetooth® Low Energy module failed!");
 
     while (1);
   }
@@ -160,7 +161,7 @@ void blePeripheralDisconnectHandler(BLEDevice central) {
 
 ### `connected()`
 
-Query if another BLE device is connected
+Query if another Bluetooth® Low Energy device is connected
 
 #### Syntax
 
@@ -174,7 +175,7 @@ BLE.connected()
 None
 
 #### Returns
-**true** if another BLE device is connected, otherwise **false**.
+**true** if another Bluetooth® Low Energy device is connected, otherwise **false**.
 
 #### Example
 
@@ -191,7 +192,7 @@ None
 
 ### `disconnect()`
 
-Disconnect any BLE devices that are connected
+Disconnect any Bluetooth® Low Energy devices that are connected
 
 #### Syntax
 
@@ -205,7 +206,7 @@ BLE.disconnect()
 None
 
 #### Returns
-**true** if any BLE device that was previously connected was disconnected, otherwise **false**.
+**true** if any Bluetooth® Low Energy device that was previously connected was disconnected, otherwise **false**.
 
 #### Example
 
@@ -222,7 +223,7 @@ None
 
 ### `address()`
 
-Query the Bluetooth address of the BLE device.
+Query the Bluetooth® address of the Bluetooth® Low Energy device.
 
 #### Syntax
 
@@ -236,7 +237,7 @@ BLE.address()
 None
 
 #### Returns
-The **Bluetooth address** of the BLE device (as a String).
+The **Bluetooth® address** of the Bluetooth® Low Energy device (as a String).
 
 #### Example
 
@@ -252,7 +253,7 @@ The **Bluetooth address** of the BLE device (as a String).
 
 ### `rssi()`
 
-Query the RSSI (Received signal strength indication) of the connected BLE device.
+Query the RSSI (Received signal strength indication) of the connected Bluetooth® Low Energy device.
 
 #### Syntax
 
@@ -266,7 +267,7 @@ BLE.rssi()
 None
 
 #### Returns
-The **RSSI** of the connected BLE device, 127 if no BLE device is connected.
+The **RSSI** of the connected Bluetooth® Low Energy device, 127 if no Bluetooth® Low Energy device is connected.
 
 #### Example
 
@@ -295,7 +296,7 @@ BLE.setAdvertisedServiceUuid(uuid)
 
 #### Parameters
 
-**uuid:** 16-bit or 128-bit BLE UUID in **String** format
+**uuid:** 16-bit or 128-bit Bluetooth® Low Energy UUID in **String** format
 
 #### Returns
 Nothing
@@ -306,7 +307,7 @@ Nothing
 
   // begin initialization
   if (!BLE.begin()) {
-    Serial.println("starting BLE failed!");
+    Serial.println("starting Bluetooth® Low Energy module failed!");
 
     while (1);
   }
@@ -343,13 +344,13 @@ Nothing
 
 ```arduino
 
-BLEService ledService("19B10000-E8F2-537E-4F6C-D104768A1214"); // BLE LED Service
+BLEService ledService("19B10000-E8F2-537E-4F6C-D104768A1214"); // Bluetooth® Low Energy LED Service
 
 // ...
 
   // begin initialization
   if (!BLE.begin()) {
-    Serial.println("starting BLE failed!");
+    Serial.println("starting Bluetooth® Low Energy module failed!");
 
     while (1);
   }
@@ -389,7 +390,7 @@ Nothing
 
  // begin initialization
   if (!BLE.begin()) {
-    Serial.println("starting BLE failed!");
+    Serial.println("starting Bluetooth® Low Energy module failed!");
 
     while (1);
   }
@@ -431,7 +432,7 @@ Nothing
 
  // begin initialization
   if (!BLE.begin()) {
-    Serial.println("starting BLE failed!");
+    Serial.println("starting Bluetooth® Low Energy module failed!");
 
     while (1);
   }
@@ -471,7 +472,7 @@ Nothing
 
  // begin initialization
   if (!BLE.begin()) {
-    Serial.println("starting BLE failed!");
+    Serial.println("starting Bluetooth® Low Energy module failed!");
 
     while (1);
   }
@@ -511,7 +512,7 @@ Nothing
 
  // begin initialization
   if (!BLE.begin()) {
-    Serial.println("starting BLE failed!");
+    Serial.println("starting Bluetooth® Low Energy module failed!");
 
     while (1);
   }
@@ -529,7 +530,7 @@ Nothing
 
 ### `addService()`
 
-Add a BLEService to the set of services the BLE device provides
+Add a BLEService to the set of services the Bluetooth® Low Energy device provides
 
 #### Syntax
 
@@ -549,13 +550,13 @@ Nothing
 
 ```arduino
 
-BLEService ledService("19B10000-E8F2-537E-4F6C-D104768A1214"); // BLE LED Service
+BLEService ledService("19B10000-E8F2-537E-4F6C-D104768A1214"); // Bluetooth® Low Energy LED Service
 
 
 
  // begin initialization
   if (!BLE.begin()) {
-    Serial.println("starting BLE failed!");
+    Serial.println("starting Bluetooth® Low Energy module failed!");
 
     while (1);
   }
@@ -593,7 +594,7 @@ None
 
   // begin initialization
   if (!BLE.begin()) {
-    Serial.println("starting BLE failed!");
+    Serial.println("starting Bluetooth® Low Energy module failed!");
 
     while (1);
   }
@@ -631,7 +632,7 @@ Nothing
 
   // begin initialization
   if (!BLE.begin()) {
-    Serial.println("starting BLE failed!");
+    Serial.println("starting Bluetooth® Low Energy module failed!");
 
     while (1);
   }
@@ -649,7 +650,7 @@ Nothing
 
 ### `central()`
 
-Query the central BLE device connected.
+Query the central Bluetooth® Low Energy device connected.
 
 #### Syntax
 
@@ -669,7 +670,7 @@ None
 
 ```arduino
 
-  // 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:
@@ -708,7 +709,7 @@ Nothing.
 
   // begin initialization
   if (!BLE.begin()) {
-    Serial.println("starting BLE failed!");
+    Serial.println("starting Bluetooth® Low Energy module failed!");
 
     while (1);
   }
@@ -747,7 +748,7 @@ Nothing.
 
   // begin initialization
   if (!BLE.begin()) {
-    Serial.println("starting BLE failed!");
+    Serial.println("starting Bluetooth® Low Energy module failed!");
 
     while (1);
   }
@@ -785,7 +786,7 @@ Nothing.
 
   // begin initialization
   if (!BLE.begin()) {
-    Serial.println("starting BLE failed!");
+    Serial.println("starting Bluetooth® Low Energy module failed!");
 
     while (1);
   }
@@ -800,7 +801,7 @@ Nothing.
 
 ### `scan()`
 
-Start scanning for BLE devices that are advertising.
+Start scanning for Bluetooth® Low Energy devices that are advertising.
 
 #### Syntax
 
@@ -823,7 +824,7 @@ BLE.scan(withDuplicates)
 
   // begin initialization
   if (!BLE.begin()) {
-    Serial.println("starting BLE failed!");
+    Serial.println("starting Bluetooth® Low Energy module failed!");
 
     while (1);
   }
@@ -846,7 +847,7 @@ BLE.scan(withDuplicates)
 
 ### `scanForName()`
 
-Start scanning for BLE devices that are advertising with a particular (local) name.
+Start scanning for Bluetooth® Low Energy devices that are advertising with a particular (local) name.
 
 #### Syntax
 
@@ -870,7 +871,7 @@ BLE.scanForName(name, withDuplicates)
 
   // begin initialization
   if (!BLE.begin()) {
-    Serial.println("starting BLE failed!");
+    Serial.println("starting Bluetooth® Low Energy module failed!");
 
     while (1);
   }
@@ -893,7 +894,7 @@ BLE.scanForName(name, withDuplicates)
 
 ### `scanForAddress()`
 
-Start scanning for BLE devices that are advertising with a particular (Bluetooth) address.
+Start scanning for Bluetooth® Low Energy devices that are advertising with a particular (Bluetooth®) address.
 
 #### Syntax
 
@@ -905,7 +906,7 @@ BLE.scanForAddress(address, withDuplicates)
 
 #### Parameters
 
-**address:** (Bluetooth) address (as a String) to filter for
+**address:** (Bluetooth®) address (as a String) to filter for
 **withDuplicates:** optional, defaults to **false**. If **true**, advertisements received more than once will not be filtered
 
 #### Returns
@@ -917,7 +918,7 @@ BLE.scanForAddress(address, withDuplicates)
 
   // begin initialization
   if (!BLE.begin()) {
-    Serial.println("starting BLE failed!");
+    Serial.println("starting Bluetooth® Low Energy module failed!");
 
     while (1);
   }
@@ -940,7 +941,7 @@ BLE.scanForAddress(address, withDuplicates)
 
 ### `scanForUuid()`
 
-Start scanning for BLE devices that are advertising with a particular (service) UUID.
+Start scanning for Bluetooth® Low Energy devices that are advertising with a particular (service) UUID.
 
 #### Syntax
 
@@ -964,7 +965,7 @@ BLE.scanForUuid(uuid, withDuplicates)
 
   // begin initialization
   if (!BLE.begin()) {
-    Serial.println("starting BLE failed!");
+    Serial.println("starting Bluetooth® Low Energy module failed!");
 
     while (1);
   }
@@ -987,7 +988,7 @@ BLE.scanForUuid(uuid, withDuplicates)
 
 ### `stopScan()`
 
-Stop scanning for BLE devices that are advertising.
+Stop scanning for Bluetooth® Low Energy devices that are advertising.
 
 #### Syntax
 
@@ -1009,7 +1010,7 @@ Nothing
 
   // begin initialization
   if (!BLE.begin()) {
-    Serial.println("starting BLE failed!");
+    Serial.println("starting Bluetooth® Low Energy module failed!");
 
     while (1);
   }
@@ -1027,7 +1028,7 @@ Nothing
 
 ### `available()`
 
-Query for a discovered BLE device that was found during scanning.
+Query for a discovered Bluetooth® Low Energy device that was found during scanning.
 
 #### Syntax
 
@@ -1049,7 +1050,7 @@ Nothing
 
   // begin initialization
   if (!BLE.begin()) {
-    Serial.println("starting BLE failed!");
+    Serial.println("starting Bluetooth® Low Energy module failed!");
 
     while (1);
   }
@@ -1076,7 +1077,7 @@ Used to get information about the devices connected or discovered while scanning
 
 ### `poll()`
 
-Poll for BLE radio events for the specified BLE device and handle them.
+Poll for Bluetooth® Low Energy radio events for the specified Bluetooth® Low Energy device and handle them.
 
 #### Syntax
 
@@ -1097,7 +1098,7 @@ Nothing
 
 ```arduino
 
-  // listen for BLE centrals to connect:
+  // listen for Bluetooth® Low Energy centrals to connect:
   BLEDevice central = BLE.central();
 
   // if a central is connected to peripheral:
@@ -1114,7 +1115,7 @@ Nothing
 
 ### `connected()`
 
-Query if a BLE device is connected
+Query if a Bluetooth® Low Energy device is connected
 
 #### Syntax
 
@@ -1128,13 +1129,13 @@ bleDevice.connected()
 None
 
 #### Returns
-**true** if the BLE device is connected, otherwise **false**.
+**true** if the Bluetooth® Low Energy device is connected, otherwise **false**.
 
 #### Example
 
 ```arduino
 
-  // listen for BLE centrals to connect:
+  // listen for Bluetooth® Low Energy centrals to connect:
   BLEDevice central = BLE.central();
 
     // while the central is still connected
@@ -1148,7 +1149,7 @@ None
 
 ### `disconnect()`
 
-Disconnect the BLE device, if connected
+Disconnect the Bluetooth® Low Energy device, if connected
 
 #### Syntax
 
@@ -1162,13 +1163,13 @@ bleDevice.disconnect()
 None
 
 #### Returns
-**true** if the BLE device was disconnected, otherwise **false**.
+**true** if the Bluetooth® Low Energy device was disconnected, otherwise **false**.
 
 #### Example
 
 ```arduino
 
- // listen for BLE centrals to connect:
+ // listen for Bluetooth® Low Energy centrals to connect:
   BLEDevice central = BLE.central();
 
   
@@ -1180,7 +1181,7 @@ None
 
 ### `address()`
 
-Query the Bluetooth address of the BLE device.
+Query the Bluetooth® address of the Bluetooth® Low Energy device.
 
 #### Syntax
 
@@ -1194,13 +1195,13 @@ bleDevice.address()
 None
 
 #### Returns
-The **Bluetooth address** of the BLE device (as a String).
+The **Bluetooth® address** of the Bluetooth® Low Energy device (as a String).
 
 #### Example
 
 ```arduino
 
-  // 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:
@@ -1217,7 +1218,7 @@ The **Bluetooth address** of the BLE device (as a String).
 
 ### `rssi()`
 
-Query the RSSI (Received signal strength indication) of the BLE device.
+Query the RSSI (Received signal strength indication) of the Bluetooth® Low Energy device.
 
 #### Syntax
 
@@ -1231,7 +1232,7 @@ bleDevice.rssi()
 None
 
 #### Returns
-The **RSSI** of the connected BLE device, 127 if the BLE device is not connected.
+The **RSSI** of the connected Bluetooth® Low Energy device, 127 if the Bluetooth® Low Energy device is not connected.
 
 #### Example
 
@@ -1249,7 +1250,7 @@ The **RSSI** of the connected BLE device, 127 if the BLE device is not connected
 
 ### `characteristic()`
 
-Get a BLECharacteristic representing a BLE characteristic the device provides.
+Get a BLECharacteristic representing a Bluetooth® Low Energy characteristic the device provides.
 
 #### Syntax
 
@@ -1274,7 +1275,7 @@ bleDevice.characteristic(uuid, index)
 
   // begin initialization
   if (!BLE.begin()) {
-    Serial.println("starting BLE failed!");
+    Serial.println("starting Bluetooth® Low Energy module failed!");
 
     while (1);
   }
@@ -1326,7 +1327,7 @@ bleDevice.characteristic(uuid, index)
 
 ### `discoverAttributes()`
 
-Discover all of the attributes of BLE device.
+Discover all of the attributes of Bluetooth® Low Energy device.
 
 #### Syntax
 
@@ -1348,7 +1349,7 @@ None
 
   // begin initialization
   if (!BLE.begin()) {
-    Serial.println("starting BLE failed!");
+    Serial.println("starting Bluetooth® Low Energy module failed!");
 
     while (1);
   }
@@ -1392,7 +1393,7 @@ None
 
 ### `discoverService()`
 
-Discover the attributes of a particular service on the BLE device.
+Discover the attributes of a particular service on the Bluetooth® Low Energy device.
 
 #### Syntax
 
@@ -1414,7 +1415,7 @@ bleDevice.discoverService(serviceUuid)
 
   // begin initialization
   if (!BLE.begin()) {
-    Serial.println("starting BLE failed!");
+    Serial.println("starting Bluetooth® Low Energy module failed!");
 
     while (1);
   }
@@ -1458,7 +1459,7 @@ bleDevice.discoverService(serviceUuid)
 
 ### `deviceName()`
 
-Query the device name (BLE characteristic UUID 0x2a00) of a BLE device.
+Query the device name (BLE characteristic UUID 0x2a00) of a Bluetooth® Low Energy device.
 
 #### Syntax
 
@@ -1480,7 +1481,7 @@ None
 
   // begin initialization
   if (!BLE.begin()) {
-    Serial.println("starting BLE failed!");
+    Serial.println("starting Bluetooth® Low Energy module failed!");
 
     while (1);
   }
@@ -1532,7 +1533,7 @@ None
 
 ### `appearance()`
 
-Query the appearance (BLE characteristic UUID 0x2a01) of a BLE device.
+Query the appearance (BLE characteristic UUID 0x2a01) of a Bluetooth® Low Energy device.
 
 #### Syntax
 
@@ -1554,7 +1555,7 @@ None
 
   // begin initialization
   if (!BLE.begin()) {
-    Serial.println("starting BLE failed!");
+    Serial.println("starting Bluetooth® Low Energy module failed!");
 
     while (1);
   }
@@ -1606,7 +1607,7 @@ None
 
 ### `serviceCount()`
 
-Query the number of services discovered for the BLE device.
+Query the number of services discovered for the Bluetooth® Low Energy device.
 
 #### Syntax
 
@@ -1620,7 +1621,7 @@ bleDevice.serviceCount()
 None
 
 #### Returns
-The number of **services discovered** for the BLE device.
+The number of **services discovered** for the Bluetooth® Low Energy device.
 
 #### Example
 
@@ -1628,7 +1629,7 @@ The number of **services discovered** for the BLE device.
 
   // begin initialization
   if (!BLE.begin()) {
-    Serial.println("starting BLE failed!");
+    Serial.println("starting Bluetooth® Low Energy module failed!");
 
     while (1);
   }
@@ -1677,7 +1678,7 @@ The number of **services discovered** for the BLE device.
 
 ### `hasService()`
 
-Query if the BLE device has a particular service.
+Query if the Bluetooth® Low Energy device has a particular service.
 
 #### Syntax
 
@@ -1701,7 +1702,7 @@ bleDevice.hasService(uuid, index)
 
   // begin initialization
   if (!BLE.begin()) {
-    Serial.println("starting BLE failed!");
+    Serial.println("starting Bluetooth® Low Energy module failed!");
 
     while (1);
   }
@@ -1749,7 +1750,7 @@ bleDevice.hasService(uuid, index)
 
 ### `service()`
 
-Get a BLEService representing a BLE service the device provides.
+Get a BLEService representing a Bluetooth® Low Energy service the device provides.
 
 #### Syntax
 
@@ -1774,7 +1775,7 @@ bleDevice.service(uuid, index)
 
   // begin initialization
   if (!BLE.begin()) {
-    Serial.println("starting BLE failed!");
+    Serial.println("starting Bluetooth® Low Energy module failed!");
 
     while (1);
   }
@@ -1826,7 +1827,7 @@ bleDevice.service(uuid, index)
 
 ### `characteristicCount()`
 
-Query the number of characteristics discovered for the BLE device.
+Query the number of characteristics discovered for the Bluetooth® Low Energy device.
 
 #### Syntax
 
@@ -1840,7 +1841,7 @@ bleDevice.characteristicCount()
 None
 
 #### Returns
-The **number of characteristics** discovered for the BLE device.
+The **number of characteristics** discovered for the Bluetooth® Low Energy device.
 
 #### Example
 
@@ -1848,7 +1849,7 @@ The **number of characteristics** discovered for the BLE device.
 
   // begin initialization
   if (!BLE.begin()) {
-    Serial.println("starting BLE failed!");
+    Serial.println("starting Bluetooth® Low Energy module failed!");
 
     while (1);
   }
@@ -1897,7 +1898,7 @@ The **number of characteristics** discovered for the BLE device.
 
 ### `hasCharacteristic()`
 
-Query if the BLE device has a particular characteristic.
+Query if the Bluetooth® Low Energy device has a particular characteristic.
 
 #### Syntax
 
@@ -1921,7 +1922,7 @@ bleDevice.hasCharacteristic(uuid, index)
 
   // begin initialization
   if (!BLE.begin()) {
-    Serial.println("starting BLE failed!");
+    Serial.println("starting Bluetooth® Low Energy module failed!");
 
     while (1);
   }
@@ -1969,7 +1970,7 @@ bleDevice.hasCharacteristic(uuid, index)
 
 ### `hasLocalName()`
 
-Query if a discovered BLE device is advertising a local name.
+Query if a discovered Bluetooth® Low Energy device is advertising a local name.
 
 #### Syntax
 
@@ -1991,7 +1992,7 @@ Nothing
 
   // begin initialization
   if (!BLE.begin()) {
-    Serial.println("starting BLE failed!");
+    Serial.println("starting Bluetooth® Low Energy module failed!");
 
     while (1);
   }
@@ -2022,7 +2023,7 @@ Nothing
 
 ### `hasAdvertisedServiceUuid()`
 
-Query if a discovered BLE device is advertising a service UUID.
+Query if a discovered Bluetooth® Low Energy device is advertising a service UUID.
 
 #### Syntax
 
@@ -2045,7 +2046,7 @@ bleDevice.hasAdvertisedServiceUuid(index)
 
   // begin initialization
   if (!BLE.begin()) {
-    Serial.println("starting BLE failed!");
+    Serial.println("starting Bluetooth® Low Energy module failed!");
 
     while (1);
   }
@@ -2080,7 +2081,7 @@ bleDevice.hasAdvertisedServiceUuid(index)
 
 ### `advertisedServiceUuidCount()`
 
-Query the number of advertised services a discovered BLE device is advertising.
+Query the number of advertised services a discovered Bluetooth® Low Energy device is advertising.
 
 #### Syntax
 
@@ -2094,7 +2095,7 @@ bleDevice.advertisedServiceUuidCount()
 None
 
 #### Returns
-The **number of advertised services** a discovered BLE device is advertising.
+The **number of advertised services** a discovered Bluetooth® Low Energy device is advertising.
 
 #### Example
 
@@ -2102,7 +2103,7 @@ The **number of advertised services** a discovered BLE device is advertising.
 
   // begin initialization
   if (!BLE.begin()) {
-    Serial.println("starting BLE failed!");
+    Serial.println("starting Bluetooth® Low Energy module failed!");
 
     while (1);
   }
@@ -2137,7 +2138,7 @@ The **number of advertised services** a discovered BLE device is advertising.
 
 ### `localName()`
 
-Query the local name a discovered BLE device is advertising with.
+Query the local name a discovered Bluetooth® Low Energy device is advertising with.
 
 #### Syntax
 
@@ -2159,7 +2160,7 @@ Nothing
 
   // begin initialization
   if (!BLE.begin()) {
-    Serial.println("starting BLE failed!");
+    Serial.println("starting Bluetooth® Low Energy module failed!");
 
     while (1);
   }
@@ -2190,7 +2191,7 @@ Nothing
 
 ### `advertisedServiceUuid()`
 
-Query an advertised service UUID discovered BLE device is advertising.
+Query an advertised service UUID discovered Bluetooth® Low Energy device is advertising.
 
 #### Syntax
 
@@ -2213,7 +2214,7 @@ Advertised service **UUID** (as a String).
 
   // begin initialization
   if (!BLE.begin()) {
-    Serial.println("starting BLE failed!");
+    Serial.println("starting Bluetooth® Low Energy module failed!");
 
     while (1);
   }
@@ -2248,7 +2249,7 @@ Advertised service **UUID** (as a String).
 
 ### `connect()`
 
-Connect to a BLE device.
+Connect to a Bluetooth® Low Energy device.
 
 #### Syntax
 
@@ -2270,7 +2271,7 @@ None
 
   // begin initialization
   if (!BLE.begin()) {
-    Serial.println("starting BLE failed!");
+    Serial.println("starting Bluetooth® Low Energy module failed!");
 
     while (1);
   }
@@ -2308,7 +2309,7 @@ Used to enable the services board provides or interact with services a remote bo
 
 ### `BLEService()`
 
-Create a new BLE service.
+Create a new Bluetooth® Low Energy service.
 
 #### Syntax
 
@@ -2328,7 +2329,7 @@ New **BLEService** with the specified **UUID**
 
 ```arduino
 
-BLEService ledService("19B10000-E8F2-537E-4F6C-D104768A1214"); // BLE LED Service
+BLEService ledService("19B10000-E8F2-537E-4F6C-D104768A1214"); // Bluetooth® Low Energy LED Service
 
 
 ```
@@ -2349,13 +2350,13 @@ bleService.uuid()
 None
 
 #### Returns
-UUID of the BLE service as a **String**.
+UUID of the Bluetooth® Low Energy service as a **String**.
 
 #### Example
 
 ```arduino
 
-BLEService ledService("19B10000-E8F2-537E-4F6C-D104768A1214"); // BLE LED Service
+BLEService ledService("19B10000-E8F2-537E-4F6C-D104768A1214"); // Bluetooth® Low Energy LED Service
 
 
 Serial.print(“LED service UUID = “);
@@ -2367,7 +2368,7 @@ Serial.println(ledService.uuid());
 
 ### `addCharacteristic()`
 
-Add a BLECharateristic to the BLE service.
+Add a BLECharateristic to the Bluetooth® Low Energy service.
 
 #### Syntax
 
@@ -2387,9 +2388,9 @@ Nothing
 
 ```arduino
 
-BLEService ledService("19B10000-E8F2-537E-4F6C-D104768A1214"); // BLE LED Service
+BLEService ledService("19B10000-E8F2-537E-4F6C-D104768A1214"); // Bluetooth® Low Energy LED Service
 
-// BLE LED Switch Characteristic - custom 128-bit UUID, readable and writable by central
+// Bluetooth® Low Energy LED Switch Characteristic - custom 128-bit UUID, readable and writable by central
 BLECharacteristic switchCharacteristic("19B10001-E8F2-537E-4F6C-D104768A1214", BLERead | BLEWrite, 1);
 
 
@@ -2404,7 +2405,7 @@ ledService.addCharacteristic(switchCharacteristic);
 
 ### `characteristicCount()`
 
-Query the number of characteristics discovered for the BLE service.
+Query the number of characteristics discovered for the Bluetooth® Low Energy service.
 
 #### Syntax
 
@@ -2418,7 +2419,7 @@ bleService.characteristicCount()
 None
 
 #### Returns
-The **number of characteristics** discovered for the BLE service.
+The **number of characteristics** discovered for the Bluetooth® Low Energy service.
 
 #### Example
 
@@ -2426,7 +2427,7 @@ The **number of characteristics** discovered for the BLE service.
 
   // begin initialization
   if (!BLE.begin()) {
-    Serial.println("starting BLE failed!");
+    Serial.println("starting Bluetooth® Low Energy module failed!");
 
     while (1);
   }
@@ -2482,7 +2483,7 @@ The **number of characteristics** discovered for the BLE service.
 
 ### `hasCharacteristic()`
 
-Query if the BLE service has a particular characteristic.
+Query if the Bluetooth® Low Energy service has a particular characteristic.
 
 #### Syntax
 
@@ -2506,7 +2507,7 @@ bleService.hasCharacteristic(uuid, index)
 
   // begin initialization
   if (!BLE.begin()) {
-    Serial.println("starting BLE failed!");
+    Serial.println("starting Bluetooth® Low Energy module failed!");
 
     while (1);
   }
@@ -2560,7 +2561,7 @@ bleService.hasCharacteristic(uuid, index)
 
 ### `characteristic()`
 
-Get a BLECharacteristic representing a BLE characteristic the service provides.
+Get a BLECharacteristic representing a Bluetooth® Low Energy characteristic the service provides.
 
 #### Syntax
 
@@ -2585,7 +2586,7 @@ bleService.characteristic(uuid, index)
 
   // begin initialization
   if (!BLE.begin()) {
-    Serial.println("starting BLE failed!");
+    Serial.println("starting Bluetooth® Low Energy module failed!");
 
     while (1);
   }
@@ -2648,7 +2649,7 @@ Used to enable the characteristics board offers in a service or interact with ch
 
 ### `BLECharacteristic()`
 
-Create a new BLE characteristic.
+Create a new Bluetooth® Low Energy characteristic.
 
 #### Syntax
 
@@ -2686,7 +2687,7 @@ New **BLECharacteristic** with the specified **UUID** and value
 
 ```arduino
 
-// BLE Battery Level Characteristic
+// 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
 
@@ -2710,13 +2711,13 @@ bleCharacteristic.uuid()
 None
 
 #### Returns
-**UUID** of the BLE service as a **String**.
+**UUID** of the Bluetooth® Low Energy service as a **String**.
 
 #### Example
 
 ```arduino
 
-// BLE LED Switch Characteristic - custom 128-bit UUID, read and writable by central
+// Bluetooth® Low Energy LED Switch Characteristic - custom 128-bit UUID, read and writable by central
 BLEByteCharacteristic switchCharacteristic("19B10001-E8F2-537E-4F6C-D104768A1214", BLERead | BLEWrite);
 
 
@@ -2749,7 +2750,7 @@ None
 
 ```arduino
 
-// BLE LED Switch Characteristic - custom 128-bit UUID, read and writable by central
+// Bluetooth® Low Energy LED Switch Characteristic - custom 128-bit UUID, read and writable by central
 BLEByteCharacteristic switchCharacteristic("19B10001-E8F2-537E-4F6C-D104768A1214", BLERead | BLEWrite);
 
 
@@ -2788,7 +2789,7 @@ The **maximum value** size of the characteristic (in bytes)
 
 ```arduino
 
-// BLE LED Switch Characteristic - custom 128-bit UUID, read and writable by central
+// Bluetooth® Low Energy LED Switch Characteristic - custom 128-bit UUID, read and writable by central
 BLEByteCharacteristic switchCharacteristic("19B10001-E8F2-537E-4F6C-D104768A1214", BLERead | BLEWrite);
 
 
@@ -2821,7 +2822,7 @@ The **current value** of the characteristic, value type depends on the construct
 
 ```arduino
 
-// BLE LED Switch Characteristic - custom 128-bit UUID, read and writable by central
+// Bluetooth® Low Energy LED Switch Characteristic - custom 128-bit UUID, read and writable by central
 BLEByteCharacteristic switchCharacteristic("19B10001-E8F2-537E-4F6C-D104768A1214", BLERead | BLEWrite);
 
 
@@ -2860,7 +2861,7 @@ The **current value** size of the characteristic (in bytes)
 
 ```arduino
 
-// BLE LED Switch Characteristic - custom 128-bit UUID, read and writable by central
+// Bluetooth® Low Energy LED Switch Characteristic - custom 128-bit UUID, read and writable by central
 BLEByteCharacteristic switchCharacteristic("19B10001-E8F2-537E-4F6C-D104768A1214", BLERead | BLEWrite);
 
 
@@ -3054,7 +3055,7 @@ buttonCharacteristic.broadcast();
 
 ### `written()`
 
-Query if the characteristic value has been written by another BLE device.
+Query if the characteristic value has been written by another Bluetooth® Low Energy device.
 
 #### Syntax
 
@@ -3068,19 +3069,19 @@ bleCharacteristic.written()
 None
 
 #### Returns
-**true** if the characteristic value has been written by another BLE device, **false** otherwise
+**true** if the characteristic value has been written by another Bluetooth® Low Energy device, **false** otherwise
 
 #### Example
 
 ```arduino
 
-// BLE LED Switch Characteristic - custom 128-bit UUID, read and writable by central
+// Bluetooth® Low Energy LED Switch Characteristic - custom 128-bit UUID, read and writable by central
 BLEByteCharacteristic switchCharacteristic("19B10001-E8F2-537E-4F6C-D104768A1214", BLERead | BLEWrite);
 
 
 
 
- // 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:
@@ -3116,7 +3117,7 @@ BLEByteCharacteristic switchCharacteristic("19B10001-E8F2-537E-4F6C-D104768A1214
 
 ### `subscribed()`
 
-Query if the characteristic has been subscribed to by another BLE device.
+Query if the characteristic has been subscribed to by another Bluetooth® Low Energy device.
 
 #### Syntax
 
@@ -3130,13 +3131,13 @@ bleCharacteristic.subscribed()
 None
 
 #### Returns
-**true** if the characteristic value has been subscribed to by another BLE device, **false** otherwise
+**true** if the characteristic value has been subscribed to by another Bluetooth® Low Energy device, **false** otherwise
 
 #### Example
 
 ```arduino
 
-// BLE Battery Level Characteristic
+// 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
 
@@ -3145,7 +3146,7 @@ BLEUnsignedCharCharacteristic batteryLevelChar("2A19",  // standard 16-bit chara
 
 
   if (batteryLevelChar.subscribed()) {
-     // set a new value , that well be pushed to subscribed BLE devices
+     // set a new value , that well be pushed to subscribed Bluetooth® Low Energy devices
     batteryLevelChar.writeValue(0xab);
   }
 
@@ -3174,7 +3175,7 @@ Nothing
 
 ```arduino
 
-// BLE Battery Level Characteristic
+// 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
 
@@ -3191,7 +3192,7 @@ BLEDescriptor batteryLevelDescriptor("2901", "millis");
 
 ### `descriptorCount`
 
-Query the number of BLE descriptors discovered for the characteristic.
+Query the number of Bluetooth® Low Energy descriptors discovered for the characteristic.
 
 #### Syntax
 
@@ -3205,7 +3206,7 @@ bleCharacteristic.descriptorCount()
 None
 
 #### Returns
-The **number of BLE descriptors** discovered for the characteristic
+The **number of Bluetooth® Low Energy descriptors** discovered for the characteristic
 
 #### Example
 
@@ -3254,7 +3255,7 @@ bleCharacteristic.hasDescriptor(uuid, index)
 
 ### `descriptor()`
 
-Get a BLEDescriptor that represents a characteristics BLE descriptor.
+Get a BLEDescriptor that represents a characteristics Bluetooth® Low Energy descriptor.
 
 #### Syntax
 
@@ -3271,7 +3272,7 @@ bleCharacteristic.descriptor(uuid, index)
 **uuid**: uuid (as a **String**)
 
 #### Returns
-BLEDescriptor that represents a characteristics BLE descriptor
+BLEDescriptor that represents a characteristics Bluetooth® Low Energy descriptor
 
 #### Example
 
@@ -3286,7 +3287,7 @@ BLEDescriptor that represents a characteristics BLE descriptor
 
 ### `canRead()`
 
-Query if a BLE characteristic is readable.
+Query if a Bluetooth® Low Energy characteristic is readable.
 
 #### Syntax
 
@@ -3348,7 +3349,7 @@ None
 
 ### `canWrite()`
 
-Query if a BLE characteristic is writable.
+Query if a Bluetooth® Low Energy characteristic is writable.
 
 #### Syntax
 
@@ -3377,7 +3378,7 @@ None
 
 ### `canSubscribe()`
 
-Query if a BLE characteristic is subscribable.
+Query if a Bluetooth® Low Energy characteristic is subscribable.
 
 #### Syntax
 
@@ -3406,7 +3407,7 @@ None
 
 ### `subscribe()`
 
-Subscribe to a BLE characteristics notification or indications.
+Subscribe to a Bluetooth® Low Energy characteristics notification or indications.
 
 #### Syntax
 
@@ -3454,7 +3455,7 @@ None
 
 ### `canUnsubscribe()`
 
-Query if a BLE characteristic is unsubscribable.
+Query if a Bluetooth® Low Energy characteristic is unsubscribable.
 
 #### Syntax
 
@@ -3483,7 +3484,7 @@ None
 
 ### `unsubscribe()`
 
-Unsubscribe to a BLE characteristics notifications or indications.
+Unsubscribe to a Bluetooth® Low Energy characteristics notifications or indications.
 
 #### Syntax
 
@@ -3584,7 +3585,7 @@ Used to describe a characteristic the board offers
 
 ### `BLEDescriptor()`
 
-Create a new BLE descriptor.
+Create a new Bluetooth® Low Energy descriptor.
 
 #### Syntax
 
@@ -3629,7 +3630,7 @@ bleDescriptor.uuid()
 None
 
 #### Returns
-**UUID** of the BLE descriptor (as a String).
+**UUID** of the Bluetooth® Low Energy descriptor (as a String).
 
 #### Example
 
@@ -3661,7 +3662,7 @@ bleDescriptor.valueSize()
 None
 
 #### Returns
-**Value size** (in bytes) of the BLE descriptor.
+**Value size** (in bytes) of the Bluetooth® Low Energy descriptor.
 
 #### Example
 
diff --git a/docs/readme.md b/docs/readme.md
index e9e36fc3..bfd1496b 100644
--- a/docs/readme.md
+++ b/docs/readme.md
@@ -1,27 +1,27 @@
 # ArduinoBLE library
 
-This library supports all the Arduino boards that have the hardware enabled for BLE and Bluetooth 4.0 and above; these include Nano 33 BLE, Arduino NANO 33 IoT, Uno WiFi Rev 2, MKR WiFi 1010, Nicla Sense ME.
+This library supports all the Arduino boards that have the hardware enabled for Bluetooth® Low Energy and Bluetooth® 4.0 and above; these include Nano 33 BLE, Arduino NANO 33 IoT, Uno WiFi Rev 2, MKR WiFi 1010, Nicla Sense ME.
 
 To use this library
 ``#include <ArduinoBLE.h>``
 
 ## A quick introduction to BLE
 
-Bluetooth 4.0 includes both traditional Bluetooth, now labeled "Bluetooth Classic", and the Bluetooth Low Energy (Bluetooth LE, or BLE). BLE is optimized for low power use at low data rates, and was designed to operate from simple lithium coin cell batteries.
+Bluetooth® 4.0 includes both traditional Bluetooth®, now labeled "Bluetooth® Classic", and the Bluetooth® Low Energy. Bluetooth® Low Energy is optimized for low power use at low data rates, and was designed to operate from simple lithium coin cell batteries.
 
-Unlike standard bluetooth communication basically based on an asynchronous serial connection (UART) a Bluetooth LE radio acts like a community bulletin board. The computers that connect to it are like community members that read the bulletin board. Each radio acts as either the bulletin board or the reader. If your radio is a bulletin board (called a peripheral device in Bluetooth LE parlance) it posts data for all radios in the community to read. If your radio is a reader (called a central device in Blueooth LE terms) it reads from any of the bulletin boards (peripheral devices) that have information about which it cares. You can also think of peripheral devices as the servers in a client-server transaction, because they contain the information that reader radios ask for. Similarly, central devices are the clients of the Bluetooth LE world because they read information available from the peripherals.
+Unlike standard Bluetooth® communication basically based on an asynchronous serial connection (UART) a Bluetooth® LE radio acts like a community bulletin board. The computers that connect to it are like community members that read the bulletin board. Each radio acts as either the bulletin board or the reader. If your radio is a bulletin board (called a peripheral device in Bluetooth® LE parlance) it posts data for all radios in the community to read. If your radio is a reader (called a central device in Blueooth LE terms) it reads from any of the bulletin boards (peripheral devices) that have information about which it cares. You can also think of peripheral devices as the servers in a client-server transaction, because they contain the information that reader radios ask for. Similarly, central devices are the clients of the Bluetooth® LE world because they read information available from the peripherals.
 
 ![Communication between central and peripheral devices](www.arduino.cc/en/uploads/Reference/ble-bulletin-board-model.png)
 
-Think of a Bluetooth LE peripheral device as a bulletin board and central devices as viewers of the board. Central devices view the services, get the data, then move on. Each transaction is quick (a few milliseconds), so multiple central devices can get data from one peripheral.
+Think of a Bluetooth® LE peripheral device as a bulletin board and central devices as viewers of the board. Central devices view the services, get the data, then move on. Each transaction is quick (a few milliseconds), so multiple central devices can get data from one peripheral.
 
 The information presented by a peripheral is structured as **services**, each of which is subdivided into **characteristics**. You can think of services as the notices on a bulletin board, and characteristics as the individual paragraphs of those notices. If you're a peripheral device, you just update each service characteristic when it needs updating and don't worry about whether the central devices read them or not. If you're a central device, you connect to the peripheral then read the boxes you want. If a given characteristic is readable and writable, then the peripheral and central can both change it.
 
 ## Notify
 
-The Bluetooth LE specification includes a mechanism known as **notify** that lets you know when data's changed. When notify on a characteristic is enabled and the sender writes to it, the new value is automatically sent to the receiver, without the receiver explicitly issuing a read command. This is commonly used for streaming data such as accelerometer or other sensor readings. There's a variation on this specification called **indicate** which works similarly, but in the indicate specification, the reader sends an acknowledgement of the pushed data.
+The Bluetooth® LE specification includes a mechanism known as **notify** that lets you know when data's changed. When notify on a characteristic is enabled and the sender writes to it, the new value is automatically sent to the receiver, without the receiver explicitly issuing a read command. This is commonly used for streaming data such as accelerometer or other sensor readings. There's a variation on this specification called **indicate** which works similarly, but in the indicate specification, the reader sends an acknowledgement of the pushed data.
 
-The client-server structure of Bluetooth LE, combined with the notify characteristic, is generally called a **publish-and-subscribe model**.
+The client-server structure of Bluetooth® LE, combined with the notify characteristic, is generally called a **publish-and-subscribe model**.
 
 ## Update a characteristic
 
@@ -35,7 +35,7 @@ Just as with writing to a characteristic, you could update your characteristics
 
 ## Services, characteristics, and UUIDs
 
-A BLE peripheral will provide **services**, which in turn provide **characteristics**. You can define your own services, or use [standard services](https://developer.bluetooth.org/gatt/services/Pages/ServicesHome.aspx).
+A Bluetooth® Low Energy peripheral will provide **services**, which in turn provide **characteristics**. You can define your own services, or use [standard services](https://developer.bluetooth.org/gatt/services/Pages/ServicesHome.aspx).
 
 Services are identified by unique numbers known as UUIDs. You know about UUIDs from other contexts. Standard services have a 16-bit UUID and custom services have a 128-bit UUID. The ability to define services and characteristics depends on the radio you're using and its firmware.
 
@@ -84,8 +84,8 @@ The Bluetooth LE protocol operates on multiple layers. **General Attribute Profi
 
 As the library enables multiple types of functionality, there are a number of different classes.
 
-- BLE used to enable the BLE module.
-- BLEDevice used to get information about the devices connected or discovered while scanning.
-- BLEService used to enable the services board provides or interact with services a remote board provides.
-- BLECharacteristic used to enable the characteristics board offers in a service or interact with characteristics a remote board provides.
-- BLEDescriptor used to describe a characteristic the board offers.
+- `BLE` used to enable the Bluetooth® Low Energy module.
+- `BLEDevice` used to get information about the devices connected or discovered while scanning.
+- `BLEService` used to enable the services board provides or interact with services a remote board provides.
+- `BLECharacteristic` used to enable the characteristics board offers in a service or interact with characteristics a remote board provides.
+- `BLEDescriptor` used to describe a characteristic the board offers.
diff --git a/examples/Central/LedControl/LedControl.ino b/examples/Central/LedControl/LedControl.ino
index 8301a311..953de7d8 100644
--- a/examples/Central/LedControl/LedControl.ino
+++ b/examples/Central/LedControl/LedControl.ino
@@ -1,9 +1,9 @@
 /*
   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:
   - Arduino MKR WiFi 1010, Arduino Uno WiFi Rev2 board, Arduino Nano 33 IoT,
@@ -29,10 +29,10 @@ void setup() {
   // configure the button pin as input
   pinMode(buttonPin, INPUT);
 
-  // initialize the BLE hardware
+  // initialize the Bluetooth® Low Energy hardware
   BLE.begin();
 
-  Serial.println("BLE Central - LED control");
+  Serial.println("Bluetooth® Low Energy Central - LED control");
 
   // start scanning for peripherals
   BLE.scanForUuid("19b10000-e8f2-537e-4f6c-d104768a1214");
diff --git a/examples/Central/PeripheralExplorer/PeripheralExplorer.ino b/examples/Central/PeripheralExplorer/PeripheralExplorer.ino
index 100225d6..919cdde0 100644
--- a/examples/Central/PeripheralExplorer/PeripheralExplorer.ino
+++ b/examples/Central/PeripheralExplorer/PeripheralExplorer.ino
@@ -1,7 +1,7 @@
 /*
   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:
@@ -22,12 +22,12 @@ void setup() {
 
   // 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
   BLE.scan();
diff --git a/examples/Central/Scan/Scan.ino b/examples/Central/Scan/Scan.ino
index 3126d1a6..162e3c07 100644
--- a/examples/Central/Scan/Scan.ino
+++ b/examples/Central/Scan/Scan.ino
@@ -1,7 +1,7 @@
 /*
   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:
@@ -19,12 +19,12 @@ void setup() {
 
   // 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 peripheral
   BLE.scan();
diff --git a/examples/Central/ScanCallback/ScanCallback.ino b/examples/Central/ScanCallback/ScanCallback.ino
index 28ab9e9e..2687a3b9 100644
--- a/examples/Central/ScanCallback/ScanCallback.ino
+++ b/examples/Central/ScanCallback/ScanCallback.ino
@@ -1,7 +1,7 @@
 /*
   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.
@@ -21,12 +21,12 @@ void setup() {
 
   // 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 72dad90b..a56504f6 100644
--- a/examples/Central/SensorTagButton/SensorTagButton.ino
+++ b/examples/Central/SensorTagButton/SensorTagButton.ino
@@ -1,7 +1,7 @@
 /*
   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
@@ -23,12 +23,12 @@ void setup() {
 
   // 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 peripheral
diff --git a/examples/Peripheral/BatteryMonitor/BatteryMonitor.ino b/examples/Peripheral/BatteryMonitor/BatteryMonitor.ino
index 6c5d3d30..f013c6f5 100644
--- a/examples/Peripheral/BatteryMonitor/BatteryMonitor.ino
+++ b/examples/Peripheral/BatteryMonitor/BatteryMonitor.ino
@@ -1,14 +1,14 @@
 /*
   Battery Monitor
 
-  This example creates a BLE peripheral with the standard battery service and
+  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:
   - Arduino MKR WiFi 1010, Arduino Uno WiFi Rev2 board, Arduino Nano 33 IoT,
     Arduino Nano 33 BLE, or Arduino Nano 33 BLE Sense board.
 
-  You can use a generic BLE central app, like LightBlue (iOS and Android) or
+  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.
 
@@ -17,10 +17,10 @@
 
 #include <ArduinoBLE.h>
 
- // BLE Battery Service
+ // Bluetooth® Low Energy Battery Service
 BLEService batteryService("180F");
 
-// BLE Battery Level Characteristic
+// 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
 
@@ -40,9 +40,9 @@ void setup() {
     while (1);
   }
 
-  /* Set a local name for the BLE device
+  /* 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 BLE device
+     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");
@@ -51,18 +51,18 @@ void setup() {
   BLE.addService(batteryService); // Add the battery service
   batteryLevelChar.writeValue(oldBatteryLevel); // set initial value for this characteristic
 
-  /* Start advertising BLE.  It will start continuously transmitting BLE
-     advertising packets and will be visible to remote BLE central devices
+  /* 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...");
+  Serial.println("Bluetooth® device active, waiting for connections...");
 }
 
 void loop() {
-  // wait for a BLE central
+  // wait for a Bluetooth® Low Energy central
   BLEDevice central = BLE.central();
 
   // if a central is connected to the peripheral:
diff --git a/examples/Peripheral/ButtonLED/ButtonLED.ino b/examples/Peripheral/ButtonLED/ButtonLED.ino
index 659d466a..cbc14dd8 100644
--- a/examples/Peripheral/ButtonLED/ButtonLED.ino
+++ b/examples/Peripheral/ButtonLED/ButtonLED.ino
@@ -1,7 +1,7 @@
 /*
   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.
 
@@ -10,7 +10,7 @@
     Arduino Nano 33 BLE, or Arduino Nano 33 BLE Sense board.
   - Button connected to pin 4
 
-  You can use a generic BLE central app, like LightBlue (iOS and Android) or
+  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.
 
@@ -38,7 +38,7 @@ void setup() {
 
   // begin initialization
   if (!BLE.begin()) {
-    Serial.println("starting BLE failed!");
+    Serial.println("starting Bluetooth® Low Energy module failed!");
 
     while (1);
   }
@@ -61,11 +61,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 a874a77b..23f67bc3 100644
--- a/examples/Peripheral/CallbackLED/CallbackLED.ino
+++ b/examples/Peripheral/CallbackLED/CallbackLED.ino
@@ -1,7 +1,7 @@
 /*
   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.
 
@@ -9,7 +9,7 @@
   - Arduino MKR WiFi 1010, Arduino Uno WiFi Rev2 board, Arduino Nano 33 IoT,
     Arduino Nano 33 BLE, or Arduino Nano 33 BLE Sense board.
 
-  You can use a generic BLE central app, like LightBlue (iOS and Android) or
+  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.
 
@@ -33,7 +33,7 @@ void setup() {
 
   // begin initialization
   if (!BLE.begin()) {
-    Serial.println("starting BLE failed!");
+    Serial.println("starting Bluetooth® Low Energy module failed!");
 
     while (1);
   }
@@ -61,11 +61,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 1ede6535..2e6d6db9 100644
--- a/examples/Peripheral/LED/LED.ino
+++ b/examples/Peripheral/LED/LED.ino
@@ -1,14 +1,14 @@
 /*
   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:
   - Arduino MKR WiFi 1010, Arduino Uno WiFi Rev2 board, Arduino Nano 33 IoT,
     Arduino Nano 33 BLE, or Arduino Nano 33 BLE Sense board.
 
-  You can use a generic BLE central app, like LightBlue (iOS and Android) or
+  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.
 
@@ -17,9 +17,9 @@
 
 #include <ArduinoBLE.h>
 
-BLEService ledService("19B10000-E8F2-537E-4F6C-D104768A1214"); // BLE LED Service
+BLEService ledService("19B10000-E8F2-537E-4F6C-D104768A1214"); // Bluetooth® Low Energy LED Service
 
-// BLE LED Switch Characteristic - custom 128-bit UUID, read and writable by central
+// 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
@@ -33,7 +33,7 @@ void setup() {
 
   // begin initialization
   if (!BLE.begin()) {
-    Serial.println("starting BLE failed!");
+    Serial.println("starting Bluetooth® Low Energy module failed!");
 
     while (1);
   }
@@ -58,7 +58,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/library.properties b/library.properties
index 601474c6..8d8a9d1c 100644
--- a/library.properties
+++ b/library.properties
@@ -2,8 +2,8 @@ name=ArduinoBLE
 version=1.2.1
 author=Arduino
 maintainer=Arduino <info@arduino.cc>
-sentence=Enables BLE connectivity on the Arduino MKR WiFi 1010, Arduino UNO WiFi Rev.2, Arduino Nano 33 IoT, Arduino Nano 33 BLE and Nicla Sense ME.
-paragraph=This library supports creating a BLE peripheral and BLE central mode.
+sentence=Enables Bluetooth® Low Energy connectivity on the Arduino MKR WiFi 1010, Arduino UNO WiFi Rev.2, Arduino Nano 33 IoT, Arduino Nano 33 BLE and Nicla Sense ME.
+paragraph=This library supports creating a Bluetooth® Low Energy peripheral & central mode.
 category=Communication
 url=https://www.arduino.cc/en/Reference/ArduinoBLE
 architectures=samd,megaavr,mbed,apollo3,mbed_nano,mbed_portenta,mbed_nicla

From 57ce5149d944932740401ab7952d3f745bc9652a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 2 Mar 2022 09:03:48 +0000
Subject: [PATCH 031/112] Bump actions/checkout from 2 to 3

Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/compile-examples.yml | 2 +-
 .github/workflows/spell-check.yml      | 2 +-
 .github/workflows/sync-labels.yml      | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/compile-examples.yml b/.github/workflows/compile-examples.yml
index a14882ff..a1faf997 100644
--- a/.github/workflows/compile-examples.yml
+++ b/.github/workflows/compile-examples.yml
@@ -17,7 +17,7 @@ jobs:
           - arduino:mbed_nano:nanorp2040connect
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: arduino/compile-sketches@v1
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/spell-check.yml b/.github/workflows/spell-check.yml
index 6c44bcfb..0cbdde58 100644
--- a/.github/workflows/spell-check.yml
+++ b/.github/workflows/spell-check.yml
@@ -8,7 +8,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Spell check
         uses: arduino/actions/libraries/spell-check@master
diff --git a/.github/workflows/sync-labels.yml b/.github/workflows/sync-labels.yml
index 3ee6febd..4ea57559 100644
--- a/.github/workflows/sync-labels.yml
+++ b/.github/workflows/sync-labels.yml
@@ -27,7 +27,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Download JSON schema for labels configuration file
         id: download-schema
@@ -105,7 +105,7 @@ jobs:
           echo "::set-output name=flag::--dry-run"
 
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Download configuration files artifact
         uses: actions/download-artifact@v2

From c9bfd21ed1f927603460b3e00fc673009aad4330 Mon Sep 17 00:00:00 2001
From: "Ho Yun \"Bobby" <ho.chan@colorado.edu>
Date: Fri, 18 Mar 2022 20:58:54 -0600
Subject: [PATCH 032/112] Update readme.md

image from Arduino's assets folder not linking properly
---
 docs/readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/readme.md b/docs/readme.md
index bfd1496b..5a52d988 100644
--- a/docs/readme.md
+++ b/docs/readme.md
@@ -11,7 +11,7 @@ Bluetooth® 4.0 includes both traditional Bluetooth®, now labeled "Bluetooth®
 
 Unlike standard Bluetooth® communication basically based on an asynchronous serial connection (UART) a Bluetooth® LE radio acts like a community bulletin board. The computers that connect to it are like community members that read the bulletin board. Each radio acts as either the bulletin board or the reader. If your radio is a bulletin board (called a peripheral device in Bluetooth® LE parlance) it posts data for all radios in the community to read. If your radio is a reader (called a central device in Blueooth LE terms) it reads from any of the bulletin boards (peripheral devices) that have information about which it cares. You can also think of peripheral devices as the servers in a client-server transaction, because they contain the information that reader radios ask for. Similarly, central devices are the clients of the Bluetooth® LE world because they read information available from the peripherals.
 
-![Communication between central and peripheral devices](www.arduino.cc/en/uploads/Reference/ble-bulletin-board-model.png)
+![Communication between central and peripheral devices](https://www.arduino.cc/en/uploads/Reference/ble-bulletin-board-model.png)
 
 Think of a Bluetooth® LE peripheral device as a bulletin board and central devices as viewers of the board. Central devices view the services, get the data, then move on. Each transaction is quick (a few milliseconds), so multiple central devices can get data from one peripheral.
 

From c925d8251ac31e715a19b63cbf279c7be2a576a1 Mon Sep 17 00:00:00 2001
From: giulcioffi <g.cioffi@arduino.cc>
Date: Thu, 24 Mar 2022 16:15:56 +0100
Subject: [PATCH 033/112] Add compatibility with Nicla Vision

---
 src/utility/HCICordioTransport.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/utility/HCICordioTransport.cpp b/src/utility/HCICordioTransport.cpp
index 01788238..28eb97be 100644
--- a/src/utility/HCICordioTransport.cpp
+++ b/src/utility/HCICordioTransport.cpp
@@ -25,7 +25,7 @@
 #include <driver/CordioHCITransportDriver.h>
 #include <driver/CordioHCIDriver.h>
 
-#if defined(ARDUINO_PORTENTA_H7_M4) || defined(ARDUINO_PORTENTA_H7_M7)
+#if defined(ARDUINO_PORTENTA_H7_M4) || defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_NICLA_VISION)
 #include "ble/BLE.h"
 #include <events/mbed_events.h>
 #endif
@@ -181,7 +181,7 @@ HCICordioTransportClass::~HCICordioTransportClass()
 {
 }
 
-#if defined(ARDUINO_PORTENTA_H7_M4) || defined(ARDUINO_PORTENTA_H7_M7)
+#if defined(ARDUINO_PORTENTA_H7_M4) || defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_NICLA_VISION)
 events::EventQueue eventQueue(10 * EVENTS_EVENT_SIZE);
 void scheduleMbedBleEvents(BLE::OnEventsToProcessCallbackContext *context) {
   eventQueue.call(mbed::Callback<void()>(&context->ble, &BLE::processEvents));
@@ -201,7 +201,7 @@ int HCICordioTransportClass::begin()
   init_wsf(bufPoolDesc);
 #endif
 
-#if defined(ARDUINO_PORTENTA_H7_M4) || defined(ARDUINO_PORTENTA_H7_M7)
+#if defined(ARDUINO_PORTENTA_H7_M4) || defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_NICLA_VISION)
   BLE &ble = BLE::Instance();
   ble.onEventsToProcess(scheduleMbedBleEvents);
 

From c12774c09cb96cf91911ee73613783b5602d3161 Mon Sep 17 00:00:00 2001
From: giulcioffi <g.cioffi@arduino.cc>
Date: Thu, 24 Mar 2022 16:18:49 +0100
Subject: [PATCH 034/112] Release 1.2.2

---
 library.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library.properties b/library.properties
index 8d8a9d1c..e8859d8e 100644
--- a/library.properties
+++ b/library.properties
@@ -1,5 +1,5 @@
 name=ArduinoBLE
-version=1.2.1
+version=1.2.2
 author=Arduino
 maintainer=Arduino <info@arduino.cc>
 sentence=Enables Bluetooth® Low Energy connectivity on the Arduino MKR WiFi 1010, Arduino UNO WiFi Rev.2, Arduino Nano 33 IoT, Arduino Nano 33 BLE and Nicla Sense ME.

From bfc3202668332c857c46c4502be5127cbe6da597 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacob=20Hyl=C3=A9n?=
 <60390259+jacobhylen@users.noreply.github.com>
Date: Thu, 31 Mar 2022 16:27:49 +0200
Subject: [PATCH 035/112] Update api.md

---
 docs/api.md | 162 ++++++++++++++++++++++++++--------------------------
 1 file changed, 81 insertions(+), 81 deletions(-)

diff --git a/docs/api.md b/docs/api.md
index df285806..b8fa1d5f 100644
--- a/docs/api.md
+++ b/docs/api.md
@@ -4,7 +4,7 @@
 
 Used to enable the Bluetooth® Low Energy module.
 
-### `begin()`
+### `BLE.begin()`
 
 Initializes the Bluetooth® Low Energy device.
 
@@ -36,7 +36,7 @@ None
 
 ```
 
-### `end()`
+### `BLE.end()`
 
 Stops the Bluetooth® Low Energy device.
 
@@ -72,7 +72,7 @@ Nothing
 
 ```
 
-### `poll()`
+### `BLE.poll()`
 
 Poll for Bluetooth® Low Energy radio events and handle them.
 
@@ -106,7 +106,7 @@ Nothing
 
 ```
 
-### `setEventHandler()`
+### `BLE.setEventHandler()`
 
 Set the event handler (callback) function that will be called when the specified event occurs.
 
@@ -159,7 +159,7 @@ void blePeripheralDisconnectHandler(BLEDevice central) {
 
 ```
 
-### `connected()`
+### `BLE.connected()`
 
 Query if another Bluetooth® Low Energy device is connected
 
@@ -190,7 +190,7 @@ None
 
 ```
 
-### `disconnect()`
+### `BLE.disconnect()`
 
 Disconnect any Bluetooth® Low Energy devices that are connected
 
@@ -221,7 +221,7 @@ None
 
 ```
 
-### `address()`
+### `BLE.address()`
 
 Query the Bluetooth® address of the Bluetooth® Low Energy device.
 
@@ -251,7 +251,7 @@ The **Bluetooth® address** of the Bluetooth® Low Energy device (as a String).
 
 ```
 
-### `rssi()`
+### `BLE.rssi()`
 
 Query the RSSI (Received signal strength indication) of the connected Bluetooth® Low Energy device.
 
@@ -283,7 +283,7 @@ The **RSSI** of the connected Bluetooth® Low Energy device, 127 if no Bluetooth
 
 ```
 
-### `setAdvertisedServiceUuid()`
+### `BLE.setAdvertisedServiceUuid()`
 
 Set the advertised service UUID used when advertising.
 
@@ -322,7 +322,7 @@ Nothing
 
 ```
 
-### `setAdvertisedService()`
+### `BLE.setAdvertisedService()`
 
 Set the advertised service UUID used when advertising to the value of the BLEService provided.
 
@@ -365,7 +365,7 @@ BLEService ledService("19B10000-E8F2-537E-4F6C-D104768A1214"); // Bluetooth® Lo
 
 ```
 
-### `setManufacturerData()`
+### `BLE.setManufacturerData()`
 
 Set the manufacturer data value used when advertising.
 
@@ -408,7 +408,7 @@ Nothing
 
 ```
 
-### `setLocalName()`
+### `BLE.setLocalName()`
 
 Set the local value used when advertising.
 
@@ -448,7 +448,7 @@ Nothing
 
 ```
 
-### `setDeviceName()`
+### `BLE.setDeviceName()`
 
 Set the device name in the built in device name characteristic. If not set, the value defaults “Arduino”.
 
@@ -488,7 +488,7 @@ Nothing
 
 ```
 
-### `setAppearance()`
+### `BLE.setAppearance()`
 
 Set the appearance in the built in appearance characteristic. If not set, the value defaults 0x0000.
 
@@ -528,7 +528,7 @@ Nothing
 
 ```
 
-### `addService()`
+### `BLE.addService()`
 
 Add a BLEService to the set of services the Bluetooth® Low Energy device provides
 
@@ -570,7 +570,7 @@ BLEService ledService("19B10000-E8F2-537E-4F6C-D104768A1214"); // Bluetooth® Lo
 
 ```
 
-### `advertise()`
+### `BLE.advertise()`
 
 Start advertising.
 
@@ -608,7 +608,7 @@ None
 
 ```
 
-### `stopAdvertise()`
+### `BLE.stopAdvertise()`
 
 Stop advertising.
 
@@ -648,7 +648,7 @@ Nothing
 
 ```
 
-### `central()`
+### `BLE.central()`
 
 Query the central Bluetooth® Low Energy device connected.
 
@@ -685,7 +685,7 @@ None
 
 ```
 
-### `setAdvertisingInterval()`
+### `BLE.setAdvertisingInterval()`
 
 Set the advertising interval in units of 0.625 ms. Defaults to 100ms (160 * 0.625 ms) if not provided.
 
@@ -723,7 +723,7 @@ Nothing.
 
 ```
 
-### `setConnectionInterval()`
+### `BLE.setConnectionInterval()`
 
 Set the minimum and maximum desired connection intervals in units of 1.25 ms.
 
@@ -761,7 +761,7 @@ Nothing.
 
 ```
 
-### `setConnectable()`
+### `BLE.setConnectable()`
 
 Set if the device is connectable after advertising, defaults to **true**.
 
@@ -799,7 +799,7 @@ Nothing.
 
 ```
 
-### `scan()`
+### `BLE.scan()`
 
 Start scanning for Bluetooth® Low Energy devices that are advertising.
 
@@ -845,7 +845,7 @@ BLE.scan(withDuplicates)
 
 ```
 
-### `scanForName()`
+### `BLE.scanForName()`
 
 Start scanning for Bluetooth® Low Energy devices that are advertising with a particular (local) name.
 
@@ -892,7 +892,7 @@ BLE.scanForName(name, withDuplicates)
 
 ```
 
-### `scanForAddress()`
+### `BLE.scanForAddress()`
 
 Start scanning for Bluetooth® Low Energy devices that are advertising with a particular (Bluetooth®) address.
 
@@ -939,7 +939,7 @@ BLE.scanForAddress(address, withDuplicates)
 
 ```
 
-### `scanForUuid()`
+### `BLE.scanForUuid()`
 
 Start scanning for Bluetooth® Low Energy devices that are advertising with a particular (service) UUID.
 
@@ -986,7 +986,7 @@ BLE.scanForUuid(uuid, withDuplicates)
 
 ```
 
-### `stopScan()`
+### `BLE.stopScan()`
 
 Stop scanning for Bluetooth® Low Energy devices that are advertising.
 
@@ -1026,7 +1026,7 @@ Nothing
 
 ```
 
-### `available()`
+### `BLE.available()`
 
 Query for a discovered Bluetooth® Low Energy device that was found during scanning.
 
@@ -1075,7 +1075,7 @@ Nothing
 
 Used to get information about the devices connected or discovered while scanning
 
-### `poll()`
+### `bleDevice.poll()`
 
 Poll for Bluetooth® Low Energy radio events for the specified Bluetooth® Low Energy device and handle them.
 
@@ -1113,7 +1113,7 @@ Nothing
 
 ```
 
-### `connected()`
+### `bleDevice.connected()`
 
 Query if a Bluetooth® Low Energy device is connected
 
@@ -1147,7 +1147,7 @@ None
 
 ```
 
-### `disconnect()`
+### `bleDevice.disconnect()`
 
 Disconnect the Bluetooth® Low Energy device, if connected
 
@@ -1179,7 +1179,7 @@ None
 
 ```
 
-### `address()`
+### `bleDevice.address()`
 
 Query the Bluetooth® address of the Bluetooth® Low Energy device.
 
@@ -1216,7 +1216,7 @@ The **Bluetooth® address** of the Bluetooth® Low Energy device (as a String).
 
 ```
 
-### `rssi()`
+### `bleDevice.rssi()`
 
 Query the RSSI (Received signal strength indication) of the Bluetooth® Low Energy device.
 
@@ -1248,7 +1248,7 @@ The **RSSI** of the connected Bluetooth® Low Energy device, 127 if the Bluetoot
 
 ```
 
-### `characteristic()`
+### `bleDevice.characteristic()`
 
 Get a BLECharacteristic representing a Bluetooth® Low Energy characteristic the device provides.
 
@@ -1325,7 +1325,7 @@ bleDevice.characteristic(uuid, index)
 
 ```
 
-### `discoverAttributes()`
+### `bleDevice.discoverAttributes()`
 
 Discover all of the attributes of Bluetooth® Low Energy device.
 
@@ -1391,7 +1391,7 @@ None
 
 ```
 
-### `discoverService()`
+### `bleDevice.discoverService()`
 
 Discover the attributes of a particular service on the Bluetooth® Low Energy device.
 
@@ -1457,7 +1457,7 @@ bleDevice.discoverService(serviceUuid)
 
 ```
 
-### `deviceName()`
+### `bleDevice.deviceName()`
 
 Query the device name (BLE characteristic UUID 0x2a00) of a Bluetooth® Low Energy device.
 
@@ -1531,7 +1531,7 @@ None
 
 ```
 
-### `appearance()`
+### `bleDevice.appearance()`
 
 Query the appearance (BLE characteristic UUID 0x2a01) of a Bluetooth® Low Energy device.
 
@@ -1605,7 +1605,7 @@ None
 
 ```
 
-### `serviceCount()`
+### `bleDevice.serviceCount()`
 
 Query the number of services discovered for the Bluetooth® Low Energy device.
 
@@ -1676,7 +1676,7 @@ The number of **services discovered** for the Bluetooth® Low Energy device.
 
 ```
 
-### `hasService()`
+### `bleDevice.hasService()`
 
 Query if the Bluetooth® Low Energy device has a particular service.
 
@@ -1748,7 +1748,7 @@ bleDevice.hasService(uuid, index)
 
 ```
 
-### `service()`
+### `bleDevice.service()`
 
 Get a BLEService representing a Bluetooth® Low Energy service the device provides.
 
@@ -1825,7 +1825,7 @@ bleDevice.service(uuid, index)
 
 ```
 
-### `characteristicCount()`
+### `bleDevice.characteristicCount()`
 
 Query the number of characteristics discovered for the Bluetooth® Low Energy device.
 
@@ -1896,7 +1896,7 @@ The **number of characteristics** discovered for the Bluetooth® Low Energy devi
 
 ```
 
-### `hasCharacteristic()`
+### `bleDevice.hasCharacteristic()`
 
 Query if the Bluetooth® Low Energy device has a particular characteristic.
 
@@ -1968,7 +1968,7 @@ bleDevice.hasCharacteristic(uuid, index)
 
 ```
 
-### `hasLocalName()`
+### `bleDevice.hasLocalName()`
 
 Query if a discovered Bluetooth® Low Energy device is advertising a local name.
 
@@ -2021,7 +2021,7 @@ Nothing
 
 ```
 
-### `hasAdvertisedServiceUuid()`
+### `bleDevice.hasAdvertisedServiceUuid()`
 
 Query if a discovered Bluetooth® Low Energy device is advertising a service UUID.
 
@@ -2079,7 +2079,7 @@ bleDevice.hasAdvertisedServiceUuid(index)
 
 ```
 
-### `advertisedServiceUuidCount()`
+### `bleDevice.advertisedServiceUuidCount()`
 
 Query the number of advertised services a discovered Bluetooth® Low Energy device is advertising.
 
@@ -2136,7 +2136,7 @@ The **number of advertised services** a discovered Bluetooth® Low Energy device
 
 ```
 
-### `localName()`
+### `bleDevice.localName()`
 
 Query the local name a discovered Bluetooth® Low Energy device is advertising with.
 
@@ -2189,7 +2189,7 @@ Nothing
 
 ```
 
-### `advertisedServiceUuid()`
+### `bleDevice.advertisedServiceUuid()`
 
 Query an advertised service UUID discovered Bluetooth® Low Energy device is advertising.
 
@@ -2247,7 +2247,7 @@ Advertised service **UUID** (as a String).
 
 ```
 
-### `connect()`
+### `bleDevice.connect()`
 
 Connect to a Bluetooth® Low Energy device.
 
@@ -2334,7 +2334,7 @@ BLEService ledService("19B10000-E8F2-537E-4F6C-D104768A1214"); // Bluetooth® Lo
 
 ```
 
-### `uuid()`
+### `bleService.uuid()`
 
 Query the UUID of the specified BLEService.
 
@@ -2366,7 +2366,7 @@ Serial.println(ledService.uuid());
 
 ```
 
-### `addCharacteristic()`
+### `bleService.addCharacteristic()`
 
 Add a BLECharateristic to the Bluetooth® Low Energy service.
 
@@ -2403,7 +2403,7 @@ ledService.addCharacteristic(switchCharacteristic);
 
 ```
 
-### `characteristicCount()`
+### `bleService.characteristicCount()`
 
 Query the number of characteristics discovered for the Bluetooth® Low Energy service.
 
@@ -2481,7 +2481,7 @@ The **number of characteristics** discovered for the Bluetooth® Low Energy serv
 
 ```
 
-### `hasCharacteristic()`
+### `bleService.hasCharacteristic()`
 
 Query if the Bluetooth® Low Energy service has a particular characteristic.
 
@@ -2559,7 +2559,7 @@ bleService.hasCharacteristic(uuid, index)
 
 ```
 
-### `characteristic()`
+### `bleService.characteristic()`
 
 Get a BLECharacteristic representing a Bluetooth® Low Energy characteristic the service provides.
 
@@ -2695,7 +2695,7 @@ BLEUnsignedCharCharacteristic batteryLevelChar("2A19",  // standard 16-bit chara
 
 ```
 
-### `uuid()`
+### `bleCharacteristic.uuid()`
 
 Query the UUID of the specified BLECharacteristic.
 
@@ -2728,7 +2728,7 @@ Serial.println(switchCharacteristic.uuid());
 
 ```
 
-### `properties()`
+### `bleCharacteristic.properties()`
 
 Query the property mask of the specified BLECharacteristic.
 
@@ -2767,7 +2767,7 @@ if (properties & (BLEWrite | BLEWriteWithoutResponse)) {
 
 ```
 
-### `valueSize()`
+### `bleCharacteristic.valueSize()`
 
 Query the maximum value size of the specified BLECharacteristic.
 
@@ -2800,7 +2800,7 @@ Serial.println(switchCharacteristic.valueSize());
 
 ```
 
-### `value()`
+### `bleCharacteristic.value()`
 
 Query the current value of the specified BLECharacteristic.
 
@@ -2839,7 +2839,7 @@ BLEByteCharacteristic switchCharacteristic("19B10001-E8F2-537E-4F6C-D104768A1214
 
 ```
 
-### `valueLength()`
+### `bleCharacteristic.valueLength()`
 
 Query the current value size of the specified BLECharacteristic.
 
@@ -2872,7 +2872,7 @@ Serial.println(switchCharacteristic.valueLength());
 
 ```
 
-### `readValue()`
+### `bleCharacteristic.readValue()`
 
 Read the current value of the characteristic. If the characteristic is on a remote device, a read request will be sent.
 
@@ -2921,7 +2921,7 @@ Number of bytes read
 
 ```
 
-### `writeValue()`
+### `bleCharacteristic.writeValue()`
 
 Write the value of the characteristic. If the characteristic is on a remote device, a write request or command will be sent.
 
@@ -2969,7 +2969,7 @@ bleCharacteristic.writeValue(value)
 
 ```
 
-### `setEventHandler()`
+### `bleCharacteristic.setEventHandler()`
 
 Set the event handler (callback) function that will be called when the specified event occurs.
 
@@ -3020,7 +3020,7 @@ void switchCharacteristicWritten(BLEDevice central, BLECharacteristic characteri
 
 ```
 
-### `broadcast()`
+### `bleCharacteristic.broadcast()`
 
 Broadcast the characteristics value as service data when advertising.
 
@@ -3053,7 +3053,7 @@ buttonCharacteristic.broadcast();
 
 ```
 
-### `written()`
+### `bleCharacteristic.written()`
 
 Query if the characteristic value has been written by another Bluetooth® Low Energy device.
 
@@ -3115,7 +3115,7 @@ BLEByteCharacteristic switchCharacteristic("19B10001-E8F2-537E-4F6C-D104768A1214
 
 ```
 
-### `subscribed()`
+### `bleCharacteristic.subscribed()`
 
 Query if the characteristic has been subscribed to by another Bluetooth® Low Energy device.
 
@@ -3153,7 +3153,7 @@ BLEUnsignedCharCharacteristic batteryLevelChar("2A19",  // standard 16-bit chara
 
 ```
 
-### `addDescriptor()`
+### `bleCharacteristic.addDescriptor()`
 
 Add a BLEDescriptor to the characteristic.
 
@@ -3190,7 +3190,7 @@ BLEDescriptor batteryLevelDescriptor("2901", "millis");
 
 ```
 
-### `descriptorCount`
+### `bleCharacteristic.descriptorCount`
 
 Query the number of Bluetooth® Low Energy descriptors discovered for the characteristic.
 
@@ -3222,7 +3222,7 @@ The **number of Bluetooth® Low Energy descriptors** discovered for the characte
 
 ```
 
-### `hasDescriptor`
+### `bleCharacteristic.hasDescriptor`
 
 Check if a characteristic has a particular descriptor.
 
@@ -3253,7 +3253,7 @@ bleCharacteristic.hasDescriptor(uuid, index)
 
 ```
 
-### `descriptor()`
+### `bleCharacteristic.descriptor()`
 
 Get a BLEDescriptor that represents a characteristics Bluetooth® Low Energy descriptor.
 
@@ -3285,7 +3285,7 @@ BLEDescriptor that represents a characteristics Bluetooth® Low Energy descripto
 
 ```
 
-### `canRead()`
+### `bleCharacteristic.canRead()`
 
 Query if a Bluetooth® Low Energy characteristic is readable.
 
@@ -3347,7 +3347,7 @@ None
 
 ```
 
-### `canWrite()`
+### `bleCharacteristic.canWrite()`
 
 Query if a Bluetooth® Low Energy characteristic is writable.
 
@@ -3376,7 +3376,7 @@ None
 
 ```
 
-### `canSubscribe()`
+### `bleCharacteristic.canSubscribe()`
 
 Query if a Bluetooth® Low Energy characteristic is subscribable.
 
@@ -3405,7 +3405,7 @@ None
 
 ```
 
-### `subscribe()`
+### `bleCharacteristic.subscribe()`
 
 Subscribe to a Bluetooth® Low Energy characteristics notification or indications.
 
@@ -3453,7 +3453,7 @@ None
 
 ```
 
-### `canUnsubscribe()`
+### `bleCharacteristic.canUnsubscribe()`
 
 Query if a Bluetooth® Low Energy characteristic is unsubscribable.
 
@@ -3482,7 +3482,7 @@ None
 
 ```
 
-### `unsubscribe()`
+### `bleCharacteristic.unsubscribe()`
 
 Unsubscribe to a Bluetooth® Low Energy characteristics notifications or indications.
 
@@ -3532,7 +3532,7 @@ None
 
 ```
 
-### `valueUpdated()`
+### `bleCharacteristic.valueUpdated()`
 
 Has the characteristics value been updated via a notification or indication.
 
@@ -3614,7 +3614,7 @@ BLEDescriptor millisLabelDescriptor("2901", "millis");
 
 ```
 
-### `uuid()`
+### `bleDescriptor.uuid()`
 
 Query the UUID of the specified BLEDescriptor.
 
@@ -3646,7 +3646,7 @@ Serial.println(millisLabelDescriptor.uuid());
 
 ```
 
-### `valueSize()`
+### `bleDescriptor.valueSize()`
 
 Query the value size of the specified BLEDescriptor.
 
@@ -3678,7 +3678,7 @@ Serial.println(millisLabelDescriptor.valueSize());
 
 ```
 
-### `valueLength()`
+### `bleDescriptor.valueLength()`
 
 Query the length, in bytes, of the descriptor current value.
 
@@ -3724,7 +3724,7 @@ None
 
 ```
 
-### `value()`
+### `bleDescriptor.value()`
 
 Query the value of the specified BLEDescriptor.
 
@@ -3761,7 +3761,7 @@ BLEDescriptor millisLabelDescriptor("2901", "millis");
 
 ```
 
-### `readValue()`
+### `bleDescriptor.readValue()`
 
 Read the current value of the descriptor. If the descriptor is on a remote device, a read request will be sent.
 
@@ -3795,7 +3795,7 @@ bleDescriptor.readValue(value)
 
 ```
 
-### `read()`
+### `bleDescriptor.read()`
 
 Perform a read request for the descriptor.
 

From 4cf376eb39ae1ae623ade8d48f03f729aae44124 Mon Sep 17 00:00:00 2001
From: Maciej Klemarczyk <m.klemarczyk+git@live.com>
Date: Thu, 7 Apr 2022 20:10:01 +0200
Subject: [PATCH 036/112] Unification of documentation

---
 docs/api.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/api.md b/docs/api.md
index b8fa1d5f..f3a7bc43 100644
--- a/docs/api.md
+++ b/docs/api.md
@@ -3190,7 +3190,7 @@ BLEDescriptor batteryLevelDescriptor("2901", "millis");
 
 ```
 
-### `bleCharacteristic.descriptorCount`
+### `bleCharacteristic.descriptorCount()`
 
 Query the number of Bluetooth® Low Energy descriptors discovered for the characteristic.
 
@@ -3222,7 +3222,7 @@ The **number of Bluetooth® Low Energy descriptors** discovered for the characte
 
 ```
 
-### `bleCharacteristic.hasDescriptor`
+### `bleCharacteristic.hasDescriptor()`
 
 Check if a characteristic has a particular descriptor.
 

From 6438f81904d1cc4b63fcd2ca669c9893a9a950c5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Apr 2022 09:39:54 +0000
Subject: [PATCH 037/112] Bump actions/download-artifact from 2 to 3

Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 2 to 3.
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](https://github.com/actions/download-artifact/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/download-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/sync-labels.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/sync-labels.yml b/.github/workflows/sync-labels.yml
index 4ea57559..e84e803e 100644
--- a/.github/workflows/sync-labels.yml
+++ b/.github/workflows/sync-labels.yml
@@ -108,7 +108,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Download configuration files artifact
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: ${{ env.CONFIGURATIONS_ARTIFACT }}
           path: ${{ env.CONFIGURATIONS_FOLDER }}

From 785ef5cbb3622dff711f619467b742641847df2c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Apr 2022 09:39:58 +0000
Subject: [PATCH 038/112] Bump actions/upload-artifact from 2 to 3

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 2 to 3.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/sync-labels.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/sync-labels.yml b/.github/workflows/sync-labels.yml
index 4ea57559..1d969d57 100644
--- a/.github/workflows/sync-labels.yml
+++ b/.github/workflows/sync-labels.yml
@@ -70,7 +70,7 @@ jobs:
           file-url: https://raw.githubusercontent.com/arduino/tooling-project-assets/main/workflow-templates/assets/sync-labels/${{ matrix.filename }}
 
       - name: Pass configuration files to next job via workflow artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           path: |
             *.yaml

From b94ff5f28e6d39fb39aa6de339113540bd3e294c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacob=20Hyl=C3=A9n?=
 <60390259+jacobhylen@users.noreply.github.com>
Date: Fri, 29 Apr 2022 11:23:39 +0200
Subject: [PATCH 039/112] Update api.md

Bullet points in ### Parameters and ### Returns.
---
 docs/api.md | 287 +++++++++++++++++++++++++++++-----------------------
 1 file changed, 159 insertions(+), 128 deletions(-)

diff --git a/docs/api.md b/docs/api.md
index df285806..1ed8e6bb 100644
--- a/docs/api.md
+++ b/docs/api.md
@@ -20,7 +20,8 @@ BLE.begin()
 None
 
 #### Returns
-1 on success, 0 on failure.
+- 1 on success
+- 0 on failure
 
 #### Example
 
@@ -119,8 +120,8 @@ BLE.setEventHandler(eventType, callback)
 
 #### Parameters
 
-**eventType**: event type (BLEConnected, BLEDisconnected)
-**callback**: function to call when event occurs
+- **eventType**: event type (BLEConnected, BLEDisconnected)
+- **callback**: function to call when event occurs
 #### Returns
 Nothing.
 
@@ -175,7 +176,8 @@ BLE.connected()
 None
 
 #### Returns
-**true** if another Bluetooth® Low Energy device is connected, otherwise **false**.
+- **true** if another Bluetooth® Low Energy device is connected, 
+- otherwise **false**.
 
 #### Example
 
@@ -206,7 +208,8 @@ BLE.disconnect()
 None
 
 #### Returns
-**true** if any Bluetooth® Low Energy device that was previously connected was disconnected, otherwise **false**.
+- **true** if any Bluetooth® Low Energy device that was previously connected was disconnected, 
+- otherwise **false**.
 
 #### Example
 
@@ -237,7 +240,7 @@ BLE.address()
 None
 
 #### Returns
-The **Bluetooth® address** of the Bluetooth® Low Energy device (as a String).
+- The **Bluetooth® address** of the Bluetooth® Low Energy device (as a String).
 
 #### Example
 
@@ -267,7 +270,7 @@ BLE.rssi()
 None
 
 #### Returns
-The **RSSI** of the connected Bluetooth® Low Energy device, 127 if no Bluetooth® Low Energy device is connected.
+- The **RSSI** of the connected Bluetooth® Low Energy device, 127 if no Bluetooth® Low Energy device is connected.
 
 #### Example
 
@@ -296,7 +299,7 @@ BLE.setAdvertisedServiceUuid(uuid)
 
 #### Parameters
 
-**uuid:** 16-bit or 128-bit Bluetooth® Low Energy UUID in **String** format
+- **uuid:** 16-bit or 128-bit Bluetooth® Low Energy UUID in **String** format
 
 #### Returns
 Nothing
@@ -335,7 +338,7 @@ BLE.setAdvertisedService(bleService)
 
 #### Parameters
 
-**bleService:** BLEService to use UUID from
+- **bleService:** BLEService to use UUID from
 
 #### Returns
 Nothing
@@ -378,8 +381,8 @@ BLE.setManufacturerData(data, length)
 
 #### Parameters
 
-**data:** byte array containing manufacturer data
-**length:** length of manufacturer data array
+- **data:** byte array containing manufacturer data
+- **length:** length of manufacturer data array
 
 #### Returns
 Nothing
@@ -421,7 +424,7 @@ BLE.setLocalName(name)
 
 #### Parameters
 
-**name:** local name value to use when advertising
+- **name:** local name value to use when advertising
 
 #### Returns
 Nothing
@@ -461,7 +464,7 @@ BLE.setDeviceName(name)
 
 #### Parameters
 
-**name:** device name value
+- **name:** device name value
 
 #### Returns
 Nothing
@@ -501,7 +504,7 @@ BLE.setAppearance(appearance)
 
 #### Parameters
 
-**appearance:** appearance value
+- **appearance:** appearance value
 
 #### Returns
 Nothing
@@ -541,7 +544,7 @@ BLE.addService(service)
 
 #### Parameters
 
-**service:** BLEService to add
+- **service:** BLEService to add
 
 #### Returns
 Nothing
@@ -586,7 +589,8 @@ BLE.advertise()
 None
 
 #### Returns
-1 on success, 0 on failure.
+- 1 on success,
+- 0 on failure.
 
 #### Example
 
@@ -664,7 +668,7 @@ BLE.central()
 None
 
 #### Returns
-**BLEDevice** representing the central.
+- **BLEDevice** representing the central.
 
 #### Example
 
@@ -698,7 +702,7 @@ BLE.setAdvertisingInterval(advertisingInterval)
 
 #### Parameters
 
-**advertisingInterval:** advertising interval in units of 0.625 ms
+- **advertisingInterval:** advertising interval in units of 0.625 ms
 
 #### Returns
 Nothing.
@@ -736,8 +740,8 @@ BLE.setConnectionInterval(minimum, maximum)
 
 #### Parameters
 
-**minimum:** minimum desired connection interval in units of 1.25 ms
-**maximum:** maximum desired connection interval in units of 1.25 ms
+- **minimum:** minimum desired connection interval in units of 1.25 ms
+- **maximum:** maximum desired connection interval in units of 1.25 ms
 
 #### Returns
 Nothing.
@@ -774,8 +778,8 @@ BLE.setConnectable(connectable)
 
 #### Parameters
 
-**true**: the device will be connectable when advertising
-**false**: the device will NOT be connectable when advertising
+- **true**: the device will be connectable when advertising
+- **false**: the device will NOT be connectable when advertising
 
 #### Returns
 Nothing.
@@ -813,10 +817,11 @@ BLE.scan(withDuplicates)
 
 #### Parameters
 
-**withDuplicates:** optional, defaults to **false**. If **true**, advertisements received more than once will not be filtered
+- **withDuplicates:** optional, defaults to **false**. If **true**, advertisements received more than once will not be filtered
 
 #### Returns
-1 on success, 0 on failure.
+- 1 on success, 
+- 0 on failure.
 
 #### Example
 
@@ -859,11 +864,12 @@ BLE.scanForName(name, withDuplicates)
 
 #### Parameters
 
-**name:** (local) name of device (as a **String**) to filter for
-**withDuplicates:** optional, defaults to **false**. If **true**, advertisements received more than once will not be filtered.
+-  **name:** (local) name of device (as a **String**) to filter for
+- **withDuplicates:** optional, defaults to **false**. If **true**, advertisements received more than once will not be filtered.
 
 #### Returns
-1 on success, 0 on failure.
+- 1 on success,
+- 0 on failure.
 
 #### Example
 
@@ -906,11 +912,12 @@ BLE.scanForAddress(address, withDuplicates)
 
 #### Parameters
 
-**address:** (Bluetooth®) address (as a String) to filter for
-**withDuplicates:** optional, defaults to **false**. If **true**, advertisements received more than once will not be filtered
+- **address:** (Bluetooth®) address (as a String) to filter for
+- **withDuplicates:** optional, defaults to **false**. If **true**, advertisements received more than once will not be filtered
 
 #### Returns
-1 on success, 0 on failure.
+- 1 on success, 
+- 0 on failure.
 
 #### Example
 
@@ -953,11 +960,12 @@ BLE.scanForUuid(uuid, withDuplicates)
 
 #### Parameters
 
-**uuid:** (service) UUID (as a **String**) to filter for
-**withDuplicates:** optional, defaults to **false**. If **true**, advertisements received more than once will not be filtered.
+- **uuid:** (service) UUID (as a **String**) to filter for
+- **withDuplicates:** optional, defaults to **false**. If **true**, advertisements received more than once will not be filtered.
 
 #### Returns
-1 on success, 0 on failure.
+- 1 on success,
+- 0 on failure.
 
 #### Example
 
@@ -1042,7 +1050,7 @@ BLE.available()
 Nothing
 
 #### Returns
-**BLEDevice** representing the discovered device.
+- **BLEDevice** representing the discovered device.
 
 #### Example
 
@@ -1089,7 +1097,7 @@ bleDevice.poll(timeout)
 
 #### Parameters
 
-**timeout**: optional timeout in ms, to wait for event. If not specified defaults to 0 ms.
+- **timeout**: optional timeout in ms, to wait for event. If not specified defaults to 0 ms.
 
 #### Returns
 Nothing
@@ -1129,7 +1137,8 @@ bleDevice.connected()
 None
 
 #### Returns
-**true** if the Bluetooth® Low Energy device is connected, otherwise **false**.
+- **true** if the Bluetooth® Low Energy device is connected,
+- otherwise **false**.
 
 #### Example
 
@@ -1163,7 +1172,8 @@ bleDevice.disconnect()
 None
 
 #### Returns
-**true** if the Bluetooth® Low Energy device was disconnected, otherwise **false**.
+- **true** if the Bluetooth® Low Energy device was disconnected,
+- otherwise **false**.
 
 #### Example
 
@@ -1195,7 +1205,7 @@ bleDevice.address()
 None
 
 #### Returns
-The **Bluetooth® address** of the Bluetooth® Low Energy device (as a String).
+- **Bluetooth® address** of the Bluetooth® Low Energy device (as a String).
 
 #### Example
 
@@ -1232,7 +1242,7 @@ bleDevice.rssi()
 None
 
 #### Returns
-The **RSSI** of the connected Bluetooth® Low Energy device, 127 if the Bluetooth® Low Energy device is not connected.
+- **RSSI** of the connected Bluetooth® Low Energy device, 127 if the Bluetooth® Low Energy device is not connected.
 
 #### Example
 
@@ -1263,11 +1273,11 @@ bleDevice.characteristic(uuid, index)
 
 #### Parameters
 
-**index**: index of characteristic
-**uuid**: uuid (as a **String**)
+- **index**: index of characteristic
+- **uuid**: uuid (as a **String**)
 
 #### Returns
-**BLECharacteristic** for provided parameters
+- **BLECharacteristic** for provided parameters
 
 #### Example
 
@@ -1341,7 +1351,8 @@ bleDevice.discoverAttributes()
 None
 
 #### Returns
-**true**, if successful, **false** on failure.
+- **true**, if successful, 
+- **false** on failure.
 
 #### Example
 
@@ -1404,10 +1415,11 @@ bleDevice.discoverService(serviceUuid)
 
 #### Parameters
 
-**serviceUuid:** service UUID to discover (as a **String**)
+- **serviceUuid:** service UUID to discover (as a **String**)
 
 #### Returns
-**true**, if successful, **false** on failure.
+- **true**, if successful,
+- **false** on failure.
 
 #### Example
 
@@ -1473,7 +1485,7 @@ bleDevice.deviceName()
 None
 
 #### Returns
-**Device name** (as a String).
+- **Device name** (as a String).
 
 #### Example
 
@@ -1547,7 +1559,7 @@ bleDevice.appearance()
 None
 
 #### Returns
-**Appearance value** (as a number).
+- **Appearance value** (as a number).
 
 #### Example
 
@@ -1621,7 +1633,7 @@ bleDevice.serviceCount()
 None
 
 #### Returns
-The number of **services discovered** for the Bluetooth® Low Energy device.
+- The number of **services discovered** for the Bluetooth® Low Energy device.
 
 #### Example
 
@@ -1690,11 +1702,12 @@ bleDevice.hasService(uuid, index)
 
 #### Parameters
 
-**uuid**: uuid to check (as a **String**)
-**index**: optional, index of service to check if the device provides more than on. Defaults to 0, if not provided.
+- **uuid**: uuid to check (as a **String**)
+- **index**: optional, index of service to check if the device provides more than on. Defaults to 0, if not provided.
 
 #### Returns
-**true**, if the device provides the service, **false** otherwise.
+- **true**, if the device provides the service,
+- **false** otherwise.
 
 #### Example
 
@@ -1763,11 +1776,11 @@ bleDevice.service(uuid, index)
 
 #### Parameters
 
-**index**: index of service
-**uuid**: uuid (as a **String**)
+- **index**: index of service
+- **uuid**: uuid (as a **String**)
 
 #### Returns
-**BLEService** for provided parameters
+- **BLEService** for provided parameters
 
 #### Example
 
@@ -1841,7 +1854,7 @@ bleDevice.characteristicCount()
 None
 
 #### Returns
-The **number of characteristics** discovered for the Bluetooth® Low Energy device.
+- The **number of characteristics** discovered for the Bluetooth® Low Energy device.
 
 #### Example
 
@@ -1910,11 +1923,12 @@ bleDevice.hasCharacteristic(uuid, index)
 
 #### Parameters
 
-**uuid**: uuid to check (as a **String**)
-**index**: optional, index of characteristic to check if the device provides more than on. Defaults to 0, if not provided.
+- **uuid**: uuid to check (as a **String**)
+- **index**: optional, index of characteristic to check if the device provides more than on. Defaults to 0, if not provided.
 
 #### Returns
-**true**, if the device provides the characteristic, **false** otherwise.
+- **true**, if the device provides the characteristic, 
+- **false** otherwise.
 
 #### Example
 
@@ -1984,7 +1998,8 @@ bleDevice.hasLocalName()
 Nothing
 
 #### Returns
-**true**, if the device is advertising a local name, **false** otherwise.
+- **true**, if the device is advertising a local name, 
+- **false** otherwise.
 
 #### Example
 
@@ -2035,10 +2050,11 @@ bleDevice.hasAdvertisedServiceUuid(index)
 
 #### Parameters
 
-**index**: optional, defaults to 0, the index of the service UUID, if the device is advertising more than one.
+- **index**: optional, defaults to 0, the index of the service UUID, if the device is advertising more than one.
 
 #### Returns
-**true**, if the device is advertising a service UUID, **false** otherwise.
+- **true**, if the device is advertising a service UUID, 
+- **false** otherwise.
 
 #### Example
 
@@ -2095,7 +2111,7 @@ bleDevice.advertisedServiceUuidCount()
 None
 
 #### Returns
-The **number of advertised services** a discovered Bluetooth® Low Energy device is advertising.
+- The **number of advertised services** a discovered Bluetooth® Low Energy device is advertising.
 
 #### Example
 
@@ -2152,7 +2168,7 @@ bleDevice.localName()
 Nothing
 
 #### Returns
-**Advertised local name** (as a String).
+- **Advertised local name** (as a String).
 
 #### Example
 
@@ -2203,10 +2219,10 @@ bleDevice.advertisedServiceUuid(index)
 
 #### Parameters
 
-**index**: optional, defaults to 0, the index of the **service UUID**, if the device is advertising more than one.
+- **index**: optional, defaults to 0, the index of the **service UUID**, if the device is advertising more than one.
 
 #### Returns
-Advertised service **UUID** (as a String).
+- Advertised service **UUID** (as a String).
 
 #### Example
 
@@ -2263,7 +2279,8 @@ bleDevice.connect()
 None
 
 #### Returns
-**true**, if the connection was successful, **false** otherwise.
+- **true**, if the connection was successful, 
+- **false** otherwise.
 
 #### Example
 
@@ -2320,10 +2337,10 @@ BLEService(uuid)
 
 #### Parameters
 
-**uuid**: 16-bit or 128-bit UUID in **String** format
+- **uuid**: 16-bit or 128-bit UUID in **String** format
 
 #### Returns
-New **BLEService** with the specified **UUID**
+- New **BLEService** with the specified **UUID**
 
 #### Example
 
@@ -2350,7 +2367,7 @@ bleService.uuid()
 None
 
 #### Returns
-UUID of the Bluetooth® Low Energy service as a **String**.
+- UUID of the Bluetooth® Low Energy service as a **String**.
 
 #### Example
 
@@ -2419,7 +2436,7 @@ bleService.characteristicCount()
 None
 
 #### Returns
-The **number of characteristics** discovered for the Bluetooth® Low Energy service.
+- The **number of characteristics** discovered for the Bluetooth® Low Energy service.
 
 #### Example
 
@@ -2495,11 +2512,12 @@ bleService.hasCharacteristic(uuid, index)
 
 #### Parameters
 
-**uuid**: uuid to check (as a **String**)
-**index**: optional, index of characteristic to check if the device provides more than on. Defaults to 0, if not provided.
+- **uuid**: uuid to check (as a **String**)
+- **index**: optional, index of characteristic to check if the device provides more than on. Defaults to 0, if not provided.
 
 #### Returns
-**true**, if the service provides the characteristic, **false** otherwise.
+- **true**, if the service provides the characteristic,
+- **false** otherwise.
 
 #### Example
 
@@ -2574,11 +2592,11 @@ bleService.characteristic(uuid, index)
 
 #### Parameters
 
-**index**: index of characteristic
-**uuid**: uuid (as a **String**)
+- **index**: index of characteristic
+- **uuid**: uuid (as a **String**)
 
 #### Returns
-**BLECharacteristic** for provided parameters
+- **BLECharacteristic** for provided parameters
 
 #### Example
 
@@ -2675,13 +2693,13 @@ BLEDoubleCharacteristic(uuid, properties)
 
 #### Parameters
 
-**uuid**: 16-bit or 128-bit UUID in **String** format
-**properties**: mask of the properties (BLEBroadcast, BLERead, BLEWriteWithoutResponse, BLEWrite, BLENotify, BLEIndicate)
-**valueSize**: (maximum) size of characteristic value
-**stringValue**: value as a string
+- **uuid**: 16-bit or 128-bit UUID in **String** format
+- **properties**: mask of the properties (BLEBroadcast, BLERead, BLEWriteWithoutResponse, BLEWrite, BLENotify, BLEIndicate)
+- **valueSize**: (maximum) size of characteristic value
+- **stringValue**: value as a string
 
 #### Returns
-New **BLECharacteristic** with the specified **UUID** and value
+- New **BLECharacteristic** with the specified **UUID** and value
 
 #### Example
 
@@ -2711,7 +2729,7 @@ bleCharacteristic.uuid()
 None
 
 #### Returns
-**UUID** of the Bluetooth® Low Energy service as a **String**.
+- **UUID** of the Bluetooth® Low Energy service as a **String**.
 
 #### Example
 
@@ -2744,7 +2762,7 @@ bleCharacteristic.properties()
 None
 
 #### Returns
-**Properties of the characteristic masked** (BLEBroadcast, BLERead, BLEWriteWithoutResponse, BLEWrite, BLENotify, BLEIndicate)
+- **Properties of the characteristic masked** (BLEBroadcast, BLERead, BLEWriteWithoutResponse, BLEWrite, BLENotify, BLEIndicate)
 
 #### Example
 
@@ -2783,7 +2801,7 @@ bleCharacteristic.valueSize()
 None
 
 #### Returns
-The **maximum value** size of the characteristic (in bytes)
+- The **maximum value** size of the characteristic (in bytes)
 
 #### Example
 
@@ -2816,7 +2834,7 @@ bleCharacteristic.value()
 None
 
 #### Returns
-The **current value** of the characteristic, value type depends on the constructor used
+- The **current value** of the characteristic, value type depends on the constructor used
 
 #### Example
 
@@ -2855,7 +2873,7 @@ bleCharacteristic.valueLength()
 None
 
 #### Returns
-The **current value** size of the characteristic (in bytes)
+- The **current value** size of the characteristic (in bytes)
 
 #### Example
 
@@ -2886,11 +2904,11 @@ bleCharacteristic.readValue(value)
 
 #### Parameters
 
-**buffer:** byte array to read value into length: size of buffer argument in bytes 
-**value**: variable to read value into (by reference)
+- **buffer:** byte array to read value into length: size of buffer argument in bytes 
+- **value**: variable to read value into (by reference)
 
 #### Returns
-Number of bytes read
+- **Number of bytes** read
 
 #### Example
 
@@ -2935,12 +2953,13 @@ bleCharacteristic.writeValue(value)
 
 #### Parameters
 
-**buffer**: byte array to write value with
-**length**: number of bytes of the buffer argument to write
-**value**: value to write
+- **buffer**: byte array to write value with
+- **length**: number of bytes of the buffer argument to write
+- **value**: value to write
 
 #### Returns
-1 on success, 0 on failure
+- 1 on success, 
+- 0 on failure
 
 #### Example
 
@@ -2982,8 +3001,8 @@ bleCharacteristic.setEventHandler(eventType, callback)
 
 #### Parameters
 
-**eventType**: event type (BLESubscribed, BLEUnsubscribed, BLERead, BLEWritten) 
-**callback**: function to call when the event occurs
+- **eventType**: event type (BLESubscribed, BLEUnsubscribed, BLERead, BLEWritten) 
+- **callback**: function to call when the event occurs
 
 #### Returns
 Nothing
@@ -3036,7 +3055,8 @@ bleCharacteristic.broadcast()
 None
 
 #### Returns
-1 on success, 0 on failure
+- 1 on success,
+- 0 on failure
 
 #### Example
 
@@ -3069,7 +3089,8 @@ bleCharacteristic.written()
 None
 
 #### Returns
-**true** if the characteristic value has been written by another Bluetooth® Low Energy device, **false** otherwise
+- **true** if the characteristic value has been written by another Bluetooth® Low Energy device,
+- **false** otherwise
 
 #### Example
 
@@ -3131,7 +3152,8 @@ bleCharacteristic.subscribed()
 None
 
 #### Returns
-**true** if the characteristic value has been subscribed to by another Bluetooth® Low Energy device, **false** otherwise
+- **true** if the characteristic value has been subscribed to by another Bluetooth® Low Energy device,
+- **false** otherwise
 
 #### Example
 
@@ -3166,7 +3188,7 @@ bleCharacteristic.addDescriptor(bleDescriptor)
 
 #### Parameters
 
-**bleDescriptor**: descriptor to add to the characteristic
+- **bleDescriptor**: descriptor to add to the characteristic
 
 #### Returns
 Nothing
@@ -3206,7 +3228,7 @@ bleCharacteristic.descriptorCount()
 None
 
 #### Returns
-The **number of Bluetooth® Low Energy descriptors** discovered for the characteristic
+- The **number of Bluetooth® Low Energy descriptors** discovered for the characteristic
 
 #### Example
 
@@ -3236,11 +3258,12 @@ bleCharacteristic.hasDescriptor(uuid, index)
 
 #### Parameters
 
-**index**: index of descriptor
-**uuid**: uuid (as a **String**)
+- **index**: index of descriptor
+- **uuid**: uuid (as a **String**)
 
 #### Returns
-**true**, if the characteristic has a matching descriptor, otherwise **false**.
+- **true**, if the characteristic has a matching descriptor,
+- otherwise **false**.
 
 #### Example
 
@@ -3268,11 +3291,11 @@ bleCharacteristic.descriptor(uuid, index)
 
 #### Parameters
 
-**index**: index of descriptor
-**uuid**: uuid (as a **String**)
+- **index**: index of descriptor
+- **uuid**: uuid (as a **String**)
 
 #### Returns
-BLEDescriptor that represents a characteristics Bluetooth® Low Energy descriptor
+- BLEDescriptor that represents a characteristics Bluetooth® Low Energy descriptor
 
 #### Example
 
@@ -3301,7 +3324,8 @@ bleCharacteristic.canRead()
 None
 
 #### Returns
-**true**, if characteristic is readable, **false** otherwise
+- **true**, if characteristic is readable, 
+- **false** otherwise
 
 #### Example
 
@@ -3330,7 +3354,8 @@ bleCharacteristic.read()
 None
 
 #### Returns
-**true**, if successful, **false** on failure
+- **true**, if successful, 
+- **false** on failure
 
 #### Example
 
@@ -3363,7 +3388,8 @@ bleCharacteristic.canWrite()
 None
 
 #### Returns
-**true**, if characteristic is writable, **false** otherwise
+- **true**, if characteristic is writable,
+- **false** otherwise
 
 #### Example
 
@@ -3392,7 +3418,8 @@ bleCharacteristic.canSubscribe()
 None
 
 #### Returns
-**true**, if characteristic is subscribable, **false** otherwise
+- **true**, if characteristic is subscribable,
+- **false** otherwise
 
 #### Example
 
@@ -3421,7 +3448,8 @@ bleCharacteristic.subscribe()
 None
 
 #### Returns
-**true**, on success, **false** on failure
+- **true**, on success,
+- **false** on failure
 
 #### Example
 
@@ -3469,7 +3497,8 @@ bleCharacteristic.canUnsubscribe()
 None
 
 #### Returns
-**true**, if characteristic is unsubscribable, **false** otherwise
+- **true**, if characteristic is unsubscribable,
+- **false** otherwise
 
 #### Example
 
@@ -3498,7 +3527,8 @@ bleCharacteristic.unsubscribe()
 None
 
 #### Returns
-**true**, on success, **false** on failure
+- **true**, on success,
+- **false** on failure
 
 #### Example
 
@@ -3548,7 +3578,7 @@ bleCharacteristic.valueUpdated()
 None
 
 #### Returns
-**true**, if the characteristics value been updated via a notification or indication
+- **true**, if the characteristics value been updated via a notification or indication
 
 #### Example
 
@@ -3597,13 +3627,13 @@ BLEDescriptor(uuid, stringValue)
 
 #### Parameters
 
-**uuid**: 16-bit or 128-bit UUID in string format
-**value**: byte array value
-**valueSize**: size of byte array value
-**stringValue**: value as a string
+- **uuid**: 16-bit or 128-bit UUID in string format
+- **value**: byte array value
+- **valueSize**: size of byte array value
+- **stringValue**: value as a string
 
 #### Returns
-New **BLEDescriptor** with the specified **UUID** and value
+- New **BLEDescriptor** with the specified **UUID** and value
 
 #### Example
 
@@ -3630,7 +3660,7 @@ bleDescriptor.uuid()
 None
 
 #### Returns
-**UUID** of the Bluetooth® Low Energy descriptor (as a String).
+- **UUID** of the Bluetooth® Low Energy descriptor (as a String).
 
 #### Example
 
@@ -3662,7 +3692,7 @@ bleDescriptor.valueSize()
 None
 
 #### Returns
-**Value size** (in bytes) of the Bluetooth® Low Energy descriptor.
+- **Value size** (in bytes) of the Bluetooth® Low Energy descriptor.
 
 #### Example
 
@@ -3694,7 +3724,7 @@ bleDescriptor.valueLength()
 None
 
 #### Returns
-**Length of descriptor** value in bytes.
+- **Length of descriptor** value in bytes.
 
 #### Example
 
@@ -3740,7 +3770,7 @@ bleDescriptor.value()
 None
 
 #### Returns
-Value byte array of the **BLE descriptor**.
+- Value byte array of the **BLE descriptor**.
 
 #### Example
 
@@ -3775,12 +3805,12 @@ bleDescriptor.readValue(value)
 
 #### Parameters
 
-**buffer**: byte array to read value into
-**length**: size of buffer argument in bytes
-**value**: variable to read value into (by reference)
+- **buffer**: byte array to read value into
+- **length**: size of buffer argument in bytes
+- **value**: variable to read value into (by reference)
 
 #### Returns
-**Number of bytes** read
+- **Number of bytes** read
 
 #### Example
 
@@ -3811,7 +3841,8 @@ bleDescriptor.read()
 None
 
 #### Returns
-**true**, if successful, **false** on failure
+- **true**, if successful,
+- **false** on failure
 
 #### Example
 

From b39ac7ebf27635ad418c2e5fc2a48c14ef7a2eaa Mon Sep 17 00:00:00 2001
From: giulcioffi <g.cioffi@arduino.cc>
Date: Tue, 21 Sep 2021 14:50:24 +0200
Subject: [PATCH 040/112] Add support for NICLA VISION

---
 src/local/BLELocalDevice.cpp     | 9 ++++++---
 src/utility/HCIUartTransport.cpp | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/local/BLELocalDevice.cpp b/src/local/BLELocalDevice.cpp
index 45d975a5..bb337a2b 100644
--- a/src/local/BLELocalDevice.cpp
+++ b/src/local/BLELocalDevice.cpp
@@ -29,6 +29,10 @@
 #ifndef BT_REG_ON
 #define BT_REG_ON PJ_12
 #endif
+#elif defined(ARDUINO_NICLA_VISION)
+#ifndef BT_REG_ON
+#define BT_REG_ON PF_14
+#endif
 #endif
 
 BLELocalDevice::BLELocalDevice()
@@ -61,7 +65,7 @@ int BLELocalDevice::begin()
   delay(100);
   digitalWrite(NINA_RESETN, HIGH);
   delay(750);
-#elif defined(ARDUINO_PORTENTA_H7_M4) || defined(ARDUINO_PORTENTA_H7_M7)
+#elif defined(ARDUINO_PORTENTA_H7_M4) || defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_NICLA_VISION)
   // BT_REG_ON -> HIGH
   pinMode(BT_REG_ON, OUTPUT);
   digitalWrite(BT_REG_ON, HIGH);
@@ -134,8 +138,7 @@ void BLELocalDevice::end()
 #elif defined(ARDUINO_SAMD_NANO_33_IOT) || defined(ARDUINO_NANO_RP2040_CONNECT)
   // disable the NINA
   digitalWrite(NINA_RESETN, LOW);
-#elif defined(ARDUINO_PORTENTA_H7_M4) || defined(ARDUINO_PORTENTA_H7_M7)
-  // BT_REG_ON -> LOW
+#elif defined(ARDUINO_PORTENTA_H7_M4) || defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_NICLA_VISION)
   digitalWrite(BT_REG_ON, LOW);
 #endif
 }
diff --git a/src/utility/HCIUartTransport.cpp b/src/utility/HCIUartTransport.cpp
index 67bc173f..37ce95e7 100644
--- a/src/utility/HCIUartTransport.cpp
+++ b/src/utility/HCIUartTransport.cpp
@@ -27,7 +27,7 @@
 // SerialHCI is already defined in the variant
 #elif defined(ARDUINO_PORTENTA_H7_M4)
 // SerialHCI is already defined in the variant
-#elif defined(ARDUINO_PORTENTA_H7_M7)
+#elif defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_NICLA_VISION)
 #define SerialHCI Serial2
 #else
 #error "Unsupported board selected!"

From 58136fca11465a5b6703b386d9b1f0f1c13ccedf Mon Sep 17 00:00:00 2001
From: Alessandro Ranellucci <alessandro@pintle.it>
Date: Thu, 12 May 2022 10:18:17 +0200
Subject: [PATCH 041/112] Bugfix: memory leak caused by variables not being
 deleted in end(). #192

---
 src/utility/GATT.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/utility/GATT.cpp b/src/utility/GATT.cpp
index 373213b9..50af4f6c 100644
--- a/src/utility/GATT.cpp
+++ b/src/utility/GATT.cpp
@@ -70,7 +70,12 @@ void GATTClass::begin()
 
 void GATTClass::end()
 {
-  _attributes.clear();
+  delete(_genericAccessService);
+  delete(_deviceNameCharacteristic);
+  delete(_appearanceCharacteristic);
+  delete(_genericAttributeService);
+  delete(_servicesChangedCharacteristic);
+  clearAttributes();
 }
 
 void GATTClass::setDeviceName(const char* deviceName)

From 3c6a53ae7856ccf7189df7adc9f38079c8371432 Mon Sep 17 00:00:00 2001
From: Alessandro Ranellucci <alessandro@pintle.it>
Date: Thu, 12 May 2022 14:01:21 +0200
Subject: [PATCH 042/112] Respect refcounting before freeing dynamically
 allocated variables

---
 src/utility/GATT.cpp | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/utility/GATT.cpp b/src/utility/GATT.cpp
index 50af4f6c..5db7ec55 100644
--- a/src/utility/GATT.cpp
+++ b/src/utility/GATT.cpp
@@ -70,11 +70,21 @@ void GATTClass::begin()
 
 void GATTClass::end()
 {
-  delete(_genericAccessService);
-  delete(_deviceNameCharacteristic);
-  delete(_appearanceCharacteristic);
-  delete(_genericAttributeService);
-  delete(_servicesChangedCharacteristic);
+  if (_genericAccessService->release() <= 0)
+    delete(_genericAccessService);
+  
+  if (_deviceNameCharacteristic->release() <= 0)
+    delete(_deviceNameCharacteristic);
+  
+  if (_appearanceCharacteristic->release() <= 0)
+    delete(_appearanceCharacteristic);
+  
+  if (_genericAttributeService->release() <= 0)
+    delete(_genericAttributeService);
+  
+  if (_servicesChangedCharacteristic->release() <= 0)
+    delete(_servicesChangedCharacteristic);
+  
   clearAttributes();
 }
 

From 122319959ddeb317b2e76ffc4c350f4f2f5804d4 Mon Sep 17 00:00:00 2001
From: Alessandro Ranellucci <alessandro@pintle.it>
Date: Thu, 12 May 2022 18:12:46 +0200
Subject: [PATCH 043/112] Call end() upon destruction

---
 src/utility/GATT.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utility/GATT.cpp b/src/utility/GATT.cpp
index 5db7ec55..3874fb6f 100644
--- a/src/utility/GATT.cpp
+++ b/src/utility/GATT.cpp
@@ -38,7 +38,7 @@ GATTClass::GATTClass() :
 
 GATTClass::~GATTClass()
 {
-  clearAttributes();
+  end();
 }
 
 void GATTClass::begin()

From f24ba26576fdb74e6be4ec9f704042f059bdd6e6 Mon Sep 17 00:00:00 2001
From: Alessandro Ranellucci <alessandro@pintle.it>
Date: Thu, 12 May 2022 15:12:16 +0200
Subject: [PATCH 044/112] Prevent double object deletion

---
 src/BLECharacteristic.cpp              | 4 ++--
 src/BLEDescriptor.cpp                  | 4 ++--
 src/BLEService.cpp                     | 4 ++--
 src/local/BLELocalCharacteristic.cpp   | 2 +-
 src/local/BLELocalService.cpp          | 2 +-
 src/remote/BLERemoteCharacteristic.cpp | 2 +-
 src/remote/BLERemoteDevice.cpp         | 2 +-
 src/remote/BLERemoteService.cpp        | 2 +-
 src/utility/GATT.cpp                   | 2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/BLECharacteristic.cpp b/src/BLECharacteristic.cpp
index 1cfbf489..cb9783ce 100644
--- a/src/BLECharacteristic.cpp
+++ b/src/BLECharacteristic.cpp
@@ -72,11 +72,11 @@ BLECharacteristic::BLECharacteristic(const BLECharacteristic& other)
 
 BLECharacteristic::~BLECharacteristic()
 {
-  if (_local && _local->release() <= 0) {
+  if (_local && _local->release() == 0) {
     delete _local;
   }
 
-  if (_remote && _remote->release() <= 0) {
+  if (_remote && _remote->release() == 0) {
     delete _remote;
   }
 }
diff --git a/src/BLEDescriptor.cpp b/src/BLEDescriptor.cpp
index 7a6736b0..366b89aa 100644
--- a/src/BLEDescriptor.cpp
+++ b/src/BLEDescriptor.cpp
@@ -72,11 +72,11 @@ BLEDescriptor::BLEDescriptor(const BLEDescriptor& other)
 
 BLEDescriptor::~BLEDescriptor()
 {
-  if (_local && _local->release() <= 0) {
+  if (_local && _local->release() == 0) {
     delete _local;
   }
 
-  if (_remote && _remote->release() <= 0) {
+  if (_remote && _remote->release() == 0) {
     delete _remote;
   }
 }
diff --git a/src/BLEService.cpp b/src/BLEService.cpp
index 7b5df148..b3f33739 100644
--- a/src/BLEService.cpp
+++ b/src/BLEService.cpp
@@ -65,11 +65,11 @@ BLEService::BLEService(const BLEService& other)
 
 BLEService::~BLEService()
 {
-  if (_local && _local->release() <= 0) {
+  if (_local && _local->release() == 0) {
     delete _local;
   }
 
-  if (_remote && _remote->release() <= 0) {
+  if (_remote && _remote->release() == 0) {
     delete _remote;
   }
 }
diff --git a/src/local/BLELocalCharacteristic.cpp b/src/local/BLELocalCharacteristic.cpp
index 2cd801b2..63208b05 100644
--- a/src/local/BLELocalCharacteristic.cpp
+++ b/src/local/BLELocalCharacteristic.cpp
@@ -62,7 +62,7 @@ BLELocalCharacteristic::~BLELocalCharacteristic()
   for (unsigned int i = 0; i < descriptorCount(); i++) {
     BLELocalDescriptor* d = descriptor(i);
 
-    if (d->release() <= 0) {
+    if (d->release() == 0) {
       delete d;
     }
   }
diff --git a/src/local/BLELocalService.cpp b/src/local/BLELocalService.cpp
index 442c5422..58957342 100644
--- a/src/local/BLELocalService.cpp
+++ b/src/local/BLELocalService.cpp
@@ -33,7 +33,7 @@ BLELocalService::~BLELocalService()
   for (unsigned int i = 0; i < characteristicCount(); i++) {
     BLELocalCharacteristic* c = characteristic(i);
 
-    if (c->release() <= 0) {
+    if (c->release() == 0) {
       delete c;
     }
   }
diff --git a/src/remote/BLERemoteCharacteristic.cpp b/src/remote/BLERemoteCharacteristic.cpp
index e8ac733f..454438b6 100644
--- a/src/remote/BLERemoteCharacteristic.cpp
+++ b/src/remote/BLERemoteCharacteristic.cpp
@@ -44,7 +44,7 @@ BLERemoteCharacteristic::~BLERemoteCharacteristic()
   for (unsigned int i = 0; i < descriptorCount(); i++) {
     BLERemoteDescriptor* d = descriptor(i);
 
-    if (d->release() <= 0) {
+    if (d->release() == 0) {
       delete d;
     }
   }
diff --git a/src/remote/BLERemoteDevice.cpp b/src/remote/BLERemoteDevice.cpp
index 5a49f26f..1a4a67ab 100644
--- a/src/remote/BLERemoteDevice.cpp
+++ b/src/remote/BLERemoteDevice.cpp
@@ -50,7 +50,7 @@ void BLERemoteDevice::clearServices()
   for (unsigned int i = 0; i < serviceCount(); i++) {
     BLERemoteService* s = service(i);
 
-    if (s->release() <= 0) {
+    if (s->release() == 0) {
       delete s;
     }
   }
diff --git a/src/remote/BLERemoteService.cpp b/src/remote/BLERemoteService.cpp
index fd5c0ba6..f7461290 100644
--- a/src/remote/BLERemoteService.cpp
+++ b/src/remote/BLERemoteService.cpp
@@ -31,7 +31,7 @@ BLERemoteService::~BLERemoteService()
   for (unsigned int i = 0; i < characteristicCount(); i++) {
     BLERemoteCharacteristic* c = characteristic(i);
 
-    if (c->release() <= 0) {
+    if (c->release() == 0) {
       delete c;
     }
   }
diff --git a/src/utility/GATT.cpp b/src/utility/GATT.cpp
index 3874fb6f..35adb5f7 100644
--- a/src/utility/GATT.cpp
+++ b/src/utility/GATT.cpp
@@ -179,7 +179,7 @@ void GATTClass::clearAttributes()
   for (unsigned int i = 0; i < attributeCount(); i++) {
     BLELocalAttribute* a = attribute(i);
 
-    if (a->release() <= 0) {
+    if (a->release() == 0) {
       delete a;
     }
   }

From 2b72c948b3f2da4287ce69488da9804bb4bb8e5f Mon Sep 17 00:00:00 2001
From: Martino Facchin <m.facchin@arduino.cc>
Date: Mon, 23 May 2022 18:11:19 +0200
Subject: [PATCH 045/112] Don't double-free characteristics

---
 src/utility/GATT.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/utility/GATT.cpp b/src/utility/GATT.cpp
index 35adb5f7..98d5f4ad 100644
--- a/src/utility/GATT.cpp
+++ b/src/utility/GATT.cpp
@@ -70,19 +70,19 @@ void GATTClass::begin()
 
 void GATTClass::end()
 {
-  if (_genericAccessService->release() <= 0)
+  if (_genericAccessService->release() == 0)
     delete(_genericAccessService);
   
-  if (_deviceNameCharacteristic->release() <= 0)
+  if (_deviceNameCharacteristic->release() == 0)
     delete(_deviceNameCharacteristic);
   
-  if (_appearanceCharacteristic->release() <= 0)
+  if (_appearanceCharacteristic->release() == 0)
     delete(_appearanceCharacteristic);
   
-  if (_genericAttributeService->release() <= 0)
+  if (_genericAttributeService->release() == 0)
     delete(_genericAttributeService);
   
-  if (_servicesChangedCharacteristic->release() <= 0)
+  if (_servicesChangedCharacteristic->release() == 0)
     delete(_servicesChangedCharacteristic);
   
   clearAttributes();

From afccc49f94fcac2d961e74309b100ba7c9e961d1 Mon Sep 17 00:00:00 2001
From: Martino Facchin <m.facchin@arduino.cc>
Date: Mon, 23 May 2022 18:12:01 +0200
Subject: [PATCH 046/112] Don't terminate CordioHCIHook::getDriver() on end()
 for Murata chips

---
 src/utility/HCICordioTransport.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/utility/HCICordioTransport.cpp b/src/utility/HCICordioTransport.cpp
index 28eb97be..4dc8d45e 100644
--- a/src/utility/HCICordioTransport.cpp
+++ b/src/utility/HCICordioTransport.cpp
@@ -234,7 +234,10 @@ void HCICordioTransportClass::end()
     delete bleLoopThread;
     bleLoopThread = NULL;
   }
+
+#if !defined(ARDUINO_PORTENTA_H7_M4) && !defined(ARDUINO_PORTENTA_H7_M7) && !defined(ARDUINO_NICLA_VISION)
   CordioHCIHook::getDriver().terminate();
+#endif
 
   _begun = false;
 }

From f0747240daef118d8039280d0a87ab2b40f3d9ea Mon Sep 17 00:00:00 2001
From: Martino Facchin <m.facchin@arduino.cc>
Date: Mon, 30 May 2022 14:55:10 +0200
Subject: [PATCH 047/112] Release 1.3.0

---
 library.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library.properties b/library.properties
index e8859d8e..35afbfaf 100644
--- a/library.properties
+++ b/library.properties
@@ -1,5 +1,5 @@
 name=ArduinoBLE
-version=1.2.2
+version=1.3.0
 author=Arduino
 maintainer=Arduino <info@arduino.cc>
 sentence=Enables Bluetooth® Low Energy connectivity on the Arduino MKR WiFi 1010, Arduino UNO WiFi Rev.2, Arduino Nano 33 IoT, Arduino Nano 33 BLE and Nicla Sense ME.

From d5bc5b850636be9da59a6c6e147e9d2585433ee4 Mon Sep 17 00:00:00 2001
From: giulcioffi <g.cioffi@arduino.cc>
Date: Tue, 31 May 2022 11:37:52 +0200
Subject: [PATCH 048/112] Prepend 'BLE_GATT_' to READ and WRITE enums to avoid
 clashes with ArduinoIoTCloud lib

---
 src/BLEProperty.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/BLEProperty.h b/src/BLEProperty.h
index 434bd2aa..b9238ba9 100644
--- a/src/BLEProperty.h
+++ b/src/BLEProperty.h
@@ -63,10 +63,10 @@ enum BLEPermission {
 #define    ESP_GATT_PERM_WRITE_AUTHORIZATION   (1 << 10)  /* bit 10 - 0x0400 */
 
 enum BLE_GATT_PERM_ {
-  READ                = 1 << 0,
+  BLE_GATT_READ       = 1 << 0,
   READ_ENCRYPTED      = 1 << 1,
   READ_ENC_MITM       = 1 << 2,
-  WRITE               = 1 << 4,
+  BLE_GATT_WRITE      = 1 << 4,
   WRITE_ENCRYPTED     = 1 << 5,
   WRITE_ENC_MITM      = 1 << 6,
   WRITE_SIGNED        = 1 << 7,

From f24f335c54311ef05c99102ba5714fe99340f2db Mon Sep 17 00:00:00 2001
From: Martino Facchin <m.facchin@arduino.cc>
Date: Tue, 31 May 2022 18:19:56 +0200
Subject: [PATCH 049/112] Publish 1.3.1

---
 library.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library.properties b/library.properties
index 35afbfaf..e2a3f15f 100644
--- a/library.properties
+++ b/library.properties
@@ -1,5 +1,5 @@
 name=ArduinoBLE
-version=1.3.0
+version=1.3.1
 author=Arduino
 maintainer=Arduino <info@arduino.cc>
 sentence=Enables Bluetooth® Low Energy connectivity on the Arduino MKR WiFi 1010, Arduino UNO WiFi Rev.2, Arduino Nano 33 IoT, Arduino Nano 33 BLE and Nicla Sense ME.

From 9bf21b767bbc380f69dbfad7168dcc4f469c93b6 Mon Sep 17 00:00:00 2001
From: Karthik <101386306+laviator98@users.noreply.github.com>
Date: Thu, 9 Jun 2022 12:50:54 +0530
Subject: [PATCH 050/112] Fix Long Term Key Request Negative Reply Command

Kindly See the Docs, https://www.bluetooth.com/specifications/specs/core-specification-4-2/
In Pg. No: 1316/2772, you Can See "7.8.26 LE Long Term Key Request Negative Reply Command".
Kindly See the OFC Code, it is 0x001B.
---
 src/utility/HCI.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utility/HCI.h b/src/utility/HCI.h
index af46265a..b8f88538 100644
--- a/src/utility/HCI.h
+++ b/src/utility/HCI.h
@@ -35,7 +35,7 @@ enum LE_COMMAND {
   ENCRYPT                      = 0x0017,
   RANDOM                       = 0x0018,
   LONG_TERM_KEY_REPLY          = 0x001A,
-  LONG_TERM_KEY_NEGATIVE_REPLY = 0x1B,
+  LONG_TERM_KEY_NEGATIVE_REPLY = 0x001B,
   READ_LOCAL_P256              = 0x0025,
   GENERATE_DH_KEY_V1           = 0x0026,
   GENERATE_DH_KEY_V2           = 0x005E

From fae1e36beeadffadd01624c0c8355ecf0d216149 Mon Sep 17 00:00:00 2001
From: dominsch <dominsch@gmail.com>
Date: Tue, 23 Aug 2022 05:46:47 -0300
Subject: [PATCH 051/112] Change non returning functions to void + spelling
 (#251)

---
 src/utility/ATT.cpp | 4 ++--
 src/utility/HCI.cpp | 8 ++++----
 src/utility/HCI.h   | 8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/utility/ATT.cpp b/src/utility/ATT.cpp
index 439b88e8..acdf5a9f 100644
--- a/src/utility/ATT.cpp
+++ b/src/utility/ATT.cpp
@@ -1272,7 +1272,7 @@ void ATTClass::writeReqOrCmd(uint16_t connectionHandle, uint16_t mtu, uint8_t op
       }
       return;
     }
-    // Check permssion
+    // Check permission
     if((characteristic->permissions() &( BLEPermission::BLEEncryption >> 8)) > 0 && 
        (getPeerEncryption(connectionHandle) & PEER_ENCRYPTION::ENCRYPTED_AES) == 0){
       holdResponse = true;
@@ -1941,4 +1941,4 @@ int ATTClass::getPeerResolvedAddress(uint16_t connectionHandle, uint8_t resolved
 #if !defined(FAKE_ATT)
 ATTClass ATTObj;
 ATTClass& ATT = ATTObj;
-#endif
\ No newline at end of file
+#endif
diff --git a/src/utility/HCI.cpp b/src/utility/HCI.cpp
index 773f4f18..bc7bc2da 100644
--- a/src/utility/HCI.cpp
+++ b/src/utility/HCI.cpp
@@ -460,14 +460,14 @@ int HCIClass::leConnUpdate(uint16_t handle, uint16_t minInterval, uint16_t maxIn
 
   return sendCommand(OGF_LE_CTL << 10 | OCF_LE_CONN_UPDATE, sizeof(leConnUpdateData), &leConnUpdateData);
 }
-int HCIClass::saveNewAddress(uint8_t addressType, uint8_t* address, uint8_t* peerIrk, uint8_t* localIrk){
+void HCIClass::saveNewAddress(uint8_t addressType, uint8_t* address, uint8_t* peerIrk, uint8_t* localIrk){
   if(_storeIRK!=0){
     _storeIRK(address, peerIrk);
   }
   // Again... this should work 
   // leAddResolvingAddress(addressType, address, peerIrk, localIrk);
 }
-int HCIClass::leAddResolvingAddress(uint8_t addressType, uint8_t* peerAddress, uint8_t* peerIrk, uint8_t* localIrk){
+void HCIClass::leAddResolvingAddress(uint8_t addressType, uint8_t* peerAddress, uint8_t* peerIrk, uint8_t* localIrk){
   leStopResolvingAddresses();
 
   struct __attribute__ ((packed)) AddDevice {
@@ -527,7 +527,7 @@ int HCIClass::leReadPeerResolvableAddress(uint8_t peerAddressType, uint8_t* peer
   return res;
 }
 
-int HCIClass::writeLK(uint8_t peerAddress[], uint8_t LK[]){
+void HCIClass::writeLK(uint8_t peerAddress[], uint8_t LK[]){
   struct __attribute__ ((packed)) StoreLK {
     uint8_t nKeys;
     uint8_t BD_ADDR[6];
@@ -538,7 +538,7 @@ int HCIClass::writeLK(uint8_t peerAddress[], uint8_t LK[]){
   for(int i=0; i<16; i++) storeLK.LTK[15-i] = LK[i];
   HCI.sendCommand(OGF_HOST_CTL << 10 | 0x11, sizeof(storeLK), &storeLK);
 }
-int HCIClass::readStoredLKs(){
+void HCIClass::readStoredLKs(){
   uint8_t BD_ADDR[6];
   readStoredLK(BD_ADDR, 1);
 }
diff --git a/src/utility/HCI.h b/src/utility/HCI.h
index b8f88538..0a530ceb 100644
--- a/src/utility/HCI.h
+++ b/src/utility/HCI.h
@@ -99,15 +99,15 @@ class HCIClass {
   virtual AuthReq localAuthreq();
   virtual uint8_t localIOCap();
 
-  virtual int saveNewAddress(uint8_t addressType, uint8_t* address, uint8_t* peerIrk, uint8_t* remoteIrk);
-  virtual int leAddResolvingAddress(uint8_t addressType, uint8_t* address, uint8_t* peerIrk, uint8_t* remoteIrk);
+  virtual void saveNewAddress(uint8_t addressType, uint8_t* address, uint8_t* peerIrk, uint8_t* remoteIrk);
+  virtual void leAddResolvingAddress(uint8_t addressType, uint8_t* address, uint8_t* peerIrk, uint8_t* remoteIrk);
   virtual int leStopResolvingAddresses();
   virtual int leStartResolvingAddresses();
   virtual int leReadPeerResolvableAddress(uint8_t peerAddressType, uint8_t* peerIdentityAddress, uint8_t* peerResolvableAddress);
 
-  virtual int readStoredLKs();
+  virtual void readStoredLKs();
   virtual int readStoredLK(uint8_t BD_ADDR[], uint8_t read_all = 0);
-  virtual int writeLK(uint8_t peerAddress[], uint8_t LK[]);
+  virtual void writeLK(uint8_t peerAddress[], uint8_t LK[]);
   virtual int tryResolveAddress(uint8_t* BDAddr, uint8_t* address);
 
   virtual int sendAclPkt(uint16_t handle, uint8_t cid, uint8_t plen, void* data);

From 991f0763bf172cebfebb7cdccbd289ccb2893263 Mon Sep 17 00:00:00 2001
From: dominsch <dominsch@gmail.com>
Date: Tue, 23 Aug 2022 05:49:29 -0300
Subject: [PATCH 052/112] Support esp32, esp32-C3, esp32-S3 (#252)

* add esp32 support

* Update HCIVirtualTransport.cpp

* Update HCIVirtualTransport.cpp

add ESP32-C3 support

* Revert "Update HCIVirtualTransport.cpp"

This reverts commit 9af9bea9beb9bc63f9aab68893d414b9a22dacd6.

* Update HCIVirtualTransport.cpp

* Update library.properties

* fix crash on restart

* Update ATT.cpp

spelling

* support more espressif chips

* Create compile-for-esp.yaml

don't know what I'm doing

* skip failing examples

* Update compile-for-esp.yaml

* Update compile-for-esp.yaml

* Update compile-for-esp.yaml

* Update compile-for-esp.yaml

* Update compile-for-esp.yaml

* Update compile-examples.yml

* Delete compile-for-esp.yaml
---
 .github/workflows/compile-examples.yml |  33 ++++++
 library.properties                     |   2 +-
 src/utility/HCIUartTransport.cpp       |   2 +-
 src/utility/HCIVirtualTransport.cpp    | 142 +++++++++++++++++++++++++
 src/utility/HCIVirtualTransport.h      |  50 +++++++++
 5 files changed, 227 insertions(+), 2 deletions(-)
 create mode 100644 src/utility/HCIVirtualTransport.cpp
 create mode 100644 src/utility/HCIVirtualTransport.h

diff --git a/.github/workflows/compile-examples.yml b/.github/workflows/compile-examples.yml
index a1faf997..b33d6c75 100644
--- a/.github/workflows/compile-examples.yml
+++ b/.github/workflows/compile-examples.yml
@@ -22,3 +22,36 @@ jobs:
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           fqbn: ${{ matrix.fqbn }}
+          
+  build-for-esp32:
+    runs-on: ubuntu-latest
+    
+    strategy:
+      matrix:
+        fqbn:
+          - esp32:esp32:esp32
+          - esp32:esp32:esp32s3
+          - esp32:esp32:esp32c3
+          # future bluetooth chips
+          #- esp32:esp32:esp32c2
+          #- esp32:esp32:esp32c6
+          #- esp32:esp32:esp32h2
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: arduino/compile-sketches@v1
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          fqbn: ${{ matrix.fqbn }}
+          platforms: |
+            - name: esp32:esp32
+              source-url: https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json
+          sketch-paths: |
+            - examples/Central/Scan
+            - examples/Central/PeripheralExplorer
+            - examples/Central/ScanCallback
+            - examples/Central/SensorTagButton
+            - examples/Peripheral/Advertising/EnhancedAdvertising
+            - examples/Peripheral/Advertising/RawDataAdvertising
+          cli-compile-flags: |
+            - --warnings="none"
diff --git a/library.properties b/library.properties
index e2a3f15f..467d9eaf 100644
--- a/library.properties
+++ b/library.properties
@@ -6,5 +6,5 @@ sentence=Enables Bluetooth® Low Energy connectivity on the Arduino MKR WiFi 101
 paragraph=This library supports creating a Bluetooth® Low Energy peripheral & central mode.
 category=Communication
 url=https://www.arduino.cc/en/Reference/ArduinoBLE
-architectures=samd,megaavr,mbed,apollo3,mbed_nano,mbed_portenta,mbed_nicla
+architectures=samd,megaavr,mbed,apollo3,mbed_nano,mbed_portenta,mbed_nicla,esp32
 includes=ArduinoBLE.h
diff --git a/src/utility/HCIUartTransport.cpp b/src/utility/HCIUartTransport.cpp
index 37ce95e7..1b1a513a 100644
--- a/src/utility/HCIUartTransport.cpp
+++ b/src/utility/HCIUartTransport.cpp
@@ -17,7 +17,7 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#if !defined(ARDUINO_ARCH_MBED) || defined(TARGET_NANO_RP2040_CONNECT)
+#if !defined(ARDUINO_ARCH_MBED) && !defined(ESP32) || defined(TARGET_NANO_RP2040_CONNECT)
 
 #include "HCIUartTransport.h"
 
diff --git a/src/utility/HCIVirtualTransport.cpp b/src/utility/HCIVirtualTransport.cpp
new file mode 100644
index 00000000..046a0e72
--- /dev/null
+++ b/src/utility/HCIVirtualTransport.cpp
@@ -0,0 +1,142 @@
+/*
+  This file is part of the ArduinoBLE library.
+  Copyright (c) 2018 Arduino SA. All rights reserved.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  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
+*/
+
+#if defined(ESP32)
+
+#include "HCIVirtualTransport.h"
+
+StreamBufferHandle_t rec_buffer;
+StreamBufferHandle_t send_buffer;
+TaskHandle_t bleHandle;
+
+
+static void notify_host_send_available(void)
+{
+}
+
+static int notify_host_recv(uint8_t *data, uint16_t length)
+{
+  xStreamBufferSend(rec_buffer,data,length,portMAX_DELAY);  // !!!potentially waiting forever
+  return 0;
+}
+
+static esp_vhci_host_callback_t vhci_host_cb = {
+  notify_host_send_available,
+  notify_host_recv
+};
+
+void bleTask(void *pvParameters)
+{
+  esp_vhci_host_register_callback(&vhci_host_cb);
+  size_t length;
+  uint8_t mybuf[258];
+
+  while(true){
+    length = xStreamBufferReceive(send_buffer,mybuf,258,portMAX_DELAY);
+    while (!esp_vhci_host_check_send_available()) {}
+    esp_vhci_host_send_packet(mybuf, length);
+  }
+}
+
+
+HCIVirtualTransportClass::HCIVirtualTransportClass()
+{
+}
+
+HCIVirtualTransportClass::~HCIVirtualTransportClass()
+{
+}
+
+int HCIVirtualTransportClass::begin()
+{
+  btStarted(); // this somehow stops the arduino ide from initializing bluedroid
+
+  rec_buffer = xStreamBufferCreate(258, 1);
+  send_buffer = xStreamBufferCreate(258, 1);
+
+  esp_err_t ret = nvs_flash_init();
+  if (ret == ESP_ERR_NVS_NO_FREE_PAGES || ret == ESP_ERR_NVS_NEW_VERSION_FOUND) {
+    ESP_ERROR_CHECK(nvs_flash_erase());
+    ret = nvs_flash_init();
+  }
+  esp_bt_controller_config_t bt_cfg = BT_CONTROLLER_INIT_CONFIG_DEFAULT();
+  
+#if CONFIG_IDF_TARGET_ESP32
+  bt_cfg.mode = ESP_BT_MODE_BLE; //original esp32 chip
+#else
+  bt_cfg.bluetooth_mode = ESP_BT_MODE_BLE; //different api for newer models
+#endif
+
+  esp_bt_controller_mem_release(ESP_BT_MODE_CLASSIC_BT);
+  esp_bt_controller_init(&bt_cfg);
+  esp_bt_controller_enable(ESP_BT_MODE_BLE);
+  xTaskCreatePinnedToCore(&bleTask, "bleTask", 2048, NULL, 5, &bleHandle, 0);
+  return 1;
+}
+
+void HCIVirtualTransportClass::end()
+{
+  vStreamBufferDelete(rec_buffer);
+  vStreamBufferDelete(send_buffer);
+  esp_bt_controller_disable();
+  esp_bt_controller_deinit();
+  vTaskDelete(bleHandle);
+}
+
+void HCIVirtualTransportClass::wait(unsigned long timeout)
+{
+  for (unsigned long start = (esp_timer_get_time() / 1000ULL); ((esp_timer_get_time() / 1000ULL) - start) < timeout;) {
+    if (available()) {
+      break;
+    }
+  }
+}
+
+int HCIVirtualTransportClass::available()
+{
+  size_t bytes	= xStreamBufferBytesAvailable(rec_buffer);
+  return bytes;
+}
+
+// never called
+int HCIVirtualTransportClass::peek()
+{
+  return -1;
+}
+
+int HCIVirtualTransportClass::read()
+{
+  uint8_t c;
+  if(xStreamBufferReceive(rec_buffer, &c, 1, portMAX_DELAY)) {
+    return c;
+  }
+  return -1;
+}
+
+size_t HCIVirtualTransportClass::write(const uint8_t* data, size_t length)
+{
+  size_t result = xStreamBufferSend(send_buffer,data,length,portMAX_DELAY);
+  return result;
+}
+
+HCIVirtualTransportClass HCIVirtualTransport;
+
+HCITransportInterface& HCITransport = HCIVirtualTransport;
+
+#endif
diff --git a/src/utility/HCIVirtualTransport.h b/src/utility/HCIVirtualTransport.h
new file mode 100644
index 00000000..0da43cac
--- /dev/null
+++ b/src/utility/HCIVirtualTransport.h
@@ -0,0 +1,50 @@
+/*
+  This file is part of the ArduinoBLE library.
+  Copyright (c) 2018 Arduino SA. All rights reserved.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  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
+*/
+
+#include "HCITransport.h"
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "freertos/FreeRTOS.h"
+#include "freertos/task.h"
+#include "freertos/stream_buffer.h"
+
+#include "esp_bt.h"
+#include "nvs_flash.h"
+
+#include "esp32-hal-bt.h" // this is needed to disable bluedroid
+
+
+class HCIVirtualTransportClass : public HCITransportInterface {
+public:
+  HCIVirtualTransportClass();
+  virtual ~HCIVirtualTransportClass();
+
+  virtual int begin();
+  virtual void end();
+
+  virtual void wait(unsigned long timeout);
+
+  virtual int available();
+  virtual int peek();
+  virtual int read();
+
+  virtual size_t write(const uint8_t* data, size_t length);
+};
\ No newline at end of file

From cd9cbad71af82c939455b8ad446da766adc17a71 Mon Sep 17 00:00:00 2001
From: Giuseppe Roberti <giuseppe.roberti@ieee.org>
Date: Tue, 30 Aug 2022 11:55:17 +0200
Subject: [PATCH 053/112] Fix hard fault when str is NULL

---
 src/utility/BLEUuid.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/utility/BLEUuid.cpp b/src/utility/BLEUuid.cpp
index fba6244a..0465ea9a 100644
--- a/src/utility/BLEUuid.cpp
+++ b/src/utility/BLEUuid.cpp
@@ -30,6 +30,11 @@ BLEUuid::BLEUuid(const char * str) :
   memset(_data, 0x00, sizeof(_data));
 
   _length = 0;
+
+  if (str == NULL) {
+    return;
+  }
+
   for (int i = strlen(str) - 1; i >= 0 && _length < BLE_UUID_MAX_LENGTH; i -= 2) {
     if (str[i] == '-') {
       i++;

From 6e97bf2a3753ffff071b60a762f8178084f702b2 Mon Sep 17 00:00:00 2001
From: Martino Facchin <m.facchin@arduino.cc>
Date: Wed, 31 Aug 2022 18:05:06 +0200
Subject: [PATCH 054/112] Fix memory leak on end() -> begin() -> end()

Only tested in Peripheral mode, with services and characteristics allocated:
* as global objects (arduino way)
* in function stack
* in heap

On mbed-enabled platforms, the memory check can be activated via

```

  ....
  mbed_stats_heap_t heap_stats;
  mbed_stats_heap_get(&heap_stats);
  Serial.print("Heap size: ");
  Serial.print(heap_stats.current_size);
  Serial.print(" / ");
  Serial.println(heap_stats.reserved_size);
  ....
```
---
 src/BLEService.cpp                   | 7 +++++++
 src/BLEService.h                     | 1 +
 src/local/BLELocalAttribute.cpp      | 5 +++++
 src/local/BLELocalAttribute.h        | 1 +
 src/local/BLELocalCharacteristic.cpp | 1 +
 src/local/BLELocalService.cpp        | 9 +++++++--
 src/local/BLELocalService.h          | 1 +
 src/utility/GATT.cpp                 | 9 ++++++++-
 src/utility/GATT.h                   | 1 +
 9 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/src/BLEService.cpp b/src/BLEService.cpp
index b3f33739..ed54f9ff 100644
--- a/src/BLEService.cpp
+++ b/src/BLEService.cpp
@@ -63,6 +63,13 @@ BLEService::BLEService(const BLEService& other)
   }
 }
 
+void BLEService::clear()
+{
+  if (_local) {
+    _local->clear();
+  }
+}
+
 BLEService::~BLEService()
 {
   if (_local && _local->release() == 0) {
diff --git a/src/BLEService.h b/src/BLEService.h
index a8d8b010..5b2440d8 100644
--- a/src/BLEService.h
+++ b/src/BLEService.h
@@ -33,6 +33,7 @@ class BLEService {
   virtual ~BLEService();
 
   const char* uuid() const;
+  void clear();
 
   void addCharacteristic(BLECharacteristic& characteristic);
 
diff --git a/src/local/BLELocalAttribute.cpp b/src/local/BLELocalAttribute.cpp
index ce3010a0..9929fa41 100644
--- a/src/local/BLELocalAttribute.cpp
+++ b/src/local/BLELocalAttribute.cpp
@@ -56,6 +56,11 @@ int BLELocalAttribute::retain()
   return _refCount;
 }
 
+bool BLELocalAttribute::active()
+{
+  return _refCount > 0;
+}
+
 int BLELocalAttribute::release()
 {
   _refCount--;
diff --git a/src/local/BLELocalAttribute.h b/src/local/BLELocalAttribute.h
index 2af948c3..53a0abfe 100644
--- a/src/local/BLELocalAttribute.h
+++ b/src/local/BLELocalAttribute.h
@@ -44,6 +44,7 @@ class BLELocalAttribute
 
   int retain();
   int release();
+  bool active();
 
 protected:
   friend class ATTClass;
diff --git a/src/local/BLELocalCharacteristic.cpp b/src/local/BLELocalCharacteristic.cpp
index 63208b05..ef19e726 100644
--- a/src/local/BLELocalCharacteristic.cpp
+++ b/src/local/BLELocalCharacteristic.cpp
@@ -46,6 +46,7 @@ BLELocalCharacteristic::BLELocalCharacteristic(const char* uuid, uint16_t permis
   if (permissions & (BLENotify | BLEIndicate)) {
     BLELocalDescriptor* cccd = new BLELocalDescriptor("2902", (uint8_t*)&_cccdValue, sizeof(_cccdValue));
   
+    cccd->retain();
     _descriptors.add(cccd);
   }
 
diff --git a/src/local/BLELocalService.cpp b/src/local/BLELocalService.cpp
index 58957342..7fda3cb4 100644
--- a/src/local/BLELocalService.cpp
+++ b/src/local/BLELocalService.cpp
@@ -28,6 +28,12 @@ BLELocalService::BLELocalService(const char* uuid) :
 {
 }
 
+void BLELocalService::clear() {
+  _characteristics.clear();
+  _startHandle = 0;
+  _endHandle = 0;
+}
+
 BLELocalService::~BLELocalService()
 {
   for (unsigned int i = 0; i < characteristicCount(); i++) {
@@ -37,8 +43,7 @@ BLELocalService::~BLELocalService()
       delete c;
     }
   }
-
-  _characteristics.clear();
+  clear();
 }
 
 enum BLEAttributeType BLELocalService::type() const
diff --git a/src/local/BLELocalService.h b/src/local/BLELocalService.h
index e0179a93..f17c610c 100644
--- a/src/local/BLELocalService.h
+++ b/src/local/BLELocalService.h
@@ -36,6 +36,7 @@ class BLELocalService : public BLELocalAttribute {
   virtual enum BLEAttributeType type() const;
 
   void addCharacteristic(BLECharacteristic& characteristic);
+  void clear();
 
 protected:
   friend class ATTClass;
diff --git a/src/utility/GATT.cpp b/src/utility/GATT.cpp
index 98d5f4ad..be914f6f 100644
--- a/src/utility/GATT.cpp
+++ b/src/utility/GATT.cpp
@@ -149,6 +149,7 @@ void GATTClass::addService(BLELocalService* service)
 {
   service->retain();
   _attributes.add(service);
+  _services.add(service);
 
   uint16_t startHandle = attributeCount();
 
@@ -160,6 +161,7 @@ void GATTClass::addService(BLELocalService* service)
     characteristic->setHandle(attributeCount());
     
     // add the characteristic again to make space of the characteristic value handle
+    characteristic->retain();
     _attributes.add(characteristic);
 
     for (unsigned int j = 0; j < characteristic->descriptorCount(); j++) {
@@ -183,8 +185,13 @@ void GATTClass::clearAttributes()
       delete a;
     }
   }
-
   _attributes.clear();
+
+  for (unsigned int i = 0; i < _services.size(); i++) {
+    _services.get(i)->clear();
+  }
+  _services.clear();
+
 }
 
 #if !defined(FAKE_GATT)
diff --git a/src/utility/GATT.h b/src/utility/GATT.h
index fd916709..51d1537e 100644
--- a/src/utility/GATT.h
+++ b/src/utility/GATT.h
@@ -59,6 +59,7 @@ class GATTClass {
 
 private:
   BLELinkedList<BLELocalAttribute*> _attributes;
+  BLELinkedList<BLELocalService*>   _services;
 
   BLELocalService*              _genericAccessService;
   BLELocalCharacteristic*       _deviceNameCharacteristic;

From b5fc368db01e67fc706e231d5fd70ee4ec50353d Mon Sep 17 00:00:00 2001
From: BBear <13687227078@163.com>
Date: Wed, 31 Aug 2022 19:13:15 +0200
Subject: [PATCH 055/112] fix the potential overflow problem of
 leAdvertisingReport->eirData

---
 src/utility/HCI.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/utility/HCI.cpp b/src/utility/HCI.cpp
index bc7bc2da..1902abe7 100644
--- a/src/utility/HCI.cpp
+++ b/src/utility/HCI.cpp
@@ -1116,6 +1116,10 @@ void HCIClass::handleEventPkt(uint8_t /*plen*/, uint8_t pdata[])
           uint8_t eirData[31];
         } *leAdvertisingReport = (EvtLeAdvertisingReport*)&pdata[sizeof(HCIEventHdr) + sizeof(LeMetaEventHeader)];
 
+        if(leAdvertisingReport->eirLength > sizeof(leAdvertisingReport->eirData)){
+          return ;
+        }
+
         if (leAdvertisingReport->status == 0x01) {
           // last byte is RSSI
           int8_t rssi = leAdvertisingReport->eirData[leAdvertisingReport->eirLength];

From dd56eb7e13213a477ad57171c2e334897892fad0 Mon Sep 17 00:00:00 2001
From: Martino Facchin <m.facchin@arduino.cc>
Date: Mon, 5 Sep 2022 14:43:17 +0200
Subject: [PATCH 056/112] Release 1.3.2

---
 library.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library.properties b/library.properties
index 467d9eaf..0648b56a 100644
--- a/library.properties
+++ b/library.properties
@@ -1,5 +1,5 @@
 name=ArduinoBLE
-version=1.3.1
+version=1.3.2
 author=Arduino
 maintainer=Arduino <info@arduino.cc>
 sentence=Enables Bluetooth® Low Energy connectivity on the Arduino MKR WiFi 1010, Arduino UNO WiFi Rev.2, Arduino Nano 33 IoT, Arduino Nano 33 BLE and Nicla Sense ME.

From 07d249acb64f07b2fa338355c7852d519d328b72 Mon Sep 17 00:00:00 2001
From: Steve Allasia <40604011+sallasia@users.noreply.github.com>
Date: Mon, 3 Oct 2022 15:07:44 +0200
Subject: [PATCH 057/112] Fix BLE scanning block after few minutes

---
 src/utility/GAP.cpp | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/utility/GAP.cpp b/src/utility/GAP.cpp
index f3ee32fa..08c9c3f0 100644
--- a/src/utility/GAP.cpp
+++ b/src/utility/GAP.cpp
@@ -22,7 +22,7 @@
 
 #include "GAP.h"
 
-#define GAP_MAX_DISCOVERED_QUEUE_SIZE 5
+#define GAP_MAX_DISCOVERED_QUEUE_SIZE 32
 
 #define GAP_ADV_IND (0x00)
 #define GAP_ADV_SCAN_IND (0x02)
@@ -86,8 +86,14 @@ int GAPClass::scan(bool withDuplicates)
 {
   HCI.leSetScanEnable(false, true);
 
-  // active scan, 10 ms scan interval (N * 0.625), 10 ms scan window (N * 0.625), public own address type, no filter
-  if (HCI.leSetScanParameters(0x01, 0x0010, 0x0010, 0x00, 0x00) != 0) {
+  // active scan, 20 ms scan interval (N * 0.625), 20 ms scan window (N * 0.625), public own address type, no filter
+  /*
+    Warning (from BLUETOOTH SPECIFICATION 5.x):
+    - scan interval: mandatory range from 0x0012 to 0x1000; only even values are valid
+    - scan window: mandatory range from 0x0011 to 0x1000
+    - The scan window can only be less than or equal to the scan interval
+  */
+  if (HCI.leSetScanParameters(0x01, 0x0020, 0x0020, 0x00, 0x00) != 0) {
     return false;
   }
 
@@ -216,8 +222,11 @@ void GAPClass::handleLeAdvertisingReport(uint8_t type, uint8_t addressType, uint
 
   if (discoveredDevice == NULL) {
     if (_discoveredDevices.size() >= GAP_MAX_DISCOVERED_QUEUE_SIZE) {
-      // drop
-      return;
+      // delete data in first list posistion
+      BLEDevice* device_first = _discoveredDevices.remove(0);
+      if (device_first != NULL) {
+        delete device_first;
+      }
     }
 
     discoveredDevice = new BLEDevice(addressType, address);

From c928892cc1eb89de2a112bdf0844fc5252067ccc Mon Sep 17 00:00:00 2001
From: Steve Allasia <40604011+sallasia@users.noreply.github.com>
Date: Mon, 3 Oct 2022 15:26:48 +0200
Subject: [PATCH 058/112] Update GAP.cpp

Removed comment
---
 src/utility/GAP.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/utility/GAP.cpp b/src/utility/GAP.cpp
index 08c9c3f0..f1bf02fe 100644
--- a/src/utility/GAP.cpp
+++ b/src/utility/GAP.cpp
@@ -222,7 +222,6 @@ void GAPClass::handleLeAdvertisingReport(uint8_t type, uint8_t addressType, uint
 
   if (discoveredDevice == NULL) {
     if (_discoveredDevices.size() >= GAP_MAX_DISCOVERED_QUEUE_SIZE) {
-      // delete data in first list posistion
       BLEDevice* device_first = _discoveredDevices.remove(0);
       if (device_first != NULL) {
         delete device_first;

From 1ec7d0046e20a8c78cf40d4bec5bbadfa4bb27bb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 13 Oct 2022 08:41:37 +0000
Subject: [PATCH 059/112] Bump geekyeggo/delete-artifact from 1 to 2

Bumps [geekyeggo/delete-artifact](https://github.com/geekyeggo/delete-artifact) from 1 to 2.
- [Release notes](https://github.com/geekyeggo/delete-artifact/releases)
- [Commits](https://github.com/geekyeggo/delete-artifact/compare/v1...v2)

---
updated-dependencies:
- dependency-name: geekyeggo/delete-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/sync-labels.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/sync-labels.yml b/.github/workflows/sync-labels.yml
index 986bda6f..10abaeac 100644
--- a/.github/workflows/sync-labels.yml
+++ b/.github/workflows/sync-labels.yml
@@ -114,7 +114,7 @@ jobs:
           path: ${{ env.CONFIGURATIONS_FOLDER }}
 
       - name: Remove unneeded artifact
-        uses: geekyeggo/delete-artifact@v1
+        uses: geekyeggo/delete-artifact@v2
         with:
           name: ${{ env.CONFIGURATIONS_ARTIFACT }}
 

From 8ae816ce7b45b801d58ec30241a6405fd3b3b4eb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 25 Oct 2022 08:23:57 +0000
Subject: [PATCH 060/112] Bump carlosperate/download-file-action from 1 to 2

Bumps [carlosperate/download-file-action](https://github.com/carlosperate/download-file-action) from 1 to 2.
- [Release notes](https://github.com/carlosperate/download-file-action/releases)
- [Commits](https://github.com/carlosperate/download-file-action/compare/v1...v2)

---
updated-dependencies:
- dependency-name: carlosperate/download-file-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/sync-labels.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/sync-labels.yml b/.github/workflows/sync-labels.yml
index 10abaeac..94938f35 100644
--- a/.github/workflows/sync-labels.yml
+++ b/.github/workflows/sync-labels.yml
@@ -31,7 +31,7 @@ jobs:
 
       - name: Download JSON schema for labels configuration file
         id: download-schema
-        uses: carlosperate/download-file-action@v1
+        uses: carlosperate/download-file-action@v2
         with:
           file-url: https://raw.githubusercontent.com/arduino/tooling-project-assets/main/workflow-templates/assets/sync-labels/arduino-tooling-gh-label-configuration-schema.json
           location: ${{ runner.temp }}/label-configuration-schema
@@ -65,7 +65,7 @@ jobs:
 
     steps:
       - name: Download
-        uses: carlosperate/download-file-action@v1
+        uses: carlosperate/download-file-action@v2
         with:
           file-url: https://raw.githubusercontent.com/arduino/tooling-project-assets/main/workflow-templates/assets/sync-labels/${{ matrix.filename }}
 

From f852716d0bab16a5d0f87b0dc1bace871a38a686 Mon Sep 17 00:00:00 2001
From: Martino Facchin <m.facchin@arduino.cc>
Date: Fri, 10 Mar 2023 15:11:01 +0100
Subject: [PATCH 061/112] Add compatibility with Giga

---
 library.properties                 | 2 +-
 src/local/BLELocalDevice.cpp       | 8 ++++++--
 src/utility/HCICordioTransport.cpp | 8 ++++----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/library.properties b/library.properties
index 0648b56a..9135fc90 100644
--- a/library.properties
+++ b/library.properties
@@ -6,5 +6,5 @@ sentence=Enables Bluetooth® Low Energy connectivity on the Arduino MKR WiFi 101
 paragraph=This library supports creating a Bluetooth® Low Energy peripheral & central mode.
 category=Communication
 url=https://www.arduino.cc/en/Reference/ArduinoBLE
-architectures=samd,megaavr,mbed,apollo3,mbed_nano,mbed_portenta,mbed_nicla,esp32
+architectures=samd,megaavr,mbed,apollo3,mbed_nano,mbed_portenta,mbed_nicla,esp32,mbed_giga
 includes=ArduinoBLE.h
diff --git a/src/local/BLELocalDevice.cpp b/src/local/BLELocalDevice.cpp
index 91cc8695..20de8222 100644
--- a/src/local/BLELocalDevice.cpp
+++ b/src/local/BLELocalDevice.cpp
@@ -33,6 +33,10 @@
 #ifndef BT_REG_ON
 #define BT_REG_ON PF_14
 #endif
+#elif defined(ARDUINO_GIGA)
+#ifndef BT_REG_ON
+#define BT_REG_ON PA_10
+#endif
 #endif
 
 BLELocalDevice::BLELocalDevice()
@@ -65,7 +69,7 @@ int BLELocalDevice::begin()
   delay(100);
   digitalWrite(NINA_RESETN, HIGH);
   delay(750);
-#elif defined(ARDUINO_PORTENTA_H7_M4) || defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_NICLA_VISION)
+#elif defined(ARDUINO_PORTENTA_H7_M4) || defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_NICLA_VISION) || defined(ARDUINO_GIGA)
   // BT_REG_ON -> HIGH
   pinMode(BT_REG_ON, OUTPUT);
   digitalWrite(BT_REG_ON, HIGH);
@@ -195,7 +199,7 @@ void BLELocalDevice::end()
 #elif defined(ARDUINO_SAMD_NANO_33_IOT) || defined(ARDUINO_NANO_RP2040_CONNECT)
   // disable the NINA
   digitalWrite(NINA_RESETN, LOW);
-#elif defined(ARDUINO_PORTENTA_H7_M4) || defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_NICLA_VISION)
+#elif defined(ARDUINO_PORTENTA_H7_M4) || defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_NICLA_VISION) || defined(ARDUINO_GIGA)
   digitalWrite(BT_REG_ON, LOW);
 #endif
 }
diff --git a/src/utility/HCICordioTransport.cpp b/src/utility/HCICordioTransport.cpp
index 4dc8d45e..0e67dae7 100644
--- a/src/utility/HCICordioTransport.cpp
+++ b/src/utility/HCICordioTransport.cpp
@@ -25,7 +25,7 @@
 #include <driver/CordioHCITransportDriver.h>
 #include <driver/CordioHCIDriver.h>
 
-#if defined(ARDUINO_PORTENTA_H7_M4) || defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_NICLA_VISION)
+#if defined(ARDUINO_PORTENTA_H7_M4) || defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_NICLA_VISION) || defined(ARDUINO_GIGA)
 #include "ble/BLE.h"
 #include <events/mbed_events.h>
 #endif
@@ -181,7 +181,7 @@ HCICordioTransportClass::~HCICordioTransportClass()
 {
 }
 
-#if defined(ARDUINO_PORTENTA_H7_M4) || defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_NICLA_VISION)
+#if defined(ARDUINO_PORTENTA_H7_M4) || defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_NICLA_VISION) || defined(ARDUINO_GIGA)
 events::EventQueue eventQueue(10 * EVENTS_EVENT_SIZE);
 void scheduleMbedBleEvents(BLE::OnEventsToProcessCallbackContext *context) {
   eventQueue.call(mbed::Callback<void()>(&context->ble, &BLE::processEvents));
@@ -201,7 +201,7 @@ int HCICordioTransportClass::begin()
   init_wsf(bufPoolDesc);
 #endif
 
-#if defined(ARDUINO_PORTENTA_H7_M4) || defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_NICLA_VISION)
+#if defined(ARDUINO_PORTENTA_H7_M4) || defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_NICLA_VISION) || defined(ARDUINO_GIGA)
   BLE &ble = BLE::Instance();
   ble.onEventsToProcess(scheduleMbedBleEvents);
 
@@ -235,7 +235,7 @@ void HCICordioTransportClass::end()
     bleLoopThread = NULL;
   }
 
-#if !defined(ARDUINO_PORTENTA_H7_M4) && !defined(ARDUINO_PORTENTA_H7_M7) && !defined(ARDUINO_NICLA_VISION)
+#if defined(ARDUINO_PORTENTA_H7_M4) || defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_NICLA_VISION) || defined(ARDUINO_GIGA)
   CordioHCIHook::getDriver().terminate();
 #endif
 

From 289d3d6335a3f85581fa937d148b0d72958cdc5d Mon Sep 17 00:00:00 2001
From: Martino Facchin <m.facchin@arduino.cc>
Date: Fri, 10 Mar 2023 15:11:23 +0100
Subject: [PATCH 062/112] Publish version 1.3.3

---
 library.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library.properties b/library.properties
index 9135fc90..547ddb7d 100644
--- a/library.properties
+++ b/library.properties
@@ -1,5 +1,5 @@
 name=ArduinoBLE
-version=1.3.2
+version=1.3.3
 author=Arduino
 maintainer=Arduino <info@arduino.cc>
 sentence=Enables Bluetooth® Low Energy connectivity on the Arduino MKR WiFi 1010, Arduino UNO WiFi Rev.2, Arduino Nano 33 IoT, Arduino Nano 33 BLE and Nicla Sense ME.

From a263bc760a0773eaad1ba3fa862726ee8ce3592b Mon Sep 17 00:00:00 2001
From: Martino Facchin <m.facchin@arduino.cc>
Date: Mon, 27 Mar 2023 14:38:23 +0200
Subject: [PATCH 063/112] Restore logic for end() on STM32H7 boards (1DX
 module)

Amends https://github.com/arduino-libraries/ArduinoBLE/commit/f852716d0bab16a5d0f87b0dc1bace871a38a686 and fixes https://github.com/arduino-libraries/ArduinoBLE/issues/292
---
 src/utility/HCICordioTransport.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utility/HCICordioTransport.cpp b/src/utility/HCICordioTransport.cpp
index 0e67dae7..e78a44ea 100644
--- a/src/utility/HCICordioTransport.cpp
+++ b/src/utility/HCICordioTransport.cpp
@@ -235,7 +235,7 @@ void HCICordioTransportClass::end()
     bleLoopThread = NULL;
   }
 
-#if defined(ARDUINO_PORTENTA_H7_M4) || defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_NICLA_VISION) || defined(ARDUINO_GIGA)
+#if !defined(TARGET_STM32H7)
   CordioHCIHook::getDriver().terminate();
 #endif
 

From 55e7bb6a625f8ef8fab2a72e21ab1185dfcd70c0 Mon Sep 17 00:00:00 2001
From: Martino Facchin <m.facchin@arduino.cc>
Date: Mon, 27 Mar 2023 14:39:44 +0200
Subject: [PATCH 064/112] Publish 1.3.4

---
 library.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library.properties b/library.properties
index 547ddb7d..3da861aa 100644
--- a/library.properties
+++ b/library.properties
@@ -1,5 +1,5 @@
 name=ArduinoBLE
-version=1.3.3
+version=1.3.4
 author=Arduino
 maintainer=Arduino <info@arduino.cc>
 sentence=Enables Bluetooth® Low Energy connectivity on the Arduino MKR WiFi 1010, Arduino UNO WiFi Rev.2, Arduino Nano 33 IoT, Arduino Nano 33 BLE and Nicla Sense ME.

From 9aa695e95ef1fe39884bd49f8810afd50dcda01f Mon Sep 17 00:00:00 2001
From: Joso Eterovic <roleroz@gmail.com>
Date: Sun, 28 May 2023 21:55:01 -0700
Subject: [PATCH 065/112] Fix warnings: - Reorder member initialization on
 BLELocalCharacteristic - Remove unused variables in:   -
 HCIClass::tryResolveAddress   - HCIClass::handleEventPkt (the whole else if
 statement did nothing)   - L2CAPSignalingClass::handleSecurityData (one
 initialization should be inside of _BLE_TRACE_   - BluetoothCryptoToolbox::f5
   - BluetoothCryptoToolbox::testAh   - BluetoothCryptoToolbox::testg2 -
 Uninitialized variable in L2CAPSignalingClass::handleSecurityData

---
 src/local/BLELocalCharacteristic.cpp |  4 ++--
 src/utility/HCI.cpp                  | 34 +---------------------------
 src/utility/L2CAPSignaling.cpp       |  9 ++------
 src/utility/btct.cpp                 | 12 ----------
 4 files changed, 5 insertions(+), 54 deletions(-)

diff --git a/src/local/BLELocalCharacteristic.cpp b/src/local/BLELocalCharacteristic.cpp
index ef19e726..207425bd 100644
--- a/src/local/BLELocalCharacteristic.cpp
+++ b/src/local/BLELocalCharacteristic.cpp
@@ -32,14 +32,14 @@
 BLELocalCharacteristic::BLELocalCharacteristic(const char* uuid, uint16_t permissions, int valueSize, bool fixedLength) :
   BLELocalAttribute(uuid),
   _properties((uint8_t)(permissions&0x000FF)),
+  _permissions((uint8_t)((permissions&0xFF00)>>8)),
   _valueSize(min(valueSize, 512)),
   _valueLength(0),
   _fixedLength(fixedLength),
   _handle(0x0000),
   _broadcast(false),
   _written(false),
-  _cccdValue(0x0000),
-  _permissions((uint8_t)((permissions&0xFF00)>>8))
+  _cccdValue(0x0000)
 {
   memset(_eventHandlers, 0x00, sizeof(_eventHandlers));
 
diff --git a/src/utility/HCI.cpp b/src/utility/HCI.cpp
index 1902abe7..af9ffad8 100644
--- a/src/utility/HCI.cpp
+++ b/src/utility/HCI.cpp
@@ -554,15 +554,12 @@ int HCIClass::readStoredLK(uint8_t BD_ADDR[], uint8_t read_all ){
 
 int HCIClass::tryResolveAddress(uint8_t* BDAddr, uint8_t* address){
   uint8_t iphone[16] = {0xA6, 0xD2, 0xD, 0xD3, 0x4F, 0x13, 0x42, 0x4F, 0xE1, 0xC1, 0xFD, 0x22, 0x2E, 0xC5, 0x6A, 0x2D};
-  uint8_t irk[16];
-  for(int i=0; i<16; i++) irk[15-i] = iphone[i];
   bool foundMatch = false;
   if(HCI._getIRKs!=0){
     uint8_t nIRKs = 0;
     uint8_t** BDAddrType = new uint8_t*;
     uint8_t*** BADDRs = new uint8_t**;
     uint8_t*** IRKs = new uint8_t**;
-    uint8_t* memcheck;
 
 
     if(!HCI._getIRKs(&nIRKs, BDAddrType, BADDRs, IRKs)){
@@ -971,33 +968,12 @@ void HCIClass::handleEventPkt(uint8_t /*plen*/, uint8_t pdata[])
       data += 2;
     }
   }
-  else if(eventHdr->evt == EVT_RETURN_LINK_KEYS)
-  {
-    uint8_t num_keys = (uint8_t)pdata[sizeof(HCIEventHdr)];
-    // Serial.print("N keys: ");
-    // Serial.println(num_keys);
-    uint8_t BD_ADDRs[num_keys][6];
-    uint8_t LKs[num_keys][16];
-    auto nAddresss = [pdata](uint8_t nAddr)->uint8_t*{
-      return (uint8_t*) &pdata[sizeof(HCIEventHdr)] + 1 + nAddr*6 + nAddr*16;
-    };
-    auto nLK = [pdata](uint8_t nLK)->uint8_t*{
-      return (uint8_t*) &pdata[sizeof(HCIEventHdr)] + 1 + (nLK+1)*6 + nLK*16;
-    };
-    // Serial.println("Stored LKs are: ");
-    // for(int i=0; i<num_keys; i++){
-    //   Serial.print("Address : ");
-    //   btct.printBytes(nAddresss(i),6);
-    //   Serial.print("LK      : ");
-    //   btct.printBytes(nLK(i),16);
-    // }
-  }
   else if(eventHdr->evt == 0x10)
   {
+#ifdef _BLE_TRACE_
     struct __attribute__ ((packed)) CmdHardwareError {
       uint8_t hardwareCode;
     } *cmdHardwareError = (CmdHardwareError*)&pdata[sizeof(HCIEventHdr)];
-#ifdef _BLE_TRACE_
     Serial.print("Bluetooth hardware error.");
     Serial.print(" Code: 0x");
     Serial.println(cmdHardwareError->hardwareCode, HEX);
@@ -1096,9 +1072,6 @@ void HCIClass::handleEventPkt(uint8_t /*plen*/, uint8_t pdata[])
                                 leConnectionComplete->supervisionTimeout,
                                 leConnectionComplete->masterClockAccuracy);
         }
-        uint8_t address[6];
-        uint8_t BDAddr[6];
-        for(int i=0; i<6; i++) BDAddr[5-i] = leConnectionComplete->peerBdaddr[i];
         // leReadPeerResolvableAddress(leConnectionComplete->peerBdaddrType,BDAddr,address);
         // Serial.print("Resolving address: ");
         // btct.printBytes(BDAddr, 6);
@@ -1325,11 +1298,6 @@ void HCIClass::handleEventPkt(uint8_t /*plen*/, uint8_t pdata[])
 
           // Send Pairing confirm response
           HCI.sendAclPkt(connectionHandle, SECURITY_CID, sizeof(pairingConfirm), &pairingConfirm);
-          // Start calculating DH Key 
-          uint8_t remotePublicKeyReversed[sizeof(HCI.remotePublicKeyBuffer)];
-          for(int i=0; i<sizeof(HCI.remotePublicKeyBuffer); i++){
-            remotePublicKeyReversed[sizeof(HCI.remotePublicKeyBuffer)-i] = HCI.remotePublicKeyBuffer[i];
-          }
           
           HCI.sendCommand( (OGF_LE_CTL << 10) | LE_COMMAND::GENERATE_DH_KEY_V1, sizeof(HCI.remotePublicKeyBuffer), HCI.remotePublicKeyBuffer);
         }else{
diff --git a/src/utility/L2CAPSignaling.cpp b/src/utility/L2CAPSignaling.cpp
index 2ef08b62..7af170df 100644
--- a/src/utility/L2CAPSignaling.cpp
+++ b/src/utility/L2CAPSignaling.cpp
@@ -264,12 +264,12 @@ void L2CAPSignalingClass::handleSecurityData(uint16_t connectionHandle, uint8_t
   }
   else if(code == CONNECTION_PAIRING_FAILED)
   {
+#ifdef _BLE_TRACE_
     struct __attribute__ ((packed)) PairingFailed
     {
       uint8_t code;
       uint8_t reason;
     } *pairingFailed = (PairingFailed*)data;
-#ifdef _BLE_TRACE_
     Serial.print("Pairing failed with code: 0x");
     Serial.println(pairingFailed->reason,HEX);
 #endif
@@ -293,7 +293,7 @@ void L2CAPSignalingClass::handleSecurityData(uint16_t connectionHandle, uint8_t
     } *identityAddress = (IdentityAddress*)data;
     // we can save this information now.
     uint8_t peerAddress[6];
-    for(int i; i<6; i++) peerAddress[5-i] = identityAddress->address[i];
+    for(int i=0; i<6; i++) peerAddress[5-i] = identityAddress->address[i];
 
     HCI.saveNewAddress(identityAddress->addressType, peerAddress, ATT.peerIRK, ATT.localIRK);
     if(HCI._storeLTK!=0){
@@ -315,11 +315,6 @@ void L2CAPSignalingClass::handleSecurityData(uint16_t connectionHandle, uint8_t
     };
     memcpy(generateDHKeyCommand.x,connectionPairingPublicKey->x,32);
     memcpy(generateDHKeyCommand.y,connectionPairingPublicKey->y,32);
-    struct __attribute__ ((packed)) ReadPublicKeyCommand {
-      uint8_t code;
-    } readPublicKeyCommand = {
-      LE_COMMAND::READ_LOCAL_P256,
-    };
 
     if(ATT.setPeerEncryption(connectionHandle, ATT.getPeerEncryption(connectionHandle) | PEER_ENCRYPTION::REQUESTED_ENCRYPTION)){
 #ifdef _BLE_TRACE_
diff --git a/src/utility/btct.cpp b/src/utility/btct.cpp
index b4faf053..6829494c 100644
--- a/src/utility/btct.cpp
+++ b/src/utility/btct.cpp
@@ -60,16 +60,8 @@ int BluetoothCryptoToolbox::f5(uint8_t DHKey[],uint8_t N_master[], uint8_t N_sla
     printBytes(BD_ADDR_slave, ADDR_LEN);
 #endif
 
-    uint8_t ADD_M[7];
-    uint8_t ADD_S[7];
     uint8_t T[16];
 
-    for(int i=0; i<6; i++){
-        ADD_M[1+i] = BD_ADDR_master[i];
-        ADD_M[0] = 0x00;
-        ADD_S[i+1] = BD_ADDR_slave[i];
-        ADD_S[0] = 0x00;
-    }
     struct __attribute__ ((packed)) CmacInput
     {
         uint8_t counter;
@@ -135,11 +127,8 @@ int BluetoothCryptoToolbox::ah(uint8_t k[16], uint8_t r[3], uint8_t* result)
 void BluetoothCryptoToolbox::testAh()
 {
     uint8_t irk[16] = {0xec,0x02,0x34,0xa3,0x57,0xc8,0xad,0x05,0x34,0x10,0x10,0xa6,0x0a,0x39,0x7d,0x9b};         
-    uint8_t r[3]   = {0x70,0x81,0x94};
-    uint8_t expected_AES[16] = {0x15,0x9d,0x5f,0xb7,0x2e,0xbe,0x23,0x11,0xa4,0x8c,0x1b,0xdc,0xc4,0x0d,0xfb,0xaa};
     uint8_t expected_final[3] = {0x0d,0xfb,0xaa};
     
-    for(int i=0; i<3; i++) r[2-i] = expected_final[3+i];
     uint8_t ourResult[3];
     ah(irk, expected_final, ourResult);
 
@@ -170,7 +159,6 @@ void BluetoothCryptoToolbox::testg2(){
     uint8_t V[32] = {0x55,0x18,0x8b,0x3d,0x32,0xf6,0xbb,0x9a,0x90,0x0a,0xfc,0xfb,0xee,0xd4,0xe7,0x2a,0x59,0xcb,0x9a,0xc2,0xf1,0x9d,0x7c,0xfb,0x6b,0x4f,0xdd,0x49,0xf4,0x7f,0xc5,0xfd};
     uint8_t X[16] = {0xd5,0xcb,0x84,0x54,0xd1,0x77,0x73,0x3e,0xff,0xff,0xb2,0xec,0x71,0x2b,0xae,0xab};
     uint8_t Y[16] = {0xa6,0xe8,0xe7,0xcc,0x25,0xa7,0x5f,0x6e,0x21,0x65,0x83,0xf7,0xff,0x3d,0xc4,0xcf};
-    uint8_t AES[16] = {0x15,0x36,0xd1,0x8d,0xe3,0xd2,0x0d,0xf9,0x9b,0x70,0x44,0xc1,0x2f,0x9e,0xd5,0xba};
     uint8_t out[4];
     
     

From 1dfbf629d6b86d9e58a594d3588d5d0850783856 Mon Sep 17 00:00:00 2001
From: Joso Eterovic <roleroz@gmail.com>
Date: Sun, 28 May 2023 21:58:22 -0700
Subject: [PATCH 066/112] Remove another unused variable

---
 src/utility/HCI.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/utility/HCI.cpp b/src/utility/HCI.cpp
index af9ffad8..e9743758 100644
--- a/src/utility/HCI.cpp
+++ b/src/utility/HCI.cpp
@@ -553,7 +553,6 @@ int HCIClass::readStoredLK(uint8_t BD_ADDR[], uint8_t read_all ){
 }
 
 int HCIClass::tryResolveAddress(uint8_t* BDAddr, uint8_t* address){
-  uint8_t iphone[16] = {0xA6, 0xD2, 0xD, 0xD3, 0x4F, 0x13, 0x42, 0x4F, 0xE1, 0xC1, 0xFD, 0x22, 0x2E, 0xC5, 0x6A, 0x2D};
   bool foundMatch = false;
   if(HCI._getIRKs!=0){
     uint8_t nIRKs = 0;

From 0ad2d7dce3ec9d3541c09fe9404dab97d8c02073 Mon Sep 17 00:00:00 2001
From: Martino Facchin <m.facchin@arduino.cc>
Date: Tue, 4 Apr 2023 18:51:34 +0200
Subject: [PATCH 067/112] Support C33

---
 src/local/BLELocalDevice.cpp     | 20 ++++++++++++++++++++
 src/utility/HCIUartTransport.cpp |  2 ++
 2 files changed, 22 insertions(+)

diff --git a/src/local/BLELocalDevice.cpp b/src/local/BLELocalDevice.cpp
index 20de8222..79e43bf5 100644
--- a/src/local/BLELocalDevice.cpp
+++ b/src/local/BLELocalDevice.cpp
@@ -73,6 +73,26 @@ int BLELocalDevice::begin()
   // BT_REG_ON -> HIGH
   pinMode(BT_REG_ON, OUTPUT);
   digitalWrite(BT_REG_ON, HIGH);
+#elif defined(ARDUINO_PORTENTA_C33)
+#define NINA_GPIO0      (100)
+#define NINA_RESETN     (101)
+  pinMode(NINA_GPIO0, OUTPUT);
+  pinMode(NINA_RESETN, OUTPUT);
+  Serial5.begin(921600);
+
+  digitalWrite(NINA_GPIO0, HIGH);
+  delay(100);
+  digitalWrite(NINA_RESETN, HIGH);
+  digitalWrite(NINA_RESETN, LOW);
+  digitalWrite(NINA_RESETN, HIGH);
+  auto _start = millis();
+  while (millis() - _start < 500) {
+    if (Serial5.available()) {
+      Serial5.read();
+    }
+  }
+  //pinMode(94, OUTPUT);
+  //digitalWrite(94, LOW);
 #endif
 
 
diff --git a/src/utility/HCIUartTransport.cpp b/src/utility/HCIUartTransport.cpp
index 1b1a513a..1cd44495 100644
--- a/src/utility/HCIUartTransport.cpp
+++ b/src/utility/HCIUartTransport.cpp
@@ -29,6 +29,8 @@
 // SerialHCI is already defined in the variant
 #elif defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_NICLA_VISION)
 #define SerialHCI Serial2
+#elif defined(ARDUINO_PORTENTA_C33)
+#define SerialHCI Serial5
 #else
 #error "Unsupported board selected!"
 #endif

From 0753ec0fe43c22600df09c7b8eb7e7a0b870500b Mon Sep 17 00:00:00 2001
From: per1234 <accounts@perglass.com>
Date: Sun, 2 Jul 2023 07:39:28 -0700
Subject: [PATCH 068/112] Fix broken image embed in documentation

The file previously targeted by the embed has been lost or moved. Experience shows that this is is a common occurrence
with the files hosted by Arduino, and will be especially problematic in cases like this where the file may appear to be
superfluous to the website maintainers due to the lack of any internal references to it, so the only way to ensure the
file will continue to be available is by hosting alongside the documentation content in the repository.

I was able to recover the lost file from the Internet Archive Wayback Machine's 2023-06-18 archive of the previous URL:

https://web.archive.org/web/20230618230604/https://www.arduino.cc/en/uploads/Reference/ble-bulletin-board-model.png

The absolute URL of the file was intentionally used in the markup instead of what would normally be the best practices
of using the relative path. The reason is because the documentation content will be published at
https://reference.arduino.cc/reference/en/libraries/arduinoble/ and the publishing system doesn't have any capability
for handling asset files.
---
 docs/assets/ble-bulletin-board-model.png | Bin 0 -> 41914 bytes
 docs/readme.md                           |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 docs/assets/ble-bulletin-board-model.png

diff --git a/docs/assets/ble-bulletin-board-model.png b/docs/assets/ble-bulletin-board-model.png
new file mode 100644
index 0000000000000000000000000000000000000000..409ae9e89385b0c27d8331f7d52fff2a8f71e097
GIT binary patch
literal 41914
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%0D=_TZL8{w6fgEx~7n--;r3l9+lBb-c
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

literal 0
HcmV?d00001

diff --git a/docs/readme.md b/docs/readme.md
index 5a52d988..7451e015 100644
--- a/docs/readme.md
+++ b/docs/readme.md
@@ -11,7 +11,7 @@ Bluetooth® 4.0 includes both traditional Bluetooth®, now labeled "Bluetooth®
 
 Unlike standard Bluetooth® communication basically based on an asynchronous serial connection (UART) a Bluetooth® LE radio acts like a community bulletin board. The computers that connect to it are like community members that read the bulletin board. Each radio acts as either the bulletin board or the reader. If your radio is a bulletin board (called a peripheral device in Bluetooth® LE parlance) it posts data for all radios in the community to read. If your radio is a reader (called a central device in Blueooth LE terms) it reads from any of the bulletin boards (peripheral devices) that have information about which it cares. You can also think of peripheral devices as the servers in a client-server transaction, because they contain the information that reader radios ask for. Similarly, central devices are the clients of the Bluetooth® LE world because they read information available from the peripherals.
 
-![Communication between central and peripheral devices](https://www.arduino.cc/en/uploads/Reference/ble-bulletin-board-model.png)
+![Communication between central and peripheral devices](https://raw.githubusercontent.com/arduino-libraries/ArduinoBLE/master/docs/assets/ble-bulletin-board-model.png)
 
 Think of a Bluetooth® LE peripheral device as a bulletin board and central devices as viewers of the board. Central devices view the services, get the data, then move on. Each transaction is quick (a few milliseconds), so multiple central devices can get data from one peripheral.
 

From a29f1aa61d1b48321b2aaf8a373fa2b80404c7f8 Mon Sep 17 00:00:00 2001
From: per1234 <accounts@perglass.com>
Date: Sun, 2 Jul 2023 07:46:33 -0700
Subject: [PATCH 069/112] Fix broken link in documentation

The previous target of this link is no longer available.

I found that there is no longer an authoritative web page that provides a list of standard GATT service UUIDs, equivalent to the previous target of that link:

https://web.archive.org/web/20160305021019/https://developer.bluetooth.org/gatt/services/Pages/ServicesHome.aspx

The Bluetooth Special Interest Group has since moved this information into the "Assigned Numbers" pdf, so I replaced the
broken link with a link to the download page for that document and noted its location in that document.
---
 docs/readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/readme.md b/docs/readme.md
index 7451e015..5ba0dfb4 100644
--- a/docs/readme.md
+++ b/docs/readme.md
@@ -35,7 +35,7 @@ Just as with writing to a characteristic, you could update your characteristics
 
 ## Services, characteristics, and UUIDs
 
-A Bluetooth® Low Energy peripheral will provide **services**, which in turn provide **characteristics**. You can define your own services, or use [standard services](https://developer.bluetooth.org/gatt/services/Pages/ServicesHome.aspx).
+A Bluetooth® Low Energy peripheral will provide **services**, which in turn provide **characteristics**. You can define your own services, or use standard services (see section 3.4 in the [Assigned Numbers document](https://www.bluetooth.com/specifications/assigned-numbers/)).
 
 Services are identified by unique numbers known as UUIDs. You know about UUIDs from other contexts. Standard services have a 16-bit UUID and custom services have a 128-bit UUID. The ability to define services and characteristics depends on the radio you're using and its firmware.
 

From 8ca541559676bc88dce841a889d80ba557fb0399 Mon Sep 17 00:00:00 2001
From: Martino Facchin <m.facchin@arduino.cc>
Date: Tue, 11 Jul 2023 15:13:48 +0200
Subject: [PATCH 070/112] Update library.properties

---
 library.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library.properties b/library.properties
index 3da861aa..a08e251c 100644
--- a/library.properties
+++ b/library.properties
@@ -1,10 +1,10 @@
 name=ArduinoBLE
-version=1.3.4
+version=1.3.5
 author=Arduino
 maintainer=Arduino <info@arduino.cc>
 sentence=Enables Bluetooth® Low Energy connectivity on the Arduino MKR WiFi 1010, Arduino UNO WiFi Rev.2, Arduino Nano 33 IoT, Arduino Nano 33 BLE and Nicla Sense ME.
 paragraph=This library supports creating a Bluetooth® Low Energy peripheral & central mode.
 category=Communication
 url=https://www.arduino.cc/en/Reference/ArduinoBLE
-architectures=samd,megaavr,mbed,apollo3,mbed_nano,mbed_portenta,mbed_nicla,esp32,mbed_giga
+architectures=samd,megaavr,mbed,apollo3,mbed_nano,mbed_portenta,mbed_nicla,esp32,mbed_giga,renesas,renesas_portenta
 includes=ArduinoBLE.h

From c0cd781374c36bf1309529d09ad88c098fdbf45a Mon Sep 17 00:00:00 2001
From: Giampaolo Mancini <giampaolo@trampolineup.com>
Date: Thu, 24 Aug 2023 11:49:50 +0200
Subject: [PATCH 071/112] Add support for OPTA

---
 library.properties                 | 2 +-
 src/local/BLELocalDevice.cpp       | 6 +++---
 src/utility/HCICordioTransport.cpp | 6 +++---
 src/utility/HCIUartTransport.cpp   | 2 ++
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/library.properties b/library.properties
index a08e251c..929fa0fd 100644
--- a/library.properties
+++ b/library.properties
@@ -6,5 +6,5 @@ sentence=Enables Bluetooth® Low Energy connectivity on the Arduino MKR WiFi 101
 paragraph=This library supports creating a Bluetooth® Low Energy peripheral & central mode.
 category=Communication
 url=https://www.arduino.cc/en/Reference/ArduinoBLE
-architectures=samd,megaavr,mbed,apollo3,mbed_nano,mbed_portenta,mbed_nicla,esp32,mbed_giga,renesas,renesas_portenta
+architectures=samd,megaavr,mbed,apollo3,mbed_nano,mbed_portenta,mbed_nicla,esp32,mbed_giga,renesas,renesas_portenta,mbed_opta
 includes=ArduinoBLE.h
diff --git a/src/local/BLELocalDevice.cpp b/src/local/BLELocalDevice.cpp
index 79e43bf5..146d99b9 100644
--- a/src/local/BLELocalDevice.cpp
+++ b/src/local/BLELocalDevice.cpp
@@ -25,7 +25,7 @@
 
 #include "BLELocalDevice.h"
 
-#if defined(ARDUINO_PORTENTA_H7_M4) || defined(ARDUINO_PORTENTA_H7_M7)
+#if defined(ARDUINO_PORTENTA_H7_M4) || defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_OPTA)
 #ifndef BT_REG_ON
 #define BT_REG_ON PJ_12
 #endif
@@ -69,7 +69,7 @@ int BLELocalDevice::begin()
   delay(100);
   digitalWrite(NINA_RESETN, HIGH);
   delay(750);
-#elif defined(ARDUINO_PORTENTA_H7_M4) || defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_NICLA_VISION) || defined(ARDUINO_GIGA)
+#elif defined(ARDUINO_PORTENTA_H7_M4) || defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_NICLA_VISION) || defined(ARDUINO_GIGA) || defined(ARDUINO_OPTA)
   // BT_REG_ON -> HIGH
   pinMode(BT_REG_ON, OUTPUT);
   digitalWrite(BT_REG_ON, HIGH);
@@ -219,7 +219,7 @@ void BLELocalDevice::end()
 #elif defined(ARDUINO_SAMD_NANO_33_IOT) || defined(ARDUINO_NANO_RP2040_CONNECT)
   // disable the NINA
   digitalWrite(NINA_RESETN, LOW);
-#elif defined(ARDUINO_PORTENTA_H7_M4) || defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_NICLA_VISION) || defined(ARDUINO_GIGA)
+#elif defined(ARDUINO_PORTENTA_H7_M4) || defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_NICLA_VISION) || defined(ARDUINO_GIGA) || defined(ARDUINO_OPTA)
   digitalWrite(BT_REG_ON, LOW);
 #endif
 }
diff --git a/src/utility/HCICordioTransport.cpp b/src/utility/HCICordioTransport.cpp
index e78a44ea..947378cf 100644
--- a/src/utility/HCICordioTransport.cpp
+++ b/src/utility/HCICordioTransport.cpp
@@ -25,7 +25,7 @@
 #include <driver/CordioHCITransportDriver.h>
 #include <driver/CordioHCIDriver.h>
 
-#if defined(ARDUINO_PORTENTA_H7_M4) || defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_NICLA_VISION) || defined(ARDUINO_GIGA)
+#if defined(ARDUINO_PORTENTA_H7_M4) || defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_NICLA_VISION) || defined(ARDUINO_GIGA) || defined(ARDUINO_OPTA)
 #include "ble/BLE.h"
 #include <events/mbed_events.h>
 #endif
@@ -181,7 +181,7 @@ HCICordioTransportClass::~HCICordioTransportClass()
 {
 }
 
-#if defined(ARDUINO_PORTENTA_H7_M4) || defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_NICLA_VISION) || defined(ARDUINO_GIGA)
+#if defined(ARDUINO_PORTENTA_H7_M4) || defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_NICLA_VISION) || defined(ARDUINO_GIGA) || defined(ARDUINO_OPTA)
 events::EventQueue eventQueue(10 * EVENTS_EVENT_SIZE);
 void scheduleMbedBleEvents(BLE::OnEventsToProcessCallbackContext *context) {
   eventQueue.call(mbed::Callback<void()>(&context->ble, &BLE::processEvents));
@@ -201,7 +201,7 @@ int HCICordioTransportClass::begin()
   init_wsf(bufPoolDesc);
 #endif
 
-#if defined(ARDUINO_PORTENTA_H7_M4) || defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_NICLA_VISION) || defined(ARDUINO_GIGA)
+#if defined(ARDUINO_PORTENTA_H7_M4) || defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_NICLA_VISION) || defined(ARDUINO_GIGA) || defined(ARDUINO_OPTA)
   BLE &ble = BLE::Instance();
   ble.onEventsToProcess(scheduleMbedBleEvents);
 
diff --git a/src/utility/HCIUartTransport.cpp b/src/utility/HCIUartTransport.cpp
index 1cd44495..3219268d 100644
--- a/src/utility/HCIUartTransport.cpp
+++ b/src/utility/HCIUartTransport.cpp
@@ -29,6 +29,8 @@
 // SerialHCI is already defined in the variant
 #elif defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_NICLA_VISION)
 #define SerialHCI Serial2
+#elif defined(ARDUINO_OPTA)
+#define SerialHCI Serial3
 #elif defined(ARDUINO_PORTENTA_C33)
 #define SerialHCI Serial5
 #else

From 2a35e72af28904a247f01d4a18a6d1e5a1daea62 Mon Sep 17 00:00:00 2001
From: Martino Facchin <m.facchin@arduino.cc>
Date: Mon, 3 Jul 2023 20:03:55 +0200
Subject: [PATCH 072/112] wip: add support for UNO R4 WiFi

Needs UNOR4USBBridge firmware >= 0.2.0
---
 src/utility/HCIUartTransport.cpp      |   2 +-
 src/utility/HCIVirtualTransportAT.cpp | 112 ++++++++++++++++++++++++++
 src/utility/HCIVirtualTransportAT.h   |  42 ++++++++++
 3 files changed, 155 insertions(+), 1 deletion(-)
 create mode 100644 src/utility/HCIVirtualTransportAT.cpp
 create mode 100644 src/utility/HCIVirtualTransportAT.h

diff --git a/src/utility/HCIUartTransport.cpp b/src/utility/HCIUartTransport.cpp
index 3219268d..d3c44d8f 100644
--- a/src/utility/HCIUartTransport.cpp
+++ b/src/utility/HCIUartTransport.cpp
@@ -17,7 +17,7 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#if !defined(ARDUINO_ARCH_MBED) && !defined(ESP32) || defined(TARGET_NANO_RP2040_CONNECT)
+#if !defined(ARDUINO_ARCH_MBED) && !defined(ESP32) && !defined(ARDUINO_UNOR4_WIFI) || defined(TARGET_NANO_RP2040_CONNECT)
 
 #include "HCIUartTransport.h"
 
diff --git a/src/utility/HCIVirtualTransportAT.cpp b/src/utility/HCIVirtualTransportAT.cpp
new file mode 100644
index 00000000..7b3a24a9
--- /dev/null
+++ b/src/utility/HCIVirtualTransportAT.cpp
@@ -0,0 +1,112 @@
+/*
+  This file is part of the ArduinoBLE library.
+  Copyright (c) 2018 Arduino SA. All rights reserved.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  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
+*/
+
+#if defined(ARDUINO_UNOR4_WIFI)
+
+#include "HCIVirtualTransportAT.h"
+
+extern ModemClass modem;
+
+HCIVirtualTransportATClass::HCIVirtualTransportATClass()
+{
+}
+
+HCIVirtualTransportATClass::~HCIVirtualTransportATClass()
+{
+}
+
+static RingBufferN<258> buf;
+
+int HCIVirtualTransportATClass::begin()
+{
+  // TODO: add this helper
+  //modem.debug(Serial);
+  buf.clear();
+  //modem.debug(true);
+  std::string res = "";
+  modem.begin();
+  if (modem.write(std::string(PROMPT(_HCI_BEGIN)), res, CMD(_HCI_BEGIN))) {
+      return 1;
+  }
+  return 0;
+}
+
+void HCIVirtualTransportATClass::end()
+{
+}
+
+void HCIVirtualTransportATClass::wait(unsigned long timeout)
+{
+  std::string res = "";
+  modem.write(std::string(PROMPT(_HCI_WAIT)), res, "%d\n\r", CMD_WRITE(_HCI_WAIT), timeout);
+}
+
+int HCIVirtualTransportATClass::available()
+{
+  std::string res = "";
+  if (buf.available()) {
+    return buf.available();
+  }
+  if (modem.write(std::string(PROMPT(_HCI_AVAILABLE)), res, CMD_READ(_HCI_AVAILABLE))) {
+    return atoi(res.c_str());
+  }
+
+  return 0;
+}
+
+// never called
+int HCIVirtualTransportATClass::peek()
+{
+  return -1;
+}
+
+int HCIVirtualTransportATClass::read()
+{
+  uint8_t c;
+  std::string res = "";
+  if (buf.available()) {
+    return buf.read_char();
+  }
+  modem.avoid_trim_results();
+  modem.read_using_size();
+  if (modem.write(std::string(PROMPT(_HCI_READ)), res, CMD(_HCI_READ))) {
+    for(int i = 0; i < res.size(); i++) {
+      buf.store_char((uint8_t)res[i]);
+    }
+    return buf.read_char();
+  }
+
+  return -1;
+}
+
+size_t HCIVirtualTransportATClass::write(const uint8_t* data, size_t length)
+{
+  std::string res = "";
+  modem.write_nowait(std::string(PROMPT(_HCI_WRITE)), res, "%s%d\r\n" , CMD_WRITE(_HCI_WRITE), length);
+  if(modem.passthrough(data, length)) {
+    return length;
+  }
+  return 0;
+}
+
+HCIVirtualTransportATClass HCIVirtualTransportAT;
+
+HCITransportInterface& HCITransport = HCIVirtualTransportAT;
+
+#endif
diff --git a/src/utility/HCIVirtualTransportAT.h b/src/utility/HCIVirtualTransportAT.h
new file mode 100644
index 00000000..8e29801d
--- /dev/null
+++ b/src/utility/HCIVirtualTransportAT.h
@@ -0,0 +1,42 @@
+/*
+  This file is part of the ArduinoBLE library.
+  Copyright (c) 2018 Arduino SA. All rights reserved.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  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
+*/
+
+#include "HCITransport.h"
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "WiFiS3.h"
+
+class HCIVirtualTransportATClass : public HCITransportInterface {
+public:
+  HCIVirtualTransportATClass();
+  virtual ~HCIVirtualTransportATClass();
+
+  virtual int begin();
+  virtual void end();
+
+  virtual void wait(unsigned long timeout);
+
+  virtual int available();
+  virtual int peek();
+  virtual int read();
+
+  virtual size_t write(const uint8_t* data, size_t length);
+};
\ No newline at end of file

From 742ba783a17fce4ce8d3ddf8992573718f99d37f Mon Sep 17 00:00:00 2001
From: Martino Facchin <m.facchin@arduino.cc>
Date: Tue, 11 Jul 2023 09:30:29 +0200
Subject: [PATCH 073/112] unor4wifi: fix metadata and gh action

---
 .github/workflows/compile-examples.yml | 1 +
 README.md                              | 4 +++-
 library.properties                     | 4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/compile-examples.yml b/.github/workflows/compile-examples.yml
index b33d6c75..81e843dd 100644
--- a/.github/workflows/compile-examples.yml
+++ b/.github/workflows/compile-examples.yml
@@ -15,6 +15,7 @@ jobs:
           - arduino:megaavr:uno2018:mode=on
           - arduino:mbed:nano33ble
           - arduino:mbed_nano:nanorp2040connect
+          - arduino:renesas_uno:unor4wifi
 
     steps:
       - uses: actions/checkout@v3
diff --git a/README.md b/README.md
index 9ec934a3..6808502c 100644
--- a/README.md
+++ b/README.md
@@ -2,12 +2,14 @@
 
 [![Compile Examples Status](https://github.com/arduino-libraries/ArduinoBLE/workflows/Compile%20Examples/badge.svg)](https://github.com/arduino-libraries/ArduinoBLE/actions?workflow=Compile+Examples) [![Spell Check Status](https://github.com/arduino-libraries/ArduinoBLE/workflows/Spell%20Check/badge.svg)](https://github.com/arduino-libraries/ArduinoBLE/actions?workflow=Spell+Check)
 
-Enables Bluetooth® Low Energy connectivity on the Arduino MKR WiFi 1010, Arduino UNO WiFi Rev.2, Arduino Nano 33 IoT, and Arduino Nano 33 BLE.
+Enables Bluetooth® Low Energy connectivity on the Arduino MKR WiFi 1010, Arduino UNO WiFi Rev.2, Arduino Nano 33 IoT, Arduino Nano 33 BLE, Arduino Portenta H7, Arduino Giga R1 and Arduino UNO R4 WiFi.
 
 This library supports creating a Bluetooth® Low Energy peripheral & central mode.
 
 For the Arduino MKR WiFi 1010, Arduino UNO WiFi Rev.2, and Arduino Nano 33 IoT boards, it requires the NINA module to be running [Arduino NINA-W102 firmware](https://github.com/arduino/nina-fw) v1.2.0 or later.
 
+For the Arduino UNO R4 WiFi, it requires the ESP32-S3 module to be running [firmware](https://github.com/arduino/uno-r4-wifi-usb-bridge) v0.2.0 or later.
+
 
 For more information about this library please visit us at:
 https://www.arduino.cc/en/Reference/ArduinoBLE
diff --git a/library.properties b/library.properties
index 929fa0fd..718b6066 100644
--- a/library.properties
+++ b/library.properties
@@ -2,9 +2,9 @@ name=ArduinoBLE
 version=1.3.5
 author=Arduino
 maintainer=Arduino <info@arduino.cc>
-sentence=Enables Bluetooth® Low Energy connectivity on the Arduino MKR WiFi 1010, Arduino UNO WiFi Rev.2, Arduino Nano 33 IoT, Arduino Nano 33 BLE and Nicla Sense ME.
+sentence=Enables Bluetooth® Low Energy connectivity on the Arduino MKR WiFi 1010, Arduino UNO WiFi Rev.2, Arduino Nano 33 IoT, Arduino Nano 33 BLE, Nicla Sense ME and UNO R4 WiFi.
 paragraph=This library supports creating a Bluetooth® Low Energy peripheral & central mode.
 category=Communication
 url=https://www.arduino.cc/en/Reference/ArduinoBLE
-architectures=samd,megaavr,mbed,apollo3,mbed_nano,mbed_portenta,mbed_nicla,esp32,mbed_giga,renesas,renesas_portenta,mbed_opta
+architectures=samd,megaavr,mbed,apollo3,mbed_nano,mbed_portenta,mbed_nicla,esp32,mbed_giga,renesas,renesas_portenta,mbed_opta,renesas_uno
 includes=ArduinoBLE.h

From 56dbfb33aef47489cfbfb26a4e32c8e6d123c9ff Mon Sep 17 00:00:00 2001
From: Martino Facchin <m.facchin@arduino.cc>
Date: Wed, 30 Aug 2023 14:43:44 +0200
Subject: [PATCH 074/112] Publish 1.3.6

---
 library.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library.properties b/library.properties
index 718b6066..5f238fde 100644
--- a/library.properties
+++ b/library.properties
@@ -1,5 +1,5 @@
 name=ArduinoBLE
-version=1.3.5
+version=1.3.6
 author=Arduino
 maintainer=Arduino <info@arduino.cc>
 sentence=Enables Bluetooth® Low Energy connectivity on the Arduino MKR WiFi 1010, Arduino UNO WiFi Rev.2, Arduino Nano 33 IoT, Arduino Nano 33 BLE, Nicla Sense ME and UNO R4 WiFi.

From 304386172a90c47c474e6416151fb69c942ee846 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Sep 2023 08:16:41 +0000
Subject: [PATCH 075/112] Bump actions/checkout from 3 to 4

Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/compile-examples.yml | 4 ++--
 .github/workflows/spell-check.yml      | 2 +-
 .github/workflows/sync-labels.yml      | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/compile-examples.yml b/.github/workflows/compile-examples.yml
index 81e843dd..7f2ed318 100644
--- a/.github/workflows/compile-examples.yml
+++ b/.github/workflows/compile-examples.yml
@@ -18,7 +18,7 @@ jobs:
           - arduino:renesas_uno:unor4wifi
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: arduino/compile-sketches@v1
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -39,7 +39,7 @@ jobs:
           #- esp32:esp32:esp32h2
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: arduino/compile-sketches@v1
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/spell-check.yml b/.github/workflows/spell-check.yml
index 0cbdde58..94b57020 100644
--- a/.github/workflows/spell-check.yml
+++ b/.github/workflows/spell-check.yml
@@ -8,7 +8,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Spell check
         uses: arduino/actions/libraries/spell-check@master
diff --git a/.github/workflows/sync-labels.yml b/.github/workflows/sync-labels.yml
index 94938f35..9cde1acc 100644
--- a/.github/workflows/sync-labels.yml
+++ b/.github/workflows/sync-labels.yml
@@ -27,7 +27,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Download JSON schema for labels configuration file
         id: download-schema
@@ -105,7 +105,7 @@ jobs:
           echo "::set-output name=flag::--dry-run"
 
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Download configuration files artifact
         uses: actions/download-artifact@v3

From de0bcbbe5ef3522eb2c0652b99d5351212765e95 Mon Sep 17 00:00:00 2001
From: Martino Facchin <m.facchin@arduino.cc>
Date: Thu, 26 Oct 2023 17:06:06 +0200
Subject: [PATCH 076/112] Fix functionality on Giga CM4 core

Requires https://github.com/arduino/ArduinoCore-mbed/pull/741
---
 src/local/BLELocalDevice.cpp        |  3 +++
 src/utility/CordioHCICustomDriver.h | 17 +++++++++++++++++
 src/utility/HCICordioTransport.cpp  | 10 ++++++----
 src/utility/HCIUartTransport.cpp    |  4 +++-
 4 files changed, 29 insertions(+), 5 deletions(-)
 create mode 100644 src/utility/CordioHCICustomDriver.h

diff --git a/src/local/BLELocalDevice.cpp b/src/local/BLELocalDevice.cpp
index 146d99b9..be603364 100644
--- a/src/local/BLELocalDevice.cpp
+++ b/src/local/BLELocalDevice.cpp
@@ -72,7 +72,10 @@ int BLELocalDevice::begin()
 #elif defined(ARDUINO_PORTENTA_H7_M4) || defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_NICLA_VISION) || defined(ARDUINO_GIGA) || defined(ARDUINO_OPTA)
   // BT_REG_ON -> HIGH
   pinMode(BT_REG_ON, OUTPUT);
+  digitalWrite(BT_REG_ON, LOW);
+  delay(500);
   digitalWrite(BT_REG_ON, HIGH);
+  delay(500);
 #elif defined(ARDUINO_PORTENTA_C33)
 #define NINA_GPIO0      (100)
 #define NINA_RESETN     (101)
diff --git a/src/utility/CordioHCICustomDriver.h b/src/utility/CordioHCICustomDriver.h
new file mode 100644
index 00000000..fc062ee8
--- /dev/null
+++ b/src/utility/CordioHCICustomDriver.h
@@ -0,0 +1,17 @@
+#if defined(CORE_CM4)
+
+#include "CyH4TransportDriver.h"
+
+ble::vendor::cypress_ble::CyH4TransportDriver& ble_cordio_get_h4_transport_driver()
+{
+    static  ble::vendor::cypress_ble::CyH4TransportDriver s_transport_driver(
+        /* TX */ CYBSP_BT_UART_TX, /* RX */ CYBSP_BT_UART_RX,
+        /* cts */ CYBSP_BT_UART_CTS, /* rts */ CYBSP_BT_UART_RTS, NC, DEF_BT_BAUD_RATE,
+        CYBSP_BT_HOST_WAKE, CYBSP_BT_DEVICE_WAKE
+    );
+    return s_transport_driver;
+}
+
+#define CUSTOM_HCI_DRIVER
+
+#endif
\ No newline at end of file
diff --git a/src/utility/HCICordioTransport.cpp b/src/utility/HCICordioTransport.cpp
index 947378cf..7848712f 100644
--- a/src/utility/HCICordioTransport.cpp
+++ b/src/utility/HCICordioTransport.cpp
@@ -17,8 +17,7 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#if defined(ARDUINO_ARCH_MBED) && !defined(TARGET_NANO_RP2040_CONNECT)
-
+#if defined(ARDUINO_ARCH_MBED) && !defined(TARGET_NANO_RP2040_CONNECT) // && !defined(CORE_CM4)
 #include <Arduino.h>
 #include <mbed.h>
 
@@ -53,6 +52,8 @@
 #define BLE_NAMESPACE ble::vendor::cordio
 #endif
 
+#include "CordioHCICustomDriver.h"
+
 extern BLE_NAMESPACE::CordioHCIDriver& ble_cordio_get_hci_driver();
 
 namespace BLE_NAMESPACE {
@@ -181,7 +182,7 @@ HCICordioTransportClass::~HCICordioTransportClass()
 {
 }
 
-#if defined(ARDUINO_PORTENTA_H7_M4) || defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_NICLA_VISION) || defined(ARDUINO_GIGA) || defined(ARDUINO_OPTA)
+#if (defined(ARDUINO_PORTENTA_H7_M4) || defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_NICLA_VISION) || defined(ARDUINO_GIGA) || defined(ARDUINO_OPTA)) && !defined(CUSTOM_HCI_DRIVER)
 events::EventQueue eventQueue(10 * EVENTS_EVENT_SIZE);
 void scheduleMbedBleEvents(BLE::OnEventsToProcessCallbackContext *context) {
   eventQueue.call(mbed::Callback<void()>(&context->ble, &BLE::processEvents));
@@ -201,7 +202,8 @@ int HCICordioTransportClass::begin()
   init_wsf(bufPoolDesc);
 #endif
 
-#if defined(ARDUINO_PORTENTA_H7_M4) || defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_NICLA_VISION) || defined(ARDUINO_GIGA) || defined(ARDUINO_OPTA)
+#if (defined(ARDUINO_PORTENTA_H7_M4) || defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_NICLA_VISION) || defined(ARDUINO_GIGA) || defined(ARDUINO_OPTA)) && !defined(CUSTOM_HCI_DRIVER)
+
   BLE &ble = BLE::Instance();
   ble.onEventsToProcess(scheduleMbedBleEvents);
 
diff --git a/src/utility/HCIUartTransport.cpp b/src/utility/HCIUartTransport.cpp
index d3c44d8f..d6f9ec3e 100644
--- a/src/utility/HCIUartTransport.cpp
+++ b/src/utility/HCIUartTransport.cpp
@@ -17,7 +17,7 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#if !defined(ARDUINO_ARCH_MBED) && !defined(ESP32) && !defined(ARDUINO_UNOR4_WIFI) || defined(TARGET_NANO_RP2040_CONNECT)
+#if !defined(ARDUINO_ARCH_MBED) && !defined(ESP32) && !defined(ARDUINO_UNOR4_WIFI) || defined(TARGET_NANO_RP2040_CONNECT) //|| defined(CORE_CM4)
 
 #include "HCIUartTransport.h"
 
@@ -33,6 +33,8 @@
 #define SerialHCI Serial3
 #elif defined(ARDUINO_PORTENTA_C33)
 #define SerialHCI Serial5
+#elif defined(ARDUINO_GIGA)
+arduino::UART SerialHCI(CYBSP_BT_UART_TX, CYBSP_BT_UART_RX, CYBSP_BT_UART_RTS, CYBSP_BT_UART_CTS);
 #else
 #error "Unsupported board selected!"
 #endif

From 93802d08dbf2e2b4e61bac8c4098eb502cc212e2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Feb 2024 06:29:02 +0100
Subject: [PATCH 077/112] Bump actions/download-artifact from 3 to 4 (#336)

Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 3 to 4.
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](https://github.com/actions/download-artifact/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/download-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/sync-labels.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/sync-labels.yml b/.github/workflows/sync-labels.yml
index 9cde1acc..885a8ac0 100644
--- a/.github/workflows/sync-labels.yml
+++ b/.github/workflows/sync-labels.yml
@@ -108,7 +108,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Download configuration files artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: ${{ env.CONFIGURATIONS_ARTIFACT }}
           path: ${{ env.CONFIGURATIONS_FOLDER }}

From 416506ef203dbbf3549ffabeb82ab96d1291ea6e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Feb 2024 06:29:12 +0100
Subject: [PATCH 078/112] Bump actions/upload-artifact from 3 to 4 (#337)

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/sync-labels.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/sync-labels.yml b/.github/workflows/sync-labels.yml
index 885a8ac0..2e1d6e05 100644
--- a/.github/workflows/sync-labels.yml
+++ b/.github/workflows/sync-labels.yml
@@ -70,7 +70,7 @@ jobs:
           file-url: https://raw.githubusercontent.com/arduino/tooling-project-assets/main/workflow-templates/assets/sync-labels/${{ matrix.filename }}
 
       - name: Pass configuration files to next job via workflow artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           path: |
             *.yaml

From 37337ad2405109e573eaaafb49dfac4b6a5eec23 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Feb 2024 06:29:28 +0100
Subject: [PATCH 079/112] Bump geekyeggo/delete-artifact from 2 to 4 (#340)

Bumps [geekyeggo/delete-artifact](https://github.com/geekyeggo/delete-artifact) from 2 to 4.
- [Release notes](https://github.com/geekyeggo/delete-artifact/releases)
- [Changelog](https://github.com/GeekyEggo/delete-artifact/blob/main/CHANGELOG.md)
- [Commits](https://github.com/geekyeggo/delete-artifact/compare/v2...v4)

---
updated-dependencies:
- dependency-name: geekyeggo/delete-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/sync-labels.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/sync-labels.yml b/.github/workflows/sync-labels.yml
index 2e1d6e05..47ac50a4 100644
--- a/.github/workflows/sync-labels.yml
+++ b/.github/workflows/sync-labels.yml
@@ -114,7 +114,7 @@ jobs:
           path: ${{ env.CONFIGURATIONS_FOLDER }}
 
       - name: Remove unneeded artifact
-        uses: geekyeggo/delete-artifact@v2
+        uses: geekyeggo/delete-artifact@v4
         with:
           name: ${{ env.CONFIGURATIONS_ARTIFACT }}
 

From 99159f05e19b583e1464e3087fcbd7071f1e8ea4 Mon Sep 17 00:00:00 2001
From: Martino Facchin <m.facchin@arduino.cc>
Date: Wed, 21 Feb 2024 10:55:28 +0100
Subject: [PATCH 080/112] Portenta_H7_M4: provide the correct define

Fixes #333 again (not only for Giga)
---
 src/local/BLELocalDevice.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/local/BLELocalDevice.cpp b/src/local/BLELocalDevice.cpp
index be603364..1d1036be 100644
--- a/src/local/BLELocalDevice.cpp
+++ b/src/local/BLELocalDevice.cpp
@@ -25,7 +25,7 @@
 
 #include "BLELocalDevice.h"
 
-#if defined(ARDUINO_PORTENTA_H7_M4) || defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_OPTA)
+#if defined(PORTENTA_H7_PINS) || defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_OPTA)
 #ifndef BT_REG_ON
 #define BT_REG_ON PJ_12
 #endif
@@ -69,7 +69,7 @@ int BLELocalDevice::begin()
   delay(100);
   digitalWrite(NINA_RESETN, HIGH);
   delay(750);
-#elif defined(ARDUINO_PORTENTA_H7_M4) || defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_NICLA_VISION) || defined(ARDUINO_GIGA) || defined(ARDUINO_OPTA)
+#elif defined(PORTENTA_H7_PINS) || defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_NICLA_VISION) || defined(ARDUINO_GIGA) || defined(ARDUINO_OPTA)
   // BT_REG_ON -> HIGH
   pinMode(BT_REG_ON, OUTPUT);
   digitalWrite(BT_REG_ON, LOW);

From 4a85fec0ae95462b2d96e824ff6fad6aae6e156a Mon Sep 17 00:00:00 2001
From: Alexander Entinger <cto@lxrobotics.com>
Date: Tue, 19 Mar 2024 14:45:48 +0100
Subject: [PATCH 081/112] CI: Add arduino/report-size-deltas action. (#354)

This action comments on the pull request with a report on the resulting change in memory usage of the Arduino sketches compiled by the arduino/compile-sketches action.
---
 .github/workflows/compile-examples.yml   | 83 ++++++++++++++++++++----
 .github/workflows/report-size-deltas.yml | 24 +++++++
 2 files changed, 94 insertions(+), 13 deletions(-)
 create mode 100644 .github/workflows/report-size-deltas.yml

diff --git a/.github/workflows/compile-examples.yml b/.github/workflows/compile-examples.yml
index 7f2ed318..706ccb4c 100644
--- a/.github/workflows/compile-examples.yml
+++ b/.github/workflows/compile-examples.yml
@@ -1,29 +1,86 @@
 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/**"
+  schedule:
+    # Run every Tuesday at 8 AM UTC to catch breakage caused by changes to external resources (libraries, platforms).
+    - cron: "0 8 * * TUE"
+  workflow_dispatch:
+  repository_dispatch:
 
 jobs:
   build:
+    name: ${{ matrix.board.fqbn }}
     runs-on: ubuntu-latest
 
+    env:
+      SKETCHES_REPORTS_PATH: sketches-reports
+
     strategy:
+      fail-fast: false
+
       matrix:
-        fqbn:
-          - arduino:samd:mkrwifi1010
-          - arduino:samd:nano_33_iot
-          - arduino:megaavr:uno2018:mode=on
-          - arduino:mbed:nano33ble
-          - arduino:mbed_nano:nanorp2040connect
-          - arduino:renesas_uno:unor4wifi
+        board:
+          - fqbn: arduino:samd:mkrwifi1010
+            platforms: |
+              - name: arduino:samd
+            artifact-name-suffix: arduino-samd-mkrwifi1010
+          - fqbn: arduino:samd:nano_33_iot
+            platforms: |
+              - name: arduino:samd
+            artifact-name-suffix: arduino-samd-nano_33_iot
+          - fqbn: arduino:megaavr:uno2018:mode=on
+            platforms: |
+              - name: arduino:megaavr
+            artifact-name-suffix: arduino-megaavr-uno2018
+          - fqbn: arduino:mbed_nano:nano33ble
+            platforms: |
+              - name: arduino:mbed_nano
+            artifact-name-suffix: arduino-mbed_nano-nano33ble
+          - fqbn: arduino:mbed_nano:nanorp2040connect
+            platforms: |
+              - name: arduino:mbed_nano
+            artifact-name-suffix: arduino-mbed_nano-nanorp2040connect
+          - fqbn: arduino:renesas_uno:unor4wifi
+            platforms: |
+              - name: arduino:renesas_uno
+            artifact-name-suffix: arduino-renesas_uno-unor4wifi
 
     steps:
-      - uses: actions/checkout@v4
-      - uses: arduino/compile-sketches@v1
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Compile examples
+        uses: arduino/compile-sketches@v1
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
-          fqbn: ${{ matrix.fqbn }}
-          
+          fqbn: ${{ matrix.board.fqbn }}
+          platforms: ${{ matrix.board.platforms }}
+          libraries: |
+            # Install the library from the local path.
+            - source-path: ./
+          sketch-paths: |
+            - examples
+          enable-deltas-report: true
+          sketches-report-path: ${{ env.SKETCHES_REPORTS_PATH }}
+
+      - name: Save sketches report as workflow artifact
+        uses: actions/upload-artifact@v4
+        with:
+          if-no-files-found: error
+          path: ${{ env.SKETCHES_REPORTS_PATH }}
+          name: sketches-report-${{ matrix.board.artifact-name-suffix }}
+
   build-for-esp32:
     runs-on: ubuntu-latest
     
diff --git a/.github/workflows/report-size-deltas.yml b/.github/workflows/report-size-deltas.yml
new file mode 100644
index 00000000..39e2a0ad
--- /dev/null
+++ b/.github/workflows/report-size-deltas.yml
@@ -0,0 +1,24 @@
+name: Report Size Deltas
+
+# See: https://docs.github.com/en/free-pro-team@latest/actions/reference/events-that-trigger-workflows
+on:
+  push:
+    paths:
+      - ".github/workflows/report-size-deltas.yml"
+  schedule:
+    # Run at the minimum interval allowed by GitHub Actions.
+    # Note: GitHub Actions periodically has outages which result in workflow failures.
+    # In this event, the workflows will start passing again once the service recovers.
+    - cron: "*/5 * * * *"
+  workflow_dispatch:
+  repository_dispatch:
+
+jobs:
+  report:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Comment size deltas reports to PRs
+        uses: arduino/report-size-deltas@v1
+        with:
+          # Regex matching the names of the workflow artifacts created by the "Compile Examples" workflow
+          sketches-reports-source: ^sketches-report-.+

From 98ff550988912ffbaeb1d877970e9e05f1de0599 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 19 Mar 2024 14:46:11 +0100
Subject: [PATCH 082/112] Bump geekyeggo/delete-artifact from 4 to 5 (#356)

Bumps [geekyeggo/delete-artifact](https://github.com/geekyeggo/delete-artifact) from 4 to 5.
- [Release notes](https://github.com/geekyeggo/delete-artifact/releases)
- [Changelog](https://github.com/GeekyEggo/delete-artifact/blob/main/CHANGELOG.md)
- [Commits](https://github.com/geekyeggo/delete-artifact/compare/v4...v5)

---
updated-dependencies:
- dependency-name: geekyeggo/delete-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/sync-labels.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/sync-labels.yml b/.github/workflows/sync-labels.yml
index 47ac50a4..53a9f54f 100644
--- a/.github/workflows/sync-labels.yml
+++ b/.github/workflows/sync-labels.yml
@@ -114,7 +114,7 @@ jobs:
           path: ${{ env.CONFIGURATIONS_FOLDER }}
 
       - name: Remove unneeded artifact
-        uses: geekyeggo/delete-artifact@v4
+        uses: geekyeggo/delete-artifact@v5
         with:
           name: ${{ env.CONFIGURATIONS_ARTIFACT }}
 

From 93315a9d727902b1a5c7dcf3f10ac280e07be20f Mon Sep 17 00:00:00 2001
From: Leonardo Cavagnis <l.cavagnis@arduino.cc>
Date: Fri, 7 Jun 2024 17:01:30 +0200
Subject: [PATCH 083/112] add support for silabs core

---
 src/BLECharacteristic.cpp          |   2 +
 src/BLEDevice.cpp                  |   2 +
 src/BLEService.cpp                 |   2 +
 src/utility/ATT.cpp                |   2 +
 src/utility/HCISilabsTransport.cpp | 130 +++++++++++++++++++++++++++++
 src/utility/HCISilabsTransport.h   |  42 ++++++++++
 src/utility/HCIUartTransport.cpp   |   2 +-
 7 files changed, 181 insertions(+), 1 deletion(-)
 create mode 100644 src/utility/HCISilabsTransport.cpp
 create mode 100644 src/utility/HCISilabsTransport.h

diff --git a/src/BLECharacteristic.cpp b/src/BLECharacteristic.cpp
index cb9783ce..bfaee3ff 100644
--- a/src/BLECharacteristic.cpp
+++ b/src/BLECharacteristic.cpp
@@ -24,6 +24,8 @@
 
 #include "BLECharacteristic.h"
 
+extern "C" int strcasecmp(char const *a, char const *b);
+
 BLECharacteristic::BLECharacteristic() :
   BLECharacteristic((BLELocalCharacteristic*)NULL)
 {
diff --git a/src/BLEDevice.cpp b/src/BLEDevice.cpp
index 5f64c1d6..e9ca9b99 100644
--- a/src/BLEDevice.cpp
+++ b/src/BLEDevice.cpp
@@ -25,6 +25,8 @@
 
 #include "BLEDevice.h"
 
+extern "C" int strcasecmp(char const *a, char const *b);
+
 BLEDevice::BLEDevice() :
   _advertisementTypeMask(0),
   _eirDataLength(0),
diff --git a/src/BLEService.cpp b/src/BLEService.cpp
index ed54f9ff..88687b61 100644
--- a/src/BLEService.cpp
+++ b/src/BLEService.cpp
@@ -22,6 +22,8 @@
 
 #include "BLEService.h"
 
+extern "C" int strcasecmp(char const *a, char const *b);
+
 BLEService::BLEService() :
   BLEService((BLELocalService*)NULL)
 {
diff --git a/src/utility/ATT.cpp b/src/utility/ATT.cpp
index acdf5a9f..b1796c90 100644
--- a/src/utility/ATT.cpp
+++ b/src/utility/ATT.cpp
@@ -34,6 +34,8 @@
 
 #include "ATT.h"
 
+extern "C" int strcasecmp(char const *a, char const *b);
+
 #define ATT_OP_ERROR              0x01
 #define ATT_OP_MTU_REQ            0x02
 #define ATT_OP_MTU_RESP           0x03
diff --git a/src/utility/HCISilabsTransport.cpp b/src/utility/HCISilabsTransport.cpp
new file mode 100644
index 00000000..135fd020
--- /dev/null
+++ b/src/utility/HCISilabsTransport.cpp
@@ -0,0 +1,130 @@
+/*
+  This file is part of the ArduinoBLE library.
+  Copyright (c) 2024 Arduino SA. All rights reserved.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  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
+*/
+
+#if defined(ARDUINO_SILABS)
+
+#include "HCISilabsTransport.h"
+#include "sl_string.h"
+
+extern "C" {
+#include "sl_btctrl_linklayer.h"
+#include "sl_hci_common_transport.h"
+}
+
+extern "C" int strcasecmp(char const *a, char const *b) {
+  return sl_strcasecmp(a, b);
+}
+
+static RingBufferN<512> buf;
+
+HCISilabsTransportClass::HCISilabsTransportClass()
+{
+}
+
+HCISilabsTransportClass::~HCISilabsTransportClass()
+{
+}
+
+int HCISilabsTransportClass::begin()
+{
+  if(!sl_btctrl_is_initialized()) {
+    sl_bt_controller_init(); 
+  }
+
+  /* Initialize adv & scan components */
+  sl_btctrl_init_adv();
+  sl_btctrl_init_scan();
+  sl_btctrl_init_conn(); 
+  sl_btctrl_init_adv_ext();
+  sl_btctrl_init_scan_ext();
+
+  /* Initialize HCI controller */
+  sl_bthci_init_upper(); 
+  sl_btctrl_hci_parser_init_default();
+  sl_btctrl_hci_parser_init_conn();
+  sl_btctrl_hci_parser_init_adv();
+  sl_btctrl_hci_parser_init_phy();
+
+  return 1;
+}
+
+void HCISilabsTransportClass::end()
+{
+  sl_bt_controller_deinit();
+}
+
+void HCISilabsTransportClass::wait(unsigned long timeout)
+{
+  for (unsigned long start = millis(); (millis() - start) < timeout;) {
+    if (available()) {
+      break;
+    }
+  }
+}
+
+int HCISilabsTransportClass::available()
+{
+  return buf.available();
+}
+
+int HCISilabsTransportClass::peek()
+{
+  return buf.peek();
+}
+
+int HCISilabsTransportClass::read()
+{
+  return buf.read_char();
+}
+
+size_t HCISilabsTransportClass::write(const uint8_t* data, size_t len)
+{
+  int ret = 0;
+  ret = hci_common_transport_receive((uint8_t *)data, len, true);
+
+  if (ret == 0) return len;
+
+  return 0;
+}
+
+extern "C" {
+  /**
+   * @brief Transmit HCI message using the currently used transport layer.
+   * The HCI calls this function to transmit a full HCI message.
+   * @param[in] data Packet type followed by HCI packet data.
+   * @param[in] len Length of the `data` parameter
+   * @return 0 - on success, or non-zero on failure.
+   */
+  uint32_t hci_common_transport_transmit(uint8_t *data, int16_t len)
+  {
+    for (int i = 0; i < len; i++) {
+      buf.store_char(data[i]);
+      if (buf.isFull()) return SL_STATUS_FAIL;
+    }
+    
+    sl_btctrl_hci_transmit_complete(0);
+    return 0;
+  }
+}
+
+HCISilabsTransportClass HCISilabsTransport;
+
+HCITransportInterface& HCITransport = HCISilabsTransport;
+
+#endif
diff --git a/src/utility/HCISilabsTransport.h b/src/utility/HCISilabsTransport.h
new file mode 100644
index 00000000..2061e782
--- /dev/null
+++ b/src/utility/HCISilabsTransport.h
@@ -0,0 +1,42 @@
+/*
+  This file is part of the ArduinoBLE library.
+  Copyright (c) 2018 Arduino SA. All rights reserved.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  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
+*/
+
+#ifndef _HCI_SILABS_TRANSPORT_H_
+#define _HCI_SILABS_TRANSPORT_H_
+
+#include "HCITransport.h"
+
+class HCISilabsTransportClass : public HCITransportInterface {
+public:
+  HCISilabsTransportClass();
+  virtual ~HCISilabsTransportClass();
+
+  virtual int begin();
+  virtual void end();
+
+  virtual void wait(unsigned long timeout);
+
+  virtual int available();
+  virtual int peek();
+  virtual int read();
+
+  virtual size_t write(const uint8_t* data, size_t length);
+};
+
+#endif
\ No newline at end of file
diff --git a/src/utility/HCIUartTransport.cpp b/src/utility/HCIUartTransport.cpp
index d6f9ec3e..191811a7 100644
--- a/src/utility/HCIUartTransport.cpp
+++ b/src/utility/HCIUartTransport.cpp
@@ -17,7 +17,7 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#if !defined(ARDUINO_ARCH_MBED) && !defined(ESP32) && !defined(ARDUINO_UNOR4_WIFI) || defined(TARGET_NANO_RP2040_CONNECT) //|| defined(CORE_CM4)
+#if !defined(ARDUINO_ARCH_MBED) && !defined(ESP32) && !defined(ARDUINO_SILABS) && !defined(ARDUINO_UNOR4_WIFI) || defined(TARGET_NANO_RP2040_CONNECT) //|| defined(CORE_CM4)
 
 #include "HCIUartTransport.h"
 

From 29bef40e214b96dfe0a9043d791ae15b3934cd19 Mon Sep 17 00:00:00 2001
From: Leonardo Cavagnis <45899760+leonardocavagnis@users.noreply.github.com>
Date: Thu, 1 Aug 2024 16:24:40 +0200
Subject: [PATCH 084/112] Publish 1.3.7

---
 library.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library.properties b/library.properties
index 5f238fde..543998b7 100644
--- a/library.properties
+++ b/library.properties
@@ -1,10 +1,10 @@
 name=ArduinoBLE
-version=1.3.6
+version=1.3.7
 author=Arduino
 maintainer=Arduino <info@arduino.cc>
 sentence=Enables Bluetooth® Low Energy connectivity on the Arduino MKR WiFi 1010, Arduino UNO WiFi Rev.2, Arduino Nano 33 IoT, Arduino Nano 33 BLE, Nicla Sense ME and UNO R4 WiFi.
 paragraph=This library supports creating a Bluetooth® Low Energy peripheral & central mode.
 category=Communication
 url=https://www.arduino.cc/en/Reference/ArduinoBLE
-architectures=samd,megaavr,mbed,apollo3,mbed_nano,mbed_portenta,mbed_nicla,esp32,mbed_giga,renesas,renesas_portenta,mbed_opta,renesas_uno
+architectures=samd,megaavr,mbed,apollo3,mbed_nano,mbed_portenta,mbed_nicla,esp32,mbed_giga,renesas,renesas_portenta,mbed_opta,renesas_uno,silabs
 includes=ArduinoBLE.h

From 910dd44389ea5b00a1e09cbdf4ae7a041e6ee2b5 Mon Sep 17 00:00:00 2001
From: fabik111 <fabiomassimo.centonze@gmail.com>
Date: Wed, 4 Sep 2024 16:18:56 +0200
Subject: [PATCH 085/112] clear advertising data when BLE end is called

---
 src/local/BLELocalDevice.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/local/BLELocalDevice.cpp b/src/local/BLELocalDevice.cpp
index 1d1036be..5792353f 100644
--- a/src/local/BLELocalDevice.cpp
+++ b/src/local/BLELocalDevice.cpp
@@ -224,7 +224,9 @@ void BLELocalDevice::end()
   digitalWrite(NINA_RESETN, LOW);
 #elif defined(ARDUINO_PORTENTA_H7_M4) || defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_NICLA_VISION) || defined(ARDUINO_GIGA) || defined(ARDUINO_OPTA)
   digitalWrite(BT_REG_ON, LOW);
-#endif
+#endif 
+  _advertisingData.clear();
+  _scanResponseData.clear();
 }
 
 void BLELocalDevice::poll()

From 5a531356080351ac03ea0258d82d3842f23db5d8 Mon Sep 17 00:00:00 2001
From: per1234 <accounts@perglass.com>
Date: Tue, 4 Feb 2025 18:16:56 -0800
Subject: [PATCH 086/112] Modernize spell checking infrastructure

The repository contains a CI workflow to check for commonly misspelled words in the project files. This is done using
the "codespell" tool.

A GitHub Actions action handles the installation and execution of the tool. At the time Arduino started setting up such
infrastructure in project repositories, no such action was available and so Arduino created an action. Since that time,
the codespell developers created an equivalent action and so Arduino's action was abandoned. Most of the libraries were
migrated to the new action, but somehow this repository is still using the abandoned action. Due to bit rot, Arduino's
action now fails to initialize:

```
 #8 [3/4] RUN pip3 install codespell
 #8 0.401 error: externally-managed-environment

[...]

ERROR: failed to solve: process "/bin/sh -c pip3 install codespell" did not complete successfully: exit code: 1
Error: Docker build failed with exit code 1
```

The problem is solved by migrating the spell check workflow to using the codespell action.
---
 .codespellrc                      |  9 +++++++++
 .github/workflows/spell-check.yml | 21 +++++++++++++++------
 2 files changed, 24 insertions(+), 6 deletions(-)
 create mode 100644 .codespellrc

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/spell-check.yml b/.github/workflows/spell-check.yml
index 94b57020..6faf09c8 100644
--- a/.github/workflows/spell-check.yml
+++ b/.github/workflows/spell-check.yml
@@ -1,16 +1,25 @@
+# Source: https://github.com/per1234/.github/blob/main/workflow-templates/spell-check.md
 name: Spell Check
 
-on: [push, pull_request]
+# 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:
-  build:
+  spellcheck:
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
 
     steps:
-      - name: Checkout
+      - name: Checkout repository
         uses: actions/checkout@v4
 
       - name: Spell check
-        uses: arduino/actions/libraries/spell-check@master
-        with:
-          skip-paths: ./extras/test
\ No newline at end of file
+        uses: codespell-project/actions-codespell@v2

From 0178fdfc2cdb101a08d30a6481c621e78f5bc5ee Mon Sep 17 00:00:00 2001
From: per1234 <accounts@perglass.com>
Date: Tue, 4 Feb 2025 19:03:19 -0800
Subject: [PATCH 087/112] Fix typos

The "codespell" spellchecker tool is used to automatically detect commonly misspelled words in the files of this
project.

The misspelled words dictionary was expanded in recent releases of codespell, which resulted in the detection of
misspelled words in the project files:

> Error: ./src/utility/HCI.cpp:761: Signalling ==> Signaling
> Error: ./docs/readme.md:22: acknowledgement ==> acknowledgment

The typos are hereby corrected, which will restore the spell check to a passing state.

---

I supplemented the correction of the automatically detected typos with a general review of the project content,
fixing the additional typos I identified during that review.
---
 CHANGELOG                                     |   2 +-
 README.md                                     |   4 +-
 docs/api.md                                   | 143 +++++++-----------
 docs/readme.md                                |   8 +-
 .../SensorTagButton/SensorTagButton.ino       |   2 +-
 .../RawDataAdvertising/RawDataAdvertising.ino |   6 +-
 .../BatteryMonitor/BatteryMonitor.ino         |   4 +-
 .../Peripheral/CallbackLED/CallbackLED.ino    |   2 +-
 .../EncryptedBatteryMonitor.ino               |  22 +--
 examples/Peripheral/LED/LED.ino               |   2 +-
 library.properties                            |   2 +-
 src/utility/HCI.cpp                           |  51 +++----
 12 files changed, 103 insertions(+), 145 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index a29f8598..d8a84716 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,7 +2,7 @@ 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 6808502c..b0027583 100644
--- a/README.md
+++ b/README.md
@@ -2,11 +2,11 @@
 
 [![Compile Examples Status](https://github.com/arduino-libraries/ArduinoBLE/workflows/Compile%20Examples/badge.svg)](https://github.com/arduino-libraries/ArduinoBLE/actions?workflow=Compile+Examples) [![Spell Check Status](https://github.com/arduino-libraries/ArduinoBLE/workflows/Spell%20Check/badge.svg)](https://github.com/arduino-libraries/ArduinoBLE/actions?workflow=Spell+Check)
 
-Enables Bluetooth® Low Energy connectivity on the Arduino MKR WiFi 1010, Arduino UNO WiFi Rev.2, Arduino Nano 33 IoT, Arduino Nano 33 BLE, Arduino Portenta H7, Arduino Giga R1 and Arduino UNO R4 WiFi.
+Enables Bluetooth® Low Energy connectivity on the Arduino MKR WiFi 1010, Arduino UNO WiFi Rev2, Arduino Nano 33 IoT, Arduino Nano 33 BLE, Arduino Portenta H7, Arduino Giga R1 and Arduino UNO R4 WiFi.
 
 This library supports creating a Bluetooth® Low Energy peripheral & central mode.
 
-For the Arduino MKR WiFi 1010, Arduino UNO WiFi Rev.2, and Arduino Nano 33 IoT boards, it requires the NINA module to be running [Arduino NINA-W102 firmware](https://github.com/arduino/nina-fw) v1.2.0 or later.
+For the Arduino MKR WiFi 1010, Arduino UNO WiFi Rev2, and Arduino Nano 33 IoT boards, it requires the NINA module to be running [Arduino NINA-W102 firmware](https://github.com/arduino/nina-fw) v1.2.0 or later.
 
 For the Arduino UNO R4 WiFi, it requires the ESP32-S3 module to be running [firmware](https://github.com/arduino/uno-r4-wifi-usb-bridge) v0.2.0 or later.
 
diff --git a/docs/api.md b/docs/api.md
index 636fe52c..c9f41840 100644
--- a/docs/api.md
+++ b/docs/api.md
@@ -80,7 +80,7 @@ Poll for Bluetooth® Low Energy radio events and handle them.
 #### Syntax
 
 ```
-BLE.poll() 
+BLE.poll()
 BLE.poll(timeout)
 
 ```
@@ -100,7 +100,6 @@ Nothing
   BLE.setEventHandler(BLEConnected, blePeripheralConnectHandler);
   BLE.setEventHandler(BLEDisconnected, blePeripheralDisconnectHandler);
 
-  
 
   BLE.poll();
 
@@ -142,7 +141,6 @@ Nothing.
   BLE.setEventHandler(BLEConnected, blePeripheralConnectHandler);
   BLE.setEventHandler(BLEDisconnected, blePeripheralDisconnectHandler);
 
-  
 
 
 void blePeripheralConnectHandler(BLEDevice central) {
@@ -176,7 +174,7 @@ BLE.connected()
 None
 
 #### Returns
-- **true** if another Bluetooth® Low Energy device is connected, 
+- **true** if another Bluetooth® Low Energy device is connected,
 - otherwise **false**.
 
 #### Example
@@ -208,7 +206,7 @@ BLE.disconnect()
 None
 
 #### Returns
-- **true** if any Bluetooth® Low Energy device that was previously connected was disconnected, 
+- **true** if any Bluetooth® Low Energy device that was previously connected was disconnected,
 - otherwise **false**.
 
 #### Example
@@ -216,8 +214,6 @@ None
 ```arduino
 
   if (BLE.connected()) {
-    
-
     BLE.disconnect();
   }
 
@@ -246,9 +242,9 @@ None
 
 ```arduino
 
-  **String** address = BLE.address();
+  String address = BLE.address();
 
-  Serial.print(“Local address is: “);
+  Serial.print("Local address is: ");
   Serial.println(address);
 
 
@@ -277,9 +273,7 @@ None
 ```arduino
 
   if (BLE.connected()) {
-    
-
-   Serial.print(“RSSI = “);
+    Serial.print("RSSI = ");
     Serial.println(BLE.rssi());
   }
 
@@ -315,9 +309,9 @@ Nothing
     while (1);
   }
 
-  BLE.setAdvertisedServiceUuid(“19B10000-E8F2-537E-4F6C-D104768A1214");
+  BLE.setAdvertisedServiceUuid("19B10000-E8F2-537E-4F6C-D104768A1214");
 
-  // ...  
+  // ...
 
   // start advertising
   BLE.advertise();
@@ -360,7 +354,7 @@ BLEService ledService("19B10000-E8F2-537E-4F6C-D104768A1214"); // Bluetooth® Lo
 
   BLE.setAdvertisedService(ledService);
 
-  // ...  
+  // ...
 
   // start advertising
   BLE.advertise();
@@ -402,7 +396,7 @@ Nothing
 
   BLE.setManufacturerData(data, 5);
 
-  // ...  
+  // ...
 
   // start advertising
   BLE.advertise();
@@ -442,7 +436,7 @@ Nothing
 
   BLE.setLocalName("LED");
 
-  // ...  
+  // ...
 
   // start advertising
   BLE.advertise();
@@ -453,7 +447,7 @@ Nothing
 
 ### `BLE.setDeviceName()`
 
-Set the device name in the built in device name characteristic. If not set, the value defaults “Arduino”.
+Set the device name in the built in device name characteristic. If not set, the value defaults to “Arduino”.
 
 #### Syntax
 
@@ -482,7 +476,7 @@ Nothing
 
   BLE.setDeviceName("LED");
 
-  // ...  
+  // ...
 
   // start advertising
   BLE.advertise();
@@ -493,7 +487,7 @@ Nothing
 
 ### `BLE.setAppearance()`
 
-Set the appearance in the built in appearance characteristic. If not set, the value defaults 0x0000.
+Set the appearance in the built in appearance characteristic. If not set, the value defaults to 0x0000.
 
 #### Syntax
 
@@ -522,7 +516,7 @@ Nothing
 
   BLE.setAppearance(0x8000);
 
-  // ...  
+  // ...
 
   // start advertising
   BLE.advertise();
@@ -568,7 +562,7 @@ BLEService ledService("19B10000-E8F2-537E-4F6C-D104768A1214"); // Bluetooth® Lo
 
   BLE.addService(ledService);
 
-  // ...  
+  // ...
 
 
 ```
@@ -607,7 +601,7 @@ None
 
   BLE.advertise();
 
-  // ...  
+  // ...
 
 
 ```
@@ -645,7 +639,7 @@ Nothing
 
   BLE.advertise();
 
-  // ...  
+  // ...
 
   BLE.stopAdvertise();
 
@@ -682,8 +676,6 @@ None
     Serial.print("Connected to central: ");
     // print the central's MAC address:
     Serial.println(central.address());
-
-    
   }
 
 
@@ -820,7 +812,7 @@ BLE.scan(withDuplicates)
 - **withDuplicates:** optional, defaults to **false**. If **true**, advertisements received more than once will not be filtered
 
 #### Returns
-- 1 on success, 
+- 1 on success,
 - 0 on failure.
 
 #### Example
@@ -839,7 +831,6 @@ BLE.scan(withDuplicates)
   // start scanning for peripheral
   BLE.scan();
 
-  
 
   BLEDevice peripheral = BLE.available();
 
@@ -887,7 +878,6 @@ BLE.scanForName(name, withDuplicates)
   // start scanning for peripheral
   BLE.scanForName("LED");
 
-  
 
   BLEDevice peripheral = BLE.available();
 
@@ -916,7 +906,7 @@ BLE.scanForAddress(address, withDuplicates)
 - **withDuplicates:** optional, defaults to **false**. If **true**, advertisements received more than once will not be filtered
 
 #### Returns
-- 1 on success, 
+- 1 on success,
 - 0 on failure.
 
 #### Example
@@ -935,7 +925,6 @@ BLE.scanForAddress(address, withDuplicates)
   // start scanning for peripheral
   BLE.scanForAddress("aa:bb:cc:ee:dd:ff");
 
-  
 
   BLEDevice peripheral = BLE.available();
 
@@ -983,7 +972,6 @@ BLE.scanForUuid(uuid, withDuplicates)
   // start scanning for peripheral
   BLE.scanForUuid("aa10");
 
-  
 
   BLEDevice peripheral = BLE.available();
 
@@ -1028,7 +1016,6 @@ Nothing
   // start scanning for peripheral
   BLE.scan();
 
-  
   BLE.stopScan();
 
 
@@ -1068,7 +1055,6 @@ Nothing
   // start scanning for peripheral
   BLE.scan();
 
-  
 
   BLEDevice peripheral = BLE.available();
 
@@ -1111,8 +1097,6 @@ Nothing
 
   // if a central is connected to peripheral:
   if (central) {
-    
-
    central.poll();
 
     // ...
@@ -1182,7 +1166,6 @@ None
  // listen for Bluetooth® Low Energy centrals to connect:
   BLEDevice central = BLE.central();
 
-  
 
   central.disconnect();
 
@@ -1219,8 +1202,6 @@ None
     Serial.print("Connected to central: ");
     // print the central's MAC address:
     Serial.println(central.address());
-
-    .
   }
 
 
@@ -1249,9 +1230,7 @@ None
 ```arduino
 
   if (bleDevice.connected()) {
-    
-
-    Serial.print(“RSSI = “);
+    Serial.print("RSSI = ");
     Serial.println(bleDevice.rssi());
   }
 
@@ -1295,7 +1274,6 @@ bleDevice.characteristic(uuid, index)
   // start scanning for peripheral
   BLE.scan();
 
-  
 
   BLEDevice peripheral = BLE.available();
 
@@ -1321,9 +1299,9 @@ bleDevice.characteristic(uuid, index)
       return;
     }
 
-    BLECharacteristic batteryLevelCharacterisic = peripheral.characteristic("2a19");
+    BLECharacteristic batteryLevelCharacteristic = peripheral.characteristic("2a19");
 
-    if (batteryLevelCharacterisic) {
+    if (batteryLevelCharacteristic) {
       // use the characteristic
     } else {
       Serial.println("Peripheral does NOT have battery level characteristic");
@@ -1351,7 +1329,7 @@ bleDevice.discoverAttributes()
 None
 
 #### Returns
-- **true**, if successful, 
+- **true**, if successful,
 - **false** on failure.
 
 #### Example
@@ -1370,7 +1348,6 @@ None
   // start scanning for peripheral
   BLE.scan();
 
-  
 
   BLEDevice peripheral = BLE.available();
 
@@ -1437,7 +1414,6 @@ bleDevice.discoverService(serviceUuid)
   // start scanning for peripheral
   BLE.scan();
 
-  
 
   BLEDevice peripheral = BLE.available();
 
@@ -1503,7 +1479,6 @@ None
   // start scanning for peripheral
   BLE.scan();
 
-  
 
   BLEDevice peripheral = BLE.available();
 
@@ -1577,7 +1552,6 @@ None
   // start scanning for peripheral
   BLE.scan();
 
-  
 
   BLEDevice peripheral = BLE.available();
 
@@ -1651,7 +1625,6 @@ None
   // start scanning for peripheral
   BLE.scan();
 
-  
 
   BLEDevice peripheral = BLE.available();
 
@@ -1725,7 +1698,6 @@ bleDevice.hasService(uuid, index)
   // start scanning for peripheral
   BLE.scan();
 
-  
 
   BLEDevice peripheral = BLE.available();
 
@@ -1798,7 +1770,6 @@ bleDevice.service(uuid, index)
   // start scanning for peripheral
   BLE.scan();
 
-  
 
   BLEDevice peripheral = BLE.available();
 
@@ -1872,7 +1843,6 @@ None
   // start scanning for peripheral
   BLE.scan();
 
-  
 
   BLEDevice peripheral = BLE.available();
 
@@ -1901,7 +1871,7 @@ None
     int characteristicCount = peripheral.characteristicCount();
 
     Serial.print(characteristicCount);
-    Serial.println(" characteristis discovered");
+    Serial.println(" characteristics discovered");
 
     // ...
   }
@@ -1927,7 +1897,7 @@ bleDevice.hasCharacteristic(uuid, index)
 - **index**: optional, index of characteristic to check if the device provides more than on. Defaults to 0, if not provided.
 
 #### Returns
-- **true**, if the device provides the characteristic, 
+- **true**, if the device provides the characteristic,
 - **false** otherwise.
 
 #### Example
@@ -1946,7 +1916,6 @@ bleDevice.hasCharacteristic(uuid, index)
   // start scanning for peripheral
   BLE.scan();
 
-  
 
   BLEDevice peripheral = BLE.available();
 
@@ -1998,7 +1967,7 @@ bleDevice.hasLocalName()
 Nothing
 
 #### Returns
-- **true**, if the device is advertising a local name, 
+- **true**, if the device is advertising a local name,
 - **false** otherwise.
 
 #### Example
@@ -2017,7 +1986,6 @@ Nothing
   // start scanning for peripheral
   BLE.scan();
 
-  
 
   BLEDevice peripheral = BLE.available();
 
@@ -2053,7 +2021,7 @@ bleDevice.hasAdvertisedServiceUuid(index)
 - **index**: optional, defaults to 0, the index of the service UUID, if the device is advertising more than one.
 
 #### Returns
-- **true**, if the device is advertising a service UUID, 
+- **true**, if the device is advertising a service UUID,
 - **false** otherwise.
 
 #### Example
@@ -2072,7 +2040,6 @@ bleDevice.hasAdvertisedServiceUuid(index)
   // start scanning for peripheral
   BLE.scan();
 
-  
 
   BLEDevice peripheral = BLE.available();
 
@@ -2129,7 +2096,6 @@ None
   // start scanning for peripheral
   BLE.scan();
 
-  
 
   BLEDevice peripheral = BLE.available();
 
@@ -2186,7 +2152,6 @@ Nothing
   // start scanning for peripheral
   BLE.scan();
 
-  
 
   BLEDevice peripheral = BLE.available();
 
@@ -2240,7 +2205,6 @@ bleDevice.advertisedServiceUuid(index)
   // start scanning for peripheral
   BLE.scan();
 
-  
 
   BLEDevice peripheral = BLE.available();
 
@@ -2279,7 +2243,7 @@ bleDevice.connect()
 None
 
 #### Returns
-- **true**, if the connection was successful, 
+- **true**, if the connection was successful,
 - **false** otherwise.
 
 #### Example
@@ -2298,7 +2262,6 @@ None
   // start scanning for peripheral
   BLE.scan();
 
-  
 
   BLEDevice peripheral = BLE.available();
 
@@ -2376,7 +2339,7 @@ None
 BLEService ledService("19B10000-E8F2-537E-4F6C-D104768A1214"); // Bluetooth® Low Energy LED Service
 
 
-Serial.print(“LED service UUID = “);
+Serial.print("LED service UUID = ");
 Serial.println(ledService.uuid());
 
 
@@ -2385,7 +2348,7 @@ Serial.println(ledService.uuid());
 
 ### `bleService.addCharacteristic()`
 
-Add a BLECharateristic to the Bluetooth® Low Energy service.
+Add a BLECharacteristic to the Bluetooth® Low Energy service.
 
 #### Syntax
 
@@ -2454,7 +2417,6 @@ None
   // start scanning for peripheral
   BLE.scan();
 
-  
 
   BLEDevice peripheral = BLE.available();
 
@@ -2535,7 +2497,6 @@ bleService.hasCharacteristic(uuid, index)
   // start scanning for peripheral
   BLE.scan();
 
-  
   BLEDevice peripheral = BLE.available();
 
   if (peripheral) {
@@ -2614,7 +2575,6 @@ bleService.characteristic(uuid, index)
   // start scanning for peripheral
   BLE.scan();
 
-  
 
   BLEDevice peripheral = BLE.available();
 
@@ -2644,9 +2604,9 @@ bleService.characteristic(uuid, index)
 
     if (batteryService) {
       // use the service
-      BLECharacteristic batteryLevelCharacterisic = peripheral.characteristic("2a19");
+      BLECharacteristic batteryLevelCharacteristic = peripheral.characteristic("2a19");
 
-      if (batteryLevelCharacterisic) {
+      if (batteryLevelCharacteristic) {
         // use the characteristic
       } else {
         Serial.println("Peripheral does NOT have battery level characteristic");
@@ -2739,7 +2699,7 @@ None
 BLEByteCharacteristic switchCharacteristic("19B10001-E8F2-537E-4F6C-D104768A1214", BLERead | BLEWrite);
 
 
-Serial.print(“Switch characteristic UUID = “);
+Serial.print("Switch characteristic UUID = ");
 Serial.println(switchCharacteristic.uuid());
 
 
@@ -2812,7 +2772,7 @@ BLEByteCharacteristic switchCharacteristic("19B10001-E8F2-537E-4F6C-D104768A1214
 
 
 
-Serial.print(“value size = “);
+Serial.print("value size = ");
 Serial.println(switchCharacteristic.valueSize());
 
 
@@ -2845,13 +2805,13 @@ BLEByteCharacteristic switchCharacteristic("19B10001-E8F2-537E-4F6C-D104768A1214
 
 
 
-      if (switchCharacteristic.value()) {   // any value other than 0
-          Serial.println("LED on");
-          digitalWrite(ledPin, HIGH);         // will turn the LED on
-        } else {                              // a 0 value
-          Serial.println(F("LED off"));
-          digitalWrite(ledPin, LOW);          // will turn the LED off
-        }
+  if (switchCharacteristic.value()) {  // any value other than 0
+    Serial.println("LED on");
+    digitalWrite(ledPin, HIGH);  // will turn the LED on
+  } else {                       // a 0 value
+    Serial.println(F("LED off"));
+    digitalWrite(ledPin, LOW);  // will turn the LED off
+  }
 
 
 
@@ -2884,7 +2844,7 @@ BLEByteCharacteristic switchCharacteristic("19B10001-E8F2-537E-4F6C-D104768A1214
 
 
 
-Serial.print(“value length = “);
+Serial.print("value length = ");
 Serial.println(switchCharacteristic.valueLength());
 
 
@@ -2904,7 +2864,7 @@ bleCharacteristic.readValue(value)
 
 #### Parameters
 
-- **buffer:** byte array to read value into length: size of buffer argument in bytes 
+- **buffer:** byte array to read value into length: size of buffer argument in bytes
 - **value**: variable to read value into (by reference)
 
 #### Returns
@@ -2958,7 +2918,7 @@ bleCharacteristic.writeValue(value)
 - **value**: value to write
 
 #### Returns
-- 1 on success, 
+- 1 on success,
 - 0 on failure
 
 #### Example
@@ -3001,7 +2961,7 @@ bleCharacteristic.setEventHandler(eventType, callback)
 
 #### Parameters
 
-- **eventType**: event type (BLESubscribed, BLEUnsubscribed, BLERead, BLEWritten) 
+- **eventType**: event type (BLESubscribed, BLEUnsubscribed, BLERead, BLEWritten)
 - **callback**: function to call when the event occurs
 
 #### Returns
@@ -3035,7 +2995,6 @@ void switchCharacteristicWritten(BLEDevice central, BLECharacteristic characteri
   }
 }
 
-  
 
 ```
 
@@ -3324,7 +3283,7 @@ bleCharacteristic.canRead()
 None
 
 #### Returns
-- **true**, if characteristic is readable, 
+- **true**, if characteristic is readable,
 - **false** otherwise
 
 #### Example
@@ -3354,7 +3313,7 @@ bleCharacteristic.read()
 None
 
 #### Returns
-- **true**, if successful, 
+- **true**, if successful,
 - **false** on failure
 
 #### Example
@@ -3669,7 +3628,7 @@ None
 BLEDescriptor millisLabelDescriptor("2901", "millis");
 
 
-Serial.print(“millis label descriptor UUID = “);
+Serial.print("millis label descriptor UUID = ");
 Serial.println(millisLabelDescriptor.uuid());
 
 
@@ -3701,7 +3660,7 @@ None
 BLEDescriptor millisLabelDescriptor("2901", "millis");
 
 
-Serial.print(“millis label descriptor value size = “);
+Serial.print("millis label descriptor value size = ");
 Serial.println(millisLabelDescriptor.valueSize());
 
 
@@ -3819,7 +3778,7 @@ bleDescriptor.readValue(value)
 
   byte value = 0;
 
-  /get the value, descriptor is 1 byte so use byte value    
+  // get the value, descriptor is 1 byte so use byte value
   descriptor.readValue(value);
 
 
diff --git a/docs/readme.md b/docs/readme.md
index 5ba0dfb4..b584d71e 100644
--- a/docs/readme.md
+++ b/docs/readme.md
@@ -1,6 +1,6 @@
 # ArduinoBLE library
 
-This library supports all the Arduino boards that have the hardware enabled for Bluetooth® Low Energy and Bluetooth® 4.0 and above; these include Nano 33 BLE, Arduino NANO 33 IoT, Uno WiFi Rev 2, MKR WiFi 1010, Nicla Sense ME.
+This library supports all the Arduino boards that have the hardware enabled for Bluetooth® Low Energy and Bluetooth® 4.0 and above; these include Nano 33 BLE, Arduino NANO 33 IoT, Uno WiFi Rev2, MKR WiFi 1010, Nicla Sense ME.
 
 To use this library
 ``#include <ArduinoBLE.h>``
@@ -9,7 +9,7 @@ To use this library
 
 Bluetooth® 4.0 includes both traditional Bluetooth®, now labeled "Bluetooth® Classic", and the Bluetooth® Low Energy. Bluetooth® Low Energy is optimized for low power use at low data rates, and was designed to operate from simple lithium coin cell batteries.
 
-Unlike standard Bluetooth® communication basically based on an asynchronous serial connection (UART) a Bluetooth® LE radio acts like a community bulletin board. The computers that connect to it are like community members that read the bulletin board. Each radio acts as either the bulletin board or the reader. If your radio is a bulletin board (called a peripheral device in Bluetooth® LE parlance) it posts data for all radios in the community to read. If your radio is a reader (called a central device in Blueooth LE terms) it reads from any of the bulletin boards (peripheral devices) that have information about which it cares. You can also think of peripheral devices as the servers in a client-server transaction, because they contain the information that reader radios ask for. Similarly, central devices are the clients of the Bluetooth® LE world because they read information available from the peripherals.
+Unlike standard Bluetooth® communication basically based on an asynchronous serial connection (UART) a Bluetooth® LE radio acts like a community bulletin board. The computers that connect to it are like community members that read the bulletin board. Each radio acts as either the bulletin board or the reader. If your radio is a bulletin board (called a peripheral device in Bluetooth® LE parlance) it posts data for all radios in the community to read. If your radio is a reader (called a central device in Bluetooth LE terms) it reads from any of the bulletin boards (peripheral devices) that have information about which it cares. You can also think of peripheral devices as the servers in a client-server transaction, because they contain the information that reader radios ask for. Similarly, central devices are the clients of the Bluetooth® LE world because they read information available from the peripherals.
 
 ![Communication between central and peripheral devices](https://raw.githubusercontent.com/arduino-libraries/ArduinoBLE/master/docs/assets/ble-bulletin-board-model.png)
 
@@ -19,7 +19,7 @@ The information presented by a peripheral is structured as **services**, each of
 
 ## Notify
 
-The Bluetooth® LE specification includes a mechanism known as **notify** that lets you know when data's changed. When notify on a characteristic is enabled and the sender writes to it, the new value is automatically sent to the receiver, without the receiver explicitly issuing a read command. This is commonly used for streaming data such as accelerometer or other sensor readings. There's a variation on this specification called **indicate** which works similarly, but in the indicate specification, the reader sends an acknowledgement of the pushed data.
+The Bluetooth® LE specification includes a mechanism known as **notify** that lets you know when data's changed. When notify on a characteristic is enabled and the sender writes to it, the new value is automatically sent to the receiver, without the receiver explicitly issuing a read command. This is commonly used for streaming data such as accelerometer or other sensor readings. There's a variation on this specification called **indicate** which works similarly, but in the indicate specification, the reader sends an acknowledgment of the pushed data.
 
 The client-server structure of Bluetooth® LE, combined with the notify characteristic, is generally called a **publish-and-subscribe model**.
 
@@ -58,7 +58,7 @@ You could also combine readings into a single characteristic, when a given senso
 |Motor Speed, Direction|150,1|
 |Accelerometer X, Y, Z|200,133,150|
 
-This is more efficient, but you need to be careful not to exceed the 512-byte limit. The accelerometer characteristic above, for example, takes 11 bytes as a ASCII-encoded string.
+This is more efficient, but you need to be careful not to exceed the 512-byte limit. The accelerometer characteristic above, for example, takes 11 bytes as an ASCII-encoded string.
 
 ## Read/write/notify/indicate
 
diff --git a/examples/Central/SensorTagButton/SensorTagButton.ino b/examples/Central/SensorTagButton/SensorTagButton.ino
index a56504f6..27c421fe 100644
--- a/examples/Central/SensorTagButton/SensorTagButton.ino
+++ b/examples/Central/SensorTagButton/SensorTagButton.ino
@@ -114,7 +114,7 @@ void monitorSensorTagButtons(BLEDevice peripheral) {
     if (simpleKeyCharacteristic.valueUpdated()) {
       // yes, get the value, characteristic is 1 byte so use byte value
       byte value = 0;
-      
+
       simpleKeyCharacteristic.readValue(value);
 
       if (value & 0x01) {
diff --git a/examples/Peripheral/Advertising/RawDataAdvertising/RawDataAdvertising.ino b/examples/Peripheral/Advertising/RawDataAdvertising/RawDataAdvertising.ino
index d025dd62..5e7ba7f3 100644
--- a/examples/Peripheral/Advertising/RawDataAdvertising/RawDataAdvertising.ino
+++ b/examples/Peripheral/Advertising/RawDataAdvertising/RawDataAdvertising.ino
@@ -4,7 +4,7 @@ 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};   
+const uint8_t completeRawAdvertisingData[] = {0x02,0x01,0x06,0x09,0xff,0x01,0x01,0x00,0x01,0x02,0x03,0x04,0x05};
 
 void setup() {
   Serial.begin(9600);
@@ -21,7 +21,7 @@ void setup() {
   // 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));  
+  advData.setRawData(completeRawAdvertisingData, sizeof(completeRawAdvertisingData));
   // Copy set parameters in the actual advertising packet
   BLE.setAdvertisingData(advData);
 
@@ -30,7 +30,7 @@ void setup() {
   scanData.setLocalName("Test advertising raw data");
   // Copy set parameters in the actual scan response packet
   BLE.setScanResponseData(scanData);
-  
+
   BLE.advertise();
 
   Serial.println("advertising ...");
diff --git a/examples/Peripheral/BatteryMonitor/BatteryMonitor.ino b/examples/Peripheral/BatteryMonitor/BatteryMonitor.ino
index f013c6f5..0d786627 100644
--- a/examples/Peripheral/BatteryMonitor/BatteryMonitor.ino
+++ b/examples/Peripheral/BatteryMonitor/BatteryMonitor.ino
@@ -73,11 +73,11 @@ void loop() {
     // turn on the LED to indicate the connection:
     digitalWrite(LED_BUILTIN, HIGH);
 
-    // check the battery level every 200ms
+    // check the battery level every 200 ms
     // while the central is connected:
     while (central.connected()) {
       long currentMillis = millis();
-      // if 200ms have passed, check the battery level:
+      // if 200 ms have passed, check the battery level:
       if (currentMillis - previousMillis >= 200) {
         previousMillis = currentMillis;
         updateBatteryLevel();
diff --git a/examples/Peripheral/CallbackLED/CallbackLED.ino b/examples/Peripheral/CallbackLED/CallbackLED.ino
index 23f67bc3..59bda5ed 100644
--- a/examples/Peripheral/CallbackLED/CallbackLED.ino
+++ b/examples/Peripheral/CallbackLED/CallbackLED.ino
@@ -28,7 +28,7 @@ const int ledPin = LED_BUILTIN; // pin to use for the LED
 void setup() {
   Serial.begin(9600);
   while (!Serial);
-  
+
   pinMode(ledPin, OUTPUT); // use the LED pin as an output
 
   // begin initialization
diff --git a/examples/Peripheral/EncryptedBatteryMonitor/EncryptedBatteryMonitor.ino b/examples/Peripheral/EncryptedBatteryMonitor/EncryptedBatteryMonitor.ino
index 9f9d453b..dfc9f4a0 100644
--- a/examples/Peripheral/EncryptedBatteryMonitor/EncryptedBatteryMonitor.ino
+++ b/examples/Peripheral/EncryptedBatteryMonitor/EncryptedBatteryMonitor.ino
@@ -54,7 +54,7 @@ void setup() {
 
 
   Serial.println("Serial connected");
-  
+
   // Callback function with confirmation code when new device is pairing.
   BLE.setDisplayCode([](uint32_t confirmCode){
     Serial.println("New device pairing request.");
@@ -63,7 +63,7 @@ void setup() {
     sprintf(code, "%06d", confirmCode);
     Serial.println(code);
   });
-  
+
   // Callback to allow accepting or rejecting pairing
   BLE.setBinaryConfirmPairing([&acceptOrReject](){
     Serial.print("Should we confirm pairing? ");
@@ -98,7 +98,7 @@ void setup() {
 
 
     (*BDaddrTypes)[0] = 0; // Type 0 is for pubc address, type 1 is for static random
-    (*BDAddrs)[0] = new uint8_t[6]; 
+    (*BDAddrs)[0] = new uint8_t[6];
     (*IRKs)[0]    = new uint8_t[16];
     memcpy((*IRKs)[0]   , device1IRK,16);
     memcpy((*BDAddrs)[0], device1Mac, 6);
@@ -124,7 +124,7 @@ void setup() {
     uint8_t device1LTK[16] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
     uint8_t device2Mac[6]  = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
     uint8_t device2LTK[16] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-    
+
 
     if(memcmp(device1Mac, address, 6) == 0) {
       memcpy(LTK, device1LTK, 16);
@@ -159,7 +159,7 @@ void setup() {
     }
     Serial.println("BT init");
     delay(200);
-    
+
     /* Set a local name for the BLE device
        This name will appear in advertising packets
        and can be used by remote devices to identify this BLE device
@@ -180,16 +180,16 @@ void setup() {
     stringCharValue = "string";
     stringcharacteristic.writeValue(stringCharValue);
     secretValue.writeValue(0);
-    
+
     delay(1000);
 
     // prevent pairing until button is pressed (will show a pairing rejected message)
     BLE.setPairable(false);
-  
+
     /* Start advertising BLE.  It will start continuously transmitting BLE
        advertising packets and will be visible to remote BLE central devices
        until it receives a new connection */
-  
+
     // start advertising
     if(!BLE.advertise()){
       Serial.println("failed to advertise bluetooth.");
@@ -214,13 +214,13 @@ void loop() {
   if (!BLE.pairable() && digitalRead(PAIR_BUTTON) == LOW){
     pairingStarted = millis();
     BLE.setPairable(Pairable::ONCE);
-    Serial.println("Accepting pairing for 30s");
+    Serial.println("Accepting pairing for 30 s");
   } else if (BLE.pairable() && millis() > pairingStarted + PAIR_INTERVAL){
     BLE.setPairable(false);
     Serial.println("No longer accepting pairing");
   }
   // Make LED blink while pairing is allowed
-  digitalWrite(PAIR_LED, (BLE.pairable() ? (millis()%400)<200 : BLE.paired()) ? PAIR_LED_ON : !PAIR_LED_ON); 
+  digitalWrite(PAIR_LED, (BLE.pairable() ? (millis()%400)<200 : BLE.paired()) ? PAIR_LED_ON : !PAIR_LED_ON);
 
 
   // if a central is connected to the peripheral:
@@ -246,7 +246,7 @@ void loop() {
     Serial.print("Disconnected from central: ");
     Serial.println(central.address());
   }
-    
+
 }
 
 void updateBatteryLevel() {
diff --git a/examples/Peripheral/LED/LED.ino b/examples/Peripheral/LED/LED.ino
index 2e6d6db9..65b88605 100644
--- a/examples/Peripheral/LED/LED.ino
+++ b/examples/Peripheral/LED/LED.ino
@@ -48,7 +48,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
diff --git a/library.properties b/library.properties
index 543998b7..6e248f5f 100644
--- a/library.properties
+++ b/library.properties
@@ -2,7 +2,7 @@ name=ArduinoBLE
 version=1.3.7
 author=Arduino
 maintainer=Arduino <info@arduino.cc>
-sentence=Enables Bluetooth® Low Energy connectivity on the Arduino MKR WiFi 1010, Arduino UNO WiFi Rev.2, Arduino Nano 33 IoT, Arduino Nano 33 BLE, Nicla Sense ME and UNO R4 WiFi.
+sentence=Enables Bluetooth® Low Energy connectivity on the Arduino MKR WiFi 1010, Arduino UNO WiFi Rev2, Arduino Nano 33 IoT, Arduino Nano 33 BLE, Nicla Sense ME and UNO R4 WiFi.
 paragraph=This library supports creating a Bluetooth® Low Energy peripheral & central mode.
 category=Communication
 url=https://www.arduino.cc/en/Reference/ArduinoBLE
diff --git a/src/utility/HCI.cpp b/src/utility/HCI.cpp
index e9743758..fb30b3ca 100644
--- a/src/utility/HCI.cpp
+++ b/src/utility/HCI.cpp
@@ -137,7 +137,7 @@ void HCIClass::poll(unsigned long timeout)
 
   while (HCITransport.available()) {
     byte b = HCITransport.read();
-	
+
     if (_recvIndex >= sizeof(_recvBuffer)) {
         _recvIndex = 0;
         if (_debug) {
@@ -161,7 +161,7 @@ void HCIClass::poll(unsigned long timeout)
         handleAclDataPkt(pktLen, &_recvBuffer[1]);
 
 #ifdef ARDUINO_AVR_UNO_WIFI_REV2
-        digitalWrite(NINA_RTS, LOW);  
+        digitalWrite(NINA_RTS, LOW);
 #endif
       }
     } else if (_recvBuffer[0] == HCI_EVENT_PKT) {
@@ -363,7 +363,7 @@ int HCIClass::leSetAdvertiseEnable(uint8_t enable)
   return sendCommand(OGF_LE_CTL << 10 | OCF_LE_SET_ADVERTISE_ENABLE, sizeof(enable), &enable);
 }
 
-int HCIClass::leSetScanParameters(uint8_t type, uint16_t interval, uint16_t window, 
+int HCIClass::leSetScanParameters(uint8_t type, uint16_t interval, uint16_t window,
                           uint8_t ownBdaddrType, uint8_t filter)
 {
   struct __attribute__ ((packed)) HCILeSetScanParameters {
@@ -437,7 +437,7 @@ int HCIClass::leCancelConn()
   return sendCommand(OGF_LE_CTL << 10 | OCF_LE_CANCEL_CONN, 0, NULL);
 }
 
-int HCIClass::leConnUpdate(uint16_t handle, uint16_t minInterval, uint16_t maxInterval, 
+int HCIClass::leConnUpdate(uint16_t handle, uint16_t minInterval, uint16_t maxInterval,
                           uint16_t latency, uint16_t supervisionTimeout)
 {
   struct __attribute__ ((packed)) HCILeConnUpdateData {
@@ -464,7 +464,7 @@ void HCIClass::saveNewAddress(uint8_t addressType, uint8_t* address, uint8_t* pe
   if(_storeIRK!=0){
     _storeIRK(address, peerIrk);
   }
-  // Again... this should work 
+  // Again... this should work
   // leAddResolvingAddress(addressType, address, peerIrk, localIrk);
 }
 void HCIClass::leAddResolvingAddress(uint8_t addressType, uint8_t* peerAddress, uint8_t* peerIrk, uint8_t* localIrk){
@@ -490,7 +490,7 @@ void HCIClass::leAddResolvingAddress(uint8_t addressType, uint8_t* peerAddress,
   btct.printBytes(addDevice.peerIRK,16);
   Serial.print("localIRK   :");
   btct.printBytes(addDevice.localIRK,16);
-  sendCommand(OGF_LE_CTL << 10 | 0x27, sizeof(addDevice), &addDevice); 
+  sendCommand(OGF_LE_CTL << 10 | 0x27, sizeof(addDevice), &addDevice);
 
   leStartResolvingAddresses();
 }
@@ -509,7 +509,7 @@ int HCIClass::leReadPeerResolvableAddress(uint8_t peerAddressType, uint8_t* peer
   } request;
   request.addressType = peerAddressType;
   for(int i=0; i<6; i++) request.identityAddress[5-i] = peerIdentityAddress[i];
-  
+
 
   int res = sendCommand(OGF_LE_CTL << 10 | 0x2B, sizeof(request), &request);
   Serial.print("res: 0x");
@@ -604,7 +604,7 @@ int HCIClass::tryResolveAddress(uint8_t* BDAddr, uint8_t* address){
     delete BADDRs;
     delete[] (*IRKs);
     delete IRKs;
-    
+
     if(foundMatch){
       return 1;
     }
@@ -688,7 +688,6 @@ int HCIClass::sendCommand(uint16_t opcode, uint8_t plen, void* parameters)
   for(int i=0; i< sizeof(pktHdr) + plen;i++){
     Serial.print(" 0x");
     Serial.print(txBuffer[i],HEX);
-    
   }
   Serial.println("");
 #endif
@@ -758,7 +757,7 @@ void HCIClass::handleAclDataPkt(uint8_t /*plen*/, uint8_t pdata[])
     }
   } else if (aclHdr->cid == SIGNALING_CID) {
 #ifdef _BLE_TRACE_
-    Serial.println("Signalling");
+    Serial.println("Signaling");
 #endif
     L2CAPSignaling.handleData(aclHdr->handle & 0x0fff, aclHdr->len, &_recvBuffer[1 + sizeof(HCIACLHdr)]);
   } else if (aclHdr->cid == SECURITY_CID){
@@ -853,7 +852,7 @@ void HCIClass::handleEventPkt(uint8_t /*plen*/, uint8_t pdata[])
         }
         // From page 1681 bluetooth standard - order matters
         if(ATT.localKeyDistribution.IdKey()){
-          /// We shall distribute IRK and address using identity information 
+          /// We shall distribute IRK and address using identity information
           {
             uint8_t response[17];
             response[0] = CONNECTION_IDENTITY_INFORMATION; // Identity information.
@@ -1002,7 +1001,7 @@ void HCIClass::handleEventPkt(uint8_t /*plen*/, uint8_t pdata[])
           uint16_t supervisionTimeout;
           uint8_t masterClockAccuracy;
         } *leConnectionComplete = (EvtLeConnectionComplete*)&pdata[sizeof(HCIEventHdr) + sizeof(LeMetaEventHeader)];
-      
+
         if (leConnectionComplete->status == 0x00) {
           ATT.addConnection(leConnectionComplete->handle,
                             leConnectionComplete->role,
@@ -1051,7 +1050,7 @@ void HCIClass::handleEventPkt(uint8_t /*plen*/, uint8_t pdata[])
           uint16_t supervisionTimeout;
           uint8_t masterClockAccuracy;
         } *leConnectionComplete = (EvtLeConnectionComplete*)&pdata[sizeof(HCIEventHdr) + sizeof(LeMetaEventHeader)];
-      
+
         if (leConnectionComplete->status == 0x00) {
           ATT.addConnection(leConnectionComplete->handle,
                             leConnectionComplete->role,
@@ -1127,7 +1126,7 @@ void HCIClass::handleEventPkt(uint8_t /*plen*/, uint8_t pdata[])
         uint8_t resolvableAddr[6];
         uint8_t foundLTK;
         ATT.getPeerAddrWithType(ltkRequest->connectionHandle, peerAddr);
-        
+
         if((ATT.getPeerEncryption(ltkRequest->connectionHandle) & PEER_ENCRYPTION::PAIRING_REQUEST)>0){
           // Pairing request - LTK is one in buffer already
           foundLTK = 1;
@@ -1207,7 +1206,7 @@ void HCIClass::handleEventPkt(uint8_t /*plen*/, uint8_t pdata[])
         Serial.print("Timeout     : ");
         btct.printBytes((uint8_t*)&remoteConnParamReq->timeOut,2);
 #endif
-        
+
         struct __attribute__ ((packed)) RemoteConnParamReqReply {
           uint16_t connectionHandle;
           uint16_t intervalMin;
@@ -1253,13 +1252,13 @@ void HCIClass::handleEventPkt(uint8_t /*plen*/, uint8_t pdata[])
           HCI.sendAclPkt(connectionHandle,SECURITY_CID,sizeof(PairingPublicKey),&pairingPublicKey);
           uint8_t encryption = ATT.getPeerEncryption(connectionHandle) | PEER_ENCRYPTION::SENT_PUBKEY;
           ATT.setPeerEncryption(connectionHandle, encryption);
-          
+
 
           uint8_t Z = 0;
-          
+
           HCI.leRand(Nb);
           HCI.leRand(&Nb[8]);
-          
+
 #ifdef _BLE_TRACE_
           Serial.print("nb: ");
           btct.printBytes(Nb, 16);
@@ -1271,16 +1270,16 @@ void HCIClass::handleEventPkt(uint8_t /*plen*/, uint8_t pdata[])
             uint8_t Z;
           } f4Params = {0,0,Z};
           for(int i=0; i<32; i++){
-            f4Params.U[31-i] = pairingPublicKey.publicKey[i]; 
+            f4Params.U[31-i] = pairingPublicKey.publicKey[i];
             f4Params.V[31-i] = HCI.remotePublicKeyBuffer[i];
           }
-          
+
           struct __attribute__ ((packed)) PairingConfirm
           {
             uint8_t code;
             uint8_t cb[16];
           } pairingConfirm = {CONNECTION_PAIRING_CONFIRM,0};
-          
+
           btct.AES_CMAC(Nb,(unsigned char *)&f4Params,sizeof(f4Params),pairingConfirm.cb);
 
 #ifdef _BLE_TRACE_
@@ -1297,7 +1296,7 @@ void HCIClass::handleEventPkt(uint8_t /*plen*/, uint8_t pdata[])
 
           // Send Pairing confirm response
           HCI.sendAclPkt(connectionHandle, SECURITY_CID, sizeof(pairingConfirm), &pairingConfirm);
-          
+
           HCI.sendCommand( (OGF_LE_CTL << 10) | LE_COMMAND::GENERATE_DH_KEY_V1, sizeof(HCI.remotePublicKeyBuffer), HCI.remotePublicKeyBuffer);
         }else{
 #ifdef _BLE_TRACE_
@@ -1329,8 +1328,8 @@ void HCIClass::handleEventPkt(uint8_t /*plen*/, uint8_t pdata[])
 #endif
             break;
           }
-          
-          
+
+
           for(int i=0; i<32; i++) DHKey[31-i] = evtLeDHKeyComplete->DHKey[i];
 
 #ifdef _BLE_TRACE_
@@ -1345,7 +1344,7 @@ void HCIClass::handleEventPkt(uint8_t /*plen*/, uint8_t pdata[])
             Serial.println("Received DHKey check already so calculate f5, f6 now.");
 #endif
             L2CAPSignaling.smCalculateLTKandConfirm(connectionHandle, HCI.remoteDHKeyCheckBuffer);
-	  
+
           }else{
 #ifdef _BLE_TRACE_
             Serial.println("Waiting on other DHKey check before calculating.");
@@ -1382,7 +1381,7 @@ int HCIClass::leEncrypt(uint8_t* key, uint8_t* plaintext, uint8_t* status, uint8
     leEncryptCommand.key[15-i] = key[i];
     leEncryptCommand.plaintext[15-i] = plaintext[i];
   }
-  
+
   int res = sendCommand(OGF_LE_CTL << 10 | LE_COMMAND::ENCRYPT, 32, &leEncryptCommand);
   if(res == 0){
 #ifdef _BLE_TRACE_

From eef16ce34abb977d147d637c6751b69bf5b1161b Mon Sep 17 00:00:00 2001
From: fabik111 <fabiomassimo.centonze@gmail.com>
Date: Thu, 3 Oct 2024 14:52:10 +0200
Subject: [PATCH 088/112] fix crashes on M0 board when assigning the BLE handle
 from the received data buffer

---
 src/utility/ATT.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/utility/ATT.cpp b/src/utility/ATT.cpp
index b1796c90..9367cfbf 100644
--- a/src/utility/ATT.cpp
+++ b/src/utility/ATT.cpp
@@ -993,8 +993,8 @@ void ATTClass::readOrReadBlobReq(uint16_t connectionHandle, uint16_t mtu, uint8_
   }
   /// if auth error, hold the response in a buffer.
   bool holdResponse = false;
-
-  uint16_t handle = *(uint16_t*)data;
+  uint16_t handle;
+  memcpy(&handle, data, sizeof(handle));
   uint16_t offset = (opcode == ATT_OP_READ_REQ) ? 0 : *(uint16_t*)&data[sizeof(handle)];
 
   if ((uint16_t)(handle - 1) > GATT.attributeCount()) {
@@ -1248,7 +1248,8 @@ void ATTClass::writeReqOrCmd(uint16_t connectionHandle, uint16_t mtu, uint8_t op
     return;
   }
 
-  uint16_t handle = *(uint16_t*)data;
+  uint16_t handle;
+  memcpy(&handle, data, sizeof(handle));
 
   if ((uint16_t)(handle - 1) > GATT.attributeCount()) {
     if (withResponse) {

From 3fd5a50fd18c2b0644d1a8e2d74045fa9beafd96 Mon Sep 17 00:00:00 2001
From: Carlo Parata <carlo.parata@st.com>
Date: Thu, 19 Sep 2019 10:33:53 +0200
Subject: [PATCH 089/112] feat: add HCISpiTransport

To support to STBTLE-RF, STBTLE-1S, BLUENRG-M2SP, BLUENRG-LP
and BLUENRG-M0.

Signed-off-by: Carlo Parata <carlo.parata@st.com>
Co-authored-by: Frederic Pillon <frederic.pillon@st.com>
---
 keywords.txt                    |    9 +
 src/utility/HCISpiTransport.cpp | 1399 +++++++++++++++++++++++++++++++
 src/utility/HCISpiTransport.h   |   83 ++
 3 files changed, 1491 insertions(+)
 create mode 100644 src/utility/HCISpiTransport.cpp
 create mode 100644 src/utility/HCISpiTransport.h

diff --git a/keywords.txt b/keywords.txt
index effdfbca..ecfbafbf 100644
--- a/keywords.txt
+++ b/keywords.txt
@@ -30,6 +30,8 @@ BLEFloatCharacteristic	KEYWORD1
 BLEDoubleCharacteristic	KEYWORD1
 BLEStringCharacteristic	KEYWORD1
 
+HCISpiTransportClass	KEYWORD1
+
 #######################################
 # Methods and Functions (KEYWORD2)
 #######################################
@@ -136,3 +138,10 @@ BLEUnsubscribed	LITERAL1
 BLEWritten	LITERAL1
 BLEUpdated	LITERAL1	
 
+SPBTLE_RF	LITERAL1
+SPBTLE_1S	LITERAL1
+BLUENRG_M2SP	LITERAL1
+BLUENRG_M0	LITERAL1
+BLUENRG_LP	LITERAL1
+BLEChip_t	LITERAL1
+
diff --git a/src/utility/HCISpiTransport.cpp b/src/utility/HCISpiTransport.cpp
new file mode 100644
index 00000000..91c2c5dc
--- /dev/null
+++ b/src/utility/HCISpiTransport.cpp
@@ -0,0 +1,1399 @@
+/*
+  This file is part of the STM32duinoBLE library.
+  Copyright (c) 2019 STMicroelectronics. All rights reserved.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  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
+*/
+
+#include "HCISpiTransport.h"
+
+#if defined(ARDUINO_STEVAL_MKBOXPRO)
+/* STEVAL-MKBOXPRO */
+SPIClass SpiHCI(PA7, PA6, PA5);
+HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_LP, PA2, PB11, PD4, 1000000, SPI_MODE3);
+#elif defined(ARDUINO_STEVAL_MKSBOX1V1)
+/* STEVAL-MKSBOX1V1 */
+SPIClass SpiHCI(PC3, PD3, PD1);
+HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_1S, PD0, PD4, PA8, 1000000, SPI_MODE1);
+#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);
+#elif defined(ARDUINO_STM32L562E_DK)
+/* STM32L562E-DK */
+SPIClass SpiHCI(PG4, PG3, PG2);
+HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M0, PG5, PG6, PG8, 8000000, SPI_MODE0);
+#elif defined(IDB05A2_SPI_CLOCK_D3)
+/* Shield IDB05A2 with SPI clock on D3 */
+SPIClass SpiHCI(D11, D12, D3);
+HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M0, A1, A0, D7, 8000000, SPI_MODE0);
+#elif defined(IDB05A2_SPI_CLOCK_D13)
+/* Shield IDB05A2 with SPI clock on D13 */
+#define SpiHCI SPI
+HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M0, A1, A0, D7, 8000000, SPI_MODE0);
+#elif defined(IDB05A1_SPI_CLOCK_D3)
+/* Shield IDB05A1 with SPI clock on D3 */
+SPIClass SpiHCI(D11, D12, D3);
+HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, A1, A0, D7, 8000000, SPI_MODE0);
+#elif defined(IDB05A1_SPI_CLOCK_D13)
+/* Shield IDB05A1 with SPI clock on D13 */
+#define SpiHCI SPI
+HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, A1, A0, D7, 8000000, SPI_MODE0);
+#elif defined(BNRG2A1_CLOCK_D3)
+/* Shield BNRG2A1 with SPI clock on D3 */
+SPIClass SpiHCI(D11, D12, D3);
+HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M2SP, A1, A0, D7, 1000000, SPI_MODE1);
+#elif defined(BNRG2A1_CLOCK_D13)
+/* Shield BNRG2A1 with SPI clock on D13 */
+#define SpiHCI SPI
+HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M2SP, A1, A0, D7, 1000000, SPI_MODE1);
+#else
+#error "Unsupported board or shield selected!"
+#endif
+
+volatile int data_avail = 0;
+
+HCISpiTransportClass::HCISpiTransportClass(SPIClass &spi, BLEChip_t ble_chip, uint8_t cs_pin, uint8_t spi_irq, uint8_t ble_rst, uint32_t frequency, uint8_t spi_mode) :
+  _spi(&spi),
+  _ble_chip(ble_chip),
+  _cs_pin(cs_pin),
+  _spi_irq(spi_irq),
+  _ble_rst(ble_rst)
+{
+  _spiSettings = SPISettings(frequency, (BitOrder)BLE_SPI_BYTE_ORDER, spi_mode);
+  _read_index = 0;
+  _write_index = 0;
+  _write_index_initial = 0;
+  _initial_phase = 1;
+  _random_addr_done = false;
+}
+
+HCISpiTransportClass::~HCISpiTransportClass()
+{
+}
+
+extern "C" void SPI_Irq_Callback(void)
+{
+  data_avail = 1;
+}
+
+int HCISpiTransportClass::begin()
+{
+  _read_index = 0;
+  _write_index = 0;
+  _write_index_initial = 0;
+  _initial_phase = 1;
+  memset(_rxbuff, 0, sizeof(_rxbuff));
+  pinMode(_cs_pin, OUTPUT);
+  digitalWrite(_cs_pin, HIGH);
+
+  _spi->begin();
+
+  pinMode(_spi_irq, INPUT);
+  attachInterrupt(_spi_irq, SPI_Irq_Callback, RISING);
+
+  // Reset chip
+  pinMode(_ble_rst, OUTPUT);
+  digitalWrite(_ble_rst, LOW);
+  delay(5);
+  digitalWrite(_ble_rst, HIGH);
+  delay(5);
+
+  if (_ble_chip == SPBTLE_RF || _ble_chip == BLUENRG_M0 || _ble_chip == BLUENRG_LP || _ble_chip == BLUENRG_M2SP) {
+    // Wait for Blue Initialize
+    wait_for_blue_initialize();
+  } else if (_ble_chip == SPBTLE_1S) {
+    // Wait a while for the reset of the BLE module
+    delay(300);
+  } else {
+    // BLE chip not supported
+    return 0;
+  }
+
+  return 1;
+}
+
+void HCISpiTransportClass::end()
+{
+  detachInterrupt(_spi_irq);
+  _spi->end();
+}
+
+void HCISpiTransportClass::wait(unsigned long timeout)
+{
+  for (unsigned long start = millis(); (millis() - start) < timeout;) {
+    if (available()) {
+      break;
+    }
+  }
+}
+
+int HCISpiTransportClass::available()
+{
+  if (_ble_chip != SPBTLE_RF && _ble_chip != SPBTLE_1S && _ble_chip != BLUENRG_M2SP && _ble_chip != BLUENRG_M0 && _ble_chip != BLUENRG_LP) {
+    return 0;
+  }
+
+  if (_read_index != _write_index) {
+    return 1;
+  } else if (data_avail) {
+    int ble_reset = 0;
+
+    if (digitalRead(_spi_irq) == 0) {
+      return 0;
+    }
+
+    data_avail = 0;
+
+    // Wait for BlueNRG-LP to be ready (needs to be done after each HCI RESET)
+    if (_ble_chip == BLUENRG_LP && _initial_phase) {
+      delay(100);
+    }
+
+    while (digitalRead(_spi_irq) == 1 && _write_index != BLE_MODULE_SPI_BUFFER_SIZE) {
+      uint8_t header_master[5] = {0x0b, 0x00, 0x00, 0x00, 0x00};
+
+      if (_ble_chip == SPBTLE_1S || _ble_chip == BLUENRG_M2SP || _ble_chip == BLUENRG_LP) {
+        detachInterrupt(_spi_irq);
+      }
+
+      _spi->beginTransaction(_spiSettings);
+
+      digitalWrite(_cs_pin, LOW);
+
+      /* Write the header */
+      _spi->transfer(header_master, 5);
+
+      if (_ble_chip == SPBTLE_RF || _ble_chip == BLUENRG_M0) {
+        /* device is ready */
+        if (header_master[0] == 0x02) {
+          uint16_t byte_count = (header_master[4] << 8) | header_master[3];
+
+          if (byte_count > 0) {
+            if (_initial_phase) {
+              /* avoid to read more data that available size of the buffer */
+              if (byte_count > (BLE_MODULE_SPI_BUFFER_SIZE - _write_index_initial)) {
+                byte_count = (BLE_MODULE_SPI_BUFFER_SIZE - _write_index_initial);
+              }
+
+              /* Read the response */
+              for (int j = 0; j < byte_count; j++) {
+                _rxbuff[_write_index_initial] = _spi->transfer(0x00);
+                _write_index_initial++;
+              }
+
+              /* Check if the message is a Blue Initialize */
+              /* If so we need to send the command to enable LL_ONLY */
+              if (byte_count == 6) {
+                if (_rxbuff[_write_index_initial - 6] == 0x04 &&
+                    _rxbuff[_write_index_initial - 5] == 0xFF &&
+                    _rxbuff[_write_index_initial - 4] == 0x03 &&
+                    _rxbuff[_write_index_initial - 3] == 0x01 &&
+                    _rxbuff[_write_index_initial - 2] == 0x00 &&
+                    _rxbuff[_write_index_initial - 1] == 0x01) {
+                  ble_reset = 1;
+                }
+              }
+            } else {
+              /* avoid to read more data that available size of the buffer */
+              if (byte_count > (BLE_MODULE_SPI_BUFFER_SIZE - _write_index)) {
+                byte_count = (BLE_MODULE_SPI_BUFFER_SIZE - _write_index);
+                /* SPI buffer is full but we still have data to store, so we set the data_avail flag to true */
+                data_avail = 1;
+              }
+
+              /* Read the response */
+              for (int j = 0; j < byte_count; j++) {
+                _rxbuff[_write_index] = _spi->transfer(0x00);
+                _write_index++;
+              }
+            }
+          }
+        }
+      } else if (_ble_chip == SPBTLE_1S || _ble_chip == BLUENRG_M2SP || _ble_chip == BLUENRG_LP) {
+        uint16_t byte_count = (header_master[4] << 8) | header_master[3];
+
+        if (byte_count > 0) {
+          if (_initial_phase) {
+            /* avoid to read more data that available size of the buffer */
+            if (byte_count > (BLE_MODULE_SPI_BUFFER_SIZE - _write_index_initial)) {
+              byte_count = (BLE_MODULE_SPI_BUFFER_SIZE - _write_index_initial);
+            }
+
+            /* Read the response */
+            for (int j = 0; j < byte_count; j++) {
+              _rxbuff[_write_index_initial] = _spi->transfer(0x00);
+              _write_index_initial++;
+            }
+
+            /* Check if the message is a CMD_COMPLETE */
+            /* We suppose that the first CMD is always a HCI_RESET */
+            if (byte_count == 7) {
+              if (_rxbuff[_write_index_initial - 7] == 0x04 &&
+                  _rxbuff[_write_index_initial - 6] == 0x0E &&
+                  _rxbuff[_write_index_initial - 5] == 0x04 &&
+                  _rxbuff[_write_index_initial - 4] == 0x01 &&
+                  _rxbuff[_write_index_initial - 3] == 0x03 &&
+                  _rxbuff[_write_index_initial - 2] == 0x0C &&
+                  _rxbuff[_write_index_initial - 1] == 0x00) {
+                ble_reset = 1;
+              }
+            }
+          } else {
+            /* avoid to read more data that available size of the buffer */
+            if (byte_count > (BLE_MODULE_SPI_BUFFER_SIZE - _write_index)) {
+              byte_count = (BLE_MODULE_SPI_BUFFER_SIZE - _write_index);
+              /* SPI buffer is full but we still have data to store, so we set the data_avail flag to true */
+              data_avail = 1;
+            }
+
+            /* Read the response */
+            for (int j = 0; j < byte_count; j++) {
+              _rxbuff[_write_index] = _spi->transfer(0x00);
+              _write_index++;
+            }
+          }
+        }
+      }
+
+      digitalWrite(_cs_pin, HIGH);
+
+      _spi->endTransaction();
+
+      if (_ble_chip == SPBTLE_1S || _ble_chip == BLUENRG_M2SP || _ble_chip == BLUENRG_LP) {
+        attachInterrupt(_spi_irq, SPI_Irq_Callback, RISING);
+      }
+    }
+
+    if (ble_reset) {
+      if (_ble_chip == BLUENRG_M2SP) {
+        wait_for_blue_initialize();
+      }
+
+      if (_ble_chip == SPBTLE_RF || _ble_chip == BLUENRG_M0 || _ble_chip == BLUENRG_LP || _ble_chip == BLUENRG_M2SP) {
+        /* BLE chip was reset: we need to enable LL_ONLY */
+        enable_ll_only();
+        wait_for_enable_ll_only();
+      } else if (_ble_chip == SPBTLE_1S) {
+        /* BLE chip was reset: we need to wait for a while */
+        delay(300);
+      }
+
+      /* Call Gatt Init and Gap Init to activate the random BLE address */
+      if (!_random_addr_done) {
+        aci_gatt_init();
+        wait_for_aci_gatt_init();
+        aci_gap_init();
+        wait_for_aci_gap_init();
+        /* Call Read Config Parameter to retrieve the random BLE address */
+        aci_read_config_parameter();
+        wait_for_aci_read_config_parameter();
+        if (_ble_chip == BLUENRG_LP) {
+          hci_reset();
+          _read_index = _write_index = _write_index_initial = 0;
+          _initial_phase = 1;
+        } else {
+          /* Now we can update the write index and close the initial phase */
+          _write_index = _write_index_initial;
+          _initial_phase = 0;
+          _write_index_initial = 0;
+        }
+      } else {
+        set_address();
+        wait_for_set_address();
+        /* Now we can update the write index and close the initial phase */
+        _write_index = _write_index_initial;
+        _initial_phase = 0;
+        _write_index_initial = 0;
+      }
+    }
+
+    if (_read_index != _write_index) {
+      return 1;
+    } else {
+      return 0;
+    }
+  } else {
+    return 0;
+  }
+}
+
+int HCISpiTransportClass::peek()
+{
+  int peek_val = -1;
+
+  if (_read_index != _write_index) {
+    peek_val = _rxbuff[_read_index];
+  }
+
+  return peek_val;
+}
+
+int HCISpiTransportClass::read()
+{
+  int read_val = -1;
+
+  if (_read_index != _write_index) {
+    read_val = _rxbuff[_read_index];
+    _read_index++;
+    if (_read_index == _write_index) {
+      /* Reset buffer index */
+      _read_index = 0;
+      _write_index = 0;
+    }
+  }
+
+  return read_val;
+}
+
+size_t HCISpiTransportClass::write(const uint8_t *data, size_t length)
+{
+  uint8_t header_master[5] = {0x0a, 0x00, 0x00, 0x00, 0x00};
+  void *my_data = (void *)data;
+  int result = 0;
+  uint32_t tickstart = millis();
+
+  if (_ble_chip != SPBTLE_RF && _ble_chip != SPBTLE_1S && _ble_chip != BLUENRG_M2SP && _ble_chip != BLUENRG_M0 && _ble_chip != BLUENRG_LP) {
+    return 0;
+  }
+
+  do {
+    if (_ble_chip == SPBTLE_RF || _ble_chip == BLUENRG_M0) {
+      result = 0;
+
+      _spi->beginTransaction(_spiSettings);
+
+      digitalWrite(_cs_pin, LOW);
+
+      /* Write the header */
+      _spi->transfer(header_master, 5);
+
+      /* device is ready */
+      if (header_master[0] == 0x02) {
+        if (header_master[1] >= length) {
+          /* Write the data */
+          _spi->transfer(my_data, length);
+        } else {
+          result = -2;
+        }
+      } else {
+        result = -1;
+      }
+
+      digitalWrite(_cs_pin, HIGH);
+
+      _spi->endTransaction();
+
+      if ((millis() - tickstart) > 1000) {
+        result = -3;
+        break;
+      }
+    } else if (_ble_chip == SPBTLE_1S || _ble_chip == BLUENRG_M2SP || _ble_chip == BLUENRG_LP) {
+      uint32_t tickstart_data_available = millis();
+      result = 0;
+
+      detachInterrupt(_spi_irq);
+
+      _spi->beginTransaction(_spiSettings);
+
+      digitalWrite(_cs_pin, LOW);
+
+      /*
+       * Wait until BlueNRG-1 is ready.
+       * When ready it will raise the IRQ pin.
+       */
+      while (!(digitalRead(_spi_irq) == 1)) {
+        if ((millis() - tickstart_data_available) > 1000) {
+          result = -3;
+          break;
+        }
+      }
+
+      if (result == -3) {
+        digitalWrite(_cs_pin, HIGH);
+        _spi->endTransaction();
+        attachInterrupt(_spi_irq, SPI_Irq_Callback, RISING);
+        break;
+      }
+
+      /* Write the header */
+      _spi->transfer(header_master, 5);
+
+      if ((int)((((uint16_t)header_master[2]) << 8) | ((uint16_t)header_master[1])) >= (int)length) {
+        /* Write the data */
+        _spi->transfer(my_data, length);
+      } else {
+        result = -2;
+      }
+
+      digitalWrite(_cs_pin, HIGH);
+
+      _spi->endTransaction();
+
+      attachInterrupt(_spi_irq, SPI_Irq_Callback, RISING);
+
+      if ((millis() - tickstart) > 1000) {
+        result = -3;
+        break;
+      }
+    }
+  } while (result < 0);
+
+  if (result < 0) {
+    return 0;
+  } else {
+    return length;
+  }
+}
+
+void HCISpiTransportClass::wait_for_blue_initialize()
+{
+  int event_blue_initialize = 0;
+  uint8_t event[16];
+
+  do {
+    while (!data_avail);
+
+    if (digitalRead(_spi_irq) == 0) {
+      continue;
+    }
+
+    data_avail = 0;
+    while (digitalRead(_spi_irq) == 1) {
+      uint8_t header_master[5] = {0x0b, 0x00, 0x00, 0x00, 0x00};
+
+      if (_ble_chip == SPBTLE_1S || _ble_chip == BLUENRG_M2SP || _ble_chip == BLUENRG_LP) {
+        detachInterrupt(_spi_irq);
+      }
+
+      _spi->beginTransaction(_spiSettings);
+
+      digitalWrite(_cs_pin, LOW);
+
+      /* Write the header */
+      _spi->transfer(header_master, 5);
+
+      if (_ble_chip == SPBTLE_RF || _ble_chip == BLUENRG_M0) {
+        /* device is ready */
+        if (header_master[0] == 0x02) {
+          /* device is ready */
+          uint16_t byte_count = (header_master[4] << 8) | header_master[3];
+
+          if (byte_count > 0) {
+            /* Read the response */
+            if (byte_count == 6) {
+              for (int j = 0; j < byte_count; j++) {
+                event[j] = _spi->transfer(0x00);
+              }
+
+              if (event[0] == 0x04 &&
+                  event[1] == 0xFF &&
+                  event[2] == 0x03 &&
+                  event[3] == 0x01 &&
+                  event[4] == 0x00 &&
+                  event[5] == 0x01) {
+                event_blue_initialize = 1;
+              }
+            } else {
+              for (int j = 0; j < byte_count; j++) {
+                _spi->transfer(0x00);
+              }
+            }
+          }
+        }
+      } else if (_ble_chip == SPBTLE_1S || _ble_chip == BLUENRG_M2SP) {
+        uint16_t byte_count = (header_master[4] << 8) | header_master[3];
+
+        if (byte_count > 0) {
+          /* Read the response */
+          if (byte_count == 6) {
+            for (int j = 0; j < byte_count; j++) {
+              event[j] = _spi->transfer(0x00);
+            }
+
+            if (event[0] == 0x04 &&
+                event[1] == 0xFF &&
+                event[2] == 0x03 &&
+                event[3] == 0x01 &&
+                event[4] == 0x00 &&
+                event[5] == 0x01) {
+              event_blue_initialize = 1;
+            }
+          } else {
+            for (int j = 0; j < byte_count; j++) {
+              _spi->transfer(0x00);
+            }
+          }
+        }
+      } else if (_ble_chip == BLUENRG_LP) {
+        uint8_t byte_count = (header_master[4] << 8) | header_master[3];
+
+        if (byte_count > 0) {
+          /* Read the response */
+          if (byte_count == 7) {
+            for (int j = 0; j < byte_count; j++) {
+              event[j] = _spi->transfer(0x00);
+            }
+
+            if (event[0] == 0x82 &&
+                event[1] == 0xFF &&
+                event[2] == 0x03 &&
+                event[3] == 0x00 &&
+                event[4] == 0x01 &&
+                event[5] == 0x00 &&
+                event[6] == 0x01) {
+              event_blue_initialize = 1;
+            }
+          } else {
+            for (int j = 0; j < byte_count; j++) {
+              _spi->transfer(0x00);
+            }
+          }
+        }
+      }
+
+      digitalWrite(_cs_pin, HIGH);
+
+      _spi->endTransaction();
+
+      if (_ble_chip == SPBTLE_1S || _ble_chip == BLUENRG_M2SP || _ble_chip == BLUENRG_LP) {
+        attachInterrupt(_spi_irq, SPI_Irq_Callback, RISING);
+      }
+    }
+  } while (!event_blue_initialize);
+}
+
+void HCISpiTransportClass::wait_for_enable_ll_only()
+{
+  uint8_t data[8];
+  int status = 0;
+
+  do {
+    while (!data_avail);
+
+    if (digitalRead(_spi_irq) == 0) {
+      continue;
+    }
+
+    data_avail = 0;
+    while (digitalRead(_spi_irq) == 1) {
+      uint8_t header_master[5] = {0x0b, 0x00, 0x00, 0x00, 0x00};
+
+      if (_ble_chip == SPBTLE_1S || _ble_chip == BLUENRG_M2SP || _ble_chip == BLUENRG_LP) {
+        detachInterrupt(_spi_irq);
+      }
+
+      _spi->beginTransaction(_spiSettings);
+
+      digitalWrite(_cs_pin, LOW);
+
+      /* Write the header */
+      _spi->transfer(header_master, 5);
+
+      if (_ble_chip == SPBTLE_RF || _ble_chip == BLUENRG_M0) {
+        /* device is ready */
+        if (header_master[0] == 0x02) {
+          /* device is ready */
+          uint16_t byte_count = (header_master[4] << 8) | header_master[3];
+
+          if (byte_count > 0) {
+            /* Read the response */
+            for (int j = 0; j < byte_count; j++) {
+              data[j] = _spi->transfer(0x00);
+            }
+
+            if (byte_count >= 7) {
+              if (data[0] == 0x04 &&
+                  data[1] == 0x0E &&
+                  data[2] == 0x04 &&
+                  data[3] == 0x01 &&
+                  data[4] == 0x0C &&
+                  data[5] == 0xFC &&
+                  data[6] == 0x00) {
+                status = 1;
+              }
+            }
+          }
+        }
+      } else if (_ble_chip == SPBTLE_1S || _ble_chip == BLUENRG_M2SP || _ble_chip == BLUENRG_LP) {
+        uint16_t byte_count = (header_master[4] << 8) | header_master[3];
+
+        if (byte_count > 0) {
+          /* Read the response */
+          for (int j = 0; j < byte_count; j++) {
+            data[j] = _spi->transfer(0x00);
+          }
+
+          if (byte_count >= 7) {
+            if (data[0] == 0x04 &&
+                data[1] == 0x0E &&
+                data[2] == 0x04 &&
+                data[3] == 0x01 &&
+                data[4] == 0x0C &&
+                data[5] == 0xFC &&
+                data[6] == 0x00) {
+              status = 1;
+            }
+          }
+        }
+      }
+
+      digitalWrite(_cs_pin, HIGH);
+
+      _spi->endTransaction();
+
+      if (_ble_chip == SPBTLE_1S || _ble_chip == BLUENRG_M2SP || _ble_chip == BLUENRG_LP) {
+        attachInterrupt(_spi_irq, SPI_Irq_Callback, RISING);
+      }
+    }
+  } while (!status);
+}
+
+void HCISpiTransportClass::enable_ll_only()
+{
+  uint8_t header_master[5] = {0x0a, 0x00, 0x00, 0x00, 0x00};
+  uint8_t cmd[7] = {0x01, 0x0C, 0xFC, 0x03, 0x2C, 0x01, 0x01}; // Enable LL_ONLY
+  int result = 0;
+
+  do {
+    if (_ble_chip == SPBTLE_RF || _ble_chip == BLUENRG_M0) {
+      result = 0;
+
+      _spi->beginTransaction(_spiSettings);
+
+      digitalWrite(_cs_pin, LOW);
+
+      /* Write the header */
+      _spi->transfer(header_master, 5);
+
+      /* device is ready */
+      if (header_master[0] == 0x02) {
+        /* Write the data */
+        if (header_master[1] >= 7) {
+          /* Write the data */
+          _spi->transfer((void *)cmd, 7);
+        } else {
+          result = -2;
+        }
+      } else {
+        result = -1;
+      }
+
+      digitalWrite(_cs_pin, HIGH);
+
+      _spi->endTransaction();
+    } else if (_ble_chip == SPBTLE_1S || _ble_chip == BLUENRG_M2SP || _ble_chip == BLUENRG_LP) {
+      uint32_t tickstart_data_available = millis();
+      result = 0;
+
+      detachInterrupt(_spi_irq);
+
+      _spi->beginTransaction(_spiSettings);
+
+      digitalWrite(_cs_pin, LOW);
+
+      while (!(digitalRead(_spi_irq) == 1)) {
+        if ((millis() - tickstart_data_available) > 1000) {
+          result = -3;
+          break;
+        }
+      }
+
+      if (result == -3) {
+        digitalWrite(_cs_pin, HIGH);
+        _spi->endTransaction();
+        attachInterrupt(_spi_irq, SPI_Irq_Callback, RISING);
+        break;
+      }
+
+      /* Write the header */
+      _spi->transfer(header_master, 5);
+
+      if ((int)((((uint16_t)header_master[2]) << 8) | ((uint16_t)header_master[1])) >= 7) {
+        /* Write the data */
+        _spi->transfer((void *)cmd, 7);
+      } else {
+        result = -2;
+      }
+
+      digitalWrite(_cs_pin, HIGH);
+
+      _spi->endTransaction();
+
+      attachInterrupt(_spi_irq, SPI_Irq_Callback, RISING);
+    }
+  } while (result < 0);
+}
+
+void HCISpiTransportClass::wait_for_aci_gatt_init()
+{
+  uint8_t data[8];
+  int status = 0;
+
+  do {
+    while (!data_avail);
+
+    if (digitalRead(_spi_irq) == 0) {
+      continue;
+    }
+
+    data_avail = 0;
+    while (digitalRead(_spi_irq) == 1) {
+      uint8_t header_master[5] = {0x0b, 0x00, 0x00, 0x00, 0x00};
+
+      if (_ble_chip == SPBTLE_1S || _ble_chip == BLUENRG_M2SP || _ble_chip == BLUENRG_LP) {
+        detachInterrupt(_spi_irq);
+      }
+
+      _spi->beginTransaction(_spiSettings);
+
+      digitalWrite(_cs_pin, LOW);
+
+      /* Write the header */
+      _spi->transfer(header_master, 5);
+
+      if (_ble_chip == SPBTLE_RF || _ble_chip == BLUENRG_M0) {
+        /* device is ready */
+        if (header_master[0] == 0x02) {
+          /* device is ready */
+          uint16_t byte_count = (header_master[4] << 8) | header_master[3];
+
+          if (byte_count > 0) {
+            /* Read the response */
+            for (int j = 0; j < byte_count; j++) {
+              data[j] = _spi->transfer(0x00);
+            }
+
+            if (byte_count >= 7) {
+              if (data[0] == 0x04 &&
+                  data[1] == 0x0E &&
+                  data[2] == 0x04 &&
+                  data[3] == 0x01 &&
+                  data[4] == 0x01 &&
+                  data[5] == 0xFD &&
+                  data[6] == 0x00) {
+                status = 1;
+              }
+            }
+          }
+        }
+      } else if (_ble_chip == SPBTLE_1S || _ble_chip == BLUENRG_M2SP || _ble_chip == BLUENRG_LP) {
+        uint16_t byte_count = (header_master[4] << 8) | header_master[3];
+
+        if (byte_count > 0) {
+          /* Read the response */
+          for (int j = 0; j < byte_count; j++) {
+            data[j] = _spi->transfer(0x00);
+          }
+
+          if (byte_count >= 7) {
+            if (data[0] == 0x04 &&
+                data[1] == 0x0E &&
+                data[2] == 0x04 &&
+                data[3] == 0x01 &&
+                data[4] == 0x01 &&
+                data[5] == 0xFD &&
+                data[6] == 0x00) {
+              status = 1;
+            }
+          }
+        }
+      }
+
+      digitalWrite(_cs_pin, HIGH);
+
+      _spi->endTransaction();
+
+      if (_ble_chip == SPBTLE_1S || _ble_chip == BLUENRG_M2SP || _ble_chip == BLUENRG_LP) {
+        attachInterrupt(_spi_irq, SPI_Irq_Callback, RISING);
+      }
+    }
+  } while (!status);
+}
+
+void HCISpiTransportClass::aci_gatt_init()
+{
+  uint8_t header_master[5] = {0x0a, 0x00, 0x00, 0x00, 0x00};
+  uint8_t cmd[4] = {0x01, 0x01, 0xFD, 0x00}; // ACI_GATT_INIT
+  int result = 0;
+
+  do {
+    if (_ble_chip == SPBTLE_RF || _ble_chip == BLUENRG_M0) {
+      result = 0;
+
+      _spi->beginTransaction(_spiSettings);
+
+      digitalWrite(_cs_pin, LOW);
+
+      /* Write the header */
+      _spi->transfer(header_master, 5);
+
+      /* device is ready */
+      if (header_master[0] == 0x02) {
+        /* Write the data */
+        if (header_master[1] >= 4) {
+          /* Write the data */
+          _spi->transfer((void *)cmd, 4);
+        } else {
+          result = -2;
+        }
+      } else {
+        result = -1;
+      }
+
+      digitalWrite(_cs_pin, HIGH);
+
+      _spi->endTransaction();
+    } else if (_ble_chip == SPBTLE_1S || _ble_chip == BLUENRG_M2SP || _ble_chip == BLUENRG_LP) {
+      uint32_t tickstart_data_available = millis();
+      result = 0;
+
+      detachInterrupt(_spi_irq);
+
+      _spi->beginTransaction(_spiSettings);
+
+      digitalWrite(_cs_pin, LOW);
+
+      while (!(digitalRead(_spi_irq) == 1)) {
+        if ((millis() - tickstart_data_available) > 1000) {
+          result = -3;
+          break;
+        }
+      }
+
+      if (result == -3) {
+        digitalWrite(_cs_pin, HIGH);
+        _spi->endTransaction();
+        attachInterrupt(_spi_irq, SPI_Irq_Callback, RISING);
+        break;
+      }
+
+      /* Write the header */
+      _spi->transfer(header_master, 5);
+
+      if ((int)((((uint16_t)header_master[2]) << 8) | ((uint16_t)header_master[1])) >= 4) {
+        /* Write the data */
+        _spi->transfer((void *)cmd, 4);
+      } else {
+        result = -2;
+      }
+
+      digitalWrite(_cs_pin, HIGH);
+
+      _spi->endTransaction();
+
+      attachInterrupt(_spi_irq, SPI_Irq_Callback, RISING);
+    }
+  } while (result < 0);
+}
+
+void HCISpiTransportClass::wait_for_aci_gap_init()
+{
+  uint8_t data[14];
+  int status = 0;
+
+  do {
+    while (!data_avail);
+
+    if (digitalRead(_spi_irq) == 0) {
+      continue;
+    }
+
+    data_avail = 0;
+    while (digitalRead(_spi_irq) == 1) {
+      uint8_t header_master[5] = {0x0b, 0x00, 0x00, 0x00, 0x00};
+
+      if (_ble_chip == SPBTLE_1S || _ble_chip == BLUENRG_M2SP || _ble_chip == BLUENRG_LP) {
+        detachInterrupt(_spi_irq);
+      }
+
+      _spi->beginTransaction(_spiSettings);
+
+      digitalWrite(_cs_pin, LOW);
+
+      /* Write the header */
+      _spi->transfer(header_master, 5);
+
+      if (_ble_chip == SPBTLE_RF || _ble_chip == BLUENRG_M0) {
+        /* device is ready */
+        if (header_master[0] == 0x02) {
+          /* device is ready */
+          uint16_t byte_count = (header_master[4] << 8) | header_master[3];
+
+          if (byte_count > 0) {
+            /* Read the response */
+            for (int j = 0; j < byte_count; j++) {
+              data[j] = _spi->transfer(0x00);
+            }
+
+            if (byte_count >= 13) {
+              if (data[0] == 0x04 &&
+                  data[1] == 0x0E &&
+                  data[2] == 0x0A &&
+                  data[3] == 0x01 &&
+                  data[4] == 0x8A &&
+                  data[5] == 0xFC &&
+                  data[6] == 0x00) {
+                status = 1;
+              }
+            }
+          }
+        }
+      } else if (_ble_chip == SPBTLE_1S || _ble_chip == BLUENRG_M2SP || _ble_chip == BLUENRG_LP) {
+        uint16_t byte_count = (header_master[4] << 8) | header_master[3];
+
+        if (byte_count > 0) {
+          /* Read the response */
+          for (int j = 0; j < byte_count; j++) {
+            data[j] = _spi->transfer(0x00);
+          }
+
+          if (byte_count >= 13) {
+            if (data[0] == 0x04 &&
+                data[1] == 0x0E &&
+                data[2] == 0x0A &&
+                data[3] == 0x01 &&
+                data[4] == 0x8A &&
+                data[5] == 0xFC &&
+                data[6] == 0x00) {
+              status = 1;
+            }
+          }
+        }
+      }
+
+      digitalWrite(_cs_pin, HIGH);
+
+      _spi->endTransaction();
+
+      if (_ble_chip == SPBTLE_1S || _ble_chip == BLUENRG_M2SP || _ble_chip == BLUENRG_LP) {
+        attachInterrupt(_spi_irq, SPI_Irq_Callback, RISING);
+      }
+    }
+  } while (!status);
+}
+
+void HCISpiTransportClass::aci_gap_init()
+{
+  uint8_t header_master[5] = {0x0a, 0x00, 0x00, 0x00, 0x00};
+  uint8_t cmd_lp[8] = {0x01, 0x8A, 0xFC, 0x04, 0x0F, 0x00, 0x00, 0x00}; // ACI_GAP_INIT
+  uint8_t cmd_others[7] = {0x01, 0x8A, 0xFC, 0x03, 0x0F, 0x00, 0x00}; // ACI_GAP_INIT
+  uint8_t *cmd, cmd_size;
+  if (_ble_chip == BLUENRG_LP) {
+    cmd = cmd_lp;
+    cmd_size = 8;
+  } else {
+    cmd = cmd_others;
+    cmd_size = 7;
+  }
+  int result = 0;
+
+  do {
+    if (_ble_chip == SPBTLE_RF || _ble_chip == BLUENRG_M0) {
+      result = 0;
+
+      _spi->beginTransaction(_spiSettings);
+
+      digitalWrite(_cs_pin, LOW);
+
+      /* Write the header */
+      _spi->transfer(header_master, 5);
+
+      /* device is ready */
+      if (header_master[0] == 0x02) {
+        /* Write the data */
+        if (header_master[1] >= cmd_size) {
+          /* Write the data */
+          _spi->transfer((void *)cmd, cmd_size);
+        } else {
+          result = -2;
+        }
+      } else {
+        result = -1;
+      }
+
+      digitalWrite(_cs_pin, HIGH);
+
+      _spi->endTransaction();
+    } else if (_ble_chip == SPBTLE_1S || _ble_chip == BLUENRG_M2SP || _ble_chip == BLUENRG_LP) {
+      uint32_t tickstart_data_available = millis();
+      result = 0;
+
+      detachInterrupt(_spi_irq);
+
+      _spi->beginTransaction(_spiSettings);
+
+      digitalWrite(_cs_pin, LOW);
+
+      while (!(digitalRead(_spi_irq) == 1)) {
+        if ((millis() - tickstart_data_available) > 1000) {
+          result = -3;
+          break;
+        }
+      }
+
+      if (result == -3) {
+        digitalWrite(_cs_pin, HIGH);
+        _spi->endTransaction();
+        attachInterrupt(_spi_irq, SPI_Irq_Callback, RISING);
+        break;
+      }
+
+      /* Write the header */
+      _spi->transfer(header_master, 5);
+
+      if ((int)((((uint16_t)header_master[2]) << 8) | ((uint16_t)header_master[1])) >= cmd_size) {
+        /* Write the data */
+        _spi->transfer((void *)cmd, cmd_size);
+      } else {
+        result = -2;
+      }
+
+      digitalWrite(_cs_pin, HIGH);
+
+      _spi->endTransaction();
+
+      attachInterrupt(_spi_irq, SPI_Irq_Callback, RISING);
+    }
+  } while (result < 0);
+}
+
+void HCISpiTransportClass::wait_for_aci_read_config_parameter()
+{
+  uint8_t data[15];
+  int status = 0;
+
+  do {
+    while (!data_avail);
+
+    if (digitalRead(_spi_irq) == 0) {
+      continue;
+    }
+
+    data_avail = 0;
+    while (digitalRead(_spi_irq) == 1) {
+      uint8_t header_master[5] = {0x0b, 0x00, 0x00, 0x00, 0x00};
+
+      if (_ble_chip == SPBTLE_1S || _ble_chip == BLUENRG_M2SP || _ble_chip == BLUENRG_LP) {
+        detachInterrupt(_spi_irq);
+      }
+
+      _spi->beginTransaction(_spiSettings);
+
+      digitalWrite(_cs_pin, LOW);
+
+      /* Write the header */
+      _spi->transfer(header_master, 5);
+
+      if (_ble_chip == SPBTLE_RF || _ble_chip == BLUENRG_M0) {
+        /* device is ready */
+        if (header_master[0] == 0x02) {
+          /* device is ready */
+          uint16_t byte_count = (header_master[4] << 8) | header_master[3];
+
+          if (byte_count > 0) {
+            /* Read the response */
+            for (int j = 0; j < byte_count; j++) {
+              data[j] = _spi->transfer(0x00);
+            }
+
+            if (byte_count >= 13) {
+              if (data[0] == 0x04 &&
+                  data[1] == 0x0E &&
+                  data[2] == 0x0A &&
+                  data[3] == 0x01 &&
+                  data[4] == 0x0D &&
+                  data[5] == 0xFC &&
+                  data[6] == 0x00) {
+                memcpy(_random_addr, &data[7], 6);
+                status = 1;
+              }
+            }
+          }
+        }
+      } else if (_ble_chip == SPBTLE_1S || _ble_chip == BLUENRG_M2SP || _ble_chip == BLUENRG_LP) {
+        uint16_t byte_count = (header_master[4] << 8) | header_master[3];
+
+        if (byte_count > 0) {
+          /* Read the response */
+          for (int j = 0; j < byte_count; j++) {
+            data[j] = _spi->transfer(0x00);
+          }
+
+          if (byte_count >= 14) {
+            if (data[0] == 0x04 &&
+                data[1] == 0x0E &&
+                data[2] == 0x0B &&
+                data[3] == 0x01 &&
+                data[4] == 0x0D &&
+                data[5] == 0xFC &&
+                data[6] == 0x00) {
+              memcpy(_random_addr, &data[8], 6);
+              status = 1;
+              _random_addr_done = true;
+            }
+          }
+        }
+      }
+
+      digitalWrite(_cs_pin, HIGH);
+
+      _spi->endTransaction();
+
+      if (_ble_chip == SPBTLE_1S || _ble_chip == BLUENRG_M2SP || _ble_chip == BLUENRG_LP) {
+        attachInterrupt(_spi_irq, SPI_Irq_Callback, RISING);
+      }
+    }
+  } while (!status);
+}
+
+void HCISpiTransportClass::aci_read_config_parameter()
+{
+  uint8_t header_master[5] = {0x0a, 0x00, 0x00, 0x00, 0x00};
+  uint8_t cmd[5] = {0x01, 0x0D, 0xFC, 0x01, 0x80}; // ACI_READ_CONFIG_PARAMETER
+  int result = 0;
+
+  do {
+    if (_ble_chip == SPBTLE_RF || _ble_chip == BLUENRG_M0) {
+      result = 0;
+
+      _spi->beginTransaction(_spiSettings);
+
+      digitalWrite(_cs_pin, LOW);
+
+      /* Write the header */
+      _spi->transfer(header_master, 5);
+
+      /* device is ready */
+      if (header_master[0] == 0x02) {
+        /* Write the data */
+        if (header_master[1] >= 5) {
+          /* Write the data */
+          _spi->transfer((void *)cmd, 5);
+        } else {
+          result = -2;
+        }
+      } else {
+        result = -1;
+      }
+
+      digitalWrite(_cs_pin, HIGH);
+
+      _spi->endTransaction();
+    } else if (_ble_chip == SPBTLE_1S || _ble_chip == BLUENRG_M2SP || _ble_chip == BLUENRG_LP) {
+      uint32_t tickstart_data_available = millis();
+      result = 0;
+
+      detachInterrupt(_spi_irq);
+
+      _spi->beginTransaction(_spiSettings);
+
+      digitalWrite(_cs_pin, LOW);
+
+      while (!(digitalRead(_spi_irq) == 1)) {
+        if ((millis() - tickstart_data_available) > 1000) {
+          result = -3;
+          break;
+        }
+      }
+
+      if (result == -3) {
+        digitalWrite(_cs_pin, HIGH);
+        _spi->endTransaction();
+        attachInterrupt(_spi_irq, SPI_Irq_Callback, RISING);
+        break;
+      }
+
+      /* Write the header */
+      _spi->transfer(header_master, 5);
+
+      if ((int)((((uint16_t)header_master[2]) << 8) | ((uint16_t)header_master[1])) >= 5) {
+        /* Write the data */
+        _spi->transfer((void *)cmd, 5);
+      } else {
+        result = -2;
+      }
+
+      digitalWrite(_cs_pin, HIGH);
+
+      _spi->endTransaction();
+
+      attachInterrupt(_spi_irq, SPI_Irq_Callback, RISING);
+    }
+  } while (result < 0);
+}
+
+void HCISpiTransportClass::hci_reset()
+{
+  uint8_t header_master[5] = {0x0a, 0x00, 0x00, 0x00, 0x00};
+  uint8_t cmd[4] = {0x01, 0x03, 0x0C, 0x00}; // HCI_RESET
+  int result = 0;
+
+  do {
+    if (_ble_chip == BLUENRG_LP) {
+      uint32_t tickstart_data_available = millis();
+      result = 0;
+
+      detachInterrupt(_spi_irq);
+
+      _spi->beginTransaction(_spiSettings);
+
+      digitalWrite(_cs_pin, LOW);
+
+      while (!(digitalRead(_spi_irq) == 1)) {
+        if ((millis() - tickstart_data_available) > 1000) {
+          result = -3;
+          break;
+        }
+      }
+
+      if (result == -3) {
+        digitalWrite(_cs_pin, HIGH);
+        _spi->endTransaction();
+        attachInterrupt(_spi_irq, SPI_Irq_Callback, RISING);
+        break;
+      }
+
+      /* Write the header */
+      _spi->transfer(header_master, 5);
+
+      if ((int)((((uint16_t)header_master[2]) << 8) | ((uint16_t)header_master[1])) >= 4) {
+        /* Write the data */
+        _spi->transfer((void *)cmd, 4);
+      } else {
+        result = -2;
+      }
+
+      digitalWrite(_cs_pin, HIGH);
+
+      _spi->endTransaction();
+
+      attachInterrupt(_spi_irq, SPI_Irq_Callback, RISING);
+    }
+  } while (result < 0);
+}
+
+void HCISpiTransportClass::set_address()
+{
+  uint8_t header_master[5] = {0x0a, 0x00, 0x00, 0x00, 0x00};
+  uint8_t cmd[10] = {0x01, 0x05, 0x20, 0x06}; // SET ADDR
+  int result = 0;
+  memcpy(&cmd[4], _random_addr, 6);
+
+  do {
+    if (_ble_chip == BLUENRG_LP) {
+      uint32_t tickstart_data_available = millis();
+      result = 0;
+
+      detachInterrupt(_spi_irq);
+
+      _spi->beginTransaction(_spiSettings);
+
+      digitalWrite(_cs_pin, LOW);
+
+      while (!(digitalRead(_spi_irq) == 1)) {
+        if ((millis() - tickstart_data_available) > 1000) {
+          result = -3;
+          break;
+        }
+      }
+
+      if (result == -3) {
+        digitalWrite(_cs_pin, HIGH);
+        _spi->endTransaction();
+        attachInterrupt(_spi_irq, SPI_Irq_Callback, RISING);
+        break;
+      }
+
+      /* Write the header */
+      _spi->transfer(header_master, 5);
+
+      if ((int)((((uint16_t)header_master[2]) << 8) | ((uint16_t)header_master[1])) >= 10) {
+        /* Write the data */
+        _spi->transfer((void *)cmd, 10);
+      } else {
+        result = -2;
+      }
+
+      digitalWrite(_cs_pin, HIGH);
+
+      _spi->endTransaction();
+
+      attachInterrupt(_spi_irq, SPI_Irq_Callback, RISING);
+    }
+  } while (result < 0);
+}
+
+void HCISpiTransportClass::wait_for_set_address()
+{
+  uint8_t data[15];
+  int status = 0;
+
+  if (_ble_chip != BLUENRG_LP) {
+    return;
+  }
+
+  do {
+    while (!data_avail);
+
+    if (digitalRead(_spi_irq) == 0) {
+      continue;
+    }
+
+    data_avail = 0;
+    while (digitalRead(_spi_irq) == 1) {
+      uint8_t header_master[5] = {0x0b, 0x00, 0x00, 0x00, 0x00};
+      uint16_t byte_count = 0;
+
+      detachInterrupt(_spi_irq);
+
+      _spi->beginTransaction(_spiSettings);
+
+      digitalWrite(_cs_pin, LOW);
+
+      /* Write the header */
+      _spi->transfer(header_master, 5);
+
+      byte_count = (header_master[4] << 8) | header_master[3];
+
+      if (byte_count > 0) {
+        /* Read the response */
+        for (int j = 0; j < byte_count; j++) {
+          data[j] = _spi->transfer(0x00);
+        }
+
+        if (byte_count >= 7) { // 040E0401052000
+          if (data[0] == 0x04 &&
+              data[1] == 0x0E &&
+              data[2] == 0x04 &&
+              data[3] == 0x01 &&
+              data[4] == 0x05 &&
+              data[5] == 0x20 &&
+              data[6] == 0x00) {
+            status = 1;
+          }
+        }
+      }
+
+      digitalWrite(_cs_pin, HIGH);
+
+      _spi->endTransaction();
+
+      attachInterrupt(_spi_irq, SPI_Irq_Callback, RISING);
+    }
+  } while (!status);
+}
+
+HCITransportInterface& HCITransport = HCISpiTransport;
diff --git a/src/utility/HCISpiTransport.h b/src/utility/HCISpiTransport.h
new file mode 100644
index 00000000..34af1aa9
--- /dev/null
+++ b/src/utility/HCISpiTransport.h
@@ -0,0 +1,83 @@
+/*
+  This file is part of the STM32duinoBLE library.
+  Copyright (c) 2019 STMicroelectronics. All rights reserved.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  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
+*/
+
+#ifndef _HCI_SPI_TRANSPORT_H_
+#define _HCI_SPI_TRANSPORT_H_
+
+#include "HCITransport.h"
+#include "SPI.h"
+
+typedef enum BLEChip_s {
+  SPBTLE_RF,
+  SPBTLE_1S,
+  BLUENRG_M2SP,
+  BLUENRG_M0,
+  BLUENRG_LP
+} BLEChip_t;
+
+#ifndef BLE_SPI_BYTE_ORDER
+  #define BLE_SPI_BYTE_ORDER  MSBFIRST
+#endif
+#define BLE_MODULE_SPI_BUFFER_SIZE 128
+
+class HCISpiTransportClass : public HCITransportInterface {
+  public:
+    HCISpiTransportClass(SPIClass &spi, BLEChip_t ble_chip, uint8_t cs_pin, uint8_t spi_irq, uint8_t ble_rst, uint32_t frequency, uint8_t spi_mode);
+    virtual ~HCISpiTransportClass();
+
+    virtual int begin();
+    virtual void end();
+
+    virtual void wait(unsigned long timeout);
+
+    virtual int available();
+    virtual int peek();
+    virtual int read();
+
+    virtual size_t write(const uint8_t *data, size_t length);
+
+  private:
+    void wait_for_blue_initialize();
+    void wait_for_enable_ll_only();
+    void enable_ll_only();
+    void wait_for_aci_gatt_init();
+    void aci_gatt_init();
+    void wait_for_aci_gap_init();
+    void aci_gap_init();
+    void wait_for_aci_read_config_parameter();
+    void aci_read_config_parameter();
+    void hci_reset();
+    void set_address();
+    void wait_for_set_address();
+    SPIClass *_spi;
+    SPISettings _spiSettings;
+    BLEChip_t _ble_chip;
+    uint8_t _cs_pin;
+    uint8_t _spi_irq;
+    uint8_t _ble_rst;
+    uint8_t _rxbuff[BLE_MODULE_SPI_BUFFER_SIZE];
+    uint16_t _read_index;
+    uint16_t _write_index;
+    uint16_t _write_index_initial;
+    uint8_t _initial_phase;
+    uint8_t _random_addr[6];
+    bool _random_addr_done;
+};
+
+#endif /* _HCI_SPI_TRANSPORT_H_ */

From f5e86b919317620ab4cc9e88c76bc66d17897948 Mon Sep 17 00:00:00 2001
From: Frederic Pillon <frederic.pillon@st.com>
Date: Wed, 26 Mar 2025 09:03:20 +0100
Subject: [PATCH 090/112] chore: moved to STM32duinoBLE

Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
---
 .github/dependabot.yml                        |    13 -
 .github/workflows/compile-examples.yml        |    98 -
 .github/workflows/report-size-deltas.yml      |    24 -
 .github/workflows/sync-labels.yml             |   138 -
 README.md                                     |    28 +-
 docs/api.md                                   |  3818 ----
 docs/assets/ble-bulletin-board-model.png      |   Bin 41914 -> 0 bytes
 docs/readme.md                                |    91 -
 examples/Central/LedControl/LedControl.ino    |     6 +-
 .../PeripheralExplorer/PeripheralExplorer.ino |     5 +-
 examples/Central/Scan/Scan.ino                |     5 +-
 .../Central/ScanCallback/ScanCallback.ino     |     5 +-
 .../SensorTagButton/SensorTagButton.ino       |     5 +-
 .../EnhancedAdvertising.ino                   |     2 +-
 .../RawDataAdvertising/RawDataAdvertising.ino |     2 +-
 .../BatteryMonitor/BatteryMonitor.ino         |     5 +-
 examples/Peripheral/ButtonLED/ButtonLED.ino   |     6 +-
 .../Peripheral/CallbackLED/CallbackLED.ino    |     5 +-
 .../EncryptedBatteryMonitor.ino               |   265 -
 examples/Peripheral/LED/LED.ino               |     5 +-
 extras/arduino-ble-parser.py                  |    85 -
 extras/test/.gitignore                        |     1 -
 extras/test/CMakeLists.txt                    |   126 -
 .../external/catch/v2.12.1/include/catch.hpp  | 17698 ----------------
 extras/test/include/Arduino.h                 |    45 -
 .../FakeBLELocalDevice.h                      |    35 -
 .../include/test_discovered_device/FakeGAP.h  |    33 -
 extras/test/include/util/Common.h             |   167 -
 extras/test/include/util/HCIFakeTransport.h   |    19 -
 extras/test/include/util/Stream.h             |    40 -
 extras/test/include/util/String.h             |   248 -
 extras/test/include/util/TestUtil.h           |     3 -
 extras/test/include/util/itoa.h               |    37 -
 extras/test/src/Arduino.cpp                   |    44 -
 .../FakeBLELocalDevice.cpp                    |    40 -
 .../test_advertising_data.cpp                 |   184 -
 .../test_advertising_data/test_local_name.cpp |    82 -
 .../test_manufacturer.cpp                     |   146 -
 .../test_advertising_data/test_service.cpp    |   149 -
 .../src/test_discovered_device/FakeGAP.cpp    |    31 -
 .../test_discovered_device.cpp                |    52 -
 extras/test/src/test_main.cpp                 |    21 -
 extras/test/src/test_uuid/test_uuid.cpp       |    52 -
 extras/test/src/util/Common.cpp               |    34 -
 extras/test/src/util/HCIFakeTransport.cpp     |    23 -
 extras/test/src/util/String.cpp               |   755 -
 extras/test/src/util/TestUtil.cpp             |     3 -
 extras/test/src/util/itoa.c                   |   126 -
 keywords.txt                                  |     4 +-
 library.properties                            |    14 +-
 src/{ArduinoBLE.h => STM32duinoBLE.h}         |     4 +-
 src/utility/CordioHCICustomDriver.h           |    17 -
 src/utility/HCICordioTransport.cpp            |   314 -
 src/utility/HCICordioTransport.h              |    54 -
 src/utility/HCISilabsTransport.cpp            |   130 -
 src/utility/HCISilabsTransport.h              |    42 -
 src/utility/HCIUartTransport.cpp              |   109 -
 src/utility/HCIUartTransport.h                |    46 -
 src/utility/HCIVirtualTransport.cpp           |   142 -
 src/utility/HCIVirtualTransport.h             |    50 -
 src/utility/HCIVirtualTransportAT.cpp         |   112 -
 src/utility/HCIVirtualTransportAT.h           |    42 -
 src/utility/btct.cpp                          |     2 +-
 63 files changed, 53 insertions(+), 25834 deletions(-)
 delete mode 100644 .github/dependabot.yml
 delete mode 100644 .github/workflows/report-size-deltas.yml
 delete mode 100644 .github/workflows/sync-labels.yml
 delete mode 100644 docs/api.md
 delete mode 100644 docs/assets/ble-bulletin-board-model.png
 delete mode 100644 docs/readme.md
 delete mode 100644 examples/Peripheral/EncryptedBatteryMonitor/EncryptedBatteryMonitor.ino
 delete mode 100644 extras/arduino-ble-parser.py
 delete mode 100644 extras/test/.gitignore
 delete mode 100644 extras/test/CMakeLists.txt
 delete mode 100644 extras/test/external/catch/v2.12.1/include/catch.hpp
 delete mode 100644 extras/test/include/Arduino.h
 delete mode 100644 extras/test/include/test_advertising_data/FakeBLELocalDevice.h
 delete mode 100644 extras/test/include/test_discovered_device/FakeGAP.h
 delete mode 100644 extras/test/include/util/Common.h
 delete mode 100644 extras/test/include/util/HCIFakeTransport.h
 delete mode 100644 extras/test/include/util/Stream.h
 delete mode 100644 extras/test/include/util/String.h
 delete mode 100644 extras/test/include/util/TestUtil.h
 delete mode 100644 extras/test/include/util/itoa.h
 delete mode 100644 extras/test/src/Arduino.cpp
 delete mode 100644 extras/test/src/test_advertising_data/FakeBLELocalDevice.cpp
 delete mode 100644 extras/test/src/test_advertising_data/test_advertising_data.cpp
 delete mode 100644 extras/test/src/test_advertising_data/test_local_name.cpp
 delete mode 100644 extras/test/src/test_advertising_data/test_manufacturer.cpp
 delete mode 100644 extras/test/src/test_advertising_data/test_service.cpp
 delete mode 100644 extras/test/src/test_discovered_device/FakeGAP.cpp
 delete mode 100644 extras/test/src/test_discovered_device/test_discovered_device.cpp
 delete mode 100644 extras/test/src/test_main.cpp
 delete mode 100644 extras/test/src/test_uuid/test_uuid.cpp
 delete mode 100644 extras/test/src/util/Common.cpp
 delete mode 100644 extras/test/src/util/HCIFakeTransport.cpp
 delete mode 100644 extras/test/src/util/String.cpp
 delete mode 100644 extras/test/src/util/TestUtil.cpp
 delete mode 100644 extras/test/src/util/itoa.c
 rename src/{ArduinoBLE.h => STM32duinoBLE.h} (94%)
 delete mode 100644 src/utility/CordioHCICustomDriver.h
 delete mode 100644 src/utility/HCICordioTransport.cpp
 delete mode 100644 src/utility/HCICordioTransport.h
 delete mode 100644 src/utility/HCISilabsTransport.cpp
 delete mode 100644 src/utility/HCISilabsTransport.h
 delete mode 100644 src/utility/HCIUartTransport.cpp
 delete mode 100644 src/utility/HCIUartTransport.h
 delete mode 100644 src/utility/HCIVirtualTransport.cpp
 delete mode 100644 src/utility/HCIVirtualTransport.h
 delete mode 100644 src/utility/HCIVirtualTransportAT.cpp
 delete mode 100644 src/utility/HCIVirtualTransportAT.h

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
deleted file mode 100644
index f2bfa724..00000000
--- a/.github/dependabot.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-# See: https://docs.github.com/en/code-security/supply-chain-security/configuration-options-for-dependency-updates#about-the-dependabotyml-file
-version: 2
-
-updates:
-  # Configure check for outdated GitHub Actions actions in workflows.
-  # Source: https://github.com/arduino/tooling-project-assets/blob/main/workflow-templates/assets/dependabot/README.md
-  # See: https://docs.github.com/en/code-security/supply-chain-security/keeping-your-actions-up-to-date-with-dependabot
-  - package-ecosystem: github-actions
-    directory: / # Check the repository's workflows under /.github/workflows/
-    schedule:
-      interval: daily
-    labels:
-      - "topic: infrastructure"
diff --git a/.github/workflows/compile-examples.yml b/.github/workflows/compile-examples.yml
index 706ccb4c..c298c638 100644
--- a/.github/workflows/compile-examples.yml
+++ b/.github/workflows/compile-examples.yml
@@ -12,104 +12,6 @@ on:
       - ".github/workflows/compile-examples.yml"
       - "examples/**"
       - "src/**"
-  schedule:
-    # Run every Tuesday at 8 AM UTC to catch breakage caused by changes to external resources (libraries, platforms).
-    - cron: "0 8 * * TUE"
   workflow_dispatch:
-  repository_dispatch:
 
 jobs:
-  build:
-    name: ${{ matrix.board.fqbn }}
-    runs-on: ubuntu-latest
-
-    env:
-      SKETCHES_REPORTS_PATH: sketches-reports
-
-    strategy:
-      fail-fast: false
-
-      matrix:
-        board:
-          - fqbn: arduino:samd:mkrwifi1010
-            platforms: |
-              - name: arduino:samd
-            artifact-name-suffix: arduino-samd-mkrwifi1010
-          - fqbn: arduino:samd:nano_33_iot
-            platforms: |
-              - name: arduino:samd
-            artifact-name-suffix: arduino-samd-nano_33_iot
-          - fqbn: arduino:megaavr:uno2018:mode=on
-            platforms: |
-              - name: arduino:megaavr
-            artifact-name-suffix: arduino-megaavr-uno2018
-          - fqbn: arduino:mbed_nano:nano33ble
-            platforms: |
-              - name: arduino:mbed_nano
-            artifact-name-suffix: arduino-mbed_nano-nano33ble
-          - fqbn: arduino:mbed_nano:nanorp2040connect
-            platforms: |
-              - name: arduino:mbed_nano
-            artifact-name-suffix: arduino-mbed_nano-nanorp2040connect
-          - fqbn: arduino:renesas_uno:unor4wifi
-            platforms: |
-              - name: arduino:renesas_uno
-            artifact-name-suffix: arduino-renesas_uno-unor4wifi
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Compile examples
-        uses: arduino/compile-sketches@v1
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          fqbn: ${{ matrix.board.fqbn }}
-          platforms: ${{ matrix.board.platforms }}
-          libraries: |
-            # Install the library from the local path.
-            - source-path: ./
-          sketch-paths: |
-            - examples
-          enable-deltas-report: true
-          sketches-report-path: ${{ env.SKETCHES_REPORTS_PATH }}
-
-      - name: Save sketches report as workflow artifact
-        uses: actions/upload-artifact@v4
-        with:
-          if-no-files-found: error
-          path: ${{ env.SKETCHES_REPORTS_PATH }}
-          name: sketches-report-${{ matrix.board.artifact-name-suffix }}
-
-  build-for-esp32:
-    runs-on: ubuntu-latest
-    
-    strategy:
-      matrix:
-        fqbn:
-          - esp32:esp32:esp32
-          - esp32:esp32:esp32s3
-          - esp32:esp32:esp32c3
-          # future bluetooth chips
-          #- esp32:esp32:esp32c2
-          #- esp32:esp32:esp32c6
-          #- esp32:esp32:esp32h2
-
-    steps:
-      - uses: actions/checkout@v4
-      - uses: arduino/compile-sketches@v1
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          fqbn: ${{ matrix.fqbn }}
-          platforms: |
-            - name: esp32:esp32
-              source-url: https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json
-          sketch-paths: |
-            - examples/Central/Scan
-            - examples/Central/PeripheralExplorer
-            - examples/Central/ScanCallback
-            - examples/Central/SensorTagButton
-            - examples/Peripheral/Advertising/EnhancedAdvertising
-            - examples/Peripheral/Advertising/RawDataAdvertising
-          cli-compile-flags: |
-            - --warnings="none"
diff --git a/.github/workflows/report-size-deltas.yml b/.github/workflows/report-size-deltas.yml
deleted file mode 100644
index 39e2a0ad..00000000
--- a/.github/workflows/report-size-deltas.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-name: Report Size Deltas
-
-# See: https://docs.github.com/en/free-pro-team@latest/actions/reference/events-that-trigger-workflows
-on:
-  push:
-    paths:
-      - ".github/workflows/report-size-deltas.yml"
-  schedule:
-    # Run at the minimum interval allowed by GitHub Actions.
-    # Note: GitHub Actions periodically has outages which result in workflow failures.
-    # In this event, the workflows will start passing again once the service recovers.
-    - cron: "*/5 * * * *"
-  workflow_dispatch:
-  repository_dispatch:
-
-jobs:
-  report:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Comment size deltas reports to PRs
-        uses: arduino/report-size-deltas@v1
-        with:
-          # Regex matching the names of the workflow artifacts created by the "Compile Examples" workflow
-          sketches-reports-source: ^sketches-report-.+
diff --git a/.github/workflows/sync-labels.yml b/.github/workflows/sync-labels.yml
deleted file mode 100644
index 53a9f54f..00000000
--- a/.github/workflows/sync-labels.yml
+++ /dev/null
@@ -1,138 +0,0 @@
-# Source: https://github.com/arduino/tooling-project-assets/blob/main/workflow-templates/sync-labels.md
-name: Sync Labels
-
-# See: https://docs.github.com/en/actions/reference/events-that-trigger-workflows
-on:
-  push:
-    paths:
-      - ".github/workflows/sync-labels.ya?ml"
-      - ".github/label-configuration-files/*.ya?ml"
-  pull_request:
-    paths:
-      - ".github/workflows/sync-labels.ya?ml"
-      - ".github/label-configuration-files/*.ya?ml"
-  schedule:
-    # Run daily at 8 AM UTC to sync with changes to shared label configurations.
-    - cron: "0 8 * * *"
-  workflow_dispatch:
-  repository_dispatch:
-
-env:
-  CONFIGURATIONS_FOLDER: .github/label-configuration-files
-  CONFIGURATIONS_ARTIFACT: label-configuration-files
-
-jobs:
-  check:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Download JSON schema for labels configuration file
-        id: download-schema
-        uses: carlosperate/download-file-action@v2
-        with:
-          file-url: https://raw.githubusercontent.com/arduino/tooling-project-assets/main/workflow-templates/assets/sync-labels/arduino-tooling-gh-label-configuration-schema.json
-          location: ${{ runner.temp }}/label-configuration-schema
-
-      - name: Install JSON schema validator
-        run: |
-          sudo npm install \
-            --global \
-            ajv-cli \
-            ajv-formats
-
-      - name: Validate local labels configuration
-        run: |
-          # See: https://github.com/ajv-validator/ajv-cli#readme
-          ajv validate \
-            --all-errors \
-            -c ajv-formats \
-            -s "${{ steps.download-schema.outputs.file-path }}" \
-            -d "${{ env.CONFIGURATIONS_FOLDER }}/*.{yml,yaml}"
-
-  download:
-    needs: check
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        filename:
-          # Filenames of the shared configurations to apply to the repository in addition to the local configuration.
-          # https://github.com/arduino/tooling-project-assets/blob/main/workflow-templates/assets/sync-labels
-          - universal.yml
-
-    steps:
-      - name: Download
-        uses: carlosperate/download-file-action@v2
-        with:
-          file-url: https://raw.githubusercontent.com/arduino/tooling-project-assets/main/workflow-templates/assets/sync-labels/${{ matrix.filename }}
-
-      - name: Pass configuration files to next job via workflow artifact
-        uses: actions/upload-artifact@v4
-        with:
-          path: |
-            *.yaml
-            *.yml
-          if-no-files-found: error
-          name: ${{ env.CONFIGURATIONS_ARTIFACT }}
-
-  sync:
-    needs: download
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Set environment variables
-        run: |
-          # See: https://docs.github.com/en/actions/reference/workflow-commands-for-github-actions#setting-an-environment-variable
-          echo "MERGED_CONFIGURATION_PATH=${{ runner.temp }}/labels.yml" >> "$GITHUB_ENV"
-
-      - name: Determine whether to dry run
-        id: dry-run
-        if: >
-          github.event_name == 'pull_request' ||
-          (
-            (
-              github.event_name == 'push' ||
-              github.event_name == 'workflow_dispatch'
-            ) &&
-            github.ref != format('refs/heads/{0}', github.event.repository.default_branch)
-          )
-        run: |
-          # Use of this flag in the github-label-sync command will cause it to only check the validity of the
-          # configuration.
-          echo "::set-output name=flag::--dry-run"
-
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Download configuration files artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: ${{ env.CONFIGURATIONS_ARTIFACT }}
-          path: ${{ env.CONFIGURATIONS_FOLDER }}
-
-      - name: Remove unneeded artifact
-        uses: geekyeggo/delete-artifact@v5
-        with:
-          name: ${{ env.CONFIGURATIONS_ARTIFACT }}
-
-      - name: Merge label configuration files
-        run: |
-          # Merge all configuration files
-          shopt -s extglob
-          cat "${{ env.CONFIGURATIONS_FOLDER }}"/*.@(yml|yaml) > "${{ env.MERGED_CONFIGURATION_PATH }}"
-
-      - name: Install github-label-sync
-        run: sudo npm install --global github-label-sync
-
-      - name: Sync labels
-        env:
-          GITHUB_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          # See: https://github.com/Financial-Times/github-label-sync
-          github-label-sync \
-            --labels "${{ env.MERGED_CONFIGURATION_PATH }}" \
-            ${{ steps.dry-run.outputs.flag }} \
-            ${{ github.repository }}
diff --git a/README.md b/README.md
index b0027583..e9f3a948 100644
--- a/README.md
+++ b/README.md
@@ -1,22 +1,24 @@
-# ArduinoBLE
+# STM32duinoBLE
 
-[![Compile Examples Status](https://github.com/arduino-libraries/ArduinoBLE/workflows/Compile%20Examples/badge.svg)](https://github.com/arduino-libraries/ArduinoBLE/actions?workflow=Compile+Examples) [![Spell Check Status](https://github.com/arduino-libraries/ArduinoBLE/workflows/Spell%20Check/badge.svg)](https://github.com/arduino-libraries/ArduinoBLE/actions?workflow=Spell+Check)
+This library is a fork of ArduinoBLE library to add the support of SPBTLE-RF, SPBTLE-1S, BLUENRG-M2SP, BLUENRG-LP and BLUENRG-M0 BLE modules.
 
-Enables Bluetooth® Low Energy connectivity on the Arduino MKR WiFi 1010, Arduino UNO WiFi Rev2, Arduino Nano 33 IoT, Arduino Nano 33 BLE, Arduino Portenta H7, Arduino Giga R1 and Arduino UNO R4 WiFi.
+It was successfully tested with the [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].
 
-This library supports creating a Bluetooth® Low Energy peripheral & central mode.
+ - 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:
 
-For the Arduino MKR WiFi 1010, Arduino UNO WiFi Rev2, and Arduino Nano 33 IoT boards, it requires the NINA module to be running [Arduino NINA-W102 firmware](https://github.com/arduino/nina-fw) v1.2.0 or later.
+https://github.com/stm32duino/Arduino_Core_STM32/wiki/STM32duinoBLE#stm32duinoble-with-steval_mksbox1v1
 
-For the Arduino UNO R4 WiFi, it requires the ESP32-S3 module to be running [firmware](https://github.com/arduino/uno-r4-wifi-usb-bridge) v0.2.0 or later.
+- 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 this library please visit us at:
+For more information about ArduinoBLE library please visit the official web page at:
 https://www.arduino.cc/en/Reference/ArduinoBLE
 
 ## License
 
 ```
+Copyright (c) 2019 STMicroelectronics. All rights reserved.
 Copyright (c) 2019 Arduino SA. All rights reserved.
 
 This library is free software; you can redistribute it and/or
@@ -33,3 +35,15 @@ 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
+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
+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
\ No newline at end of file
diff --git a/docs/api.md b/docs/api.md
deleted file mode 100644
index c9f41840..00000000
--- a/docs/api.md
+++ /dev/null
@@ -1,3818 +0,0 @@
-# ArduinoBLE library
-
-## BLE class
-
-Used to enable the Bluetooth® Low Energy module.
-
-### `BLE.begin()`
-
-Initializes the Bluetooth® Low Energy device.
-
-#### Syntax
-
-```
-BLE.begin()
-
-```
-
-#### Parameters
-
-None
-
-#### Returns
-- 1 on success
-- 0 on failure
-
-#### Example
-
-```arduino
-
-  // begin initialization
-  if (!BLE.begin()) {
-    Serial.println("starting Bluetooth® Low Energy module failed!");
-
-    while (1);
-  }
-
-
-```
-
-### `BLE.end()`
-
-Stops the Bluetooth® Low Energy device.
-
-#### Syntax
-
-```
-BLE.end()
-
-```
-
-#### Parameters
-
-None
-
-#### Returns
-Nothing
-
-#### Example
-
-```arduino
-
-  // begin initialization
-  if (!BLE.begin()) {
-    Serial.println("starting Bluetooth® Low Energy module failed!");
-
-    while (1);
-  }
-
-  // ....
-
-  BLE.end();
-
-
-```
-
-### `BLE.poll()`
-
-Poll for Bluetooth® Low Energy radio events and handle them.
-
-#### Syntax
-
-```
-BLE.poll()
-BLE.poll(timeout)
-
-```
-
-#### Parameters
-
-**timeout**: optional timeout in ms, to wait for event. If not specified defaults to 0 ms.
-
-#### Returns
-Nothing
-
-#### Example
-
-```arduino
-
-  // assign event handlers for connected, disconnected to peripheral
-  BLE.setEventHandler(BLEConnected, blePeripheralConnectHandler);
-  BLE.setEventHandler(BLEDisconnected, blePeripheralDisconnectHandler);
-
-
-  BLE.poll();
-
-
-```
-
-### `BLE.setEventHandler()`
-
-Set the event handler (callback) function that will be called when the specified event occurs.
-
-#### Syntax
-
-```
-BLE.setEventHandler(eventType, callback)
-
-```
-
-#### Parameters
-
-- **eventType**: event type (BLEConnected, BLEDisconnected)
-- **callback**: function to call when event occurs
-#### Returns
-Nothing.
-
-#### Example
-
-```arduino
-
-  // begin initialization
-  if (!BLE.begin()) {
-    Serial.println("starting Bluetooth® Low Energy module failed!");
-
-    while (1);
-  }
-
-  // ...
-
-  // assign event handlers for connected, disconnected to peripheral
-  BLE.setEventHandler(BLEConnected, blePeripheralConnectHandler);
-  BLE.setEventHandler(BLEDisconnected, blePeripheralDisconnectHandler);
-
-
-
-void blePeripheralConnectHandler(BLEDevice central) {
-  // central connected event handler
-  Serial.print("Connected event, central: ");
-  Serial.println(central.address());
-}
-
-void blePeripheralDisconnectHandler(BLEDevice central) {
-  // central disconnected event handler
-  Serial.print("Disconnected event, central: ");
-  Serial.println(central.address());
-}
-
-
-```
-
-### `BLE.connected()`
-
-Query if another Bluetooth® Low Energy device is connected
-
-#### Syntax
-
-```
-BLE.connected()
-
-```
-
-#### Parameters
-
-None
-
-#### Returns
-- **true** if another Bluetooth® Low Energy device is connected,
-- otherwise **false**.
-
-#### Example
-
-```arduino
-
-    // while the central is still connected to peripheral:
-    while (BLE.connected()) {
-
-       // ...
-    }
-
-
-```
-
-### `BLE.disconnect()`
-
-Disconnect any Bluetooth® Low Energy devices that are connected
-
-#### Syntax
-
-```
-BLE.disconnect()
-
-```
-
-#### Parameters
-
-None
-
-#### Returns
-- **true** if any Bluetooth® Low Energy device that was previously connected was disconnected,
-- otherwise **false**.
-
-#### Example
-
-```arduino
-
-  if (BLE.connected()) {
-    BLE.disconnect();
-  }
-
-
-```
-
-### `BLE.address()`
-
-Query the Bluetooth® address of the Bluetooth® Low Energy device.
-
-#### Syntax
-
-```
-BLE.address()
-
-```
-
-#### Parameters
-
-None
-
-#### Returns
-- The **Bluetooth® address** of the Bluetooth® Low Energy device (as a String).
-
-#### Example
-
-```arduino
-
-  String address = BLE.address();
-
-  Serial.print("Local address is: ");
-  Serial.println(address);
-
-
-```
-
-### `BLE.rssi()`
-
-Query the RSSI (Received signal strength indication) of the connected Bluetooth® Low Energy device.
-
-#### Syntax
-
-```
-BLE.rssi()
-
-```
-
-#### Parameters
-
-None
-
-#### Returns
-- The **RSSI** of the connected Bluetooth® Low Energy device, 127 if no Bluetooth® Low Energy device is connected.
-
-#### Example
-
-```arduino
-
-  if (BLE.connected()) {
-    Serial.print("RSSI = ");
-    Serial.println(BLE.rssi());
-  }
-
-
-```
-
-### `BLE.setAdvertisedServiceUuid()`
-
-Set the advertised service UUID used when advertising.
-
-#### Syntax
-
-```
-BLE.setAdvertisedServiceUuid(uuid)
-
-```
-
-#### Parameters
-
-- **uuid:** 16-bit or 128-bit Bluetooth® Low Energy UUID in **String** format
-
-#### Returns
-Nothing
-
-#### Example
-
-```arduino
-
-  // begin initialization
-  if (!BLE.begin()) {
-    Serial.println("starting Bluetooth® Low Energy module failed!");
-
-    while (1);
-  }
-
-  BLE.setAdvertisedServiceUuid("19B10000-E8F2-537E-4F6C-D104768A1214");
-
-  // ...
-
-  // start advertising
-  BLE.advertise();
-
-
-```
-
-### `BLE.setAdvertisedService()`
-
-Set the advertised service UUID used when advertising to the value of the BLEService provided.
-
-#### Syntax
-
-```
-BLE.setAdvertisedService(bleService)
-
-```
-
-#### Parameters
-
-- **bleService:** BLEService to use UUID from
-
-#### Returns
-Nothing
-
-#### Example
-
-```arduino
-
-BLEService ledService("19B10000-E8F2-537E-4F6C-D104768A1214"); // Bluetooth® Low Energy LED Service
-
-// ...
-
-  // begin initialization
-  if (!BLE.begin()) {
-    Serial.println("starting Bluetooth® Low Energy module failed!");
-
-    while (1);
-  }
-
-  BLE.setAdvertisedService(ledService);
-
-  // ...
-
-  // start advertising
-  BLE.advertise();
-
-
-```
-
-### `BLE.setManufacturerData()`
-
-Set the manufacturer data value used when advertising.
-
-#### Syntax
-
-```
-BLE.setManufacturerData(data, length)
-
-```
-
-#### Parameters
-
-- **data:** byte array containing manufacturer data
-- **length:** length of manufacturer data array
-
-#### Returns
-Nothing
-
-#### Example
-
-```arduino
-
- // begin initialization
-  if (!BLE.begin()) {
-    Serial.println("starting Bluetooth® Low Energy module failed!");
-
-    while (1);
-  }
-
-  byte data[5] = { 0x01, 0x02, 0x03, 0x04, 0x05};
-
-  BLE.setManufacturerData(data, 5);
-
-  // ...
-
-  // start advertising
-  BLE.advertise();
-
-
-
-```
-
-### `BLE.setLocalName()`
-
-Set the local value used when advertising.
-
-#### Syntax
-
-```
-BLE.setLocalName(name)
-
-```
-
-#### Parameters
-
-- **name:** local name value to use when advertising
-
-#### Returns
-Nothing
-
-#### Example
-
-```arduino
-
- // begin initialization
-  if (!BLE.begin()) {
-    Serial.println("starting Bluetooth® Low Energy module failed!");
-
-    while (1);
-  }
-
-  BLE.setLocalName("LED");
-
-  // ...
-
-  // start advertising
-  BLE.advertise();
-
-
-
-```
-
-### `BLE.setDeviceName()`
-
-Set the device name in the built in device name characteristic. If not set, the value defaults to “Arduino”.
-
-#### Syntax
-
-```
-BLE.setDeviceName(name)
-
-```
-
-#### Parameters
-
-- **name:** device name value
-
-#### Returns
-Nothing
-
-#### Example
-
-```arduino
-
- // begin initialization
-  if (!BLE.begin()) {
-    Serial.println("starting Bluetooth® Low Energy module failed!");
-
-    while (1);
-  }
-
-  BLE.setDeviceName("LED");
-
-  // ...
-
-  // start advertising
-  BLE.advertise();
-
-
-
-```
-
-### `BLE.setAppearance()`
-
-Set the appearance in the built in appearance characteristic. If not set, the value defaults to 0x0000.
-
-#### Syntax
-
-```
-BLE.setAppearance(appearance)
-
-```
-
-#### Parameters
-
-- **appearance:** appearance value
-
-#### Returns
-Nothing
-
-#### Example
-
-```arduino
-
- // begin initialization
-  if (!BLE.begin()) {
-    Serial.println("starting Bluetooth® Low Energy module failed!");
-
-    while (1);
-  }
-
-  BLE.setAppearance(0x8000);
-
-  // ...
-
-  // start advertising
-  BLE.advertise();
-
-
-
-```
-
-### `BLE.addService()`
-
-Add a BLEService to the set of services the Bluetooth® Low Energy device provides
-
-#### Syntax
-
-```
-BLE.addService(service)
-
-```
-
-#### Parameters
-
-- **service:** BLEService to add
-
-#### Returns
-Nothing
-
-#### Example
-
-```arduino
-
-BLEService ledService("19B10000-E8F2-537E-4F6C-D104768A1214"); // Bluetooth® Low Energy LED Service
-
-
-
- // begin initialization
-  if (!BLE.begin()) {
-    Serial.println("starting Bluetooth® Low Energy module failed!");
-
-    while (1);
-  }
-
-  // ...
-
-  BLE.addService(ledService);
-
-  // ...
-
-
-```
-
-### `BLE.advertise()`
-
-Start advertising.
-
-#### Syntax
-
-```
-BLE.advertise()
-
-```
-
-#### Parameters
-
-None
-
-#### Returns
-- 1 on success,
-- 0 on failure.
-
-#### Example
-
-```arduino
-
-  // begin initialization
-  if (!BLE.begin()) {
-    Serial.println("starting Bluetooth® Low Energy module failed!");
-
-    while (1);
-  }
-
-  // ...
-
-  BLE.advertise();
-
-  // ...
-
-
-```
-
-### `BLE.stopAdvertise()`
-
-Stop advertising.
-
-#### Syntax
-
-```
-BLE.stopAdvertise()
-
-```
-
-#### Parameters
-
-None
-
-#### Returns
-Nothing
-
-#### Example
-
-```arduino
-
-  // begin initialization
-  if (!BLE.begin()) {
-    Serial.println("starting Bluetooth® Low Energy module failed!");
-
-    while (1);
-  }
-
-  // ...
-
-  BLE.advertise();
-
-  // ...
-
-  BLE.stopAdvertise();
-
-
-```
-
-### `BLE.central()`
-
-Query the central Bluetooth® Low Energy device connected.
-
-#### Syntax
-
-```
-BLE.central()
-
-```
-
-#### Parameters
-
-None
-
-#### Returns
-- **BLEDevice** representing the central.
-
-#### Example
-
-```arduino
-
-  // listen for Bluetooth® Low Energy peripherals to connect:
-  BLEDevice central = BLE.central();
-
-  // if a central is connected to peripheral:
-  if (central) {
-    Serial.print("Connected to central: ");
-    // print the central's MAC address:
-    Serial.println(central.address());
-  }
-
-
-```
-
-### `BLE.setAdvertisingInterval()`
-
-Set the advertising interval in units of 0.625 ms. Defaults to 100ms (160 * 0.625 ms) if not provided.
-
-#### Syntax
-
-```
-BLE.setAdvertisingInterval(advertisingInterval)
-
-```
-
-#### Parameters
-
-- **advertisingInterval:** advertising interval in units of 0.625 ms
-
-#### Returns
-Nothing.
-
-#### Example
-
-```arduino
-
-  // begin initialization
-  if (!BLE.begin()) {
-    Serial.println("starting Bluetooth® Low Energy module failed!");
-
-    while (1);
-  }
-
-  // ...
-
-  BLE.setAdvertisingInterval(320); // 200 * 0.625 ms
-
-  BLE.advertise();
-
-
-```
-
-### `BLE.setConnectionInterval()`
-
-Set the minimum and maximum desired connection intervals in units of 1.25 ms.
-
-#### Syntax
-
-```
-BLE.setConnectionInterval(minimum, maximum)
-
-```
-
-#### Parameters
-
-- **minimum:** minimum desired connection interval in units of 1.25 ms
-- **maximum:** maximum desired connection interval in units of 1.25 ms
-
-#### Returns
-Nothing.
-
-#### Example
-
-```arduino
-
-  // begin initialization
-  if (!BLE.begin()) {
-    Serial.println("starting Bluetooth® Low Energy module failed!");
-
-    while (1);
-  }
-
-  // ...
-
-  BLE.setConnectionInterval(0x0006, 0x0c80); // 7.5 ms minimum, 4 s maximum
-
-
-
-```
-
-### `BLE.setConnectable()`
-
-Set if the device is connectable after advertising, defaults to **true**.
-
-#### Syntax
-
-```
-BLE.setConnectable(connectable)
-
-```
-
-#### Parameters
-
-- **true**: the device will be connectable when advertising
-- **false**: the device will NOT be connectable when advertising
-
-#### Returns
-Nothing.
-
-#### Example
-
-```arduino
-
-  // begin initialization
-  if (!BLE.begin()) {
-    Serial.println("starting Bluetooth® Low Energy module failed!");
-
-    while (1);
-  }
-
-  // ...
-
-  BLE.setConnectable(false); // make the device unconnectable when advertising
-
-
-
-```
-
-### `BLE.scan()`
-
-Start scanning for Bluetooth® Low Energy devices that are advertising.
-
-#### Syntax
-
-```
-BLE.scan()
-BLE.scan(withDuplicates)
-
-```
-
-#### Parameters
-
-- **withDuplicates:** optional, defaults to **false**. If **true**, advertisements received more than once will not be filtered
-
-#### Returns
-- 1 on success,
-- 0 on failure.
-
-#### Example
-
-```arduino
-
-  // begin initialization
-  if (!BLE.begin()) {
-    Serial.println("starting Bluetooth® Low Energy module failed!");
-
-    while (1);
-  }
-
-  Serial.println("BLE Central scan");
-
-  // start scanning for peripheral
-  BLE.scan();
-
-
-  BLEDevice peripheral = BLE.available();
-
-  if (peripheral) {
-     // ...
-  }
-
-
-```
-
-### `BLE.scanForName()`
-
-Start scanning for Bluetooth® Low Energy devices that are advertising with a particular (local) name.
-
-#### Syntax
-
-```
-BLE.scanForName(name)
-BLE.scanForName(name, withDuplicates)
-
-```
-
-#### Parameters
-
--  **name:** (local) name of device (as a **String**) to filter for
-- **withDuplicates:** optional, defaults to **false**. If **true**, advertisements received more than once will not be filtered.
-
-#### Returns
-- 1 on success,
-- 0 on failure.
-
-#### Example
-
-```arduino
-
-  // begin initialization
-  if (!BLE.begin()) {
-    Serial.println("starting Bluetooth® Low Energy module failed!");
-
-    while (1);
-  }
-
-  Serial.println("BLE Central scan");
-
-  // start scanning for peripheral
-  BLE.scanForName("LED");
-
-
-  BLEDevice peripheral = BLE.available();
-
-  if (peripheral) {
-     // ...
-  }
-
-
-```
-
-### `BLE.scanForAddress()`
-
-Start scanning for Bluetooth® Low Energy devices that are advertising with a particular (Bluetooth®) address.
-
-#### Syntax
-
-```
-BLE.scanForAddress(address)
-BLE.scanForAddress(address, withDuplicates)
-
-```
-
-#### Parameters
-
-- **address:** (Bluetooth®) address (as a String) to filter for
-- **withDuplicates:** optional, defaults to **false**. If **true**, advertisements received more than once will not be filtered
-
-#### Returns
-- 1 on success,
-- 0 on failure.
-
-#### Example
-
-```arduino
-
-  // begin initialization
-  if (!BLE.begin()) {
-    Serial.println("starting Bluetooth® Low Energy module failed!");
-
-    while (1);
-  }
-
-  Serial.println("BLE Central scan");
-
-  // start scanning for peripheral
-  BLE.scanForAddress("aa:bb:cc:ee:dd:ff");
-
-
-  BLEDevice peripheral = BLE.available();
-
-  if (peripheral) {
-     // ...
-  }
-
-
-```
-
-### `BLE.scanForUuid()`
-
-Start scanning for Bluetooth® Low Energy devices that are advertising with a particular (service) UUID.
-
-#### Syntax
-
-```
-BLE.scanForUuid(uuid)
-BLE.scanForUuid(uuid, withDuplicates)
-
-```
-
-#### Parameters
-
-- **uuid:** (service) UUID (as a **String**) to filter for
-- **withDuplicates:** optional, defaults to **false**. If **true**, advertisements received more than once will not be filtered.
-
-#### Returns
-- 1 on success,
-- 0 on failure.
-
-#### Example
-
-```arduino
-
-  // begin initialization
-  if (!BLE.begin()) {
-    Serial.println("starting Bluetooth® Low Energy module failed!");
-
-    while (1);
-  }
-
-  Serial.println("BLE Central scan");
-
-  // start scanning for peripheral
-  BLE.scanForUuid("aa10");
-
-
-  BLEDevice peripheral = BLE.available();
-
-  if (peripheral) {
-     // ...
-  }
-
-
-```
-
-### `BLE.stopScan()`
-
-Stop scanning for Bluetooth® Low Energy devices that are advertising.
-
-#### Syntax
-
-```
-BLE.stopScan()
-
-```
-
-#### Parameters
-
-None
-
-#### Returns
-Nothing
-
-#### Example
-
-```arduino
-
-  // begin initialization
-  if (!BLE.begin()) {
-    Serial.println("starting Bluetooth® Low Energy module failed!");
-
-    while (1);
-  }
-
-  Serial.println("BLE Central scan");
-
-  // start scanning for peripheral
-  BLE.scan();
-
-  BLE.stopScan();
-
-
-```
-
-### `BLE.available()`
-
-Query for a discovered Bluetooth® Low Energy device that was found during scanning.
-
-#### Syntax
-
-```
-BLE.available()
-
-```
-
-#### Parameters
-
-Nothing
-
-#### Returns
-- **BLEDevice** representing the discovered device.
-
-#### Example
-
-```arduino
-
-  // begin initialization
-  if (!BLE.begin()) {
-    Serial.println("starting Bluetooth® Low Energy module failed!");
-
-    while (1);
-  }
-
-  Serial.println("BLE Central scan");
-
-  // start scanning for peripheral
-  BLE.scan();
-
-
-  BLEDevice peripheral = BLE.available();
-
-  if (peripheral) {
-     // ...
-  }
-
-
-```
-
-## BLEDevice Class
-
-Used to get information about the devices connected or discovered while scanning
-
-### `bleDevice.poll()`
-
-Poll for Bluetooth® Low Energy radio events for the specified Bluetooth® Low Energy device and handle them.
-
-#### Syntax
-
-```
-bleDevice.poll()
-bleDevice.poll(timeout)
-
-```
-
-#### Parameters
-
-- **timeout**: optional timeout in ms, to wait for event. If not specified defaults to 0 ms.
-
-#### Returns
-Nothing
-
-#### Example
-
-```arduino
-
-  // listen for Bluetooth® Low Energy centrals to connect:
-  BLEDevice central = BLE.central();
-
-  // if a central is connected to peripheral:
-  if (central) {
-   central.poll();
-
-    // ...
-  }
-
-
-```
-
-### `bleDevice.connected()`
-
-Query if a Bluetooth® Low Energy device is connected
-
-#### Syntax
-
-```
-bleDevice.connected()
-
-```
-
-#### Parameters
-
-None
-
-#### Returns
-- **true** if the Bluetooth® Low Energy device is connected,
-- otherwise **false**.
-
-#### Example
-
-```arduino
-
-  // listen for Bluetooth® Low Energy centrals to connect:
-  BLEDevice central = BLE.central();
-
-    // while the central is still connected
-    while (central.connected()) {
-
-       // ...
-    }
-
-
-```
-
-### `bleDevice.disconnect()`
-
-Disconnect the Bluetooth® Low Energy device, if connected
-
-#### Syntax
-
-```
-bleDevice.disconnect()
-
-```
-
-#### Parameters
-
-None
-
-#### Returns
-- **true** if the Bluetooth® Low Energy device was disconnected,
-- otherwise **false**.
-
-#### Example
-
-```arduino
-
- // listen for Bluetooth® Low Energy centrals to connect:
-  BLEDevice central = BLE.central();
-
-
-  central.disconnect();
-
-
-```
-
-### `bleDevice.address()`
-
-Query the Bluetooth® address of the Bluetooth® Low Energy device.
-
-#### Syntax
-
-```
-bleDevice.address()
-
-```
-
-#### Parameters
-
-None
-
-#### Returns
-- **Bluetooth® address** of the Bluetooth® Low Energy device (as a String).
-
-#### Example
-
-```arduino
-
-  // listen for Bluetooth® Low Energy peripherals to connect:
-  BLEDevice central = BLE.central();
-
-  // if a central is connected to peripheral:
-  if (central) {
-    Serial.print("Connected to central: ");
-    // print the central's MAC address:
-    Serial.println(central.address());
-  }
-
-
-```
-
-### `bleDevice.rssi()`
-
-Query the RSSI (Received signal strength indication) of the Bluetooth® Low Energy device.
-
-#### Syntax
-
-```
-bleDevice.rssi()
-
-```
-
-#### Parameters
-
-None
-
-#### Returns
-- **RSSI** of the connected Bluetooth® Low Energy device, 127 if the Bluetooth® Low Energy device is not connected.
-
-#### Example
-
-```arduino
-
-  if (bleDevice.connected()) {
-    Serial.print("RSSI = ");
-    Serial.println(bleDevice.rssi());
-  }
-
-
-```
-
-### `bleDevice.characteristic()`
-
-Get a BLECharacteristic representing a Bluetooth® Low Energy characteristic the device provides.
-
-#### Syntax
-
-```
-bleDevice.characteristic(index)
-bleDevice.characteristic(uuid)
-bleDevice.characteristic(uuid, index)
-
-```
-
-#### Parameters
-
-- **index**: index of characteristic
-- **uuid**: uuid (as a **String**)
-
-#### Returns
-- **BLECharacteristic** for provided parameters
-
-#### Example
-
-```arduino
-
-  // begin initialization
-  if (!BLE.begin()) {
-    Serial.println("starting Bluetooth® Low Energy module failed!");
-
-    while (1);
-  }
-
-  Serial.println("BLE Central scan");
-
-  // start scanning for peripheral
-  BLE.scan();
-
-
-  BLEDevice peripheral = BLE.available();
-
-  if (peripheral) {
-    // ...
-
-    Serial.println("Connecting ...");
-
-    if (peripheral.connect()) {
-      Serial.println("Connected");
-    } else {
-      Serial.println("Failed to connect!");
-      return;
-    }
-
-    // discover peripheral attributes
-    Serial.println("Discovering attributes ...");
-    if (peripheral.discoverAttributes()) {
-      Serial.println("Attributes discovered");
-    } else {
-      Serial.println("Attribute discovery failed!");
-      peripheral.disconnect();
-      return;
-    }
-
-    BLECharacteristic batteryLevelCharacteristic = peripheral.characteristic("2a19");
-
-    if (batteryLevelCharacteristic) {
-      // use the characteristic
-    } else {
-      Serial.println("Peripheral does NOT have battery level characteristic");
-    }
-
-    // ...
-  }
-
-
-```
-
-### `bleDevice.discoverAttributes()`
-
-Discover all of the attributes of Bluetooth® Low Energy device.
-
-#### Syntax
-
-```
-bleDevice.discoverAttributes()
-
-```
-
-#### Parameters
-
-None
-
-#### Returns
-- **true**, if successful,
-- **false** on failure.
-
-#### Example
-
-```arduino
-
-  // begin initialization
-  if (!BLE.begin()) {
-    Serial.println("starting Bluetooth® Low Energy module failed!");
-
-    while (1);
-  }
-
-  Serial.println("BLE Central scan");
-
-  // start scanning for peripheral
-  BLE.scan();
-
-
-  BLEDevice peripheral = BLE.available();
-
-  if (peripheral) {
-    // ...
-
-    Serial.println("Connecting ...");
-
-    if (peripheral.connect()) {
-      Serial.println("Connected");
-    } else {
-      Serial.println("Failed to connect!");
-      return;
-    }
-
-    // discover peripheral attributes
-    Serial.println("Discovering attributes ...");
-    if (peripheral.discoverAttributes()) {
-      Serial.println("Attributes discovered");
-    } else {
-      Serial.println("Attribute discovery failed!");
-      peripheral.disconnect();
-      return;
-    }
-
-    // ...
-  }
-
-
-```
-
-### `bleDevice.discoverService()`
-
-Discover the attributes of a particular service on the Bluetooth® Low Energy device.
-
-#### Syntax
-
-```
-bleDevice.discoverService(serviceUuid)
-
-```
-
-#### Parameters
-
-- **serviceUuid:** service UUID to discover (as a **String**)
-
-#### Returns
-- **true**, if successful,
-- **false** on failure.
-
-#### Example
-
-```arduino
-
-  // begin initialization
-  if (!BLE.begin()) {
-    Serial.println("starting Bluetooth® Low Energy module failed!");
-
-    while (1);
-  }
-
-  Serial.println("BLE Central scan");
-
-  // start scanning for peripheral
-  BLE.scan();
-
-
-  BLEDevice peripheral = BLE.available();
-
-  if (peripheral) {
-    // ...
-
-    Serial.println("Connecting ...");
-
-    if (peripheral.connect()) {
-      Serial.println("Connected");
-    } else {
-      Serial.println("Failed to connect!");
-      return;
-    }
-
-    // discover service attributes
-    Serial.println("Discovering service attributes ...");
-    if (peripheral.serviceUuid("fffe")) {
-      Serial.println("Service attributes discovered");
-    } else {
-      Serial.println("Service attribute discovery failed!");
-      peripheral.disconnect();
-      return;
-    }
-
-    // ...
-  }
-
-
-```
-
-### `bleDevice.deviceName()`
-
-Query the device name (BLE characteristic UUID 0x2a00) of a Bluetooth® Low Energy device.
-
-#### Syntax
-
-```
-bleDevice.deviceName()
-
-```
-
-#### Parameters
-
-None
-
-#### Returns
-- **Device name** (as a String).
-
-#### Example
-
-```arduino
-
-  // begin initialization
-  if (!BLE.begin()) {
-    Serial.println("starting Bluetooth® Low Energy module failed!");
-
-    while (1);
-  }
-
-  Serial.println("BLE Central scan");
-
-  // start scanning for peripheral
-  BLE.scan();
-
-
-  BLEDevice peripheral = BLE.available();
-
-  if (peripheral) {
-    // ...
-
-    Serial.println("Connecting ...");
-
-    if (peripheral.connect()) {
-      Serial.println("Connected");
-    } else {
-      Serial.println("Failed to connect!");
-      return;
-    }
-
-    // discover peripheral attributes
-    Serial.println("Discovering attributes ...");
-    if (peripheral.discoverAttributes()) {
-      Serial.println("Attributes discovered");
-    } else {
-      Serial.println("Attribute discovery failed!");
-      peripheral.disconnect();
-      return;
-    }
-
-    // read and print device name of peripheral
-    Serial.println();
-    Serial.print("Device name: ");
-    Serial.println(peripheral.deviceName());
-    Serial.print("Appearance: 0x");
-    Serial.println(peripheral.appearance(), HEX);
-    Serial.println();
-
-    // ...
-  }
-
-
-```
-
-### `bleDevice.appearance()`
-
-Query the appearance (BLE characteristic UUID 0x2a01) of a Bluetooth® Low Energy device.
-
-#### Syntax
-
-```
-bleDevice.appearance()
-
-```
-
-#### Parameters
-
-None
-
-#### Returns
-- **Appearance value** (as a number).
-
-#### Example
-
-```arduino
-
-  // begin initialization
-  if (!BLE.begin()) {
-    Serial.println("starting Bluetooth® Low Energy module failed!");
-
-    while (1);
-  }
-
-  Serial.println("BLE Central scan");
-
-  // start scanning for peripheral
-  BLE.scan();
-
-
-  BLEDevice peripheral = BLE.available();
-
-  if (peripheral) {
-    // ...
-
-    Serial.println("Connecting ...");
-
-    if (peripheral.connect()) {
-      Serial.println("Connected");
-    } else {
-      Serial.println("Failed to connect!");
-      return;
-    }
-
-    // discover peripheral attributes
-    Serial.println("Discovering attributes ...");
-    if (peripheral.discoverAttributes()) {
-      Serial.println("Attributes discovered");
-    } else {
-      Serial.println("Attribute discovery failed!");
-      peripheral.disconnect();
-      return;
-    }
-
-    // read and print device name of peripheral
-    Serial.println();
-    Serial.print("Device name: ");
-    Serial.println(peripheral.deviceName());
-    Serial.print("Appearance: 0x");
-    Serial.println(peripheral.appearance(), HEX);
-    Serial.println();
-
-    // ...
-  }
-
-
-```
-
-### `bleDevice.serviceCount()`
-
-Query the number of services discovered for the Bluetooth® Low Energy device.
-
-#### Syntax
-
-```
-bleDevice.serviceCount()
-
-```
-
-#### Parameters
-
-None
-
-#### Returns
-- The number of **services discovered** for the Bluetooth® Low Energy device.
-
-#### Example
-
-```arduino
-
-  // begin initialization
-  if (!BLE.begin()) {
-    Serial.println("starting Bluetooth® Low Energy module failed!");
-
-    while (1);
-  }
-
-  Serial.println("BLE Central scan");
-
-  // start scanning for peripheral
-  BLE.scan();
-
-
-  BLEDevice peripheral = BLE.available();
-
-  if (peripheral) {
-    // ...
-
-    Serial.println("Connecting ...");
-
-    if (peripheral.connect()) {
-      Serial.println("Connected");
-    } else {
-      Serial.println("Failed to connect!");
-      return;
-    }
-
-    // discover peripheral attributes
-    Serial.println("Discovering attributes ...");
-    if (peripheral.discoverAttributes()) {
-      Serial.println("Attributes discovered");
-    } else {
-      Serial.println("Attribute discovery failed!");
-      peripheral.disconnect();
-      return;
-    }
-
-    int serviceCount = peripheral.serviceCount();
-
-    Serial.print(serviceCount);
-    Serial.println(" services discovered");
-
-    // ...
-  }
-
-
-```
-
-### `bleDevice.hasService()`
-
-Query if the Bluetooth® Low Energy device has a particular service.
-
-#### Syntax
-
-```
-bleDevice.hasService(uuid)
-bleDevice.hasService(uuid, index)
-
-```
-
-#### Parameters
-
-- **uuid**: uuid to check (as a **String**)
-- **index**: optional, index of service to check if the device provides more than on. Defaults to 0, if not provided.
-
-#### Returns
-- **true**, if the device provides the service,
-- **false** otherwise.
-
-#### Example
-
-```arduino
-
-  // begin initialization
-  if (!BLE.begin()) {
-    Serial.println("starting Bluetooth® Low Energy module failed!");
-
-    while (1);
-  }
-
-  Serial.println("BLE Central scan");
-
-  // start scanning for peripheral
-  BLE.scan();
-
-
-  BLEDevice peripheral = BLE.available();
-
-  if (peripheral) {
-    // ...
-
-    Serial.println("Connecting ...");
-
-    if (peripheral.connect()) {
-      Serial.println("Connected");
-    } else {
-      Serial.println("Failed to connect!");
-      return;
-    }
-
-    // discover peripheral attributes
-    Serial.println("Discovering attributes ...");
-    if (peripheral.discoverAttributes()) {
-      Serial.println("Attributes discovered");
-    } else {
-      Serial.println("Attribute discovery failed!");
-      peripheral.disconnect();
-      return;
-    }
-
-    if (peripheral.hasService("180f")) {
-      Serial.println("Peripheral has battery service");
-    }
-
-    // ...
-  }
-
-
-```
-
-### `bleDevice.service()`
-
-Get a BLEService representing a Bluetooth® Low Energy service the device provides.
-
-#### Syntax
-
-```
-bleDevice.service(index)
-bleDevice.service(uuid)
-bleDevice.service(uuid, index)
-
-```
-
-#### Parameters
-
-- **index**: index of service
-- **uuid**: uuid (as a **String**)
-
-#### Returns
-- **BLEService** for provided parameters
-
-#### Example
-
-```arduino
-
-  // begin initialization
-  if (!BLE.begin()) {
-    Serial.println("starting Bluetooth® Low Energy module failed!");
-
-    while (1);
-  }
-
-  Serial.println("BLE Central scan");
-
-  // start scanning for peripheral
-  BLE.scan();
-
-
-  BLEDevice peripheral = BLE.available();
-
-  if (peripheral) {
-    // ...
-
-    Serial.println("Connecting ...");
-
-    if (peripheral.connect()) {
-      Serial.println("Connected");
-    } else {
-      Serial.println("Failed to connect!");
-      return;
-    }
-
-    // discover peripheral attributes
-    Serial.println("Discovering attributes ...");
-    if (peripheral.discoverAttributes()) {
-      Serial.println("Attributes discovered");
-    } else {
-      Serial.println("Attribute discovery failed!");
-      peripheral.disconnect();
-      return;
-    }
-
-    BLEService batteryService = peripheral.service("180f");
-
-    if (batteryService) {
-      // use the service
-    } else {
-      Serial.println("Peripheral does NOT have battery service");
-    }
-
-    // ...
-  }
-
-
-```
-
-### `bleDevice.characteristicCount()`
-
-Query the number of characteristics discovered for the Bluetooth® Low Energy device.
-
-#### Syntax
-
-```
-bleDevice.characteristicCount()
-
-```
-
-#### Parameters
-
-None
-
-#### Returns
-- The **number of characteristics** discovered for the Bluetooth® Low Energy device.
-
-#### Example
-
-```arduino
-
-  // begin initialization
-  if (!BLE.begin()) {
-    Serial.println("starting Bluetooth® Low Energy module failed!");
-
-    while (1);
-  }
-
-  Serial.println("BLE Central scan");
-
-  // start scanning for peripheral
-  BLE.scan();
-
-
-  BLEDevice peripheral = BLE.available();
-
-  if (peripheral) {
-    // ...
-
-    Serial.println("Connecting ...");
-
-    if (peripheral.connect()) {
-      Serial.println("Connected");
-    } else {
-      Serial.println("Failed to connect!");
-      return;
-    }
-
-    // discover peripheral attributes
-    Serial.println("Discovering attributes ...");
-    if (peripheral.discoverAttributes()) {
-      Serial.println("Attributes discovered");
-    } else {
-      Serial.println("Attribute discovery failed!");
-      peripheral.disconnect();
-      return;
-    }
-
-    int characteristicCount = peripheral.characteristicCount();
-
-    Serial.print(characteristicCount);
-    Serial.println(" characteristics discovered");
-
-    // ...
-  }
-
-
-```
-
-### `bleDevice.hasCharacteristic()`
-
-Query if the Bluetooth® Low Energy device has a particular characteristic.
-
-#### Syntax
-
-```
-bleDevice.hasCharacteristic(uuid)
-bleDevice.hasCharacteristic(uuid, index)
-
-```
-
-#### Parameters
-
-- **uuid**: uuid to check (as a **String**)
-- **index**: optional, index of characteristic to check if the device provides more than on. Defaults to 0, if not provided.
-
-#### Returns
-- **true**, if the device provides the characteristic,
-- **false** otherwise.
-
-#### Example
-
-```arduino
-
-  // begin initialization
-  if (!BLE.begin()) {
-    Serial.println("starting Bluetooth® Low Energy module failed!");
-
-    while (1);
-  }
-
-  Serial.println("BLE Central scan");
-
-  // start scanning for peripheral
-  BLE.scan();
-
-
-  BLEDevice peripheral = BLE.available();
-
-  if (peripheral) {
-    // ...
-
-    Serial.println("Connecting ...");
-
-    if (peripheral.connect()) {
-      Serial.println("Connected");
-    } else {
-      Serial.println("Failed to connect!");
-      return;
-    }
-
-    // discover peripheral attributes
-    Serial.println("Discovering attributes ...");
-    if (peripheral.discoverAttributes()) {
-      Serial.println("Attributes discovered");
-    } else {
-      Serial.println("Attribute discovery failed!");
-      peripheral.disconnect();
-      return;
-    }
-
-    if (peripheral.hasCharacteristic("2a19")) {
-      Serial.println("Peripheral has battery level characteristic");
-    }
-
-    // ...
-  }
-
-
-```
-
-### `bleDevice.hasLocalName()`
-
-Query if a discovered Bluetooth® Low Energy device is advertising a local name.
-
-#### Syntax
-
-```
-bleDevice.hasLocalName()
-
-```
-
-#### Parameters
-
-Nothing
-
-#### Returns
-- **true**, if the device is advertising a local name,
-- **false** otherwise.
-
-#### Example
-
-```arduino
-
-  // begin initialization
-  if (!BLE.begin()) {
-    Serial.println("starting Bluetooth® Low Energy module failed!");
-
-    while (1);
-  }
-
-  Serial.println("BLE Central scan");
-
-  // start scanning for peripheral
-  BLE.scan();
-
-
-  BLEDevice peripheral = BLE.available();
-
-  if (peripheral) {
-    // ...
-
-    // print the local name, if present
-    if (peripheral.hasLocalName()) {
-      Serial.print("Local Name: ");
-      Serial.println(peripheral.localName());
-    }
-
-    // ...
-  }
-
-
-```
-
-### `bleDevice.hasAdvertisedServiceUuid()`
-
-Query if a discovered Bluetooth® Low Energy device is advertising a service UUID.
-
-#### Syntax
-
-```
-bleDevice.hasAdvertisedServiceUuid()
-bleDevice.hasAdvertisedServiceUuid(index)
-
-```
-
-#### Parameters
-
-- **index**: optional, defaults to 0, the index of the service UUID, if the device is advertising more than one.
-
-#### Returns
-- **true**, if the device is advertising a service UUID,
-- **false** otherwise.
-
-#### Example
-
-```arduino
-
-  // begin initialization
-  if (!BLE.begin()) {
-    Serial.println("starting Bluetooth® Low Energy module failed!");
-
-    while (1);
-  }
-
-  Serial.println("BLE Central scan");
-
-  // start scanning for peripheral
-  BLE.scan();
-
-
-  BLEDevice peripheral = BLE.available();
-
-  if (peripheral) {
-    // ...
-
-    // print the advertised service UUIDs, if present
-    if (peripheral.hasAdvertisedServiceUuid()) {
-      Serial.print("Service UUIDs: ");
-      for (int i = 0; i < peripheral.advertisedServiceUuidCount(); i++) {
-        Serial.print(peripheral.advertisedServiceUuid(i));
-        Serial.print(" ");
-      }
-      Serial.println();
-    }
-
-    // ...
-  }
-
-
-```
-
-### `bleDevice.advertisedServiceUuidCount()`
-
-Query the number of advertised services a discovered Bluetooth® Low Energy device is advertising.
-
-#### Syntax
-
-```
-bleDevice.advertisedServiceUuidCount()
-
-```
-
-#### Parameters
-
-None
-
-#### Returns
-- The **number of advertised services** a discovered Bluetooth® Low Energy device is advertising.
-
-#### Example
-
-```arduino
-
-  // begin initialization
-  if (!BLE.begin()) {
-    Serial.println("starting Bluetooth® Low Energy module failed!");
-
-    while (1);
-  }
-
-  Serial.println("BLE Central scan");
-
-  // start scanning for peripheral
-  BLE.scan();
-
-
-  BLEDevice peripheral = BLE.available();
-
-  if (peripheral) {
-    // ...
-
-    // print the advertised service UUIDs, if present
-    if (peripheral.hasAdvertisedServiceUuid()) {
-      Serial.print("Service UUIDs: ");
-      for (int i = 0; i < peripheral.advertisedServiceUuidCount(); i++) {
-        Serial.print(peripheral.advertisedServiceUuid(i));
-        Serial.print(" ");
-      }
-      Serial.println();
-    }
-
-    // ...
-  }
-
-
-```
-
-### `bleDevice.localName()`
-
-Query the local name a discovered Bluetooth® Low Energy device is advertising with.
-
-#### Syntax
-
-```
-bleDevice.localName()
-
-```
-
-#### Parameters
-
-Nothing
-
-#### Returns
-- **Advertised local name** (as a String).
-
-#### Example
-
-```arduino
-
-  // begin initialization
-  if (!BLE.begin()) {
-    Serial.println("starting Bluetooth® Low Energy module failed!");
-
-    while (1);
-  }
-
-  Serial.println("BLE Central scan");
-
-  // start scanning for peripheral
-  BLE.scan();
-
-
-  BLEDevice peripheral = BLE.available();
-
-  if (peripheral) {
-    // ...
-
-    // print the local name, if present
-    if (peripheral.hasLocalName()) {
-      Serial.print("Local Name: ");
-      Serial.println(peripheral.localName());
-    }
-
-    // ...
-  }
-
-
-```
-
-### `bleDevice.advertisedServiceUuid()`
-
-Query an advertised service UUID discovered Bluetooth® Low Energy device is advertising.
-
-#### Syntax
-
-```
-bleDevice.advertisedServiceUuid()
-bleDevice.advertisedServiceUuid(index)
-
-```
-
-#### Parameters
-
-- **index**: optional, defaults to 0, the index of the **service UUID**, if the device is advertising more than one.
-
-#### Returns
-- Advertised service **UUID** (as a String).
-
-#### Example
-
-```arduino
-
-  // begin initialization
-  if (!BLE.begin()) {
-    Serial.println("starting Bluetooth® Low Energy module failed!");
-
-    while (1);
-  }
-
-  Serial.println("BLE Central scan");
-
-  // start scanning for peripheral
-  BLE.scan();
-
-
-  BLEDevice peripheral = BLE.available();
-
-  if (peripheral) {
-    // ...
-
-    // print the advertised service UUIDs, if present
-    if (peripheral.hasAdvertisedServiceUuid()) {
-      Serial.print("Service UUIDs: ");
-      for (int i = 0; i < peripheral.advertisedServiceUuidCount(); i++) {
-        Serial.print(peripheral.advertisedServiceUuid(i));
-        Serial.print(" ");
-      }
-      Serial.println();
-    }
-
-    // ...
-  }
-
-
-```
-
-### `bleDevice.connect()`
-
-Connect to a Bluetooth® Low Energy device.
-
-#### Syntax
-
-```
-bleDevice.connect()
-
-```
-
-#### Parameters
-
-None
-
-#### Returns
-- **true**, if the connection was successful,
-- **false** otherwise.
-
-#### Example
-
-```arduino
-
-  // begin initialization
-  if (!BLE.begin()) {
-    Serial.println("starting Bluetooth® Low Energy module failed!");
-
-    while (1);
-  }
-
-  Serial.println("BLE Central scan");
-
-  // start scanning for peripheral
-  BLE.scan();
-
-
-  BLEDevice peripheral = BLE.available();
-
-  if (peripheral) {
-    // ...
-
-    Serial.println("Connecting ...");
-
-    if (peripheral.connect()) {
-      Serial.println("Connected");
-    } else {
-      Serial.println("Failed to connect!");
-      return;
-    }
-
-    // ...
-  }
-
-
-```
-
-## BLEService Class
-
-Used to enable the services board provides or interact with services a remote board provides.
-
-### `BLEService()`
-
-Create a new Bluetooth® Low Energy service.
-
-#### Syntax
-
-```
-BLEService(uuid)
-
-```
-
-#### Parameters
-
-- **uuid**: 16-bit or 128-bit UUID in **String** format
-
-#### Returns
-- New **BLEService** with the specified **UUID**
-
-#### Example
-
-```arduino
-
-BLEService ledService("19B10000-E8F2-537E-4F6C-D104768A1214"); // Bluetooth® Low Energy LED Service
-
-
-```
-
-### `bleService.uuid()`
-
-Query the UUID of the specified BLEService.
-
-#### Syntax
-
-```
-bleService.uuid()
-
-```
-
-#### Parameters
-
-None
-
-#### Returns
-- UUID of the Bluetooth® Low Energy service as a **String**.
-
-#### Example
-
-```arduino
-
-BLEService ledService("19B10000-E8F2-537E-4F6C-D104768A1214"); // Bluetooth® Low Energy LED Service
-
-
-Serial.print("LED service UUID = ");
-Serial.println(ledService.uuid());
-
-
-
-```
-
-### `bleService.addCharacteristic()`
-
-Add a BLECharacteristic to the Bluetooth® Low Energy service.
-
-#### Syntax
-
-```
-bleService.addCharacteristic(bleCharacteristic)
-
-```
-
-#### Parameters
-
-None
-
-#### Returns
-Nothing
-
-#### Example
-
-```arduino
-
-BLEService ledService("19B10000-E8F2-537E-4F6C-D104768A1214"); // Bluetooth® Low Energy LED Service
-
-// Bluetooth® Low Energy LED Switch Characteristic - custom 128-bit UUID, readable and writable by central
-BLECharacteristic switchCharacteristic("19B10001-E8F2-537E-4F6C-D104768A1214", BLERead | BLEWrite, 1);
-
-
-
-
-// add the characteristic to the service
-ledService.addCharacteristic(switchCharacteristic);
-
-
-
-```
-
-### `bleService.characteristicCount()`
-
-Query the number of characteristics discovered for the Bluetooth® Low Energy service.
-
-#### Syntax
-
-```
-bleService.characteristicCount()
-
-```
-
-#### Parameters
-
-None
-
-#### Returns
-- The **number of characteristics** discovered for the Bluetooth® Low Energy service.
-
-#### Example
-
-```arduino
-
-  // begin initialization
-  if (!BLE.begin()) {
-    Serial.println("starting Bluetooth® Low Energy module failed!");
-
-    while (1);
-  }
-
-  Serial.println("BLE Central scan");
-
-  // start scanning for peripheral
-  BLE.scan();
-
-
-  BLEDevice peripheral = BLE.available();
-
-  if (peripheral) {
-    // ...
-
-    Serial.println("Connecting ...");
-
-    if (peripheral.connect()) {
-      Serial.println("Connected");
-    } else {
-      Serial.println("Failed to connect!");
-      return;
-    }
-
-    // discover peripheral attributes
-    Serial.println("Discovering attributes ...");
-    if (peripheral.discoverAttributes()) {
-      Serial.println("Attributes discovered");
-    } else {
-      Serial.println("Attribute discovery failed!");
-      peripheral.disconnect();
-      return;
-    }
-
-    BLEService batteryService = peripheral.service("180f");
-
-    if (batteryService) {
-      // use the service
-      int characteristicCount = batteryService.characteristicCount();
-
-      Serial.print(characteristicCount);
-      Serial.println(" characteristics discovered in battery service");
-    } else {
-      Serial.println("Peripheral does NOT have battery service");
-    }
-
-    // ...
-  }
-
-
-```
-
-### `bleService.hasCharacteristic()`
-
-Query if the Bluetooth® Low Energy service has a particular characteristic.
-
-#### Syntax
-
-```
-bleService.hasCharacteristic(uuid)
-bleService.hasCharacteristic(uuid, index)
-
-```
-
-#### Parameters
-
-- **uuid**: uuid to check (as a **String**)
-- **index**: optional, index of characteristic to check if the device provides more than on. Defaults to 0, if not provided.
-
-#### Returns
-- **true**, if the service provides the characteristic,
-- **false** otherwise.
-
-#### Example
-
-```arduino
-
-  // begin initialization
-  if (!BLE.begin()) {
-    Serial.println("starting Bluetooth® Low Energy module failed!");
-
-    while (1);
-  }
-
-  Serial.println("BLE Central scan");
-
-  // start scanning for peripheral
-  BLE.scan();
-
-  BLEDevice peripheral = BLE.available();
-
-  if (peripheral) {
-    // ...
-
-    Serial.println("Connecting ...");
-
-    if (peripheral.connect()) {
-      Serial.println("Connected");
-    } else {
-      Serial.println("Failed to connect!");
-      return;
-    }
-
-    // discover peripheral attributes
-    Serial.println("Discovering attributes ...");
-    if (peripheral.discoverAttributes()) {
-      Serial.println("Attributes discovered");
-    } else {
-      Serial.println("Attribute discovery failed!");
-      peripheral.disconnect();
-      return;
-    }
-
-    BLEService batteryService = peripheral.service("180f");
-
-    if (batteryService) {
-      // use the service
-      if (batteryService.hasCharacteristic("2a19")) {
-        Serial.println("Battery service has battery level characteristic");
-      }
-    } else {
-      Serial.println("Peripheral does NOT have battery service");
-    }
-
-    // ...
-  }
-
-
-```
-
-### `bleService.characteristic()`
-
-Get a BLECharacteristic representing a Bluetooth® Low Energy characteristic the service provides.
-
-#### Syntax
-
-```
-bleService.characteristic(index)
-bleService.characteristic(uuid)
-bleService.characteristic(uuid, index)
-
-```
-
-#### Parameters
-
-- **index**: index of characteristic
-- **uuid**: uuid (as a **String**)
-
-#### Returns
-- **BLECharacteristic** for provided parameters
-
-#### Example
-
-```arduino
-
-  // begin initialization
-  if (!BLE.begin()) {
-    Serial.println("starting Bluetooth® Low Energy module failed!");
-
-    while (1);
-  }
-
-  Serial.println("BLE Central scan");
-
-  // start scanning for peripheral
-  BLE.scan();
-
-
-  BLEDevice peripheral = BLE.available();
-
-  if (peripheral) {
-    // ...
-
-    Serial.println("Connecting ...");
-
-    if (peripheral.connect()) {
-      Serial.println("Connected");
-    } else {
-      Serial.println("Failed to connect!");
-      return;
-    }
-
-    // discover peripheral attributes
-    Serial.println("Discovering attributes ...");
-    if (peripheral.discoverAttributes()) {
-      Serial.println("Attributes discovered");
-    } else {
-      Serial.println("Attribute discovery failed!");
-      peripheral.disconnect();
-      return;
-    }
-
-    BLEService batteryService = peripheral.service("180f");
-
-    if (batteryService) {
-      // use the service
-      BLECharacteristic batteryLevelCharacteristic = peripheral.characteristic("2a19");
-
-      if (batteryLevelCharacteristic) {
-        // use the characteristic
-      } else {
-        Serial.println("Peripheral does NOT have battery level characteristic");
-      }
-    } else {
-      Serial.println("Peripheral does NOT have battery service");
-    }
-
-    // ...
-  }
-
-
-```
-
-## BLECharacteristic Class
-
-Used to enable the characteristics board offers in a service or interact with characteristics a remote board provides.
-
-### `BLECharacteristic()`
-
-Create a new Bluetooth® Low Energy characteristic.
-
-#### Syntax
-
-```
-BLECharacteristic(uuid, properties, value, valueSize)
-BLECharacteristic(uuid, properties, stringValue)
-
-BLEBoolCharacteristic(uuid, properties)
-BLEBooleanCharacteristic(uuid, properties)
-BLECharCharacteristic(uuid, properties)
-BLEUnsignedCharCharacteristic(uuid, properties)
-BLEByteCharacteristic(uuid, properties)
-BLEShortCharacteristic(uuid, properties)
-BLEUnsignedShortCharacteristic(uuid, properties)
-BLEWordCharacteristic(uuid, properties)
-BLEIntCharacteristic(uuid, properties)
-BLEUnsignedIntCharacteristic(uuid, properties)
-BLELongCharacteristic(uuid, properties)
-BLEUnsignedLongCharacteristic(uuid, properties)
-BLEFloatCharacteristic(uuid, properties)
-BLEDoubleCharacteristic(uuid, properties)
-```
-
-#### Parameters
-
-- **uuid**: 16-bit or 128-bit UUID in **String** format
-- **properties**: mask of the properties (BLEBroadcast, BLERead, BLEWriteWithoutResponse, BLEWrite, BLENotify, BLEIndicate)
-- **valueSize**: (maximum) size of characteristic value
-- **stringValue**: value as a string
-
-#### Returns
-- New **BLECharacteristic** with the specified **UUID** and value
-
-#### Example
-
-```arduino
-
-// 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
-
-
-
-```
-
-### `bleCharacteristic.uuid()`
-
-Query the UUID of the specified BLECharacteristic.
-
-#### Syntax
-
-```
-bleCharacteristic.uuid()
-
-```
-
-#### Parameters
-
-None
-
-#### Returns
-- **UUID** of the Bluetooth® Low Energy service as a **String**.
-
-#### Example
-
-```arduino
-
-// Bluetooth® Low Energy LED Switch Characteristic - custom 128-bit UUID, read and writable by central
-BLEByteCharacteristic switchCharacteristic("19B10001-E8F2-537E-4F6C-D104768A1214", BLERead | BLEWrite);
-
-
-Serial.print("Switch characteristic UUID = ");
-Serial.println(switchCharacteristic.uuid());
-
-
-
-```
-
-### `bleCharacteristic.properties()`
-
-Query the property mask of the specified BLECharacteristic.
-
-#### Syntax
-
-```
-bleCharacteristic.properties()
-
-```
-
-#### Parameters
-
-None
-
-#### Returns
-- **Properties of the characteristic masked** (BLEBroadcast, BLERead, BLEWriteWithoutResponse, BLEWrite, BLENotify, BLEIndicate)
-
-#### Example
-
-```arduino
-
-// Bluetooth® Low Energy LED Switch Characteristic - custom 128-bit UUID, read and writable by central
-BLEByteCharacteristic switchCharacteristic("19B10001-E8F2-537E-4F6C-D104768A1214", BLERead | BLEWrite);
-
-
-byte properties = switchCharacteristic.properties();
-
-if (properties & BLERead) {
-  // characteristic is readable ...
-}
-
-if (properties & (BLEWrite | BLEWriteWithoutResponse)) {
-  // characteristic is writable ...
-}
-
-
-```
-
-### `bleCharacteristic.valueSize()`
-
-Query the maximum value size of the specified BLECharacteristic.
-
-#### Syntax
-
-```
-bleCharacteristic.valueSize()
-
-```
-
-#### Parameters
-
-None
-
-#### Returns
-- The **maximum value** size of the characteristic (in bytes)
-
-#### Example
-
-```arduino
-
-// Bluetooth® Low Energy LED Switch Characteristic - custom 128-bit UUID, read and writable by central
-BLEByteCharacteristic switchCharacteristic("19B10001-E8F2-537E-4F6C-D104768A1214", BLERead | BLEWrite);
-
-
-
-Serial.print("value size = ");
-Serial.println(switchCharacteristic.valueSize());
-
-
-```
-
-### `bleCharacteristic.value()`
-
-Query the current value of the specified BLECharacteristic.
-
-#### Syntax
-
-```
-bleCharacteristic.value()
-
-```
-
-#### Parameters
-
-None
-
-#### Returns
-- The **current value** of the characteristic, value type depends on the constructor used
-
-#### Example
-
-```arduino
-
-// Bluetooth® Low Energy LED Switch Characteristic - custom 128-bit UUID, read and writable by central
-BLEByteCharacteristic switchCharacteristic("19B10001-E8F2-537E-4F6C-D104768A1214", BLERead | BLEWrite);
-
-
-
-  if (switchCharacteristic.value()) {  // any value other than 0
-    Serial.println("LED on");
-    digitalWrite(ledPin, HIGH);  // will turn the LED on
-  } else {                       // a 0 value
-    Serial.println(F("LED off"));
-    digitalWrite(ledPin, LOW);  // will turn the LED off
-  }
-
-
-
-```
-
-### `bleCharacteristic.valueLength()`
-
-Query the current value size of the specified BLECharacteristic.
-
-#### Syntax
-
-```
-bleCharacteristic.valueLength()
-
-```
-
-#### Parameters
-
-None
-
-#### Returns
-- The **current value** size of the characteristic (in bytes)
-
-#### Example
-
-```arduino
-
-// Bluetooth® Low Energy LED Switch Characteristic - custom 128-bit UUID, read and writable by central
-BLEByteCharacteristic switchCharacteristic("19B10001-E8F2-537E-4F6C-D104768A1214", BLERead | BLEWrite);
-
-
-
-Serial.print("value length = ");
-Serial.println(switchCharacteristic.valueLength());
-
-
-```
-
-### `bleCharacteristic.readValue()`
-
-Read the current value of the characteristic. If the characteristic is on a remote device, a read request will be sent.
-
-#### Syntax
-
-```
-bleCharacteristic.readValue(buffer, length)
-bleCharacteristic.readValue(value)
-
-```
-
-#### Parameters
-
-- **buffer:** byte array to read value into length: size of buffer argument in bytes
-- **value**: variable to read value into (by reference)
-
-#### Returns
-- **Number of bytes** read
-
-#### Example
-
-```arduino
-
-  while (peripheral.connected()) {
-    // while the peripheral is connected
-
-    // check if the value of the simple key characteristic has been updated
-    if (simpleKeyCharacteristic.valueUpdated()) {
-      // yes, get the value, characteristic is 1 byte so use byte value
-      byte value = 0;
-
-      simpleKeyCharacteristic.readValue(value);
-
-      if (value & 0x01) {
-        // first bit corresponds to the right button
-        Serial.println("Right button pressed");
-      }
-
-      if (value & 0x02) {
-        // second bit corresponds to the left button
-        Serial.println("Left button pressed");
-      }
-    }
-  }
-
-
-```
-
-### `bleCharacteristic.writeValue()`
-
-Write the value of the characteristic. If the characteristic is on a remote device, a write request or command will be sent.
-
-#### Syntax
-
-```
-bleCharacteristic.writeValue(buffer, length)
-bleCharacteristic.writeValue(value)
-
-```
-
-#### Parameters
-
-- **buffer**: byte array to write value with
-- **length**: number of bytes of the buffer argument to write
-- **value**: value to write
-
-#### Returns
-- 1 on success,
-- 0 on failure
-
-#### Example
-
-```arduino
-
-    // read the button pin
-    int buttonState = digitalRead(buttonPin);
-
-    if (oldButtonState != buttonState) {
-      // button changed
-      oldButtonState = buttonState;
-
-      if (buttonState) {
-        Serial.println("button pressed");
-
-        // button is pressed, write 0x01 to turn the LED on
-        ledCharacteristic.writeValue((byte)0x01);
-      } else {
-        Serial.println("button released");
-
-        // button is released, write 0x00 to turn the LED off
-        ledCharacteristic.writeValue((byte)0x00);
-      }
-    }
-
-
-```
-
-### `bleCharacteristic.setEventHandler()`
-
-Set the event handler (callback) function that will be called when the specified event occurs.
-
-#### Syntax
-
-```
-bleCharacteristic.setEventHandler(eventType, callback)
-
-```
-
-#### Parameters
-
-- **eventType**: event type (BLESubscribed, BLEUnsubscribed, BLERead, BLEWritten)
-- **callback**: function to call when the event occurs
-
-#### Returns
-Nothing
-
-#### Example
-
-```arduino
-
-// create switch characteristic and allow remote device to read and write
-BLEByteCharacteristic switchCharacteristic("19B10001-E8F2-537E-4F6C-D104768A1214", BLERead | BLEWrite);
-
-
-
-
-  // assign event handlers for characteristic
-  switchCharacteristic.setEventHandler(BLEWritten, switchCharacteristicWritten);
-
-
-
-void switchCharacteristicWritten(BLEDevice central, BLECharacteristic characteristic) {
-  // central wrote new value to characteristic, update LED
-  Serial.print("Characteristic event, written: ");
-
-  if (switchCharacteristic.value()) {
-    Serial.println("LED on");
-    digitalWrite(ledPin, HIGH);
-  } else {
-    Serial.println("LED off");
-    digitalWrite(ledPin, LOW);
-  }
-}
-
-
-```
-
-### `bleCharacteristic.broadcast()`
-
-Broadcast the characteristics value as service data when advertising.
-
-#### Syntax
-
-```
-bleCharacteristic.broadcast()
-
-```
-
-#### Parameters
-
-None
-
-#### Returns
-- 1 on success,
-- 0 on failure
-
-#### Example
-
-```arduino
-
-// create button characteristic and allow remote device to get notifications
-BLEByteCharacteristic buttonCharacteristic("19B10012-E8F2-537E-4F6C-D104768A1214", BLERead | BLENotify | BLEBroadcast);
-
-
-
-buttonCharacteristic.broadcast();
-
-
-
-```
-
-### `bleCharacteristic.written()`
-
-Query if the characteristic value has been written by another Bluetooth® Low Energy device.
-
-#### Syntax
-
-```
-bleCharacteristic.written()
-
-```
-
-#### Parameters
-
-None
-
-#### Returns
-- **true** if the characteristic value has been written by another Bluetooth® Low Energy device,
-- **false** otherwise
-
-#### Example
-
-```arduino
-
-// Bluetooth® Low Energy LED Switch Characteristic - custom 128-bit UUID, read and writable by central
-BLEByteCharacteristic switchCharacteristic("19B10001-E8F2-537E-4F6C-D104768A1214", BLERead | BLEWrite);
-
-
-
-
- // listen for Bluetooth® Low Energy peripherals to connect:
-  BLEDevice central = BLE.central();
-
-  // if a central is connected to peripheral:
-  if (central) {
-    Serial.print("Connected to central: ");
-    // print the central's MAC address:
-    Serial.println(central.address());
-
-    // while the central is still connected to peripheral:
-    while (central.connected()) {
-      // if the remote device wrote to the characteristic,
-      // use the value to control the LED:
-      if (switchCharacteristic.written()) {
-        if (switchCharacteristic.value()) {   // any value other than 0
-          Serial.println("LED on");
-          digitalWrite(ledPin, HIGH);         // will turn the LED on
-        } else {                              // a 0 value
-          Serial.println(F("LED off"));
-          digitalWrite(ledPin, LOW);          // will turn the LED off
-        }
-      }
-    }
-
-    // when the central disconnects, print it out:
-    Serial.print(F("Disconnected from central: "));
-    Serial.println(central.address());
-  }
-
-
-
-
-```
-
-### `bleCharacteristic.subscribed()`
-
-Query if the characteristic has been subscribed to by another Bluetooth® Low Energy device.
-
-#### Syntax
-
-```
-bleCharacteristic.subscribed()
-
-```
-
-#### Parameters
-
-None
-
-#### Returns
-- **true** if the characteristic value has been subscribed to by another Bluetooth® Low Energy device,
-- **false** otherwise
-
-#### Example
-
-```arduino
-
-// 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
-
-
-
-
-
-  if (batteryLevelChar.subscribed()) {
-     // set a new value , that well be pushed to subscribed Bluetooth® Low Energy devices
-    batteryLevelChar.writeValue(0xab);
-  }
-
-
-```
-
-### `bleCharacteristic.addDescriptor()`
-
-Add a BLEDescriptor to the characteristic.
-
-#### Syntax
-
-```
-bleCharacteristic.addDescriptor(bleDescriptor)
-
-```
-
-#### Parameters
-
-- **bleDescriptor**: descriptor to add to the characteristic
-
-#### Returns
-Nothing
-
-#### Example
-
-```arduino
-
-// 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
-
-BLEDescriptor batteryLevelDescriptor("2901", "millis");
-
-
-
-
-
-  batteryLevelChar.addDescriptor(batteryLevelDescriptor);
-
-
-```
-
-### `bleCharacteristic.descriptorCount()`
-
-Query the number of Bluetooth® Low Energy descriptors discovered for the characteristic.
-
-#### Syntax
-
-```
-bleCharacteristic.descriptorCount()
-
-```
-
-#### Parameters
-
-None
-
-#### Returns
-- The **number of Bluetooth® Low Energy descriptors** discovered for the characteristic
-
-#### Example
-
-```arduino
-
- // loop the descriptors of the characteristic and explore each
-  for (int i = 0; i < characteristic.descriptorCount(); i++) {
-    BLEDescriptor descriptor = characteristic.descriptor(i);
-
-    // ...
-  }
-
-
-```
-
-### `bleCharacteristic.hasDescriptor()`
-
-Check if a characteristic has a particular descriptor.
-
-#### Syntax
-
-```
-bleCharacteristic.hasDescriptor(uuid)
-bleCharacteristic.hasDescriptor(uuid, index)
-
-```
-
-#### Parameters
-
-- **index**: index of descriptor
-- **uuid**: uuid (as a **String**)
-
-#### Returns
-- **true**, if the characteristic has a matching descriptor,
-- otherwise **false**.
-
-#### Example
-
-```arduino
-
-  if (characteristic.hasDescriptor("2901")) {
-    Serial.println("characteristic has description descriptor");
-  }
-
-
-```
-
-### `bleCharacteristic.descriptor()`
-
-Get a BLEDescriptor that represents a characteristics Bluetooth® Low Energy descriptor.
-
-#### Syntax
-
-```
-bleCharacteristic.descriptor(index)
-bleCharacteristic.descriptor(uuid)
-bleCharacteristic.descriptor(uuid, index)
-
-```
-
-#### Parameters
-
-- **index**: index of descriptor
-- **uuid**: uuid (as a **String**)
-
-#### Returns
-- BLEDescriptor that represents a characteristics Bluetooth® Low Energy descriptor
-
-#### Example
-
-```arduino
-
-  if (characteristic.hasDescriptor("2901")) {
-    Serial.println("characteristic has description descriptor");
-  }
-
-
-```
-
-### `bleCharacteristic.canRead()`
-
-Query if a Bluetooth® Low Energy characteristic is readable.
-
-#### Syntax
-
-```
-bleCharacteristic.canRead()
-
-```
-
-#### Parameters
-
-None
-
-#### Returns
-- **true**, if characteristic is readable,
-- **false** otherwise
-
-#### Example
-
-```arduino
-
-  if (characteristic.canRead("2901")) {
-    Serial.println("characteristic is readable");
-  }
-
-
-```
-
-read
-
-Perform a read request for the characteristic.
-
-#### Syntax
-
-```
-bleCharacteristic.read()
-
-```
-
-#### Parameters
-
-None
-
-#### Returns
-- **true**, if successful,
-- **false** on failure
-
-#### Example
-
-```arduino
-
-  if (characteristic.read()) {
-    Serial.println("characteristic value read");
-
-    // ...
-  } else {
-    Serial.println("error reading characteristic value");
-  }
-
-
-```
-
-### `bleCharacteristic.canWrite()`
-
-Query if a Bluetooth® Low Energy characteristic is writable.
-
-#### Syntax
-
-```
-bleCharacteristic.canWrite()
-
-```
-
-#### Parameters
-
-None
-
-#### Returns
-- **true**, if characteristic is writable,
-- **false** otherwise
-
-#### Example
-
-```arduino
-
-  if (characteristic.canWrite()) {
-    Serial.println("characteristic is writable");
-  }
-
-
-```
-
-### `bleCharacteristic.canSubscribe()`
-
-Query if a Bluetooth® Low Energy characteristic is subscribable.
-
-#### Syntax
-
-```
-bleCharacteristic.canSubscribe()
-
-```
-
-#### Parameters
-
-None
-
-#### Returns
-- **true**, if characteristic is subscribable,
-- **false** otherwise
-
-#### Example
-
-```arduino
-
-  if (characteristic.canSubscribe()) {
-    Serial.println("characteristic is subscribable");
-  }
-
-
-```
-
-### `bleCharacteristic.subscribe()`
-
-Subscribe to a Bluetooth® Low Energy characteristics notification or indications.
-
-#### Syntax
-
-```
-bleCharacteristic.subscribe()
-
-```
-
-#### Parameters
-
-None
-
-#### Returns
-- **true**, on success,
-- **false** on failure
-
-#### Example
-
-```arduino
-
-  // ...
-
-  // retrieve the simple key characteristic
-  BLECharacteristic simpleKeyCharacteristic = peripheral.characteristic("ffe1");
-
-  // subscribe to the simple key characteristic
-  Serial.println("Subscribing to simple key characteristic ...");
-  if (!simpleKeyCharacteristic) {
-    Serial.println("no simple key characteristic found!");
-    peripheral.disconnect();
-    return;
-  } else if (!simpleKeyCharacteristic.canSubscribe()) {
-    Serial.println("simple key characteristic is not subscribable!");
-    peripheral.disconnect();
-    return;
-  } else if (!simpleKeyCharacteristic.subscribe()) {
-    Serial.println("subscription failed!");
-    peripheral.disconnect();
-    return;
-  }
-
-  // ...
-
-
-```
-
-### `bleCharacteristic.canUnsubscribe()`
-
-Query if a Bluetooth® Low Energy characteristic is unsubscribable.
-
-#### Syntax
-
-```
-bleCharacteristic.canUnsubscribe()
-
-```
-
-#### Parameters
-
-None
-
-#### Returns
-- **true**, if characteristic is unsubscribable,
-- **false** otherwise
-
-#### Example
-
-```arduino
-
-  if (characteristic.canUnsubscribe()) {
-    Serial.println("characteristic is unsubscribable");
-  }
-
-
-```
-
-### `bleCharacteristic.unsubscribe()`
-
-Unsubscribe to a Bluetooth® Low Energy characteristics notifications or indications.
-
-#### Syntax
-
-```
-bleCharacteristic.unsubscribe()
-
-```
-
-#### Parameters
-
-None
-
-#### Returns
-- **true**, on success,
-- **false** on failure
-
-#### Example
-
-```arduino
-
-  // ...
-
-  // retrieve the simple key characteristic
-  BLECharacteristic simpleKeyCharacteristic = peripheral.characteristic("ffe1");
-
-  // subscribe to the simple key characteristic
-  Serial.println("Subscribing to simple key characteristic ...");
-  if (!simpleKeyCharacteristic) {
-    Serial.println("no simple key characteristic found!");
-    peripheral.disconnect();
-    return;
-  } else if (!simpleKeyCharacteristic.canSubscribe()) {
-    Serial.println("simple key characteristic is not subscribable!");
-    peripheral.disconnect();
-    return;
-  } else if (!simpleKeyCharacteristic.subscribe()) {
-    Serial.println("subscription failed!");
-    peripheral.disconnect();
-    return;
-  }
-
-  // ...
-
-  simpleKeyCharacteristic.unsubscribe();
-
-
-```
-
-### `bleCharacteristic.valueUpdated()`
-
-Has the characteristics value been updated via a notification or indication.
-
-#### Syntax
-
-```
-bleCharacteristic.valueUpdated()
-
-```
-
-#### Parameters
-
-None
-
-#### Returns
-- **true**, if the characteristics value been updated via a notification or indication
-
-#### Example
-
-```arduino
-
-  while (peripheral.connected()) {
-    // while the peripheral is connected
-
-    // check if the value of the simple key characteristic has been updated
-    if (simpleKeyCharacteristic.valueUpdated()) {
-      // yes, get the value, characteristic is 1 byte so use byte value
-      byte value = 0;
-
-      simpleKeyCharacteristic.readValue(value);
-
-      if (value & 0x01) {
-        // first bit corresponds to the right button
-        Serial.println("Right button pressed");
-      }
-
-      if (value & 0x02) {
-        // second bit corresponds to the left button
-        Serial.println("Left button pressed");
-      }
-    }
-  }
-
-
-```
-
-## BLEDescriptor Class
-
-Used to describe a characteristic the board offers
-
-### `BLEDescriptor()`
-
-Create a new Bluetooth® Low Energy descriptor.
-
-#### Syntax
-
-```
-BLEDescriptor(uuid, value, valueSize)
-BLEDescriptor(uuid, stringValue)
-
-```
-
-#### Parameters
-
-- **uuid**: 16-bit or 128-bit UUID in string format
-- **value**: byte array value
-- **valueSize**: size of byte array value
-- **stringValue**: value as a string
-
-#### Returns
-- New **BLEDescriptor** with the specified **UUID** and value
-
-#### Example
-
-```arduino
-
-BLEDescriptor millisLabelDescriptor("2901", "millis");
-
-
-```
-
-### `bleDescriptor.uuid()`
-
-Query the UUID of the specified BLEDescriptor.
-
-#### Syntax
-
-```
-bleDescriptor.uuid()
-
-```
-
-#### Parameters
-
-None
-
-#### Returns
-- **UUID** of the Bluetooth® Low Energy descriptor (as a String).
-
-#### Example
-
-```arduino
-
-BLEDescriptor millisLabelDescriptor("2901", "millis");
-
-
-Serial.print("millis label descriptor UUID = ");
-Serial.println(millisLabelDescriptor.uuid());
-
-
-
-```
-
-### `bleDescriptor.valueSize()`
-
-Query the value size of the specified BLEDescriptor.
-
-#### Syntax
-
-```
-bleDescriptor.valueSize()
-
-```
-
-#### Parameters
-
-None
-
-#### Returns
-- **Value size** (in bytes) of the Bluetooth® Low Energy descriptor.
-
-#### Example
-
-```arduino
-
-BLEDescriptor millisLabelDescriptor("2901", "millis");
-
-
-Serial.print("millis label descriptor value size = ");
-Serial.println(millisLabelDescriptor.valueSize());
-
-
-
-```
-
-### `bleDescriptor.valueLength()`
-
-Query the length, in bytes, of the descriptor current value.
-
-#### Syntax
-
-```
-bleDescriptor.valueLength()
-
-```
-
-#### Parameters
-
-None
-
-#### Returns
-- **Length of descriptor** value in bytes.
-
-#### Example
-
-```arduino
-
-  // read the descriptor value
-  descriptor.read();
-
-  // print out the value of the descriptor
-  Serial.print(", value 0x");
-  printData(descriptor.value(), descriptor.valueLength());
-
-  // ...
-
-  void printData(const unsigned char data[], int length) {
-    for (int i = 0; i < length; i++) {
-      unsigned char b = data[i];
-
-      if (b < 16) {
-        Serial.print("0");
-      }
-
-      Serial.print(b, HEX);
-    }
-  }
-
-
-```
-
-### `bleDescriptor.value()`
-
-Query the value of the specified BLEDescriptor.
-
-#### Syntax
-
-```
-bleDescriptor.value()
-
-```
-
-#### Parameters
-
-None
-
-#### Returns
-- Value byte array of the **BLE descriptor**.
-
-#### Example
-
-```arduino
-
-BLEDescriptor millisLabelDescriptor("2901", "millis");
-
-
-
-  int descriptorValueSize = millisLabelDescriptor.valueSize();
-  byte descriptorValue[descriptorValueSize];
-
-  for (int i = 0; i < descriptorValueSize; i++) {
-    descriptorValue[i] = millisLabelDescriptor.value()[i];
-  }
-
-
-
-```
-
-### `bleDescriptor.readValue()`
-
-Read the current value of the descriptor. If the descriptor is on a remote device, a read request will be sent.
-
-#### Syntax
-
-```
-bleDescriptor.readValue(buffer, length)
-bleDescriptor.readValue(value)
-
-```
-
-#### Parameters
-
-- **buffer**: byte array to read value into
-- **length**: size of buffer argument in bytes
-- **value**: variable to read value into (by reference)
-
-#### Returns
-- **Number of bytes** read
-
-#### Example
-
-
-```arduino
-
-  byte value = 0;
-
-  // get the value, descriptor is 1 byte so use byte value
-  descriptor.readValue(value);
-
-
-```
-
-### `bleDescriptor.read()`
-
-Perform a read request for the descriptor.
-
-#### Syntax
-
-```
-bleDescriptor.read()
-
-```
-
-#### Parameters
-
-None
-
-#### Returns
-- **true**, if successful,
-- **false** on failure
-
-#### Example
-
-```arduino
-
-  if (descriptor.read()) {
-    Serial.println("descriptor value read");
-
-    // ...
-  } else {
-    Serial.println("error reading descriptor value");
-  }
-
-```
diff --git a/docs/assets/ble-bulletin-board-model.png b/docs/assets/ble-bulletin-board-model.png
deleted file mode 100644
index 409ae9e89385b0c27d8331f7d52fff2a8f71e097..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 41914
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%0D=_TZL8{w6fgEx~7n--;r3l9+lBb-c
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

diff --git a/docs/readme.md b/docs/readme.md
deleted file mode 100644
index b584d71e..00000000
--- a/docs/readme.md
+++ /dev/null
@@ -1,91 +0,0 @@
-# ArduinoBLE library
-
-This library supports all the Arduino boards that have the hardware enabled for Bluetooth® Low Energy and Bluetooth® 4.0 and above; these include Nano 33 BLE, Arduino NANO 33 IoT, Uno WiFi Rev2, MKR WiFi 1010, Nicla Sense ME.
-
-To use this library
-``#include <ArduinoBLE.h>``
-
-## A quick introduction to BLE
-
-Bluetooth® 4.0 includes both traditional Bluetooth®, now labeled "Bluetooth® Classic", and the Bluetooth® Low Energy. Bluetooth® Low Energy is optimized for low power use at low data rates, and was designed to operate from simple lithium coin cell batteries.
-
-Unlike standard Bluetooth® communication basically based on an asynchronous serial connection (UART) a Bluetooth® LE radio acts like a community bulletin board. The computers that connect to it are like community members that read the bulletin board. Each radio acts as either the bulletin board or the reader. If your radio is a bulletin board (called a peripheral device in Bluetooth® LE parlance) it posts data for all radios in the community to read. If your radio is a reader (called a central device in Bluetooth LE terms) it reads from any of the bulletin boards (peripheral devices) that have information about which it cares. You can also think of peripheral devices as the servers in a client-server transaction, because they contain the information that reader radios ask for. Similarly, central devices are the clients of the Bluetooth® LE world because they read information available from the peripherals.
-
-![Communication between central and peripheral devices](https://raw.githubusercontent.com/arduino-libraries/ArduinoBLE/master/docs/assets/ble-bulletin-board-model.png)
-
-Think of a Bluetooth® LE peripheral device as a bulletin board and central devices as viewers of the board. Central devices view the services, get the data, then move on. Each transaction is quick (a few milliseconds), so multiple central devices can get data from one peripheral.
-
-The information presented by a peripheral is structured as **services**, each of which is subdivided into **characteristics**. You can think of services as the notices on a bulletin board, and characteristics as the individual paragraphs of those notices. If you're a peripheral device, you just update each service characteristic when it needs updating and don't worry about whether the central devices read them or not. If you're a central device, you connect to the peripheral then read the boxes you want. If a given characteristic is readable and writable, then the peripheral and central can both change it.
-
-## Notify
-
-The Bluetooth® LE specification includes a mechanism known as **notify** that lets you know when data's changed. When notify on a characteristic is enabled and the sender writes to it, the new value is automatically sent to the receiver, without the receiver explicitly issuing a read command. This is commonly used for streaming data such as accelerometer or other sensor readings. There's a variation on this specification called **indicate** which works similarly, but in the indicate specification, the reader sends an acknowledgment of the pushed data.
-
-The client-server structure of Bluetooth® LE, combined with the notify characteristic, is generally called a **publish-and-subscribe model**.
-
-## Update a characteristic
-
-Your peripheral should update characteristics when there's a significant change to them. For example, when a switch changes from off to on, update its characteristic. When an analog sensor changes by a significant amount, update its characteristic.
-
-Just as with writing to a characteristic, you could update your characteristics on a regular interval, but this wastes processing power and energy if the characteristic has not changed.
-
-## Central and Peripheral Devices
-
-**Central** devices are **clients**. They read and write data from peripheral devices. **Peripheral** devices are **servers**. They provide data from sensors as readable characteristics, and provide read/writable characteristics to control actuators like motors, lights, and so forth.
-
-## Services, characteristics, and UUIDs
-
-A Bluetooth® Low Energy peripheral will provide **services**, which in turn provide **characteristics**. You can define your own services, or use standard services (see section 3.4 in the [Assigned Numbers document](https://www.bluetooth.com/specifications/assigned-numbers/)).
-
-Services are identified by unique numbers known as UUIDs. You know about UUIDs from other contexts. Standard services have a 16-bit UUID and custom services have a 128-bit UUID. The ability to define services and characteristics depends on the radio you're using and its firmware.
-
-## Service design patterns
-
-A characteristic value can be up to 512 bytes long. This is a key constraint in designing services. Given this limit, you should consider how best to store data about your sensors and actuators most effectively for your application. The simplest design pattern is to store one sensor or actuator value per characteristic, in ASCII encoded values.
-
-|**Characteristic**|**Value**|
-|------------------|---------|
-|Accelerometer X|200|
-|Accelerometer Y|134|
-|Accelerometer Z|150|
-
-This is also the most expensive in memory terms, and would take the longest to read. But it's the simplest for development and debugging.
-
-You could also combine readings into a single characteristic, when a given sensor or actuator has multiple values associated with it.
-
-|**Characteristic**|**Value**|
-|------------------|---------|
-|Motor Speed, Direction|150,1|
-|Accelerometer X, Y, Z|200,133,150|
-
-This is more efficient, but you need to be careful not to exceed the 512-byte limit. The accelerometer characteristic above, for example, takes 11 bytes as an ASCII-encoded string.
-
-## Read/write/notify/indicate
-
-There are 4 things a central device can do with a characteristic:
-
-- **Read:** ask the peripheral to send back the current value of the characteristic. Often used for characteristics that don't change very often, for example characteristics used for configuration, version numbers, etc.
-- **Write:** modify the value of the characteristic. Often used for things that are like commands, for example telling the peripheral to turn a motor on or off.
-- **Indicate** and **Notify:** ask the peripheral to continuously send updated values of the characteristic, without the central having to constantly ask for it.
-
-## Advertising and GAP
-
-BLE devices let other devices know that they exist by advertising using the **General Advertising Profile (GAP)**. Advertising packets can contain a device name, some other information, and also a list of the services it provides.
-
-Advertising packets have a limited size. You will only be able to fit a single 128-bit service UUID in the packet. Make sure the device name is not too long, or you won't even be able to fit that.
-
-You can provide additional services that are not advertised. Central devices will learn about these through the connection/bonding process. Non-advertised services cannot be used to discover devices, though. Sometimes this is not an issue. For example, you may have a custom peripheral device with a custom service, but in your central device app you may know that it also provides the Battery Service and other services.
-
-## GATT
-
-The Bluetooth LE protocol operates on multiple layers. **General Attribute Profile (GATT)** is the layer that defines services and characteristics and enables read/write/notify/indicate operations on them. When reading more about GATT, you may encounter GATT concepts of a "server" and "client". These don't always correspond to central and peripherals. In most cases, though, the peripheral is the GATT server (since it provides the services and characteristics), while the central is the GATT client.
-
-## Library structure
-
-As the library enables multiple types of functionality, there are a number of different classes.
-
-- `BLE` used to enable the Bluetooth® Low Energy module.
-- `BLEDevice` used to get information about the devices connected or discovered while scanning.
-- `BLEService` used to enable the services board provides or interact with services a remote board provides.
-- `BLECharacteristic` used to enable the characteristics board offers in a service or interact with characteristics a remote board provides.
-- `BLEDescriptor` used to describe a characteristic the board offers.
diff --git a/examples/Central/LedControl/LedControl.ino b/examples/Central/LedControl/LedControl.ino
index 953de7d8..064bb29e 100644
--- a/examples/Central/LedControl/LedControl.ino
+++ b/examples/Central/LedControl/LedControl.ino
@@ -6,9 +6,7 @@
   it will remotely control the Bluetooth® Low Energy peripheral's LED, when the button is pressed or released.
 
   The circuit:
-  - Arduino MKR WiFi 1010, Arduino Uno WiFi Rev2 board, Arduino Nano 33 IoT,
-    Arduino Nano 33 BLE, or Arduino Nano 33 BLE Sense board.
-  - Button with pull-up resistor connected to pin 2.
+  - Board with supported BLE modules.
 
   You can use it with another board that is compatible with this library and the
   Peripherals -> LED example.
@@ -16,7 +14,7 @@
   This example code is in the public domain.
 */
 
-#include <ArduinoBLE.h>
+#include <STM32duinoBLE.h>
 
 // variables for button
 const int buttonPin = 2;
diff --git a/examples/Central/PeripheralExplorer/PeripheralExplorer.ino b/examples/Central/PeripheralExplorer/PeripheralExplorer.ino
index 919cdde0..4a72a697 100644
--- a/examples/Central/PeripheralExplorer/PeripheralExplorer.ino
+++ b/examples/Central/PeripheralExplorer/PeripheralExplorer.ino
@@ -5,8 +5,7 @@
   is found. Then connects, and discovers + prints all the peripheral's attributes.
 
   The circuit:
-  - Arduino MKR WiFi 1010, Arduino Uno WiFi Rev2 board, Arduino Nano 33 IoT,
-    Arduino Nano 33 BLE, or Arduino Nano 33 BLE Sense board.
+  - Board with supported BLE modules.
 
   You can use it with another board that is compatible with this library and the
   Peripherals -> LED example.
@@ -14,7 +13,7 @@
   This example code is in the public domain.
 */
 
-#include <ArduinoBLE.h>
+#include <STM32duinoBLE.h>
 
 void setup() {
   Serial.begin(9600);
diff --git a/examples/Central/Scan/Scan.ino b/examples/Central/Scan/Scan.ino
index 162e3c07..99e13696 100644
--- a/examples/Central/Scan/Scan.ino
+++ b/examples/Central/Scan/Scan.ino
@@ -5,13 +5,12 @@
   address, local name, advertised service UUID's.
 
   The circuit:
-  - Arduino MKR WiFi 1010, Arduino Uno WiFi Rev2 board, Arduino Nano 33 IoT,
-    Arduino Nano 33 BLE, or Arduino Nano 33 BLE Sense board.
+  - Board with supported BLE modules.
 
   This example code is in the public domain.
 */
 
-#include <ArduinoBLE.h>
+#include <STM32duinoBLE.h>
 
 void setup() {
   Serial.begin(9600);
diff --git a/examples/Central/ScanCallback/ScanCallback.ino b/examples/Central/ScanCallback/ScanCallback.ino
index 2687a3b9..63ab2753 100644
--- a/examples/Central/ScanCallback/ScanCallback.ino
+++ b/examples/Central/ScanCallback/ScanCallback.ino
@@ -7,13 +7,12 @@
   reported for every single advertisement it makes.
 
   The circuit:
-  - Arduino MKR WiFi 1010, Arduino Uno WiFi Rev2 board, Arduino Nano 33 IoT,
-    Arduino Nano 33 BLE, or Arduino Nano 33 BLE Sense board.
+  - Board with supported BLE modules.
 
   This example code is in the public domain.
 */
 
-#include <ArduinoBLE.h>
+#include <STM32duinoBLE.h>
 
 void setup() {
   Serial.begin(9600);
diff --git a/examples/Central/SensorTagButton/SensorTagButton.ino b/examples/Central/SensorTagButton/SensorTagButton.ino
index 27c421fe..26ee667d 100644
--- a/examples/Central/SensorTagButton/SensorTagButton.ino
+++ b/examples/Central/SensorTagButton/SensorTagButton.ino
@@ -8,14 +8,13 @@
   outputted to the Serial Monitor when one is pressed.
 
   The circuit:
-  - Arduino MKR WiFi 1010, Arduino Uno WiFi Rev2 board, Arduino Nano 33 IoT,
-    Arduino Nano 33 BLE, or Arduino Nano 33 BLE Sense board.
+  - Board with supported BLE modules.
   - TI SensorTag
 
   This example code is in the public domain.
 */
 
-#include <ArduinoBLE.h>
+#include <STM32duinoBLE.h>
 
 void setup() {
   Serial.begin(9600);
diff --git a/examples/Peripheral/Advertising/EnhancedAdvertising/EnhancedAdvertising.ino b/examples/Peripheral/Advertising/EnhancedAdvertising/EnhancedAdvertising.ino
index 979b69a8..806c41bd 100644
--- a/examples/Peripheral/Advertising/EnhancedAdvertising/EnhancedAdvertising.ino
+++ b/examples/Peripheral/Advertising/EnhancedAdvertising/EnhancedAdvertising.ino
@@ -1,4 +1,4 @@
-#include <ArduinoBLE.h>
+#include <STM32duinoBLE.h>
 
 BLEService myService("fff0");
 BLEIntCharacteristic myCharacteristic("fff1", BLERead | BLEBroadcast);
diff --git a/examples/Peripheral/Advertising/RawDataAdvertising/RawDataAdvertising.ino b/examples/Peripheral/Advertising/RawDataAdvertising/RawDataAdvertising.ino
index 5e7ba7f3..88b17e29 100644
--- a/examples/Peripheral/Advertising/RawDataAdvertising/RawDataAdvertising.ino
+++ b/examples/Peripheral/Advertising/RawDataAdvertising/RawDataAdvertising.ino
@@ -1,4 +1,4 @@
-#include <ArduinoBLE.h>
+#include <STM32duinoBLE.h>
 
 BLEService myService("fff0");
 BLEIntCharacteristic myCharacteristic("fff1", BLERead | BLEBroadcast);
diff --git a/examples/Peripheral/BatteryMonitor/BatteryMonitor.ino b/examples/Peripheral/BatteryMonitor/BatteryMonitor.ino
index 0d786627..3413127e 100644
--- a/examples/Peripheral/BatteryMonitor/BatteryMonitor.ino
+++ b/examples/Peripheral/BatteryMonitor/BatteryMonitor.ino
@@ -5,8 +5,7 @@
   level characteristic. The A0 pin is used to calculate the battery level.
 
   The circuit:
-  - Arduino MKR WiFi 1010, Arduino Uno WiFi Rev2 board, Arduino Nano 33 IoT,
-    Arduino Nano 33 BLE, or Arduino Nano 33 BLE Sense board.
+    - 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
@@ -15,7 +14,7 @@
   This example code is in the public domain.
 */
 
-#include <ArduinoBLE.h>
+#include <STM32duinoBLE.h>
 
  // Bluetooth® Low Energy Battery Service
 BLEService batteryService("180F");
diff --git a/examples/Peripheral/ButtonLED/ButtonLED.ino b/examples/Peripheral/ButtonLED/ButtonLED.ino
index cbc14dd8..baa64b87 100644
--- a/examples/Peripheral/ButtonLED/ButtonLED.ino
+++ b/examples/Peripheral/ButtonLED/ButtonLED.ino
@@ -6,9 +6,7 @@
   represents the state of the button.
 
   The circuit:
-  - Arduino MKR WiFi 1010, Arduino Uno WiFi Rev2 board, Arduino Nano 33 IoT,
-    Arduino Nano 33 BLE, or Arduino Nano 33 BLE Sense board.
-  - Button connected to pin 4
+  - 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
@@ -17,7 +15,7 @@
   This example code is in the public domain.
 */
 
-#include <ArduinoBLE.h>
+#include <STM32duinoBLE.h>
 
 const int ledPin = LED_BUILTIN; // set ledPin to on-board LED
 const int buttonPin = 4; // set buttonPin to digital pin 4
diff --git a/examples/Peripheral/CallbackLED/CallbackLED.ino b/examples/Peripheral/CallbackLED/CallbackLED.ino
index 59bda5ed..8bb90106 100644
--- a/examples/Peripheral/CallbackLED/CallbackLED.ino
+++ b/examples/Peripheral/CallbackLED/CallbackLED.ino
@@ -6,8 +6,7 @@
   library are used.
 
   The circuit:
-  - Arduino MKR WiFi 1010, Arduino Uno WiFi Rev2 board, Arduino Nano 33 IoT,
-    Arduino Nano 33 BLE, or Arduino Nano 33 BLE Sense board.
+  - 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
@@ -16,7 +15,7 @@
   This example code is in the public domain.
 */
 
-#include <ArduinoBLE.h>
+#include <STM32duinoBLE.h>
 
 BLEService ledService("19B10000-E8F2-537E-4F6C-D104768A1214"); // create service
 
diff --git a/examples/Peripheral/EncryptedBatteryMonitor/EncryptedBatteryMonitor.ino b/examples/Peripheral/EncryptedBatteryMonitor/EncryptedBatteryMonitor.ino
deleted file mode 100644
index dfc9f4a0..00000000
--- a/examples/Peripheral/EncryptedBatteryMonitor/EncryptedBatteryMonitor.ino
+++ /dev/null
@@ -1,265 +0,0 @@
-/*
-  Battery Monitor
-
-  This example creates a BLE peripheral with the standard battery service and
-  level characteristic. The A0 pin is used to calculate the battery level.
-
-  The circuit:
-  - Arduino MKR WiFi 1010, Arduino Uno WiFi Rev2 board, Arduino Nano 33 IoT,
-    Arduino Nano 33 BLE, or Arduino Nano 33 BLE Sense board.
-
-  You can use a generic BLE 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 <ArduinoBLE.h>
-
-
-#define PAIR_BUTTON 3        // button for pairing
-#define PAIR_LED 24           // LED used to signal pairing
-#define PAIR_LED_ON LOW       // Blue LED on Nano BLE has inverted logic
-#define PAIR_INTERVAL 30000   // interval for pairing after button press in ms
-
-#define CTRL_LED LED_BUILTIN
-
-
- // BLE Battery Service
-BLEService batteryService("180F");
-
-// BLE 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
-BLEStringCharacteristic stringcharacteristic("183E", BLERead | BLEWrite, 31);
-
-
-// Add BLEEncryption tag to require pairing. This controls the LED.
-BLEUnsignedCharCharacteristic secretValue("2a3F", BLERead | BLEWrite | BLEEncryption);
-
-int oldBatteryLevel = 0;  // last battery level reading from analog input
-unsigned long previousMillis = 0;  // last time the battery level was checked, in ms
-unsigned long pairingStarted = 0;  // pairing start time when button is pressed
-bool wasConnected = 0;
-bool acceptOrReject = true;
-
-void setup() {
-  Serial.begin(9600);    // initialize serial communication
-  while (!Serial);
-
-  pinMode(CTRL_LED, OUTPUT); // initialize the built-in LED pin to indicate when a central is connected
-  pinMode(PAIR_LED, OUTPUT);
-  pinMode(PAIR_BUTTON, INPUT_PULLUP);
-
-
-  Serial.println("Serial connected");
-
-  // Callback function with confirmation code when new device is pairing.
-  BLE.setDisplayCode([](uint32_t confirmCode){
-    Serial.println("New device pairing request.");
-    Serial.print("Confirm code matches pairing device: ");
-    char code[6];
-    sprintf(code, "%06d", confirmCode);
-    Serial.println(code);
-  });
-
-  // Callback to allow accepting or rejecting pairing
-  BLE.setBinaryConfirmPairing([&acceptOrReject](){
-    Serial.print("Should we confirm pairing? ");
-    delay(5000);
-    if(acceptOrReject){
-      acceptOrReject = false;
-      Serial.println("yes");
-      return true;
-    }else{
-      acceptOrReject = true;
-      Serial.println("no");
-      return false;
-    }
-  });
-
-  // IRKs are keys that identify the true owner of a random mac address.
-  // Add IRKs of devices you are bonded with.
-  BLE.setGetIRKs([](uint8_t* nIRKs, uint8_t** BDaddrTypes, uint8_t*** BDAddrs, uint8_t*** IRKs){
-    // Set to number of devices
-    *nIRKs       = 2;
-
-    *BDAddrs     = new uint8_t*[*nIRKs];
-    *IRKs        = new uint8_t*[*nIRKs];
-    *BDaddrTypes = new uint8_t[*nIRKs];
-
-    // Set these to the mac and IRK for your bonded devices as printed in the serial console after bonding.
-    uint8_t device1Mac[6]    = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-    uint8_t device1IRK[16]   = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-
-    uint8_t device2Mac[6]    = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-    uint8_t device2IRK[16]   = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-
-
-    (*BDaddrTypes)[0] = 0; // Type 0 is for pubc address, type 1 is for static random
-    (*BDAddrs)[0] = new uint8_t[6];
-    (*IRKs)[0]    = new uint8_t[16];
-    memcpy((*IRKs)[0]   , device1IRK,16);
-    memcpy((*BDAddrs)[0], device1Mac, 6);
-
-
-    (*BDaddrTypes)[1] = 0;
-    (*BDAddrs)[1] = new uint8_t[6];
-    (*IRKs)[1]    = new uint8_t[16];
-    memcpy((*IRKs)[1]   , device2IRK,16);
-    memcpy((*BDAddrs)[1], device2Mac, 6);
-
-
-    return 1;
-  });
-  // The LTK is the secret key which is used to encrypt bluetooth traffic
-  BLE.setGetLTK([](uint8_t* address, uint8_t* LTK){
-    // address is input
-    Serial.print("Received request for address: ");
-    btct.printBytes(address,6);
-
-    // Set these to the MAC and LTK of your devices after bonding.
-    uint8_t device1Mac[6]  = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-    uint8_t device1LTK[16] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-    uint8_t device2Mac[6]  = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-    uint8_t device2LTK[16] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-
-
-    if(memcmp(device1Mac, address, 6) == 0) {
-      memcpy(LTK, device1LTK, 16);
-      return 1;
-    }else if(memcmp(device2Mac, address, 6) == 0) {
-      memcpy(LTK, device2LTK, 16);
-      return 1;
-    }
-    return 0;
-  });
-  BLE.setStoreIRK([](uint8_t* address, uint8_t* IRK){
-    Serial.print(F("New device with MAC : "));
-    btct.printBytes(address,6);
-    Serial.print(F("Need to store IRK   : "));
-    btct.printBytes(IRK,16);
-    return 1;
-  });
-  BLE.setStoreLTK([](uint8_t* address, uint8_t* LTK){
-    Serial.print(F("New device with MAC : "));
-    btct.printBytes(address,6);
-    Serial.print(F("Need to store LTK   : "));
-    btct.printBytes(LTK,16);
-    return 1;
-  });
-
-  while(1){
-    // begin initialization
-    if (!BLE.begin()) {
-      Serial.println("starting BLE failed!");
-      delay(200);
-      continue;
-    }
-    Serial.println("BT init");
-    delay(200);
-
-    /* Set a local name for the BLE device
-       This name will appear in advertising packets
-       and can be used by remote devices to identify this BLE device
-       The name can be changed but maybe be truncated based on space left in advertisement packet
-    */
-
-    BLE.setDeviceName("Arduino");
-    BLE.setLocalName("BatteryMonitor");
-
-    BLE.setAdvertisedService(batteryService); // add the service UUID
-    batteryService.addCharacteristic(batteryLevelChar); // add the battery level characteristic
-    batteryService.addCharacteristic(stringcharacteristic);
-    batteryService.addCharacteristic(secretValue);
-
-    BLE.addService(batteryService);               // Add the battery service
-    batteryLevelChar.writeValue(oldBatteryLevel); // set initial value for this characteristic
-    char* stringCharValue = new char[32];
-    stringCharValue = "string";
-    stringcharacteristic.writeValue(stringCharValue);
-    secretValue.writeValue(0);
-
-    delay(1000);
-
-    // prevent pairing until button is pressed (will show a pairing rejected message)
-    BLE.setPairable(false);
-
-    /* Start advertising BLE.  It will start continuously transmitting BLE
-       advertising packets and will be visible to remote BLE central devices
-       until it receives a new connection */
-
-    // start advertising
-    if(!BLE.advertise()){
-      Serial.println("failed to advertise bluetooth.");
-      BLE.stopAdvertise();
-      delay(500);
-    }else{
-      Serial.println("advertising...");
-      break;
-    }
-    BLE.end();
-    delay(100);
-  }
-}
-
-
-void loop() {
-  // wait for a BLE central
-  BLEDevice central = BLE.central();
-
-
-  // If button is pressed, allow pairing for 30 sec
-  if (!BLE.pairable() && digitalRead(PAIR_BUTTON) == LOW){
-    pairingStarted = millis();
-    BLE.setPairable(Pairable::ONCE);
-    Serial.println("Accepting pairing for 30 s");
-  } else if (BLE.pairable() && millis() > pairingStarted + PAIR_INTERVAL){
-    BLE.setPairable(false);
-    Serial.println("No longer accepting pairing");
-  }
-  // Make LED blink while pairing is allowed
-  digitalWrite(PAIR_LED, (BLE.pairable() ? (millis()%400)<200 : BLE.paired()) ? PAIR_LED_ON : !PAIR_LED_ON);
-
-
-  // if a central is connected to the peripheral:
-  if (central && central.connected()) {
-    if (!wasConnected){
-      wasConnected = true;
-      Serial.print("Connected to central: ");
-      // print the central's BT address:
-      Serial.println(central.address());
-    }
-
-    // check the battery level every 200ms
-    // while the central is connected:
-    long currentMillis = millis();
-    // if 200ms have passed, check the battery level:
-    if (currentMillis - previousMillis >= 1000) {
-      previousMillis = currentMillis;
-      updateBatteryLevel();
-      digitalWrite(CTRL_LED, secretValue.value()>0 ? HIGH : LOW);
-    }
-  } else if (wasConnected){
-    wasConnected = false;
-    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
-  }
-}
\ No newline at end of file
diff --git a/examples/Peripheral/LED/LED.ino b/examples/Peripheral/LED/LED.ino
index 65b88605..7223365f 100644
--- a/examples/Peripheral/LED/LED.ino
+++ b/examples/Peripheral/LED/LED.ino
@@ -5,8 +5,7 @@
   characteristic to control an LED.
 
   The circuit:
-  - Arduino MKR WiFi 1010, Arduino Uno WiFi Rev2 board, Arduino Nano 33 IoT,
-    Arduino Nano 33 BLE, or Arduino Nano 33 BLE Sense board.
+  - 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
@@ -15,7 +14,7 @@
   This example code is in the public domain.
 */
 
-#include <ArduinoBLE.h>
+#include <STM32duinoBLE.h>
 
 BLEService ledService("19B10000-E8F2-537E-4F6C-D104768A1214"); // Bluetooth® Low Energy LED Service
 
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 <TargetConditionals.h>
-# 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_<feature name> 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(<string_view>) && defined(CATCH_CPP17_OR_GREATER)
-  #    define CATCH_INTERNAL_CONFIG_CPP17_STRING_VIEW
-  #endif
-
-  // Check if optional is available and usable
-  #  if __has_include(<optional>) && defined(CATCH_CPP17_OR_GREATER)
-  #    define CATCH_INTERNAL_CONFIG_CPP17_OPTIONAL
-  #  endif // __has_include(<optional>) && defined(CATCH_CPP17_OR_GREATER)
-
-  // Check if byte is available and usable
-  #  if __has_include(<cstddef>) && defined(CATCH_CPP17_OR_GREATER)
-  #    define CATCH_INTERNAL_CONFIG_CPP17_BYTE
-  #  endif // __has_include(<cstddef>) && defined(CATCH_CPP17_OR_GREATER)
-
-  // Check if variant is available and usable
-  #  if __has_include(<variant>) && 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 <ciso646>
-  #      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(<variant>) && 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 <iosfwd>
-#include <string>
-#include <cstdint>
-
-// 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<typename T>
-    T const& operator + ( T const& value, StreamEndStop ) {
-        return value;
-    }
-}
-
-#define CATCH_INTERNAL_LINEINFO \
-    ::Catch::SourceLineInfo( __FILE__, static_cast<std::size_t>( __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 <vector>
-
-namespace Catch {
-
-    class TestSpec;
-
-    struct ITestInvoker {
-        virtual void invoke () const = 0;
-        virtual ~ITestInvoker();
-    };
-
-    class TestCase;
-    struct IConfig;
-
-    struct ITestCaseRegistry {
-        virtual ~ITestCaseRegistry();
-        virtual std::vector<TestCase> const& getAllTests() const = 0;
-        virtual std::vector<TestCase> 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<TestCase> filterTests( std::vector<TestCase> const& testCases, TestSpec const& testSpec, IConfig const& config );
-    std::vector<TestCase> const& getAllTestCasesSorted( IConfig const& config );
-
-}
-
-// end catch_interfaces_testcase.h
-// start catch_stringref.h
-
-#include <cstddef>
-#include <string>
-#include <iosfwd>
-#include <cassert>
-
-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<INTERNAL_CATCH_REMOVE_PARENS_GEN(__VA_ARGS__)>())
-#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<INTERNAL_CATCH_REMOVE_PARENS_GEN(__VA_ARGS__)>()))
-#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<typename...> struct TypeList {};\
-    template<typename...Ts>\
-    constexpr auto get_wrapper() noexcept -> TypeList<Ts...> { return {}; }\
-    template<template<typename...> class...> struct TemplateTypeList{};\
-    template<template<typename...> class...Cs>\
-    constexpr auto get_wrapper() noexcept -> TemplateTypeList<Cs...> { return {}; }\
-    template<typename...>\
-    struct append;\
-    template<typename...>\
-    struct rewrap;\
-    template<template<typename...> class, typename...>\
-    struct create;\
-    template<template<typename...> class, typename>\
-    struct convert;\
-    \
-    template<typename T> \
-    struct append<T> { using type = T; };\
-    template< template<typename...> class L1, typename...E1, template<typename...> class L2, typename...E2, typename...Rest>\
-    struct append<L1<E1...>, L2<E2...>, Rest...> { using type = typename append<L1<E1...,E2...>, Rest...>::type; };\
-    template< template<typename...> class L1, typename...E1, typename...Rest>\
-    struct append<L1<E1...>, TypeList<mpl_::na>, Rest...> { using type = L1<E1...>; };\
-    \
-    template< template<typename...> class Container, template<typename...> class List, typename...elems>\
-    struct rewrap<TemplateTypeList<Container>, List<elems...>> { using type = TypeList<Container<elems...>>; };\
-    template< template<typename...> class Container, template<typename...> class List, class...Elems, typename...Elements>\
-    struct rewrap<TemplateTypeList<Container>, List<Elems...>, Elements...> { using type = typename append<TypeList<Container<Elems...>>, typename rewrap<TemplateTypeList<Container>, Elements...>::type>::type; };\
-    \
-    template<template <typename...> class Final, template< typename...> class...Containers, typename...Types>\
-    struct create<Final, TemplateTypeList<Containers...>, TypeList<Types...>> { using type = typename append<Final<>, typename rewrap<TemplateTypeList<Containers>, Types...>::type...>::type; };\
-    template<template <typename...> class Final, template <typename...> class List, typename...Ts>\
-    struct convert<Final, List<Ts...>> { using type = typename append<Final<>,TypeList<Ts>...>::type; };
-
-#define INTERNAL_CATCH_NTTP_1(signature, ...)\
-    template<INTERNAL_CATCH_REMOVE_PARENS(signature)> struct Nttp{};\
-    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
-    constexpr auto get_wrapper() noexcept -> Nttp<__VA_ARGS__> { return {}; } \
-    template<template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class...> struct NttpTemplateTypeList{};\
-    template<template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class...Cs>\
-    constexpr auto get_wrapper() noexcept -> NttpTemplateTypeList<Cs...> { return {}; } \
-    \
-    template< template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class Container, template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class List, INTERNAL_CATCH_REMOVE_PARENS(signature)>\
-    struct rewrap<NttpTemplateTypeList<Container>, List<__VA_ARGS__>> { using type = TypeList<Container<__VA_ARGS__>>; };\
-    template< template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class Container, template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class List, INTERNAL_CATCH_REMOVE_PARENS(signature), typename...Elements>\
-    struct rewrap<NttpTemplateTypeList<Container>, List<__VA_ARGS__>, Elements...> { using type = typename append<TypeList<Container<__VA_ARGS__>>, typename rewrap<NttpTemplateTypeList<Container>, Elements...>::type>::type; };\
-    template<template <typename...> class Final, template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class...Containers, typename...Types>\
-    struct create<Final, NttpTemplateTypeList<Containers...>, TypeList<Types...>> { using type = typename append<Final<>, typename rewrap<NttpTemplateTypeList<Containers>, Types...>::type...>::type; };
-
-#define INTERNAL_CATCH_DECLARE_SIG_TEST0(TestName)
-#define INTERNAL_CATCH_DECLARE_SIG_TEST1(TestName, signature)\
-    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
-    static void TestName()
-#define INTERNAL_CATCH_DECLARE_SIG_TEST_X(TestName, signature, ...)\
-    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
-    static void TestName()
-
-#define INTERNAL_CATCH_DEFINE_SIG_TEST0(TestName)
-#define INTERNAL_CATCH_DEFINE_SIG_TEST1(TestName, signature)\
-    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
-    static void TestName()
-#define INTERNAL_CATCH_DEFINE_SIG_TEST_X(TestName, signature,...)\
-    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
-    static void TestName()
-
-#define INTERNAL_CATCH_NTTP_REGISTER0(TestFunc, signature)\
-    template<typename Type>\
-    void reg_test(TypeList<Type>, Catch::NameAndTags nameAndTags)\
-    {\
-        Catch::AutoReg( Catch::makeTestInvoker(&TestFunc<Type>), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), nameAndTags);\
-    }
-
-#define INTERNAL_CATCH_NTTP_REGISTER(TestFunc, signature, ...)\
-    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
-    void reg_test(Nttp<__VA_ARGS__>, Catch::NameAndTags nameAndTags)\
-    {\
-        Catch::AutoReg( Catch::makeTestInvoker(&TestFunc<__VA_ARGS__>), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), nameAndTags);\
-    }
-
-#define INTERNAL_CATCH_NTTP_REGISTER_METHOD0(TestName, signature, ...)\
-    template<typename Type>\
-    void reg_test(TypeList<Type>, Catch::StringRef className, Catch::NameAndTags nameAndTags)\
-    {\
-        Catch::AutoReg( Catch::makeTestInvoker(&TestName<Type>::test), CATCH_INTERNAL_LINEINFO, className, nameAndTags);\
-    }
-
-#define INTERNAL_CATCH_NTTP_REGISTER_METHOD(TestName, signature, ...)\
-    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
-    void reg_test(Nttp<__VA_ARGS__>, Catch::StringRef className, Catch::NameAndTags nameAndTags)\
-    {\
-        Catch::AutoReg( Catch::makeTestInvoker(&TestName<__VA_ARGS__>::test), CATCH_INTERNAL_LINEINFO, className, nameAndTags);\
-    }
-
-#define INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD0(TestName, ClassName)
-#define INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD1(TestName, ClassName, signature)\
-    template<typename TestType> \
-    struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName)<TestType> { \
-        void test();\
-    }
-
-#define INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X(TestName, ClassName, signature, ...)\
-    template<INTERNAL_CATCH_REMOVE_PARENS(signature)> \
-    struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName)<__VA_ARGS__> { \
-        void test();\
-    }
-
-#define INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD0(TestName)
-#define INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD1(TestName, signature)\
-    template<typename TestType> \
-    void INTERNAL_CATCH_MAKE_NAMESPACE(TestName)::TestName<TestType>::test()
-#define INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X(TestName, signature, ...)\
-    template<INTERNAL_CATCH_REMOVE_PARENS(signature)> \
-    void INTERNAL_CATCH_MAKE_NAMESPACE(TestName)::TestName<__VA_ARGS__>::test()
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-#define INTERNAL_CATCH_NTTP_0
-#define INTERNAL_CATCH_NTTP_GEN(...) INTERNAL_CATCH_VA_NARGS_IMPL(__VA_ARGS__, INTERNAL_CATCH_NTTP_1(__VA_ARGS__), INTERNAL_CATCH_NTTP_1(__VA_ARGS__), INTERNAL_CATCH_NTTP_1(__VA_ARGS__), INTERNAL_CATCH_NTTP_1(__VA_ARGS__), INTERNAL_CATCH_NTTP_1(__VA_ARGS__), INTERNAL_CATCH_NTTP_1( __VA_ARGS__), INTERNAL_CATCH_NTTP_1( __VA_ARGS__), INTERNAL_CATCH_NTTP_1( __VA_ARGS__), INTERNAL_CATCH_NTTP_1( __VA_ARGS__),INTERNAL_CATCH_NTTP_1( __VA_ARGS__), INTERNAL_CATCH_NTTP_0)
-#define INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD(TestName, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD1, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD0)(TestName, __VA_ARGS__)
-#define INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD(TestName, ClassName, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD1, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD0)(TestName, ClassName, __VA_ARGS__)
-#define INTERNAL_CATCH_NTTP_REG_METHOD_GEN(TestName, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD0, INTERNAL_CATCH_NTTP_REGISTER_METHOD0)(TestName, __VA_ARGS__)
-#define INTERNAL_CATCH_NTTP_REG_GEN(TestFunc, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER0, INTERNAL_CATCH_NTTP_REGISTER0)(TestFunc, __VA_ARGS__)
-#define INTERNAL_CATCH_DEFINE_SIG_TEST(TestName, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DEFINE_SIG_TEST1, INTERNAL_CATCH_DEFINE_SIG_TEST0)(TestName, __VA_ARGS__)
-#define INTERNAL_CATCH_DECLARE_SIG_TEST(TestName, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DECLARE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST1, INTERNAL_CATCH_DECLARE_SIG_TEST0)(TestName, __VA_ARGS__)
-#define INTERNAL_CATCH_REMOVE_PARENS_GEN(...) INTERNAL_CATCH_VA_NARGS_IMPL(__VA_ARGS__, INTERNAL_CATCH_REMOVE_PARENS_11_ARG,INTERNAL_CATCH_REMOVE_PARENS_10_ARG,INTERNAL_CATCH_REMOVE_PARENS_9_ARG,INTERNAL_CATCH_REMOVE_PARENS_8_ARG,INTERNAL_CATCH_REMOVE_PARENS_7_ARG,INTERNAL_CATCH_REMOVE_PARENS_6_ARG,INTERNAL_CATCH_REMOVE_PARENS_5_ARG,INTERNAL_CATCH_REMOVE_PARENS_4_ARG,INTERNAL_CATCH_REMOVE_PARENS_3_ARG,INTERNAL_CATCH_REMOVE_PARENS_2_ARG,INTERNAL_CATCH_REMOVE_PARENS_1_ARG)(__VA_ARGS__)
-#else
-#define INTERNAL_CATCH_NTTP_0(signature)
-#define INTERNAL_CATCH_NTTP_GEN(...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL(__VA_ARGS__, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1,INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_0)( __VA_ARGS__))
-#define INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD(TestName, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD1, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD0)(TestName, __VA_ARGS__))
-#define INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD(TestName, ClassName, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD1, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD0)(TestName, ClassName, __VA_ARGS__))
-#define INTERNAL_CATCH_NTTP_REG_METHOD_GEN(TestName, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD0, INTERNAL_CATCH_NTTP_REGISTER_METHOD0)(TestName, __VA_ARGS__))
-#define INTERNAL_CATCH_NTTP_REG_GEN(TestFunc, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER0, INTERNAL_CATCH_NTTP_REGISTER0)(TestFunc, __VA_ARGS__))
-#define INTERNAL_CATCH_DEFINE_SIG_TEST(TestName, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DEFINE_SIG_TEST1, INTERNAL_CATCH_DEFINE_SIG_TEST0)(TestName, __VA_ARGS__))
-#define INTERNAL_CATCH_DECLARE_SIG_TEST(TestName, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DECLARE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST1, INTERNAL_CATCH_DECLARE_SIG_TEST0)(TestName, __VA_ARGS__))
-#define INTERNAL_CATCH_REMOVE_PARENS_GEN(...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL(__VA_ARGS__, INTERNAL_CATCH_REMOVE_PARENS_11_ARG,INTERNAL_CATCH_REMOVE_PARENS_10_ARG,INTERNAL_CATCH_REMOVE_PARENS_9_ARG,INTERNAL_CATCH_REMOVE_PARENS_8_ARG,INTERNAL_CATCH_REMOVE_PARENS_7_ARG,INTERNAL_CATCH_REMOVE_PARENS_6_ARG,INTERNAL_CATCH_REMOVE_PARENS_5_ARG,INTERNAL_CATCH_REMOVE_PARENS_4_ARG,INTERNAL_CATCH_REMOVE_PARENS_3_ARG,INTERNAL_CATCH_REMOVE_PARENS_2_ARG,INTERNAL_CATCH_REMOVE_PARENS_1_ARG)(__VA_ARGS__))
-#endif
-
-// end catch_preprocessor.hpp
-// start catch_meta.hpp
-
-
-#include <type_traits>
-
-namespace Catch {
-    template<typename T>
-    struct always_false : std::false_type {};
-
-    template <typename> struct true_given : std::true_type {};
-    struct is_callable_tester {
-        template <typename Fun, typename... Args>
-        true_given<decltype(std::declval<Fun>()(std::declval<Args>()...))> static test(int);
-        template <typename...>
-        std::false_type static test(...);
-    };
-
-    template <typename T>
-    struct is_callable;
-
-    template <typename Fun, typename... Args>
-    struct is_callable<Fun(Args...)> : decltype(is_callable_tester::test<Fun, Args...>(0)) {};
-
-#if defined(__cpp_lib_is_invocable) && __cpp_lib_is_invocable >= 201703
-    // std::result_of is deprecated in C++17 and removed in C++20. Hence, it is
-    // replaced with std::invoke_result here. Also *_t format is preferred over
-    // typename *::type format.
-    template <typename Func, typename U>
-    using FunctionReturnType = std::remove_reference_t<std::remove_cv_t<std::invoke_result_t<Func, U>>>;
-#else
-    template <typename Func, typename U>
-    using FunctionReturnType = typename std::remove_reference<typename std::remove_cv<typename std::result_of<Func(U)>::type>::type>::type;
-#endif
-
-} // namespace Catch
-
-namespace mpl_{
-    struct na;
-}
-
-// end catch_meta.hpp
-namespace Catch {
-
-template<typename C>
-class TestInvokerAsMethod : public ITestInvoker {
-    void (C::*m_testAsMethod)();
-public:
-    TestInvokerAsMethod( void (C::*testAsMethod)() ) noexcept : m_testAsMethod( testAsMethod ) {}
-
-    void invoke() const override {
-        C obj;
-        (obj.*m_testAsMethod)();
-    }
-};
-
-auto makeTestInvoker( void(*testAsFunction)() ) noexcept -> ITestInvoker*;
-
-template<typename C>
-auto makeTestInvoker( void (C::*testAsMethod)() ) noexcept -> ITestInvoker* {
-    return new(std::nothrow) TestInvokerAsMethod<C>( testAsMethod );
-}
-
-struct NameAndTags {
-    NameAndTags( StringRef const& name_ = StringRef(), StringRef const& tags_ = StringRef() ) noexcept;
-    StringRef name;
-    StringRef tags;
-};
-
-struct AutoReg : NonCopyable {
-    AutoReg( ITestInvoker* invoker, SourceLineInfo const& lineInfo, StringRef const& classOrMethod, NameAndTags const& nameAndTags ) noexcept;
-    ~AutoReg();
-};
-
-} // end namespace Catch
-
-#if defined(CATCH_CONFIG_DISABLE)
-    #define INTERNAL_CATCH_TESTCASE_NO_REGISTRATION( TestName, ... ) \
-        static void TestName()
-    #define INTERNAL_CATCH_TESTCASE_METHOD_NO_REGISTRATION( TestName, ClassName, ... ) \
-        namespace{                        \
-            struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName) { \
-                void test();              \
-            };                            \
-        }                                 \
-        void TestName::test()
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( TestName, TestFunc, Name, Tags, Signature, ... )  \
-        INTERNAL_CATCH_DEFINE_SIG_TEST(TestFunc, INTERNAL_CATCH_REMOVE_PARENS(Signature))
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( TestNameClass, TestName, ClassName, Name, Tags, Signature, ... )    \
-        namespace{                                                                                  \
-            namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName) {                                      \
-            INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD(TestName, ClassName, INTERNAL_CATCH_REMOVE_PARENS(Signature));\
-        }                                                                                           \
-        }                                                                                           \
-        INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD(TestName, INTERNAL_CATCH_REMOVE_PARENS(Signature))
-
-    #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(Name, Tags, ...) \
-            INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, typename TestType, __VA_ARGS__ )
-    #else
-        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(Name, Tags, ...) \
-            INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, typename TestType, __VA_ARGS__ ) )
-    #endif
-
-    #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(Name, Tags, Signature, ...) \
-            INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, Signature, __VA_ARGS__ )
-    #else
-        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(Name, Tags, Signature, ...) \
-            INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, Signature, __VA_ARGS__ ) )
-    #endif
-
-    #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION( ClassName, Name, Tags,... ) \
-            INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____C_L_A_S_S____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ) , ClassName, Name, Tags, typename T, __VA_ARGS__ )
-    #else
-        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION( ClassName, Name, Tags,... ) \
-            INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____C_L_A_S_S____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ) , ClassName, Name, Tags, typename T, __VA_ARGS__ ) )
-    #endif
-
-    #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION( ClassName, Name, Tags, Signature, ... ) \
-            INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____C_L_A_S_S____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ) , ClassName, Name, Tags, Signature, __VA_ARGS__ )
-    #else
-        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION( ClassName, Name, Tags, Signature, ... ) \
-            INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____C_L_A_S_S____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ) , ClassName, Name, Tags, Signature, __VA_ARGS__ ) )
-    #endif
-#endif
-
-    ///////////////////////////////////////////////////////////////////////////////
-    #define INTERNAL_CATCH_TESTCASE2( TestName, ... ) \
-        static void TestName(); \
-        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-        namespace{ Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( Catch::makeTestInvoker( &TestName ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ __VA_ARGS__ } ); } /* NOLINT */ \
-        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
-        static void TestName()
-    #define INTERNAL_CATCH_TESTCASE( ... ) \
-        INTERNAL_CATCH_TESTCASE2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), __VA_ARGS__ )
-
-    ///////////////////////////////////////////////////////////////////////////////
-    #define INTERNAL_CATCH_METHOD_AS_TEST_CASE( QualifiedMethod, ... ) \
-        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-        namespace{ Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( Catch::makeTestInvoker( &QualifiedMethod ), CATCH_INTERNAL_LINEINFO, "&" #QualifiedMethod, Catch::NameAndTags{ __VA_ARGS__ } ); } /* NOLINT */ \
-        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
-
-    ///////////////////////////////////////////////////////////////////////////////
-    #define INTERNAL_CATCH_TEST_CASE_METHOD2( TestName, ClassName, ... )\
-        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-        namespace{ \
-            struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName) { \
-                void test(); \
-            }; \
-            Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar ) ( Catch::makeTestInvoker( &TestName::test ), CATCH_INTERNAL_LINEINFO, #ClassName, Catch::NameAndTags{ __VA_ARGS__ } ); /* NOLINT */ \
-        } \
-        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
-        void TestName::test()
-    #define INTERNAL_CATCH_TEST_CASE_METHOD( ClassName, ... ) \
-        INTERNAL_CATCH_TEST_CASE_METHOD2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), ClassName, __VA_ARGS__ )
-
-    ///////////////////////////////////////////////////////////////////////////////
-    #define INTERNAL_CATCH_REGISTER_TESTCASE( Function, ... ) \
-        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-        Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( Catch::makeTestInvoker( Function ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ __VA_ARGS__ } ); /* NOLINT */ \
-        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
-
-    ///////////////////////////////////////////////////////////////////////////////
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_2(TestName, TestFunc, Name, Tags, Signature, ... )\
-        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-        CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS \
-        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
-        INTERNAL_CATCH_DECLARE_SIG_TEST(TestFunc, INTERNAL_CATCH_REMOVE_PARENS(Signature));\
-        namespace {\
-        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName){\
-            INTERNAL_CATCH_TYPE_GEN\
-            INTERNAL_CATCH_NTTP_GEN(INTERNAL_CATCH_REMOVE_PARENS(Signature))\
-            INTERNAL_CATCH_NTTP_REG_GEN(TestFunc,INTERNAL_CATCH_REMOVE_PARENS(Signature))\
-            template<typename...Types> \
-            struct TestName{\
-                TestName(){\
-                    int index = 0;                                    \
-                    constexpr char const* tmpl_types[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, __VA_ARGS__)};\
-                    using expander = int[];\
-                    (void)expander{(reg_test(Types{}, Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index]), Tags } ), index++, 0)... };/* NOLINT */ \
-                }\
-            };\
-            static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){\
-            TestName<INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(__VA_ARGS__)>();\
-            return 0;\
-        }();\
-        }\
-        }\
-        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
-        INTERNAL_CATCH_DEFINE_SIG_TEST(TestFunc,INTERNAL_CATCH_REMOVE_PARENS(Signature))
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE(Name, Tags, ...) \
-        INTERNAL_CATCH_TEMPLATE_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, typename TestType, __VA_ARGS__ )
-#else
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE(Name, Tags, ...) \
-        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, typename TestType, __VA_ARGS__ ) )
-#endif
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG(Name, Tags, Signature, ...) \
-        INTERNAL_CATCH_TEMPLATE_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, Signature, __VA_ARGS__ )
-#else
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG(Name, Tags, Signature, ...) \
-        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, Signature, __VA_ARGS__ ) )
-#endif
-
-    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2(TestName, TestFuncName, Name, Tags, Signature, TmplTypes, TypesList) \
-        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION                      \
-        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS                      \
-        CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS                \
-        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS              \
-        template<typename TestType> static void TestFuncName();       \
-        namespace {\
-        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName) {                                     \
-            INTERNAL_CATCH_TYPE_GEN                                                  \
-            INTERNAL_CATCH_NTTP_GEN(INTERNAL_CATCH_REMOVE_PARENS(Signature))         \
-            template<typename... Types>                               \
-            struct TestName {                                         \
-                void reg_tests() {                                          \
-                    int index = 0;                                    \
-                    using expander = int[];                           \
-                    constexpr char const* tmpl_types[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, INTERNAL_CATCH_REMOVE_PARENS(TmplTypes))};\
-                    constexpr char const* types_list[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, INTERNAL_CATCH_REMOVE_PARENS(TypesList))};\
-                    constexpr auto num_types = sizeof(types_list) / sizeof(types_list[0]);\
-                    (void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestFuncName<Types> ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index / num_types]) + "<" + std::string(types_list[index % num_types]) + ">", Tags } ), index++, 0)... };/* NOLINT */\
-                }                                                     \
-            };                                                        \
-            static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){ \
-                using TestInit = typename create<TestName, decltype(get_wrapper<INTERNAL_CATCH_REMOVE_PARENS(TmplTypes)>()), TypeList<INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(INTERNAL_CATCH_REMOVE_PARENS(TypesList))>>::type; \
-                TestInit t;                                           \
-                t.reg_tests();                                        \
-                return 0;                                             \
-            }();                                                      \
-        }                                                             \
-        }                                                             \
-        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION                       \
-        template<typename TestType>                                   \
-        static void TestFuncName()
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE(Name, Tags, ...)\
-        INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, typename T,__VA_ARGS__)
-#else
-    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE(Name, Tags, ...)\
-        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, typename T, __VA_ARGS__ ) )
-#endif
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG(Name, Tags, Signature, ...)\
-        INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, Signature, __VA_ARGS__)
-#else
-    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG(Name, Tags, Signature, ...)\
-        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, Signature, __VA_ARGS__ ) )
-#endif
-
-    #define INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_2(TestName, TestFunc, Name, Tags, TmplList)\
-        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
-        template<typename TestType> static void TestFunc();       \
-        namespace {\
-        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName){\
-        INTERNAL_CATCH_TYPE_GEN\
-        template<typename... Types>                               \
-        struct TestName {                                         \
-            void reg_tests() {                                          \
-                int index = 0;                                    \
-                using expander = int[];                           \
-                (void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestFunc<Types> ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ Name " - " + std::string(INTERNAL_CATCH_STRINGIZE(TmplList)) + " - " + std::to_string(index), Tags } ), index++, 0)... };/* NOLINT */\
-            }                                                     \
-        };\
-        static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){ \
-                using TestInit = typename convert<TestName, TmplList>::type; \
-                TestInit t;                                           \
-                t.reg_tests();                                        \
-                return 0;                                             \
-            }();                                                      \
-        }}\
-        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION                       \
-        template<typename TestType>                                   \
-        static void TestFunc()
-
-    #define INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE(Name, Tags, TmplList) \
-        INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, TmplList )
-
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( TestNameClass, TestName, ClassName, Name, Tags, Signature, ... ) \
-        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-        CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS \
-        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
-        namespace {\
-        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName){ \
-            INTERNAL_CATCH_TYPE_GEN\
-            INTERNAL_CATCH_NTTP_GEN(INTERNAL_CATCH_REMOVE_PARENS(Signature))\
-            INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD(TestName, ClassName, INTERNAL_CATCH_REMOVE_PARENS(Signature));\
-            INTERNAL_CATCH_NTTP_REG_METHOD_GEN(TestName, INTERNAL_CATCH_REMOVE_PARENS(Signature))\
-            template<typename...Types> \
-            struct TestNameClass{\
-                TestNameClass(){\
-                    int index = 0;                                    \
-                    constexpr char const* tmpl_types[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, __VA_ARGS__)};\
-                    using expander = int[];\
-                    (void)expander{(reg_test(Types{}, #ClassName, Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index]), Tags } ), index++, 0)... };/* NOLINT */ \
-                }\
-            };\
-            static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){\
-                TestNameClass<INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(__VA_ARGS__)>();\
-                return 0;\
-        }();\
-        }\
-        }\
-        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
-        INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD(TestName, INTERNAL_CATCH_REMOVE_PARENS(Signature))
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( ClassName, Name, Tags,... ) \
-        INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____C_L_A_S_S____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ) , ClassName, Name, Tags, typename T, __VA_ARGS__ )
-#else
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( ClassName, Name, Tags,... ) \
-        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____C_L_A_S_S____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ) , ClassName, Name, Tags, typename T, __VA_ARGS__ ) )
-#endif
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( ClassName, Name, Tags, Signature, ... ) \
-        INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____C_L_A_S_S____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ) , ClassName, Name, Tags, Signature, __VA_ARGS__ )
-#else
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( ClassName, Name, Tags, Signature, ... ) \
-        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____C_L_A_S_S____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ) , ClassName, Name, Tags, Signature, __VA_ARGS__ ) )
-#endif
-
-    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2(TestNameClass, TestName, ClassName, Name, Tags, Signature, TmplTypes, TypesList)\
-        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-        CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS \
-        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
-        template<typename TestType> \
-            struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName <TestType>) { \
-                void test();\
-            };\
-        namespace {\
-        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestNameClass) {\
-            INTERNAL_CATCH_TYPE_GEN                  \
-            INTERNAL_CATCH_NTTP_GEN(INTERNAL_CATCH_REMOVE_PARENS(Signature))\
-            template<typename...Types>\
-            struct TestNameClass{\
-                void reg_tests(){\
-                    int index = 0;\
-                    using expander = int[];\
-                    constexpr char const* tmpl_types[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, INTERNAL_CATCH_REMOVE_PARENS(TmplTypes))};\
-                    constexpr char const* types_list[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, INTERNAL_CATCH_REMOVE_PARENS(TypesList))};\
-                    constexpr auto num_types = sizeof(types_list) / sizeof(types_list[0]);\
-                    (void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestName<Types>::test ), CATCH_INTERNAL_LINEINFO, #ClassName, Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index / num_types]) + "<" + std::string(types_list[index % num_types]) + ">", Tags } ), index++, 0)... };/* NOLINT */ \
-                }\
-            };\
-            static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){\
-                using TestInit = typename create<TestNameClass, decltype(get_wrapper<INTERNAL_CATCH_REMOVE_PARENS(TmplTypes)>()), TypeList<INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(INTERNAL_CATCH_REMOVE_PARENS(TypesList))>>::type;\
-                TestInit t;\
-                t.reg_tests();\
-                return 0;\
-            }(); \
-        }\
-        }\
-        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
-        template<typename TestType> \
-        void TestName<TestType>::test()
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( ClassName, Name, Tags, ... )\
-        INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), ClassName, Name, Tags, typename T, __VA_ARGS__ )
-#else
-    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( ClassName, Name, Tags, ... )\
-        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), ClassName, Name, Tags, typename T,__VA_ARGS__ ) )
-#endif
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( ClassName, Name, Tags, Signature, ... )\
-        INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), ClassName, Name, Tags, Signature, __VA_ARGS__ )
-#else
-    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( ClassName, Name, Tags, Signature, ... )\
-        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), ClassName, Name, Tags, Signature,__VA_ARGS__ ) )
-#endif
-
-    #define INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD_2( TestNameClass, TestName, ClassName, Name, Tags, TmplList) \
-        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
-        template<typename TestType> \
-        struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName <TestType>) { \
-            void test();\
-        };\
-        namespace {\
-        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName){ \
-            INTERNAL_CATCH_TYPE_GEN\
-            template<typename...Types>\
-            struct TestNameClass{\
-                void reg_tests(){\
-                    int index = 0;\
-                    using expander = int[];\
-                    (void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestName<Types>::test ), CATCH_INTERNAL_LINEINFO, #ClassName, Catch::NameAndTags{ Name " - " + std::string(INTERNAL_CATCH_STRINGIZE(TmplList)) + " - " + std::to_string(index), Tags } ), index++, 0)... };/* NOLINT */ \
-                }\
-            };\
-            static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){\
-                using TestInit = typename convert<TestNameClass, TmplList>::type;\
-                TestInit t;\
-                t.reg_tests();\
-                return 0;\
-            }(); \
-        }}\
-        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
-        template<typename TestType> \
-        void TestName<TestType>::test()
-
-#define INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD(ClassName, Name, Tags, TmplList) \
-        INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), ClassName, Name, Tags, TmplList )
-
-// end catch_test_registry.h
-// start catch_capture.hpp
-
-// start catch_assertionhandler.h
-
-// start catch_assertioninfo.h
-
-// start catch_result_type.h
-
-namespace Catch {
-
-    // ResultWas::OfType enum
-    struct ResultWas { enum OfType {
-        Unknown = -1,
-        Ok = 0,
-        Info = 1,
-        Warning = 2,
-
-        FailureBit = 0x10,
-
-        ExpressionFailed = FailureBit | 1,
-        ExplicitFailure = FailureBit | 2,
-
-        Exception = 0x100 | FailureBit,
-
-        ThrewException = Exception | 1,
-        DidntThrowException = Exception | 2,
-
-        FatalErrorCondition = 0x200 | FailureBit
-
-    }; };
-
-    bool isOk( ResultWas::OfType resultType );
-    bool isJustInfo( int flags );
-
-    // ResultDisposition::Flags enum
-    struct ResultDisposition { enum Flags {
-        Normal = 0x01,
-
-        ContinueOnFailure = 0x02,   // Failures fail test, but execution continues
-        FalseTest = 0x04,           // Prefix expression with !
-        SuppressFail = 0x08         // Failures are reported but do not fail the test
-    }; };
-
-    ResultDisposition::Flags operator | ( ResultDisposition::Flags lhs, ResultDisposition::Flags rhs );
-
-    bool shouldContinueOnFailure( int flags );
-    inline bool isFalseTest( int flags ) { return ( flags & ResultDisposition::FalseTest ) != 0; }
-    bool shouldSuppressFailure( int flags );
-
-} // end namespace Catch
-
-// end catch_result_type.h
-namespace Catch {
-
-    struct AssertionInfo
-    {
-        StringRef macroName;
-        SourceLineInfo lineInfo;
-        StringRef capturedExpression;
-        ResultDisposition::Flags resultDisposition;
-
-        // We want to delete this constructor but a compiler bug in 4.8 means
-        // the struct is then treated as non-aggregate
-        //AssertionInfo() = delete;
-    };
-
-} // end namespace Catch
-
-// end catch_assertioninfo.h
-// start catch_decomposer.h
-
-// start catch_tostring.h
-
-#include <vector>
-#include <cstddef>
-#include <type_traits>
-#include <string>
-// start catch_stream.h
-
-#include <iosfwd>
-#include <cstddef>
-#include <ostream>
-
-namespace Catch {
-
-    std::ostream& cout();
-    std::ostream& cerr();
-    std::ostream& clog();
-
-    class StringRef;
-
-    struct IStream {
-        virtual ~IStream();
-        virtual std::ostream& stream() const = 0;
-    };
-
-    auto makeStream( StringRef const &filename ) -> IStream const*;
-
-    class ReusableStringStream : NonCopyable {
-        std::size_t m_index;
-        std::ostream* m_oss;
-    public:
-        ReusableStringStream();
-        ~ReusableStringStream();
-
-        auto str() const -> std::string;
-
-        template<typename T>
-        auto operator << ( T const& value ) -> ReusableStringStream& {
-            *m_oss << value;
-            return *this;
-        }
-        auto get() -> std::ostream& { return *m_oss; }
-    };
-}
-
-// end catch_stream.h
-// start catch_interfaces_enum_values_registry.h
-
-#include <vector>
-
-namespace Catch {
-
-    namespace Detail {
-        struct EnumInfo {
-            StringRef m_name;
-            std::vector<std::pair<int, StringRef>> m_values;
-
-            ~EnumInfo();
-
-            StringRef lookup( int value ) const;
-        };
-    } // namespace Detail
-
-    struct IMutableEnumValuesRegistry {
-        virtual ~IMutableEnumValuesRegistry();
-
-        virtual Detail::EnumInfo const& registerEnum( StringRef enumName, StringRef allEnums, std::vector<int> const& values ) = 0;
-
-        template<typename E>
-        Detail::EnumInfo const& registerEnum( StringRef enumName, StringRef allEnums, std::initializer_list<E> values ) {
-            static_assert(sizeof(int) >= sizeof(E), "Cannot serialize enum to int");
-            std::vector<int> intValues;
-            intValues.reserve( values.size() );
-            for( auto enumValue : values )
-                intValues.push_back( static_cast<int>( enumValue ) );
-            return registerEnum( enumName, allEnums, intValues );
-        }
-    };
-
-} // Catch
-
-// end catch_interfaces_enum_values_registry.h
-
-#ifdef CATCH_CONFIG_CPP17_STRING_VIEW
-#include <string_view>
-#endif
-
-#ifdef __OBJC__
-// start catch_objc_arc.hpp
-
-#import <Foundation/Foundation.h>
-
-#ifdef __has_feature
-#define CATCH_ARC_ENABLED __has_feature(objc_arc)
-#else
-#define CATCH_ARC_ENABLED 0
-#endif
-
-void arcSafeRelease( NSObject* obj );
-id performOptionalSelector( id obj, SEL sel );
-
-#if !CATCH_ARC_ENABLED
-inline void arcSafeRelease( NSObject* obj ) {
-    [obj release];
-}
-inline id performOptionalSelector( id obj, SEL sel ) {
-    if( [obj respondsToSelector: sel] )
-        return [obj performSelector: sel];
-    return nil;
-}
-#define CATCH_UNSAFE_UNRETAINED
-#define CATCH_ARC_STRONG
-#else
-inline void arcSafeRelease( NSObject* ){}
-inline id performOptionalSelector( id obj, SEL sel ) {
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
-#endif
-    if( [obj respondsToSelector: sel] )
-        return [obj performSelector: sel];
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-    return nil;
-}
-#define CATCH_UNSAFE_UNRETAINED __unsafe_unretained
-#define CATCH_ARC_STRONG __strong
-#endif
-
-// end catch_objc_arc.hpp
-#endif
-
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable:4180) // We attempt to stream a function (address) by const&, which MSVC complains about but is harmless
-#endif
-
-namespace Catch {
-    namespace Detail {
-
-        extern const std::string unprintableString;
-
-        std::string rawMemoryToString( const void *object, std::size_t size );
-
-        template<typename T>
-        std::string rawMemoryToString( const T& object ) {
-          return rawMemoryToString( &object, sizeof(object) );
-        }
-
-        template<typename T>
-        class IsStreamInsertable {
-            template<typename Stream, typename U>
-            static auto test(int)
-                -> decltype(std::declval<Stream&>() << std::declval<U>(), std::true_type());
-
-            template<typename, typename>
-            static auto test(...)->std::false_type;
-
-        public:
-            static const bool value = decltype(test<std::ostream, const T&>(0))::value;
-        };
-
-        template<typename E>
-        std::string convertUnknownEnumToString( E e );
-
-        template<typename T>
-        typename std::enable_if<
-            !std::is_enum<T>::value && !std::is_base_of<std::exception, T>::value,
-        std::string>::type convertUnstreamable( T const& ) {
-            return Detail::unprintableString;
-        }
-        template<typename T>
-        typename std::enable_if<
-            !std::is_enum<T>::value && std::is_base_of<std::exception, T>::value,
-         std::string>::type convertUnstreamable(T const& ex) {
-            return ex.what();
-        }
-
-        template<typename T>
-        typename std::enable_if<
-            std::is_enum<T>::value
-        , std::string>::type convertUnstreamable( T const& value ) {
-            return convertUnknownEnumToString( value );
-        }
-
-#if defined(_MANAGED)
-        //! Convert a CLR string to a utf8 std::string
-        template<typename T>
-        std::string clrReferenceToString( T^ ref ) {
-            if (ref == nullptr)
-                return std::string("null");
-            auto bytes = System::Text::Encoding::UTF8->GetBytes(ref->ToString());
-            cli::pin_ptr<System::Byte> p = &bytes[0];
-            return std::string(reinterpret_cast<char const *>(p), bytes->Length);
-        }
-#endif
-
-    } // namespace Detail
-
-    // If we decide for C++14, change these to enable_if_ts
-    template <typename T, typename = void>
-    struct StringMaker {
-        template <typename Fake = T>
-        static
-        typename std::enable_if<::Catch::Detail::IsStreamInsertable<Fake>::value, std::string>::type
-            convert(const Fake& value) {
-                ReusableStringStream rss;
-                // NB: call using the function-like syntax to avoid ambiguity with
-                // user-defined templated operator<< under clang.
-                rss.operator<<(value);
-                return rss.str();
-        }
-
-        template <typename Fake = T>
-        static
-        typename std::enable_if<!::Catch::Detail::IsStreamInsertable<Fake>::value, std::string>::type
-            convert( const Fake& value ) {
-#if !defined(CATCH_CONFIG_FALLBACK_STRINGIFIER)
-            return Detail::convertUnstreamable(value);
-#else
-            return CATCH_CONFIG_FALLBACK_STRINGIFIER(value);
-#endif
-        }
-    };
-
-    namespace Detail {
-
-        // This function dispatches all stringification requests inside of Catch.
-        // Should be preferably called fully qualified, like ::Catch::Detail::stringify
-        template <typename T>
-        std::string stringify(const T& e) {
-            return ::Catch::StringMaker<typename std::remove_cv<typename std::remove_reference<T>::type>::type>::convert(e);
-        }
-
-        template<typename E>
-        std::string convertUnknownEnumToString( E e ) {
-            return ::Catch::Detail::stringify(static_cast<typename std::underlying_type<E>::type>(e));
-        }
-
-#if defined(_MANAGED)
-        template <typename T>
-        std::string stringify( T^ e ) {
-            return ::Catch::StringMaker<T^>::convert(e);
-        }
-#endif
-
-    } // namespace Detail
-
-    // Some predefined specializations
-
-    template<>
-    struct StringMaker<std::string> {
-        static std::string convert(const std::string& str);
-    };
-
-#ifdef CATCH_CONFIG_CPP17_STRING_VIEW
-    template<>
-    struct StringMaker<std::string_view> {
-        static std::string convert(std::string_view str);
-    };
-#endif
-
-    template<>
-    struct StringMaker<char const *> {
-        static std::string convert(char const * str);
-    };
-    template<>
-    struct StringMaker<char *> {
-        static std::string convert(char * str);
-    };
-
-#ifdef CATCH_CONFIG_WCHAR
-    template<>
-    struct StringMaker<std::wstring> {
-        static std::string convert(const std::wstring& wstr);
-    };
-
-# ifdef CATCH_CONFIG_CPP17_STRING_VIEW
-    template<>
-    struct StringMaker<std::wstring_view> {
-        static std::string convert(std::wstring_view str);
-    };
-# endif
-
-    template<>
-    struct StringMaker<wchar_t const *> {
-        static std::string convert(wchar_t const * str);
-    };
-    template<>
-    struct StringMaker<wchar_t *> {
-        static std::string convert(wchar_t * str);
-    };
-#endif
-
-    // TBD: Should we use `strnlen` to ensure that we don't go out of the buffer,
-    //      while keeping string semantics?
-    template<int SZ>
-    struct StringMaker<char[SZ]> {
-        static std::string convert(char const* str) {
-            return ::Catch::Detail::stringify(std::string{ str });
-        }
-    };
-    template<int SZ>
-    struct StringMaker<signed char[SZ]> {
-        static std::string convert(signed char const* str) {
-            return ::Catch::Detail::stringify(std::string{ reinterpret_cast<char const *>(str) });
-        }
-    };
-    template<int SZ>
-    struct StringMaker<unsigned char[SZ]> {
-        static std::string convert(unsigned char const* str) {
-            return ::Catch::Detail::stringify(std::string{ reinterpret_cast<char const *>(str) });
-        }
-    };
-
-#if defined(CATCH_CONFIG_CPP17_BYTE)
-    template<>
-    struct StringMaker<std::byte> {
-        static std::string convert(std::byte value);
-    };
-#endif // defined(CATCH_CONFIG_CPP17_BYTE)
-    template<>
-    struct StringMaker<int> {
-        static std::string convert(int value);
-    };
-    template<>
-    struct StringMaker<long> {
-        static std::string convert(long value);
-    };
-    template<>
-    struct StringMaker<long long> {
-        static std::string convert(long long value);
-    };
-    template<>
-    struct StringMaker<unsigned int> {
-        static std::string convert(unsigned int value);
-    };
-    template<>
-    struct StringMaker<unsigned long> {
-        static std::string convert(unsigned long value);
-    };
-    template<>
-    struct StringMaker<unsigned long long> {
-        static std::string convert(unsigned long long value);
-    };
-
-    template<>
-    struct StringMaker<bool> {
-        static std::string convert(bool b);
-    };
-
-    template<>
-    struct StringMaker<char> {
-        static std::string convert(char c);
-    };
-    template<>
-    struct StringMaker<signed char> {
-        static std::string convert(signed char c);
-    };
-    template<>
-    struct StringMaker<unsigned char> {
-        static std::string convert(unsigned char c);
-    };
-
-    template<>
-    struct StringMaker<std::nullptr_t> {
-        static std::string convert(std::nullptr_t);
-    };
-
-    template<>
-    struct StringMaker<float> {
-        static std::string convert(float value);
-        static int precision;
-    };
-
-    template<>
-    struct StringMaker<double> {
-        static std::string convert(double value);
-        static int precision;
-    };
-
-    template <typename T>
-    struct StringMaker<T*> {
-        template <typename U>
-        static std::string convert(U* p) {
-            if (p) {
-                return ::Catch::Detail::rawMemoryToString(p);
-            } else {
-                return "nullptr";
-            }
-        }
-    };
-
-    template <typename R, typename C>
-    struct StringMaker<R C::*> {
-        static std::string convert(R C::* p) {
-            if (p) {
-                return ::Catch::Detail::rawMemoryToString(p);
-            } else {
-                return "nullptr";
-            }
-        }
-    };
-
-#if defined(_MANAGED)
-    template <typename T>
-    struct StringMaker<T^> {
-        static std::string convert( T^ ref ) {
-            return ::Catch::Detail::clrReferenceToString(ref);
-        }
-    };
-#endif
-
-    namespace Detail {
-        template<typename InputIterator>
-        std::string rangeToString(InputIterator first, InputIterator last) {
-            ReusableStringStream rss;
-            rss << "{ ";
-            if (first != last) {
-                rss << ::Catch::Detail::stringify(*first);
-                for (++first; first != last; ++first)
-                    rss << ", " << ::Catch::Detail::stringify(*first);
-            }
-            rss << " }";
-            return rss.str();
-        }
-    }
-
-#ifdef __OBJC__
-    template<>
-    struct StringMaker<NSString*> {
-        static std::string convert(NSString * nsstring) {
-            if (!nsstring)
-                return "nil";
-            return std::string("@") + [nsstring UTF8String];
-        }
-    };
-    template<>
-    struct StringMaker<NSObject*> {
-        static std::string convert(NSObject* nsObject) {
-            return ::Catch::Detail::stringify([nsObject description]);
-        }
-
-    };
-    namespace Detail {
-        inline std::string stringify( NSString* nsstring ) {
-            return StringMaker<NSString*>::convert( nsstring );
-        }
-
-    } // namespace Detail
-#endif // __OBJC__
-
-} // namespace Catch
-
-//////////////////////////////////////////////////////
-// Separate std-lib types stringification, so it can be selectively enabled
-// This means that we do not bring in
-
-#if defined(CATCH_CONFIG_ENABLE_ALL_STRINGMAKERS)
-#  define CATCH_CONFIG_ENABLE_PAIR_STRINGMAKER
-#  define CATCH_CONFIG_ENABLE_TUPLE_STRINGMAKER
-#  define CATCH_CONFIG_ENABLE_VARIANT_STRINGMAKER
-#  define CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER
-#  define CATCH_CONFIG_ENABLE_OPTIONAL_STRINGMAKER
-#endif
-
-// Separate std::pair specialization
-#if defined(CATCH_CONFIG_ENABLE_PAIR_STRINGMAKER)
-#include <utility>
-namespace Catch {
-    template<typename T1, typename T2>
-    struct StringMaker<std::pair<T1, T2> > {
-        static std::string convert(const std::pair<T1, T2>& pair) {
-            ReusableStringStream rss;
-            rss << "{ "
-                << ::Catch::Detail::stringify(pair.first)
-                << ", "
-                << ::Catch::Detail::stringify(pair.second)
-                << " }";
-            return rss.str();
-        }
-    };
-}
-#endif // CATCH_CONFIG_ENABLE_PAIR_STRINGMAKER
-
-#if defined(CATCH_CONFIG_ENABLE_OPTIONAL_STRINGMAKER) && defined(CATCH_CONFIG_CPP17_OPTIONAL)
-#include <optional>
-namespace Catch {
-    template<typename T>
-    struct StringMaker<std::optional<T> > {
-        static std::string convert(const std::optional<T>& optional) {
-            ReusableStringStream rss;
-            if (optional.has_value()) {
-                rss << ::Catch::Detail::stringify(*optional);
-            } else {
-                rss << "{ }";
-            }
-            return rss.str();
-        }
-    };
-}
-#endif // CATCH_CONFIG_ENABLE_OPTIONAL_STRINGMAKER
-
-// Separate std::tuple specialization
-#if defined(CATCH_CONFIG_ENABLE_TUPLE_STRINGMAKER)
-#include <tuple>
-namespace Catch {
-    namespace Detail {
-        template<
-            typename Tuple,
-            std::size_t N = 0,
-            bool = (N < std::tuple_size<Tuple>::value)
-            >
-            struct TupleElementPrinter {
-            static void print(const Tuple& tuple, std::ostream& os) {
-                os << (N ? ", " : " ")
-                    << ::Catch::Detail::stringify(std::get<N>(tuple));
-                TupleElementPrinter<Tuple, N + 1>::print(tuple, os);
-            }
-        };
-
-        template<
-            typename Tuple,
-            std::size_t N
-        >
-            struct TupleElementPrinter<Tuple, N, false> {
-            static void print(const Tuple&, std::ostream&) {}
-        };
-
-    }
-
-    template<typename ...Types>
-    struct StringMaker<std::tuple<Types...>> {
-        static std::string convert(const std::tuple<Types...>& tuple) {
-            ReusableStringStream rss;
-            rss << '{';
-            Detail::TupleElementPrinter<std::tuple<Types...>>::print(tuple, rss.get());
-            rss << " }";
-            return rss.str();
-        }
-    };
-}
-#endif // CATCH_CONFIG_ENABLE_TUPLE_STRINGMAKER
-
-#if defined(CATCH_CONFIG_ENABLE_VARIANT_STRINGMAKER) && defined(CATCH_CONFIG_CPP17_VARIANT)
-#include <variant>
-namespace Catch {
-    template<>
-    struct StringMaker<std::monostate> {
-        static std::string convert(const std::monostate&) {
-            return "{ }";
-        }
-    };
-
-    template<typename... Elements>
-    struct StringMaker<std::variant<Elements...>> {
-        static std::string convert(const std::variant<Elements...>& variant) {
-            if (variant.valueless_by_exception()) {
-                return "{valueless variant}";
-            } else {
-                return std::visit(
-                    [](const auto& value) {
-                        return ::Catch::Detail::stringify(value);
-                    },
-                    variant
-                );
-            }
-        }
-    };
-}
-#endif // CATCH_CONFIG_ENABLE_VARIANT_STRINGMAKER
-
-namespace Catch {
-    struct not_this_one {}; // Tag type for detecting which begin/ end are being selected
-
-    // Import begin/ end from std here so they are considered alongside the fallback (...) overloads in this namespace
-    using std::begin;
-    using std::end;
-
-    not_this_one begin( ... );
-    not_this_one end( ... );
-
-    template <typename T>
-    struct is_range {
-        static const bool value =
-            !std::is_same<decltype(begin(std::declval<T>())), not_this_one>::value &&
-            !std::is_same<decltype(end(std::declval<T>())), not_this_one>::value;
-    };
-
-#if defined(_MANAGED) // Managed types are never ranges
-    template <typename T>
-    struct is_range<T^> {
-        static const bool value = false;
-    };
-#endif
-
-    template<typename Range>
-    std::string rangeToString( Range const& range ) {
-        return ::Catch::Detail::rangeToString( begin( range ), end( range ) );
-    }
-
-    // Handle vector<bool> specially
-    template<typename Allocator>
-    std::string rangeToString( std::vector<bool, Allocator> const& v ) {
-        ReusableStringStream rss;
-        rss << "{ ";
-        bool first = true;
-        for( bool b : v ) {
-            if( first )
-                first = false;
-            else
-                rss << ", ";
-            rss << ::Catch::Detail::stringify( b );
-        }
-        rss << " }";
-        return rss.str();
-    }
-
-    template<typename R>
-    struct StringMaker<R, typename std::enable_if<is_range<R>::value && !::Catch::Detail::IsStreamInsertable<R>::value>::type> {
-        static std::string convert( R const& range ) {
-            return rangeToString( range );
-        }
-    };
-
-    template <typename T, int SZ>
-    struct StringMaker<T[SZ]> {
-        static std::string convert(T const(&arr)[SZ]) {
-            return rangeToString(arr);
-        }
-    };
-
-} // namespace Catch
-
-// Separate std::chrono::duration specialization
-#if defined(CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER)
-#include <ctime>
-#include <ratio>
-#include <chrono>
-
-namespace Catch {
-
-template <class Ratio>
-struct ratio_string {
-    static std::string symbol();
-};
-
-template <class Ratio>
-std::string ratio_string<Ratio>::symbol() {
-    Catch::ReusableStringStream rss;
-    rss << '[' << Ratio::num << '/'
-        << Ratio::den << ']';
-    return rss.str();
-}
-template <>
-struct ratio_string<std::atto> {
-    static std::string symbol();
-};
-template <>
-struct ratio_string<std::femto> {
-    static std::string symbol();
-};
-template <>
-struct ratio_string<std::pico> {
-    static std::string symbol();
-};
-template <>
-struct ratio_string<std::nano> {
-    static std::string symbol();
-};
-template <>
-struct ratio_string<std::micro> {
-    static std::string symbol();
-};
-template <>
-struct ratio_string<std::milli> {
-    static std::string symbol();
-};
-
-    ////////////
-    // std::chrono::duration specializations
-    template<typename Value, typename Ratio>
-    struct StringMaker<std::chrono::duration<Value, Ratio>> {
-        static std::string convert(std::chrono::duration<Value, Ratio> const& duration) {
-            ReusableStringStream rss;
-            rss << duration.count() << ' ' << ratio_string<Ratio>::symbol() << 's';
-            return rss.str();
-        }
-    };
-    template<typename Value>
-    struct StringMaker<std::chrono::duration<Value, std::ratio<1>>> {
-        static std::string convert(std::chrono::duration<Value, std::ratio<1>> const& duration) {
-            ReusableStringStream rss;
-            rss << duration.count() << " s";
-            return rss.str();
-        }
-    };
-    template<typename Value>
-    struct StringMaker<std::chrono::duration<Value, std::ratio<60>>> {
-        static std::string convert(std::chrono::duration<Value, std::ratio<60>> const& duration) {
-            ReusableStringStream rss;
-            rss << duration.count() << " m";
-            return rss.str();
-        }
-    };
-    template<typename Value>
-    struct StringMaker<std::chrono::duration<Value, std::ratio<3600>>> {
-        static std::string convert(std::chrono::duration<Value, std::ratio<3600>> const& duration) {
-            ReusableStringStream rss;
-            rss << duration.count() << " h";
-            return rss.str();
-        }
-    };
-
-    ////////////
-    // std::chrono::time_point specialization
-    // Generic time_point cannot be specialized, only std::chrono::time_point<system_clock>
-    template<typename Clock, typename Duration>
-    struct StringMaker<std::chrono::time_point<Clock, Duration>> {
-        static std::string convert(std::chrono::time_point<Clock, Duration> const& time_point) {
-            return ::Catch::Detail::stringify(time_point.time_since_epoch()) + " since epoch";
-        }
-    };
-    // std::chrono::time_point<system_clock> specialization
-    template<typename Duration>
-    struct StringMaker<std::chrono::time_point<std::chrono::system_clock, Duration>> {
-        static std::string convert(std::chrono::time_point<std::chrono::system_clock, Duration> const& time_point) {
-            auto converted = std::chrono::system_clock::to_time_t(time_point);
-
-#ifdef _MSC_VER
-            std::tm timeInfo = {};
-            gmtime_s(&timeInfo, &converted);
-#else
-            std::tm* timeInfo = std::gmtime(&converted);
-#endif
-
-            auto const timeStampSize = sizeof("2017-01-16T17:06:45Z");
-            char timeStamp[timeStampSize];
-            const char * const fmt = "%Y-%m-%dT%H:%M:%SZ";
-
-#ifdef _MSC_VER
-            std::strftime(timeStamp, timeStampSize, fmt, &timeInfo);
-#else
-            std::strftime(timeStamp, timeStampSize, fmt, timeInfo);
-#endif
-            return std::string(timeStamp);
-        }
-    };
-}
-#endif // CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER
-
-#define INTERNAL_CATCH_REGISTER_ENUM( enumName, ... ) \
-namespace Catch { \
-    template<> struct StringMaker<enumName> { \
-        static std::string convert( enumName value ) { \
-            static const auto& enumInfo = ::Catch::getMutableRegistryHub().getMutableEnumValuesRegistry().registerEnum( #enumName, #__VA_ARGS__, { __VA_ARGS__ } ); \
-            return static_cast<std::string>(enumInfo.lookup( static_cast<int>( value ) )); \
-        } \
-    }; \
-}
-
-#define CATCH_REGISTER_ENUM( enumName, ... ) INTERNAL_CATCH_REGISTER_ENUM( enumName, __VA_ARGS__ )
-
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
-// end catch_tostring.h
-#include <iosfwd>
-
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable:4389) // '==' : signed/unsigned mismatch
-#pragma warning(disable:4018) // more "signed/unsigned mismatch"
-#pragma warning(disable:4312) // Converting int to T* using reinterpret_cast (issue on x64 platform)
-#pragma warning(disable:4180) // qualifier applied to function type has no meaning
-#pragma warning(disable:4800) // Forcing result to true or false
-#endif
-
-namespace Catch {
-
-    struct ITransientExpression {
-        auto isBinaryExpression() const -> bool { return m_isBinaryExpression; }
-        auto getResult() const -> bool { return m_result; }
-        virtual void streamReconstructedExpression( std::ostream &os ) const = 0;
-
-        ITransientExpression( bool isBinaryExpression, bool result )
-        :   m_isBinaryExpression( isBinaryExpression ),
-            m_result( result )
-        {}
-
-        // We don't actually need a virtual destructor, but many static analyzers
-        // complain if it's not here :-(
-        virtual ~ITransientExpression();
-
-        bool m_isBinaryExpression;
-        bool m_result;
-
-    };
-
-    void formatReconstructedExpression( std::ostream &os, std::string const& lhs, StringRef op, std::string const& rhs );
-
-    template<typename LhsT, typename RhsT>
-    class BinaryExpr  : public ITransientExpression {
-        LhsT m_lhs;
-        StringRef m_op;
-        RhsT m_rhs;
-
-        void streamReconstructedExpression( std::ostream &os ) const override {
-            formatReconstructedExpression
-                    ( os, Catch::Detail::stringify( m_lhs ), m_op, Catch::Detail::stringify( m_rhs ) );
-        }
-
-    public:
-        BinaryExpr( bool comparisonResult, LhsT lhs, StringRef op, RhsT rhs )
-        :   ITransientExpression{ true, comparisonResult },
-            m_lhs( lhs ),
-            m_op( op ),
-            m_rhs( rhs )
-        {}
-
-        template<typename T>
-        auto operator && ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
-            static_assert(always_false<T>::value,
-            "chained comparisons are not supported inside assertions, "
-            "wrap the expression inside parentheses, or decompose it");
-        }
-
-        template<typename T>
-        auto operator || ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
-            static_assert(always_false<T>::value,
-            "chained comparisons are not supported inside assertions, "
-            "wrap the expression inside parentheses, or decompose it");
-        }
-
-        template<typename T>
-        auto operator == ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
-            static_assert(always_false<T>::value,
-            "chained comparisons are not supported inside assertions, "
-            "wrap the expression inside parentheses, or decompose it");
-        }
-
-        template<typename T>
-        auto operator != ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
-            static_assert(always_false<T>::value,
-            "chained comparisons are not supported inside assertions, "
-            "wrap the expression inside parentheses, or decompose it");
-        }
-
-        template<typename T>
-        auto operator > ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
-            static_assert(always_false<T>::value,
-            "chained comparisons are not supported inside assertions, "
-            "wrap the expression inside parentheses, or decompose it");
-        }
-
-        template<typename T>
-        auto operator < ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
-            static_assert(always_false<T>::value,
-            "chained comparisons are not supported inside assertions, "
-            "wrap the expression inside parentheses, or decompose it");
-        }
-
-        template<typename T>
-        auto operator >= ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
-            static_assert(always_false<T>::value,
-            "chained comparisons are not supported inside assertions, "
-            "wrap the expression inside parentheses, or decompose it");
-        }
-
-        template<typename T>
-        auto operator <= ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
-            static_assert(always_false<T>::value,
-            "chained comparisons are not supported inside assertions, "
-            "wrap the expression inside parentheses, or decompose it");
-        }
-    };
-
-    template<typename LhsT>
-    class UnaryExpr : public ITransientExpression {
-        LhsT m_lhs;
-
-        void streamReconstructedExpression( std::ostream &os ) const override {
-            os << Catch::Detail::stringify( m_lhs );
-        }
-
-    public:
-        explicit UnaryExpr( LhsT lhs )
-        :   ITransientExpression{ false, static_cast<bool>(lhs) },
-            m_lhs( lhs )
-        {}
-    };
-
-    // Specialised comparison functions to handle equality comparisons between ints and pointers (NULL deduces as an int)
-    template<typename LhsT, typename RhsT>
-    auto compareEqual( LhsT const& lhs, RhsT const& rhs ) -> bool { return static_cast<bool>(lhs == rhs); }
-    template<typename T>
-    auto compareEqual( T* const& lhs, int rhs ) -> bool { return lhs == reinterpret_cast<void const*>( rhs ); }
-    template<typename T>
-    auto compareEqual( T* const& lhs, long rhs ) -> bool { return lhs == reinterpret_cast<void const*>( rhs ); }
-    template<typename T>
-    auto compareEqual( int lhs, T* const& rhs ) -> bool { return reinterpret_cast<void const*>( lhs ) == rhs; }
-    template<typename T>
-    auto compareEqual( long lhs, T* const& rhs ) -> bool { return reinterpret_cast<void const*>( lhs ) == rhs; }
-
-    template<typename LhsT, typename RhsT>
-    auto compareNotEqual( LhsT const& lhs, RhsT&& rhs ) -> bool { return static_cast<bool>(lhs != rhs); }
-    template<typename T>
-    auto compareNotEqual( T* const& lhs, int rhs ) -> bool { return lhs != reinterpret_cast<void const*>( rhs ); }
-    template<typename T>
-    auto compareNotEqual( T* const& lhs, long rhs ) -> bool { return lhs != reinterpret_cast<void const*>( rhs ); }
-    template<typename T>
-    auto compareNotEqual( int lhs, T* const& rhs ) -> bool { return reinterpret_cast<void const*>( lhs ) != rhs; }
-    template<typename T>
-    auto compareNotEqual( long lhs, T* const& rhs ) -> bool { return reinterpret_cast<void const*>( lhs ) != rhs; }
-
-    template<typename LhsT>
-    class ExprLhs {
-        LhsT m_lhs;
-    public:
-        explicit ExprLhs( LhsT lhs ) : m_lhs( lhs ) {}
-
-        template<typename RhsT>
-        auto operator == ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
-            return { compareEqual( m_lhs, rhs ), m_lhs, "==", rhs };
-        }
-        auto operator == ( bool rhs ) -> BinaryExpr<LhsT, bool> const {
-            return { m_lhs == rhs, m_lhs, "==", rhs };
-        }
-
-        template<typename RhsT>
-        auto operator != ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
-            return { compareNotEqual( m_lhs, rhs ), m_lhs, "!=", rhs };
-        }
-        auto operator != ( bool rhs ) -> BinaryExpr<LhsT, bool> const {
-            return { m_lhs != rhs, m_lhs, "!=", rhs };
-        }
-
-        template<typename RhsT>
-        auto operator > ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
-            return { static_cast<bool>(m_lhs > rhs), m_lhs, ">", rhs };
-        }
-        template<typename RhsT>
-        auto operator < ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
-            return { static_cast<bool>(m_lhs < rhs), m_lhs, "<", rhs };
-        }
-        template<typename RhsT>
-        auto operator >= ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
-            return { static_cast<bool>(m_lhs >= rhs), m_lhs, ">=", rhs };
-        }
-        template<typename RhsT>
-        auto operator <= ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
-            return { static_cast<bool>(m_lhs <= rhs), m_lhs, "<=", rhs };
-        }
-        template <typename RhsT>
-        auto operator | (RhsT const& rhs) -> BinaryExpr<LhsT, RhsT const&> const {
-            return { static_cast<bool>(m_lhs | rhs), m_lhs, "|", rhs };
-        }
-        template <typename RhsT>
-        auto operator & (RhsT const& rhs) -> BinaryExpr<LhsT, RhsT const&> const {
-            return { static_cast<bool>(m_lhs & rhs), m_lhs, "&", rhs };
-        }
-        template <typename RhsT>
-        auto operator ^ (RhsT const& rhs) -> BinaryExpr<LhsT, RhsT const&> const {
-            return { static_cast<bool>(m_lhs ^ rhs), m_lhs, "^", rhs };
-        }
-
-        template<typename RhsT>
-        auto operator && ( RhsT const& ) -> BinaryExpr<LhsT, RhsT const&> const {
-            static_assert(always_false<RhsT>::value,
-            "operator&& is not supported inside assertions, "
-            "wrap the expression inside parentheses, or decompose it");
-        }
-
-        template<typename RhsT>
-        auto operator || ( RhsT const& ) -> BinaryExpr<LhsT, RhsT const&> const {
-            static_assert(always_false<RhsT>::value,
-            "operator|| is not supported inside assertions, "
-            "wrap the expression inside parentheses, or decompose it");
-        }
-
-        auto makeUnaryExpr() const -> UnaryExpr<LhsT> {
-            return UnaryExpr<LhsT>{ m_lhs };
-        }
-    };
-
-    void handleExpression( ITransientExpression const& expr );
-
-    template<typename T>
-    void handleExpression( ExprLhs<T> const& expr ) {
-        handleExpression( expr.makeUnaryExpr() );
-    }
-
-    struct Decomposer {
-        template<typename T>
-        auto operator <= ( T const& lhs ) -> ExprLhs<T const&> {
-            return ExprLhs<T const&>{ lhs };
-        }
-
-        auto operator <=( bool value ) -> ExprLhs<bool> {
-            return ExprLhs<bool>{ value };
-        }
-    };
-
-} // end namespace Catch
-
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
-// end catch_decomposer.h
-// start catch_interfaces_capture.h
-
-#include <string>
-#include <chrono>
-
-namespace Catch {
-
-    class AssertionResult;
-    struct AssertionInfo;
-    struct SectionInfo;
-    struct SectionEndInfo;
-    struct MessageInfo;
-    struct MessageBuilder;
-    struct Counts;
-    struct AssertionReaction;
-    struct SourceLineInfo;
-
-    struct ITransientExpression;
-    struct IGeneratorTracker;
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-    struct BenchmarkInfo;
-    template <typename Duration = std::chrono::duration<double, std::nano>>
-    struct BenchmarkStats;
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-    struct IResultCapture {
-
-        virtual ~IResultCapture();
-
-        virtual bool sectionStarted(    SectionInfo const& sectionInfo,
-                                        Counts& assertions ) = 0;
-        virtual void sectionEnded( SectionEndInfo const& endInfo ) = 0;
-        virtual void sectionEndedEarly( SectionEndInfo const& endInfo ) = 0;
-
-        virtual auto acquireGeneratorTracker( SourceLineInfo const& lineInfo ) -> IGeneratorTracker& = 0;
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-        virtual void benchmarkPreparing( std::string const& name ) = 0;
-        virtual void benchmarkStarting( BenchmarkInfo const& info ) = 0;
-        virtual void benchmarkEnded( BenchmarkStats<> const& stats ) = 0;
-        virtual void benchmarkFailed( std::string const& error ) = 0;
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-        virtual void pushScopedMessage( MessageInfo const& message ) = 0;
-        virtual void popScopedMessage( MessageInfo const& message ) = 0;
-
-        virtual void emplaceUnscopedMessage( MessageBuilder const& builder ) = 0;
-
-        virtual void handleFatalErrorCondition( StringRef message ) = 0;
-
-        virtual void handleExpr
-                (   AssertionInfo const& info,
-                    ITransientExpression const& expr,
-                    AssertionReaction& reaction ) = 0;
-        virtual void handleMessage
-                (   AssertionInfo const& info,
-                    ResultWas::OfType resultType,
-                    StringRef const& message,
-                    AssertionReaction& reaction ) = 0;
-        virtual void handleUnexpectedExceptionNotThrown
-                (   AssertionInfo const& info,
-                    AssertionReaction& reaction ) = 0;
-        virtual void handleUnexpectedInflightException
-                (   AssertionInfo const& info,
-                    std::string const& message,
-                    AssertionReaction& reaction ) = 0;
-        virtual void handleIncomplete
-                (   AssertionInfo const& info ) = 0;
-        virtual void handleNonExpr
-                (   AssertionInfo const &info,
-                    ResultWas::OfType resultType,
-                    AssertionReaction &reaction ) = 0;
-
-        virtual bool lastAssertionPassed() = 0;
-        virtual void assertionPassed() = 0;
-
-        // Deprecated, do not use:
-        virtual std::string getCurrentTestName() const = 0;
-        virtual const AssertionResult* getLastResult() const = 0;
-        virtual void exceptionEarlyReported() = 0;
-    };
-
-    IResultCapture& getResultCapture();
-}
-
-// end catch_interfaces_capture.h
-namespace Catch {
-
-    struct TestFailureException{};
-    struct AssertionResultData;
-    struct IResultCapture;
-    class RunContext;
-
-    class LazyExpression {
-        friend class AssertionHandler;
-        friend struct AssertionStats;
-        friend class RunContext;
-
-        ITransientExpression const* m_transientExpression = nullptr;
-        bool m_isNegated;
-    public:
-        LazyExpression( bool isNegated );
-        LazyExpression( LazyExpression const& other );
-        LazyExpression& operator = ( LazyExpression const& ) = delete;
-
-        explicit operator bool() const;
-
-        friend auto operator << ( std::ostream& os, LazyExpression const& lazyExpr ) -> std::ostream&;
-    };
-
-    struct AssertionReaction {
-        bool shouldDebugBreak = false;
-        bool shouldThrow = false;
-    };
-
-    class AssertionHandler {
-        AssertionInfo m_assertionInfo;
-        AssertionReaction m_reaction;
-        bool m_completed = false;
-        IResultCapture& m_resultCapture;
-
-    public:
-        AssertionHandler
-            (   StringRef const& macroName,
-                SourceLineInfo const& lineInfo,
-                StringRef capturedExpression,
-                ResultDisposition::Flags resultDisposition );
-        ~AssertionHandler() {
-            if ( !m_completed ) {
-                m_resultCapture.handleIncomplete( m_assertionInfo );
-            }
-        }
-
-        template<typename T>
-        void handleExpr( ExprLhs<T> const& expr ) {
-            handleExpr( expr.makeUnaryExpr() );
-        }
-        void handleExpr( ITransientExpression const& expr );
-
-        void handleMessage(ResultWas::OfType resultType, StringRef const& message);
-
-        void handleExceptionThrownAsExpected();
-        void handleUnexpectedExceptionNotThrown();
-        void handleExceptionNotThrownAsExpected();
-        void handleThrowingCallSkipped();
-        void handleUnexpectedInflightException();
-
-        void complete();
-        void setCompleted();
-
-        // query
-        auto allowThrows() const -> bool;
-    };
-
-    void handleExceptionMatchExpr( AssertionHandler& handler, std::string const& str, StringRef const& matcherString );
-
-} // namespace Catch
-
-// end catch_assertionhandler.h
-// start catch_message.h
-
-#include <string>
-#include <vector>
-
-namespace Catch {
-
-    struct MessageInfo {
-        MessageInfo(    StringRef const& _macroName,
-                        SourceLineInfo const& _lineInfo,
-                        ResultWas::OfType _type );
-
-        StringRef macroName;
-        std::string message;
-        SourceLineInfo lineInfo;
-        ResultWas::OfType type;
-        unsigned int sequence;
-
-        bool operator == ( MessageInfo const& other ) const;
-        bool operator < ( MessageInfo const& other ) const;
-    private:
-        static unsigned int globalCount;
-    };
-
-    struct MessageStream {
-
-        template<typename T>
-        MessageStream& operator << ( T const& value ) {
-            m_stream << value;
-            return *this;
-        }
-
-        ReusableStringStream m_stream;
-    };
-
-    struct MessageBuilder : MessageStream {
-        MessageBuilder( StringRef const& macroName,
-                        SourceLineInfo const& lineInfo,
-                        ResultWas::OfType type );
-
-        template<typename T>
-        MessageBuilder& operator << ( T const& value ) {
-            m_stream << value;
-            return *this;
-        }
-
-        MessageInfo m_info;
-    };
-
-    class ScopedMessage {
-    public:
-        explicit ScopedMessage( MessageBuilder const& builder );
-        ScopedMessage( ScopedMessage& duplicate ) = delete;
-        ScopedMessage( ScopedMessage&& old );
-        ~ScopedMessage();
-
-        MessageInfo m_info;
-        bool m_moved;
-    };
-
-    class Capturer {
-        std::vector<MessageInfo> m_messages;
-        IResultCapture& m_resultCapture = getResultCapture();
-        size_t m_captured = 0;
-    public:
-        Capturer( StringRef macroName, SourceLineInfo const& lineInfo, ResultWas::OfType resultType, StringRef names );
-        ~Capturer();
-
-        void captureValue( size_t index, std::string const& value );
-
-        template<typename T>
-        void captureValues( size_t index, T const& value ) {
-            captureValue( index, Catch::Detail::stringify( value ) );
-        }
-
-        template<typename T, typename... Ts>
-        void captureValues( size_t index, T const& value, Ts const&... values ) {
-            captureValue( index, Catch::Detail::stringify(value) );
-            captureValues( index+1, values... );
-        }
-    };
-
-} // end namespace Catch
-
-// end catch_message.h
-#if !defined(CATCH_CONFIG_DISABLE)
-
-#if !defined(CATCH_CONFIG_DISABLE_STRINGIFICATION)
-  #define CATCH_INTERNAL_STRINGIFY(...) #__VA_ARGS__
-#else
-  #define CATCH_INTERNAL_STRINGIFY(...) "Disabled by CATCH_CONFIG_DISABLE_STRINGIFICATION"
-#endif
-
-#if defined(CATCH_CONFIG_FAST_COMPILE) || defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-
-///////////////////////////////////////////////////////////////////////////////
-// Another way to speed-up compilation is to omit local try-catch for REQUIRE*
-// macros.
-#define INTERNAL_CATCH_TRY
-#define INTERNAL_CATCH_CATCH( capturer )
-
-#else // CATCH_CONFIG_FAST_COMPILE
-
-#define INTERNAL_CATCH_TRY try
-#define INTERNAL_CATCH_CATCH( handler ) catch(...) { handler.handleUnexpectedInflightException(); }
-
-#endif
-
-#define INTERNAL_CATCH_REACT( handler ) handler.complete();
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_TEST( macroName, resultDisposition, ... ) \
-    do { \
-        CATCH_INTERNAL_IGNORE_BUT_WARN(__VA_ARGS__); \
-        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__), resultDisposition ); \
-        INTERNAL_CATCH_TRY { \
-            CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-            CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS \
-            catchAssertionHandler.handleExpr( Catch::Decomposer() <= __VA_ARGS__ ); \
-            CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
-        } INTERNAL_CATCH_CATCH( catchAssertionHandler ) \
-        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
-    } while( (void)0, (false) && static_cast<bool>( !!(__VA_ARGS__) ) )
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_IF( macroName, resultDisposition, ... ) \
-    INTERNAL_CATCH_TEST( macroName, resultDisposition, __VA_ARGS__ ); \
-    if( Catch::getResultCapture().lastAssertionPassed() )
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_ELSE( macroName, resultDisposition, ... ) \
-    INTERNAL_CATCH_TEST( macroName, resultDisposition, __VA_ARGS__ ); \
-    if( !Catch::getResultCapture().lastAssertionPassed() )
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_NO_THROW( macroName, resultDisposition, ... ) \
-    do { \
-        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__), resultDisposition ); \
-        try { \
-            static_cast<void>(__VA_ARGS__); \
-            catchAssertionHandler.handleExceptionNotThrownAsExpected(); \
-        } \
-        catch( ... ) { \
-            catchAssertionHandler.handleUnexpectedInflightException(); \
-        } \
-        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
-    } while( false )
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_THROWS( macroName, resultDisposition, ... ) \
-    do { \
-        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__), resultDisposition); \
-        if( catchAssertionHandler.allowThrows() ) \
-            try { \
-                static_cast<void>(__VA_ARGS__); \
-                catchAssertionHandler.handleUnexpectedExceptionNotThrown(); \
-            } \
-            catch( ... ) { \
-                catchAssertionHandler.handleExceptionThrownAsExpected(); \
-            } \
-        else \
-            catchAssertionHandler.handleThrowingCallSkipped(); \
-        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
-    } while( false )
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_THROWS_AS( macroName, exceptionType, resultDisposition, expr ) \
-    do { \
-        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(expr) ", " CATCH_INTERNAL_STRINGIFY(exceptionType), resultDisposition ); \
-        if( catchAssertionHandler.allowThrows() ) \
-            try { \
-                static_cast<void>(expr); \
-                catchAssertionHandler.handleUnexpectedExceptionNotThrown(); \
-            } \
-            catch( exceptionType const& ) { \
-                catchAssertionHandler.handleExceptionThrownAsExpected(); \
-            } \
-            catch( ... ) { \
-                catchAssertionHandler.handleUnexpectedInflightException(); \
-            } \
-        else \
-            catchAssertionHandler.handleThrowingCallSkipped(); \
-        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
-    } while( false )
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_MSG( macroName, messageType, resultDisposition, ... ) \
-    do { \
-        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, Catch::StringRef(), resultDisposition ); \
-        catchAssertionHandler.handleMessage( messageType, ( Catch::MessageStream() << __VA_ARGS__ + ::Catch::StreamEndStop() ).m_stream.str() ); \
-        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
-    } while( false )
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_CAPTURE( varName, macroName, ... ) \
-    auto varName = Catch::Capturer( macroName, CATCH_INTERNAL_LINEINFO, Catch::ResultWas::Info, #__VA_ARGS__ ); \
-    varName.captureValues( 0, __VA_ARGS__ )
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_INFO( macroName, log ) \
-    Catch::ScopedMessage INTERNAL_CATCH_UNIQUE_NAME( scopedMessage )( Catch::MessageBuilder( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, Catch::ResultWas::Info ) << log );
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_UNSCOPED_INFO( macroName, log ) \
-    Catch::getResultCapture().emplaceUnscopedMessage( Catch::MessageBuilder( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, Catch::ResultWas::Info ) << log )
-
-///////////////////////////////////////////////////////////////////////////////
-// Although this is matcher-based, it can be used with just a string
-#define INTERNAL_CATCH_THROWS_STR_MATCHES( macroName, resultDisposition, matcher, ... ) \
-    do { \
-        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__) ", " CATCH_INTERNAL_STRINGIFY(matcher), resultDisposition ); \
-        if( catchAssertionHandler.allowThrows() ) \
-            try { \
-                static_cast<void>(__VA_ARGS__); \
-                catchAssertionHandler.handleUnexpectedExceptionNotThrown(); \
-            } \
-            catch( ... ) { \
-                Catch::handleExceptionMatchExpr( catchAssertionHandler, matcher, #matcher##_catch_sr ); \
-            } \
-        else \
-            catchAssertionHandler.handleThrowingCallSkipped(); \
-        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
-    } while( false )
-
-#endif // CATCH_CONFIG_DISABLE
-
-// end catch_capture.hpp
-// start catch_section.h
-
-// start catch_section_info.h
-
-// start catch_totals.h
-
-#include <cstddef>
-
-namespace Catch {
-
-    struct Counts {
-        Counts operator - ( Counts const& other ) const;
-        Counts& operator += ( Counts const& other );
-
-        std::size_t total() const;
-        bool allPassed() const;
-        bool allOk() const;
-
-        std::size_t passed = 0;
-        std::size_t failed = 0;
-        std::size_t failedButOk = 0;
-    };
-
-    struct Totals {
-
-        Totals operator - ( Totals const& other ) const;
-        Totals& operator += ( Totals const& other );
-
-        Totals delta( Totals const& prevTotals ) const;
-
-        int error = 0;
-        Counts assertions;
-        Counts testCases;
-    };
-}
-
-// end catch_totals.h
-#include <string>
-
-namespace Catch {
-
-    struct SectionInfo {
-        SectionInfo
-            (   SourceLineInfo const& _lineInfo,
-                std::string const& _name );
-
-        // Deprecated
-        SectionInfo
-            (   SourceLineInfo const& _lineInfo,
-                std::string const& _name,
-                std::string const& ) : SectionInfo( _lineInfo, _name ) {}
-
-        std::string name;
-        std::string description; // !Deprecated: this will always be empty
-        SourceLineInfo lineInfo;
-    };
-
-    struct SectionEndInfo {
-        SectionInfo sectionInfo;
-        Counts prevAssertions;
-        double durationInSeconds;
-    };
-
-} // end namespace Catch
-
-// end catch_section_info.h
-// start catch_timer.h
-
-#include <cstdint>
-
-namespace Catch {
-
-    auto getCurrentNanosecondsSinceEpoch() -> uint64_t;
-    auto getEstimatedClockResolution() -> uint64_t;
-
-    class Timer {
-        uint64_t m_nanoseconds = 0;
-    public:
-        void start();
-        auto getElapsedNanoseconds() const -> uint64_t;
-        auto getElapsedMicroseconds() const -> uint64_t;
-        auto getElapsedMilliseconds() const -> unsigned int;
-        auto getElapsedSeconds() const -> double;
-    };
-
-} // namespace Catch
-
-// end catch_timer.h
-#include <string>
-
-namespace Catch {
-
-    class Section : NonCopyable {
-    public:
-        Section( SectionInfo const& info );
-        ~Section();
-
-        // This indicates whether the section should be executed or not
-        explicit operator bool() const;
-
-    private:
-        SectionInfo m_info;
-
-        std::string m_name;
-        Counts m_assertions;
-        bool m_sectionIncluded;
-        Timer m_timer;
-    };
-
-} // end namespace Catch
-
-#define INTERNAL_CATCH_SECTION( ... ) \
-    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-    CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS \
-    if( Catch::Section const& INTERNAL_CATCH_UNIQUE_NAME( catch_internal_Section ) = Catch::SectionInfo( CATCH_INTERNAL_LINEINFO, __VA_ARGS__ ) ) \
-    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
-
-#define INTERNAL_CATCH_DYNAMIC_SECTION( ... ) \
-    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-    CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS \
-    if( Catch::Section const& INTERNAL_CATCH_UNIQUE_NAME( catch_internal_Section ) = Catch::SectionInfo( CATCH_INTERNAL_LINEINFO, (Catch::ReusableStringStream() << __VA_ARGS__).str() ) ) \
-    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
-
-// end catch_section.h
-// start catch_interfaces_exception.h
-
-// start catch_interfaces_registry_hub.h
-
-#include <string>
-#include <memory>
-
-namespace Catch {
-
-    class TestCase;
-    struct ITestCaseRegistry;
-    struct IExceptionTranslatorRegistry;
-    struct IExceptionTranslator;
-    struct IReporterRegistry;
-    struct IReporterFactory;
-    struct ITagAliasRegistry;
-    struct IMutableEnumValuesRegistry;
-
-    class StartupExceptionRegistry;
-
-    using IReporterFactoryPtr = std::shared_ptr<IReporterFactory>;
-
-    struct IRegistryHub {
-        virtual ~IRegistryHub();
-
-        virtual IReporterRegistry const& getReporterRegistry() const = 0;
-        virtual ITestCaseRegistry const& getTestCaseRegistry() const = 0;
-        virtual ITagAliasRegistry const& getTagAliasRegistry() const = 0;
-        virtual IExceptionTranslatorRegistry const& getExceptionTranslatorRegistry() const = 0;
-
-        virtual StartupExceptionRegistry const& getStartupExceptionRegistry() const = 0;
-    };
-
-    struct IMutableRegistryHub {
-        virtual ~IMutableRegistryHub();
-        virtual void registerReporter( std::string const& name, IReporterFactoryPtr const& factory ) = 0;
-        virtual void registerListener( IReporterFactoryPtr const& factory ) = 0;
-        virtual void registerTest( TestCase const& testInfo ) = 0;
-        virtual void registerTranslator( const IExceptionTranslator* translator ) = 0;
-        virtual void registerTagAlias( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ) = 0;
-        virtual void registerStartupException() noexcept = 0;
-        virtual IMutableEnumValuesRegistry& getMutableEnumValuesRegistry() = 0;
-    };
-
-    IRegistryHub const& getRegistryHub();
-    IMutableRegistryHub& getMutableRegistryHub();
-    void cleanUp();
-    std::string translateActiveException();
-
-}
-
-// end catch_interfaces_registry_hub.h
-#if defined(CATCH_CONFIG_DISABLE)
-    #define INTERNAL_CATCH_TRANSLATE_EXCEPTION_NO_REG( translatorName, signature) \
-        static std::string translatorName( signature )
-#endif
-
-#include <exception>
-#include <string>
-#include <vector>
-
-namespace Catch {
-    using exceptionTranslateFunction = std::string(*)();
-
-    struct IExceptionTranslator;
-    using ExceptionTranslators = std::vector<std::unique_ptr<IExceptionTranslator const>>;
-
-    struct IExceptionTranslator {
-        virtual ~IExceptionTranslator();
-        virtual std::string translate( ExceptionTranslators::const_iterator it, ExceptionTranslators::const_iterator itEnd ) const = 0;
-    };
-
-    struct IExceptionTranslatorRegistry {
-        virtual ~IExceptionTranslatorRegistry();
-
-        virtual std::string translateActiveException() const = 0;
-    };
-
-    class ExceptionTranslatorRegistrar {
-        template<typename T>
-        class ExceptionTranslator : public IExceptionTranslator {
-        public:
-
-            ExceptionTranslator( std::string(*translateFunction)( T& ) )
-            : m_translateFunction( translateFunction )
-            {}
-
-            std::string translate( ExceptionTranslators::const_iterator it, ExceptionTranslators::const_iterator itEnd ) const override {
-#if defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-                return "";
-#else
-                try {
-                    if( it == itEnd )
-                        std::rethrow_exception(std::current_exception());
-                    else
-                        return (*it)->translate( it+1, itEnd );
-                }
-                catch( T& ex ) {
-                    return m_translateFunction( ex );
-                }
-#endif
-            }
-
-        protected:
-            std::string(*m_translateFunction)( T& );
-        };
-
-    public:
-        template<typename T>
-        ExceptionTranslatorRegistrar( std::string(*translateFunction)( T& ) ) {
-            getMutableRegistryHub().registerTranslator
-                ( new ExceptionTranslator<T>( translateFunction ) );
-        }
-    };
-}
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_TRANSLATE_EXCEPTION2( translatorName, signature ) \
-    static std::string translatorName( signature ); \
-    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-    CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-    namespace{ Catch::ExceptionTranslatorRegistrar INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionRegistrar )( &translatorName ); } \
-    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
-    static std::string translatorName( signature )
-
-#define INTERNAL_CATCH_TRANSLATE_EXCEPTION( signature ) INTERNAL_CATCH_TRANSLATE_EXCEPTION2( INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionTranslator ), signature )
-
-// end catch_interfaces_exception.h
-// start catch_approx.h
-
-#include <type_traits>
-
-namespace Catch {
-namespace Detail {
-
-    class Approx {
-    private:
-        bool equalityComparisonImpl(double other) const;
-        // Validates the new margin (margin >= 0)
-        // out-of-line to avoid including stdexcept in the header
-        void setMargin(double margin);
-        // Validates the new epsilon (0 < epsilon < 1)
-        // out-of-line to avoid including stdexcept in the header
-        void setEpsilon(double epsilon);
-
-    public:
-        explicit Approx ( double value );
-
-        static Approx custom();
-
-        Approx operator-() const;
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        Approx operator()( T const& value ) {
-            Approx approx( static_cast<double>(value) );
-            approx.m_epsilon = m_epsilon;
-            approx.m_margin = m_margin;
-            approx.m_scale = m_scale;
-            return approx;
-        }
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        explicit Approx( T const& value ): Approx(static_cast<double>(value))
-        {}
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        friend bool operator == ( const T& lhs, Approx const& rhs ) {
-            auto lhs_v = static_cast<double>(lhs);
-            return rhs.equalityComparisonImpl(lhs_v);
-        }
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        friend bool operator == ( Approx const& lhs, const T& rhs ) {
-            return operator==( rhs, lhs );
-        }
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        friend bool operator != ( T const& lhs, Approx const& rhs ) {
-            return !operator==( lhs, rhs );
-        }
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        friend bool operator != ( Approx const& lhs, T const& rhs ) {
-            return !operator==( rhs, lhs );
-        }
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        friend bool operator <= ( T const& lhs, Approx const& rhs ) {
-            return static_cast<double>(lhs) < rhs.m_value || lhs == rhs;
-        }
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        friend bool operator <= ( Approx const& lhs, T const& rhs ) {
-            return lhs.m_value < static_cast<double>(rhs) || lhs == rhs;
-        }
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        friend bool operator >= ( T const& lhs, Approx const& rhs ) {
-            return static_cast<double>(lhs) > rhs.m_value || lhs == rhs;
-        }
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        friend bool operator >= ( Approx const& lhs, T const& rhs ) {
-            return lhs.m_value > static_cast<double>(rhs) || lhs == rhs;
-        }
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        Approx& epsilon( T const& newEpsilon ) {
-            double epsilonAsDouble = static_cast<double>(newEpsilon);
-            setEpsilon(epsilonAsDouble);
-            return *this;
-        }
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        Approx& margin( T const& newMargin ) {
-            double marginAsDouble = static_cast<double>(newMargin);
-            setMargin(marginAsDouble);
-            return *this;
-        }
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        Approx& scale( T const& newScale ) {
-            m_scale = static_cast<double>(newScale);
-            return *this;
-        }
-
-        std::string toString() const;
-
-    private:
-        double m_epsilon;
-        double m_margin;
-        double m_scale;
-        double m_value;
-    };
-} // end namespace Detail
-
-namespace literals {
-    Detail::Approx operator "" _a(long double val);
-    Detail::Approx operator "" _a(unsigned long long val);
-} // end namespace literals
-
-template<>
-struct StringMaker<Catch::Detail::Approx> {
-    static std::string convert(Catch::Detail::Approx const& value);
-};
-
-} // end namespace Catch
-
-// end catch_approx.h
-// start catch_string_manip.h
-
-#include <string>
-#include <iosfwd>
-#include <vector>
-
-namespace Catch {
-
-    bool startsWith( std::string const& s, std::string const& prefix );
-    bool startsWith( std::string const& s, char prefix );
-    bool endsWith( std::string const& s, std::string const& suffix );
-    bool endsWith( std::string const& s, char suffix );
-    bool contains( std::string const& s, std::string const& infix );
-    void toLowerInPlace( std::string& s );
-    std::string toLower( std::string const& s );
-    //! Returns a new string without whitespace at the start/end
-    std::string trim( std::string const& str );
-    //! Returns a substring of the original ref without whitespace. Beware lifetimes!
-    StringRef trim(StringRef ref);
-
-    // !!! Be aware, returns refs into original string - make sure original string outlives them
-    std::vector<StringRef> splitStringRef( StringRef str, char delimiter );
-    bool replaceInPlace( std::string& str, std::string const& replaceThis, std::string const& withThis );
-
-    struct pluralise {
-        pluralise( std::size_t count, std::string const& label );
-
-        friend std::ostream& operator << ( std::ostream& os, pluralise const& pluraliser );
-
-        std::size_t m_count;
-        std::string m_label;
-    };
-}
-
-// end catch_string_manip.h
-#ifndef CATCH_CONFIG_DISABLE_MATCHERS
-// start catch_capture_matchers.h
-
-// start catch_matchers.h
-
-#include <string>
-#include <vector>
-
-namespace Catch {
-namespace Matchers {
-    namespace Impl {
-
-        template<typename ArgT> struct MatchAllOf;
-        template<typename ArgT> struct MatchAnyOf;
-        template<typename ArgT> struct MatchNotOf;
-
-        class MatcherUntypedBase {
-        public:
-            MatcherUntypedBase() = default;
-            MatcherUntypedBase ( MatcherUntypedBase const& ) = default;
-            MatcherUntypedBase& operator = ( MatcherUntypedBase const& ) = delete;
-            std::string toString() const;
-
-        protected:
-            virtual ~MatcherUntypedBase();
-            virtual std::string describe() const = 0;
-            mutable std::string m_cachedToString;
-        };
-
-#ifdef __clang__
-#    pragma clang diagnostic push
-#    pragma clang diagnostic ignored "-Wnon-virtual-dtor"
-#endif
-
-        template<typename ObjectT>
-        struct MatcherMethod {
-            virtual bool match( ObjectT const& arg ) const = 0;
-        };
-
-#if defined(__OBJC__)
-        // Hack to fix Catch GH issue #1661. Could use id for generic Object support.
-        // use of const for Object pointers is very uncommon and under ARC it causes some kind of signature mismatch that breaks compilation
-        template<>
-        struct MatcherMethod<NSString*> {
-            virtual bool match( NSString* arg ) const = 0;
-        };
-#endif
-
-#ifdef __clang__
-#    pragma clang diagnostic pop
-#endif
-
-        template<typename T>
-        struct MatcherBase : MatcherUntypedBase, MatcherMethod<T> {
-
-            MatchAllOf<T> operator && ( MatcherBase const& other ) const;
-            MatchAnyOf<T> operator || ( MatcherBase const& other ) const;
-            MatchNotOf<T> operator ! () const;
-        };
-
-        template<typename ArgT>
-        struct MatchAllOf : MatcherBase<ArgT> {
-            bool match( ArgT const& arg ) const override {
-                for( auto matcher : m_matchers ) {
-                    if (!matcher->match(arg))
-                        return false;
-                }
-                return true;
-            }
-            std::string describe() const override {
-                std::string description;
-                description.reserve( 4 + m_matchers.size()*32 );
-                description += "( ";
-                bool first = true;
-                for( auto matcher : m_matchers ) {
-                    if( first )
-                        first = false;
-                    else
-                        description += " and ";
-                    description += matcher->toString();
-                }
-                description += " )";
-                return description;
-            }
-
-            MatchAllOf<ArgT> operator && ( MatcherBase<ArgT> const& other ) {
-                auto copy(*this);
-                copy.m_matchers.push_back( &other );
-                return copy;
-            }
-
-            std::vector<MatcherBase<ArgT> const*> m_matchers;
-        };
-        template<typename ArgT>
-        struct MatchAnyOf : MatcherBase<ArgT> {
-
-            bool match( ArgT const& arg ) const override {
-                for( auto matcher : m_matchers ) {
-                    if (matcher->match(arg))
-                        return true;
-                }
-                return false;
-            }
-            std::string describe() const override {
-                std::string description;
-                description.reserve( 4 + m_matchers.size()*32 );
-                description += "( ";
-                bool first = true;
-                for( auto matcher : m_matchers ) {
-                    if( first )
-                        first = false;
-                    else
-                        description += " or ";
-                    description += matcher->toString();
-                }
-                description += " )";
-                return description;
-            }
-
-            MatchAnyOf<ArgT> operator || ( MatcherBase<ArgT> const& other ) {
-                auto copy(*this);
-                copy.m_matchers.push_back( &other );
-                return copy;
-            }
-
-            std::vector<MatcherBase<ArgT> const*> m_matchers;
-        };
-
-        template<typename ArgT>
-        struct MatchNotOf : MatcherBase<ArgT> {
-
-            MatchNotOf( MatcherBase<ArgT> const& underlyingMatcher ) : m_underlyingMatcher( underlyingMatcher ) {}
-
-            bool match( ArgT const& arg ) const override {
-                return !m_underlyingMatcher.match( arg );
-            }
-
-            std::string describe() const override {
-                return "not " + m_underlyingMatcher.toString();
-            }
-            MatcherBase<ArgT> const& m_underlyingMatcher;
-        };
-
-        template<typename T>
-        MatchAllOf<T> MatcherBase<T>::operator && ( MatcherBase const& other ) const {
-            return MatchAllOf<T>() && *this && other;
-        }
-        template<typename T>
-        MatchAnyOf<T> MatcherBase<T>::operator || ( MatcherBase const& other ) const {
-            return MatchAnyOf<T>() || *this || other;
-        }
-        template<typename T>
-        MatchNotOf<T> MatcherBase<T>::operator ! () const {
-            return MatchNotOf<T>( *this );
-        }
-
-    } // namespace Impl
-
-} // namespace Matchers
-
-using namespace Matchers;
-using Matchers::Impl::MatcherBase;
-
-} // namespace Catch
-
-// end catch_matchers.h
-// start catch_matchers_exception.hpp
-
-namespace Catch {
-namespace Matchers {
-namespace Exception {
-
-class ExceptionMessageMatcher : public MatcherBase<std::exception> {
-    std::string m_message;
-public:
-
-    ExceptionMessageMatcher(std::string const& message):
-        m_message(message)
-    {}
-
-    bool match(std::exception const& ex) const override;
-
-    std::string describe() const override;
-};
-
-} // namespace Exception
-
-Exception::ExceptionMessageMatcher Message(std::string const& message);
-
-} // namespace Matchers
-} // namespace Catch
-
-// end catch_matchers_exception.hpp
-// start catch_matchers_floating.h
-
-namespace Catch {
-namespace Matchers {
-
-    namespace Floating {
-
-        enum class FloatingPointKind : uint8_t;
-
-        struct WithinAbsMatcher : MatcherBase<double> {
-            WithinAbsMatcher(double target, double margin);
-            bool match(double const& matchee) const override;
-            std::string describe() const override;
-        private:
-            double m_target;
-            double m_margin;
-        };
-
-        struct WithinUlpsMatcher : MatcherBase<double> {
-            WithinUlpsMatcher(double target, uint64_t ulps, FloatingPointKind baseType);
-            bool match(double const& matchee) const override;
-            std::string describe() const override;
-        private:
-            double m_target;
-            uint64_t m_ulps;
-            FloatingPointKind m_type;
-        };
-
-        // Given IEEE-754 format for floats and doubles, we can assume
-        // that float -> double promotion is lossless. Given this, we can
-        // assume that if we do the standard relative comparison of
-        // |lhs - rhs| <= epsilon * max(fabs(lhs), fabs(rhs)), then we get
-        // the same result if we do this for floats, as if we do this for
-        // doubles that were promoted from floats.
-        struct WithinRelMatcher : MatcherBase<double> {
-            WithinRelMatcher(double target, double epsilon);
-            bool match(double const& matchee) const override;
-            std::string describe() const override;
-        private:
-            double m_target;
-            double m_epsilon;
-        };
-
-    } // namespace Floating
-
-    // The following functions create the actual matcher objects.
-    // This allows the types to be inferred
-    Floating::WithinUlpsMatcher WithinULP(double target, uint64_t maxUlpDiff);
-    Floating::WithinUlpsMatcher WithinULP(float target, uint64_t maxUlpDiff);
-    Floating::WithinAbsMatcher WithinAbs(double target, double margin);
-    Floating::WithinRelMatcher WithinRel(double target, double eps);
-    // defaults epsilon to 100*numeric_limits<double>::epsilon()
-    Floating::WithinRelMatcher WithinRel(double target);
-    Floating::WithinRelMatcher WithinRel(float target, float eps);
-    // defaults epsilon to 100*numeric_limits<float>::epsilon()
-    Floating::WithinRelMatcher WithinRel(float target);
-
-} // namespace Matchers
-} // namespace Catch
-
-// end catch_matchers_floating.h
-// start catch_matchers_generic.hpp
-
-#include <functional>
-#include <string>
-
-namespace Catch {
-namespace Matchers {
-namespace Generic {
-
-namespace Detail {
-    std::string finalizeDescription(const std::string& desc);
-}
-
-template <typename T>
-class PredicateMatcher : public MatcherBase<T> {
-    std::function<bool(T const&)> m_predicate;
-    std::string m_description;
-public:
-
-    PredicateMatcher(std::function<bool(T const&)> const& elem, std::string const& descr)
-        :m_predicate(std::move(elem)),
-        m_description(Detail::finalizeDescription(descr))
-    {}
-
-    bool match( T const& item ) const override {
-        return m_predicate(item);
-    }
-
-    std::string describe() const override {
-        return m_description;
-    }
-};
-
-} // namespace Generic
-
-    // The following functions create the actual matcher objects.
-    // The user has to explicitly specify type to the function, because
-    // inferring std::function<bool(T const&)> is hard (but possible) and
-    // requires a lot of TMP.
-    template<typename T>
-    Generic::PredicateMatcher<T> Predicate(std::function<bool(T const&)> const& predicate, std::string const& description = "") {
-        return Generic::PredicateMatcher<T>(predicate, description);
-    }
-
-} // namespace Matchers
-} // namespace Catch
-
-// end catch_matchers_generic.hpp
-// start catch_matchers_string.h
-
-#include <string>
-
-namespace Catch {
-namespace Matchers {
-
-    namespace StdString {
-
-        struct CasedString
-        {
-            CasedString( std::string const& str, CaseSensitive::Choice caseSensitivity );
-            std::string adjustString( std::string const& str ) const;
-            std::string caseSensitivitySuffix() const;
-
-            CaseSensitive::Choice m_caseSensitivity;
-            std::string m_str;
-        };
-
-        struct StringMatcherBase : MatcherBase<std::string> {
-            StringMatcherBase( std::string const& operation, CasedString const& comparator );
-            std::string describe() const override;
-
-            CasedString m_comparator;
-            std::string m_operation;
-        };
-
-        struct EqualsMatcher : StringMatcherBase {
-            EqualsMatcher( CasedString const& comparator );
-            bool match( std::string const& source ) const override;
-        };
-        struct ContainsMatcher : StringMatcherBase {
-            ContainsMatcher( CasedString const& comparator );
-            bool match( std::string const& source ) const override;
-        };
-        struct StartsWithMatcher : StringMatcherBase {
-            StartsWithMatcher( CasedString const& comparator );
-            bool match( std::string const& source ) const override;
-        };
-        struct EndsWithMatcher : StringMatcherBase {
-            EndsWithMatcher( CasedString const& comparator );
-            bool match( std::string const& source ) const override;
-        };
-
-        struct RegexMatcher : MatcherBase<std::string> {
-            RegexMatcher( std::string regex, CaseSensitive::Choice caseSensitivity );
-            bool match( std::string const& matchee ) const override;
-            std::string describe() const override;
-
-        private:
-            std::string m_regex;
-            CaseSensitive::Choice m_caseSensitivity;
-        };
-
-    } // namespace StdString
-
-    // The following functions create the actual matcher objects.
-    // This allows the types to be inferred
-
-    StdString::EqualsMatcher Equals( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
-    StdString::ContainsMatcher Contains( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
-    StdString::EndsWithMatcher EndsWith( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
-    StdString::StartsWithMatcher StartsWith( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
-    StdString::RegexMatcher Matches( std::string const& regex, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
-
-} // namespace Matchers
-} // namespace Catch
-
-// end catch_matchers_string.h
-// start catch_matchers_vector.h
-
-#include <algorithm>
-
-namespace Catch {
-namespace Matchers {
-
-    namespace Vector {
-        template<typename T, typename Alloc>
-        struct ContainsElementMatcher : MatcherBase<std::vector<T, Alloc>> {
-
-            ContainsElementMatcher(T const &comparator) : m_comparator( comparator) {}
-
-            bool match(std::vector<T, Alloc> const &v) const override {
-                for (auto const& el : v) {
-                    if (el == m_comparator) {
-                        return true;
-                    }
-                }
-                return false;
-            }
-
-            std::string describe() const override {
-                return "Contains: " + ::Catch::Detail::stringify( m_comparator );
-            }
-
-            T const& m_comparator;
-        };
-
-        template<typename T, typename AllocComp, typename AllocMatch>
-        struct ContainsMatcher : MatcherBase<std::vector<T, AllocMatch>> {
-
-            ContainsMatcher(std::vector<T, AllocComp> const &comparator) : m_comparator( comparator ) {}
-
-            bool match(std::vector<T, AllocMatch> const &v) const override {
-                // !TBD: see note in EqualsMatcher
-                if (m_comparator.size() > v.size())
-                    return false;
-                for (auto const& comparator : m_comparator) {
-                    auto present = false;
-                    for (const auto& el : v) {
-                        if (el == comparator) {
-                            present = true;
-                            break;
-                        }
-                    }
-                    if (!present) {
-                        return false;
-                    }
-                }
-                return true;
-            }
-            std::string describe() const override {
-                return "Contains: " + ::Catch::Detail::stringify( m_comparator );
-            }
-
-            std::vector<T, AllocComp> const& m_comparator;
-        };
-
-        template<typename T, typename AllocComp, typename AllocMatch>
-        struct EqualsMatcher : MatcherBase<std::vector<T, AllocMatch>> {
-
-            EqualsMatcher(std::vector<T, AllocComp> const &comparator) : m_comparator( comparator ) {}
-
-            bool match(std::vector<T, AllocMatch> const &v) const override {
-                // !TBD: This currently works if all elements can be compared using !=
-                // - a more general approach would be via a compare template that defaults
-                // to using !=. but could be specialised for, e.g. std::vector<T, Alloc> etc
-                // - then just call that directly
-                if (m_comparator.size() != v.size())
-                    return false;
-                for (std::size_t i = 0; i < v.size(); ++i)
-                    if (m_comparator[i] != v[i])
-                        return false;
-                return true;
-            }
-            std::string describe() const override {
-                return "Equals: " + ::Catch::Detail::stringify( m_comparator );
-            }
-            std::vector<T, AllocComp> const& m_comparator;
-        };
-
-        template<typename T, typename AllocComp, typename AllocMatch>
-        struct ApproxMatcher : MatcherBase<std::vector<T, AllocMatch>> {
-
-            ApproxMatcher(std::vector<T, AllocComp> const& comparator) : m_comparator( comparator ) {}
-
-            bool match(std::vector<T, AllocMatch> const &v) const override {
-                if (m_comparator.size() != v.size())
-                    return false;
-                for (std::size_t i = 0; i < v.size(); ++i)
-                    if (m_comparator[i] != approx(v[i]))
-                        return false;
-                return true;
-            }
-            std::string describe() const override {
-                return "is approx: " + ::Catch::Detail::stringify( m_comparator );
-            }
-            template <typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-            ApproxMatcher& epsilon( T const& newEpsilon ) {
-                approx.epsilon(newEpsilon);
-                return *this;
-            }
-            template <typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-            ApproxMatcher& margin( T const& newMargin ) {
-                approx.margin(newMargin);
-                return *this;
-            }
-            template <typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-            ApproxMatcher& scale( T const& newScale ) {
-                approx.scale(newScale);
-                return *this;
-            }
-
-            std::vector<T, AllocComp> const& m_comparator;
-            mutable Catch::Detail::Approx approx = Catch::Detail::Approx::custom();
-        };
-
-        template<typename T, typename AllocComp, typename AllocMatch>
-        struct UnorderedEqualsMatcher : MatcherBase<std::vector<T, AllocMatch>> {
-            UnorderedEqualsMatcher(std::vector<T, AllocComp> const& target) : m_target(target) {}
-            bool match(std::vector<T, AllocMatch> const& vec) const override {
-                // Note: This is a reimplementation of std::is_permutation,
-                //       because I don't want to include <algorithm> inside the common path
-                if (m_target.size() != vec.size()) {
-                    return false;
-                }
-                return std::is_permutation(m_target.begin(), m_target.end(), vec.begin());
-            }
-
-            std::string describe() const override {
-                return "UnorderedEquals: " + ::Catch::Detail::stringify(m_target);
-            }
-        private:
-            std::vector<T, AllocComp> const& m_target;
-        };
-
-    } // namespace Vector
-
-    // The following functions create the actual matcher objects.
-    // This allows the types to be inferred
-
-    template<typename T, typename AllocComp = std::allocator<T>, typename AllocMatch = AllocComp>
-    Vector::ContainsMatcher<T, AllocComp, AllocMatch> Contains( std::vector<T, AllocComp> const& comparator ) {
-        return Vector::ContainsMatcher<T, AllocComp, AllocMatch>( comparator );
-    }
-
-    template<typename T, typename Alloc = std::allocator<T>>
-    Vector::ContainsElementMatcher<T, Alloc> VectorContains( T const& comparator ) {
-        return Vector::ContainsElementMatcher<T, Alloc>( comparator );
-    }
-
-    template<typename T, typename AllocComp = std::allocator<T>, typename AllocMatch = AllocComp>
-    Vector::EqualsMatcher<T, AllocComp, AllocMatch> Equals( std::vector<T, AllocComp> const& comparator ) {
-        return Vector::EqualsMatcher<T, AllocComp, AllocMatch>( comparator );
-    }
-
-    template<typename T, typename AllocComp = std::allocator<T>, typename AllocMatch = AllocComp>
-    Vector::ApproxMatcher<T, AllocComp, AllocMatch> Approx( std::vector<T, AllocComp> const& comparator ) {
-        return Vector::ApproxMatcher<T, AllocComp, AllocMatch>( comparator );
-    }
-
-    template<typename T, typename AllocComp = std::allocator<T>, typename AllocMatch = AllocComp>
-    Vector::UnorderedEqualsMatcher<T, AllocComp, AllocMatch> UnorderedEquals(std::vector<T, AllocComp> const& target) {
-        return Vector::UnorderedEqualsMatcher<T, AllocComp, AllocMatch>( target );
-    }
-
-} // namespace Matchers
-} // namespace Catch
-
-// end catch_matchers_vector.h
-namespace Catch {
-
-    template<typename ArgT, typename MatcherT>
-    class MatchExpr : public ITransientExpression {
-        ArgT const& m_arg;
-        MatcherT m_matcher;
-        StringRef m_matcherString;
-    public:
-        MatchExpr( ArgT const& arg, MatcherT const& matcher, StringRef const& matcherString )
-        :   ITransientExpression{ true, matcher.match( arg ) },
-            m_arg( arg ),
-            m_matcher( matcher ),
-            m_matcherString( matcherString )
-        {}
-
-        void streamReconstructedExpression( std::ostream &os ) const override {
-            auto matcherAsString = m_matcher.toString();
-            os << Catch::Detail::stringify( m_arg ) << ' ';
-            if( matcherAsString == Detail::unprintableString )
-                os << m_matcherString;
-            else
-                os << matcherAsString;
-        }
-    };
-
-    using StringMatcher = Matchers::Impl::MatcherBase<std::string>;
-
-    void handleExceptionMatchExpr( AssertionHandler& handler, StringMatcher const& matcher, StringRef const& matcherString  );
-
-    template<typename ArgT, typename MatcherT>
-    auto makeMatchExpr( ArgT const& arg, MatcherT const& matcher, StringRef const& matcherString  ) -> MatchExpr<ArgT, MatcherT> {
-        return MatchExpr<ArgT, MatcherT>( arg, matcher, matcherString );
-    }
-
-} // namespace Catch
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CHECK_THAT( macroName, matcher, resultDisposition, arg ) \
-    do { \
-        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(arg) ", " CATCH_INTERNAL_STRINGIFY(matcher), resultDisposition ); \
-        INTERNAL_CATCH_TRY { \
-            catchAssertionHandler.handleExpr( Catch::makeMatchExpr( arg, matcher, #matcher##_catch_sr ) ); \
-        } INTERNAL_CATCH_CATCH( catchAssertionHandler ) \
-        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
-    } while( false )
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_THROWS_MATCHES( macroName, exceptionType, resultDisposition, matcher, ... ) \
-    do { \
-        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__) ", " CATCH_INTERNAL_STRINGIFY(exceptionType) ", " CATCH_INTERNAL_STRINGIFY(matcher), resultDisposition ); \
-        if( catchAssertionHandler.allowThrows() ) \
-            try { \
-                static_cast<void>(__VA_ARGS__ ); \
-                catchAssertionHandler.handleUnexpectedExceptionNotThrown(); \
-            } \
-            catch( exceptionType const& ex ) { \
-                catchAssertionHandler.handleExpr( Catch::makeMatchExpr( ex, matcher, #matcher##_catch_sr ) ); \
-            } \
-            catch( ... ) { \
-                catchAssertionHandler.handleUnexpectedInflightException(); \
-            } \
-        else \
-            catchAssertionHandler.handleThrowingCallSkipped(); \
-        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
-    } while( false )
-
-// end catch_capture_matchers.h
-#endif
-// start catch_generators.hpp
-
-// start catch_interfaces_generatortracker.h
-
-
-#include <memory>
-
-namespace Catch {
-
-    namespace Generators {
-        class GeneratorUntypedBase {
-        public:
-            GeneratorUntypedBase() = default;
-            virtual ~GeneratorUntypedBase();
-            // Attempts to move the generator to the next element
-             //
-             // Returns true if the move succeeded (and a valid element
-             // can be retrieved).
-            virtual bool next() = 0;
-        };
-        using GeneratorBasePtr = std::unique_ptr<GeneratorUntypedBase>;
-
-    } // namespace Generators
-
-    struct IGeneratorTracker {
-        virtual ~IGeneratorTracker();
-        virtual auto hasGenerator() const -> bool = 0;
-        virtual auto getGenerator() const -> Generators::GeneratorBasePtr const& = 0;
-        virtual void setGenerator( Generators::GeneratorBasePtr&& generator ) = 0;
-    };
-
-} // namespace Catch
-
-// end catch_interfaces_generatortracker.h
-// start catch_enforce.h
-
-#include <exception>
-
-namespace Catch {
-#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-    template <typename Ex>
-    [[noreturn]]
-    void throw_exception(Ex const& e) {
-        throw e;
-    }
-#else // ^^ Exceptions are enabled //  Exceptions are disabled vv
-    [[noreturn]]
-    void throw_exception(std::exception const& e);
-#endif
-
-    [[noreturn]]
-    void throw_logic_error(std::string const& msg);
-    [[noreturn]]
-    void throw_domain_error(std::string const& msg);
-    [[noreturn]]
-    void throw_runtime_error(std::string const& msg);
-
-} // namespace Catch;
-
-#define CATCH_MAKE_MSG(...) \
-    (Catch::ReusableStringStream() << __VA_ARGS__).str()
-
-#define CATCH_INTERNAL_ERROR(...) \
-    Catch::throw_logic_error(CATCH_MAKE_MSG( CATCH_INTERNAL_LINEINFO << ": Internal Catch2 error: " << __VA_ARGS__))
-
-#define CATCH_ERROR(...) \
-    Catch::throw_domain_error(CATCH_MAKE_MSG( __VA_ARGS__ ))
-
-#define CATCH_RUNTIME_ERROR(...) \
-    Catch::throw_runtime_error(CATCH_MAKE_MSG( __VA_ARGS__ ))
-
-#define CATCH_ENFORCE( condition, ... ) \
-    do{ if( !(condition) ) CATCH_ERROR( __VA_ARGS__ ); } while(false)
-
-// end catch_enforce.h
-#include <memory>
-#include <vector>
-#include <cassert>
-
-#include <utility>
-#include <exception>
-
-namespace Catch {
-
-class GeneratorException : public std::exception {
-    const char* const m_msg = "";
-
-public:
-    GeneratorException(const char* msg):
-        m_msg(msg)
-    {}
-
-    const char* what() const noexcept override final;
-};
-
-namespace Generators {
-
-    // !TBD move this into its own location?
-    namespace pf{
-        template<typename T, typename... Args>
-        std::unique_ptr<T> make_unique( Args&&... args ) {
-            return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
-        }
-    }
-
-    template<typename T>
-    struct IGenerator : GeneratorUntypedBase {
-        virtual ~IGenerator() = default;
-
-        // Returns the current element of the generator
-        //
-        // \Precondition The generator is either freshly constructed,
-        // or the last call to `next()` returned true
-        virtual T const& get() const = 0;
-        using type = T;
-    };
-
-    template<typename T>
-    class SingleValueGenerator final : public IGenerator<T> {
-        T m_value;
-    public:
-        SingleValueGenerator(T&& value) : m_value(std::move(value)) {}
-
-        T const& get() const override {
-            return m_value;
-        }
-        bool next() override {
-            return false;
-        }
-    };
-
-    template<typename T>
-    class FixedValuesGenerator final : public IGenerator<T> {
-        static_assert(!std::is_same<T, bool>::value,
-            "FixedValuesGenerator does not support bools because of std::vector<bool>"
-            "specialization, use SingleValue Generator instead.");
-        std::vector<T> m_values;
-        size_t m_idx = 0;
-    public:
-        FixedValuesGenerator( std::initializer_list<T> values ) : m_values( values ) {}
-
-        T const& get() const override {
-            return m_values[m_idx];
-        }
-        bool next() override {
-            ++m_idx;
-            return m_idx < m_values.size();
-        }
-    };
-
-    template <typename T>
-    class GeneratorWrapper final {
-        std::unique_ptr<IGenerator<T>> m_generator;
-    public:
-        GeneratorWrapper(std::unique_ptr<IGenerator<T>> generator):
-            m_generator(std::move(generator))
-        {}
-        T const& get() const {
-            return m_generator->get();
-        }
-        bool next() {
-            return m_generator->next();
-        }
-    };
-
-    template <typename T>
-    GeneratorWrapper<T> value(T&& value) {
-        return GeneratorWrapper<T>(pf::make_unique<SingleValueGenerator<T>>(std::forward<T>(value)));
-    }
-    template <typename T>
-    GeneratorWrapper<T> values(std::initializer_list<T> values) {
-        return GeneratorWrapper<T>(pf::make_unique<FixedValuesGenerator<T>>(values));
-    }
-
-    template<typename T>
-    class Generators : public IGenerator<T> {
-        std::vector<GeneratorWrapper<T>> m_generators;
-        size_t m_current = 0;
-
-        void populate(GeneratorWrapper<T>&& generator) {
-            m_generators.emplace_back(std::move(generator));
-        }
-        void populate(T&& val) {
-            m_generators.emplace_back(value(std::forward<T>(val)));
-        }
-        template<typename U>
-        void populate(U&& val) {
-            populate(T(std::forward<U>(val)));
-        }
-        template<typename U, typename... Gs>
-        void populate(U&& valueOrGenerator, Gs &&... moreGenerators) {
-            populate(std::forward<U>(valueOrGenerator));
-            populate(std::forward<Gs>(moreGenerators)...);
-        }
-
-    public:
-        template <typename... Gs>
-        Generators(Gs &&... moreGenerators) {
-            m_generators.reserve(sizeof...(Gs));
-            populate(std::forward<Gs>(moreGenerators)...);
-        }
-
-        T const& get() const override {
-            return m_generators[m_current].get();
-        }
-
-        bool next() override {
-            if (m_current >= m_generators.size()) {
-                return false;
-            }
-            const bool current_status = m_generators[m_current].next();
-            if (!current_status) {
-                ++m_current;
-            }
-            return m_current < m_generators.size();
-        }
-    };
-
-    template<typename... Ts>
-    GeneratorWrapper<std::tuple<Ts...>> table( std::initializer_list<std::tuple<typename std::decay<Ts>::type...>> tuples ) {
-        return values<std::tuple<Ts...>>( tuples );
-    }
-
-    // Tag type to signal that a generator sequence should convert arguments to a specific type
-    template <typename T>
-    struct as {};
-
-    template<typename T, typename... Gs>
-    auto makeGenerators( GeneratorWrapper<T>&& generator, Gs &&... moreGenerators ) -> Generators<T> {
-        return Generators<T>(std::move(generator), std::forward<Gs>(moreGenerators)...);
-    }
-    template<typename T>
-    auto makeGenerators( GeneratorWrapper<T>&& generator ) -> Generators<T> {
-        return Generators<T>(std::move(generator));
-    }
-    template<typename T, typename... Gs>
-    auto makeGenerators( T&& val, Gs &&... moreGenerators ) -> Generators<T> {
-        return makeGenerators( value( std::forward<T>( val ) ), std::forward<Gs>( moreGenerators )... );
-    }
-    template<typename T, typename U, typename... Gs>
-    auto makeGenerators( as<T>, U&& val, Gs &&... moreGenerators ) -> Generators<T> {
-        return makeGenerators( value( T( std::forward<U>( val ) ) ), std::forward<Gs>( moreGenerators )... );
-    }
-
-    auto acquireGeneratorTracker( SourceLineInfo const& lineInfo ) -> IGeneratorTracker&;
-
-    template<typename L>
-    // Note: The type after -> is weird, because VS2015 cannot parse
-    //       the expression used in the typedef inside, when it is in
-    //       return type. Yeah.
-    auto generate( SourceLineInfo const& lineInfo, L const& generatorExpression ) -> decltype(std::declval<decltype(generatorExpression())>().get()) {
-        using UnderlyingType = typename decltype(generatorExpression())::type;
-
-        IGeneratorTracker& tracker = acquireGeneratorTracker( lineInfo );
-        if (!tracker.hasGenerator()) {
-            tracker.setGenerator(pf::make_unique<Generators<UnderlyingType>>(generatorExpression()));
-        }
-
-        auto const& generator = static_cast<IGenerator<UnderlyingType> const&>( *tracker.getGenerator() );
-        return generator.get();
-    }
-
-} // namespace Generators
-} // namespace Catch
-
-#define GENERATE( ... ) \
-    Catch::Generators::generate( CATCH_INTERNAL_LINEINFO, [ ]{ using namespace Catch::Generators; return makeGenerators( __VA_ARGS__ ); } ) //NOLINT(google-build-using-namespace)
-#define GENERATE_COPY( ... ) \
-    Catch::Generators::generate( CATCH_INTERNAL_LINEINFO, [=]{ using namespace Catch::Generators; return makeGenerators( __VA_ARGS__ ); } ) //NOLINT(google-build-using-namespace)
-#define GENERATE_REF( ... ) \
-    Catch::Generators::generate( CATCH_INTERNAL_LINEINFO, [&]{ using namespace Catch::Generators; return makeGenerators( __VA_ARGS__ ); } ) //NOLINT(google-build-using-namespace)
-
-// end catch_generators.hpp
-// start catch_generators_generic.hpp
-
-namespace Catch {
-namespace Generators {
-
-    template <typename T>
-    class TakeGenerator : public IGenerator<T> {
-        GeneratorWrapper<T> m_generator;
-        size_t m_returned = 0;
-        size_t m_target;
-    public:
-        TakeGenerator(size_t target, GeneratorWrapper<T>&& generator):
-            m_generator(std::move(generator)),
-            m_target(target)
-        {
-            assert(target != 0 && "Empty generators are not allowed");
-        }
-        T const& get() const override {
-            return m_generator.get();
-        }
-        bool next() override {
-            ++m_returned;
-            if (m_returned >= m_target) {
-                return false;
-            }
-
-            const auto success = m_generator.next();
-            // If the underlying generator does not contain enough values
-            // then we cut short as well
-            if (!success) {
-                m_returned = m_target;
-            }
-            return success;
-        }
-    };
-
-    template <typename T>
-    GeneratorWrapper<T> take(size_t target, GeneratorWrapper<T>&& generator) {
-        return GeneratorWrapper<T>(pf::make_unique<TakeGenerator<T>>(target, std::move(generator)));
-    }
-
-    template <typename T, typename Predicate>
-    class FilterGenerator : public IGenerator<T> {
-        GeneratorWrapper<T> m_generator;
-        Predicate m_predicate;
-    public:
-        template <typename P = Predicate>
-        FilterGenerator(P&& pred, GeneratorWrapper<T>&& generator):
-            m_generator(std::move(generator)),
-            m_predicate(std::forward<P>(pred))
-        {
-            if (!m_predicate(m_generator.get())) {
-                // It might happen that there are no values that pass the
-                // filter. In that case we throw an exception.
-                auto has_initial_value = next();
-                if (!has_initial_value) {
-                    Catch::throw_exception(GeneratorException("No valid value found in filtered generator"));
-                }
-            }
-        }
-
-        T const& get() const override {
-            return m_generator.get();
-        }
-
-        bool next() override {
-            bool success = m_generator.next();
-            if (!success) {
-                return false;
-            }
-            while (!m_predicate(m_generator.get()) && (success = m_generator.next()) == true);
-            return success;
-        }
-    };
-
-    template <typename T, typename Predicate>
-    GeneratorWrapper<T> filter(Predicate&& pred, GeneratorWrapper<T>&& generator) {
-        return GeneratorWrapper<T>(std::unique_ptr<IGenerator<T>>(pf::make_unique<FilterGenerator<T, Predicate>>(std::forward<Predicate>(pred), std::move(generator))));
-    }
-
-    template <typename T>
-    class RepeatGenerator : public IGenerator<T> {
-        static_assert(!std::is_same<T, bool>::value,
-            "RepeatGenerator currently does not support bools"
-            "because of std::vector<bool> specialization");
-        GeneratorWrapper<T> m_generator;
-        mutable std::vector<T> m_returned;
-        size_t m_target_repeats;
-        size_t m_current_repeat = 0;
-        size_t m_repeat_index = 0;
-    public:
-        RepeatGenerator(size_t repeats, GeneratorWrapper<T>&& generator):
-            m_generator(std::move(generator)),
-            m_target_repeats(repeats)
-        {
-            assert(m_target_repeats > 0 && "Repeat generator must repeat at least once");
-        }
-
-        T const& get() const override {
-            if (m_current_repeat == 0) {
-                m_returned.push_back(m_generator.get());
-                return m_returned.back();
-            }
-            return m_returned[m_repeat_index];
-        }
-
-        bool next() override {
-            // There are 2 basic cases:
-            // 1) We are still reading the generator
-            // 2) We are reading our own cache
-
-            // In the first case, we need to poke the underlying generator.
-            // If it happily moves, we are left in that state, otherwise it is time to start reading from our cache
-            if (m_current_repeat == 0) {
-                const auto success = m_generator.next();
-                if (!success) {
-                    ++m_current_repeat;
-                }
-                return m_current_repeat < m_target_repeats;
-            }
-
-            // In the second case, we need to move indices forward and check that we haven't run up against the end
-            ++m_repeat_index;
-            if (m_repeat_index == m_returned.size()) {
-                m_repeat_index = 0;
-                ++m_current_repeat;
-            }
-            return m_current_repeat < m_target_repeats;
-        }
-    };
-
-    template <typename T>
-    GeneratorWrapper<T> repeat(size_t repeats, GeneratorWrapper<T>&& generator) {
-        return GeneratorWrapper<T>(pf::make_unique<RepeatGenerator<T>>(repeats, std::move(generator)));
-    }
-
-    template <typename T, typename U, typename Func>
-    class MapGenerator : public IGenerator<T> {
-        // TBD: provide static assert for mapping function, for friendly error message
-        GeneratorWrapper<U> m_generator;
-        Func m_function;
-        // To avoid returning dangling reference, we have to save the values
-        T m_cache;
-    public:
-        template <typename F2 = Func>
-        MapGenerator(F2&& function, GeneratorWrapper<U>&& generator) :
-            m_generator(std::move(generator)),
-            m_function(std::forward<F2>(function)),
-            m_cache(m_function(m_generator.get()))
-        {}
-
-        T const& get() const override {
-            return m_cache;
-        }
-        bool next() override {
-            const auto success = m_generator.next();
-            if (success) {
-                m_cache = m_function(m_generator.get());
-            }
-            return success;
-        }
-    };
-
-    template <typename Func, typename U, typename T = FunctionReturnType<Func, U>>
-    GeneratorWrapper<T> map(Func&& function, GeneratorWrapper<U>&& generator) {
-        return GeneratorWrapper<T>(
-            pf::make_unique<MapGenerator<T, U, Func>>(std::forward<Func>(function), std::move(generator))
-        );
-    }
-
-    template <typename T, typename U, typename Func>
-    GeneratorWrapper<T> map(Func&& function, GeneratorWrapper<U>&& generator) {
-        return GeneratorWrapper<T>(
-            pf::make_unique<MapGenerator<T, U, Func>>(std::forward<Func>(function), std::move(generator))
-        );
-    }
-
-    template <typename T>
-    class ChunkGenerator final : public IGenerator<std::vector<T>> {
-        std::vector<T> m_chunk;
-        size_t m_chunk_size;
-        GeneratorWrapper<T> m_generator;
-        bool m_used_up = false;
-    public:
-        ChunkGenerator(size_t size, GeneratorWrapper<T> generator) :
-            m_chunk_size(size), m_generator(std::move(generator))
-        {
-            m_chunk.reserve(m_chunk_size);
-            if (m_chunk_size != 0) {
-                m_chunk.push_back(m_generator.get());
-                for (size_t i = 1; i < m_chunk_size; ++i) {
-                    if (!m_generator.next()) {
-                        Catch::throw_exception(GeneratorException("Not enough values to initialize the first chunk"));
-                    }
-                    m_chunk.push_back(m_generator.get());
-                }
-            }
-        }
-        std::vector<T> const& get() const override {
-            return m_chunk;
-        }
-        bool next() override {
-            m_chunk.clear();
-            for (size_t idx = 0; idx < m_chunk_size; ++idx) {
-                if (!m_generator.next()) {
-                    return false;
-                }
-                m_chunk.push_back(m_generator.get());
-            }
-            return true;
-        }
-    };
-
-    template <typename T>
-    GeneratorWrapper<std::vector<T>> chunk(size_t size, GeneratorWrapper<T>&& generator) {
-        return GeneratorWrapper<std::vector<T>>(
-            pf::make_unique<ChunkGenerator<T>>(size, std::move(generator))
-        );
-    }
-
-} // namespace Generators
-} // namespace Catch
-
-// end catch_generators_generic.hpp
-// start catch_generators_specific.hpp
-
-// start catch_context.h
-
-#include <memory>
-
-namespace Catch {
-
-    struct IResultCapture;
-    struct IRunner;
-    struct IConfig;
-    struct IMutableContext;
-
-    using IConfigPtr = std::shared_ptr<IConfig const>;
-
-    struct IContext
-    {
-        virtual ~IContext();
-
-        virtual IResultCapture* getResultCapture() = 0;
-        virtual IRunner* getRunner() = 0;
-        virtual IConfigPtr const& getConfig() const = 0;
-    };
-
-    struct IMutableContext : IContext
-    {
-        virtual ~IMutableContext();
-        virtual void setResultCapture( IResultCapture* resultCapture ) = 0;
-        virtual void setRunner( IRunner* runner ) = 0;
-        virtual void setConfig( IConfigPtr const& config ) = 0;
-
-    private:
-        static IMutableContext *currentContext;
-        friend IMutableContext& getCurrentMutableContext();
-        friend void cleanUpContext();
-        static void createContext();
-    };
-
-    inline IMutableContext& getCurrentMutableContext()
-    {
-        if( !IMutableContext::currentContext )
-            IMutableContext::createContext();
-        // NOLINTNEXTLINE(clang-analyzer-core.uninitialized.UndefReturn)
-        return *IMutableContext::currentContext;
-    }
-
-    inline IContext& getCurrentContext()
-    {
-        return getCurrentMutableContext();
-    }
-
-    void cleanUpContext();
-
-    class SimplePcg32;
-    SimplePcg32& rng();
-}
-
-// end catch_context.h
-// start catch_interfaces_config.h
-
-// start catch_option.hpp
-
-namespace Catch {
-
-    // An optional type
-    template<typename T>
-    class Option {
-    public:
-        Option() : nullableValue( nullptr ) {}
-        Option( T const& _value )
-        : nullableValue( new( storage ) T( _value ) )
-        {}
-        Option( Option const& _other )
-        : nullableValue( _other ? new( storage ) T( *_other ) : nullptr )
-        {}
-
-        ~Option() {
-            reset();
-        }
-
-        Option& operator= ( Option const& _other ) {
-            if( &_other != this ) {
-                reset();
-                if( _other )
-                    nullableValue = new( storage ) T( *_other );
-            }
-            return *this;
-        }
-        Option& operator = ( T const& _value ) {
-            reset();
-            nullableValue = new( storage ) T( _value );
-            return *this;
-        }
-
-        void reset() {
-            if( nullableValue )
-                nullableValue->~T();
-            nullableValue = nullptr;
-        }
-
-        T& operator*() { return *nullableValue; }
-        T const& operator*() const { return *nullableValue; }
-        T* operator->() { return nullableValue; }
-        const T* operator->() const { return nullableValue; }
-
-        T valueOr( T const& defaultValue ) const {
-            return nullableValue ? *nullableValue : defaultValue;
-        }
-
-        bool some() const { return nullableValue != nullptr; }
-        bool none() const { return nullableValue == nullptr; }
-
-        bool operator !() const { return nullableValue == nullptr; }
-        explicit operator bool() const {
-            return some();
-        }
-
-    private:
-        T *nullableValue;
-        alignas(alignof(T)) char storage[sizeof(T)];
-    };
-
-} // end namespace Catch
-
-// end catch_option.hpp
-#include <chrono>
-#include <iosfwd>
-#include <string>
-#include <vector>
-#include <memory>
-
-namespace Catch {
-
-    enum class Verbosity {
-        Quiet = 0,
-        Normal,
-        High
-    };
-
-    struct WarnAbout { enum What {
-        Nothing = 0x00,
-        NoAssertions = 0x01,
-        NoTests = 0x02
-    }; };
-
-    struct ShowDurations { enum OrNot {
-        DefaultForReporter,
-        Always,
-        Never
-    }; };
-    struct RunTests { enum InWhatOrder {
-        InDeclarationOrder,
-        InLexicographicalOrder,
-        InRandomOrder
-    }; };
-    struct UseColour { enum YesOrNo {
-        Auto,
-        Yes,
-        No
-    }; };
-    struct WaitForKeypress { enum When {
-        Never,
-        BeforeStart = 1,
-        BeforeExit = 2,
-        BeforeStartAndExit = BeforeStart | BeforeExit
-    }; };
-
-    class TestSpec;
-
-    struct IConfig : NonCopyable {
-
-        virtual ~IConfig();
-
-        virtual bool allowThrows() const = 0;
-        virtual std::ostream& stream() const = 0;
-        virtual std::string name() const = 0;
-        virtual bool includeSuccessfulResults() const = 0;
-        virtual bool shouldDebugBreak() const = 0;
-        virtual bool warnAboutMissingAssertions() const = 0;
-        virtual bool warnAboutNoTests() const = 0;
-        virtual int abortAfter() const = 0;
-        virtual bool showInvisibles() const = 0;
-        virtual ShowDurations::OrNot showDurations() const = 0;
-        virtual TestSpec const& testSpec() const = 0;
-        virtual bool hasTestFilters() const = 0;
-        virtual std::vector<std::string> const& getTestsOrTags() const = 0;
-        virtual RunTests::InWhatOrder runOrder() const = 0;
-        virtual unsigned int rngSeed() const = 0;
-        virtual UseColour::YesOrNo useColour() const = 0;
-        virtual std::vector<std::string> const& getSectionsToRun() const = 0;
-        virtual Verbosity verbosity() const = 0;
-
-        virtual bool benchmarkNoAnalysis() const = 0;
-        virtual int benchmarkSamples() const = 0;
-        virtual double benchmarkConfidenceInterval() const = 0;
-        virtual unsigned int benchmarkResamples() const = 0;
-        virtual std::chrono::milliseconds benchmarkWarmupTime() const = 0;
-    };
-
-    using IConfigPtr = std::shared_ptr<IConfig const>;
-}
-
-// end catch_interfaces_config.h
-// start catch_random_number_generator.h
-
-#include <cstdint>
-
-namespace Catch {
-
-    // This is a simple implementation of C++11 Uniform Random Number
-    // Generator. It does not provide all operators, because Catch2
-    // does not use it, but it should behave as expected inside stdlib's
-    // distributions.
-    // The implementation is based on the PCG family (http://pcg-random.org)
-    class SimplePcg32 {
-        using state_type = std::uint64_t;
-    public:
-        using result_type = std::uint32_t;
-        static constexpr result_type (min)() {
-            return 0;
-        }
-        static constexpr result_type (max)() {
-            return static_cast<result_type>(-1);
-        }
-
-        // Provide some default initial state for the default constructor
-        SimplePcg32():SimplePcg32(0xed743cc4U) {}
-
-        explicit SimplePcg32(result_type seed_);
-
-        void seed(result_type seed_);
-        void discard(uint64_t skip);
-
-        result_type operator()();
-
-    private:
-        friend bool operator==(SimplePcg32 const& lhs, SimplePcg32 const& rhs);
-        friend bool operator!=(SimplePcg32 const& lhs, SimplePcg32 const& rhs);
-
-        // In theory we also need operator<< and operator>>
-        // In practice we do not use them, so we will skip them for now
-
-        std::uint64_t m_state;
-        // This part of the state determines which "stream" of the numbers
-        // is chosen -- we take it as a constant for Catch2, so we only
-        // need to deal with seeding the main state.
-        // Picked by reading 8 bytes from `/dev/random` :-)
-        static const std::uint64_t s_inc = (0x13ed0cc53f939476ULL << 1ULL) | 1ULL;
-    };
-
-} // end namespace Catch
-
-// end catch_random_number_generator.h
-#include <random>
-
-namespace Catch {
-namespace Generators {
-
-template <typename Float>
-class RandomFloatingGenerator final : public IGenerator<Float> {
-    Catch::SimplePcg32& m_rng;
-    std::uniform_real_distribution<Float> m_dist;
-    Float m_current_number;
-public:
-
-    RandomFloatingGenerator(Float a, Float b):
-        m_rng(rng()),
-        m_dist(a, b) {
-        static_cast<void>(next());
-    }
-
-    Float const& get() const override {
-        return m_current_number;
-    }
-    bool next() override {
-        m_current_number = m_dist(m_rng);
-        return true;
-    }
-};
-
-template <typename Integer>
-class RandomIntegerGenerator final : public IGenerator<Integer> {
-    Catch::SimplePcg32& m_rng;
-    std::uniform_int_distribution<Integer> m_dist;
-    Integer m_current_number;
-public:
-
-    RandomIntegerGenerator(Integer a, Integer b):
-        m_rng(rng()),
-        m_dist(a, b) {
-        static_cast<void>(next());
-    }
-
-    Integer const& get() const override {
-        return m_current_number;
-    }
-    bool next() override {
-        m_current_number = m_dist(m_rng);
-        return true;
-    }
-};
-
-// TODO: Ideally this would be also constrained against the various char types,
-//       but I don't expect users to run into that in practice.
-template <typename T>
-typename std::enable_if<std::is_integral<T>::value && !std::is_same<T, bool>::value,
-GeneratorWrapper<T>>::type
-random(T a, T b) {
-    return GeneratorWrapper<T>(
-        pf::make_unique<RandomIntegerGenerator<T>>(a, b)
-    );
-}
-
-template <typename T>
-typename std::enable_if<std::is_floating_point<T>::value,
-GeneratorWrapper<T>>::type
-random(T a, T b) {
-    return GeneratorWrapper<T>(
-        pf::make_unique<RandomFloatingGenerator<T>>(a, b)
-    );
-}
-
-template <typename T>
-class RangeGenerator final : public IGenerator<T> {
-    T m_current;
-    T m_end;
-    T m_step;
-    bool m_positive;
-
-public:
-    RangeGenerator(T const& start, T const& end, T const& step):
-        m_current(start),
-        m_end(end),
-        m_step(step),
-        m_positive(m_step > T(0))
-    {
-        assert(m_current != m_end && "Range start and end cannot be equal");
-        assert(m_step != T(0) && "Step size cannot be zero");
-        assert(((m_positive && m_current <= m_end) || (!m_positive && m_current >= m_end)) && "Step moves away from end");
-    }
-
-    RangeGenerator(T const& start, T const& end):
-        RangeGenerator(start, end, (start < end) ? T(1) : T(-1))
-    {}
-
-    T const& get() const override {
-        return m_current;
-    }
-
-    bool next() override {
-        m_current += m_step;
-        return (m_positive) ? (m_current < m_end) : (m_current > m_end);
-    }
-};
-
-template <typename T>
-GeneratorWrapper<T> range(T const& start, T const& end, T const& step) {
-    static_assert(std::is_arithmetic<T>::value && !std::is_same<T, bool>::value, "Type must be numeric");
-    return GeneratorWrapper<T>(pf::make_unique<RangeGenerator<T>>(start, end, step));
-}
-
-template <typename T>
-GeneratorWrapper<T> range(T const& start, T const& end) {
-    static_assert(std::is_integral<T>::value && !std::is_same<T, bool>::value, "Type must be an integer");
-    return GeneratorWrapper<T>(pf::make_unique<RangeGenerator<T>>(start, end));
-}
-
-template <typename T>
-class IteratorGenerator final : public IGenerator<T> {
-    static_assert(!std::is_same<T, bool>::value,
-        "IteratorGenerator currently does not support bools"
-        "because of std::vector<bool> specialization");
-
-    std::vector<T> m_elems;
-    size_t m_current = 0;
-public:
-    template <typename InputIterator, typename InputSentinel>
-    IteratorGenerator(InputIterator first, InputSentinel last):m_elems(first, last) {
-        if (m_elems.empty()) {
-            Catch::throw_exception(GeneratorException("IteratorGenerator received no valid values"));
-        }
-    }
-
-    T const& get() const override {
-        return m_elems[m_current];
-    }
-
-    bool next() override {
-        ++m_current;
-        return m_current != m_elems.size();
-    }
-};
-
-template <typename InputIterator,
-          typename InputSentinel,
-          typename ResultType = typename std::iterator_traits<InputIterator>::value_type>
-GeneratorWrapper<ResultType> from_range(InputIterator from, InputSentinel to) {
-    return GeneratorWrapper<ResultType>(pf::make_unique<IteratorGenerator<ResultType>>(from, to));
-}
-
-template <typename Container,
-          typename ResultType = typename Container::value_type>
-GeneratorWrapper<ResultType> from_range(Container const& cnt) {
-    return GeneratorWrapper<ResultType>(pf::make_unique<IteratorGenerator<ResultType>>(cnt.begin(), cnt.end()));
-}
-
-} // namespace Generators
-} // namespace Catch
-
-// end catch_generators_specific.hpp
-
-// These files are included here so the single_include script doesn't put them
-// in the conditionally compiled sections
-// start catch_test_case_info.h
-
-#include <string>
-#include <vector>
-#include <memory>
-
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wpadded"
-#endif
-
-namespace Catch {
-
-    struct ITestInvoker;
-
-    struct TestCaseInfo {
-        enum SpecialProperties{
-            None = 0,
-            IsHidden = 1 << 1,
-            ShouldFail = 1 << 2,
-            MayFail = 1 << 3,
-            Throws = 1 << 4,
-            NonPortable = 1 << 5,
-            Benchmark = 1 << 6
-        };
-
-        TestCaseInfo(   std::string const& _name,
-                        std::string const& _className,
-                        std::string const& _description,
-                        std::vector<std::string> const& _tags,
-                        SourceLineInfo const& _lineInfo );
-
-        friend void setTags( TestCaseInfo& testCaseInfo, std::vector<std::string> tags );
-
-        bool isHidden() const;
-        bool throws() const;
-        bool okToFail() const;
-        bool expectedToFail() const;
-
-        std::string tagsAsString() const;
-
-        std::string name;
-        std::string className;
-        std::string description;
-        std::vector<std::string> tags;
-        std::vector<std::string> lcaseTags;
-        SourceLineInfo lineInfo;
-        SpecialProperties properties;
-    };
-
-    class TestCase : public TestCaseInfo {
-    public:
-
-        TestCase( ITestInvoker* testCase, TestCaseInfo&& info );
-
-        TestCase withName( std::string const& _newName ) const;
-
-        void invoke() const;
-
-        TestCaseInfo const& getTestCaseInfo() const;
-
-        bool operator == ( TestCase const& other ) const;
-        bool operator < ( TestCase const& other ) const;
-
-    private:
-        std::shared_ptr<ITestInvoker> test;
-    };
-
-    TestCase makeTestCase(  ITestInvoker* testCase,
-                            std::string const& className,
-                            NameAndTags const& nameAndTags,
-                            SourceLineInfo const& lineInfo );
-}
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-// end catch_test_case_info.h
-// start catch_interfaces_runner.h
-
-namespace Catch {
-
-    struct IRunner {
-        virtual ~IRunner();
-        virtual bool aborting() const = 0;
-    };
-}
-
-// end catch_interfaces_runner.h
-
-#ifdef __OBJC__
-// start catch_objc.hpp
-
-#import <objc/runtime.h>
-
-#include <string>
-
-// NB. Any general catch headers included here must be included
-// in catch.hpp first to make sure they are included by the single
-// header for non obj-usage
-
-///////////////////////////////////////////////////////////////////////////////
-// This protocol is really only here for (self) documenting purposes, since
-// all its methods are optional.
-@protocol OcFixture
-
-@optional
-
--(void) setUp;
--(void) tearDown;
-
-@end
-
-namespace Catch {
-
-    class OcMethod : public ITestInvoker {
-
-    public:
-        OcMethod( Class cls, SEL sel ) : m_cls( cls ), m_sel( sel ) {}
-
-        virtual void invoke() const {
-            id obj = [[m_cls alloc] init];
-
-            performOptionalSelector( obj, @selector(setUp)  );
-            performOptionalSelector( obj, m_sel );
-            performOptionalSelector( obj, @selector(tearDown)  );
-
-            arcSafeRelease( obj );
-        }
-    private:
-        virtual ~OcMethod() {}
-
-        Class m_cls;
-        SEL m_sel;
-    };
-
-    namespace Detail{
-
-        inline std::string getAnnotation(   Class cls,
-                                            std::string const& annotationName,
-                                            std::string const& testCaseName ) {
-            NSString* selStr = [[NSString alloc] initWithFormat:@"Catch_%s_%s", annotationName.c_str(), testCaseName.c_str()];
-            SEL sel = NSSelectorFromString( selStr );
-            arcSafeRelease( selStr );
-            id value = performOptionalSelector( cls, sel );
-            if( value )
-                return [(NSString*)value UTF8String];
-            return "";
-        }
-    }
-
-    inline std::size_t registerTestMethods() {
-        std::size_t noTestMethods = 0;
-        int noClasses = objc_getClassList( nullptr, 0 );
-
-        Class* classes = (CATCH_UNSAFE_UNRETAINED Class *)malloc( sizeof(Class) * noClasses);
-        objc_getClassList( classes, noClasses );
-
-        for( int c = 0; c < noClasses; c++ ) {
-            Class cls = classes[c];
-            {
-                u_int count;
-                Method* methods = class_copyMethodList( cls, &count );
-                for( u_int m = 0; m < count ; m++ ) {
-                    SEL selector = method_getName(methods[m]);
-                    std::string methodName = sel_getName(selector);
-                    if( startsWith( methodName, "Catch_TestCase_" ) ) {
-                        std::string testCaseName = methodName.substr( 15 );
-                        std::string name = Detail::getAnnotation( cls, "Name", testCaseName );
-                        std::string desc = Detail::getAnnotation( cls, "Description", testCaseName );
-                        const char* className = class_getName( cls );
-
-                        getMutableRegistryHub().registerTest( makeTestCase( new OcMethod( cls, selector ), className, NameAndTags( name.c_str(), desc.c_str() ), SourceLineInfo("",0) ) );
-                        noTestMethods++;
-                    }
-                }
-                free(methods);
-            }
-        }
-        return noTestMethods;
-    }
-
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-
-    namespace Matchers {
-        namespace Impl {
-        namespace NSStringMatchers {
-
-            struct StringHolder : MatcherBase<NSString*>{
-                StringHolder( NSString* substr ) : m_substr( [substr copy] ){}
-                StringHolder( StringHolder const& other ) : m_substr( [other.m_substr copy] ){}
-                StringHolder() {
-                    arcSafeRelease( m_substr );
-                }
-
-                bool match( NSString* str ) const override {
-                    return false;
-                }
-
-                NSString* CATCH_ARC_STRONG m_substr;
-            };
-
-            struct Equals : StringHolder {
-                Equals( NSString* substr ) : StringHolder( substr ){}
-
-                bool match( NSString* str ) const override {
-                    return  (str != nil || m_substr == nil ) &&
-                            [str isEqualToString:m_substr];
-                }
-
-                std::string describe() const override {
-                    return "equals string: " + Catch::Detail::stringify( m_substr );
-                }
-            };
-
-            struct Contains : StringHolder {
-                Contains( NSString* substr ) : StringHolder( substr ){}
-
-                bool match( NSString* str ) const override {
-                    return  (str != nil || m_substr == nil ) &&
-                            [str rangeOfString:m_substr].location != NSNotFound;
-                }
-
-                std::string describe() const override {
-                    return "contains string: " + Catch::Detail::stringify( m_substr );
-                }
-            };
-
-            struct StartsWith : StringHolder {
-                StartsWith( NSString* substr ) : StringHolder( substr ){}
-
-                bool match( NSString* str ) const override {
-                    return  (str != nil || m_substr == nil ) &&
-                            [str rangeOfString:m_substr].location == 0;
-                }
-
-                std::string describe() const override {
-                    return "starts with: " + Catch::Detail::stringify( m_substr );
-                }
-            };
-            struct EndsWith : StringHolder {
-                EndsWith( NSString* substr ) : StringHolder( substr ){}
-
-                bool match( NSString* str ) const override {
-                    return  (str != nil || m_substr == nil ) &&
-                            [str rangeOfString:m_substr].location == [str length] - [m_substr length];
-                }
-
-                std::string describe() const override {
-                    return "ends with: " + Catch::Detail::stringify( m_substr );
-                }
-            };
-
-        } // namespace NSStringMatchers
-        } // namespace Impl
-
-        inline Impl::NSStringMatchers::Equals
-            Equals( NSString* substr ){ return Impl::NSStringMatchers::Equals( substr ); }
-
-        inline Impl::NSStringMatchers::Contains
-            Contains( NSString* substr ){ return Impl::NSStringMatchers::Contains( substr ); }
-
-        inline Impl::NSStringMatchers::StartsWith
-            StartsWith( NSString* substr ){ return Impl::NSStringMatchers::StartsWith( substr ); }
-
-        inline Impl::NSStringMatchers::EndsWith
-            EndsWith( NSString* substr ){ return Impl::NSStringMatchers::EndsWith( substr ); }
-
-    } // namespace Matchers
-
-    using namespace Matchers;
-
-#endif // CATCH_CONFIG_DISABLE_MATCHERS
-
-} // namespace Catch
-
-///////////////////////////////////////////////////////////////////////////////
-#define OC_MAKE_UNIQUE_NAME( root, uniqueSuffix ) root##uniqueSuffix
-#define OC_TEST_CASE2( name, desc, uniqueSuffix ) \
-+(NSString*) OC_MAKE_UNIQUE_NAME( Catch_Name_test_, uniqueSuffix ) \
-{ \
-return @ name; \
-} \
-+(NSString*) OC_MAKE_UNIQUE_NAME( Catch_Description_test_, uniqueSuffix ) \
-{ \
-return @ desc; \
-} \
--(void) OC_MAKE_UNIQUE_NAME( Catch_TestCase_test_, uniqueSuffix )
-
-#define OC_TEST_CASE( name, desc ) OC_TEST_CASE2( name, desc, __LINE__ )
-
-// end catch_objc.hpp
-#endif
-
-// Benchmarking needs the externally-facing parts of reporters to work
-#if defined(CATCH_CONFIG_EXTERNAL_INTERFACES) || defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-// start catch_external_interfaces.h
-
-// start catch_reporter_bases.hpp
-
-// start catch_interfaces_reporter.h
-
-// start catch_config.hpp
-
-// start catch_test_spec_parser.h
-
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wpadded"
-#endif
-
-// start catch_test_spec.h
-
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wpadded"
-#endif
-
-// start catch_wildcard_pattern.h
-
-namespace Catch
-{
-    class WildcardPattern {
-        enum WildcardPosition {
-            NoWildcard = 0,
-            WildcardAtStart = 1,
-            WildcardAtEnd = 2,
-            WildcardAtBothEnds = WildcardAtStart | WildcardAtEnd
-        };
-
-    public:
-
-        WildcardPattern( std::string const& pattern, CaseSensitive::Choice caseSensitivity );
-        virtual ~WildcardPattern() = default;
-        virtual bool matches( std::string const& str ) const;
-
-    private:
-        std::string normaliseString( std::string const& str ) const;
-        CaseSensitive::Choice m_caseSensitivity;
-        WildcardPosition m_wildcard = NoWildcard;
-        std::string m_pattern;
-    };
-}
-
-// end catch_wildcard_pattern.h
-#include <string>
-#include <vector>
-#include <memory>
-
-namespace Catch {
-
-    struct IConfig;
-
-    class TestSpec {
-        class Pattern {
-        public:
-            explicit Pattern( std::string const& name );
-            virtual ~Pattern();
-            virtual bool matches( TestCaseInfo const& testCase ) const = 0;
-            std::string const& name() const;
-        private:
-            std::string const m_name;
-        };
-        using PatternPtr = std::shared_ptr<Pattern>;
-
-        class NamePattern : public Pattern {
-        public:
-            explicit NamePattern( std::string const& name, std::string const& filterString );
-            bool matches( TestCaseInfo const& testCase ) const override;
-        private:
-            WildcardPattern m_wildcardPattern;
-        };
-
-        class TagPattern : public Pattern {
-        public:
-            explicit TagPattern( std::string const& tag, std::string const& filterString );
-            bool matches( TestCaseInfo const& testCase ) const override;
-        private:
-            std::string m_tag;
-        };
-
-        class ExcludedPattern : public Pattern {
-        public:
-            explicit ExcludedPattern( PatternPtr const& underlyingPattern );
-            bool matches( TestCaseInfo const& testCase ) const override;
-        private:
-            PatternPtr m_underlyingPattern;
-        };
-
-        struct Filter {
-            std::vector<PatternPtr> m_patterns;
-
-            bool matches( TestCaseInfo const& testCase ) const;
-            std::string name() const;
-        };
-
-    public:
-        struct FilterMatch {
-            std::string name;
-            std::vector<TestCase const*> tests;
-        };
-        using Matches = std::vector<FilterMatch>;
-        using vectorStrings = std::vector<std::string>;
-
-        bool hasFilters() const;
-        bool matches( TestCaseInfo const& testCase ) const;
-        Matches matchesByFilter( std::vector<TestCase> const& testCases, IConfig const& config ) const;
-        const vectorStrings & getInvalidArgs() const;
-
-    private:
-        std::vector<Filter> m_filters;
-        std::vector<std::string> m_invalidArgs;
-        friend class TestSpecParser;
-    };
-}
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-// end catch_test_spec.h
-// start catch_interfaces_tag_alias_registry.h
-
-#include <string>
-
-namespace Catch {
-
-    struct TagAlias;
-
-    struct ITagAliasRegistry {
-        virtual ~ITagAliasRegistry();
-        // Nullptr if not present
-        virtual TagAlias const* find( std::string const& alias ) const = 0;
-        virtual std::string expandAliases( std::string const& unexpandedTestSpec ) const = 0;
-
-        static ITagAliasRegistry const& get();
-    };
-
-} // end namespace Catch
-
-// end catch_interfaces_tag_alias_registry.h
-namespace Catch {
-
-    class TestSpecParser {
-        enum Mode{ None, Name, QuotedName, Tag, EscapedName };
-        Mode m_mode = None;
-        Mode lastMode = None;
-        bool m_exclusion = false;
-        std::size_t m_pos = 0;
-        std::size_t m_realPatternPos = 0;
-        std::string m_arg;
-        std::string m_substring;
-        std::string m_patternName;
-        std::vector<std::size_t> m_escapeChars;
-        TestSpec::Filter m_currentFilter;
-        TestSpec m_testSpec;
-        ITagAliasRegistry const* m_tagAliases = nullptr;
-
-    public:
-        TestSpecParser( ITagAliasRegistry const& tagAliases );
-
-        TestSpecParser& parse( std::string const& arg );
-        TestSpec testSpec();
-
-    private:
-        bool visitChar( char c );
-        void startNewMode( Mode mode );
-        bool processNoneChar( char c );
-        void processNameChar( char c );
-        bool processOtherChar( char c );
-        void endMode();
-        void escape();
-        bool isControlChar( char c ) const;
-        void saveLastMode();
-        void revertBackToLastMode();
-        void addFilter();
-        bool separate();
-
-        // Handles common preprocessing of the pattern for name/tag patterns
-        std::string preprocessPattern();
-        // Adds the current pattern as a test name
-        void addNamePattern();
-        // Adds the current pattern as a tag
-        void addTagPattern();
-
-        inline void addCharToPattern(char c) {
-            m_substring += c;
-            m_patternName += c;
-            m_realPatternPos++;
-        }
-
-    };
-    TestSpec parseTestSpec( std::string const& arg );
-
-} // namespace Catch
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-// end catch_test_spec_parser.h
-// Libstdc++ doesn't like incomplete classes for unique_ptr
-
-#include <memory>
-#include <vector>
-#include <string>
-
-#ifndef CATCH_CONFIG_CONSOLE_WIDTH
-#define CATCH_CONFIG_CONSOLE_WIDTH 80
-#endif
-
-namespace Catch {
-
-    struct IStream;
-
-    struct ConfigData {
-        bool listTests = false;
-        bool listTags = false;
-        bool listReporters = false;
-        bool listTestNamesOnly = false;
-
-        bool showSuccessfulTests = false;
-        bool shouldDebugBreak = false;
-        bool noThrow = false;
-        bool showHelp = false;
-        bool showInvisibles = false;
-        bool filenamesAsTags = false;
-        bool libIdentify = false;
-
-        int abortAfter = -1;
-        unsigned int rngSeed = 0;
-
-        bool benchmarkNoAnalysis = false;
-        unsigned int benchmarkSamples = 100;
-        double benchmarkConfidenceInterval = 0.95;
-        unsigned int benchmarkResamples = 100000;
-        std::chrono::milliseconds::rep benchmarkWarmupTime = 100;
-
-        Verbosity verbosity = Verbosity::Normal;
-        WarnAbout::What warnings = WarnAbout::Nothing;
-        ShowDurations::OrNot showDurations = ShowDurations::DefaultForReporter;
-        RunTests::InWhatOrder runOrder = RunTests::InDeclarationOrder;
-        UseColour::YesOrNo useColour = UseColour::Auto;
-        WaitForKeypress::When waitForKeypress = WaitForKeypress::Never;
-
-        std::string outputFilename;
-        std::string name;
-        std::string processName;
-#ifndef CATCH_CONFIG_DEFAULT_REPORTER
-#define CATCH_CONFIG_DEFAULT_REPORTER "console"
-#endif
-        std::string reporterName = CATCH_CONFIG_DEFAULT_REPORTER;
-#undef CATCH_CONFIG_DEFAULT_REPORTER
-
-        std::vector<std::string> testsOrTags;
-        std::vector<std::string> sectionsToRun;
-    };
-
-    class Config : public IConfig {
-    public:
-
-        Config() = default;
-        Config( ConfigData const& data );
-        virtual ~Config() = default;
-
-        std::string const& getFilename() const;
-
-        bool listTests() const;
-        bool listTestNamesOnly() const;
-        bool listTags() const;
-        bool listReporters() const;
-
-        std::string getProcessName() const;
-        std::string const& getReporterName() const;
-
-        std::vector<std::string> const& getTestsOrTags() const override;
-        std::vector<std::string> const& getSectionsToRun() const override;
-
-        TestSpec const& testSpec() const override;
-        bool hasTestFilters() const override;
-
-        bool showHelp() const;
-
-        // IConfig interface
-        bool allowThrows() const override;
-        std::ostream& stream() const override;
-        std::string name() const override;
-        bool includeSuccessfulResults() const override;
-        bool warnAboutMissingAssertions() const override;
-        bool warnAboutNoTests() const override;
-        ShowDurations::OrNot showDurations() const override;
-        RunTests::InWhatOrder runOrder() const override;
-        unsigned int rngSeed() const override;
-        UseColour::YesOrNo useColour() const override;
-        bool shouldDebugBreak() const override;
-        int abortAfter() const override;
-        bool showInvisibles() const override;
-        Verbosity verbosity() const override;
-        bool benchmarkNoAnalysis() const override;
-        int benchmarkSamples() const override;
-        double benchmarkConfidenceInterval() const override;
-        unsigned int benchmarkResamples() const override;
-        std::chrono::milliseconds benchmarkWarmupTime() const override;
-
-    private:
-
-        IStream const* openStream();
-        ConfigData m_data;
-
-        std::unique_ptr<IStream const> m_stream;
-        TestSpec m_testSpec;
-        bool m_hasTestFilters = false;
-    };
-
-} // end namespace Catch
-
-// end catch_config.hpp
-// start catch_assertionresult.h
-
-#include <string>
-
-namespace Catch {
-
-    struct AssertionResultData
-    {
-        AssertionResultData() = delete;
-
-        AssertionResultData( ResultWas::OfType _resultType, LazyExpression const& _lazyExpression );
-
-        std::string message;
-        mutable std::string reconstructedExpression;
-        LazyExpression lazyExpression;
-        ResultWas::OfType resultType;
-
-        std::string reconstructExpression() const;
-    };
-
-    class AssertionResult {
-    public:
-        AssertionResult() = delete;
-        AssertionResult( AssertionInfo const& info, AssertionResultData const& data );
-
-        bool isOk() const;
-        bool succeeded() const;
-        ResultWas::OfType getResultType() const;
-        bool hasExpression() const;
-        bool hasMessage() const;
-        std::string getExpression() const;
-        std::string getExpressionInMacro() const;
-        bool hasExpandedExpression() const;
-        std::string getExpandedExpression() const;
-        std::string getMessage() const;
-        SourceLineInfo getSourceInfo() const;
-        StringRef getTestMacroName() const;
-
-    //protected:
-        AssertionInfo m_info;
-        AssertionResultData m_resultData;
-    };
-
-} // end namespace Catch
-
-// end catch_assertionresult.h
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-// start catch_estimate.hpp
-
- // Statistics estimates
-
-
-namespace Catch {
-    namespace Benchmark {
-        template <typename Duration>
-        struct Estimate {
-            Duration point;
-            Duration lower_bound;
-            Duration upper_bound;
-            double confidence_interval;
-
-            template <typename Duration2>
-            operator Estimate<Duration2>() const {
-                return { point, lower_bound, upper_bound, confidence_interval };
-            }
-        };
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_estimate.hpp
-// start catch_outlier_classification.hpp
-
-// Outlier information
-
-namespace Catch {
-    namespace Benchmark {
-        struct OutlierClassification {
-            int samples_seen = 0;
-            int low_severe = 0;     // more than 3 times IQR below Q1
-            int low_mild = 0;       // 1.5 to 3 times IQR below Q1
-            int high_mild = 0;      // 1.5 to 3 times IQR above Q3
-            int high_severe = 0;    // more than 3 times IQR above Q3
-
-            int total() const {
-                return low_severe + low_mild + high_mild + high_severe;
-            }
-        };
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_outlier_classification.hpp
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-#include <string>
-#include <iosfwd>
-#include <map>
-#include <set>
-#include <memory>
-#include <algorithm>
-
-namespace Catch {
-
-    struct ReporterConfig {
-        explicit ReporterConfig( IConfigPtr const& _fullConfig );
-
-        ReporterConfig( IConfigPtr const& _fullConfig, std::ostream& _stream );
-
-        std::ostream& stream() const;
-        IConfigPtr fullConfig() const;
-
-    private:
-        std::ostream* m_stream;
-        IConfigPtr m_fullConfig;
-    };
-
-    struct ReporterPreferences {
-        bool shouldRedirectStdOut = false;
-        bool shouldReportAllAssertions = false;
-    };
-
-    template<typename T>
-    struct LazyStat : Option<T> {
-        LazyStat& operator=( T const& _value ) {
-            Option<T>::operator=( _value );
-            used = false;
-            return *this;
-        }
-        void reset() {
-            Option<T>::reset();
-            used = false;
-        }
-        bool used = false;
-    };
-
-    struct TestRunInfo {
-        TestRunInfo( std::string const& _name );
-        std::string name;
-    };
-    struct GroupInfo {
-        GroupInfo(  std::string const& _name,
-                    std::size_t _groupIndex,
-                    std::size_t _groupsCount );
-
-        std::string name;
-        std::size_t groupIndex;
-        std::size_t groupsCounts;
-    };
-
-    struct AssertionStats {
-        AssertionStats( AssertionResult const& _assertionResult,
-                        std::vector<MessageInfo> const& _infoMessages,
-                        Totals const& _totals );
-
-        AssertionStats( AssertionStats const& )              = default;
-        AssertionStats( AssertionStats && )                  = default;
-        AssertionStats& operator = ( AssertionStats const& ) = delete;
-        AssertionStats& operator = ( AssertionStats && )     = delete;
-        virtual ~AssertionStats();
-
-        AssertionResult assertionResult;
-        std::vector<MessageInfo> infoMessages;
-        Totals totals;
-    };
-
-    struct SectionStats {
-        SectionStats(   SectionInfo const& _sectionInfo,
-                        Counts const& _assertions,
-                        double _durationInSeconds,
-                        bool _missingAssertions );
-        SectionStats( SectionStats const& )              = default;
-        SectionStats( SectionStats && )                  = default;
-        SectionStats& operator = ( SectionStats const& ) = default;
-        SectionStats& operator = ( SectionStats && )     = default;
-        virtual ~SectionStats();
-
-        SectionInfo sectionInfo;
-        Counts assertions;
-        double durationInSeconds;
-        bool missingAssertions;
-    };
-
-    struct TestCaseStats {
-        TestCaseStats(  TestCaseInfo const& _testInfo,
-                        Totals const& _totals,
-                        std::string const& _stdOut,
-                        std::string const& _stdErr,
-                        bool _aborting );
-
-        TestCaseStats( TestCaseStats const& )              = default;
-        TestCaseStats( TestCaseStats && )                  = default;
-        TestCaseStats& operator = ( TestCaseStats const& ) = default;
-        TestCaseStats& operator = ( TestCaseStats && )     = default;
-        virtual ~TestCaseStats();
-
-        TestCaseInfo testInfo;
-        Totals totals;
-        std::string stdOut;
-        std::string stdErr;
-        bool aborting;
-    };
-
-    struct TestGroupStats {
-        TestGroupStats( GroupInfo const& _groupInfo,
-                        Totals const& _totals,
-                        bool _aborting );
-        TestGroupStats( GroupInfo const& _groupInfo );
-
-        TestGroupStats( TestGroupStats const& )              = default;
-        TestGroupStats( TestGroupStats && )                  = default;
-        TestGroupStats& operator = ( TestGroupStats const& ) = default;
-        TestGroupStats& operator = ( TestGroupStats && )     = default;
-        virtual ~TestGroupStats();
-
-        GroupInfo groupInfo;
-        Totals totals;
-        bool aborting;
-    };
-
-    struct TestRunStats {
-        TestRunStats(   TestRunInfo const& _runInfo,
-                        Totals const& _totals,
-                        bool _aborting );
-
-        TestRunStats( TestRunStats const& )              = default;
-        TestRunStats( TestRunStats && )                  = default;
-        TestRunStats& operator = ( TestRunStats const& ) = default;
-        TestRunStats& operator = ( TestRunStats && )     = default;
-        virtual ~TestRunStats();
-
-        TestRunInfo runInfo;
-        Totals totals;
-        bool aborting;
-    };
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-    struct BenchmarkInfo {
-        std::string name;
-        double estimatedDuration;
-        int iterations;
-        int samples;
-        unsigned int resamples;
-        double clockResolution;
-        double clockCost;
-    };
-
-    template <class Duration>
-    struct BenchmarkStats {
-        BenchmarkInfo info;
-
-        std::vector<Duration> samples;
-        Benchmark::Estimate<Duration> mean;
-        Benchmark::Estimate<Duration> standardDeviation;
-        Benchmark::OutlierClassification outliers;
-        double outlierVariance;
-
-        template <typename Duration2>
-        operator BenchmarkStats<Duration2>() const {
-            std::vector<Duration2> samples2;
-            samples2.reserve(samples.size());
-            std::transform(samples.begin(), samples.end(), std::back_inserter(samples2), [](Duration d) { return Duration2(d); });
-            return {
-                info,
-                std::move(samples2),
-                mean,
-                standardDeviation,
-                outliers,
-                outlierVariance,
-            };
-        }
-    };
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-    struct IStreamingReporter {
-        virtual ~IStreamingReporter() = default;
-
-        // Implementing class must also provide the following static methods:
-        // static std::string getDescription();
-        // static std::set<Verbosity> getSupportedVerbosities()
-
-        virtual ReporterPreferences getPreferences() const = 0;
-
-        virtual void noMatchingTestCases( std::string const& spec ) = 0;
-
-        virtual void reportInvalidArguments(std::string const&) {}
-
-        virtual void testRunStarting( TestRunInfo const& testRunInfo ) = 0;
-        virtual void testGroupStarting( GroupInfo const& groupInfo ) = 0;
-
-        virtual void testCaseStarting( TestCaseInfo const& testInfo ) = 0;
-        virtual void sectionStarting( SectionInfo const& sectionInfo ) = 0;
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-        virtual void benchmarkPreparing( std::string const& ) {}
-        virtual void benchmarkStarting( BenchmarkInfo const& ) {}
-        virtual void benchmarkEnded( BenchmarkStats<> const& ) {}
-        virtual void benchmarkFailed( std::string const& ) {}
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-        virtual void assertionStarting( AssertionInfo const& assertionInfo ) = 0;
-
-        // The return value indicates if the messages buffer should be cleared:
-        virtual bool assertionEnded( AssertionStats const& assertionStats ) = 0;
-
-        virtual void sectionEnded( SectionStats const& sectionStats ) = 0;
-        virtual void testCaseEnded( TestCaseStats const& testCaseStats ) = 0;
-        virtual void testGroupEnded( TestGroupStats const& testGroupStats ) = 0;
-        virtual void testRunEnded( TestRunStats const& testRunStats ) = 0;
-
-        virtual void skipTest( TestCaseInfo const& testInfo ) = 0;
-
-        // Default empty implementation provided
-        virtual void fatalErrorEncountered( StringRef name );
-
-        virtual bool isMulti() const;
-    };
-    using IStreamingReporterPtr = std::unique_ptr<IStreamingReporter>;
-
-    struct IReporterFactory {
-        virtual ~IReporterFactory();
-        virtual IStreamingReporterPtr create( ReporterConfig const& config ) const = 0;
-        virtual std::string getDescription() const = 0;
-    };
-    using IReporterFactoryPtr = std::shared_ptr<IReporterFactory>;
-
-    struct IReporterRegistry {
-        using FactoryMap = std::map<std::string, IReporterFactoryPtr>;
-        using Listeners = std::vector<IReporterFactoryPtr>;
-
-        virtual ~IReporterRegistry();
-        virtual IStreamingReporterPtr create( std::string const& name, IConfigPtr const& config ) const = 0;
-        virtual FactoryMap const& getFactories() const = 0;
-        virtual Listeners const& getListeners() const = 0;
-    };
-
-} // end namespace Catch
-
-// end catch_interfaces_reporter.h
-#include <algorithm>
-#include <cstring>
-#include <cfloat>
-#include <cstdio>
-#include <cassert>
-#include <memory>
-#include <ostream>
-
-namespace Catch {
-    void prepareExpandedExpression(AssertionResult& result);
-
-    // Returns double formatted as %.3f (format expected on output)
-    std::string getFormattedDuration( double duration );
-
-    std::string serializeFilters( std::vector<std::string> const& container );
-
-    template<typename DerivedT>
-    struct StreamingReporterBase : IStreamingReporter {
-
-        StreamingReporterBase( ReporterConfig const& _config )
-        :   m_config( _config.fullConfig() ),
-            stream( _config.stream() )
-        {
-            m_reporterPrefs.shouldRedirectStdOut = false;
-            if( !DerivedT::getSupportedVerbosities().count( m_config->verbosity() ) )
-                CATCH_ERROR( "Verbosity level not supported by this reporter" );
-        }
-
-        ReporterPreferences getPreferences() const override {
-            return m_reporterPrefs;
-        }
-
-        static std::set<Verbosity> getSupportedVerbosities() {
-            return { Verbosity::Normal };
-        }
-
-        ~StreamingReporterBase() override = default;
-
-        void noMatchingTestCases(std::string const&) override {}
-
-        void reportInvalidArguments(std::string const&) override {}
-
-        void testRunStarting(TestRunInfo const& _testRunInfo) override {
-            currentTestRunInfo = _testRunInfo;
-        }
-
-        void testGroupStarting(GroupInfo const& _groupInfo) override {
-            currentGroupInfo = _groupInfo;
-        }
-
-        void testCaseStarting(TestCaseInfo const& _testInfo) override  {
-            currentTestCaseInfo = _testInfo;
-        }
-        void sectionStarting(SectionInfo const& _sectionInfo) override {
-            m_sectionStack.push_back(_sectionInfo);
-        }
-
-        void sectionEnded(SectionStats const& /* _sectionStats */) override {
-            m_sectionStack.pop_back();
-        }
-        void testCaseEnded(TestCaseStats const& /* _testCaseStats */) override {
-            currentTestCaseInfo.reset();
-        }
-        void testGroupEnded(TestGroupStats const& /* _testGroupStats */) override {
-            currentGroupInfo.reset();
-        }
-        void testRunEnded(TestRunStats const& /* _testRunStats */) override {
-            currentTestCaseInfo.reset();
-            currentGroupInfo.reset();
-            currentTestRunInfo.reset();
-        }
-
-        void skipTest(TestCaseInfo const&) override {
-            // Don't do anything with this by default.
-            // It can optionally be overridden in the derived class.
-        }
-
-        IConfigPtr m_config;
-        std::ostream& stream;
-
-        LazyStat<TestRunInfo> currentTestRunInfo;
-        LazyStat<GroupInfo> currentGroupInfo;
-        LazyStat<TestCaseInfo> currentTestCaseInfo;
-
-        std::vector<SectionInfo> m_sectionStack;
-        ReporterPreferences m_reporterPrefs;
-    };
-
-    template<typename DerivedT>
-    struct CumulativeReporterBase : IStreamingReporter {
-        template<typename T, typename ChildNodeT>
-        struct Node {
-            explicit Node( T const& _value ) : value( _value ) {}
-            virtual ~Node() {}
-
-            using ChildNodes = std::vector<std::shared_ptr<ChildNodeT>>;
-            T value;
-            ChildNodes children;
-        };
-        struct SectionNode {
-            explicit SectionNode(SectionStats const& _stats) : stats(_stats) {}
-            virtual ~SectionNode() = default;
-
-            bool operator == (SectionNode const& other) const {
-                return stats.sectionInfo.lineInfo == other.stats.sectionInfo.lineInfo;
-            }
-            bool operator == (std::shared_ptr<SectionNode> const& other) const {
-                return operator==(*other);
-            }
-
-            SectionStats stats;
-            using ChildSections = std::vector<std::shared_ptr<SectionNode>>;
-            using Assertions = std::vector<AssertionStats>;
-            ChildSections childSections;
-            Assertions assertions;
-            std::string stdOut;
-            std::string stdErr;
-        };
-
-        struct BySectionInfo {
-            BySectionInfo( SectionInfo const& other ) : m_other( other ) {}
-            BySectionInfo( BySectionInfo const& other ) : m_other( other.m_other ) {}
-            bool operator() (std::shared_ptr<SectionNode> const& node) const {
-                return ((node->stats.sectionInfo.name == m_other.name) &&
-                        (node->stats.sectionInfo.lineInfo == m_other.lineInfo));
-            }
-            void operator=(BySectionInfo const&) = delete;
-
-        private:
-            SectionInfo const& m_other;
-        };
-
-        using TestCaseNode = Node<TestCaseStats, SectionNode>;
-        using TestGroupNode = Node<TestGroupStats, TestCaseNode>;
-        using TestRunNode = Node<TestRunStats, TestGroupNode>;
-
-        CumulativeReporterBase( ReporterConfig const& _config )
-        :   m_config( _config.fullConfig() ),
-            stream( _config.stream() )
-        {
-            m_reporterPrefs.shouldRedirectStdOut = false;
-            if( !DerivedT::getSupportedVerbosities().count( m_config->verbosity() ) )
-                CATCH_ERROR( "Verbosity level not supported by this reporter" );
-        }
-        ~CumulativeReporterBase() override = default;
-
-        ReporterPreferences getPreferences() const override {
-            return m_reporterPrefs;
-        }
-
-        static std::set<Verbosity> getSupportedVerbosities() {
-            return { Verbosity::Normal };
-        }
-
-        void testRunStarting( TestRunInfo const& ) override {}
-        void testGroupStarting( GroupInfo const& ) override {}
-
-        void testCaseStarting( TestCaseInfo const& ) override {}
-
-        void sectionStarting( SectionInfo const& sectionInfo ) override {
-            SectionStats incompleteStats( sectionInfo, Counts(), 0, false );
-            std::shared_ptr<SectionNode> node;
-            if( m_sectionStack.empty() ) {
-                if( !m_rootSection )
-                    m_rootSection = std::make_shared<SectionNode>( incompleteStats );
-                node = m_rootSection;
-            }
-            else {
-                SectionNode& parentNode = *m_sectionStack.back();
-                auto it =
-                    std::find_if(   parentNode.childSections.begin(),
-                                    parentNode.childSections.end(),
-                                    BySectionInfo( sectionInfo ) );
-                if( it == parentNode.childSections.end() ) {
-                    node = std::make_shared<SectionNode>( incompleteStats );
-                    parentNode.childSections.push_back( node );
-                }
-                else
-                    node = *it;
-            }
-            m_sectionStack.push_back( node );
-            m_deepestSection = std::move(node);
-        }
-
-        void assertionStarting(AssertionInfo const&) override {}
-
-        bool assertionEnded(AssertionStats const& assertionStats) override {
-            assert(!m_sectionStack.empty());
-            // AssertionResult holds a pointer to a temporary DecomposedExpression,
-            // which getExpandedExpression() calls to build the expression string.
-            // Our section stack copy of the assertionResult will likely outlive the
-            // temporary, so it must be expanded or discarded now to avoid calling
-            // a destroyed object later.
-            prepareExpandedExpression(const_cast<AssertionResult&>( assertionStats.assertionResult ) );
-            SectionNode& sectionNode = *m_sectionStack.back();
-            sectionNode.assertions.push_back(assertionStats);
-            return true;
-        }
-        void sectionEnded(SectionStats const& sectionStats) override {
-            assert(!m_sectionStack.empty());
-            SectionNode& node = *m_sectionStack.back();
-            node.stats = sectionStats;
-            m_sectionStack.pop_back();
-        }
-        void testCaseEnded(TestCaseStats const& testCaseStats) override {
-            auto node = std::make_shared<TestCaseNode>(testCaseStats);
-            assert(m_sectionStack.size() == 0);
-            node->children.push_back(m_rootSection);
-            m_testCases.push_back(node);
-            m_rootSection.reset();
-
-            assert(m_deepestSection);
-            m_deepestSection->stdOut = testCaseStats.stdOut;
-            m_deepestSection->stdErr = testCaseStats.stdErr;
-        }
-        void testGroupEnded(TestGroupStats const& testGroupStats) override {
-            auto node = std::make_shared<TestGroupNode>(testGroupStats);
-            node->children.swap(m_testCases);
-            m_testGroups.push_back(node);
-        }
-        void testRunEnded(TestRunStats const& testRunStats) override {
-            auto node = std::make_shared<TestRunNode>(testRunStats);
-            node->children.swap(m_testGroups);
-            m_testRuns.push_back(node);
-            testRunEndedCumulative();
-        }
-        virtual void testRunEndedCumulative() = 0;
-
-        void skipTest(TestCaseInfo const&) override {}
-
-        IConfigPtr m_config;
-        std::ostream& stream;
-        std::vector<AssertionStats> m_assertions;
-        std::vector<std::vector<std::shared_ptr<SectionNode>>> m_sections;
-        std::vector<std::shared_ptr<TestCaseNode>> m_testCases;
-        std::vector<std::shared_ptr<TestGroupNode>> m_testGroups;
-
-        std::vector<std::shared_ptr<TestRunNode>> m_testRuns;
-
-        std::shared_ptr<SectionNode> m_rootSection;
-        std::shared_ptr<SectionNode> m_deepestSection;
-        std::vector<std::shared_ptr<SectionNode>> m_sectionStack;
-        ReporterPreferences m_reporterPrefs;
-    };
-
-    template<char C>
-    char const* getLineOfChars() {
-        static char line[CATCH_CONFIG_CONSOLE_WIDTH] = {0};
-        if( !*line ) {
-            std::memset( line, C, CATCH_CONFIG_CONSOLE_WIDTH-1 );
-            line[CATCH_CONFIG_CONSOLE_WIDTH-1] = 0;
-        }
-        return line;
-    }
-
-    struct TestEventListenerBase : StreamingReporterBase<TestEventListenerBase> {
-        TestEventListenerBase( ReporterConfig const& _config );
-
-        static std::set<Verbosity> getSupportedVerbosities();
-
-        void assertionStarting(AssertionInfo const&) override;
-        bool assertionEnded(AssertionStats const&) override;
-    };
-
-} // end namespace Catch
-
-// end catch_reporter_bases.hpp
-// start catch_console_colour.h
-
-namespace Catch {
-
-    struct Colour {
-        enum Code {
-            None = 0,
-
-            White,
-            Red,
-            Green,
-            Blue,
-            Cyan,
-            Yellow,
-            Grey,
-
-            Bright = 0x10,
-
-            BrightRed = Bright | Red,
-            BrightGreen = Bright | Green,
-            LightGrey = Bright | Grey,
-            BrightWhite = Bright | White,
-            BrightYellow = Bright | Yellow,
-
-            // By intention
-            FileName = LightGrey,
-            Warning = BrightYellow,
-            ResultError = BrightRed,
-            ResultSuccess = BrightGreen,
-            ResultExpectedFailure = Warning,
-
-            Error = BrightRed,
-            Success = Green,
-
-            OriginalExpression = Cyan,
-            ReconstructedExpression = BrightYellow,
-
-            SecondaryText = LightGrey,
-            Headers = White
-        };
-
-        // Use constructed object for RAII guard
-        Colour( Code _colourCode );
-        Colour( Colour&& other ) noexcept;
-        Colour& operator=( Colour&& other ) noexcept;
-        ~Colour();
-
-        // Use static method for one-shot changes
-        static void use( Code _colourCode );
-
-    private:
-        bool m_moved = false;
-    };
-
-    std::ostream& operator << ( std::ostream& os, Colour const& );
-
-} // end namespace Catch
-
-// end catch_console_colour.h
-// start catch_reporter_registrars.hpp
-
-
-namespace Catch {
-
-    template<typename T>
-    class ReporterRegistrar {
-
-        class ReporterFactory : public IReporterFactory {
-
-            IStreamingReporterPtr create( ReporterConfig const& config ) const override {
-                return std::unique_ptr<T>( new T( config ) );
-            }
-
-            std::string getDescription() const override {
-                return T::getDescription();
-            }
-        };
-
-    public:
-
-        explicit ReporterRegistrar( std::string const& name ) {
-            getMutableRegistryHub().registerReporter( name, std::make_shared<ReporterFactory>() );
-        }
-    };
-
-    template<typename T>
-    class ListenerRegistrar {
-
-        class ListenerFactory : public IReporterFactory {
-
-            IStreamingReporterPtr create( ReporterConfig const& config ) const override {
-                return std::unique_ptr<T>( new T( config ) );
-            }
-            std::string getDescription() const override {
-                return std::string();
-            }
-        };
-
-    public:
-
-        ListenerRegistrar() {
-            getMutableRegistryHub().registerListener( std::make_shared<ListenerFactory>() );
-        }
-    };
-}
-
-#if !defined(CATCH_CONFIG_DISABLE)
-
-#define CATCH_REGISTER_REPORTER( name, reporterType ) \
-    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION         \
-    CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS          \
-    namespace{ Catch::ReporterRegistrar<reporterType> catch_internal_RegistrarFor##reporterType( name ); } \
-    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
-
-#define CATCH_REGISTER_LISTENER( listenerType ) \
-    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION   \
-    CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS    \
-    namespace{ Catch::ListenerRegistrar<listenerType> catch_internal_RegistrarFor##listenerType; } \
-    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
-#else // CATCH_CONFIG_DISABLE
-
-#define CATCH_REGISTER_REPORTER(name, reporterType)
-#define CATCH_REGISTER_LISTENER(listenerType)
-
-#endif // CATCH_CONFIG_DISABLE
-
-// end catch_reporter_registrars.hpp
-// Allow users to base their work off existing reporters
-// start catch_reporter_compact.h
-
-namespace Catch {
-
-    struct CompactReporter : StreamingReporterBase<CompactReporter> {
-
-        using StreamingReporterBase::StreamingReporterBase;
-
-        ~CompactReporter() override;
-
-        static std::string getDescription();
-
-        ReporterPreferences getPreferences() const override;
-
-        void noMatchingTestCases(std::string const& spec) override;
-
-        void assertionStarting(AssertionInfo const&) override;
-
-        bool assertionEnded(AssertionStats const& _assertionStats) override;
-
-        void sectionEnded(SectionStats const& _sectionStats) override;
-
-        void testRunEnded(TestRunStats const& _testRunStats) override;
-
-    };
-
-} // end namespace Catch
-
-// end catch_reporter_compact.h
-// start catch_reporter_console.h
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4061) // Not all labels are EXPLICITLY handled in switch
-                              // Note that 4062 (not all labels are handled
-                              // and default is missing) is enabled
-#endif
-
-namespace Catch {
-    // Fwd decls
-    struct SummaryColumn;
-    class TablePrinter;
-
-    struct ConsoleReporter : StreamingReporterBase<ConsoleReporter> {
-        std::unique_ptr<TablePrinter> m_tablePrinter;
-
-        ConsoleReporter(ReporterConfig const& config);
-        ~ConsoleReporter() override;
-        static std::string getDescription();
-
-        void noMatchingTestCases(std::string const& spec) override;
-
-        void reportInvalidArguments(std::string const&arg) override;
-
-        void assertionStarting(AssertionInfo const&) override;
-
-        bool assertionEnded(AssertionStats const& _assertionStats) override;
-
-        void sectionStarting(SectionInfo const& _sectionInfo) override;
-        void sectionEnded(SectionStats const& _sectionStats) override;
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-        void benchmarkPreparing(std::string const& name) override;
-        void benchmarkStarting(BenchmarkInfo const& info) override;
-        void benchmarkEnded(BenchmarkStats<> const& stats) override;
-        void benchmarkFailed(std::string const& error) override;
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-        void testCaseEnded(TestCaseStats const& _testCaseStats) override;
-        void testGroupEnded(TestGroupStats const& _testGroupStats) override;
-        void testRunEnded(TestRunStats const& _testRunStats) override;
-        void testRunStarting(TestRunInfo const& _testRunInfo) override;
-    private:
-
-        void lazyPrint();
-
-        void lazyPrintWithoutClosingBenchmarkTable();
-        void lazyPrintRunInfo();
-        void lazyPrintGroupInfo();
-        void printTestCaseAndSectionHeader();
-
-        void printClosedHeader(std::string const& _name);
-        void printOpenHeader(std::string const& _name);
-
-        // if string has a : in first line will set indent to follow it on
-        // subsequent lines
-        void printHeaderString(std::string const& _string, std::size_t indent = 0);
-
-        void printTotals(Totals const& totals);
-        void printSummaryRow(std::string const& label, std::vector<SummaryColumn> const& cols, std::size_t row);
-
-        void printTotalsDivider(Totals const& totals);
-        void printSummaryDivider();
-        void printTestFilters();
-
-    private:
-        bool m_headerPrinted = false;
-    };
-
-} // end namespace Catch
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
-
-// end catch_reporter_console.h
-// start catch_reporter_junit.h
-
-// start catch_xmlwriter.h
-
-#include <vector>
-
-namespace Catch {
-    enum class XmlFormatting {
-        None = 0x00,
-        Indent = 0x01,
-        Newline = 0x02,
-    };
-
-    XmlFormatting operator | (XmlFormatting lhs, XmlFormatting rhs);
-    XmlFormatting operator & (XmlFormatting lhs, XmlFormatting rhs);
-
-    class XmlEncode {
-    public:
-        enum ForWhat { ForTextNodes, ForAttributes };
-
-        XmlEncode( std::string const& str, ForWhat forWhat = ForTextNodes );
-
-        void encodeTo( std::ostream& os ) const;
-
-        friend std::ostream& operator << ( std::ostream& os, XmlEncode const& xmlEncode );
-
-    private:
-        std::string m_str;
-        ForWhat m_forWhat;
-    };
-
-    class XmlWriter {
-    public:
-
-        class ScopedElement {
-        public:
-            ScopedElement( XmlWriter* writer, XmlFormatting fmt );
-
-            ScopedElement( ScopedElement&& other ) noexcept;
-            ScopedElement& operator=( ScopedElement&& other ) noexcept;
-
-            ~ScopedElement();
-
-            ScopedElement& writeText( std::string const& text, XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent );
-
-            template<typename T>
-            ScopedElement& writeAttribute( std::string const& name, T const& attribute ) {
-                m_writer->writeAttribute( name, attribute );
-                return *this;
-            }
-
-        private:
-            mutable XmlWriter* m_writer = nullptr;
-            XmlFormatting m_fmt;
-        };
-
-        XmlWriter( std::ostream& os = Catch::cout() );
-        ~XmlWriter();
-
-        XmlWriter( XmlWriter const& ) = delete;
-        XmlWriter& operator=( XmlWriter const& ) = delete;
-
-        XmlWriter& startElement( std::string const& name, XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent);
-
-        ScopedElement scopedElement( std::string const& name, XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent);
-
-        XmlWriter& endElement(XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent);
-
-        XmlWriter& writeAttribute( std::string const& name, std::string const& attribute );
-
-        XmlWriter& writeAttribute( std::string const& name, bool attribute );
-
-        template<typename T>
-        XmlWriter& writeAttribute( std::string const& name, T const& attribute ) {
-            ReusableStringStream rss;
-            rss << attribute;
-            return writeAttribute( name, rss.str() );
-        }
-
-        XmlWriter& writeText( std::string const& text, XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent);
-
-        XmlWriter& writeComment(std::string const& text, XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent);
-
-        void writeStylesheetRef( std::string const& url );
-
-        XmlWriter& writeBlankLine();
-
-        void ensureTagClosed();
-
-    private:
-
-        void applyFormatting(XmlFormatting fmt);
-
-        void writeDeclaration();
-
-        void newlineIfNecessary();
-
-        bool m_tagIsOpen = false;
-        bool m_needsNewline = false;
-        std::vector<std::string> m_tags;
-        std::string m_indent;
-        std::ostream& m_os;
-    };
-
-}
-
-// end catch_xmlwriter.h
-namespace Catch {
-
-    class JunitReporter : public CumulativeReporterBase<JunitReporter> {
-    public:
-        JunitReporter(ReporterConfig const& _config);
-
-        ~JunitReporter() override;
-
-        static std::string getDescription();
-
-        void noMatchingTestCases(std::string const& /*spec*/) override;
-
-        void testRunStarting(TestRunInfo const& runInfo) override;
-
-        void testGroupStarting(GroupInfo const& groupInfo) override;
-
-        void testCaseStarting(TestCaseInfo const& testCaseInfo) override;
-        bool assertionEnded(AssertionStats const& assertionStats) override;
-
-        void testCaseEnded(TestCaseStats const& testCaseStats) override;
-
-        void testGroupEnded(TestGroupStats const& testGroupStats) override;
-
-        void testRunEndedCumulative() override;
-
-        void writeGroup(TestGroupNode const& groupNode, double suiteTime);
-
-        void writeTestCase(TestCaseNode const& testCaseNode);
-
-        void writeSection(std::string const& className,
-                          std::string const& rootName,
-                          SectionNode const& sectionNode);
-
-        void writeAssertions(SectionNode const& sectionNode);
-        void writeAssertion(AssertionStats const& stats);
-
-        XmlWriter xml;
-        Timer suiteTimer;
-        std::string stdOutForSuite;
-        std::string stdErrForSuite;
-        unsigned int unexpectedExceptions = 0;
-        bool m_okToFail = false;
-    };
-
-} // end namespace Catch
-
-// end catch_reporter_junit.h
-// start catch_reporter_xml.h
-
-namespace Catch {
-    class XmlReporter : public StreamingReporterBase<XmlReporter> {
-    public:
-        XmlReporter(ReporterConfig const& _config);
-
-        ~XmlReporter() override;
-
-        static std::string getDescription();
-
-        virtual std::string getStylesheetRef() const;
-
-        void writeSourceInfo(SourceLineInfo const& sourceInfo);
-
-    public: // StreamingReporterBase
-
-        void noMatchingTestCases(std::string const& s) override;
-
-        void testRunStarting(TestRunInfo const& testInfo) override;
-
-        void testGroupStarting(GroupInfo const& groupInfo) override;
-
-        void testCaseStarting(TestCaseInfo const& testInfo) override;
-
-        void sectionStarting(SectionInfo const& sectionInfo) override;
-
-        void assertionStarting(AssertionInfo const&) override;
-
-        bool assertionEnded(AssertionStats const& assertionStats) override;
-
-        void sectionEnded(SectionStats const& sectionStats) override;
-
-        void testCaseEnded(TestCaseStats const& testCaseStats) override;
-
-        void testGroupEnded(TestGroupStats const& testGroupStats) override;
-
-        void testRunEnded(TestRunStats const& testRunStats) override;
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-        void benchmarkPreparing(std::string const& name) override;
-        void benchmarkStarting(BenchmarkInfo const&) override;
-        void benchmarkEnded(BenchmarkStats<> const&) override;
-        void benchmarkFailed(std::string const&) override;
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-    private:
-        Timer m_testCaseTimer;
-        XmlWriter m_xml;
-        int m_sectionDepth = 0;
-    };
-
-} // end namespace Catch
-
-// end catch_reporter_xml.h
-
-// end catch_external_interfaces.h
-#endif
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-// start catch_benchmarking_all.hpp
-
-// A proxy header that includes all of the benchmarking headers to allow
-// concise include of the benchmarking features. You should prefer the
-// individual includes in standard use.
-
-// start catch_benchmark.hpp
-
- // Benchmark
-
-// start catch_chronometer.hpp
-
-// User-facing chronometer
-
-
-// start catch_clock.hpp
-
-// Clocks
-
-
-#include <chrono>
-#include <ratio>
-
-namespace Catch {
-    namespace Benchmark {
-        template <typename Clock>
-        using ClockDuration = typename Clock::duration;
-        template <typename Clock>
-        using FloatDuration = std::chrono::duration<double, typename Clock::period>;
-
-        template <typename Clock>
-        using TimePoint = typename Clock::time_point;
-
-        using default_clock = std::chrono::steady_clock;
-
-        template <typename Clock>
-        struct now {
-            TimePoint<Clock> operator()() const {
-                return Clock::now();
-            }
-        };
-
-        using fp_seconds = std::chrono::duration<double, std::ratio<1>>;
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_clock.hpp
-// start catch_optimizer.hpp
-
- // Hinting the optimizer
-
-
-#if defined(_MSC_VER)
-#   include <atomic> // atomic_thread_fence
-#endif
-
-namespace Catch {
-    namespace Benchmark {
-#if defined(__GNUC__) || defined(__clang__)
-        template <typename T>
-        inline void keep_memory(T* p) {
-            asm volatile("" : : "g"(p) : "memory");
-        }
-        inline void keep_memory() {
-            asm volatile("" : : : "memory");
-        }
-
-        namespace Detail {
-            inline void optimizer_barrier() { keep_memory(); }
-        } // namespace Detail
-#elif defined(_MSC_VER)
-
-#pragma optimize("", off)
-        template <typename T>
-        inline void keep_memory(T* p) {
-            // thanks @milleniumbug
-            *reinterpret_cast<char volatile*>(p) = *reinterpret_cast<char const volatile*>(p);
-        }
-        // TODO equivalent keep_memory()
-#pragma optimize("", on)
-
-        namespace Detail {
-            inline void optimizer_barrier() {
-                std::atomic_thread_fence(std::memory_order_seq_cst);
-            }
-        } // namespace Detail
-
-#endif
-
-        template <typename T>
-        inline void deoptimize_value(T&& x) {
-            keep_memory(&x);
-        }
-
-        template <typename Fn, typename... Args>
-        inline auto invoke_deoptimized(Fn&& fn, Args&&... args) -> typename std::enable_if<!std::is_same<void, decltype(fn(args...))>::value>::type {
-            deoptimize_value(std::forward<Fn>(fn) (std::forward<Args...>(args...)));
-        }
-
-        template <typename Fn, typename... Args>
-        inline auto invoke_deoptimized(Fn&& fn, Args&&... args) -> typename std::enable_if<std::is_same<void, decltype(fn(args...))>::value>::type {
-            std::forward<Fn>(fn) (std::forward<Args...>(args...));
-        }
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_optimizer.hpp
-// start catch_complete_invoke.hpp
-
-// Invoke with a special case for void
-
-
-#include <type_traits>
-#include <utility>
-
-namespace Catch {
-    namespace Benchmark {
-        namespace Detail {
-            template <typename T>
-            struct CompleteType { using type = T; };
-            template <>
-            struct CompleteType<void> { struct type {}; };
-
-            template <typename T>
-            using CompleteType_t = typename CompleteType<T>::type;
-
-            template <typename Result>
-            struct CompleteInvoker {
-                template <typename Fun, typename... Args>
-                static Result invoke(Fun&& fun, Args&&... args) {
-                    return std::forward<Fun>(fun)(std::forward<Args>(args)...);
-                }
-            };
-            template <>
-            struct CompleteInvoker<void> {
-                template <typename Fun, typename... Args>
-                static CompleteType_t<void> invoke(Fun&& fun, Args&&... args) {
-                    std::forward<Fun>(fun)(std::forward<Args>(args)...);
-                    return {};
-                }
-            };
-            template <typename Sig>
-            using ResultOf_t = typename std::result_of<Sig>::type;
-
-            // invoke and not return void :(
-            template <typename Fun, typename... Args>
-            CompleteType_t<ResultOf_t<Fun(Args...)>> complete_invoke(Fun&& fun, Args&&... args) {
-                return CompleteInvoker<ResultOf_t<Fun(Args...)>>::invoke(std::forward<Fun>(fun), std::forward<Args>(args)...);
-            }
-
-            const std::string benchmarkErrorMsg = "a benchmark failed to run successfully";
-        } // namespace Detail
-
-        template <typename Fun>
-        Detail::CompleteType_t<Detail::ResultOf_t<Fun()>> user_code(Fun&& fun) {
-            CATCH_TRY{
-                return Detail::complete_invoke(std::forward<Fun>(fun));
-            } CATCH_CATCH_ALL{
-                getResultCapture().benchmarkFailed(translateActiveException());
-                CATCH_RUNTIME_ERROR(Detail::benchmarkErrorMsg);
-            }
-        }
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_complete_invoke.hpp
-namespace Catch {
-    namespace Benchmark {
-        namespace Detail {
-            struct ChronometerConcept {
-                virtual void start() = 0;
-                virtual void finish() = 0;
-                virtual ~ChronometerConcept() = default;
-            };
-            template <typename Clock>
-            struct ChronometerModel final : public ChronometerConcept {
-                void start() override { started = Clock::now(); }
-                void finish() override { finished = Clock::now(); }
-
-                ClockDuration<Clock> elapsed() const { return finished - started; }
-
-                TimePoint<Clock> started;
-                TimePoint<Clock> finished;
-            };
-        } // namespace Detail
-
-        struct Chronometer {
-        public:
-            template <typename Fun>
-            void measure(Fun&& fun) { measure(std::forward<Fun>(fun), is_callable<Fun(int)>()); }
-
-            int runs() const { return k; }
-
-            Chronometer(Detail::ChronometerConcept& meter, int k)
-                : impl(&meter)
-                , k(k) {}
-
-        private:
-            template <typename Fun>
-            void measure(Fun&& fun, std::false_type) {
-                measure([&fun](int) { return fun(); }, std::true_type());
-            }
-
-            template <typename Fun>
-            void measure(Fun&& fun, std::true_type) {
-                Detail::optimizer_barrier();
-                impl->start();
-                for (int i = 0; i < k; ++i) invoke_deoptimized(fun, i);
-                impl->finish();
-                Detail::optimizer_barrier();
-            }
-
-            Detail::ChronometerConcept* impl;
-            int k;
-        };
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_chronometer.hpp
-// start catch_environment.hpp
-
-// Environment information
-
-
-namespace Catch {
-    namespace Benchmark {
-        template <typename Duration>
-        struct EnvironmentEstimate {
-            Duration mean;
-            OutlierClassification outliers;
-
-            template <typename Duration2>
-            operator EnvironmentEstimate<Duration2>() const {
-                return { mean, outliers };
-            }
-        };
-        template <typename Clock>
-        struct Environment {
-            using clock_type = Clock;
-            EnvironmentEstimate<FloatDuration<Clock>> clock_resolution;
-            EnvironmentEstimate<FloatDuration<Clock>> clock_cost;
-        };
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_environment.hpp
-// start catch_execution_plan.hpp
-
- // Execution plan
-
-
-// start catch_benchmark_function.hpp
-
- // Dumb std::function implementation for consistent call overhead
-
-
-#include <cassert>
-#include <type_traits>
-#include <utility>
-#include <memory>
-
-namespace Catch {
-    namespace Benchmark {
-        namespace Detail {
-            template <typename T>
-            using Decay = typename std::decay<T>::type;
-            template <typename T, typename U>
-            struct is_related
-                : std::is_same<Decay<T>, Decay<U>> {};
-
-            /// We need to reinvent std::function because every piece of code that might add overhead
-            /// in a measurement context needs to have consistent performance characteristics so that we
-            /// can account for it in the measurement.
-            /// Implementations of std::function with optimizations that aren't always applicable, like
-            /// small buffer optimizations, are not uncommon.
-            /// This is effectively an implementation of std::function without any such optimizations;
-            /// it may be slow, but it is consistently slow.
-            struct BenchmarkFunction {
-            private:
-                struct callable {
-                    virtual void call(Chronometer meter) const = 0;
-                    virtual callable* clone() const = 0;
-                    virtual ~callable() = default;
-                };
-                template <typename Fun>
-                struct model : public callable {
-                    model(Fun&& fun) : fun(std::move(fun)) {}
-                    model(Fun const& fun) : fun(fun) {}
-
-                    model<Fun>* clone() const override { return new model<Fun>(*this); }
-
-                    void call(Chronometer meter) const override {
-                        call(meter, is_callable<Fun(Chronometer)>());
-                    }
-                    void call(Chronometer meter, std::true_type) const {
-                        fun(meter);
-                    }
-                    void call(Chronometer meter, std::false_type) const {
-                        meter.measure(fun);
-                    }
-
-                    Fun fun;
-                };
-
-                struct do_nothing { void operator()() const {} };
-
-                template <typename T>
-                BenchmarkFunction(model<T>* c) : f(c) {}
-
-            public:
-                BenchmarkFunction()
-                    : f(new model<do_nothing>{ {} }) {}
-
-                template <typename Fun,
-                    typename std::enable_if<!is_related<Fun, BenchmarkFunction>::value, int>::type = 0>
-                    BenchmarkFunction(Fun&& fun)
-                    : f(new model<typename std::decay<Fun>::type>(std::forward<Fun>(fun))) {}
-
-                BenchmarkFunction(BenchmarkFunction&& that)
-                    : f(std::move(that.f)) {}
-
-                BenchmarkFunction(BenchmarkFunction const& that)
-                    : f(that.f->clone()) {}
-
-                BenchmarkFunction& operator=(BenchmarkFunction&& that) {
-                    f = std::move(that.f);
-                    return *this;
-                }
-
-                BenchmarkFunction& operator=(BenchmarkFunction const& that) {
-                    f.reset(that.f->clone());
-                    return *this;
-                }
-
-                void operator()(Chronometer meter) const { f->call(meter); }
-
-            private:
-                std::unique_ptr<callable> f;
-            };
-        } // namespace Detail
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_benchmark_function.hpp
-// start catch_repeat.hpp
-
-// repeat algorithm
-
-
-#include <type_traits>
-#include <utility>
-
-namespace Catch {
-    namespace Benchmark {
-        namespace Detail {
-            template <typename Fun>
-            struct repeater {
-                void operator()(int k) const {
-                    for (int i = 0; i < k; ++i) {
-                        fun();
-                    }
-                }
-                Fun fun;
-            };
-            template <typename Fun>
-            repeater<typename std::decay<Fun>::type> repeat(Fun&& fun) {
-                return { std::forward<Fun>(fun) };
-            }
-        } // namespace Detail
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_repeat.hpp
-// start catch_run_for_at_least.hpp
-
-// Run a function for a minimum amount of time
-
-
-// start catch_measure.hpp
-
-// Measure
-
-
-// start catch_timing.hpp
-
-// Timing
-
-
-#include <tuple>
-#include <type_traits>
-
-namespace Catch {
-    namespace Benchmark {
-        template <typename Duration, typename Result>
-        struct Timing {
-            Duration elapsed;
-            Result result;
-            int iterations;
-        };
-        template <typename Clock, typename Sig>
-        using TimingOf = Timing<ClockDuration<Clock>, Detail::CompleteType_t<Detail::ResultOf_t<Sig>>>;
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_timing.hpp
-#include <utility>
-
-namespace Catch {
-    namespace Benchmark {
-        namespace Detail {
-            template <typename Clock, typename Fun, typename... Args>
-            TimingOf<Clock, Fun(Args...)> measure(Fun&& fun, Args&&... args) {
-                auto start = Clock::now();
-                auto&& r = Detail::complete_invoke(fun, std::forward<Args>(args)...);
-                auto end = Clock::now();
-                auto delta = end - start;
-                return { delta, std::forward<decltype(r)>(r), 1 };
-            }
-        } // namespace Detail
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_measure.hpp
-#include <utility>
-#include <type_traits>
-
-namespace Catch {
-    namespace Benchmark {
-        namespace Detail {
-            template <typename Clock, typename Fun>
-            TimingOf<Clock, Fun(int)> measure_one(Fun&& fun, int iters, std::false_type) {
-                return Detail::measure<Clock>(fun, iters);
-            }
-            template <typename Clock, typename Fun>
-            TimingOf<Clock, Fun(Chronometer)> measure_one(Fun&& fun, int iters, std::true_type) {
-                Detail::ChronometerModel<Clock> meter;
-                auto&& result = Detail::complete_invoke(fun, Chronometer(meter, iters));
-
-                return { meter.elapsed(), std::move(result), iters };
-            }
-
-            template <typename Clock, typename Fun>
-            using run_for_at_least_argument_t = typename std::conditional<is_callable<Fun(Chronometer)>::value, Chronometer, int>::type;
-
-            struct optimized_away_error : std::exception {
-                const char* what() const noexcept override {
-                    return "could not measure benchmark, maybe it was optimized away";
-                }
-            };
-
-            template <typename Clock, typename Fun>
-            TimingOf<Clock, Fun(run_for_at_least_argument_t<Clock, Fun>)> run_for_at_least(ClockDuration<Clock> how_long, int seed, Fun&& fun) {
-                auto iters = seed;
-                while (iters < (1 << 30)) {
-                    auto&& Timing = measure_one<Clock>(fun, iters, is_callable<Fun(Chronometer)>());
-
-                    if (Timing.elapsed >= how_long) {
-                        return { Timing.elapsed, std::move(Timing.result), iters };
-                    }
-                    iters *= 2;
-                }
-                throw optimized_away_error{};
-            }
-        } // namespace Detail
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_run_for_at_least.hpp
-#include <algorithm>
-
-namespace Catch {
-    namespace Benchmark {
-        template <typename Duration>
-        struct ExecutionPlan {
-            int iterations_per_sample;
-            Duration estimated_duration;
-            Detail::BenchmarkFunction benchmark;
-            Duration warmup_time;
-            int warmup_iterations;
-
-            template <typename Duration2>
-            operator ExecutionPlan<Duration2>() const {
-                return { iterations_per_sample, estimated_duration, benchmark, warmup_time, warmup_iterations };
-            }
-
-            template <typename Clock>
-            std::vector<FloatDuration<Clock>> run(const IConfig &cfg, Environment<FloatDuration<Clock>> env) const {
-                // warmup a bit
-                Detail::run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(warmup_time), warmup_iterations, Detail::repeat(now<Clock>{}));
-
-                std::vector<FloatDuration<Clock>> times;
-                times.reserve(cfg.benchmarkSamples());
-                std::generate_n(std::back_inserter(times), cfg.benchmarkSamples(), [this, env] {
-                    Detail::ChronometerModel<Clock> model;
-                    this->benchmark(Chronometer(model, iterations_per_sample));
-                    auto sample_time = model.elapsed() - env.clock_cost.mean;
-                    if (sample_time < FloatDuration<Clock>::zero()) sample_time = FloatDuration<Clock>::zero();
-                    return sample_time / iterations_per_sample;
-                });
-                return times;
-            }
-        };
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_execution_plan.hpp
-// start catch_estimate_clock.hpp
-
- // Environment measurement
-
-
-// start catch_stats.hpp
-
-// Statistical analysis tools
-
-
-#include <algorithm>
-#include <functional>
-#include <vector>
-#include <iterator>
-#include <numeric>
-#include <tuple>
-#include <cmath>
-#include <utility>
-#include <cstddef>
-#include <random>
-
-namespace Catch {
-    namespace Benchmark {
-        namespace Detail {
-            using sample = std::vector<double>;
-
-            double weighted_average_quantile(int k, int q, std::vector<double>::iterator first, std::vector<double>::iterator last);
-
-            template <typename Iterator>
-            OutlierClassification classify_outliers(Iterator first, Iterator last) {
-                std::vector<double> copy(first, last);
-
-                auto q1 = weighted_average_quantile(1, 4, copy.begin(), copy.end());
-                auto q3 = weighted_average_quantile(3, 4, copy.begin(), copy.end());
-                auto iqr = q3 - q1;
-                auto los = q1 - (iqr * 3.);
-                auto lom = q1 - (iqr * 1.5);
-                auto him = q3 + (iqr * 1.5);
-                auto his = q3 + (iqr * 3.);
-
-                OutlierClassification o;
-                for (; first != last; ++first) {
-                    auto&& t = *first;
-                    if (t < los) ++o.low_severe;
-                    else if (t < lom) ++o.low_mild;
-                    else if (t > his) ++o.high_severe;
-                    else if (t > him) ++o.high_mild;
-                    ++o.samples_seen;
-                }
-                return o;
-            }
-
-            template <typename Iterator>
-            double mean(Iterator first, Iterator last) {
-                auto count = last - first;
-                double sum = std::accumulate(first, last, 0.);
-                return sum / count;
-            }
-
-            template <typename URng, typename Iterator, typename Estimator>
-            sample resample(URng& rng, int resamples, Iterator first, Iterator last, Estimator& estimator) {
-                auto n = last - first;
-                std::uniform_int_distribution<decltype(n)> dist(0, n - 1);
-
-                sample out;
-                out.reserve(resamples);
-                std::generate_n(std::back_inserter(out), resamples, [n, first, &estimator, &dist, &rng] {
-                    std::vector<double> resampled;
-                    resampled.reserve(n);
-                    std::generate_n(std::back_inserter(resampled), n, [first, &dist, &rng] { return first[dist(rng)]; });
-                    return estimator(resampled.begin(), resampled.end());
-                });
-                std::sort(out.begin(), out.end());
-                return out;
-            }
-
-            template <typename Estimator, typename Iterator>
-            sample jackknife(Estimator&& estimator, Iterator first, Iterator last) {
-                auto n = last - first;
-                auto second = std::next(first);
-                sample results;
-                results.reserve(n);
-
-                for (auto it = first; it != last; ++it) {
-                    std::iter_swap(it, first);
-                    results.push_back(estimator(second, last));
-                }
-
-                return results;
-            }
-
-            inline double normal_cdf(double x) {
-                return std::erfc(-x / std::sqrt(2.0)) / 2.0;
-            }
-
-            double erfc_inv(double x);
-
-            double normal_quantile(double p);
-
-            template <typename Iterator, typename Estimator>
-            Estimate<double> bootstrap(double confidence_level, Iterator first, Iterator last, sample const& resample, Estimator&& estimator) {
-                auto n_samples = last - first;
-
-                double point = estimator(first, last);
-                // Degenerate case with a single sample
-                if (n_samples == 1) return { point, point, point, confidence_level };
-
-                sample jack = jackknife(estimator, first, last);
-                double jack_mean = mean(jack.begin(), jack.end());
-                double sum_squares, sum_cubes;
-                std::tie(sum_squares, sum_cubes) = std::accumulate(jack.begin(), jack.end(), std::make_pair(0., 0.), [jack_mean](std::pair<double, double> sqcb, double x) -> std::pair<double, double> {
-                    auto d = jack_mean - x;
-                    auto d2 = d * d;
-                    auto d3 = d2 * d;
-                    return { sqcb.first + d2, sqcb.second + d3 };
-                });
-
-                double accel = sum_cubes / (6 * std::pow(sum_squares, 1.5));
-                int n = static_cast<int>(resample.size());
-                double prob_n = std::count_if(resample.begin(), resample.end(), [point](double x) { return x < point; }) / (double)n;
-                // degenerate case with uniform samples
-                if (prob_n == 0) return { point, point, point, confidence_level };
-
-                double bias = normal_quantile(prob_n);
-                double z1 = normal_quantile((1. - confidence_level) / 2.);
-
-                auto cumn = [n](double x) -> int {
-                    return std::lround(normal_cdf(x) * n); };
-                auto a = [bias, accel](double b) { return bias + b / (1. - accel * b); };
-                double b1 = bias + z1;
-                double b2 = bias - z1;
-                double a1 = a(b1);
-                double a2 = a(b2);
-                auto lo = std::max(cumn(a1), 0);
-                auto hi = std::min(cumn(a2), n - 1);
-
-                return { point, resample[lo], resample[hi], confidence_level };
-            }
-
-            double outlier_variance(Estimate<double> mean, Estimate<double> stddev, int n);
-
-            struct bootstrap_analysis {
-                Estimate<double> mean;
-                Estimate<double> standard_deviation;
-                double outlier_variance;
-            };
-
-            bootstrap_analysis analyse_samples(double confidence_level, int n_resamples, std::vector<double>::iterator first, std::vector<double>::iterator last);
-        } // namespace Detail
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_stats.hpp
-#include <algorithm>
-#include <iterator>
-#include <tuple>
-#include <vector>
-#include <cmath>
-
-namespace Catch {
-    namespace Benchmark {
-        namespace Detail {
-            template <typename Clock>
-            std::vector<double> resolution(int k) {
-                std::vector<TimePoint<Clock>> times;
-                times.reserve(k + 1);
-                std::generate_n(std::back_inserter(times), k + 1, now<Clock>{});
-
-                std::vector<double> deltas;
-                deltas.reserve(k);
-                std::transform(std::next(times.begin()), times.end(), times.begin(),
-                    std::back_inserter(deltas),
-                    [](TimePoint<Clock> a, TimePoint<Clock> b) { return static_cast<double>((a - b).count()); });
-
-                return deltas;
-            }
-
-            const auto warmup_iterations = 10000;
-            const auto warmup_time = std::chrono::milliseconds(100);
-            const auto minimum_ticks = 1000;
-            const auto warmup_seed = 10000;
-            const auto clock_resolution_estimation_time = std::chrono::milliseconds(500);
-            const auto clock_cost_estimation_time_limit = std::chrono::seconds(1);
-            const auto clock_cost_estimation_tick_limit = 100000;
-            const auto clock_cost_estimation_time = std::chrono::milliseconds(10);
-            const auto clock_cost_estimation_iterations = 10000;
-
-            template <typename Clock>
-            int warmup() {
-                return run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(warmup_time), warmup_seed, &resolution<Clock>)
-                    .iterations;
-            }
-            template <typename Clock>
-            EnvironmentEstimate<FloatDuration<Clock>> estimate_clock_resolution(int iterations) {
-                auto r = run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(clock_resolution_estimation_time), iterations, &resolution<Clock>)
-                    .result;
-                return {
-                    FloatDuration<Clock>(mean(r.begin(), r.end())),
-                    classify_outliers(r.begin(), r.end()),
-                };
-            }
-            template <typename Clock>
-            EnvironmentEstimate<FloatDuration<Clock>> estimate_clock_cost(FloatDuration<Clock> resolution) {
-                auto time_limit = std::min(resolution * clock_cost_estimation_tick_limit, FloatDuration<Clock>(clock_cost_estimation_time_limit));
-                auto time_clock = [](int k) {
-                    return Detail::measure<Clock>([k] {
-                        for (int i = 0; i < k; ++i) {
-                            volatile auto ignored = Clock::now();
-                            (void)ignored;
-                        }
-                    }).elapsed;
-                };
-                time_clock(1);
-                int iters = clock_cost_estimation_iterations;
-                auto&& r = run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(clock_cost_estimation_time), iters, time_clock);
-                std::vector<double> times;
-                int nsamples = static_cast<int>(std::ceil(time_limit / r.elapsed));
-                times.reserve(nsamples);
-                std::generate_n(std::back_inserter(times), nsamples, [time_clock, &r] {
-                    return static_cast<double>((time_clock(r.iterations) / r.iterations).count());
-                });
-                return {
-                    FloatDuration<Clock>(mean(times.begin(), times.end())),
-                    classify_outliers(times.begin(), times.end()),
-                };
-            }
-
-            template <typename Clock>
-            Environment<FloatDuration<Clock>> measure_environment() {
-                static Environment<FloatDuration<Clock>>* env = nullptr;
-                if (env) {
-                    return *env;
-                }
-
-                auto iters = Detail::warmup<Clock>();
-                auto resolution = Detail::estimate_clock_resolution<Clock>(iters);
-                auto cost = Detail::estimate_clock_cost<Clock>(resolution.mean);
-
-                env = new Environment<FloatDuration<Clock>>{ resolution, cost };
-                return *env;
-            }
-        } // namespace Detail
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_estimate_clock.hpp
-// start catch_analyse.hpp
-
- // Run and analyse one benchmark
-
-
-// start catch_sample_analysis.hpp
-
-// Benchmark results
-
-
-#include <algorithm>
-#include <vector>
-#include <string>
-#include <iterator>
-
-namespace Catch {
-    namespace Benchmark {
-        template <typename Duration>
-        struct SampleAnalysis {
-            std::vector<Duration> samples;
-            Estimate<Duration> mean;
-            Estimate<Duration> standard_deviation;
-            OutlierClassification outliers;
-            double outlier_variance;
-
-            template <typename Duration2>
-            operator SampleAnalysis<Duration2>() const {
-                std::vector<Duration2> samples2;
-                samples2.reserve(samples.size());
-                std::transform(samples.begin(), samples.end(), std::back_inserter(samples2), [](Duration d) { return Duration2(d); });
-                return {
-                    std::move(samples2),
-                    mean,
-                    standard_deviation,
-                    outliers,
-                    outlier_variance,
-                };
-            }
-        };
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_sample_analysis.hpp
-#include <algorithm>
-#include <iterator>
-#include <vector>
-
-namespace Catch {
-    namespace Benchmark {
-        namespace Detail {
-            template <typename Duration, typename Iterator>
-            SampleAnalysis<Duration> analyse(const IConfig &cfg, Environment<Duration>, Iterator first, Iterator last) {
-                if (!cfg.benchmarkNoAnalysis()) {
-                    std::vector<double> samples;
-                    samples.reserve(last - first);
-                    std::transform(first, last, std::back_inserter(samples), [](Duration d) { return d.count(); });
-
-                    auto analysis = Catch::Benchmark::Detail::analyse_samples(cfg.benchmarkConfidenceInterval(), cfg.benchmarkResamples(), samples.begin(), samples.end());
-                    auto outliers = Catch::Benchmark::Detail::classify_outliers(samples.begin(), samples.end());
-
-                    auto wrap_estimate = [](Estimate<double> e) {
-                        return Estimate<Duration> {
-                            Duration(e.point),
-                                Duration(e.lower_bound),
-                                Duration(e.upper_bound),
-                                e.confidence_interval,
-                        };
-                    };
-                    std::vector<Duration> samples2;
-                    samples2.reserve(samples.size());
-                    std::transform(samples.begin(), samples.end(), std::back_inserter(samples2), [](double d) { return Duration(d); });
-                    return {
-                        std::move(samples2),
-                        wrap_estimate(analysis.mean),
-                        wrap_estimate(analysis.standard_deviation),
-                        outliers,
-                        analysis.outlier_variance,
-                    };
-                } else {
-                    std::vector<Duration> samples;
-                    samples.reserve(last - first);
-
-                    Duration mean = Duration(0);
-                    int i = 0;
-                    for (auto it = first; it < last; ++it, ++i) {
-                        samples.push_back(Duration(*it));
-                        mean += Duration(*it);
-                    }
-                    mean /= i;
-
-                    return {
-                        std::move(samples),
-                        Estimate<Duration>{mean, mean, mean, 0.0},
-                        Estimate<Duration>{Duration(0), Duration(0), Duration(0), 0.0},
-                        OutlierClassification{},
-                        0.0
-                    };
-                }
-            }
-        } // namespace Detail
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_analyse.hpp
-#include <algorithm>
-#include <functional>
-#include <string>
-#include <vector>
-#include <cmath>
-
-namespace Catch {
-    namespace Benchmark {
-        struct Benchmark {
-            Benchmark(std::string &&name)
-                : name(std::move(name)) {}
-
-            template <class FUN>
-            Benchmark(std::string &&name, FUN &&func)
-                : fun(std::move(func)), name(std::move(name)) {}
-
-            template <typename Clock>
-            ExecutionPlan<FloatDuration<Clock>> prepare(const IConfig &cfg, Environment<FloatDuration<Clock>> env) const {
-                auto min_time = env.clock_resolution.mean * Detail::minimum_ticks;
-                auto run_time = std::max(min_time, std::chrono::duration_cast<decltype(min_time)>(cfg.benchmarkWarmupTime()));
-                auto&& test = Detail::run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(run_time), 1, fun);
-                int new_iters = static_cast<int>(std::ceil(min_time * test.iterations / test.elapsed));
-                return { new_iters, test.elapsed / test.iterations * new_iters * cfg.benchmarkSamples(), fun, std::chrono::duration_cast<FloatDuration<Clock>>(cfg.benchmarkWarmupTime()), Detail::warmup_iterations };
-            }
-
-            template <typename Clock = default_clock>
-            void run() {
-                IConfigPtr cfg = getCurrentContext().getConfig();
-
-                auto env = Detail::measure_environment<Clock>();
-
-                getResultCapture().benchmarkPreparing(name);
-                CATCH_TRY{
-                    auto plan = user_code([&] {
-                        return prepare<Clock>(*cfg, env);
-                    });
-
-                    BenchmarkInfo info {
-                        name,
-                        plan.estimated_duration.count(),
-                        plan.iterations_per_sample,
-                        cfg->benchmarkSamples(),
-                        cfg->benchmarkResamples(),
-                        env.clock_resolution.mean.count(),
-                        env.clock_cost.mean.count()
-                    };
-
-                    getResultCapture().benchmarkStarting(info);
-
-                    auto samples = user_code([&] {
-                        return plan.template run<Clock>(*cfg, env);
-                    });
-
-                    auto analysis = Detail::analyse(*cfg, env, samples.begin(), samples.end());
-                    BenchmarkStats<FloatDuration<Clock>> stats{ info, analysis.samples, analysis.mean, analysis.standard_deviation, analysis.outliers, analysis.outlier_variance };
-                    getResultCapture().benchmarkEnded(stats);
-
-                } CATCH_CATCH_ALL{
-                    if (translateActiveException() != Detail::benchmarkErrorMsg) // benchmark errors have been reported, otherwise rethrow.
-                        std::rethrow_exception(std::current_exception());
-                }
-            }
-
-            // sets lambda to be used in fun *and* executes benchmark!
-            template <typename Fun,
-                typename std::enable_if<!Detail::is_related<Fun, Benchmark>::value, int>::type = 0>
-                Benchmark & operator=(Fun func) {
-                fun = Detail::BenchmarkFunction(func);
-                run();
-                return *this;
-            }
-
-            explicit operator bool() {
-                return true;
-            }
-
-        private:
-            Detail::BenchmarkFunction fun;
-            std::string name;
-        };
-    }
-} // namespace Catch
-
-#define INTERNAL_CATCH_GET_1_ARG(arg1, arg2, ...) arg1
-#define INTERNAL_CATCH_GET_2_ARG(arg1, arg2, ...) arg2
-
-#define INTERNAL_CATCH_BENCHMARK(BenchmarkName, name, benchmarkIndex)\
-    if( Catch::Benchmark::Benchmark BenchmarkName{name} ) \
-        BenchmarkName = [&](int benchmarkIndex)
-
-#define INTERNAL_CATCH_BENCHMARK_ADVANCED(BenchmarkName, name)\
-    if( Catch::Benchmark::Benchmark BenchmarkName{name} ) \
-        BenchmarkName = [&]
-
-// end catch_benchmark.hpp
-// start catch_constructor.hpp
-
-// Constructor and destructor helpers
-
-
-#include <type_traits>
-
-namespace Catch {
-    namespace Benchmark {
-        namespace Detail {
-            template <typename T, bool Destruct>
-            struct ObjectStorage
-            {
-                using TStorage = typename std::aligned_storage<sizeof(T), std::alignment_of<T>::value>::type;
-
-                ObjectStorage() : data() {}
-
-                ObjectStorage(const ObjectStorage& other)
-                {
-                    new(&data) T(other.stored_object());
-                }
-
-                ObjectStorage(ObjectStorage&& other)
-                {
-                    new(&data) T(std::move(other.stored_object()));
-                }
-
-                ~ObjectStorage() { destruct_on_exit<T>(); }
-
-                template <typename... Args>
-                void construct(Args&&... args)
-                {
-                    new (&data) T(std::forward<Args>(args)...);
-                }
-
-                template <bool AllowManualDestruction = !Destruct>
-                typename std::enable_if<AllowManualDestruction>::type destruct()
-                {
-                    stored_object().~T();
-                }
-
-            private:
-                // If this is a constructor benchmark, destruct the underlying object
-                template <typename U>
-                void destruct_on_exit(typename std::enable_if<Destruct, U>::type* = 0) { destruct<true>(); }
-                // Otherwise, don't
-                template <typename U>
-                void destruct_on_exit(typename std::enable_if<!Destruct, U>::type* = 0) { }
-
-                T& stored_object() {
-                    return *static_cast<T*>(static_cast<void*>(&data));
-                }
-
-                T const& stored_object() const {
-                    return *static_cast<T*>(static_cast<void*>(&data));
-                }
-
-                TStorage data;
-            };
-        }
-
-        template <typename T>
-        using storage_for = Detail::ObjectStorage<T, true>;
-
-        template <typename T>
-        using destructable_object = Detail::ObjectStorage<T, false>;
-    }
-}
-
-// end catch_constructor.hpp
-// end catch_benchmarking_all.hpp
-#endif
-
-#endif // ! CATCH_CONFIG_IMPL_ONLY
-
-#ifdef CATCH_IMPL
-// start catch_impl.hpp
-
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wweak-vtables"
-#endif
-
-// Keep these here for external reporters
-// start catch_test_case_tracker.h
-
-#include <string>
-#include <vector>
-#include <memory>
-
-namespace Catch {
-namespace TestCaseTracking {
-
-    struct NameAndLocation {
-        std::string name;
-        SourceLineInfo location;
-
-        NameAndLocation( std::string const& _name, SourceLineInfo const& _location );
-    };
-
-    struct ITracker;
-
-    using ITrackerPtr = std::shared_ptr<ITracker>;
-
-    struct ITracker {
-        virtual ~ITracker();
-
-        // static queries
-        virtual NameAndLocation const& nameAndLocation() const = 0;
-
-        // dynamic queries
-        virtual bool isComplete() const = 0; // Successfully completed or failed
-        virtual bool isSuccessfullyCompleted() const = 0;
-        virtual bool isOpen() const = 0; // Started but not complete
-        virtual bool hasChildren() const = 0;
-
-        virtual ITracker& parent() = 0;
-
-        // actions
-        virtual void close() = 0; // Successfully complete
-        virtual void fail() = 0;
-        virtual void markAsNeedingAnotherRun() = 0;
-
-        virtual void addChild( ITrackerPtr const& child ) = 0;
-        virtual ITrackerPtr findChild( NameAndLocation const& nameAndLocation ) = 0;
-        virtual void openChild() = 0;
-
-        // Debug/ checking
-        virtual bool isSectionTracker() const = 0;
-        virtual bool isGeneratorTracker() const = 0;
-    };
-
-    class TrackerContext {
-
-        enum RunState {
-            NotStarted,
-            Executing,
-            CompletedCycle
-        };
-
-        ITrackerPtr m_rootTracker;
-        ITracker* m_currentTracker = nullptr;
-        RunState m_runState = NotStarted;
-
-    public:
-
-        ITracker& startRun();
-        void endRun();
-
-        void startCycle();
-        void completeCycle();
-
-        bool completedCycle() const;
-        ITracker& currentTracker();
-        void setCurrentTracker( ITracker* tracker );
-    };
-
-    class TrackerBase : public ITracker {
-    protected:
-        enum CycleState {
-            NotStarted,
-            Executing,
-            ExecutingChildren,
-            NeedsAnotherRun,
-            CompletedSuccessfully,
-            Failed
-        };
-
-        using Children = std::vector<ITrackerPtr>;
-        NameAndLocation m_nameAndLocation;
-        TrackerContext& m_ctx;
-        ITracker* m_parent;
-        Children m_children;
-        CycleState m_runState = NotStarted;
-
-    public:
-        TrackerBase( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent );
-
-        NameAndLocation const& nameAndLocation() const override;
-        bool isComplete() const override;
-        bool isSuccessfullyCompleted() const override;
-        bool isOpen() const override;
-        bool hasChildren() const override;
-
-        void addChild( ITrackerPtr const& child ) override;
-
-        ITrackerPtr findChild( NameAndLocation const& nameAndLocation ) override;
-        ITracker& parent() override;
-
-        void openChild() override;
-
-        bool isSectionTracker() const override;
-        bool isGeneratorTracker() const override;
-
-        void open();
-
-        void close() override;
-        void fail() override;
-        void markAsNeedingAnotherRun() override;
-
-    private:
-        void moveToParent();
-        void moveToThis();
-    };
-
-    class SectionTracker : public TrackerBase {
-        std::vector<std::string> m_filters;
-        std::string m_trimmed_name;
-    public:
-        SectionTracker( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent );
-
-        bool isSectionTracker() const override;
-
-        bool isComplete() const override;
-
-        static SectionTracker& acquire( TrackerContext& ctx, NameAndLocation const& nameAndLocation );
-
-        void tryOpen();
-
-        void addInitialFilters( std::vector<std::string> const& filters );
-        void addNextFilters( std::vector<std::string> const& filters );
-    };
-
-} // namespace TestCaseTracking
-
-using TestCaseTracking::ITracker;
-using TestCaseTracking::TrackerContext;
-using TestCaseTracking::SectionTracker;
-
-} // namespace Catch
-
-// end catch_test_case_tracker.h
-
-// start catch_leak_detector.h
-
-namespace Catch {
-
-    struct LeakDetector {
-        LeakDetector();
-        ~LeakDetector();
-    };
-
-}
-// end catch_leak_detector.h
-// Cpp files will be included in the single-header file here
-// start catch_stats.cpp
-
-// Statistical analysis tools
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-
-#include <cassert>
-#include <random>
-
-#if defined(CATCH_CONFIG_USE_ASYNC)
-#include <future>
-#endif
-
-namespace {
-    double erf_inv(double x) {
-        // Code accompanying the article "Approximating the erfinv function" in GPU Computing Gems, Volume 2
-        double w, p;
-
-        w = -log((1.0 - x) * (1.0 + x));
-
-        if (w < 6.250000) {
-            w = w - 3.125000;
-            p = -3.6444120640178196996e-21;
-            p = -1.685059138182016589e-19 + p * w;
-            p = 1.2858480715256400167e-18 + p * w;
-            p = 1.115787767802518096e-17 + p * w;
-            p = -1.333171662854620906e-16 + p * w;
-            p = 2.0972767875968561637e-17 + p * w;
-            p = 6.6376381343583238325e-15 + p * w;
-            p = -4.0545662729752068639e-14 + p * w;
-            p = -8.1519341976054721522e-14 + p * w;
-            p = 2.6335093153082322977e-12 + p * w;
-            p = -1.2975133253453532498e-11 + p * w;
-            p = -5.4154120542946279317e-11 + p * w;
-            p = 1.051212273321532285e-09 + p * w;
-            p = -4.1126339803469836976e-09 + p * w;
-            p = -2.9070369957882005086e-08 + p * w;
-            p = 4.2347877827932403518e-07 + p * w;
-            p = -1.3654692000834678645e-06 + p * w;
-            p = -1.3882523362786468719e-05 + p * w;
-            p = 0.0001867342080340571352 + p * w;
-            p = -0.00074070253416626697512 + p * w;
-            p = -0.0060336708714301490533 + p * w;
-            p = 0.24015818242558961693 + p * w;
-            p = 1.6536545626831027356 + p * w;
-        } else if (w < 16.000000) {
-            w = sqrt(w) - 3.250000;
-            p = 2.2137376921775787049e-09;
-            p = 9.0756561938885390979e-08 + p * w;
-            p = -2.7517406297064545428e-07 + p * w;
-            p = 1.8239629214389227755e-08 + p * w;
-            p = 1.5027403968909827627e-06 + p * w;
-            p = -4.013867526981545969e-06 + p * w;
-            p = 2.9234449089955446044e-06 + p * w;
-            p = 1.2475304481671778723e-05 + p * w;
-            p = -4.7318229009055733981e-05 + p * w;
-            p = 6.8284851459573175448e-05 + p * w;
-            p = 2.4031110387097893999e-05 + p * w;
-            p = -0.0003550375203628474796 + p * w;
-            p = 0.00095328937973738049703 + p * w;
-            p = -0.0016882755560235047313 + p * w;
-            p = 0.0024914420961078508066 + p * w;
-            p = -0.0037512085075692412107 + p * w;
-            p = 0.005370914553590063617 + p * w;
-            p = 1.0052589676941592334 + p * w;
-            p = 3.0838856104922207635 + p * w;
-        } else {
-            w = sqrt(w) - 5.000000;
-            p = -2.7109920616438573243e-11;
-            p = -2.5556418169965252055e-10 + p * w;
-            p = 1.5076572693500548083e-09 + p * w;
-            p = -3.7894654401267369937e-09 + p * w;
-            p = 7.6157012080783393804e-09 + p * w;
-            p = -1.4960026627149240478e-08 + p * w;
-            p = 2.9147953450901080826e-08 + p * w;
-            p = -6.7711997758452339498e-08 + p * w;
-            p = 2.2900482228026654717e-07 + p * w;
-            p = -9.9298272942317002539e-07 + p * w;
-            p = 4.5260625972231537039e-06 + p * w;
-            p = -1.9681778105531670567e-05 + p * w;
-            p = 7.5995277030017761139e-05 + p * w;
-            p = -0.00021503011930044477347 + p * w;
-            p = -0.00013871931833623122026 + p * w;
-            p = 1.0103004648645343977 + p * w;
-            p = 4.8499064014085844221 + p * w;
-        }
-        return p * x;
-    }
-
-    double standard_deviation(std::vector<double>::iterator first, std::vector<double>::iterator last) {
-        auto m = Catch::Benchmark::Detail::mean(first, last);
-        double variance = std::accumulate(first, last, 0., [m](double a, double b) {
-            double diff = b - m;
-            return a + diff * diff;
-            }) / (last - first);
-            return std::sqrt(variance);
-    }
-
-}
-
-namespace Catch {
-    namespace Benchmark {
-        namespace Detail {
-
-            double weighted_average_quantile(int k, int q, std::vector<double>::iterator first, std::vector<double>::iterator last) {
-                auto count = last - first;
-                double idx = (count - 1) * k / static_cast<double>(q);
-                int j = static_cast<int>(idx);
-                double g = idx - j;
-                std::nth_element(first, first + j, last);
-                auto xj = first[j];
-                if (g == 0) return xj;
-
-                auto xj1 = *std::min_element(first + (j + 1), last);
-                return xj + g * (xj1 - xj);
-            }
-
-            double erfc_inv(double x) {
-                return erf_inv(1.0 - x);
-            }
-
-            double normal_quantile(double p) {
-                static const double ROOT_TWO = std::sqrt(2.0);
-
-                double result = 0.0;
-                assert(p >= 0 && p <= 1);
-                if (p < 0 || p > 1) {
-                    return result;
-                }
-
-                result = -erfc_inv(2.0 * p);
-                // result *= normal distribution standard deviation (1.0) * sqrt(2)
-                result *= /*sd * */ ROOT_TWO;
-                // result += normal disttribution mean (0)
-                return result;
-            }
-
-            double outlier_variance(Estimate<double> mean, Estimate<double> stddev, int n) {
-                double sb = stddev.point;
-                double mn = mean.point / n;
-                double mg_min = mn / 2.;
-                double sg = std::min(mg_min / 4., sb / std::sqrt(n));
-                double sg2 = sg * sg;
-                double sb2 = sb * sb;
-
-                auto c_max = [n, mn, sb2, sg2](double x) -> double {
-                    double k = mn - x;
-                    double d = k * k;
-                    double nd = n * d;
-                    double k0 = -n * nd;
-                    double k1 = sb2 - n * sg2 + nd;
-                    double det = k1 * k1 - 4 * sg2 * k0;
-                    return (int)(-2. * k0 / (k1 + std::sqrt(det)));
-                };
-
-                auto var_out = [n, sb2, sg2](double c) {
-                    double nc = n - c;
-                    return (nc / n) * (sb2 - nc * sg2);
-                };
-
-                return std::min(var_out(1), var_out(std::min(c_max(0.), c_max(mg_min)))) / sb2;
-            }
-
-            bootstrap_analysis analyse_samples(double confidence_level, int n_resamples, std::vector<double>::iterator first, std::vector<double>::iterator last) {
-                CATCH_INTERNAL_START_WARNINGS_SUPPRESSION
-                CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS
-                static std::random_device entropy;
-                CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
-
-                auto n = static_cast<int>(last - first); // seriously, one can't use integral types without hell in C++
-
-                auto mean = &Detail::mean<std::vector<double>::iterator>;
-                auto stddev = &standard_deviation;
-
-#if defined(CATCH_CONFIG_USE_ASYNC)
-                auto Estimate = [=](double(*f)(std::vector<double>::iterator, std::vector<double>::iterator)) {
-                    auto seed = entropy();
-                    return std::async(std::launch::async, [=] {
-                        std::mt19937 rng(seed);
-                        auto resampled = resample(rng, n_resamples, first, last, f);
-                        return bootstrap(confidence_level, first, last, resampled, f);
-                    });
-                };
-
-                auto mean_future = Estimate(mean);
-                auto stddev_future = Estimate(stddev);
-
-                auto mean_estimate = mean_future.get();
-                auto stddev_estimate = stddev_future.get();
-#else
-                auto Estimate = [=](double(*f)(std::vector<double>::iterator, std::vector<double>::iterator)) {
-                    auto seed = entropy();
-                    std::mt19937 rng(seed);
-                    auto resampled = resample(rng, n_resamples, first, last, f);
-                    return bootstrap(confidence_level, first, last, resampled, f);
-                };
-
-                auto mean_estimate = Estimate(mean);
-                auto stddev_estimate = Estimate(stddev);
-#endif // CATCH_USE_ASYNC
-
-                double outlier_variance = Detail::outlier_variance(mean_estimate, stddev_estimate, n);
-
-                return { mean_estimate, stddev_estimate, outlier_variance };
-            }
-        } // namespace Detail
-    } // namespace Benchmark
-} // namespace Catch
-
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-// end catch_stats.cpp
-// start catch_approx.cpp
-
-#include <cmath>
-#include <limits>
-
-namespace {
-
-// Performs equivalent check of std::fabs(lhs - rhs) <= margin
-// But without the subtraction to allow for INFINITY in comparison
-bool marginComparison(double lhs, double rhs, double margin) {
-    return (lhs + margin >= rhs) && (rhs + margin >= lhs);
-}
-
-}
-
-namespace Catch {
-namespace Detail {
-
-    Approx::Approx ( double value )
-    :   m_epsilon( std::numeric_limits<float>::epsilon()*100 ),
-        m_margin( 0.0 ),
-        m_scale( 0.0 ),
-        m_value( value )
-    {}
-
-    Approx Approx::custom() {
-        return Approx( 0 );
-    }
-
-    Approx Approx::operator-() const {
-        auto temp(*this);
-        temp.m_value = -temp.m_value;
-        return temp;
-    }
-
-    std::string Approx::toString() const {
-        ReusableStringStream rss;
-        rss << "Approx( " << ::Catch::Detail::stringify( m_value ) << " )";
-        return rss.str();
-    }
-
-    bool Approx::equalityComparisonImpl(const double other) const {
-        // First try with fixed margin, then compute margin based on epsilon, scale and Approx's value
-        // Thanks to Richard Harris for his help refining the scaled margin value
-        return marginComparison(m_value, other, m_margin)
-            || marginComparison(m_value, other, m_epsilon * (m_scale + std::fabs(std::isinf(m_value)? 0 : m_value)));
-    }
-
-    void Approx::setMargin(double newMargin) {
-        CATCH_ENFORCE(newMargin >= 0,
-            "Invalid Approx::margin: " << newMargin << '.'
-            << " Approx::Margin has to be non-negative.");
-        m_margin = newMargin;
-    }
-
-    void Approx::setEpsilon(double newEpsilon) {
-        CATCH_ENFORCE(newEpsilon >= 0 && newEpsilon <= 1.0,
-            "Invalid Approx::epsilon: " << newEpsilon << '.'
-            << " Approx::epsilon has to be in [0, 1]");
-        m_epsilon = newEpsilon;
-    }
-
-} // end namespace Detail
-
-namespace literals {
-    Detail::Approx operator "" _a(long double val) {
-        return Detail::Approx(val);
-    }
-    Detail::Approx operator "" _a(unsigned long long val) {
-        return Detail::Approx(val);
-    }
-} // end namespace literals
-
-std::string StringMaker<Catch::Detail::Approx>::convert(Catch::Detail::Approx const& value) {
-    return value.toString();
-}
-
-} // end namespace Catch
-// end catch_approx.cpp
-// start catch_assertionhandler.cpp
-
-// start catch_debugger.h
-
-namespace Catch {
-    bool isDebuggerActive();
-}
-
-#ifdef CATCH_PLATFORM_MAC
-
-    #define CATCH_TRAP() __asm__("int $3\n" : : ) /* NOLINT */
-
-#elif defined(CATCH_PLATFORM_IPHONE)
-
-    // use inline assembler
-    #if defined(__i386__) || defined(__x86_64__)
-        #define CATCH_TRAP()  __asm__("int $3")
-    #elif defined(__aarch64__)
-        #define CATCH_TRAP()  __asm__(".inst 0xd4200000")
-    #elif defined(__arm__) && !defined(__thumb__)
-        #define CATCH_TRAP()  __asm__(".inst 0xe7f001f0")
-    #elif defined(__arm__) &&  defined(__thumb__)
-        #define CATCH_TRAP()  __asm__(".inst 0xde01")
-    #endif
-
-#elif defined(CATCH_PLATFORM_LINUX)
-    // If we can use inline assembler, do it because this allows us to break
-    // directly at the location of the failing check instead of breaking inside
-    // raise() called from it, i.e. one stack frame below.
-    #if defined(__GNUC__) && (defined(__i386) || defined(__x86_64))
-        #define CATCH_TRAP() asm volatile ("int $3") /* NOLINT */
-    #else // Fall back to the generic way.
-        #include <signal.h>
-
-        #define CATCH_TRAP() raise(SIGTRAP)
-    #endif
-#elif defined(_MSC_VER)
-    #define CATCH_TRAP() __debugbreak()
-#elif defined(__MINGW32__)
-    extern "C" __declspec(dllimport) void __stdcall DebugBreak();
-    #define CATCH_TRAP() DebugBreak()
-#endif
-
-#ifndef CATCH_BREAK_INTO_DEBUGGER
-    #ifdef CATCH_TRAP
-        #define CATCH_BREAK_INTO_DEBUGGER() []{ if( Catch::isDebuggerActive() ) { CATCH_TRAP(); } }()
-    #else
-        #define CATCH_BREAK_INTO_DEBUGGER() []{}()
-    #endif
-#endif
-
-// end catch_debugger.h
-// start catch_run_context.h
-
-// start catch_fatal_condition.h
-
-// start catch_windows_h_proxy.h
-
-
-#if defined(CATCH_PLATFORM_WINDOWS)
-
-#if !defined(NOMINMAX) && !defined(CATCH_CONFIG_NO_NOMINMAX)
-#  define CATCH_DEFINED_NOMINMAX
-#  define NOMINMAX
-#endif
-#if !defined(WIN32_LEAN_AND_MEAN) && !defined(CATCH_CONFIG_NO_WIN32_LEAN_AND_MEAN)
-#  define CATCH_DEFINED_WIN32_LEAN_AND_MEAN
-#  define WIN32_LEAN_AND_MEAN
-#endif
-
-#ifdef __AFXDLL
-#include <AfxWin.h>
-#else
-#include <windows.h>
-#endif
-
-#ifdef CATCH_DEFINED_NOMINMAX
-#  undef NOMINMAX
-#endif
-#ifdef CATCH_DEFINED_WIN32_LEAN_AND_MEAN
-#  undef WIN32_LEAN_AND_MEAN
-#endif
-
-#endif // defined(CATCH_PLATFORM_WINDOWS)
-
-// end catch_windows_h_proxy.h
-#if defined( CATCH_CONFIG_WINDOWS_SEH )
-
-namespace Catch {
-
-    struct FatalConditionHandler {
-
-        static LONG CALLBACK handleVectoredException(PEXCEPTION_POINTERS ExceptionInfo);
-        FatalConditionHandler();
-        static void reset();
-        ~FatalConditionHandler();
-
-    private:
-        static bool isSet;
-        static ULONG guaranteeSize;
-        static PVOID exceptionHandlerHandle;
-    };
-
-} // namespace Catch
-
-#elif defined ( CATCH_CONFIG_POSIX_SIGNALS )
-
-#include <signal.h>
-
-namespace Catch {
-
-    struct FatalConditionHandler {
-
-        static bool isSet;
-        static struct sigaction oldSigActions[];
-        static stack_t oldSigStack;
-        static char altStackMem[];
-
-        static void handleSignal( int sig );
-
-        FatalConditionHandler();
-        ~FatalConditionHandler();
-        static void reset();
-    };
-
-} // namespace Catch
-
-#else
-
-namespace Catch {
-    struct FatalConditionHandler {
-        void reset();
-    };
-}
-
-#endif
-
-// end catch_fatal_condition.h
-#include <string>
-
-namespace Catch {
-
-    struct IMutableContext;
-
-    ///////////////////////////////////////////////////////////////////////////
-
-    class RunContext : public IResultCapture, public IRunner {
-
-    public:
-        RunContext( RunContext const& ) = delete;
-        RunContext& operator =( RunContext const& ) = delete;
-
-        explicit RunContext( IConfigPtr const& _config, IStreamingReporterPtr&& reporter );
-
-        ~RunContext() override;
-
-        void testGroupStarting( std::string const& testSpec, std::size_t groupIndex, std::size_t groupsCount );
-        void testGroupEnded( std::string const& testSpec, Totals const& totals, std::size_t groupIndex, std::size_t groupsCount );
-
-        Totals runTest(TestCase const& testCase);
-
-        IConfigPtr config() const;
-        IStreamingReporter& reporter() const;
-
-    public: // IResultCapture
-
-        // Assertion handlers
-        void handleExpr
-                (   AssertionInfo const& info,
-                    ITransientExpression const& expr,
-                    AssertionReaction& reaction ) override;
-        void handleMessage
-                (   AssertionInfo const& info,
-                    ResultWas::OfType resultType,
-                    StringRef const& message,
-                    AssertionReaction& reaction ) override;
-        void handleUnexpectedExceptionNotThrown
-                (   AssertionInfo const& info,
-                    AssertionReaction& reaction ) override;
-        void handleUnexpectedInflightException
-                (   AssertionInfo const& info,
-                    std::string const& message,
-                    AssertionReaction& reaction ) override;
-        void handleIncomplete
-                (   AssertionInfo const& info ) override;
-        void handleNonExpr
-                (   AssertionInfo const &info,
-                    ResultWas::OfType resultType,
-                    AssertionReaction &reaction ) override;
-
-        bool sectionStarted( SectionInfo const& sectionInfo, Counts& assertions ) override;
-
-        void sectionEnded( SectionEndInfo const& endInfo ) override;
-        void sectionEndedEarly( SectionEndInfo const& endInfo ) override;
-
-        auto acquireGeneratorTracker( SourceLineInfo const& lineInfo ) -> IGeneratorTracker& override;
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-        void benchmarkPreparing( std::string const& name ) override;
-        void benchmarkStarting( BenchmarkInfo const& info ) override;
-        void benchmarkEnded( BenchmarkStats<> const& stats ) override;
-        void benchmarkFailed( std::string const& error ) override;
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-        void pushScopedMessage( MessageInfo const& message ) override;
-        void popScopedMessage( MessageInfo const& message ) override;
-
-        void emplaceUnscopedMessage( MessageBuilder const& builder ) override;
-
-        std::string getCurrentTestName() const override;
-
-        const AssertionResult* getLastResult() const override;
-
-        void exceptionEarlyReported() override;
-
-        void handleFatalErrorCondition( StringRef message ) override;
-
-        bool lastAssertionPassed() override;
-
-        void assertionPassed() override;
-
-    public:
-        // !TBD We need to do this another way!
-        bool aborting() const final;
-
-    private:
-
-        void runCurrentTest( std::string& redirectedCout, std::string& redirectedCerr );
-        void invokeActiveTestCase();
-
-        void resetAssertionInfo();
-        bool testForMissingAssertions( Counts& assertions );
-
-        void assertionEnded( AssertionResult const& result );
-        void reportExpr
-                (   AssertionInfo const &info,
-                    ResultWas::OfType resultType,
-                    ITransientExpression const *expr,
-                    bool negated );
-
-        void populateReaction( AssertionReaction& reaction );
-
-    private:
-
-        void handleUnfinishedSections();
-
-        TestRunInfo m_runInfo;
-        IMutableContext& m_context;
-        TestCase const* m_activeTestCase = nullptr;
-        ITracker* m_testCaseTracker = nullptr;
-        Option<AssertionResult> m_lastResult;
-
-        IConfigPtr m_config;
-        Totals m_totals;
-        IStreamingReporterPtr m_reporter;
-        std::vector<MessageInfo> m_messages;
-        std::vector<ScopedMessage> m_messageScopes; /* Keeps owners of so-called unscoped messages. */
-        AssertionInfo m_lastAssertionInfo;
-        std::vector<SectionEndInfo> m_unfinishedSections;
-        std::vector<ITracker*> m_activeSections;
-        TrackerContext m_trackerContext;
-        bool m_lastAssertionPassed = false;
-        bool m_shouldReportUnexpected = true;
-        bool m_includeSuccessfulResults;
-    };
-
-    void seedRng(IConfig const& config);
-    unsigned int rngSeed();
-} // end namespace Catch
-
-// end catch_run_context.h
-namespace Catch {
-
-    namespace {
-        auto operator <<( std::ostream& os, ITransientExpression const& expr ) -> std::ostream& {
-            expr.streamReconstructedExpression( os );
-            return os;
-        }
-    }
-
-    LazyExpression::LazyExpression( bool isNegated )
-    :   m_isNegated( isNegated )
-    {}
-
-    LazyExpression::LazyExpression( LazyExpression const& other ) : m_isNegated( other.m_isNegated ) {}
-
-    LazyExpression::operator bool() const {
-        return m_transientExpression != nullptr;
-    }
-
-    auto operator << ( std::ostream& os, LazyExpression const& lazyExpr ) -> std::ostream& {
-        if( lazyExpr.m_isNegated )
-            os << "!";
-
-        if( lazyExpr ) {
-            if( lazyExpr.m_isNegated && lazyExpr.m_transientExpression->isBinaryExpression() )
-                os << "(" << *lazyExpr.m_transientExpression << ")";
-            else
-                os << *lazyExpr.m_transientExpression;
-        }
-        else {
-            os << "{** error - unchecked empty expression requested **}";
-        }
-        return os;
-    }
-
-    AssertionHandler::AssertionHandler
-        (   StringRef const& macroName,
-            SourceLineInfo const& lineInfo,
-            StringRef capturedExpression,
-            ResultDisposition::Flags resultDisposition )
-    :   m_assertionInfo{ macroName, lineInfo, capturedExpression, resultDisposition },
-        m_resultCapture( getResultCapture() )
-    {}
-
-    void AssertionHandler::handleExpr( ITransientExpression const& expr ) {
-        m_resultCapture.handleExpr( m_assertionInfo, expr, m_reaction );
-    }
-    void AssertionHandler::handleMessage(ResultWas::OfType resultType, StringRef const& message) {
-        m_resultCapture.handleMessage( m_assertionInfo, resultType, message, m_reaction );
-    }
-
-    auto AssertionHandler::allowThrows() const -> bool {
-        return getCurrentContext().getConfig()->allowThrows();
-    }
-
-    void AssertionHandler::complete() {
-        setCompleted();
-        if( m_reaction.shouldDebugBreak ) {
-
-            // If you find your debugger stopping you here then go one level up on the
-            // call-stack for the code that caused it (typically a failed assertion)
-
-            // (To go back to the test and change execution, jump over the throw, next)
-            CATCH_BREAK_INTO_DEBUGGER();
-        }
-        if (m_reaction.shouldThrow) {
-#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-            throw Catch::TestFailureException();
-#else
-            CATCH_ERROR( "Test failure requires aborting test!" );
-#endif
-        }
-    }
-    void AssertionHandler::setCompleted() {
-        m_completed = true;
-    }
-
-    void AssertionHandler::handleUnexpectedInflightException() {
-        m_resultCapture.handleUnexpectedInflightException( m_assertionInfo, Catch::translateActiveException(), m_reaction );
-    }
-
-    void AssertionHandler::handleExceptionThrownAsExpected() {
-        m_resultCapture.handleNonExpr(m_assertionInfo, ResultWas::Ok, m_reaction);
-    }
-    void AssertionHandler::handleExceptionNotThrownAsExpected() {
-        m_resultCapture.handleNonExpr(m_assertionInfo, ResultWas::Ok, m_reaction);
-    }
-
-    void AssertionHandler::handleUnexpectedExceptionNotThrown() {
-        m_resultCapture.handleUnexpectedExceptionNotThrown( m_assertionInfo, m_reaction );
-    }
-
-    void AssertionHandler::handleThrowingCallSkipped() {
-        m_resultCapture.handleNonExpr(m_assertionInfo, ResultWas::Ok, m_reaction);
-    }
-
-    // This is the overload that takes a string and infers the Equals matcher from it
-    // The more general overload, that takes any string matcher, is in catch_capture_matchers.cpp
-    void handleExceptionMatchExpr( AssertionHandler& handler, std::string const& str, StringRef const& matcherString  ) {
-        handleExceptionMatchExpr( handler, Matchers::Equals( str ), matcherString );
-    }
-
-} // namespace Catch
-// end catch_assertionhandler.cpp
-// start catch_assertionresult.cpp
-
-namespace Catch {
-    AssertionResultData::AssertionResultData(ResultWas::OfType _resultType, LazyExpression const & _lazyExpression):
-        lazyExpression(_lazyExpression),
-        resultType(_resultType) {}
-
-    std::string AssertionResultData::reconstructExpression() const {
-
-        if( reconstructedExpression.empty() ) {
-            if( lazyExpression ) {
-                ReusableStringStream rss;
-                rss << lazyExpression;
-                reconstructedExpression = rss.str();
-            }
-        }
-        return reconstructedExpression;
-    }
-
-    AssertionResult::AssertionResult( AssertionInfo const& info, AssertionResultData const& data )
-    :   m_info( info ),
-        m_resultData( data )
-    {}
-
-    // Result was a success
-    bool AssertionResult::succeeded() const {
-        return Catch::isOk( m_resultData.resultType );
-    }
-
-    // Result was a success, or failure is suppressed
-    bool AssertionResult::isOk() const {
-        return Catch::isOk( m_resultData.resultType ) || shouldSuppressFailure( m_info.resultDisposition );
-    }
-
-    ResultWas::OfType AssertionResult::getResultType() const {
-        return m_resultData.resultType;
-    }
-
-    bool AssertionResult::hasExpression() const {
-        return !m_info.capturedExpression.empty();
-    }
-
-    bool AssertionResult::hasMessage() const {
-        return !m_resultData.message.empty();
-    }
-
-    std::string AssertionResult::getExpression() const {
-        // Possibly overallocating by 3 characters should be basically free
-        std::string expr; expr.reserve(m_info.capturedExpression.size() + 3);
-        if (isFalseTest(m_info.resultDisposition)) {
-            expr += "!(";
-        }
-        expr += m_info.capturedExpression;
-        if (isFalseTest(m_info.resultDisposition)) {
-            expr += ')';
-        }
-        return expr;
-    }
-
-    std::string AssertionResult::getExpressionInMacro() const {
-        std::string expr;
-        if( m_info.macroName.empty() )
-            expr = static_cast<std::string>(m_info.capturedExpression);
-        else {
-            expr.reserve( m_info.macroName.size() + m_info.capturedExpression.size() + 4 );
-            expr += m_info.macroName;
-            expr += "( ";
-            expr += m_info.capturedExpression;
-            expr += " )";
-        }
-        return expr;
-    }
-
-    bool AssertionResult::hasExpandedExpression() const {
-        return hasExpression() && getExpandedExpression() != getExpression();
-    }
-
-    std::string AssertionResult::getExpandedExpression() const {
-        std::string expr = m_resultData.reconstructExpression();
-        return expr.empty()
-                ? getExpression()
-                : expr;
-    }
-
-    std::string AssertionResult::getMessage() const {
-        return m_resultData.message;
-    }
-    SourceLineInfo AssertionResult::getSourceInfo() const {
-        return m_info.lineInfo;
-    }
-
-    StringRef AssertionResult::getTestMacroName() const {
-        return m_info.macroName;
-    }
-
-} // end namespace Catch
-// end catch_assertionresult.cpp
-// start catch_capture_matchers.cpp
-
-namespace Catch {
-
-    using StringMatcher = Matchers::Impl::MatcherBase<std::string>;
-
-    // This is the general overload that takes a any string matcher
-    // There is another overload, in catch_assertionhandler.h/.cpp, that only takes a string and infers
-    // the Equals matcher (so the header does not mention matchers)
-    void handleExceptionMatchExpr( AssertionHandler& handler, StringMatcher const& matcher, StringRef const& matcherString  ) {
-        std::string exceptionMessage = Catch::translateActiveException();
-        MatchExpr<std::string, StringMatcher const&> expr( exceptionMessage, matcher, matcherString );
-        handler.handleExpr( expr );
-    }
-
-} // namespace Catch
-// end catch_capture_matchers.cpp
-// start catch_commandline.cpp
-
-// start catch_commandline.h
-
-// start catch_clara.h
-
-// Use Catch's value for console width (store Clara's off to the side, if present)
-#ifdef CLARA_CONFIG_CONSOLE_WIDTH
-#define CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH
-#undef CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH
-#endif
-#define CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH CATCH_CONFIG_CONSOLE_WIDTH-1
-
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wweak-vtables"
-#pragma clang diagnostic ignored "-Wexit-time-destructors"
-#pragma clang diagnostic ignored "-Wshadow"
-#endif
-
-// start clara.hpp
-// Copyright 2017 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)
-//
-// See https://github.com/philsquared/Clara for more details
-
-// Clara v1.1.5
-
-
-#ifndef CATCH_CLARA_CONFIG_CONSOLE_WIDTH
-#define CATCH_CLARA_CONFIG_CONSOLE_WIDTH 80
-#endif
-
-#ifndef CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH
-#define CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH CATCH_CLARA_CONFIG_CONSOLE_WIDTH
-#endif
-
-#ifndef CLARA_CONFIG_OPTIONAL_TYPE
-#ifdef __has_include
-#if __has_include(<optional>) && __cplusplus >= 201703L
-#include <optional>
-#define CLARA_CONFIG_OPTIONAL_TYPE std::optional
-#endif
-#endif
-#endif
-
-// ----------- #included from clara_textflow.hpp -----------
-
-// TextFlowCpp
-//
-// A single-header library for wrapping and laying out basic text, by Phil Nash
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// This project is hosted at https://github.com/philsquared/textflowcpp
-
-
-#include <cassert>
-#include <ostream>
-#include <sstream>
-#include <vector>
-
-#ifndef CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH
-#define CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH 80
-#endif
-
-namespace Catch {
-namespace clara {
-namespace TextFlow {
-
-inline auto isWhitespace(char c) -> bool {
-	static std::string chars = " \t\n\r";
-	return chars.find(c) != std::string::npos;
-}
-inline auto isBreakableBefore(char c) -> bool {
-	static std::string chars = "[({<|";
-	return chars.find(c) != std::string::npos;
-}
-inline auto isBreakableAfter(char c) -> bool {
-	static std::string chars = "])}>.,:;*+-=&/\\";
-	return chars.find(c) != std::string::npos;
-}
-
-class Columns;
-
-class Column {
-	std::vector<std::string> m_strings;
-	size_t m_width = CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH;
-	size_t m_indent = 0;
-	size_t m_initialIndent = std::string::npos;
-
-public:
-	class iterator {
-		friend Column;
-
-		Column const& m_column;
-		size_t m_stringIndex = 0;
-		size_t m_pos = 0;
-
-		size_t m_len = 0;
-		size_t m_end = 0;
-		bool m_suffix = false;
-
-		iterator(Column const& column, size_t stringIndex)
-			: m_column(column),
-			m_stringIndex(stringIndex) {}
-
-		auto line() const -> std::string const& { return m_column.m_strings[m_stringIndex]; }
-
-		auto isBoundary(size_t at) const -> bool {
-			assert(at > 0);
-			assert(at <= line().size());
-
-			return at == line().size() ||
-				(isWhitespace(line()[at]) && !isWhitespace(line()[at - 1])) ||
-				isBreakableBefore(line()[at]) ||
-				isBreakableAfter(line()[at - 1]);
-		}
-
-		void calcLength() {
-			assert(m_stringIndex < m_column.m_strings.size());
-
-			m_suffix = false;
-			auto width = m_column.m_width - indent();
-			m_end = m_pos;
-			if (line()[m_pos] == '\n') {
-				++m_end;
-			}
-			while (m_end < line().size() && line()[m_end] != '\n')
-				++m_end;
-
-			if (m_end < m_pos + width) {
-				m_len = m_end - m_pos;
-			} else {
-				size_t len = width;
-				while (len > 0 && !isBoundary(m_pos + len))
-					--len;
-				while (len > 0 && isWhitespace(line()[m_pos + len - 1]))
-					--len;
-
-				if (len > 0) {
-					m_len = len;
-				} else {
-					m_suffix = true;
-					m_len = width - 1;
-				}
-			}
-		}
-
-		auto indent() const -> size_t {
-			auto initial = m_pos == 0 && m_stringIndex == 0 ? m_column.m_initialIndent : std::string::npos;
-			return initial == std::string::npos ? m_column.m_indent : initial;
-		}
-
-		auto addIndentAndSuffix(std::string const &plain) const -> std::string {
-			return std::string(indent(), ' ') + (m_suffix ? plain + "-" : plain);
-		}
-
-	public:
-		using difference_type = std::ptrdiff_t;
-		using value_type = std::string;
-		using pointer = value_type * ;
-		using reference = value_type & ;
-		using iterator_category = std::forward_iterator_tag;
-
-		explicit iterator(Column const& column) : m_column(column) {
-			assert(m_column.m_width > m_column.m_indent);
-			assert(m_column.m_initialIndent == std::string::npos || m_column.m_width > m_column.m_initialIndent);
-			calcLength();
-			if (m_len == 0)
-				m_stringIndex++; // Empty string
-		}
-
-		auto operator *() const -> std::string {
-			assert(m_stringIndex < m_column.m_strings.size());
-			assert(m_pos <= m_end);
-			return addIndentAndSuffix(line().substr(m_pos, m_len));
-		}
-
-		auto operator ++() -> iterator& {
-			m_pos += m_len;
-			if (m_pos < line().size() && line()[m_pos] == '\n')
-				m_pos += 1;
-			else
-				while (m_pos < line().size() && isWhitespace(line()[m_pos]))
-					++m_pos;
-
-			if (m_pos == line().size()) {
-				m_pos = 0;
-				++m_stringIndex;
-			}
-			if (m_stringIndex < m_column.m_strings.size())
-				calcLength();
-			return *this;
-		}
-		auto operator ++(int) -> iterator {
-			iterator prev(*this);
-			operator++();
-			return prev;
-		}
-
-		auto operator ==(iterator const& other) const -> bool {
-			return
-				m_pos == other.m_pos &&
-				m_stringIndex == other.m_stringIndex &&
-				&m_column == &other.m_column;
-		}
-		auto operator !=(iterator const& other) const -> bool {
-			return !operator==(other);
-		}
-	};
-	using const_iterator = iterator;
-
-	explicit Column(std::string const& text) { m_strings.push_back(text); }
-
-	auto width(size_t newWidth) -> Column& {
-		assert(newWidth > 0);
-		m_width = newWidth;
-		return *this;
-	}
-	auto indent(size_t newIndent) -> Column& {
-		m_indent = newIndent;
-		return *this;
-	}
-	auto initialIndent(size_t newIndent) -> Column& {
-		m_initialIndent = newIndent;
-		return *this;
-	}
-
-	auto width() const -> size_t { return m_width; }
-	auto begin() const -> iterator { return iterator(*this); }
-	auto end() const -> iterator { return { *this, m_strings.size() }; }
-
-	inline friend std::ostream& operator << (std::ostream& os, Column const& col) {
-		bool first = true;
-		for (auto line : col) {
-			if (first)
-				first = false;
-			else
-				os << "\n";
-			os << line;
-		}
-		return os;
-	}
-
-	auto operator + (Column const& other)->Columns;
-
-	auto toString() const -> std::string {
-		std::ostringstream oss;
-		oss << *this;
-		return oss.str();
-	}
-};
-
-class Spacer : public Column {
-
-public:
-	explicit Spacer(size_t spaceWidth) : Column("") {
-		width(spaceWidth);
-	}
-};
-
-class Columns {
-	std::vector<Column> m_columns;
-
-public:
-
-	class iterator {
-		friend Columns;
-		struct EndTag {};
-
-		std::vector<Column> const& m_columns;
-		std::vector<Column::iterator> m_iterators;
-		size_t m_activeIterators;
-
-		iterator(Columns const& columns, EndTag)
-			: m_columns(columns.m_columns),
-			m_activeIterators(0) {
-			m_iterators.reserve(m_columns.size());
-
-			for (auto const& col : m_columns)
-				m_iterators.push_back(col.end());
-		}
-
-	public:
-		using difference_type = std::ptrdiff_t;
-		using value_type = std::string;
-		using pointer = value_type * ;
-		using reference = value_type & ;
-		using iterator_category = std::forward_iterator_tag;
-
-		explicit iterator(Columns const& columns)
-			: m_columns(columns.m_columns),
-			m_activeIterators(m_columns.size()) {
-			m_iterators.reserve(m_columns.size());
-
-			for (auto const& col : m_columns)
-				m_iterators.push_back(col.begin());
-		}
-
-		auto operator ==(iterator const& other) const -> bool {
-			return m_iterators == other.m_iterators;
-		}
-		auto operator !=(iterator const& other) const -> bool {
-			return m_iterators != other.m_iterators;
-		}
-		auto operator *() const -> std::string {
-			std::string row, padding;
-
-			for (size_t i = 0; i < m_columns.size(); ++i) {
-				auto width = m_columns[i].width();
-				if (m_iterators[i] != m_columns[i].end()) {
-					std::string col = *m_iterators[i];
-					row += padding + col;
-					if (col.size() < width)
-						padding = std::string(width - col.size(), ' ');
-					else
-						padding = "";
-				} else {
-					padding += std::string(width, ' ');
-				}
-			}
-			return row;
-		}
-		auto operator ++() -> iterator& {
-			for (size_t i = 0; i < m_columns.size(); ++i) {
-				if (m_iterators[i] != m_columns[i].end())
-					++m_iterators[i];
-			}
-			return *this;
-		}
-		auto operator ++(int) -> iterator {
-			iterator prev(*this);
-			operator++();
-			return prev;
-		}
-	};
-	using const_iterator = iterator;
-
-	auto begin() const -> iterator { return iterator(*this); }
-	auto end() const -> iterator { return { *this, iterator::EndTag() }; }
-
-	auto operator += (Column const& col) -> Columns& {
-		m_columns.push_back(col);
-		return *this;
-	}
-	auto operator + (Column const& col) -> Columns {
-		Columns combined = *this;
-		combined += col;
-		return combined;
-	}
-
-	inline friend std::ostream& operator << (std::ostream& os, Columns const& cols) {
-
-		bool first = true;
-		for (auto line : cols) {
-			if (first)
-				first = false;
-			else
-				os << "\n";
-			os << line;
-		}
-		return os;
-	}
-
-	auto toString() const -> std::string {
-		std::ostringstream oss;
-		oss << *this;
-		return oss.str();
-	}
-};
-
-inline auto Column::operator + (Column const& other) -> Columns {
-	Columns cols;
-	cols += *this;
-	cols += other;
-	return cols;
-}
-}
-
-}
-}
-
-// ----------- end of #include from clara_textflow.hpp -----------
-// ........... back in clara.hpp
-
-#include <cctype>
-#include <string>
-#include <memory>
-#include <set>
-#include <algorithm>
-
-#if !defined(CATCH_PLATFORM_WINDOWS) && ( defined(WIN32) || defined(__WIN32__) || defined(_WIN32) || defined(_MSC_VER) )
-#define CATCH_PLATFORM_WINDOWS
-#endif
-
-namespace Catch { namespace clara {
-namespace detail {
-
-    // Traits for extracting arg and return type of lambdas (for single argument lambdas)
-    template<typename L>
-    struct UnaryLambdaTraits : UnaryLambdaTraits<decltype( &L::operator() )> {};
-
-    template<typename ClassT, typename ReturnT, typename... Args>
-    struct UnaryLambdaTraits<ReturnT( ClassT::* )( Args... ) const> {
-        static const bool isValid = false;
-    };
-
-    template<typename ClassT, typename ReturnT, typename ArgT>
-    struct UnaryLambdaTraits<ReturnT( ClassT::* )( ArgT ) const> {
-        static const bool isValid = true;
-        using ArgType = typename std::remove_const<typename std::remove_reference<ArgT>::type>::type;
-        using ReturnType = ReturnT;
-    };
-
-    class TokenStream;
-
-    // Transport for raw args (copied from main args, or supplied via init list for testing)
-    class Args {
-        friend TokenStream;
-        std::string m_exeName;
-        std::vector<std::string> m_args;
-
-    public:
-        Args( int argc, char const* const* argv )
-            : m_exeName(argv[0]),
-              m_args(argv + 1, argv + argc) {}
-
-        Args( std::initializer_list<std::string> args )
-        :   m_exeName( *args.begin() ),
-            m_args( args.begin()+1, args.end() )
-        {}
-
-        auto exeName() const -> std::string {
-            return m_exeName;
-        }
-    };
-
-    // Wraps a token coming from a token stream. These may not directly correspond to strings as a single string
-    // may encode an option + its argument if the : or = form is used
-    enum class TokenType {
-        Option, Argument
-    };
-    struct Token {
-        TokenType type;
-        std::string token;
-    };
-
-    inline auto isOptPrefix( char c ) -> bool {
-        return c == '-'
-#ifdef CATCH_PLATFORM_WINDOWS
-            || c == '/'
-#endif
-        ;
-    }
-
-    // Abstracts iterators into args as a stream of tokens, with option arguments uniformly handled
-    class TokenStream {
-        using Iterator = std::vector<std::string>::const_iterator;
-        Iterator it;
-        Iterator itEnd;
-        std::vector<Token> m_tokenBuffer;
-
-        void loadBuffer() {
-            m_tokenBuffer.resize( 0 );
-
-            // Skip any empty strings
-            while( it != itEnd && it->empty() )
-                ++it;
-
-            if( it != itEnd ) {
-                auto const &next = *it;
-                if( isOptPrefix( next[0] ) ) {
-                    auto delimiterPos = next.find_first_of( " :=" );
-                    if( delimiterPos != std::string::npos ) {
-                        m_tokenBuffer.push_back( { TokenType::Option, next.substr( 0, delimiterPos ) } );
-                        m_tokenBuffer.push_back( { TokenType::Argument, next.substr( delimiterPos + 1 ) } );
-                    } else {
-                        if( next[1] != '-' && next.size() > 2 ) {
-                            std::string opt = "- ";
-                            for( size_t i = 1; i < next.size(); ++i ) {
-                                opt[1] = next[i];
-                                m_tokenBuffer.push_back( { TokenType::Option, opt } );
-                            }
-                        } else {
-                            m_tokenBuffer.push_back( { TokenType::Option, next } );
-                        }
-                    }
-                } else {
-                    m_tokenBuffer.push_back( { TokenType::Argument, next } );
-                }
-            }
-        }
-
-    public:
-        explicit TokenStream( Args const &args ) : TokenStream( args.m_args.begin(), args.m_args.end() ) {}
-
-        TokenStream( Iterator it, Iterator itEnd ) : it( it ), itEnd( itEnd ) {
-            loadBuffer();
-        }
-
-        explicit operator bool() const {
-            return !m_tokenBuffer.empty() || it != itEnd;
-        }
-
-        auto count() const -> size_t { return m_tokenBuffer.size() + (itEnd - it); }
-
-        auto operator*() const -> Token {
-            assert( !m_tokenBuffer.empty() );
-            return m_tokenBuffer.front();
-        }
-
-        auto operator->() const -> Token const * {
-            assert( !m_tokenBuffer.empty() );
-            return &m_tokenBuffer.front();
-        }
-
-        auto operator++() -> TokenStream & {
-            if( m_tokenBuffer.size() >= 2 ) {
-                m_tokenBuffer.erase( m_tokenBuffer.begin() );
-            } else {
-                if( it != itEnd )
-                    ++it;
-                loadBuffer();
-            }
-            return *this;
-        }
-    };
-
-    class ResultBase {
-    public:
-        enum Type {
-            Ok, LogicError, RuntimeError
-        };
-
-    protected:
-        ResultBase( Type type ) : m_type( type ) {}
-        virtual ~ResultBase() = default;
-
-        virtual void enforceOk() const = 0;
-
-        Type m_type;
-    };
-
-    template<typename T>
-    class ResultValueBase : public ResultBase {
-    public:
-        auto value() const -> T const & {
-            enforceOk();
-            return m_value;
-        }
-
-    protected:
-        ResultValueBase( Type type ) : ResultBase( type ) {}
-
-        ResultValueBase( ResultValueBase const &other ) : ResultBase( other ) {
-            if( m_type == ResultBase::Ok )
-                new( &m_value ) T( other.m_value );
-        }
-
-        ResultValueBase( Type, T const &value ) : ResultBase( Ok ) {
-            new( &m_value ) T( value );
-        }
-
-        auto operator=( ResultValueBase const &other ) -> ResultValueBase & {
-            if( m_type == ResultBase::Ok )
-                m_value.~T();
-            ResultBase::operator=(other);
-            if( m_type == ResultBase::Ok )
-                new( &m_value ) T( other.m_value );
-            return *this;
-        }
-
-        ~ResultValueBase() override {
-            if( m_type == Ok )
-                m_value.~T();
-        }
-
-        union {
-            T m_value;
-        };
-    };
-
-    template<>
-    class ResultValueBase<void> : public ResultBase {
-    protected:
-        using ResultBase::ResultBase;
-    };
-
-    template<typename T = void>
-    class BasicResult : public ResultValueBase<T> {
-    public:
-        template<typename U>
-        explicit BasicResult( BasicResult<U> const &other )
-        :   ResultValueBase<T>( other.type() ),
-            m_errorMessage( other.errorMessage() )
-        {
-            assert( type() != ResultBase::Ok );
-        }
-
-        template<typename U>
-        static auto ok( U const &value ) -> BasicResult { return { ResultBase::Ok, value }; }
-        static auto ok() -> BasicResult { return { ResultBase::Ok }; }
-        static auto logicError( std::string const &message ) -> BasicResult { return { ResultBase::LogicError, message }; }
-        static auto runtimeError( std::string const &message ) -> BasicResult { return { ResultBase::RuntimeError, message }; }
-
-        explicit operator bool() const { return m_type == ResultBase::Ok; }
-        auto type() const -> ResultBase::Type { return m_type; }
-        auto errorMessage() const -> std::string { return m_errorMessage; }
-
-    protected:
-        void enforceOk() const override {
-
-            // Errors shouldn't reach this point, but if they do
-            // the actual error message will be in m_errorMessage
-            assert( m_type != ResultBase::LogicError );
-            assert( m_type != ResultBase::RuntimeError );
-            if( m_type != ResultBase::Ok )
-                std::abort();
-        }
-
-        std::string m_errorMessage; // Only populated if resultType is an error
-
-        BasicResult( ResultBase::Type type, std::string const &message )
-        :   ResultValueBase<T>(type),
-            m_errorMessage(message)
-        {
-            assert( m_type != ResultBase::Ok );
-        }
-
-        using ResultValueBase<T>::ResultValueBase;
-        using ResultBase::m_type;
-    };
-
-    enum class ParseResultType {
-        Matched, NoMatch, ShortCircuitAll, ShortCircuitSame
-    };
-
-    class ParseState {
-    public:
-
-        ParseState( ParseResultType type, TokenStream const &remainingTokens )
-        : m_type(type),
-          m_remainingTokens( remainingTokens )
-        {}
-
-        auto type() const -> ParseResultType { return m_type; }
-        auto remainingTokens() const -> TokenStream { return m_remainingTokens; }
-
-    private:
-        ParseResultType m_type;
-        TokenStream m_remainingTokens;
-    };
-
-    using Result = BasicResult<void>;
-    using ParserResult = BasicResult<ParseResultType>;
-    using InternalParseResult = BasicResult<ParseState>;
-
-    struct HelpColumns {
-        std::string left;
-        std::string right;
-    };
-
-    template<typename T>
-    inline auto convertInto( std::string const &source, T& target ) -> ParserResult {
-        std::stringstream ss;
-        ss << source;
-        ss >> target;
-        if( ss.fail() )
-            return ParserResult::runtimeError( "Unable to convert '" + source + "' to destination type" );
-        else
-            return ParserResult::ok( ParseResultType::Matched );
-    }
-    inline auto convertInto( std::string const &source, std::string& target ) -> ParserResult {
-        target = source;
-        return ParserResult::ok( ParseResultType::Matched );
-    }
-    inline auto convertInto( std::string const &source, bool &target ) -> ParserResult {
-        std::string srcLC = source;
-        std::transform( srcLC.begin(), srcLC.end(), srcLC.begin(), []( char c ) { return static_cast<char>( std::tolower(c) ); } );
-        if (srcLC == "y" || srcLC == "1" || srcLC == "true" || srcLC == "yes" || srcLC == "on")
-            target = true;
-        else if (srcLC == "n" || srcLC == "0" || srcLC == "false" || srcLC == "no" || srcLC == "off")
-            target = false;
-        else
-            return ParserResult::runtimeError( "Expected a boolean value but did not recognise: '" + source + "'" );
-        return ParserResult::ok( ParseResultType::Matched );
-    }
-#ifdef CLARA_CONFIG_OPTIONAL_TYPE
-    template<typename T>
-    inline auto convertInto( std::string const &source, CLARA_CONFIG_OPTIONAL_TYPE<T>& target ) -> ParserResult {
-        T temp;
-        auto result = convertInto( source, temp );
-        if( result )
-            target = std::move(temp);
-        return result;
-    }
-#endif // CLARA_CONFIG_OPTIONAL_TYPE
-
-    struct NonCopyable {
-        NonCopyable() = default;
-        NonCopyable( NonCopyable const & ) = delete;
-        NonCopyable( NonCopyable && ) = delete;
-        NonCopyable &operator=( NonCopyable const & ) = delete;
-        NonCopyable &operator=( NonCopyable && ) = delete;
-    };
-
-    struct BoundRef : NonCopyable {
-        virtual ~BoundRef() = default;
-        virtual auto isContainer() const -> bool { return false; }
-        virtual auto isFlag() const -> bool { return false; }
-    };
-    struct BoundValueRefBase : BoundRef {
-        virtual auto setValue( std::string const &arg ) -> ParserResult = 0;
-    };
-    struct BoundFlagRefBase : BoundRef {
-        virtual auto setFlag( bool flag ) -> ParserResult = 0;
-        virtual auto isFlag() const -> bool { return true; }
-    };
-
-    template<typename T>
-    struct BoundValueRef : BoundValueRefBase {
-        T &m_ref;
-
-        explicit BoundValueRef( T &ref ) : m_ref( ref ) {}
-
-        auto setValue( std::string const &arg ) -> ParserResult override {
-            return convertInto( arg, m_ref );
-        }
-    };
-
-    template<typename T>
-    struct BoundValueRef<std::vector<T>> : BoundValueRefBase {
-        std::vector<T> &m_ref;
-
-        explicit BoundValueRef( std::vector<T> &ref ) : m_ref( ref ) {}
-
-        auto isContainer() const -> bool override { return true; }
-
-        auto setValue( std::string const &arg ) -> ParserResult override {
-            T temp;
-            auto result = convertInto( arg, temp );
-            if( result )
-                m_ref.push_back( temp );
-            return result;
-        }
-    };
-
-    struct BoundFlagRef : BoundFlagRefBase {
-        bool &m_ref;
-
-        explicit BoundFlagRef( bool &ref ) : m_ref( ref ) {}
-
-        auto setFlag( bool flag ) -> ParserResult override {
-            m_ref = flag;
-            return ParserResult::ok( ParseResultType::Matched );
-        }
-    };
-
-    template<typename ReturnType>
-    struct LambdaInvoker {
-        static_assert( std::is_same<ReturnType, ParserResult>::value, "Lambda must return void or clara::ParserResult" );
-
-        template<typename L, typename ArgType>
-        static auto invoke( L const &lambda, ArgType const &arg ) -> ParserResult {
-            return lambda( arg );
-        }
-    };
-
-    template<>
-    struct LambdaInvoker<void> {
-        template<typename L, typename ArgType>
-        static auto invoke( L const &lambda, ArgType const &arg ) -> ParserResult {
-            lambda( arg );
-            return ParserResult::ok( ParseResultType::Matched );
-        }
-    };
-
-    template<typename ArgType, typename L>
-    inline auto invokeLambda( L const &lambda, std::string const &arg ) -> ParserResult {
-        ArgType temp{};
-        auto result = convertInto( arg, temp );
-        return !result
-           ? result
-           : LambdaInvoker<typename UnaryLambdaTraits<L>::ReturnType>::invoke( lambda, temp );
-    }
-
-    template<typename L>
-    struct BoundLambda : BoundValueRefBase {
-        L m_lambda;
-
-        static_assert( UnaryLambdaTraits<L>::isValid, "Supplied lambda must take exactly one argument" );
-        explicit BoundLambda( L const &lambda ) : m_lambda( lambda ) {}
-
-        auto setValue( std::string const &arg ) -> ParserResult override {
-            return invokeLambda<typename UnaryLambdaTraits<L>::ArgType>( m_lambda, arg );
-        }
-    };
-
-    template<typename L>
-    struct BoundFlagLambda : BoundFlagRefBase {
-        L m_lambda;
-
-        static_assert( UnaryLambdaTraits<L>::isValid, "Supplied lambda must take exactly one argument" );
-        static_assert( std::is_same<typename UnaryLambdaTraits<L>::ArgType, bool>::value, "flags must be boolean" );
-
-        explicit BoundFlagLambda( L const &lambda ) : m_lambda( lambda ) {}
-
-        auto setFlag( bool flag ) -> ParserResult override {
-            return LambdaInvoker<typename UnaryLambdaTraits<L>::ReturnType>::invoke( m_lambda, flag );
-        }
-    };
-
-    enum class Optionality { Optional, Required };
-
-    struct Parser;
-
-    class ParserBase {
-    public:
-        virtual ~ParserBase() = default;
-        virtual auto validate() const -> Result { return Result::ok(); }
-        virtual auto parse( std::string const& exeName, TokenStream const &tokens) const -> InternalParseResult  = 0;
-        virtual auto cardinality() const -> size_t { return 1; }
-
-        auto parse( Args const &args ) const -> InternalParseResult {
-            return parse( args.exeName(), TokenStream( args ) );
-        }
-    };
-
-    template<typename DerivedT>
-    class ComposableParserImpl : public ParserBase {
-    public:
-        template<typename T>
-        auto operator|( T const &other ) const -> Parser;
-
-		template<typename T>
-        auto operator+( T const &other ) const -> Parser;
-    };
-
-    // Common code and state for Args and Opts
-    template<typename DerivedT>
-    class ParserRefImpl : public ComposableParserImpl<DerivedT> {
-    protected:
-        Optionality m_optionality = Optionality::Optional;
-        std::shared_ptr<BoundRef> m_ref;
-        std::string m_hint;
-        std::string m_description;
-
-        explicit ParserRefImpl( std::shared_ptr<BoundRef> const &ref ) : m_ref( ref ) {}
-
-    public:
-        template<typename T>
-        ParserRefImpl( T &ref, std::string const &hint )
-        :   m_ref( std::make_shared<BoundValueRef<T>>( ref ) ),
-            m_hint( hint )
-        {}
-
-        template<typename LambdaT>
-        ParserRefImpl( LambdaT const &ref, std::string const &hint )
-        :   m_ref( std::make_shared<BoundLambda<LambdaT>>( ref ) ),
-            m_hint(hint)
-        {}
-
-        auto operator()( std::string const &description ) -> DerivedT & {
-            m_description = description;
-            return static_cast<DerivedT &>( *this );
-        }
-
-        auto optional() -> DerivedT & {
-            m_optionality = Optionality::Optional;
-            return static_cast<DerivedT &>( *this );
-        };
-
-        auto required() -> DerivedT & {
-            m_optionality = Optionality::Required;
-            return static_cast<DerivedT &>( *this );
-        };
-
-        auto isOptional() const -> bool {
-            return m_optionality == Optionality::Optional;
-        }
-
-        auto cardinality() const -> size_t override {
-            if( m_ref->isContainer() )
-                return 0;
-            else
-                return 1;
-        }
-
-        auto hint() const -> std::string { return m_hint; }
-    };
-
-    class ExeName : public ComposableParserImpl<ExeName> {
-        std::shared_ptr<std::string> m_name;
-        std::shared_ptr<BoundValueRefBase> m_ref;
-
-        template<typename LambdaT>
-        static auto makeRef(LambdaT const &lambda) -> std::shared_ptr<BoundValueRefBase> {
-            return std::make_shared<BoundLambda<LambdaT>>( lambda) ;
-        }
-
-    public:
-        ExeName() : m_name( std::make_shared<std::string>( "<executable>" ) ) {}
-
-        explicit ExeName( std::string &ref ) : ExeName() {
-            m_ref = std::make_shared<BoundValueRef<std::string>>( ref );
-        }
-
-        template<typename LambdaT>
-        explicit ExeName( LambdaT const& lambda ) : ExeName() {
-            m_ref = std::make_shared<BoundLambda<LambdaT>>( lambda );
-        }
-
-        // The exe name is not parsed out of the normal tokens, but is handled specially
-        auto parse( std::string const&, TokenStream const &tokens ) const -> InternalParseResult override {
-            return InternalParseResult::ok( ParseState( ParseResultType::NoMatch, tokens ) );
-        }
-
-        auto name() const -> std::string { return *m_name; }
-        auto set( std::string const& newName ) -> ParserResult {
-
-            auto lastSlash = newName.find_last_of( "\\/" );
-            auto filename = ( lastSlash == std::string::npos )
-                    ? newName
-                    : newName.substr( lastSlash+1 );
-
-            *m_name = filename;
-            if( m_ref )
-                return m_ref->setValue( filename );
-            else
-                return ParserResult::ok( ParseResultType::Matched );
-        }
-    };
-
-    class Arg : public ParserRefImpl<Arg> {
-    public:
-        using ParserRefImpl::ParserRefImpl;
-
-        auto parse( std::string const &, TokenStream const &tokens ) const -> InternalParseResult override {
-            auto validationResult = validate();
-            if( !validationResult )
-                return InternalParseResult( validationResult );
-
-            auto remainingTokens = tokens;
-            auto const &token = *remainingTokens;
-            if( token.type != TokenType::Argument )
-                return InternalParseResult::ok( ParseState( ParseResultType::NoMatch, remainingTokens ) );
-
-            assert( !m_ref->isFlag() );
-            auto valueRef = static_cast<detail::BoundValueRefBase*>( m_ref.get() );
-
-            auto result = valueRef->setValue( remainingTokens->token );
-            if( !result )
-                return InternalParseResult( result );
-            else
-                return InternalParseResult::ok( ParseState( ParseResultType::Matched, ++remainingTokens ) );
-        }
-    };
-
-    inline auto normaliseOpt( std::string const &optName ) -> std::string {
-#ifdef CATCH_PLATFORM_WINDOWS
-        if( optName[0] == '/' )
-            return "-" + optName.substr( 1 );
-        else
-#endif
-            return optName;
-    }
-
-    class Opt : public ParserRefImpl<Opt> {
-    protected:
-        std::vector<std::string> m_optNames;
-
-    public:
-        template<typename LambdaT>
-        explicit Opt( LambdaT const &ref ) : ParserRefImpl( std::make_shared<BoundFlagLambda<LambdaT>>( ref ) ) {}
-
-        explicit Opt( bool &ref ) : ParserRefImpl( std::make_shared<BoundFlagRef>( ref ) ) {}
-
-        template<typename LambdaT>
-        Opt( LambdaT const &ref, std::string const &hint ) : ParserRefImpl( ref, hint ) {}
-
-        template<typename T>
-        Opt( T &ref, std::string const &hint ) : ParserRefImpl( ref, hint ) {}
-
-        auto operator[]( std::string const &optName ) -> Opt & {
-            m_optNames.push_back( optName );
-            return *this;
-        }
-
-        auto getHelpColumns() const -> std::vector<HelpColumns> {
-            std::ostringstream oss;
-            bool first = true;
-            for( auto const &opt : m_optNames ) {
-                if (first)
-                    first = false;
-                else
-                    oss << ", ";
-                oss << opt;
-            }
-            if( !m_hint.empty() )
-                oss << " <" << m_hint << ">";
-            return { { oss.str(), m_description } };
-        }
-
-        auto isMatch( std::string const &optToken ) const -> bool {
-            auto normalisedToken = normaliseOpt( optToken );
-            for( auto const &name : m_optNames ) {
-                if( normaliseOpt( name ) == normalisedToken )
-                    return true;
-            }
-            return false;
-        }
-
-        using ParserBase::parse;
-
-        auto parse( std::string const&, TokenStream const &tokens ) const -> InternalParseResult override {
-            auto validationResult = validate();
-            if( !validationResult )
-                return InternalParseResult( validationResult );
-
-            auto remainingTokens = tokens;
-            if( remainingTokens && remainingTokens->type == TokenType::Option ) {
-                auto const &token = *remainingTokens;
-                if( isMatch(token.token ) ) {
-                    if( m_ref->isFlag() ) {
-                        auto flagRef = static_cast<detail::BoundFlagRefBase*>( m_ref.get() );
-                        auto result = flagRef->setFlag( true );
-                        if( !result )
-                            return InternalParseResult( result );
-                        if( result.value() == ParseResultType::ShortCircuitAll )
-                            return InternalParseResult::ok( ParseState( result.value(), remainingTokens ) );
-                    } else {
-                        auto valueRef = static_cast<detail::BoundValueRefBase*>( m_ref.get() );
-                        ++remainingTokens;
-                        if( !remainingTokens )
-                            return InternalParseResult::runtimeError( "Expected argument following " + token.token );
-                        auto const &argToken = *remainingTokens;
-                        if( argToken.type != TokenType::Argument )
-                            return InternalParseResult::runtimeError( "Expected argument following " + token.token );
-                        auto result = valueRef->setValue( argToken.token );
-                        if( !result )
-                            return InternalParseResult( result );
-                        if( result.value() == ParseResultType::ShortCircuitAll )
-                            return InternalParseResult::ok( ParseState( result.value(), remainingTokens ) );
-                    }
-                    return InternalParseResult::ok( ParseState( ParseResultType::Matched, ++remainingTokens ) );
-                }
-            }
-            return InternalParseResult::ok( ParseState( ParseResultType::NoMatch, remainingTokens ) );
-        }
-
-        auto validate() const -> Result override {
-            if( m_optNames.empty() )
-                return Result::logicError( "No options supplied to Opt" );
-            for( auto const &name : m_optNames ) {
-                if( name.empty() )
-                    return Result::logicError( "Option name cannot be empty" );
-#ifdef CATCH_PLATFORM_WINDOWS
-                if( name[0] != '-' && name[0] != '/' )
-                    return Result::logicError( "Option name must begin with '-' or '/'" );
-#else
-                if( name[0] != '-' )
-                    return Result::logicError( "Option name must begin with '-'" );
-#endif
-            }
-            return ParserRefImpl::validate();
-        }
-    };
-
-    struct Help : Opt {
-        Help( bool &showHelpFlag )
-        :   Opt([&]( bool flag ) {
-                showHelpFlag = flag;
-                return ParserResult::ok( ParseResultType::ShortCircuitAll );
-            })
-        {
-            static_cast<Opt &>( *this )
-                    ("display usage information")
-                    ["-?"]["-h"]["--help"]
-                    .optional();
-        }
-    };
-
-    struct Parser : ParserBase {
-
-        mutable ExeName m_exeName;
-        std::vector<Opt> m_options;
-        std::vector<Arg> m_args;
-
-        auto operator|=( ExeName const &exeName ) -> Parser & {
-            m_exeName = exeName;
-            return *this;
-        }
-
-        auto operator|=( Arg const &arg ) -> Parser & {
-            m_args.push_back(arg);
-            return *this;
-        }
-
-        auto operator|=( Opt const &opt ) -> Parser & {
-            m_options.push_back(opt);
-            return *this;
-        }
-
-        auto operator|=( Parser const &other ) -> Parser & {
-            m_options.insert(m_options.end(), other.m_options.begin(), other.m_options.end());
-            m_args.insert(m_args.end(), other.m_args.begin(), other.m_args.end());
-            return *this;
-        }
-
-        template<typename T>
-        auto operator|( T const &other ) const -> Parser {
-            return Parser( *this ) |= other;
-        }
-
-        // Forward deprecated interface with '+' instead of '|'
-        template<typename T>
-        auto operator+=( T const &other ) -> Parser & { return operator|=( other ); }
-        template<typename T>
-        auto operator+( T const &other ) const -> Parser { return operator|( other ); }
-
-        auto getHelpColumns() const -> std::vector<HelpColumns> {
-            std::vector<HelpColumns> cols;
-            for (auto const &o : m_options) {
-                auto childCols = o.getHelpColumns();
-                cols.insert( cols.end(), childCols.begin(), childCols.end() );
-            }
-            return cols;
-        }
-
-        void writeToStream( std::ostream &os ) const {
-            if (!m_exeName.name().empty()) {
-                os << "usage:\n" << "  " << m_exeName.name() << " ";
-                bool required = true, first = true;
-                for( auto const &arg : m_args ) {
-                    if (first)
-                        first = false;
-                    else
-                        os << " ";
-                    if( arg.isOptional() && required ) {
-                        os << "[";
-                        required = false;
-                    }
-                    os << "<" << arg.hint() << ">";
-                    if( arg.cardinality() == 0 )
-                        os << " ... ";
-                }
-                if( !required )
-                    os << "]";
-                if( !m_options.empty() )
-                    os << " options";
-                os << "\n\nwhere options are:" << std::endl;
-            }
-
-            auto rows = getHelpColumns();
-            size_t consoleWidth = CATCH_CLARA_CONFIG_CONSOLE_WIDTH;
-            size_t optWidth = 0;
-            for( auto const &cols : rows )
-                optWidth = (std::max)(optWidth, cols.left.size() + 2);
-
-            optWidth = (std::min)(optWidth, consoleWidth/2);
-
-            for( auto const &cols : rows ) {
-                auto row =
-                        TextFlow::Column( cols.left ).width( optWidth ).indent( 2 ) +
-                        TextFlow::Spacer(4) +
-                        TextFlow::Column( cols.right ).width( consoleWidth - 7 - optWidth );
-                os << row << std::endl;
-            }
-        }
-
-        friend auto operator<<( std::ostream &os, Parser const &parser ) -> std::ostream& {
-            parser.writeToStream( os );
-            return os;
-        }
-
-        auto validate() const -> Result override {
-            for( auto const &opt : m_options ) {
-                auto result = opt.validate();
-                if( !result )
-                    return result;
-            }
-            for( auto const &arg : m_args ) {
-                auto result = arg.validate();
-                if( !result )
-                    return result;
-            }
-            return Result::ok();
-        }
-
-        using ParserBase::parse;
-
-        auto parse( std::string const& exeName, TokenStream const &tokens ) const -> InternalParseResult override {
-
-            struct ParserInfo {
-                ParserBase const* parser = nullptr;
-                size_t count = 0;
-            };
-            const size_t totalParsers = m_options.size() + m_args.size();
-            assert( totalParsers < 512 );
-            // ParserInfo parseInfos[totalParsers]; // <-- this is what we really want to do
-            ParserInfo parseInfos[512];
-
-            {
-                size_t i = 0;
-                for (auto const &opt : m_options) parseInfos[i++].parser = &opt;
-                for (auto const &arg : m_args) parseInfos[i++].parser = &arg;
-            }
-
-            m_exeName.set( exeName );
-
-            auto result = InternalParseResult::ok( ParseState( ParseResultType::NoMatch, tokens ) );
-            while( result.value().remainingTokens() ) {
-                bool tokenParsed = false;
-
-                for( size_t i = 0; i < totalParsers; ++i ) {
-                    auto&  parseInfo = parseInfos[i];
-                    if( parseInfo.parser->cardinality() == 0 || parseInfo.count < parseInfo.parser->cardinality() ) {
-                        result = parseInfo.parser->parse(exeName, result.value().remainingTokens());
-                        if (!result)
-                            return result;
-                        if (result.value().type() != ParseResultType::NoMatch) {
-                            tokenParsed = true;
-                            ++parseInfo.count;
-                            break;
-                        }
-                    }
-                }
-
-                if( result.value().type() == ParseResultType::ShortCircuitAll )
-                    return result;
-                if( !tokenParsed )
-                    return InternalParseResult::runtimeError( "Unrecognised token: " + result.value().remainingTokens()->token );
-            }
-            // !TBD Check missing required options
-            return result;
-        }
-    };
-
-    template<typename DerivedT>
-    template<typename T>
-    auto ComposableParserImpl<DerivedT>::operator|( T const &other ) const -> Parser {
-        return Parser() | static_cast<DerivedT const &>( *this ) | other;
-    }
-} // namespace detail
-
-// A Combined parser
-using detail::Parser;
-
-// A parser for options
-using detail::Opt;
-
-// A parser for arguments
-using detail::Arg;
-
-// Wrapper for argc, argv from main()
-using detail::Args;
-
-// Specifies the name of the executable
-using detail::ExeName;
-
-// Convenience wrapper for option parser that specifies the help option
-using detail::Help;
-
-// enum of result types from a parse
-using detail::ParseResultType;
-
-// Result type for parser operation
-using detail::ParserResult;
-
-}} // namespace Catch::clara
-
-// end clara.hpp
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-// Restore Clara's value for console width, if present
-#ifdef CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH
-#define CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH
-#undef CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH
-#endif
-
-// end catch_clara.h
-namespace Catch {
-
-    clara::Parser makeCommandLineParser( ConfigData& config );
-
-} // end namespace Catch
-
-// end catch_commandline.h
-#include <fstream>
-#include <ctime>
-
-namespace Catch {
-
-    clara::Parser makeCommandLineParser( ConfigData& config ) {
-
-        using namespace clara;
-
-        auto const setWarning = [&]( std::string const& warning ) {
-                auto warningSet = [&]() {
-                    if( warning == "NoAssertions" )
-                        return WarnAbout::NoAssertions;
-
-                    if ( warning == "NoTests" )
-                        return WarnAbout::NoTests;
-
-                    return WarnAbout::Nothing;
-                }();
-
-                if (warningSet == WarnAbout::Nothing)
-                    return ParserResult::runtimeError( "Unrecognised warning: '" + warning + "'" );
-                config.warnings = static_cast<WarnAbout::What>( config.warnings | warningSet );
-                return ParserResult::ok( ParseResultType::Matched );
-            };
-        auto const loadTestNamesFromFile = [&]( std::string const& filename ) {
-                std::ifstream f( filename.c_str() );
-                if( !f.is_open() )
-                    return ParserResult::runtimeError( "Unable to load input file: '" + filename + "'" );
-
-                std::string line;
-                while( std::getline( f, line ) ) {
-                    line = trim(line);
-                    if( !line.empty() && !startsWith( line, '#' ) ) {
-                        if( !startsWith( line, '"' ) )
-                            line = '"' + line + '"';
-                        config.testsOrTags.push_back( line );
-                        config.testsOrTags.emplace_back( "," );
-                    }
-                }
-                //Remove comma in the end
-                if(!config.testsOrTags.empty())
-                    config.testsOrTags.erase( config.testsOrTags.end()-1 );
-
-                return ParserResult::ok( ParseResultType::Matched );
-            };
-        auto const setTestOrder = [&]( std::string const& order ) {
-                if( startsWith( "declared", order ) )
-                    config.runOrder = RunTests::InDeclarationOrder;
-                else if( startsWith( "lexical", order ) )
-                    config.runOrder = RunTests::InLexicographicalOrder;
-                else if( startsWith( "random", order ) )
-                    config.runOrder = RunTests::InRandomOrder;
-                else
-                    return clara::ParserResult::runtimeError( "Unrecognised ordering: '" + order + "'" );
-                return ParserResult::ok( ParseResultType::Matched );
-            };
-        auto const setRngSeed = [&]( std::string const& seed ) {
-                if( seed != "time" )
-                    return clara::detail::convertInto( seed, config.rngSeed );
-                config.rngSeed = static_cast<unsigned int>( std::time(nullptr) );
-                return ParserResult::ok( ParseResultType::Matched );
-            };
-        auto const setColourUsage = [&]( std::string const& useColour ) {
-                    auto mode = toLower( useColour );
-
-                    if( mode == "yes" )
-                        config.useColour = UseColour::Yes;
-                    else if( mode == "no" )
-                        config.useColour = UseColour::No;
-                    else if( mode == "auto" )
-                        config.useColour = UseColour::Auto;
-                    else
-                        return ParserResult::runtimeError( "colour mode must be one of: auto, yes or no. '" + useColour + "' not recognised" );
-                return ParserResult::ok( ParseResultType::Matched );
-            };
-        auto const setWaitForKeypress = [&]( std::string const& keypress ) {
-                auto keypressLc = toLower( keypress );
-                if (keypressLc == "never")
-                    config.waitForKeypress = WaitForKeypress::Never;
-                else if( keypressLc == "start" )
-                    config.waitForKeypress = WaitForKeypress::BeforeStart;
-                else if( keypressLc == "exit" )
-                    config.waitForKeypress = WaitForKeypress::BeforeExit;
-                else if( keypressLc == "both" )
-                    config.waitForKeypress = WaitForKeypress::BeforeStartAndExit;
-                else
-                    return ParserResult::runtimeError( "keypress argument must be one of: never, start, exit or both. '" + keypress + "' not recognised" );
-            return ParserResult::ok( ParseResultType::Matched );
-            };
-        auto const setVerbosity = [&]( std::string const& verbosity ) {
-            auto lcVerbosity = toLower( verbosity );
-            if( lcVerbosity == "quiet" )
-                config.verbosity = Verbosity::Quiet;
-            else if( lcVerbosity == "normal" )
-                config.verbosity = Verbosity::Normal;
-            else if( lcVerbosity == "high" )
-                config.verbosity = Verbosity::High;
-            else
-                return ParserResult::runtimeError( "Unrecognised verbosity, '" + verbosity + "'" );
-            return ParserResult::ok( ParseResultType::Matched );
-        };
-        auto const setReporter = [&]( std::string const& reporter ) {
-            IReporterRegistry::FactoryMap const& factories = getRegistryHub().getReporterRegistry().getFactories();
-
-            auto lcReporter = toLower( reporter );
-            auto result = factories.find( lcReporter );
-
-            if( factories.end() != result )
-                config.reporterName = lcReporter;
-            else
-                return ParserResult::runtimeError( "Unrecognized reporter, '" + reporter + "'. Check available with --list-reporters" );
-            return ParserResult::ok( ParseResultType::Matched );
-        };
-
-        auto cli
-            = ExeName( config.processName )
-            | Help( config.showHelp )
-            | Opt( config.listTests )
-                ["-l"]["--list-tests"]
-                ( "list all/matching test cases" )
-            | Opt( config.listTags )
-                ["-t"]["--list-tags"]
-                ( "list all/matching tags" )
-            | Opt( config.showSuccessfulTests )
-                ["-s"]["--success"]
-                ( "include successful tests in output" )
-            | Opt( config.shouldDebugBreak )
-                ["-b"]["--break"]
-                ( "break into debugger on failure" )
-            | Opt( config.noThrow )
-                ["-e"]["--nothrow"]
-                ( "skip exception tests" )
-            | Opt( config.showInvisibles )
-                ["-i"]["--invisibles"]
-                ( "show invisibles (tabs, newlines)" )
-            | Opt( config.outputFilename, "filename" )
-                ["-o"]["--out"]
-                ( "output filename" )
-            | Opt( setReporter, "name" )
-                ["-r"]["--reporter"]
-                ( "reporter to use (defaults to console)" )
-            | Opt( config.name, "name" )
-                ["-n"]["--name"]
-                ( "suite name" )
-            | Opt( [&]( bool ){ config.abortAfter = 1; } )
-                ["-a"]["--abort"]
-                ( "abort at first failure" )
-            | Opt( [&]( int x ){ config.abortAfter = x; }, "no. failures" )
-                ["-x"]["--abortx"]
-                ( "abort after x failures" )
-            | Opt( setWarning, "warning name" )
-                ["-w"]["--warn"]
-                ( "enable warnings" )
-            | Opt( [&]( bool flag ) { config.showDurations = flag ? ShowDurations::Always : ShowDurations::Never; }, "yes|no" )
-                ["-d"]["--durations"]
-                ( "show test durations" )
-            | Opt( loadTestNamesFromFile, "filename" )
-                ["-f"]["--input-file"]
-                ( "load test names to run from a file" )
-            | Opt( config.filenamesAsTags )
-                ["-#"]["--filenames-as-tags"]
-                ( "adds a tag for the filename" )
-            | Opt( config.sectionsToRun, "section name" )
-                ["-c"]["--section"]
-                ( "specify section to run" )
-            | Opt( setVerbosity, "quiet|normal|high" )
-                ["-v"]["--verbosity"]
-                ( "set output verbosity" )
-            | Opt( config.listTestNamesOnly )
-                ["--list-test-names-only"]
-                ( "list all/matching test cases names only" )
-            | Opt( config.listReporters )
-                ["--list-reporters"]
-                ( "list all reporters" )
-            | Opt( setTestOrder, "decl|lex|rand" )
-                ["--order"]
-                ( "test case order (defaults to decl)" )
-            | Opt( setRngSeed, "'time'|number" )
-                ["--rng-seed"]
-                ( "set a specific seed for random numbers" )
-            | Opt( setColourUsage, "yes|no" )
-                ["--use-colour"]
-                ( "should output be colourised" )
-            | Opt( config.libIdentify )
-                ["--libidentify"]
-                ( "report name and version according to libidentify standard" )
-            | Opt( setWaitForKeypress, "never|start|exit|both" )
-                ["--wait-for-keypress"]
-                ( "waits for a keypress before exiting" )
-            | Opt( config.benchmarkSamples, "samples" )
-                ["--benchmark-samples"]
-                ( "number of samples to collect (default: 100)" )
-            | Opt( config.benchmarkResamples, "resamples" )
-                ["--benchmark-resamples"]
-                ( "number of resamples for the bootstrap (default: 100000)" )
-            | Opt( config.benchmarkConfidenceInterval, "confidence interval" )
-                ["--benchmark-confidence-interval"]
-                ( "confidence interval for the bootstrap (between 0 and 1, default: 0.95)" )
-            | Opt( config.benchmarkNoAnalysis )
-                ["--benchmark-no-analysis"]
-                ( "perform only measurements; do not perform any analysis" )
-            | Opt( config.benchmarkWarmupTime, "benchmarkWarmupTime" )
-                ["--benchmark-warmup-time"]
-                ( "amount of time in milliseconds spent on warming up each test (default: 100)" )
-            | Arg( config.testsOrTags, "test name|pattern|tags" )
-                ( "which test or tests to use" );
-
-        return cli;
-    }
-
-} // end namespace Catch
-// end catch_commandline.cpp
-// start catch_common.cpp
-
-#include <cstring>
-#include <ostream>
-
-namespace Catch {
-
-    bool SourceLineInfo::operator == ( SourceLineInfo const& other ) const noexcept {
-        return line == other.line && (file == other.file || std::strcmp(file, other.file) == 0);
-    }
-    bool SourceLineInfo::operator < ( SourceLineInfo const& other ) const noexcept {
-        // We can assume that the same file will usually have the same pointer.
-        // Thus, if the pointers are the same, there is no point in calling the strcmp
-        return line < other.line || ( line == other.line && file != other.file && (std::strcmp(file, other.file) < 0));
-    }
-
-    std::ostream& operator << ( std::ostream& os, SourceLineInfo const& info ) {
-#ifndef __GNUG__
-        os << info.file << '(' << info.line << ')';
-#else
-        os << info.file << ':' << info.line;
-#endif
-        return os;
-    }
-
-    std::string StreamEndStop::operator+() const {
-        return std::string();
-    }
-
-    NonCopyable::NonCopyable() = default;
-    NonCopyable::~NonCopyable() = default;
-
-}
-// end catch_common.cpp
-// start catch_config.cpp
-
-namespace Catch {
-
-    Config::Config( ConfigData const& data )
-    :   m_data( data ),
-        m_stream( openStream() )
-    {
-        // We need to trim filter specs to avoid trouble with superfluous
-        // whitespace (esp. important for bdd macros, as those are manually
-        // aligned with whitespace).
-
-        for (auto& elem : m_data.testsOrTags) {
-            elem = trim(elem);
-        }
-        for (auto& elem : m_data.sectionsToRun) {
-            elem = trim(elem);
-        }
-
-        TestSpecParser parser(ITagAliasRegistry::get());
-        if (!m_data.testsOrTags.empty()) {
-            m_hasTestFilters = true;
-            for (auto const& testOrTags : m_data.testsOrTags) {
-                parser.parse(testOrTags);
-            }
-        }
-        m_testSpec = parser.testSpec();
-    }
-
-    std::string const& Config::getFilename() const {
-        return m_data.outputFilename ;
-    }
-
-    bool Config::listTests() const          { return m_data.listTests; }
-    bool Config::listTestNamesOnly() const  { return m_data.listTestNamesOnly; }
-    bool Config::listTags() const           { return m_data.listTags; }
-    bool Config::listReporters() const      { return m_data.listReporters; }
-
-    std::string Config::getProcessName() const { return m_data.processName; }
-    std::string const& Config::getReporterName() const { return m_data.reporterName; }
-
-    std::vector<std::string> const& Config::getTestsOrTags() const { return m_data.testsOrTags; }
-    std::vector<std::string> const& Config::getSectionsToRun() const { return m_data.sectionsToRun; }
-
-    TestSpec const& Config::testSpec() const { return m_testSpec; }
-    bool Config::hasTestFilters() const { return m_hasTestFilters; }
-
-    bool Config::showHelp() const { return m_data.showHelp; }
-
-    // IConfig interface
-    bool Config::allowThrows() const                   { return !m_data.noThrow; }
-    std::ostream& Config::stream() const               { return m_stream->stream(); }
-    std::string Config::name() const                   { return m_data.name.empty() ? m_data.processName : m_data.name; }
-    bool Config::includeSuccessfulResults() const      { return m_data.showSuccessfulTests; }
-    bool Config::warnAboutMissingAssertions() const    { return !!(m_data.warnings & WarnAbout::NoAssertions); }
-    bool Config::warnAboutNoTests() const              { return !!(m_data.warnings & WarnAbout::NoTests); }
-    ShowDurations::OrNot Config::showDurations() const { return m_data.showDurations; }
-    RunTests::InWhatOrder Config::runOrder() const     { return m_data.runOrder; }
-    unsigned int Config::rngSeed() const               { return m_data.rngSeed; }
-    UseColour::YesOrNo Config::useColour() const       { return m_data.useColour; }
-    bool Config::shouldDebugBreak() const              { return m_data.shouldDebugBreak; }
-    int Config::abortAfter() const                     { return m_data.abortAfter; }
-    bool Config::showInvisibles() const                { return m_data.showInvisibles; }
-    Verbosity Config::verbosity() const                { return m_data.verbosity; }
-
-    bool Config::benchmarkNoAnalysis() const                      { return m_data.benchmarkNoAnalysis; }
-    int Config::benchmarkSamples() const                          { return m_data.benchmarkSamples; }
-    double Config::benchmarkConfidenceInterval() const            { return m_data.benchmarkConfidenceInterval; }
-    unsigned int Config::benchmarkResamples() const               { return m_data.benchmarkResamples; }
-    std::chrono::milliseconds Config::benchmarkWarmupTime() const { return std::chrono::milliseconds(m_data.benchmarkWarmupTime); }
-
-    IStream const* Config::openStream() {
-        return Catch::makeStream(m_data.outputFilename);
-    }
-
-} // end namespace Catch
-// end catch_config.cpp
-// start catch_console_colour.cpp
-
-#if defined(__clang__)
-#    pragma clang diagnostic push
-#    pragma clang diagnostic ignored "-Wexit-time-destructors"
-#endif
-
-// start catch_errno_guard.h
-
-namespace Catch {
-
-    class ErrnoGuard {
-    public:
-        ErrnoGuard();
-        ~ErrnoGuard();
-    private:
-        int m_oldErrno;
-    };
-
-}
-
-// end catch_errno_guard.h
-#include <sstream>
-
-namespace Catch {
-    namespace {
-
-        struct IColourImpl {
-            virtual ~IColourImpl() = default;
-            virtual void use( Colour::Code _colourCode ) = 0;
-        };
-
-        struct NoColourImpl : IColourImpl {
-            void use( Colour::Code ) override {}
-
-            static IColourImpl* instance() {
-                static NoColourImpl s_instance;
-                return &s_instance;
-            }
-        };
-
-    } // anon namespace
-} // namespace Catch
-
-#if !defined( CATCH_CONFIG_COLOUR_NONE ) && !defined( CATCH_CONFIG_COLOUR_WINDOWS ) && !defined( CATCH_CONFIG_COLOUR_ANSI )
-#   ifdef CATCH_PLATFORM_WINDOWS
-#       define CATCH_CONFIG_COLOUR_WINDOWS
-#   else
-#       define CATCH_CONFIG_COLOUR_ANSI
-#   endif
-#endif
-
-#if defined ( CATCH_CONFIG_COLOUR_WINDOWS ) /////////////////////////////////////////
-
-namespace Catch {
-namespace {
-
-    class Win32ColourImpl : public IColourImpl {
-    public:
-        Win32ColourImpl() : stdoutHandle( GetStdHandle(STD_OUTPUT_HANDLE) )
-        {
-            CONSOLE_SCREEN_BUFFER_INFO csbiInfo;
-            GetConsoleScreenBufferInfo( stdoutHandle, &csbiInfo );
-            originalForegroundAttributes = csbiInfo.wAttributes & ~( BACKGROUND_GREEN | BACKGROUND_RED | BACKGROUND_BLUE | BACKGROUND_INTENSITY );
-            originalBackgroundAttributes = csbiInfo.wAttributes & ~( FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_INTENSITY );
-        }
-
-        void use( Colour::Code _colourCode ) override {
-            switch( _colourCode ) {
-                case Colour::None:      return setTextAttribute( originalForegroundAttributes );
-                case Colour::White:     return setTextAttribute( FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE );
-                case Colour::Red:       return setTextAttribute( FOREGROUND_RED );
-                case Colour::Green:     return setTextAttribute( FOREGROUND_GREEN );
-                case Colour::Blue:      return setTextAttribute( FOREGROUND_BLUE );
-                case Colour::Cyan:      return setTextAttribute( FOREGROUND_BLUE | FOREGROUND_GREEN );
-                case Colour::Yellow:    return setTextAttribute( FOREGROUND_RED | FOREGROUND_GREEN );
-                case Colour::Grey:      return setTextAttribute( 0 );
-
-                case Colour::LightGrey:     return setTextAttribute( FOREGROUND_INTENSITY );
-                case Colour::BrightRed:     return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_RED );
-                case Colour::BrightGreen:   return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_GREEN );
-                case Colour::BrightWhite:   return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE );
-                case Colour::BrightYellow:  return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_RED | FOREGROUND_GREEN );
-
-                case Colour::Bright: CATCH_INTERNAL_ERROR( "not a colour" );
-
-                default:
-                    CATCH_ERROR( "Unknown colour requested" );
-            }
-        }
-
-    private:
-        void setTextAttribute( WORD _textAttribute ) {
-            SetConsoleTextAttribute( stdoutHandle, _textAttribute | originalBackgroundAttributes );
-        }
-        HANDLE stdoutHandle;
-        WORD originalForegroundAttributes;
-        WORD originalBackgroundAttributes;
-    };
-
-    IColourImpl* platformColourInstance() {
-        static Win32ColourImpl s_instance;
-
-        IConfigPtr config = getCurrentContext().getConfig();
-        UseColour::YesOrNo colourMode = config
-            ? config->useColour()
-            : UseColour::Auto;
-        if( colourMode == UseColour::Auto )
-            colourMode = UseColour::Yes;
-        return colourMode == UseColour::Yes
-            ? &s_instance
-            : NoColourImpl::instance();
-    }
-
-} // end anon namespace
-} // end namespace Catch
-
-#elif defined( CATCH_CONFIG_COLOUR_ANSI ) //////////////////////////////////////
-
-#include <unistd.h>
-
-namespace Catch {
-namespace {
-
-    // use POSIX/ ANSI console terminal codes
-    // Thanks to Adam Strzelecki for original contribution
-    // (http://github.com/nanoant)
-    // https://github.com/philsquared/Catch/pull/131
-    class PosixColourImpl : public IColourImpl {
-    public:
-        void use( Colour::Code _colourCode ) override {
-            switch( _colourCode ) {
-                case Colour::None:
-                case Colour::White:     return setColour( "[0m" );
-                case Colour::Red:       return setColour( "[0;31m" );
-                case Colour::Green:     return setColour( "[0;32m" );
-                case Colour::Blue:      return setColour( "[0;34m" );
-                case Colour::Cyan:      return setColour( "[0;36m" );
-                case Colour::Yellow:    return setColour( "[0;33m" );
-                case Colour::Grey:      return setColour( "[1;30m" );
-
-                case Colour::LightGrey:     return setColour( "[0;37m" );
-                case Colour::BrightRed:     return setColour( "[1;31m" );
-                case Colour::BrightGreen:   return setColour( "[1;32m" );
-                case Colour::BrightWhite:   return setColour( "[1;37m" );
-                case Colour::BrightYellow:  return setColour( "[1;33m" );
-
-                case Colour::Bright: CATCH_INTERNAL_ERROR( "not a colour" );
-                default: CATCH_INTERNAL_ERROR( "Unknown colour requested" );
-            }
-        }
-        static IColourImpl* instance() {
-            static PosixColourImpl s_instance;
-            return &s_instance;
-        }
-
-    private:
-        void setColour( const char* _escapeCode ) {
-            getCurrentContext().getConfig()->stream()
-                << '\033' << _escapeCode;
-        }
-    };
-
-    bool useColourOnPlatform() {
-        return
-#if defined(CATCH_PLATFORM_MAC) || defined(CATCH_PLATFORM_IPHONE)
-            !isDebuggerActive() &&
-#endif
-#if !(defined(__DJGPP__) && defined(__STRICT_ANSI__))
-            isatty(STDOUT_FILENO)
-#else
-            false
-#endif
-            ;
-    }
-    IColourImpl* platformColourInstance() {
-        ErrnoGuard guard;
-        IConfigPtr config = getCurrentContext().getConfig();
-        UseColour::YesOrNo colourMode = config
-            ? config->useColour()
-            : UseColour::Auto;
-        if( colourMode == UseColour::Auto )
-            colourMode = useColourOnPlatform()
-                ? UseColour::Yes
-                : UseColour::No;
-        return colourMode == UseColour::Yes
-            ? PosixColourImpl::instance()
-            : NoColourImpl::instance();
-    }
-
-} // end anon namespace
-} // end namespace Catch
-
-#else  // not Windows or ANSI ///////////////////////////////////////////////
-
-namespace Catch {
-
-    static IColourImpl* platformColourInstance() { return NoColourImpl::instance(); }
-
-} // end namespace Catch
-
-#endif // Windows/ ANSI/ None
-
-namespace Catch {
-
-    Colour::Colour( Code _colourCode ) { use( _colourCode ); }
-    Colour::Colour( Colour&& other ) noexcept {
-        m_moved = other.m_moved;
-        other.m_moved = true;
-    }
-    Colour& Colour::operator=( Colour&& other ) noexcept {
-        m_moved = other.m_moved;
-        other.m_moved  = true;
-        return *this;
-    }
-
-    Colour::~Colour(){ if( !m_moved ) use( None ); }
-
-    void Colour::use( Code _colourCode ) {
-        static IColourImpl* impl = platformColourInstance();
-        // Strictly speaking, this cannot possibly happen.
-        // However, under some conditions it does happen (see #1626),
-        // and this change is small enough that we can let practicality
-        // triumph over purity in this case.
-        if (impl != nullptr) {
-            impl->use( _colourCode );
-        }
-    }
-
-    std::ostream& operator << ( std::ostream& os, Colour const& ) {
-        return os;
-    }
-
-} // end namespace Catch
-
-#if defined(__clang__)
-#    pragma clang diagnostic pop
-#endif
-
-// end catch_console_colour.cpp
-// start catch_context.cpp
-
-namespace Catch {
-
-    class Context : public IMutableContext, NonCopyable {
-
-    public: // IContext
-        IResultCapture* getResultCapture() override {
-            return m_resultCapture;
-        }
-        IRunner* getRunner() override {
-            return m_runner;
-        }
-
-        IConfigPtr const& getConfig() const override {
-            return m_config;
-        }
-
-        ~Context() override;
-
-    public: // IMutableContext
-        void setResultCapture( IResultCapture* resultCapture ) override {
-            m_resultCapture = resultCapture;
-        }
-        void setRunner( IRunner* runner ) override {
-            m_runner = runner;
-        }
-        void setConfig( IConfigPtr const& config ) override {
-            m_config = config;
-        }
-
-        friend IMutableContext& getCurrentMutableContext();
-
-    private:
-        IConfigPtr m_config;
-        IRunner* m_runner = nullptr;
-        IResultCapture* m_resultCapture = nullptr;
-    };
-
-    IMutableContext *IMutableContext::currentContext = nullptr;
-
-    void IMutableContext::createContext()
-    {
-        currentContext = new Context();
-    }
-
-    void cleanUpContext() {
-        delete IMutableContext::currentContext;
-        IMutableContext::currentContext = nullptr;
-    }
-    IContext::~IContext() = default;
-    IMutableContext::~IMutableContext() = default;
-    Context::~Context() = default;
-
-    SimplePcg32& rng() {
-        static SimplePcg32 s_rng;
-        return s_rng;
-    }
-
-}
-// end catch_context.cpp
-// start catch_debug_console.cpp
-
-// start catch_debug_console.h
-
-#include <string>
-
-namespace Catch {
-    void writeToDebugConsole( std::string const& text );
-}
-
-// end catch_debug_console.h
-#if defined(CATCH_CONFIG_ANDROID_LOGWRITE)
-#include <android/log.h>
-
-    namespace Catch {
-        void writeToDebugConsole( std::string const& text ) {
-            __android_log_write( ANDROID_LOG_DEBUG, "Catch", text.c_str() );
-        }
-    }
-
-#elif defined(CATCH_PLATFORM_WINDOWS)
-
-    namespace Catch {
-        void writeToDebugConsole( std::string const& text ) {
-            ::OutputDebugStringA( text.c_str() );
-        }
-    }
-
-#else
-
-    namespace Catch {
-        void writeToDebugConsole( std::string const& text ) {
-            // !TBD: Need a version for Mac/ XCode and other IDEs
-            Catch::cout() << text;
-        }
-    }
-
-#endif // Platform
-// end catch_debug_console.cpp
-// start catch_debugger.cpp
-
-#if defined(CATCH_PLATFORM_MAC) || defined(CATCH_PLATFORM_IPHONE)
-
-#  include <cassert>
-#  include <sys/types.h>
-#  include <unistd.h>
-#  include <cstddef>
-#  include <ostream>
-
-#ifdef __apple_build_version__
-    // These headers will only compile with AppleClang (XCode)
-    // For other compilers (Clang, GCC, ... ) we need to exclude them
-#  include <sys/sysctl.h>
-#endif
-
-    namespace Catch {
-        #ifdef __apple_build_version__
-        // The following function is taken directly from the following technical note:
-        // https://developer.apple.com/library/archive/qa/qa1361/_index.html
-
-        // Returns true if the current process is being debugged (either
-        // running under the debugger or has a debugger attached post facto).
-        bool isDebuggerActive(){
-            int                 mib[4];
-            struct kinfo_proc   info;
-            std::size_t         size;
-
-            // Initialize the flags so that, if sysctl fails for some bizarre
-            // reason, we get a predictable result.
-
-            info.kp_proc.p_flag = 0;
-
-            // Initialize mib, which tells sysctl the info we want, in this case
-            // we're looking for information about a specific process ID.
-
-            mib[0] = CTL_KERN;
-            mib[1] = KERN_PROC;
-            mib[2] = KERN_PROC_PID;
-            mib[3] = getpid();
-
-            // Call sysctl.
-
-            size = sizeof(info);
-            if( sysctl(mib, sizeof(mib) / sizeof(*mib), &info, &size, nullptr, 0) != 0 ) {
-                Catch::cerr() << "\n** Call to sysctl failed - unable to determine if debugger is active **\n" << std::endl;
-                return false;
-            }
-
-            // We're being debugged if the P_TRACED flag is set.
-
-            return ( (info.kp_proc.p_flag & P_TRACED) != 0 );
-        }
-        #else
-        bool isDebuggerActive() {
-            // We need to find another way to determine this for non-appleclang compilers on macOS
-            return false;
-        }
-        #endif
-    } // namespace Catch
-
-#elif defined(CATCH_PLATFORM_LINUX)
-    #include <fstream>
-    #include <string>
-
-    namespace Catch{
-        // The standard POSIX way of detecting a debugger is to attempt to
-        // ptrace() the process, but this needs to be done from a child and not
-        // this process itself to still allow attaching to this process later
-        // if wanted, so is rather heavy. Under Linux we have the PID of the
-        // "debugger" (which doesn't need to be gdb, of course, it could also
-        // be strace, for example) in /proc/$PID/status, so just get it from
-        // there instead.
-        bool isDebuggerActive(){
-            // Libstdc++ has a bug, where std::ifstream sets errno to 0
-            // This way our users can properly assert over errno values
-            ErrnoGuard guard;
-            std::ifstream in("/proc/self/status");
-            for( std::string line; std::getline(in, line); ) {
-                static const int PREFIX_LEN = 11;
-                if( line.compare(0, PREFIX_LEN, "TracerPid:\t") == 0 ) {
-                    // We're traced if the PID is not 0 and no other PID starts
-                    // with 0 digit, so it's enough to check for just a single
-                    // character.
-                    return line.length() > PREFIX_LEN && line[PREFIX_LEN] != '0';
-                }
-            }
-
-            return false;
-        }
-    } // namespace Catch
-#elif defined(_MSC_VER)
-    extern "C" __declspec(dllimport) int __stdcall IsDebuggerPresent();
-    namespace Catch {
-        bool isDebuggerActive() {
-            return IsDebuggerPresent() != 0;
-        }
-    }
-#elif defined(__MINGW32__)
-    extern "C" __declspec(dllimport) int __stdcall IsDebuggerPresent();
-    namespace Catch {
-        bool isDebuggerActive() {
-            return IsDebuggerPresent() != 0;
-        }
-    }
-#else
-    namespace Catch {
-       bool isDebuggerActive() { return false; }
-    }
-#endif // Platform
-// end catch_debugger.cpp
-// start catch_decomposer.cpp
-
-namespace Catch {
-
-    ITransientExpression::~ITransientExpression() = default;
-
-    void formatReconstructedExpression( std::ostream &os, std::string const& lhs, StringRef op, std::string const& rhs ) {
-        if( lhs.size() + rhs.size() < 40 &&
-                lhs.find('\n') == std::string::npos &&
-                rhs.find('\n') == std::string::npos )
-            os << lhs << " " << op << " " << rhs;
-        else
-            os << lhs << "\n" << op << "\n" << rhs;
-    }
-}
-// end catch_decomposer.cpp
-// start catch_enforce.cpp
-
-#include <stdexcept>
-
-namespace Catch {
-#if defined(CATCH_CONFIG_DISABLE_EXCEPTIONS) && !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS_CUSTOM_HANDLER)
-    [[noreturn]]
-    void throw_exception(std::exception const& e) {
-        Catch::cerr() << "Catch will terminate because it needed to throw an exception.\n"
-                      << "The message was: " << e.what() << '\n';
-        std::terminate();
-    }
-#endif
-
-    [[noreturn]]
-    void throw_logic_error(std::string const& msg) {
-        throw_exception(std::logic_error(msg));
-    }
-
-    [[noreturn]]
-    void throw_domain_error(std::string const& msg) {
-        throw_exception(std::domain_error(msg));
-    }
-
-    [[noreturn]]
-    void throw_runtime_error(std::string const& msg) {
-        throw_exception(std::runtime_error(msg));
-    }
-
-} // namespace Catch;
-// end catch_enforce.cpp
-// start catch_enum_values_registry.cpp
-// start catch_enum_values_registry.h
-
-#include <vector>
-#include <memory>
-
-namespace Catch {
-
-    namespace Detail {
-
-        std::unique_ptr<EnumInfo> makeEnumInfo( StringRef enumName, StringRef allValueNames, std::vector<int> const& values );
-
-        class EnumValuesRegistry : public IMutableEnumValuesRegistry {
-
-            std::vector<std::unique_ptr<EnumInfo>> m_enumInfos;
-
-            EnumInfo const& registerEnum( StringRef enumName, StringRef allEnums, std::vector<int> const& values) override;
-        };
-
-        std::vector<StringRef> parseEnums( StringRef enums );
-
-    } // Detail
-
-} // Catch
-
-// end catch_enum_values_registry.h
-
-#include <map>
-#include <cassert>
-
-namespace Catch {
-
-    IMutableEnumValuesRegistry::~IMutableEnumValuesRegistry() {}
-
-    namespace Detail {
-
-        namespace {
-            // Extracts the actual name part of an enum instance
-            // In other words, it returns the Blue part of Bikeshed::Colour::Blue
-            StringRef extractInstanceName(StringRef enumInstance) {
-                // Find last occurrence of ":"
-                size_t name_start = enumInstance.size();
-                while (name_start > 0 && enumInstance[name_start - 1] != ':') {
-                    --name_start;
-                }
-                return enumInstance.substr(name_start, enumInstance.size() - name_start);
-            }
-        }
-
-        std::vector<StringRef> parseEnums( StringRef enums ) {
-            auto enumValues = splitStringRef( enums, ',' );
-            std::vector<StringRef> parsed;
-            parsed.reserve( enumValues.size() );
-            for( auto const& enumValue : enumValues ) {
-                parsed.push_back(trim(extractInstanceName(enumValue)));
-            }
-            return parsed;
-        }
-
-        EnumInfo::~EnumInfo() {}
-
-        StringRef EnumInfo::lookup( int value ) const {
-            for( auto const& valueToName : m_values ) {
-                if( valueToName.first == value )
-                    return valueToName.second;
-            }
-            return "{** unexpected enum value **}"_sr;
-        }
-
-        std::unique_ptr<EnumInfo> makeEnumInfo( StringRef enumName, StringRef allValueNames, std::vector<int> const& values ) {
-            std::unique_ptr<EnumInfo> enumInfo( new EnumInfo );
-            enumInfo->m_name = enumName;
-            enumInfo->m_values.reserve( values.size() );
-
-            const auto valueNames = Catch::Detail::parseEnums( allValueNames );
-            assert( valueNames.size() == values.size() );
-            std::size_t i = 0;
-            for( auto value : values )
-                enumInfo->m_values.emplace_back(value, valueNames[i++]);
-
-            return enumInfo;
-        }
-
-        EnumInfo const& EnumValuesRegistry::registerEnum( StringRef enumName, StringRef allValueNames, std::vector<int> const& values ) {
-            m_enumInfos.push_back(makeEnumInfo(enumName, allValueNames, values));
-            return *m_enumInfos.back();
-        }
-
-    } // Detail
-} // Catch
-
-// end catch_enum_values_registry.cpp
-// start catch_errno_guard.cpp
-
-#include <cerrno>
-
-namespace Catch {
-        ErrnoGuard::ErrnoGuard():m_oldErrno(errno){}
-        ErrnoGuard::~ErrnoGuard() { errno = m_oldErrno; }
-}
-// end catch_errno_guard.cpp
-// start catch_exception_translator_registry.cpp
-
-// start catch_exception_translator_registry.h
-
-#include <vector>
-#include <string>
-#include <memory>
-
-namespace Catch {
-
-    class ExceptionTranslatorRegistry : public IExceptionTranslatorRegistry {
-    public:
-        ~ExceptionTranslatorRegistry();
-        virtual void registerTranslator( const IExceptionTranslator* translator );
-        std::string translateActiveException() const override;
-        std::string tryTranslators() const;
-
-    private:
-        std::vector<std::unique_ptr<IExceptionTranslator const>> m_translators;
-    };
-}
-
-// end catch_exception_translator_registry.h
-#ifdef __OBJC__
-#import "Foundation/Foundation.h"
-#endif
-
-namespace Catch {
-
-    ExceptionTranslatorRegistry::~ExceptionTranslatorRegistry() {
-    }
-
-    void ExceptionTranslatorRegistry::registerTranslator( const IExceptionTranslator* translator ) {
-        m_translators.push_back( std::unique_ptr<const IExceptionTranslator>( translator ) );
-    }
-
-#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-    std::string ExceptionTranslatorRegistry::translateActiveException() const {
-        try {
-#ifdef __OBJC__
-            // In Objective-C try objective-c exceptions first
-            @try {
-                return tryTranslators();
-            }
-            @catch (NSException *exception) {
-                return Catch::Detail::stringify( [exception description] );
-            }
-#else
-            // Compiling a mixed mode project with MSVC means that CLR
-            // exceptions will be caught in (...) as well. However, these
-            // do not fill-in std::current_exception and thus lead to crash
-            // when attempting rethrow.
-            // /EHa switch also causes structured exceptions to be caught
-            // here, but they fill-in current_exception properly, so
-            // at worst the output should be a little weird, instead of
-            // causing a crash.
-            if (std::current_exception() == nullptr) {
-                return "Non C++ exception. Possibly a CLR exception.";
-            }
-            return tryTranslators();
-#endif
-        }
-        catch( TestFailureException& ) {
-            std::rethrow_exception(std::current_exception());
-        }
-        catch( std::exception& ex ) {
-            return ex.what();
-        }
-        catch( std::string& msg ) {
-            return msg;
-        }
-        catch( const char* msg ) {
-            return msg;
-        }
-        catch(...) {
-            return "Unknown exception";
-        }
-    }
-
-    std::string ExceptionTranslatorRegistry::tryTranslators() const {
-        if (m_translators.empty()) {
-            std::rethrow_exception(std::current_exception());
-        } else {
-            return m_translators[0]->translate(m_translators.begin() + 1, m_translators.end());
-        }
-    }
-
-#else // ^^ Exceptions are enabled // Exceptions are disabled vv
-    std::string ExceptionTranslatorRegistry::translateActiveException() const {
-        CATCH_INTERNAL_ERROR("Attempted to translate active exception under CATCH_CONFIG_DISABLE_EXCEPTIONS!");
-    }
-
-    std::string ExceptionTranslatorRegistry::tryTranslators() const {
-        CATCH_INTERNAL_ERROR("Attempted to use exception translators under CATCH_CONFIG_DISABLE_EXCEPTIONS!");
-    }
-#endif
-
-}
-// end catch_exception_translator_registry.cpp
-// start catch_fatal_condition.cpp
-
-#if defined(__GNUC__)
-#    pragma GCC diagnostic push
-#    pragma GCC diagnostic ignored "-Wmissing-field-initializers"
-#endif
-
-#if defined( CATCH_CONFIG_WINDOWS_SEH ) || defined( CATCH_CONFIG_POSIX_SIGNALS )
-
-namespace {
-    // Report the error condition
-    void reportFatal( char const * const message ) {
-        Catch::getCurrentContext().getResultCapture()->handleFatalErrorCondition( message );
-    }
-}
-
-#endif // signals/SEH handling
-
-#if defined( CATCH_CONFIG_WINDOWS_SEH )
-
-namespace Catch {
-    struct SignalDefs { DWORD id; const char* name; };
-
-    // There is no 1-1 mapping between signals and windows exceptions.
-    // Windows can easily distinguish between SO and SigSegV,
-    // but SigInt, SigTerm, etc are handled differently.
-    static SignalDefs signalDefs[] = {
-        { static_cast<DWORD>(EXCEPTION_ILLEGAL_INSTRUCTION),  "SIGILL - Illegal instruction signal" },
-        { static_cast<DWORD>(EXCEPTION_STACK_OVERFLOW), "SIGSEGV - Stack overflow" },
-        { static_cast<DWORD>(EXCEPTION_ACCESS_VIOLATION), "SIGSEGV - Segmentation violation signal" },
-        { static_cast<DWORD>(EXCEPTION_INT_DIVIDE_BY_ZERO), "Divide by zero error" },
-    };
-
-    LONG CALLBACK FatalConditionHandler::handleVectoredException(PEXCEPTION_POINTERS ExceptionInfo) {
-        for (auto const& def : signalDefs) {
-            if (ExceptionInfo->ExceptionRecord->ExceptionCode == def.id) {
-                reportFatal(def.name);
-            }
-        }
-        // If its not an exception we care about, pass it along.
-        // This stops us from eating debugger breaks etc.
-        return EXCEPTION_CONTINUE_SEARCH;
-    }
-
-    FatalConditionHandler::FatalConditionHandler() {
-        isSet = true;
-        // 32k seems enough for Catch to handle stack overflow,
-        // but the value was found experimentally, so there is no strong guarantee
-        guaranteeSize = 32 * 1024;
-        exceptionHandlerHandle = nullptr;
-        // Register as first handler in current chain
-        exceptionHandlerHandle = AddVectoredExceptionHandler(1, handleVectoredException);
-        // Pass in guarantee size to be filled
-        SetThreadStackGuarantee(&guaranteeSize);
-    }
-
-    void FatalConditionHandler::reset() {
-        if (isSet) {
-            RemoveVectoredExceptionHandler(exceptionHandlerHandle);
-            SetThreadStackGuarantee(&guaranteeSize);
-            exceptionHandlerHandle = nullptr;
-            isSet = false;
-        }
-    }
-
-    FatalConditionHandler::~FatalConditionHandler() {
-        reset();
-    }
-
-bool FatalConditionHandler::isSet = false;
-ULONG FatalConditionHandler::guaranteeSize = 0;
-PVOID FatalConditionHandler::exceptionHandlerHandle = nullptr;
-
-} // namespace Catch
-
-#elif defined( CATCH_CONFIG_POSIX_SIGNALS )
-
-namespace Catch {
-
-    struct SignalDefs {
-        int id;
-        const char* name;
-    };
-
-    // 32kb for the alternate stack seems to be sufficient. However, this value
-    // is experimentally determined, so that's not guaranteed.
-    static constexpr std::size_t sigStackSize = 32768 >= MINSIGSTKSZ ? 32768 : MINSIGSTKSZ;
-
-    static SignalDefs signalDefs[] = {
-        { SIGINT,  "SIGINT - Terminal interrupt signal" },
-        { SIGILL,  "SIGILL - Illegal instruction signal" },
-        { SIGFPE,  "SIGFPE - Floating point error signal" },
-        { SIGSEGV, "SIGSEGV - Segmentation violation signal" },
-        { SIGTERM, "SIGTERM - Termination request signal" },
-        { SIGABRT, "SIGABRT - Abort (abnormal termination) signal" }
-    };
-
-    void FatalConditionHandler::handleSignal( int sig ) {
-        char const * name = "<unknown signal>";
-        for (auto const& def : signalDefs) {
-            if (sig == def.id) {
-                name = def.name;
-                break;
-            }
-        }
-        reset();
-        reportFatal(name);
-        raise( sig );
-    }
-
-    FatalConditionHandler::FatalConditionHandler() {
-        isSet = true;
-        stack_t sigStack;
-        sigStack.ss_sp = altStackMem;
-        sigStack.ss_size = sigStackSize;
-        sigStack.ss_flags = 0;
-        sigaltstack(&sigStack, &oldSigStack);
-        struct sigaction sa = { };
-
-        sa.sa_handler = handleSignal;
-        sa.sa_flags = SA_ONSTACK;
-        for (std::size_t i = 0; i < sizeof(signalDefs)/sizeof(SignalDefs); ++i) {
-            sigaction(signalDefs[i].id, &sa, &oldSigActions[i]);
-        }
-    }
-
-    FatalConditionHandler::~FatalConditionHandler() {
-        reset();
-    }
-
-    void FatalConditionHandler::reset() {
-        if( isSet ) {
-            // Set signals back to previous values -- hopefully nobody overwrote them in the meantime
-            for( std::size_t i = 0; i < sizeof(signalDefs)/sizeof(SignalDefs); ++i ) {
-                sigaction(signalDefs[i].id, &oldSigActions[i], nullptr);
-            }
-            // Return the old stack
-            sigaltstack(&oldSigStack, nullptr);
-            isSet = false;
-        }
-    }
-
-    bool FatalConditionHandler::isSet = false;
-    struct sigaction FatalConditionHandler::oldSigActions[sizeof(signalDefs)/sizeof(SignalDefs)] = {};
-    stack_t FatalConditionHandler::oldSigStack = {};
-    char FatalConditionHandler::altStackMem[sigStackSize] = {};
-
-} // namespace Catch
-
-#else
-
-namespace Catch {
-    void FatalConditionHandler::reset() {}
-}
-
-#endif // signals/SEH handling
-
-#if defined(__GNUC__)
-#    pragma GCC diagnostic pop
-#endif
-// end catch_fatal_condition.cpp
-// start catch_generators.cpp
-
-#include <limits>
-#include <set>
-
-namespace Catch {
-
-IGeneratorTracker::~IGeneratorTracker() {}
-
-const char* GeneratorException::what() const noexcept {
-    return m_msg;
-}
-
-namespace Generators {
-
-    GeneratorUntypedBase::~GeneratorUntypedBase() {}
-
-    auto acquireGeneratorTracker( SourceLineInfo const& lineInfo ) -> IGeneratorTracker& {
-        return getResultCapture().acquireGeneratorTracker( lineInfo );
-    }
-
-} // namespace Generators
-} // namespace Catch
-// end catch_generators.cpp
-// start catch_interfaces_capture.cpp
-
-namespace Catch {
-    IResultCapture::~IResultCapture() = default;
-}
-// end catch_interfaces_capture.cpp
-// start catch_interfaces_config.cpp
-
-namespace Catch {
-    IConfig::~IConfig() = default;
-}
-// end catch_interfaces_config.cpp
-// start catch_interfaces_exception.cpp
-
-namespace Catch {
-    IExceptionTranslator::~IExceptionTranslator() = default;
-    IExceptionTranslatorRegistry::~IExceptionTranslatorRegistry() = default;
-}
-// end catch_interfaces_exception.cpp
-// start catch_interfaces_registry_hub.cpp
-
-namespace Catch {
-    IRegistryHub::~IRegistryHub() = default;
-    IMutableRegistryHub::~IMutableRegistryHub() = default;
-}
-// end catch_interfaces_registry_hub.cpp
-// start catch_interfaces_reporter.cpp
-
-// start catch_reporter_listening.h
-
-namespace Catch {
-
-    class ListeningReporter : public IStreamingReporter {
-        using Reporters = std::vector<IStreamingReporterPtr>;
-        Reporters m_listeners;
-        IStreamingReporterPtr m_reporter = nullptr;
-        ReporterPreferences m_preferences;
-
-    public:
-        ListeningReporter();
-
-        void addListener( IStreamingReporterPtr&& listener );
-        void addReporter( IStreamingReporterPtr&& reporter );
-
-    public: // IStreamingReporter
-
-        ReporterPreferences getPreferences() const override;
-
-        void noMatchingTestCases( std::string const& spec ) override;
-
-        void reportInvalidArguments(std::string const&arg) override;
-
-        static std::set<Verbosity> getSupportedVerbosities();
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-        void benchmarkPreparing(std::string const& name) override;
-        void benchmarkStarting( BenchmarkInfo const& benchmarkInfo ) override;
-        void benchmarkEnded( BenchmarkStats<> const& benchmarkStats ) override;
-        void benchmarkFailed(std::string const&) override;
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-        void testRunStarting( TestRunInfo const& testRunInfo ) override;
-        void testGroupStarting( GroupInfo const& groupInfo ) override;
-        void testCaseStarting( TestCaseInfo const& testInfo ) override;
-        void sectionStarting( SectionInfo const& sectionInfo ) override;
-        void assertionStarting( AssertionInfo const& assertionInfo ) override;
-
-        // The return value indicates if the messages buffer should be cleared:
-        bool assertionEnded( AssertionStats const& assertionStats ) override;
-        void sectionEnded( SectionStats const& sectionStats ) override;
-        void testCaseEnded( TestCaseStats const& testCaseStats ) override;
-        void testGroupEnded( TestGroupStats const& testGroupStats ) override;
-        void testRunEnded( TestRunStats const& testRunStats ) override;
-
-        void skipTest( TestCaseInfo const& testInfo ) override;
-        bool isMulti() const override;
-
-    };
-
-} // end namespace Catch
-
-// end catch_reporter_listening.h
-namespace Catch {
-
-    ReporterConfig::ReporterConfig( IConfigPtr const& _fullConfig )
-    :   m_stream( &_fullConfig->stream() ), m_fullConfig( _fullConfig ) {}
-
-    ReporterConfig::ReporterConfig( IConfigPtr const& _fullConfig, std::ostream& _stream )
-    :   m_stream( &_stream ), m_fullConfig( _fullConfig ) {}
-
-    std::ostream& ReporterConfig::stream() const { return *m_stream; }
-    IConfigPtr ReporterConfig::fullConfig() const { return m_fullConfig; }
-
-    TestRunInfo::TestRunInfo( std::string const& _name ) : name( _name ) {}
-
-    GroupInfo::GroupInfo(  std::string const& _name,
-                           std::size_t _groupIndex,
-                           std::size_t _groupsCount )
-    :   name( _name ),
-        groupIndex( _groupIndex ),
-        groupsCounts( _groupsCount )
-    {}
-
-     AssertionStats::AssertionStats( AssertionResult const& _assertionResult,
-                                     std::vector<MessageInfo> const& _infoMessages,
-                                     Totals const& _totals )
-    :   assertionResult( _assertionResult ),
-        infoMessages( _infoMessages ),
-        totals( _totals )
-    {
-        assertionResult.m_resultData.lazyExpression.m_transientExpression = _assertionResult.m_resultData.lazyExpression.m_transientExpression;
-
-        if( assertionResult.hasMessage() ) {
-            // Copy message into messages list.
-            // !TBD This should have been done earlier, somewhere
-            MessageBuilder builder( assertionResult.getTestMacroName(), assertionResult.getSourceInfo(), assertionResult.getResultType() );
-            builder << assertionResult.getMessage();
-            builder.m_info.message = builder.m_stream.str();
-
-            infoMessages.push_back( builder.m_info );
-        }
-    }
-
-     AssertionStats::~AssertionStats() = default;
-
-    SectionStats::SectionStats(  SectionInfo const& _sectionInfo,
-                                 Counts const& _assertions,
-                                 double _durationInSeconds,
-                                 bool _missingAssertions )
-    :   sectionInfo( _sectionInfo ),
-        assertions( _assertions ),
-        durationInSeconds( _durationInSeconds ),
-        missingAssertions( _missingAssertions )
-    {}
-
-    SectionStats::~SectionStats() = default;
-
-    TestCaseStats::TestCaseStats(  TestCaseInfo const& _testInfo,
-                                   Totals const& _totals,
-                                   std::string const& _stdOut,
-                                   std::string const& _stdErr,
-                                   bool _aborting )
-    : testInfo( _testInfo ),
-        totals( _totals ),
-        stdOut( _stdOut ),
-        stdErr( _stdErr ),
-        aborting( _aborting )
-    {}
-
-    TestCaseStats::~TestCaseStats() = default;
-
-    TestGroupStats::TestGroupStats( GroupInfo const& _groupInfo,
-                                    Totals const& _totals,
-                                    bool _aborting )
-    :   groupInfo( _groupInfo ),
-        totals( _totals ),
-        aborting( _aborting )
-    {}
-
-    TestGroupStats::TestGroupStats( GroupInfo const& _groupInfo )
-    :   groupInfo( _groupInfo ),
-        aborting( false )
-    {}
-
-    TestGroupStats::~TestGroupStats() = default;
-
-    TestRunStats::TestRunStats(   TestRunInfo const& _runInfo,
-                    Totals const& _totals,
-                    bool _aborting )
-    :   runInfo( _runInfo ),
-        totals( _totals ),
-        aborting( _aborting )
-    {}
-
-    TestRunStats::~TestRunStats() = default;
-
-    void IStreamingReporter::fatalErrorEncountered( StringRef ) {}
-    bool IStreamingReporter::isMulti() const { return false; }
-
-    IReporterFactory::~IReporterFactory() = default;
-    IReporterRegistry::~IReporterRegistry() = default;
-
-} // end namespace Catch
-// end catch_interfaces_reporter.cpp
-// start catch_interfaces_runner.cpp
-
-namespace Catch {
-    IRunner::~IRunner() = default;
-}
-// end catch_interfaces_runner.cpp
-// start catch_interfaces_testcase.cpp
-
-namespace Catch {
-    ITestInvoker::~ITestInvoker() = default;
-    ITestCaseRegistry::~ITestCaseRegistry() = default;
-}
-// end catch_interfaces_testcase.cpp
-// start catch_leak_detector.cpp
-
-#ifdef CATCH_CONFIG_WINDOWS_CRTDBG
-#include <crtdbg.h>
-
-namespace Catch {
-
-    LeakDetector::LeakDetector() {
-        int flag = _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG);
-        flag |= _CRTDBG_LEAK_CHECK_DF;
-        flag |= _CRTDBG_ALLOC_MEM_DF;
-        _CrtSetDbgFlag(flag);
-        _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE | _CRTDBG_MODE_DEBUG);
-        _CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR);
-        // Change this to leaking allocation's number to break there
-        _CrtSetBreakAlloc(-1);
-    }
-}
-
-#else
-
-    Catch::LeakDetector::LeakDetector() {}
-
-#endif
-
-Catch::LeakDetector::~LeakDetector() {
-    Catch::cleanUp();
-}
-// end catch_leak_detector.cpp
-// start catch_list.cpp
-
-// start catch_list.h
-
-#include <set>
-
-namespace Catch {
-
-    std::size_t listTests( Config const& config );
-
-    std::size_t listTestsNamesOnly( Config const& config );
-
-    struct TagInfo {
-        void add( std::string const& spelling );
-        std::string all() const;
-
-        std::set<std::string> spellings;
-        std::size_t count = 0;
-    };
-
-    std::size_t listTags( Config const& config );
-
-    std::size_t listReporters();
-
-    Option<std::size_t> list( std::shared_ptr<Config> const& config );
-
-} // end namespace Catch
-
-// end catch_list.h
-// start catch_text.h
-
-namespace Catch {
-    using namespace clara::TextFlow;
-}
-
-// end catch_text.h
-#include <limits>
-#include <algorithm>
-#include <iomanip>
-
-namespace Catch {
-
-    std::size_t listTests( Config const& config ) {
-        TestSpec const& testSpec = config.testSpec();
-        if( config.hasTestFilters() )
-            Catch::cout() << "Matching test cases:\n";
-        else {
-            Catch::cout() << "All available test cases:\n";
-        }
-
-        auto matchedTestCases = filterTests( getAllTestCasesSorted( config ), testSpec, config );
-        for( auto const& testCaseInfo : matchedTestCases ) {
-            Colour::Code colour = testCaseInfo.isHidden()
-                ? Colour::SecondaryText
-                : Colour::None;
-            Colour colourGuard( colour );
-
-            Catch::cout() << Column( testCaseInfo.name ).initialIndent( 2 ).indent( 4 ) << "\n";
-            if( config.verbosity() >= Verbosity::High ) {
-                Catch::cout() << Column( Catch::Detail::stringify( testCaseInfo.lineInfo ) ).indent(4) << std::endl;
-                std::string description = testCaseInfo.description;
-                if( description.empty() )
-                    description = "(NO DESCRIPTION)";
-                Catch::cout() << Column( description ).indent(4) << std::endl;
-            }
-            if( !testCaseInfo.tags.empty() )
-                Catch::cout() << Column( testCaseInfo.tagsAsString() ).indent( 6 ) << "\n";
-        }
-
-        if( !config.hasTestFilters() )
-            Catch::cout() << pluralise( matchedTestCases.size(), "test case" ) << '\n' << std::endl;
-        else
-            Catch::cout() << pluralise( matchedTestCases.size(), "matching test case" ) << '\n' << std::endl;
-        return matchedTestCases.size();
-    }
-
-    std::size_t listTestsNamesOnly( Config const& config ) {
-        TestSpec const& testSpec = config.testSpec();
-        std::size_t matchedTests = 0;
-        std::vector<TestCase> matchedTestCases = filterTests( getAllTestCasesSorted( config ), testSpec, config );
-        for( auto const& testCaseInfo : matchedTestCases ) {
-            matchedTests++;
-            if( startsWith( testCaseInfo.name, '#' ) )
-               Catch::cout() << '"' << testCaseInfo.name << '"';
-            else
-               Catch::cout() << testCaseInfo.name;
-            if ( config.verbosity() >= Verbosity::High )
-                Catch::cout() << "\t@" << testCaseInfo.lineInfo;
-            Catch::cout() << std::endl;
-        }
-        return matchedTests;
-    }
-
-    void TagInfo::add( std::string const& spelling ) {
-        ++count;
-        spellings.insert( spelling );
-    }
-
-    std::string TagInfo::all() const {
-        size_t size = 0;
-        for (auto const& spelling : spellings) {
-            // Add 2 for the brackes
-            size += spelling.size() + 2;
-        }
-
-        std::string out; out.reserve(size);
-        for (auto const& spelling : spellings) {
-            out += '[';
-            out += spelling;
-            out += ']';
-        }
-        return out;
-    }
-
-    std::size_t listTags( Config const& config ) {
-        TestSpec const& testSpec = config.testSpec();
-        if( config.hasTestFilters() )
-            Catch::cout() << "Tags for matching test cases:\n";
-        else {
-            Catch::cout() << "All available tags:\n";
-        }
-
-        std::map<std::string, TagInfo> tagCounts;
-
-        std::vector<TestCase> matchedTestCases = filterTests( getAllTestCasesSorted( config ), testSpec, config );
-        for( auto const& testCase : matchedTestCases ) {
-            for( auto const& tagName : testCase.getTestCaseInfo().tags ) {
-                std::string lcaseTagName = toLower( tagName );
-                auto countIt = tagCounts.find( lcaseTagName );
-                if( countIt == tagCounts.end() )
-                    countIt = tagCounts.insert( std::make_pair( lcaseTagName, TagInfo() ) ).first;
-                countIt->second.add( tagName );
-            }
-        }
-
-        for( auto const& tagCount : tagCounts ) {
-            ReusableStringStream rss;
-            rss << "  " << std::setw(2) << tagCount.second.count << "  ";
-            auto str = rss.str();
-            auto wrapper = Column( tagCount.second.all() )
-                                                    .initialIndent( 0 )
-                                                    .indent( str.size() )
-                                                    .width( CATCH_CONFIG_CONSOLE_WIDTH-10 );
-            Catch::cout() << str << wrapper << '\n';
-        }
-        Catch::cout() << pluralise( tagCounts.size(), "tag" ) << '\n' << std::endl;
-        return tagCounts.size();
-    }
-
-    std::size_t listReporters() {
-        Catch::cout() << "Available reporters:\n";
-        IReporterRegistry::FactoryMap const& factories = getRegistryHub().getReporterRegistry().getFactories();
-        std::size_t maxNameLen = 0;
-        for( auto const& factoryKvp : factories )
-            maxNameLen = (std::max)( maxNameLen, factoryKvp.first.size() );
-
-        for( auto const& factoryKvp : factories ) {
-            Catch::cout()
-                    << Column( factoryKvp.first + ":" )
-                            .indent(2)
-                            .width( 5+maxNameLen )
-                    +  Column( factoryKvp.second->getDescription() )
-                            .initialIndent(0)
-                            .indent(2)
-                            .width( CATCH_CONFIG_CONSOLE_WIDTH - maxNameLen-8 )
-                    << "\n";
-        }
-        Catch::cout() << std::endl;
-        return factories.size();
-    }
-
-    Option<std::size_t> list( std::shared_ptr<Config> const& config ) {
-        Option<std::size_t> listedCount;
-        getCurrentMutableContext().setConfig( config );
-        if( config->listTests() )
-            listedCount = listedCount.valueOr(0) + listTests( *config );
-        if( config->listTestNamesOnly() )
-            listedCount = listedCount.valueOr(0) + listTestsNamesOnly( *config );
-        if( config->listTags() )
-            listedCount = listedCount.valueOr(0) + listTags( *config );
-        if( config->listReporters() )
-            listedCount = listedCount.valueOr(0) + listReporters();
-        return listedCount;
-    }
-
-} // end namespace Catch
-// end catch_list.cpp
-// start catch_matchers.cpp
-
-namespace Catch {
-namespace Matchers {
-    namespace Impl {
-
-        std::string MatcherUntypedBase::toString() const {
-            if( m_cachedToString.empty() )
-                m_cachedToString = describe();
-            return m_cachedToString;
-        }
-
-        MatcherUntypedBase::~MatcherUntypedBase() = default;
-
-    } // namespace Impl
-} // namespace Matchers
-
-using namespace Matchers;
-using Matchers::Impl::MatcherBase;
-
-} // namespace Catch
-// end catch_matchers.cpp
-// start catch_matchers_exception.cpp
-
-namespace Catch {
-namespace Matchers {
-namespace Exception {
-
-bool ExceptionMessageMatcher::match(std::exception const& ex) const {
-    return ex.what() == m_message;
-}
-
-std::string ExceptionMessageMatcher::describe() const {
-    return "exception message matches \"" + m_message + "\"";
-}
-
-}
-Exception::ExceptionMessageMatcher Message(std::string const& message) {
-    return Exception::ExceptionMessageMatcher(message);
-}
-
-// namespace Exception
-} // namespace Matchers
-} // namespace Catch
-// end catch_matchers_exception.cpp
-// start catch_matchers_floating.cpp
-
-// start catch_polyfills.hpp
-
-namespace Catch {
-    bool isnan(float f);
-    bool isnan(double d);
-}
-
-// end catch_polyfills.hpp
-// start catch_to_string.hpp
-
-#include <string>
-
-namespace Catch {
-    template <typename T>
-    std::string to_string(T const& t) {
-#if defined(CATCH_CONFIG_CPP11_TO_STRING)
-        return std::to_string(t);
-#else
-        ReusableStringStream rss;
-        rss << t;
-        return rss.str();
-#endif
-    }
-} // end namespace Catch
-
-// end catch_to_string.hpp
-#include <algorithm>
-#include <cmath>
-#include <cstdlib>
-#include <cstdint>
-#include <cstring>
-#include <sstream>
-#include <type_traits>
-#include <iomanip>
-#include <limits>
-
-namespace Catch {
-namespace {
-
-    int32_t convert(float f) {
-        static_assert(sizeof(float) == sizeof(int32_t), "Important ULP matcher assumption violated");
-        int32_t i;
-        std::memcpy(&i, &f, sizeof(f));
-        return i;
-    }
-
-    int64_t convert(double d) {
-        static_assert(sizeof(double) == sizeof(int64_t), "Important ULP matcher assumption violated");
-        int64_t i;
-        std::memcpy(&i, &d, sizeof(d));
-        return i;
-    }
-
-    template <typename FP>
-    bool almostEqualUlps(FP lhs, FP rhs, uint64_t maxUlpDiff) {
-        // Comparison with NaN should always be false.
-        // This way we can rule it out before getting into the ugly details
-        if (Catch::isnan(lhs) || Catch::isnan(rhs)) {
-            return false;
-        }
-
-        auto lc = convert(lhs);
-        auto rc = convert(rhs);
-
-        if ((lc < 0) != (rc < 0)) {
-            // Potentially we can have +0 and -0
-            return lhs == rhs;
-        }
-
-        auto ulpDiff = std::abs(lc - rc);
-        return static_cast<uint64_t>(ulpDiff) <= maxUlpDiff;
-    }
-
-#if defined(CATCH_CONFIG_GLOBAL_NEXTAFTER)
-
-    float nextafter(float x, float y) {
-        return ::nextafterf(x, y);
-    }
-
-    double nextafter(double x, double y) {
-        return ::nextafter(x, y);
-    }
-
-#endif // ^^^ CATCH_CONFIG_GLOBAL_NEXTAFTER ^^^
-
-template <typename FP>
-FP step(FP start, FP direction, uint64_t steps) {
-    for (uint64_t i = 0; i < steps; ++i) {
-#if defined(CATCH_CONFIG_GLOBAL_NEXTAFTER)
-        start = Catch::nextafter(start, direction);
-#else
-        start = std::nextafter(start, direction);
-#endif
-    }
-    return start;
-}
-
-// Performs equivalent check of std::fabs(lhs - rhs) <= margin
-// But without the subtraction to allow for INFINITY in comparison
-bool marginComparison(double lhs, double rhs, double margin) {
-    return (lhs + margin >= rhs) && (rhs + margin >= lhs);
-}
-
-template <typename FloatingPoint>
-void write(std::ostream& out, FloatingPoint num) {
-    out << std::scientific
-        << std::setprecision(std::numeric_limits<FloatingPoint>::max_digits10 - 1)
-        << num;
-}
-
-} // end anonymous namespace
-
-namespace Matchers {
-namespace Floating {
-
-    enum class FloatingPointKind : uint8_t {
-        Float,
-        Double
-    };
-
-    WithinAbsMatcher::WithinAbsMatcher(double target, double margin)
-        :m_target{ target }, m_margin{ margin } {
-        CATCH_ENFORCE(margin >= 0, "Invalid margin: " << margin << '.'
-            << " Margin has to be non-negative.");
-    }
-
-    // Performs equivalent check of std::fabs(lhs - rhs) <= margin
-    // But without the subtraction to allow for INFINITY in comparison
-    bool WithinAbsMatcher::match(double const& matchee) const {
-        return (matchee + m_margin >= m_target) && (m_target + m_margin >= matchee);
-    }
-
-    std::string WithinAbsMatcher::describe() const {
-        return "is within " + ::Catch::Detail::stringify(m_margin) + " of " + ::Catch::Detail::stringify(m_target);
-    }
-
-    WithinUlpsMatcher::WithinUlpsMatcher(double target, uint64_t ulps, FloatingPointKind baseType)
-        :m_target{ target }, m_ulps{ ulps }, m_type{ baseType } {
-        CATCH_ENFORCE(m_type == FloatingPointKind::Double
-                   || m_ulps < (std::numeric_limits<uint32_t>::max)(),
-            "Provided ULP is impossibly large for a float comparison.");
-    }
-
-#if defined(__clang__)
-#pragma clang diagnostic push
-// Clang <3.5 reports on the default branch in the switch below
-#pragma clang diagnostic ignored "-Wunreachable-code"
-#endif
-
-    bool WithinUlpsMatcher::match(double const& matchee) const {
-        switch (m_type) {
-        case FloatingPointKind::Float:
-            return almostEqualUlps<float>(static_cast<float>(matchee), static_cast<float>(m_target), m_ulps);
-        case FloatingPointKind::Double:
-            return almostEqualUlps<double>(matchee, m_target, m_ulps);
-        default:
-            CATCH_INTERNAL_ERROR( "Unknown FloatingPointKind value" );
-        }
-    }
-
-#if defined(__clang__)
-#pragma clang diagnostic pop
-#endif
-
-    std::string WithinUlpsMatcher::describe() const {
-        std::stringstream ret;
-
-        ret << "is within " << m_ulps << " ULPs of ";
-
-        if (m_type == FloatingPointKind::Float) {
-            write(ret, static_cast<float>(m_target));
-            ret << 'f';
-        } else {
-            write(ret, m_target);
-        }
-
-        ret << " ([";
-        if (m_type == FloatingPointKind::Double) {
-            write(ret, step(m_target, static_cast<double>(-INFINITY), m_ulps));
-            ret << ", ";
-            write(ret, step(m_target, static_cast<double>( INFINITY), m_ulps));
-        } else {
-            // We have to cast INFINITY to float because of MinGW, see #1782
-            write(ret, step(static_cast<float>(m_target), static_cast<float>(-INFINITY), m_ulps));
-            ret << ", ";
-            write(ret, step(static_cast<float>(m_target), static_cast<float>( INFINITY), m_ulps));
-        }
-        ret << "])";
-
-        return ret.str();
-    }
-
-    WithinRelMatcher::WithinRelMatcher(double target, double epsilon):
-        m_target(target),
-        m_epsilon(epsilon){
-        CATCH_ENFORCE(m_epsilon >= 0., "Relative comparison with epsilon <  0 does not make sense.");
-        CATCH_ENFORCE(m_epsilon  < 1., "Relative comparison with epsilon >= 1 does not make sense.");
-    }
-
-    bool WithinRelMatcher::match(double const& matchee) const {
-        const auto relMargin = m_epsilon * (std::max)(std::fabs(matchee), std::fabs(m_target));
-        return marginComparison(matchee, m_target,
-                                std::isinf(relMargin)? 0 : relMargin);
-    }
-
-    std::string WithinRelMatcher::describe() const {
-        Catch::ReusableStringStream sstr;
-        sstr << "and " << m_target << " are within " << m_epsilon * 100. << "% of each other";
-        return sstr.str();
-    }
-
-}// namespace Floating
-
-Floating::WithinUlpsMatcher WithinULP(double target, uint64_t maxUlpDiff) {
-    return Floating::WithinUlpsMatcher(target, maxUlpDiff, Floating::FloatingPointKind::Double);
-}
-
-Floating::WithinUlpsMatcher WithinULP(float target, uint64_t maxUlpDiff) {
-    return Floating::WithinUlpsMatcher(target, maxUlpDiff, Floating::FloatingPointKind::Float);
-}
-
-Floating::WithinAbsMatcher WithinAbs(double target, double margin) {
-    return Floating::WithinAbsMatcher(target, margin);
-}
-
-Floating::WithinRelMatcher WithinRel(double target, double eps) {
-    return Floating::WithinRelMatcher(target, eps);
-}
-
-Floating::WithinRelMatcher WithinRel(double target) {
-    return Floating::WithinRelMatcher(target, std::numeric_limits<double>::epsilon() * 100);
-}
-
-Floating::WithinRelMatcher WithinRel(float target, float eps) {
-    return Floating::WithinRelMatcher(target, eps);
-}
-
-Floating::WithinRelMatcher WithinRel(float target) {
-    return Floating::WithinRelMatcher(target, std::numeric_limits<float>::epsilon() * 100);
-}
-
-} // namespace Matchers
-} // namespace Catch
-
-// end catch_matchers_floating.cpp
-// start catch_matchers_generic.cpp
-
-std::string Catch::Matchers::Generic::Detail::finalizeDescription(const std::string& desc) {
-    if (desc.empty()) {
-        return "matches undescribed predicate";
-    } else {
-        return "matches predicate: \"" + desc + '"';
-    }
-}
-// end catch_matchers_generic.cpp
-// start catch_matchers_string.cpp
-
-#include <regex>
-
-namespace Catch {
-namespace Matchers {
-
-    namespace StdString {
-
-        CasedString::CasedString( std::string const& str, CaseSensitive::Choice caseSensitivity )
-        :   m_caseSensitivity( caseSensitivity ),
-            m_str( adjustString( str ) )
-        {}
-        std::string CasedString::adjustString( std::string const& str ) const {
-            return m_caseSensitivity == CaseSensitive::No
-                   ? toLower( str )
-                   : str;
-        }
-        std::string CasedString::caseSensitivitySuffix() const {
-            return m_caseSensitivity == CaseSensitive::No
-                   ? " (case insensitive)"
-                   : std::string();
-        }
-
-        StringMatcherBase::StringMatcherBase( std::string const& operation, CasedString const& comparator )
-        : m_comparator( comparator ),
-          m_operation( operation ) {
-        }
-
-        std::string StringMatcherBase::describe() const {
-            std::string description;
-            description.reserve(5 + m_operation.size() + m_comparator.m_str.size() +
-                                        m_comparator.caseSensitivitySuffix().size());
-            description += m_operation;
-            description += ": \"";
-            description += m_comparator.m_str;
-            description += "\"";
-            description += m_comparator.caseSensitivitySuffix();
-            return description;
-        }
-
-        EqualsMatcher::EqualsMatcher( CasedString const& comparator ) : StringMatcherBase( "equals", comparator ) {}
-
-        bool EqualsMatcher::match( std::string const& source ) const {
-            return m_comparator.adjustString( source ) == m_comparator.m_str;
-        }
-
-        ContainsMatcher::ContainsMatcher( CasedString const& comparator ) : StringMatcherBase( "contains", comparator ) {}
-
-        bool ContainsMatcher::match( std::string const& source ) const {
-            return contains( m_comparator.adjustString( source ), m_comparator.m_str );
-        }
-
-        StartsWithMatcher::StartsWithMatcher( CasedString const& comparator ) : StringMatcherBase( "starts with", comparator ) {}
-
-        bool StartsWithMatcher::match( std::string const& source ) const {
-            return startsWith( m_comparator.adjustString( source ), m_comparator.m_str );
-        }
-
-        EndsWithMatcher::EndsWithMatcher( CasedString const& comparator ) : StringMatcherBase( "ends with", comparator ) {}
-
-        bool EndsWithMatcher::match( std::string const& source ) const {
-            return endsWith( m_comparator.adjustString( source ), m_comparator.m_str );
-        }
-
-        RegexMatcher::RegexMatcher(std::string regex, CaseSensitive::Choice caseSensitivity): m_regex(std::move(regex)), m_caseSensitivity(caseSensitivity) {}
-
-        bool RegexMatcher::match(std::string const& matchee) const {
-            auto flags = std::regex::ECMAScript; // ECMAScript is the default syntax option anyway
-            if (m_caseSensitivity == CaseSensitive::Choice::No) {
-                flags |= std::regex::icase;
-            }
-            auto reg = std::regex(m_regex, flags);
-            return std::regex_match(matchee, reg);
-        }
-
-        std::string RegexMatcher::describe() const {
-            return "matches " + ::Catch::Detail::stringify(m_regex) + ((m_caseSensitivity == CaseSensitive::Choice::Yes)? " case sensitively" : " case insensitively");
-        }
-
-    } // namespace StdString
-
-    StdString::EqualsMatcher Equals( std::string const& str, CaseSensitive::Choice caseSensitivity ) {
-        return StdString::EqualsMatcher( StdString::CasedString( str, caseSensitivity) );
-    }
-    StdString::ContainsMatcher Contains( std::string const& str, CaseSensitive::Choice caseSensitivity ) {
-        return StdString::ContainsMatcher( StdString::CasedString( str, caseSensitivity) );
-    }
-    StdString::EndsWithMatcher EndsWith( std::string const& str, CaseSensitive::Choice caseSensitivity ) {
-        return StdString::EndsWithMatcher( StdString::CasedString( str, caseSensitivity) );
-    }
-    StdString::StartsWithMatcher StartsWith( std::string const& str, CaseSensitive::Choice caseSensitivity ) {
-        return StdString::StartsWithMatcher( StdString::CasedString( str, caseSensitivity) );
-    }
-
-    StdString::RegexMatcher Matches(std::string const& regex, CaseSensitive::Choice caseSensitivity) {
-        return StdString::RegexMatcher(regex, caseSensitivity);
-    }
-
-} // namespace Matchers
-} // namespace Catch
-// end catch_matchers_string.cpp
-// start catch_message.cpp
-
-// start catch_uncaught_exceptions.h
-
-namespace Catch {
-    bool uncaught_exceptions();
-} // end namespace Catch
-
-// end catch_uncaught_exceptions.h
-#include <cassert>
-#include <stack>
-
-namespace Catch {
-
-    MessageInfo::MessageInfo(   StringRef const& _macroName,
-                                SourceLineInfo const& _lineInfo,
-                                ResultWas::OfType _type )
-    :   macroName( _macroName ),
-        lineInfo( _lineInfo ),
-        type( _type ),
-        sequence( ++globalCount )
-    {}
-
-    bool MessageInfo::operator==( MessageInfo const& other ) const {
-        return sequence == other.sequence;
-    }
-
-    bool MessageInfo::operator<( MessageInfo const& other ) const {
-        return sequence < other.sequence;
-    }
-
-    // This may need protecting if threading support is added
-    unsigned int MessageInfo::globalCount = 0;
-
-    ////////////////////////////////////////////////////////////////////////////
-
-    Catch::MessageBuilder::MessageBuilder( StringRef const& macroName,
-                                           SourceLineInfo const& lineInfo,
-                                           ResultWas::OfType type )
-        :m_info(macroName, lineInfo, type) {}
-
-    ////////////////////////////////////////////////////////////////////////////
-
-    ScopedMessage::ScopedMessage( MessageBuilder const& builder )
-    : m_info( builder.m_info ), m_moved()
-    {
-        m_info.message = builder.m_stream.str();
-        getResultCapture().pushScopedMessage( m_info );
-    }
-
-    ScopedMessage::ScopedMessage( ScopedMessage&& old )
-    : m_info( old.m_info ), m_moved()
-    {
-        old.m_moved = true;
-    }
-
-    ScopedMessage::~ScopedMessage() {
-        if ( !uncaught_exceptions() && !m_moved ){
-            getResultCapture().popScopedMessage(m_info);
-        }
-    }
-
-    Capturer::Capturer( StringRef macroName, SourceLineInfo const& lineInfo, ResultWas::OfType resultType, StringRef names ) {
-        auto trimmed = [&] (size_t start, size_t end) {
-            while (names[start] == ',' || isspace(names[start])) {
-                ++start;
-            }
-            while (names[end] == ',' || isspace(names[end])) {
-                --end;
-            }
-            return names.substr(start, end - start + 1);
-        };
-        auto skipq = [&] (size_t start, char quote) {
-            for (auto i = start + 1; i < names.size() ; ++i) {
-                if (names[i] == quote)
-                    return i;
-                if (names[i] == '\\')
-                    ++i;
-            }
-            CATCH_INTERNAL_ERROR("CAPTURE parsing encountered unmatched quote");
-        };
-
-        size_t start = 0;
-        std::stack<char> openings;
-        for (size_t pos = 0; pos < names.size(); ++pos) {
-            char c = names[pos];
-            switch (c) {
-            case '[':
-            case '{':
-            case '(':
-            // It is basically impossible to disambiguate between
-            // comparison and start of template args in this context
-//            case '<':
-                openings.push(c);
-                break;
-            case ']':
-            case '}':
-            case ')':
-//           case '>':
-                openings.pop();
-                break;
-            case '"':
-            case '\'':
-                pos = skipq(pos, c);
-                break;
-            case ',':
-                if (start != pos && openings.empty()) {
-                    m_messages.emplace_back(macroName, lineInfo, resultType);
-                    m_messages.back().message = static_cast<std::string>(trimmed(start, pos));
-                    m_messages.back().message += " := ";
-                    start = pos;
-                }
-            }
-        }
-        assert(openings.empty() && "Mismatched openings");
-        m_messages.emplace_back(macroName, lineInfo, resultType);
-        m_messages.back().message = static_cast<std::string>(trimmed(start, names.size() - 1));
-        m_messages.back().message += " := ";
-    }
-    Capturer::~Capturer() {
-        if ( !uncaught_exceptions() ){
-            assert( m_captured == m_messages.size() );
-            for( size_t i = 0; i < m_captured; ++i  )
-                m_resultCapture.popScopedMessage( m_messages[i] );
-        }
-    }
-
-    void Capturer::captureValue( size_t index, std::string const& value ) {
-        assert( index < m_messages.size() );
-        m_messages[index].message += value;
-        m_resultCapture.pushScopedMessage( m_messages[index] );
-        m_captured++;
-    }
-
-} // end namespace Catch
-// end catch_message.cpp
-// start catch_output_redirect.cpp
-
-// start catch_output_redirect.h
-#ifndef TWOBLUECUBES_CATCH_OUTPUT_REDIRECT_H
-#define TWOBLUECUBES_CATCH_OUTPUT_REDIRECT_H
-
-#include <cstdio>
-#include <iosfwd>
-#include <string>
-
-namespace Catch {
-
-    class RedirectedStream {
-        std::ostream& m_originalStream;
-        std::ostream& m_redirectionStream;
-        std::streambuf* m_prevBuf;
-
-    public:
-        RedirectedStream( std::ostream& originalStream, std::ostream& redirectionStream );
-        ~RedirectedStream();
-    };
-
-    class RedirectedStdOut {
-        ReusableStringStream m_rss;
-        RedirectedStream m_cout;
-    public:
-        RedirectedStdOut();
-        auto str() const -> std::string;
-    };
-
-    // StdErr has two constituent streams in C++, std::cerr and std::clog
-    // This means that we need to redirect 2 streams into 1 to keep proper
-    // order of writes
-    class RedirectedStdErr {
-        ReusableStringStream m_rss;
-        RedirectedStream m_cerr;
-        RedirectedStream m_clog;
-    public:
-        RedirectedStdErr();
-        auto str() const -> std::string;
-    };
-
-    class RedirectedStreams {
-    public:
-        RedirectedStreams(RedirectedStreams const&) = delete;
-        RedirectedStreams& operator=(RedirectedStreams const&) = delete;
-        RedirectedStreams(RedirectedStreams&&) = delete;
-        RedirectedStreams& operator=(RedirectedStreams&&) = delete;
-
-        RedirectedStreams(std::string& redirectedCout, std::string& redirectedCerr);
-        ~RedirectedStreams();
-    private:
-        std::string& m_redirectedCout;
-        std::string& m_redirectedCerr;
-        RedirectedStdOut m_redirectedStdOut;
-        RedirectedStdErr m_redirectedStdErr;
-    };
-
-#if defined(CATCH_CONFIG_NEW_CAPTURE)
-
-    // Windows's implementation of std::tmpfile is terrible (it tries
-    // to create a file inside system folder, thus requiring elevated
-    // privileges for the binary), so we have to use tmpnam(_s) and
-    // create the file ourselves there.
-    class TempFile {
-    public:
-        TempFile(TempFile const&) = delete;
-        TempFile& operator=(TempFile const&) = delete;
-        TempFile(TempFile&&) = delete;
-        TempFile& operator=(TempFile&&) = delete;
-
-        TempFile();
-        ~TempFile();
-
-        std::FILE* getFile();
-        std::string getContents();
-
-    private:
-        std::FILE* m_file = nullptr;
-    #if defined(_MSC_VER)
-        char m_buffer[L_tmpnam] = { 0 };
-    #endif
-    };
-
-    class OutputRedirect {
-    public:
-        OutputRedirect(OutputRedirect const&) = delete;
-        OutputRedirect& operator=(OutputRedirect const&) = delete;
-        OutputRedirect(OutputRedirect&&) = delete;
-        OutputRedirect& operator=(OutputRedirect&&) = delete;
-
-        OutputRedirect(std::string& stdout_dest, std::string& stderr_dest);
-        ~OutputRedirect();
-
-    private:
-        int m_originalStdout = -1;
-        int m_originalStderr = -1;
-        TempFile m_stdoutFile;
-        TempFile m_stderrFile;
-        std::string& m_stdoutDest;
-        std::string& m_stderrDest;
-    };
-
-#endif
-
-} // end namespace Catch
-
-#endif // TWOBLUECUBES_CATCH_OUTPUT_REDIRECT_H
-// end catch_output_redirect.h
-#include <cstdio>
-#include <cstring>
-#include <fstream>
-#include <sstream>
-#include <stdexcept>
-
-#if defined(CATCH_CONFIG_NEW_CAPTURE)
-    #if defined(_MSC_VER)
-    #include <io.h>      //_dup and _dup2
-    #define dup _dup
-    #define dup2 _dup2
-    #define fileno _fileno
-    #else
-    #include <unistd.h>  // dup and dup2
-    #endif
-#endif
-
-namespace Catch {
-
-    RedirectedStream::RedirectedStream( std::ostream& originalStream, std::ostream& redirectionStream )
-    :   m_originalStream( originalStream ),
-        m_redirectionStream( redirectionStream ),
-        m_prevBuf( m_originalStream.rdbuf() )
-    {
-        m_originalStream.rdbuf( m_redirectionStream.rdbuf() );
-    }
-
-    RedirectedStream::~RedirectedStream() {
-        m_originalStream.rdbuf( m_prevBuf );
-    }
-
-    RedirectedStdOut::RedirectedStdOut() : m_cout( Catch::cout(), m_rss.get() ) {}
-    auto RedirectedStdOut::str() const -> std::string { return m_rss.str(); }
-
-    RedirectedStdErr::RedirectedStdErr()
-    :   m_cerr( Catch::cerr(), m_rss.get() ),
-        m_clog( Catch::clog(), m_rss.get() )
-    {}
-    auto RedirectedStdErr::str() const -> std::string { return m_rss.str(); }
-
-    RedirectedStreams::RedirectedStreams(std::string& redirectedCout, std::string& redirectedCerr)
-    :   m_redirectedCout(redirectedCout),
-        m_redirectedCerr(redirectedCerr)
-    {}
-
-    RedirectedStreams::~RedirectedStreams() {
-        m_redirectedCout += m_redirectedStdOut.str();
-        m_redirectedCerr += m_redirectedStdErr.str();
-    }
-
-#if defined(CATCH_CONFIG_NEW_CAPTURE)
-
-#if defined(_MSC_VER)
-    TempFile::TempFile() {
-        if (tmpnam_s(m_buffer)) {
-            CATCH_RUNTIME_ERROR("Could not get a temp filename");
-        }
-        if (fopen_s(&m_file, m_buffer, "w")) {
-            char buffer[100];
-            if (strerror_s(buffer, errno)) {
-                CATCH_RUNTIME_ERROR("Could not translate errno to a string");
-            }
-            CATCH_RUNTIME_ERROR("Could not open the temp file: '" << m_buffer << "' because: " << buffer);
-        }
-    }
-#else
-    TempFile::TempFile() {
-        m_file = std::tmpfile();
-        if (!m_file) {
-            CATCH_RUNTIME_ERROR("Could not create a temp file.");
-        }
-    }
-
-#endif
-
-    TempFile::~TempFile() {
-         // TBD: What to do about errors here?
-         std::fclose(m_file);
-         // We manually create the file on Windows only, on Linux
-         // it will be autodeleted
-#if defined(_MSC_VER)
-         std::remove(m_buffer);
-#endif
-    }
-
-    FILE* TempFile::getFile() {
-        return m_file;
-    }
-
-    std::string TempFile::getContents() {
-        std::stringstream sstr;
-        char buffer[100] = {};
-        std::rewind(m_file);
-        while (std::fgets(buffer, sizeof(buffer), m_file)) {
-            sstr << buffer;
-        }
-        return sstr.str();
-    }
-
-    OutputRedirect::OutputRedirect(std::string& stdout_dest, std::string& stderr_dest) :
-        m_originalStdout(dup(1)),
-        m_originalStderr(dup(2)),
-        m_stdoutDest(stdout_dest),
-        m_stderrDest(stderr_dest) {
-        dup2(fileno(m_stdoutFile.getFile()), 1);
-        dup2(fileno(m_stderrFile.getFile()), 2);
-    }
-
-    OutputRedirect::~OutputRedirect() {
-        Catch::cout() << std::flush;
-        fflush(stdout);
-        // Since we support overriding these streams, we flush cerr
-        // even though std::cerr is unbuffered
-        Catch::cerr() << std::flush;
-        Catch::clog() << std::flush;
-        fflush(stderr);
-
-        dup2(m_originalStdout, 1);
-        dup2(m_originalStderr, 2);
-
-        m_stdoutDest += m_stdoutFile.getContents();
-        m_stderrDest += m_stderrFile.getContents();
-    }
-
-#endif // CATCH_CONFIG_NEW_CAPTURE
-
-} // namespace Catch
-
-#if defined(CATCH_CONFIG_NEW_CAPTURE)
-    #if defined(_MSC_VER)
-    #undef dup
-    #undef dup2
-    #undef fileno
-    #endif
-#endif
-// end catch_output_redirect.cpp
-// start catch_polyfills.cpp
-
-#include <cmath>
-
-namespace Catch {
-
-#if !defined(CATCH_CONFIG_POLYFILL_ISNAN)
-    bool isnan(float f) {
-        return std::isnan(f);
-    }
-    bool isnan(double d) {
-        return std::isnan(d);
-    }
-#else
-    // For now we only use this for embarcadero
-    bool isnan(float f) {
-        return std::_isnan(f);
-    }
-    bool isnan(double d) {
-        return std::_isnan(d);
-    }
-#endif
-
-} // end namespace Catch
-// end catch_polyfills.cpp
-// start catch_random_number_generator.cpp
-
-namespace Catch {
-
-namespace {
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4146) // we negate uint32 during the rotate
-#endif
-        // Safe rotr implementation thanks to John Regehr
-        uint32_t rotate_right(uint32_t val, uint32_t count) {
-            const uint32_t mask = 31;
-            count &= mask;
-            return (val >> count) | (val << (-count & mask));
-        }
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
-
-}
-
-    SimplePcg32::SimplePcg32(result_type seed_) {
-        seed(seed_);
-    }
-
-    void SimplePcg32::seed(result_type seed_) {
-        m_state = 0;
-        (*this)();
-        m_state += seed_;
-        (*this)();
-    }
-
-    void SimplePcg32::discard(uint64_t skip) {
-        // We could implement this to run in O(log n) steps, but this
-        // should suffice for our use case.
-        for (uint64_t s = 0; s < skip; ++s) {
-            static_cast<void>((*this)());
-        }
-    }
-
-    SimplePcg32::result_type SimplePcg32::operator()() {
-        // prepare the output value
-        const uint32_t xorshifted = static_cast<uint32_t>(((m_state >> 18u) ^ m_state) >> 27u);
-        const auto output = rotate_right(xorshifted, m_state >> 59u);
-
-        // advance state
-        m_state = m_state * 6364136223846793005ULL + s_inc;
-
-        return output;
-    }
-
-    bool operator==(SimplePcg32 const& lhs, SimplePcg32 const& rhs) {
-        return lhs.m_state == rhs.m_state;
-    }
-
-    bool operator!=(SimplePcg32 const& lhs, SimplePcg32 const& rhs) {
-        return lhs.m_state != rhs.m_state;
-    }
-}
-// end catch_random_number_generator.cpp
-// start catch_registry_hub.cpp
-
-// start catch_test_case_registry_impl.h
-
-#include <vector>
-#include <set>
-#include <algorithm>
-#include <ios>
-
-namespace Catch {
-
-    class TestCase;
-    struct IConfig;
-
-    std::vector<TestCase> sortTests( IConfig const& config, std::vector<TestCase> const& unsortedTestCases );
-
-    bool isThrowSafe( TestCase const& testCase, IConfig const& config );
-    bool matchTest( TestCase const& testCase, TestSpec const& testSpec, IConfig const& config );
-
-    void enforceNoDuplicateTestCases( std::vector<TestCase> const& functions );
-
-    std::vector<TestCase> filterTests( std::vector<TestCase> const& testCases, TestSpec const& testSpec, IConfig const& config );
-    std::vector<TestCase> const& getAllTestCasesSorted( IConfig const& config );
-
-    class TestRegistry : public ITestCaseRegistry {
-    public:
-        virtual ~TestRegistry() = default;
-
-        virtual void registerTest( TestCase const& testCase );
-
-        std::vector<TestCase> const& getAllTests() const override;
-        std::vector<TestCase> const& getAllTestsSorted( IConfig const& config ) const override;
-
-    private:
-        std::vector<TestCase> m_functions;
-        mutable RunTests::InWhatOrder m_currentSortOrder = RunTests::InDeclarationOrder;
-        mutable std::vector<TestCase> m_sortedFunctions;
-        std::size_t m_unnamedCount = 0;
-        std::ios_base::Init m_ostreamInit; // Forces cout/ cerr to be initialised
-    };
-
-    ///////////////////////////////////////////////////////////////////////////
-
-    class TestInvokerAsFunction : public ITestInvoker {
-        void(*m_testAsFunction)();
-    public:
-        TestInvokerAsFunction( void(*testAsFunction)() ) noexcept;
-
-        void invoke() const override;
-    };
-
-    std::string extractClassName( StringRef const& classOrQualifiedMethodName );
-
-    ///////////////////////////////////////////////////////////////////////////
-
-} // end namespace Catch
-
-// end catch_test_case_registry_impl.h
-// start catch_reporter_registry.h
-
-#include <map>
-
-namespace Catch {
-
-    class ReporterRegistry : public IReporterRegistry {
-
-    public:
-
-        ~ReporterRegistry() override;
-
-        IStreamingReporterPtr create( std::string const& name, IConfigPtr const& config ) const override;
-
-        void registerReporter( std::string const& name, IReporterFactoryPtr const& factory );
-        void registerListener( IReporterFactoryPtr const& factory );
-
-        FactoryMap const& getFactories() const override;
-        Listeners const& getListeners() const override;
-
-    private:
-        FactoryMap m_factories;
-        Listeners m_listeners;
-    };
-}
-
-// end catch_reporter_registry.h
-// start catch_tag_alias_registry.h
-
-// start catch_tag_alias.h
-
-#include <string>
-
-namespace Catch {
-
-    struct TagAlias {
-        TagAlias(std::string const& _tag, SourceLineInfo _lineInfo);
-
-        std::string tag;
-        SourceLineInfo lineInfo;
-    };
-
-} // end namespace Catch
-
-// end catch_tag_alias.h
-#include <map>
-
-namespace Catch {
-
-    class TagAliasRegistry : public ITagAliasRegistry {
-    public:
-        ~TagAliasRegistry() override;
-        TagAlias const* find( std::string const& alias ) const override;
-        std::string expandAliases( std::string const& unexpandedTestSpec ) const override;
-        void add( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo );
-
-    private:
-        std::map<std::string, TagAlias> m_registry;
-    };
-
-} // end namespace Catch
-
-// end catch_tag_alias_registry.h
-// start catch_startup_exception_registry.h
-
-#include <vector>
-#include <exception>
-
-namespace Catch {
-
-    class StartupExceptionRegistry {
-    public:
-        void add(std::exception_ptr const& exception) noexcept;
-        std::vector<std::exception_ptr> const& getExceptions() const noexcept;
-    private:
-        std::vector<std::exception_ptr> m_exceptions;
-    };
-
-} // end namespace Catch
-
-// end catch_startup_exception_registry.h
-// start catch_singletons.hpp
-
-namespace Catch {
-
-    struct ISingleton {
-        virtual ~ISingleton();
-    };
-
-    void addSingleton( ISingleton* singleton );
-    void cleanupSingletons();
-
-    template<typename SingletonImplT, typename InterfaceT = SingletonImplT, typename MutableInterfaceT = InterfaceT>
-    class Singleton : SingletonImplT, public ISingleton {
-
-        static auto getInternal() -> Singleton* {
-            static Singleton* s_instance = nullptr;
-            if( !s_instance ) {
-                s_instance = new Singleton;
-                addSingleton( s_instance );
-            }
-            return s_instance;
-        }
-
-    public:
-        static auto get() -> InterfaceT const& {
-            return *getInternal();
-        }
-        static auto getMutable() -> MutableInterfaceT& {
-            return *getInternal();
-        }
-    };
-
-} // namespace Catch
-
-// end catch_singletons.hpp
-namespace Catch {
-
-    namespace {
-
-        class RegistryHub : public IRegistryHub, public IMutableRegistryHub,
-                            private NonCopyable {
-
-        public: // IRegistryHub
-            RegistryHub() = default;
-            IReporterRegistry const& getReporterRegistry() const override {
-                return m_reporterRegistry;
-            }
-            ITestCaseRegistry const& getTestCaseRegistry() const override {
-                return m_testCaseRegistry;
-            }
-            IExceptionTranslatorRegistry const& getExceptionTranslatorRegistry() const override {
-                return m_exceptionTranslatorRegistry;
-            }
-            ITagAliasRegistry const& getTagAliasRegistry() const override {
-                return m_tagAliasRegistry;
-            }
-            StartupExceptionRegistry const& getStartupExceptionRegistry() const override {
-                return m_exceptionRegistry;
-            }
-
-        public: // IMutableRegistryHub
-            void registerReporter( std::string const& name, IReporterFactoryPtr const& factory ) override {
-                m_reporterRegistry.registerReporter( name, factory );
-            }
-            void registerListener( IReporterFactoryPtr const& factory ) override {
-                m_reporterRegistry.registerListener( factory );
-            }
-            void registerTest( TestCase const& testInfo ) override {
-                m_testCaseRegistry.registerTest( testInfo );
-            }
-            void registerTranslator( const IExceptionTranslator* translator ) override {
-                m_exceptionTranslatorRegistry.registerTranslator( translator );
-            }
-            void registerTagAlias( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ) override {
-                m_tagAliasRegistry.add( alias, tag, lineInfo );
-            }
-            void registerStartupException() noexcept override {
-                m_exceptionRegistry.add(std::current_exception());
-            }
-            IMutableEnumValuesRegistry& getMutableEnumValuesRegistry() override {
-                return m_enumValuesRegistry;
-            }
-
-        private:
-            TestRegistry m_testCaseRegistry;
-            ReporterRegistry m_reporterRegistry;
-            ExceptionTranslatorRegistry m_exceptionTranslatorRegistry;
-            TagAliasRegistry m_tagAliasRegistry;
-            StartupExceptionRegistry m_exceptionRegistry;
-            Detail::EnumValuesRegistry m_enumValuesRegistry;
-        };
-    }
-
-    using RegistryHubSingleton = Singleton<RegistryHub, IRegistryHub, IMutableRegistryHub>;
-
-    IRegistryHub const& getRegistryHub() {
-        return RegistryHubSingleton::get();
-    }
-    IMutableRegistryHub& getMutableRegistryHub() {
-        return RegistryHubSingleton::getMutable();
-    }
-    void cleanUp() {
-        cleanupSingletons();
-        cleanUpContext();
-    }
-    std::string translateActiveException() {
-        return getRegistryHub().getExceptionTranslatorRegistry().translateActiveException();
-    }
-
-} // end namespace Catch
-// end catch_registry_hub.cpp
-// start catch_reporter_registry.cpp
-
-namespace Catch {
-
-    ReporterRegistry::~ReporterRegistry() = default;
-
-    IStreamingReporterPtr ReporterRegistry::create( std::string const& name, IConfigPtr const& config ) const {
-        auto it =  m_factories.find( name );
-        if( it == m_factories.end() )
-            return nullptr;
-        return it->second->create( ReporterConfig( config ) );
-    }
-
-    void ReporterRegistry::registerReporter( std::string const& name, IReporterFactoryPtr const& factory ) {
-        m_factories.emplace(name, factory);
-    }
-    void ReporterRegistry::registerListener( IReporterFactoryPtr const& factory ) {
-        m_listeners.push_back( factory );
-    }
-
-    IReporterRegistry::FactoryMap const& ReporterRegistry::getFactories() const {
-        return m_factories;
-    }
-    IReporterRegistry::Listeners const& ReporterRegistry::getListeners() const {
-        return m_listeners;
-    }
-
-}
-// end catch_reporter_registry.cpp
-// start catch_result_type.cpp
-
-namespace Catch {
-
-    bool isOk( ResultWas::OfType resultType ) {
-        return ( resultType & ResultWas::FailureBit ) == 0;
-    }
-    bool isJustInfo( int flags ) {
-        return flags == ResultWas::Info;
-    }
-
-    ResultDisposition::Flags operator | ( ResultDisposition::Flags lhs, ResultDisposition::Flags rhs ) {
-        return static_cast<ResultDisposition::Flags>( static_cast<int>( lhs ) | static_cast<int>( rhs ) );
-    }
-
-    bool shouldContinueOnFailure( int flags )    { return ( flags & ResultDisposition::ContinueOnFailure ) != 0; }
-    bool shouldSuppressFailure( int flags )      { return ( flags & ResultDisposition::SuppressFail ) != 0; }
-
-} // end namespace Catch
-// end catch_result_type.cpp
-// start catch_run_context.cpp
-
-#include <cassert>
-#include <algorithm>
-#include <sstream>
-
-namespace Catch {
-
-    namespace Generators {
-        struct GeneratorTracker : TestCaseTracking::TrackerBase, IGeneratorTracker {
-            GeneratorBasePtr m_generator;
-
-            GeneratorTracker( TestCaseTracking::NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent )
-            :   TrackerBase( nameAndLocation, ctx, parent )
-            {}
-            ~GeneratorTracker();
-
-            static GeneratorTracker& acquire( TrackerContext& ctx, TestCaseTracking::NameAndLocation const& nameAndLocation ) {
-                std::shared_ptr<GeneratorTracker> tracker;
-
-                ITracker& currentTracker = ctx.currentTracker();
-                if( TestCaseTracking::ITrackerPtr childTracker = currentTracker.findChild( nameAndLocation ) ) {
-                    assert( childTracker );
-                    assert( childTracker->isGeneratorTracker() );
-                    tracker = std::static_pointer_cast<GeneratorTracker>( childTracker );
-                }
-                else {
-                    tracker = std::make_shared<GeneratorTracker>( nameAndLocation, ctx, &currentTracker );
-                    currentTracker.addChild( tracker );
-                }
-
-                if( !ctx.completedCycle() && !tracker->isComplete() ) {
-                    tracker->open();
-                }
-
-                return *tracker;
-            }
-
-            // TrackerBase interface
-            bool isGeneratorTracker() const override { return true; }
-            auto hasGenerator() const -> bool override {
-                return !!m_generator;
-            }
-            void close() override {
-                TrackerBase::close();
-                // Generator interface only finds out if it has another item on atual move
-                if (m_runState == CompletedSuccessfully && m_generator->next()) {
-                    m_children.clear();
-                    m_runState = Executing;
-                }
-            }
-
-            // IGeneratorTracker interface
-            auto getGenerator() const -> GeneratorBasePtr const& override {
-                return m_generator;
-            }
-            void setGenerator( GeneratorBasePtr&& generator ) override {
-                m_generator = std::move( generator );
-            }
-        };
-        GeneratorTracker::~GeneratorTracker() {}
-    }
-
-    RunContext::RunContext(IConfigPtr const& _config, IStreamingReporterPtr&& reporter)
-    :   m_runInfo(_config->name()),
-        m_context(getCurrentMutableContext()),
-        m_config(_config),
-        m_reporter(std::move(reporter)),
-        m_lastAssertionInfo{ StringRef(), SourceLineInfo("",0), StringRef(), ResultDisposition::Normal },
-        m_includeSuccessfulResults( m_config->includeSuccessfulResults() || m_reporter->getPreferences().shouldReportAllAssertions )
-    {
-        m_context.setRunner(this);
-        m_context.setConfig(m_config);
-        m_context.setResultCapture(this);
-        m_reporter->testRunStarting(m_runInfo);
-    }
-
-    RunContext::~RunContext() {
-        m_reporter->testRunEnded(TestRunStats(m_runInfo, m_totals, aborting()));
-    }
-
-    void RunContext::testGroupStarting(std::string const& testSpec, std::size_t groupIndex, std::size_t groupsCount) {
-        m_reporter->testGroupStarting(GroupInfo(testSpec, groupIndex, groupsCount));
-    }
-
-    void RunContext::testGroupEnded(std::string const& testSpec, Totals const& totals, std::size_t groupIndex, std::size_t groupsCount) {
-        m_reporter->testGroupEnded(TestGroupStats(GroupInfo(testSpec, groupIndex, groupsCount), totals, aborting()));
-    }
-
-    Totals RunContext::runTest(TestCase const& testCase) {
-        Totals prevTotals = m_totals;
-
-        std::string redirectedCout;
-        std::string redirectedCerr;
-
-        auto const& testInfo = testCase.getTestCaseInfo();
-
-        m_reporter->testCaseStarting(testInfo);
-
-        m_activeTestCase = &testCase;
-
-        ITracker& rootTracker = m_trackerContext.startRun();
-        assert(rootTracker.isSectionTracker());
-        static_cast<SectionTracker&>(rootTracker).addInitialFilters(m_config->getSectionsToRun());
-        do {
-            m_trackerContext.startCycle();
-            m_testCaseTracker = &SectionTracker::acquire(m_trackerContext, TestCaseTracking::NameAndLocation(testInfo.name, testInfo.lineInfo));
-            runCurrentTest(redirectedCout, redirectedCerr);
-        } while (!m_testCaseTracker->isSuccessfullyCompleted() && !aborting());
-
-        Totals deltaTotals = m_totals.delta(prevTotals);
-        if (testInfo.expectedToFail() && deltaTotals.testCases.passed > 0) {
-            deltaTotals.assertions.failed++;
-            deltaTotals.testCases.passed--;
-            deltaTotals.testCases.failed++;
-        }
-        m_totals.testCases += deltaTotals.testCases;
-        m_reporter->testCaseEnded(TestCaseStats(testInfo,
-                                  deltaTotals,
-                                  redirectedCout,
-                                  redirectedCerr,
-                                  aborting()));
-
-        m_activeTestCase = nullptr;
-        m_testCaseTracker = nullptr;
-
-        return deltaTotals;
-    }
-
-    IConfigPtr RunContext::config() const {
-        return m_config;
-    }
-
-    IStreamingReporter& RunContext::reporter() const {
-        return *m_reporter;
-    }
-
-    void RunContext::assertionEnded(AssertionResult const & result) {
-        if (result.getResultType() == ResultWas::Ok) {
-            m_totals.assertions.passed++;
-            m_lastAssertionPassed = true;
-        } else if (!result.isOk()) {
-            m_lastAssertionPassed = false;
-            if( m_activeTestCase->getTestCaseInfo().okToFail() )
-                m_totals.assertions.failedButOk++;
-            else
-                m_totals.assertions.failed++;
-        }
-        else {
-            m_lastAssertionPassed = true;
-        }
-
-        // We have no use for the return value (whether messages should be cleared), because messages were made scoped
-        // and should be let to clear themselves out.
-        static_cast<void>(m_reporter->assertionEnded(AssertionStats(result, m_messages, m_totals)));
-
-        if (result.getResultType() != ResultWas::Warning)
-            m_messageScopes.clear();
-
-        // Reset working state
-        resetAssertionInfo();
-        m_lastResult = result;
-    }
-    void RunContext::resetAssertionInfo() {
-        m_lastAssertionInfo.macroName = StringRef();
-        m_lastAssertionInfo.capturedExpression = "{Unknown expression after the reported line}"_sr;
-    }
-
-    bool RunContext::sectionStarted(SectionInfo const & sectionInfo, Counts & assertions) {
-        ITracker& sectionTracker = SectionTracker::acquire(m_trackerContext, TestCaseTracking::NameAndLocation(sectionInfo.name, sectionInfo.lineInfo));
-        if (!sectionTracker.isOpen())
-            return false;
-        m_activeSections.push_back(&sectionTracker);
-
-        m_lastAssertionInfo.lineInfo = sectionInfo.lineInfo;
-
-        m_reporter->sectionStarting(sectionInfo);
-
-        assertions = m_totals.assertions;
-
-        return true;
-    }
-    auto RunContext::acquireGeneratorTracker( SourceLineInfo const& lineInfo ) -> IGeneratorTracker& {
-        using namespace Generators;
-        GeneratorTracker& tracker = GeneratorTracker::acquire( m_trackerContext, TestCaseTracking::NameAndLocation( "generator", lineInfo ) );
-        assert( tracker.isOpen() );
-        m_lastAssertionInfo.lineInfo = lineInfo;
-        return tracker;
-    }
-
-    bool RunContext::testForMissingAssertions(Counts& assertions) {
-        if (assertions.total() != 0)
-            return false;
-        if (!m_config->warnAboutMissingAssertions())
-            return false;
-        if (m_trackerContext.currentTracker().hasChildren())
-            return false;
-        m_totals.assertions.failed++;
-        assertions.failed++;
-        return true;
-    }
-
-    void RunContext::sectionEnded(SectionEndInfo const & endInfo) {
-        Counts assertions = m_totals.assertions - endInfo.prevAssertions;
-        bool missingAssertions = testForMissingAssertions(assertions);
-
-        if (!m_activeSections.empty()) {
-            m_activeSections.back()->close();
-            m_activeSections.pop_back();
-        }
-
-        m_reporter->sectionEnded(SectionStats(endInfo.sectionInfo, assertions, endInfo.durationInSeconds, missingAssertions));
-        m_messages.clear();
-        m_messageScopes.clear();
-    }
-
-    void RunContext::sectionEndedEarly(SectionEndInfo const & endInfo) {
-        if (m_unfinishedSections.empty())
-            m_activeSections.back()->fail();
-        else
-            m_activeSections.back()->close();
-        m_activeSections.pop_back();
-
-        m_unfinishedSections.push_back(endInfo);
-    }
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-    void RunContext::benchmarkPreparing(std::string const& name) {
-		m_reporter->benchmarkPreparing(name);
-	}
-    void RunContext::benchmarkStarting( BenchmarkInfo const& info ) {
-        m_reporter->benchmarkStarting( info );
-    }
-    void RunContext::benchmarkEnded( BenchmarkStats<> const& stats ) {
-        m_reporter->benchmarkEnded( stats );
-    }
-	void RunContext::benchmarkFailed(std::string const & error) {
-		m_reporter->benchmarkFailed(error);
-	}
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-    void RunContext::pushScopedMessage(MessageInfo const & message) {
-        m_messages.push_back(message);
-    }
-
-    void RunContext::popScopedMessage(MessageInfo const & message) {
-        m_messages.erase(std::remove(m_messages.begin(), m_messages.end(), message), m_messages.end());
-    }
-
-    void RunContext::emplaceUnscopedMessage( MessageBuilder const& builder ) {
-        m_messageScopes.emplace_back( builder );
-    }
-
-    std::string RunContext::getCurrentTestName() const {
-        return m_activeTestCase
-            ? m_activeTestCase->getTestCaseInfo().name
-            : std::string();
-    }
-
-    const AssertionResult * RunContext::getLastResult() const {
-        return &(*m_lastResult);
-    }
-
-    void RunContext::exceptionEarlyReported() {
-        m_shouldReportUnexpected = false;
-    }
-
-    void RunContext::handleFatalErrorCondition( StringRef message ) {
-        // First notify reporter that bad things happened
-        m_reporter->fatalErrorEncountered(message);
-
-        // Don't rebuild the result -- the stringification itself can cause more fatal errors
-        // Instead, fake a result data.
-        AssertionResultData tempResult( ResultWas::FatalErrorCondition, { false } );
-        tempResult.message = static_cast<std::string>(message);
-        AssertionResult result(m_lastAssertionInfo, tempResult);
-
-        assertionEnded(result);
-
-        handleUnfinishedSections();
-
-        // Recreate section for test case (as we will lose the one that was in scope)
-        auto const& testCaseInfo = m_activeTestCase->getTestCaseInfo();
-        SectionInfo testCaseSection(testCaseInfo.lineInfo, testCaseInfo.name);
-
-        Counts assertions;
-        assertions.failed = 1;
-        SectionStats testCaseSectionStats(testCaseSection, assertions, 0, false);
-        m_reporter->sectionEnded(testCaseSectionStats);
-
-        auto const& testInfo = m_activeTestCase->getTestCaseInfo();
-
-        Totals deltaTotals;
-        deltaTotals.testCases.failed = 1;
-        deltaTotals.assertions.failed = 1;
-        m_reporter->testCaseEnded(TestCaseStats(testInfo,
-                                  deltaTotals,
-                                  std::string(),
-                                  std::string(),
-                                  false));
-        m_totals.testCases.failed++;
-        testGroupEnded(std::string(), m_totals, 1, 1);
-        m_reporter->testRunEnded(TestRunStats(m_runInfo, m_totals, false));
-    }
-
-    bool RunContext::lastAssertionPassed() {
-         return m_lastAssertionPassed;
-    }
-
-    void RunContext::assertionPassed() {
-        m_lastAssertionPassed = true;
-        ++m_totals.assertions.passed;
-        resetAssertionInfo();
-        m_messageScopes.clear();
-    }
-
-    bool RunContext::aborting() const {
-        return m_totals.assertions.failed >= static_cast<std::size_t>(m_config->abortAfter());
-    }
-
-    void RunContext::runCurrentTest(std::string & redirectedCout, std::string & redirectedCerr) {
-        auto const& testCaseInfo = m_activeTestCase->getTestCaseInfo();
-        SectionInfo testCaseSection(testCaseInfo.lineInfo, testCaseInfo.name);
-        m_reporter->sectionStarting(testCaseSection);
-        Counts prevAssertions = m_totals.assertions;
-        double duration = 0;
-        m_shouldReportUnexpected = true;
-        m_lastAssertionInfo = { "TEST_CASE"_sr, testCaseInfo.lineInfo, StringRef(), ResultDisposition::Normal };
-
-        seedRng(*m_config);
-
-        Timer timer;
-        CATCH_TRY {
-            if (m_reporter->getPreferences().shouldRedirectStdOut) {
-#if !defined(CATCH_CONFIG_EXPERIMENTAL_REDIRECT)
-                RedirectedStreams redirectedStreams(redirectedCout, redirectedCerr);
-
-                timer.start();
-                invokeActiveTestCase();
-#else
-                OutputRedirect r(redirectedCout, redirectedCerr);
-                timer.start();
-                invokeActiveTestCase();
-#endif
-            } else {
-                timer.start();
-                invokeActiveTestCase();
-            }
-            duration = timer.getElapsedSeconds();
-        } CATCH_CATCH_ANON (TestFailureException&) {
-            // This just means the test was aborted due to failure
-        } CATCH_CATCH_ALL {
-            // Under CATCH_CONFIG_FAST_COMPILE, unexpected exceptions under REQUIRE assertions
-            // are reported without translation at the point of origin.
-            if( m_shouldReportUnexpected ) {
-                AssertionReaction dummyReaction;
-                handleUnexpectedInflightException( m_lastAssertionInfo, translateActiveException(), dummyReaction );
-            }
-        }
-        Counts assertions = m_totals.assertions - prevAssertions;
-        bool missingAssertions = testForMissingAssertions(assertions);
-
-        m_testCaseTracker->close();
-        handleUnfinishedSections();
-        m_messages.clear();
-        m_messageScopes.clear();
-
-        SectionStats testCaseSectionStats(testCaseSection, assertions, duration, missingAssertions);
-        m_reporter->sectionEnded(testCaseSectionStats);
-    }
-
-    void RunContext::invokeActiveTestCase() {
-        FatalConditionHandler fatalConditionHandler; // Handle signals
-        m_activeTestCase->invoke();
-        fatalConditionHandler.reset();
-    }
-
-    void RunContext::handleUnfinishedSections() {
-        // If sections ended prematurely due to an exception we stored their
-        // infos here so we can tear them down outside the unwind process.
-        for (auto it = m_unfinishedSections.rbegin(),
-             itEnd = m_unfinishedSections.rend();
-             it != itEnd;
-             ++it)
-            sectionEnded(*it);
-        m_unfinishedSections.clear();
-    }
-
-    void RunContext::handleExpr(
-        AssertionInfo const& info,
-        ITransientExpression const& expr,
-        AssertionReaction& reaction
-    ) {
-        m_reporter->assertionStarting( info );
-
-        bool negated = isFalseTest( info.resultDisposition );
-        bool result = expr.getResult() != negated;
-
-        if( result ) {
-            if (!m_includeSuccessfulResults) {
-                assertionPassed();
-            }
-            else {
-                reportExpr(info, ResultWas::Ok, &expr, negated);
-            }
-        }
-        else {
-            reportExpr(info, ResultWas::ExpressionFailed, &expr, negated );
-            populateReaction( reaction );
-        }
-    }
-    void RunContext::reportExpr(
-            AssertionInfo const &info,
-            ResultWas::OfType resultType,
-            ITransientExpression const *expr,
-            bool negated ) {
-
-        m_lastAssertionInfo = info;
-        AssertionResultData data( resultType, LazyExpression( negated ) );
-
-        AssertionResult assertionResult{ info, data };
-        assertionResult.m_resultData.lazyExpression.m_transientExpression = expr;
-
-        assertionEnded( assertionResult );
-    }
-
-    void RunContext::handleMessage(
-            AssertionInfo const& info,
-            ResultWas::OfType resultType,
-            StringRef const& message,
-            AssertionReaction& reaction
-    ) {
-        m_reporter->assertionStarting( info );
-
-        m_lastAssertionInfo = info;
-
-        AssertionResultData data( resultType, LazyExpression( false ) );
-        data.message = static_cast<std::string>(message);
-        AssertionResult assertionResult{ m_lastAssertionInfo, data };
-        assertionEnded( assertionResult );
-        if( !assertionResult.isOk() )
-            populateReaction( reaction );
-    }
-    void RunContext::handleUnexpectedExceptionNotThrown(
-            AssertionInfo const& info,
-            AssertionReaction& reaction
-    ) {
-        handleNonExpr(info, Catch::ResultWas::DidntThrowException, reaction);
-    }
-
-    void RunContext::handleUnexpectedInflightException(
-            AssertionInfo const& info,
-            std::string const& message,
-            AssertionReaction& reaction
-    ) {
-        m_lastAssertionInfo = info;
-
-        AssertionResultData data( ResultWas::ThrewException, LazyExpression( false ) );
-        data.message = message;
-        AssertionResult assertionResult{ info, data };
-        assertionEnded( assertionResult );
-        populateReaction( reaction );
-    }
-
-    void RunContext::populateReaction( AssertionReaction& reaction ) {
-        reaction.shouldDebugBreak = m_config->shouldDebugBreak();
-        reaction.shouldThrow = aborting() || (m_lastAssertionInfo.resultDisposition & ResultDisposition::Normal);
-    }
-
-    void RunContext::handleIncomplete(
-            AssertionInfo const& info
-    ) {
-        m_lastAssertionInfo = info;
-
-        AssertionResultData data( ResultWas::ThrewException, LazyExpression( false ) );
-        data.message = "Exception translation was disabled by CATCH_CONFIG_FAST_COMPILE";
-        AssertionResult assertionResult{ info, data };
-        assertionEnded( assertionResult );
-    }
-    void RunContext::handleNonExpr(
-            AssertionInfo const &info,
-            ResultWas::OfType resultType,
-            AssertionReaction &reaction
-    ) {
-        m_lastAssertionInfo = info;
-
-        AssertionResultData data( resultType, LazyExpression( false ) );
-        AssertionResult assertionResult{ info, data };
-        assertionEnded( assertionResult );
-
-        if( !assertionResult.isOk() )
-            populateReaction( reaction );
-    }
-
-    IResultCapture& getResultCapture() {
-        if (auto* capture = getCurrentContext().getResultCapture())
-            return *capture;
-        else
-            CATCH_INTERNAL_ERROR("No result capture instance");
-    }
-
-    void seedRng(IConfig const& config) {
-        if (config.rngSeed() != 0) {
-            std::srand(config.rngSeed());
-            rng().seed(config.rngSeed());
-        }
-    }
-
-    unsigned int rngSeed() {
-        return getCurrentContext().getConfig()->rngSeed();
-    }
-
-}
-// end catch_run_context.cpp
-// start catch_section.cpp
-
-namespace Catch {
-
-    Section::Section( SectionInfo const& info )
-    :   m_info( info ),
-        m_sectionIncluded( getResultCapture().sectionStarted( m_info, m_assertions ) )
-    {
-        m_timer.start();
-    }
-
-    Section::~Section() {
-        if( m_sectionIncluded ) {
-            SectionEndInfo endInfo{ m_info, m_assertions, m_timer.getElapsedSeconds() };
-            if( uncaught_exceptions() )
-                getResultCapture().sectionEndedEarly( endInfo );
-            else
-                getResultCapture().sectionEnded( endInfo );
-        }
-    }
-
-    // This indicates whether the section should be executed or not
-    Section::operator bool() const {
-        return m_sectionIncluded;
-    }
-
-} // end namespace Catch
-// end catch_section.cpp
-// start catch_section_info.cpp
-
-namespace Catch {
-
-    SectionInfo::SectionInfo
-        (   SourceLineInfo const& _lineInfo,
-            std::string const& _name )
-    :   name( _name ),
-        lineInfo( _lineInfo )
-    {}
-
-} // end namespace Catch
-// end catch_section_info.cpp
-// start catch_session.cpp
-
-// start catch_session.h
-
-#include <memory>
-
-namespace Catch {
-
-    class Session : NonCopyable {
-    public:
-
-        Session();
-        ~Session() override;
-
-        void showHelp() const;
-        void libIdentify();
-
-        int applyCommandLine( int argc, char const * const * argv );
-    #if defined(CATCH_CONFIG_WCHAR) && defined(_WIN32) && defined(UNICODE)
-        int applyCommandLine( int argc, wchar_t const * const * argv );
-    #endif
-
-        void useConfigData( ConfigData const& configData );
-
-        template<typename CharT>
-        int run(int argc, CharT const * const argv[]) {
-            if (m_startupExceptions)
-                return 1;
-            int returnCode = applyCommandLine(argc, argv);
-            if (returnCode == 0)
-                returnCode = run();
-            return returnCode;
-        }
-
-        int run();
-
-        clara::Parser const& cli() const;
-        void cli( clara::Parser const& newParser );
-        ConfigData& configData();
-        Config& config();
-    private:
-        int runInternal();
-
-        clara::Parser m_cli;
-        ConfigData m_configData;
-        std::shared_ptr<Config> m_config;
-        bool m_startupExceptions = false;
-    };
-
-} // end namespace Catch
-
-// end catch_session.h
-// start catch_version.h
-
-#include <iosfwd>
-
-namespace Catch {
-
-    // Versioning information
-    struct Version {
-        Version( Version const& ) = delete;
-        Version& operator=( Version const& ) = delete;
-        Version(    unsigned int _majorVersion,
-                    unsigned int _minorVersion,
-                    unsigned int _patchNumber,
-                    char const * const _branchName,
-                    unsigned int _buildNumber );
-
-        unsigned int const majorVersion;
-        unsigned int const minorVersion;
-        unsigned int const patchNumber;
-
-        // buildNumber is only used if branchName is not null
-        char const * const branchName;
-        unsigned int const buildNumber;
-
-        friend std::ostream& operator << ( std::ostream& os, Version const& version );
-    };
-
-    Version const& libraryVersion();
-}
-
-// end catch_version.h
-#include <cstdlib>
-#include <iomanip>
-#include <set>
-#include <iterator>
-
-namespace Catch {
-
-    namespace {
-        const int MaxExitCode = 255;
-
-        IStreamingReporterPtr createReporter(std::string const& reporterName, IConfigPtr const& config) {
-            auto reporter = Catch::getRegistryHub().getReporterRegistry().create(reporterName, config);
-            CATCH_ENFORCE(reporter, "No reporter registered with name: '" << reporterName << "'");
-
-            return reporter;
-        }
-
-        IStreamingReporterPtr makeReporter(std::shared_ptr<Config> const& config) {
-            if (Catch::getRegistryHub().getReporterRegistry().getListeners().empty()) {
-                return createReporter(config->getReporterName(), config);
-            }
-
-            // On older platforms, returning std::unique_ptr<ListeningReporter>
-            // when the return type is std::unique_ptr<IStreamingReporter>
-            // doesn't compile without a std::move call. However, this causes
-            // a warning on newer platforms. Thus, we have to work around
-            // it a bit and downcast the pointer manually.
-            auto ret = std::unique_ptr<IStreamingReporter>(new ListeningReporter);
-            auto& multi = static_cast<ListeningReporter&>(*ret);
-            auto const& listeners = Catch::getRegistryHub().getReporterRegistry().getListeners();
-            for (auto const& listener : listeners) {
-                multi.addListener(listener->create(Catch::ReporterConfig(config)));
-            }
-            multi.addReporter(createReporter(config->getReporterName(), config));
-            return ret;
-        }
-
-        class TestGroup {
-        public:
-            explicit TestGroup(std::shared_ptr<Config> const& config)
-            : m_config{config}
-            , m_context{config, makeReporter(config)}
-            {
-                auto const& allTestCases = getAllTestCasesSorted(*m_config);
-                m_matches = m_config->testSpec().matchesByFilter(allTestCases, *m_config);
-                auto const& invalidArgs = m_config->testSpec().getInvalidArgs();
-
-                if (m_matches.empty() && invalidArgs.empty()) {
-                    for (auto const& test : allTestCases)
-                        if (!test.isHidden())
-                            m_tests.emplace(&test);
-                } else {
-                    for (auto const& match : m_matches)
-                        m_tests.insert(match.tests.begin(), match.tests.end());
-                }
-            }
-
-            Totals execute() {
-                auto const& invalidArgs = m_config->testSpec().getInvalidArgs();
-                Totals totals;
-                m_context.testGroupStarting(m_config->name(), 1, 1);
-                for (auto const& testCase : m_tests) {
-                    if (!m_context.aborting())
-                        totals += m_context.runTest(*testCase);
-                    else
-                        m_context.reporter().skipTest(*testCase);
-                }
-
-                for (auto const& match : m_matches) {
-                    if (match.tests.empty()) {
-                        m_context.reporter().noMatchingTestCases(match.name);
-                        totals.error = -1;
-                    }
-                }
-
-                if (!invalidArgs.empty()) {
-                    for (auto const& invalidArg: invalidArgs)
-                         m_context.reporter().reportInvalidArguments(invalidArg);
-                }
-
-                m_context.testGroupEnded(m_config->name(), totals, 1, 1);
-                return totals;
-            }
-
-        private:
-            using Tests = std::set<TestCase const*>;
-
-            std::shared_ptr<Config> m_config;
-            RunContext m_context;
-            Tests m_tests;
-            TestSpec::Matches m_matches;
-        };
-
-        void applyFilenamesAsTags(Catch::IConfig const& config) {
-            auto& tests = const_cast<std::vector<TestCase>&>(getAllTestCasesSorted(config));
-            for (auto& testCase : tests) {
-                auto tags = testCase.tags;
-
-                std::string filename = testCase.lineInfo.file;
-                auto lastSlash = filename.find_last_of("\\/");
-                if (lastSlash != std::string::npos) {
-                    filename.erase(0, lastSlash);
-                    filename[0] = '#';
-                }
-
-                auto lastDot = filename.find_last_of('.');
-                if (lastDot != std::string::npos) {
-                    filename.erase(lastDot);
-                }
-
-                tags.push_back(std::move(filename));
-                setTags(testCase, tags);
-            }
-        }
-
-    } // anon namespace
-
-    Session::Session() {
-        static bool alreadyInstantiated = false;
-        if( alreadyInstantiated ) {
-            CATCH_TRY { CATCH_INTERNAL_ERROR( "Only one instance of Catch::Session can ever be used" ); }
-            CATCH_CATCH_ALL { getMutableRegistryHub().registerStartupException(); }
-        }
-
-        // There cannot be exceptions at startup in no-exception mode.
-#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-        const auto& exceptions = getRegistryHub().getStartupExceptionRegistry().getExceptions();
-        if ( !exceptions.empty() ) {
-            config();
-            getCurrentMutableContext().setConfig(m_config);
-
-            m_startupExceptions = true;
-            Colour colourGuard( Colour::Red );
-            Catch::cerr() << "Errors occurred during startup!" << '\n';
-            // iterate over all exceptions and notify user
-            for ( const auto& ex_ptr : exceptions ) {
-                try {
-                    std::rethrow_exception(ex_ptr);
-                } catch ( std::exception const& ex ) {
-                    Catch::cerr() << Column( ex.what() ).indent(2) << '\n';
-                }
-            }
-        }
-#endif
-
-        alreadyInstantiated = true;
-        m_cli = makeCommandLineParser( m_configData );
-    }
-    Session::~Session() {
-        Catch::cleanUp();
-    }
-
-    void Session::showHelp() const {
-        Catch::cout()
-                << "\nCatch v" << libraryVersion() << "\n"
-                << m_cli << std::endl
-                << "For more detailed usage please see the project docs\n" << std::endl;
-    }
-    void Session::libIdentify() {
-        Catch::cout()
-                << std::left << std::setw(16) << "description: " << "A Catch2 test executable\n"
-                << std::left << std::setw(16) << "category: " << "testframework\n"
-                << std::left << std::setw(16) << "framework: " << "Catch Test\n"
-                << std::left << std::setw(16) << "version: " << libraryVersion() << std::endl;
-    }
-
-    int Session::applyCommandLine( int argc, char const * const * argv ) {
-        if( m_startupExceptions )
-            return 1;
-
-        auto result = m_cli.parse( clara::Args( argc, argv ) );
-        if( !result ) {
-            config();
-            getCurrentMutableContext().setConfig(m_config);
-            Catch::cerr()
-                << Colour( Colour::Red )
-                << "\nError(s) in input:\n"
-                << Column( result.errorMessage() ).indent( 2 )
-                << "\n\n";
-            Catch::cerr() << "Run with -? for usage\n" << std::endl;
-            return MaxExitCode;
-        }
-
-        if( m_configData.showHelp )
-            showHelp();
-        if( m_configData.libIdentify )
-            libIdentify();
-        m_config.reset();
-        return 0;
-    }
-
-#if defined(CATCH_CONFIG_WCHAR) && defined(_WIN32) && defined(UNICODE)
-    int Session::applyCommandLine( int argc, wchar_t const * const * argv ) {
-
-        char **utf8Argv = new char *[ argc ];
-
-        for ( int i = 0; i < argc; ++i ) {
-            int bufSize = WideCharToMultiByte( CP_UTF8, 0, argv[i], -1, nullptr, 0, nullptr, nullptr );
-
-            utf8Argv[ i ] = new char[ bufSize ];
-
-            WideCharToMultiByte( CP_UTF8, 0, argv[i], -1, utf8Argv[i], bufSize, nullptr, nullptr );
-        }
-
-        int returnCode = applyCommandLine( argc, utf8Argv );
-
-        for ( int i = 0; i < argc; ++i )
-            delete [] utf8Argv[ i ];
-
-        delete [] utf8Argv;
-
-        return returnCode;
-    }
-#endif
-
-    void Session::useConfigData( ConfigData const& configData ) {
-        m_configData = configData;
-        m_config.reset();
-    }
-
-    int Session::run() {
-        if( ( m_configData.waitForKeypress & WaitForKeypress::BeforeStart ) != 0 ) {
-            Catch::cout() << "...waiting for enter/ return before starting" << std::endl;
-            static_cast<void>(std::getchar());
-        }
-        int exitCode = runInternal();
-        if( ( m_configData.waitForKeypress & WaitForKeypress::BeforeExit ) != 0 ) {
-            Catch::cout() << "...waiting for enter/ return before exiting, with code: " << exitCode << std::endl;
-            static_cast<void>(std::getchar());
-        }
-        return exitCode;
-    }
-
-    clara::Parser const& Session::cli() const {
-        return m_cli;
-    }
-    void Session::cli( clara::Parser const& newParser ) {
-        m_cli = newParser;
-    }
-    ConfigData& Session::configData() {
-        return m_configData;
-    }
-    Config& Session::config() {
-        if( !m_config )
-            m_config = std::make_shared<Config>( m_configData );
-        return *m_config;
-    }
-
-    int Session::runInternal() {
-        if( m_startupExceptions )
-            return 1;
-
-        if (m_configData.showHelp || m_configData.libIdentify) {
-            return 0;
-        }
-
-        CATCH_TRY {
-            config(); // Force config to be constructed
-
-            seedRng( *m_config );
-
-            if( m_configData.filenamesAsTags )
-                applyFilenamesAsTags( *m_config );
-
-            // Handle list request
-            if( Option<std::size_t> listed = list( m_config ) )
-                return static_cast<int>( *listed );
-
-            TestGroup tests { m_config };
-            auto const totals = tests.execute();
-
-            if( m_config->warnAboutNoTests() && totals.error == -1 )
-                return 2;
-
-            // Note that on unices only the lower 8 bits are usually used, clamping
-            // the return value to 255 prevents false negative when some multiple
-            // of 256 tests has failed
-            return (std::min) (MaxExitCode, (std::max) (totals.error, static_cast<int>(totals.assertions.failed)));
-        }
-#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-        catch( std::exception& ex ) {
-            Catch::cerr() << ex.what() << std::endl;
-            return MaxExitCode;
-        }
-#endif
-    }
-
-} // end namespace Catch
-// end catch_session.cpp
-// start catch_singletons.cpp
-
-#include <vector>
-
-namespace Catch {
-
-    namespace {
-        static auto getSingletons() -> std::vector<ISingleton*>*& {
-            static std::vector<ISingleton*>* g_singletons = nullptr;
-            if( !g_singletons )
-                g_singletons = new std::vector<ISingleton*>();
-            return g_singletons;
-        }
-    }
-
-    ISingleton::~ISingleton() {}
-
-    void addSingleton(ISingleton* singleton ) {
-        getSingletons()->push_back( singleton );
-    }
-    void cleanupSingletons() {
-        auto& singletons = getSingletons();
-        for( auto singleton : *singletons )
-            delete singleton;
-        delete singletons;
-        singletons = nullptr;
-    }
-
-} // namespace Catch
-// end catch_singletons.cpp
-// start catch_startup_exception_registry.cpp
-
-namespace Catch {
-void StartupExceptionRegistry::add( std::exception_ptr const& exception ) noexcept {
-        CATCH_TRY {
-            m_exceptions.push_back(exception);
-        } CATCH_CATCH_ALL {
-            // If we run out of memory during start-up there's really not a lot more we can do about it
-            std::terminate();
-        }
-    }
-
-    std::vector<std::exception_ptr> const& StartupExceptionRegistry::getExceptions() const noexcept {
-        return m_exceptions;
-    }
-
-} // end namespace Catch
-// end catch_startup_exception_registry.cpp
-// start catch_stream.cpp
-
-#include <cstdio>
-#include <iostream>
-#include <fstream>
-#include <sstream>
-#include <vector>
-#include <memory>
-
-namespace Catch {
-
-    Catch::IStream::~IStream() = default;
-
-    namespace Detail { namespace {
-        template<typename WriterF, std::size_t bufferSize=256>
-        class StreamBufImpl : public std::streambuf {
-            char data[bufferSize];
-            WriterF m_writer;
-
-        public:
-            StreamBufImpl() {
-                setp( data, data + sizeof(data) );
-            }
-
-            ~StreamBufImpl() noexcept {
-                StreamBufImpl::sync();
-            }
-
-        private:
-            int overflow( int c ) override {
-                sync();
-
-                if( c != EOF ) {
-                    if( pbase() == epptr() )
-                        m_writer( std::string( 1, static_cast<char>( c ) ) );
-                    else
-                        sputc( static_cast<char>( c ) );
-                }
-                return 0;
-            }
-
-            int sync() override {
-                if( pbase() != pptr() ) {
-                    m_writer( std::string( pbase(), static_cast<std::string::size_type>( pptr() - pbase() ) ) );
-                    setp( pbase(), epptr() );
-                }
-                return 0;
-            }
-        };
-
-        ///////////////////////////////////////////////////////////////////////////
-
-        struct OutputDebugWriter {
-
-            void operator()( std::string const&str ) {
-                writeToDebugConsole( str );
-            }
-        };
-
-        ///////////////////////////////////////////////////////////////////////////
-
-        class FileStream : public IStream {
-            mutable std::ofstream m_ofs;
-        public:
-            FileStream( StringRef filename ) {
-                m_ofs.open( filename.c_str() );
-                CATCH_ENFORCE( !m_ofs.fail(), "Unable to open file: '" << filename << "'" );
-            }
-            ~FileStream() override = default;
-        public: // IStream
-            std::ostream& stream() const override {
-                return m_ofs;
-            }
-        };
-
-        ///////////////////////////////////////////////////////////////////////////
-
-        class CoutStream : public IStream {
-            mutable std::ostream m_os;
-        public:
-            // Store the streambuf from cout up-front because
-            // cout may get redirected when running tests
-            CoutStream() : m_os( Catch::cout().rdbuf() ) {}
-            ~CoutStream() override = default;
-
-        public: // IStream
-            std::ostream& stream() const override { return m_os; }
-        };
-
-        ///////////////////////////////////////////////////////////////////////////
-
-        class DebugOutStream : public IStream {
-            std::unique_ptr<StreamBufImpl<OutputDebugWriter>> m_streamBuf;
-            mutable std::ostream m_os;
-        public:
-            DebugOutStream()
-            :   m_streamBuf( new StreamBufImpl<OutputDebugWriter>() ),
-                m_os( m_streamBuf.get() )
-            {}
-
-            ~DebugOutStream() override = default;
-
-        public: // IStream
-            std::ostream& stream() const override { return m_os; }
-        };
-
-    }} // namespace anon::detail
-
-    ///////////////////////////////////////////////////////////////////////////
-
-    auto makeStream( StringRef const &filename ) -> IStream const* {
-        if( filename.empty() )
-            return new Detail::CoutStream();
-        else if( filename[0] == '%' ) {
-            if( filename == "%debug" )
-                return new Detail::DebugOutStream();
-            else
-                CATCH_ERROR( "Unrecognised stream: '" << filename << "'" );
-        }
-        else
-            return new Detail::FileStream( filename );
-    }
-
-    // This class encapsulates the idea of a pool of ostringstreams that can be reused.
-    struct StringStreams {
-        std::vector<std::unique_ptr<std::ostringstream>> m_streams;
-        std::vector<std::size_t> m_unused;
-        std::ostringstream m_referenceStream; // Used for copy state/ flags from
-
-        auto add() -> std::size_t {
-            if( m_unused.empty() ) {
-                m_streams.push_back( std::unique_ptr<std::ostringstream>( new std::ostringstream ) );
-                return m_streams.size()-1;
-            }
-            else {
-                auto index = m_unused.back();
-                m_unused.pop_back();
-                return index;
-            }
-        }
-
-        void release( std::size_t index ) {
-            m_streams[index]->copyfmt( m_referenceStream ); // Restore initial flags and other state
-            m_unused.push_back(index);
-        }
-    };
-
-    ReusableStringStream::ReusableStringStream()
-    :   m_index( Singleton<StringStreams>::getMutable().add() ),
-        m_oss( Singleton<StringStreams>::getMutable().m_streams[m_index].get() )
-    {}
-
-    ReusableStringStream::~ReusableStringStream() {
-        static_cast<std::ostringstream*>( m_oss )->str("");
-        m_oss->clear();
-        Singleton<StringStreams>::getMutable().release( m_index );
-    }
-
-    auto ReusableStringStream::str() const -> std::string {
-        return static_cast<std::ostringstream*>( m_oss )->str();
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-
-#ifndef CATCH_CONFIG_NOSTDOUT // If you #define this you must implement these functions
-    std::ostream& cout() { return std::cout; }
-    std::ostream& cerr() { return std::cerr; }
-    std::ostream& clog() { return std::clog; }
-#endif
-}
-// end catch_stream.cpp
-// start catch_string_manip.cpp
-
-#include <algorithm>
-#include <ostream>
-#include <cstring>
-#include <cctype>
-#include <vector>
-
-namespace Catch {
-
-    namespace {
-        char toLowerCh(char c) {
-            return static_cast<char>( std::tolower( c ) );
-        }
-    }
-
-    bool startsWith( std::string const& s, std::string const& prefix ) {
-        return s.size() >= prefix.size() && std::equal(prefix.begin(), prefix.end(), s.begin());
-    }
-    bool startsWith( std::string const& s, char prefix ) {
-        return !s.empty() && s[0] == prefix;
-    }
-    bool endsWith( std::string const& s, std::string const& suffix ) {
-        return s.size() >= suffix.size() && std::equal(suffix.rbegin(), suffix.rend(), s.rbegin());
-    }
-    bool endsWith( std::string const& s, char suffix ) {
-        return !s.empty() && s[s.size()-1] == suffix;
-    }
-    bool contains( std::string const& s, std::string const& infix ) {
-        return s.find( infix ) != std::string::npos;
-    }
-    void toLowerInPlace( std::string& s ) {
-        std::transform( s.begin(), s.end(), s.begin(), toLowerCh );
-    }
-    std::string toLower( std::string const& s ) {
-        std::string lc = s;
-        toLowerInPlace( lc );
-        return lc;
-    }
-    std::string trim( std::string const& str ) {
-        static char const* whitespaceChars = "\n\r\t ";
-        std::string::size_type start = str.find_first_not_of( whitespaceChars );
-        std::string::size_type end = str.find_last_not_of( whitespaceChars );
-
-        return start != std::string::npos ? str.substr( start, 1+end-start ) : std::string();
-    }
-
-    StringRef trim(StringRef ref) {
-        const auto is_ws = [](char c) {
-            return c == ' ' || c == '\t' || c == '\n' || c == '\r';
-        };
-        size_t real_begin = 0;
-        while (real_begin < ref.size() && is_ws(ref[real_begin])) { ++real_begin; }
-        size_t real_end = ref.size();
-        while (real_end > real_begin && is_ws(ref[real_end - 1])) { --real_end; }
-
-        return ref.substr(real_begin, real_end - real_begin);
-    }
-
-    bool replaceInPlace( std::string& str, std::string const& replaceThis, std::string const& withThis ) {
-        bool replaced = false;
-        std::size_t i = str.find( replaceThis );
-        while( i != std::string::npos ) {
-            replaced = true;
-            str = str.substr( 0, i ) + withThis + str.substr( i+replaceThis.size() );
-            if( i < str.size()-withThis.size() )
-                i = str.find( replaceThis, i+withThis.size() );
-            else
-                i = std::string::npos;
-        }
-        return replaced;
-    }
-
-    std::vector<StringRef> splitStringRef( StringRef str, char delimiter ) {
-        std::vector<StringRef> subStrings;
-        std::size_t start = 0;
-        for(std::size_t pos = 0; pos < str.size(); ++pos ) {
-            if( str[pos] == delimiter ) {
-                if( pos - start > 1 )
-                    subStrings.push_back( str.substr( start, pos-start ) );
-                start = pos+1;
-            }
-        }
-        if( start < str.size() )
-            subStrings.push_back( str.substr( start, str.size()-start ) );
-        return subStrings;
-    }
-
-    pluralise::pluralise( std::size_t count, std::string const& label )
-    :   m_count( count ),
-        m_label( label )
-    {}
-
-    std::ostream& operator << ( std::ostream& os, pluralise const& pluraliser ) {
-        os << pluraliser.m_count << ' ' << pluraliser.m_label;
-        if( pluraliser.m_count != 1 )
-            os << 's';
-        return os;
-    }
-
-}
-// end catch_string_manip.cpp
-// start catch_stringref.cpp
-
-#include <algorithm>
-#include <ostream>
-#include <cstring>
-#include <cstdint>
-
-namespace Catch {
-    StringRef::StringRef( char const* rawChars ) noexcept
-    : StringRef( rawChars, static_cast<StringRef::size_type>(std::strlen(rawChars) ) )
-    {}
-
-    auto StringRef::c_str() const -> char const* {
-        CATCH_ENFORCE(isNullTerminated(), "Called StringRef::c_str() on a non-null-terminated instance");
-        return m_start;
-    }
-    auto StringRef::data() const noexcept -> char const* {
-        return m_start;
-    }
-
-    auto StringRef::substr( size_type start, size_type size ) const noexcept -> StringRef {
-        if (start < m_size) {
-            return StringRef(m_start + start, (std::min)(m_size - start, size));
-        } else {
-            return StringRef();
-        }
-    }
-    auto StringRef::operator == ( StringRef const& other ) const noexcept -> bool {
-        return m_size == other.m_size
-            && (std::memcmp( m_start, other.m_start, m_size ) == 0);
-    }
-
-    auto operator << ( std::ostream& os, StringRef const& str ) -> std::ostream& {
-        return os.write(str.data(), str.size());
-    }
-
-    auto operator+=( std::string& lhs, StringRef const& rhs ) -> std::string& {
-        lhs.append(rhs.data(), rhs.size());
-        return lhs;
-    }
-
-} // namespace Catch
-// end catch_stringref.cpp
-// start catch_tag_alias.cpp
-
-namespace Catch {
-    TagAlias::TagAlias(std::string const & _tag, SourceLineInfo _lineInfo): tag(_tag), lineInfo(_lineInfo) {}
-}
-// end catch_tag_alias.cpp
-// start catch_tag_alias_autoregistrar.cpp
-
-namespace Catch {
-
-    RegistrarForTagAliases::RegistrarForTagAliases(char const* alias, char const* tag, SourceLineInfo const& lineInfo) {
-        CATCH_TRY {
-            getMutableRegistryHub().registerTagAlias(alias, tag, lineInfo);
-        } CATCH_CATCH_ALL {
-            // Do not throw when constructing global objects, instead register the exception to be processed later
-            getMutableRegistryHub().registerStartupException();
-        }
-    }
-
-}
-// end catch_tag_alias_autoregistrar.cpp
-// start catch_tag_alias_registry.cpp
-
-#include <sstream>
-
-namespace Catch {
-
-    TagAliasRegistry::~TagAliasRegistry() {}
-
-    TagAlias const* TagAliasRegistry::find( std::string const& alias ) const {
-        auto it = m_registry.find( alias );
-        if( it != m_registry.end() )
-            return &(it->second);
-        else
-            return nullptr;
-    }
-
-    std::string TagAliasRegistry::expandAliases( std::string const& unexpandedTestSpec ) const {
-        std::string expandedTestSpec = unexpandedTestSpec;
-        for( auto const& registryKvp : m_registry ) {
-            std::size_t pos = expandedTestSpec.find( registryKvp.first );
-            if( pos != std::string::npos ) {
-                expandedTestSpec =  expandedTestSpec.substr( 0, pos ) +
-                                    registryKvp.second.tag +
-                                    expandedTestSpec.substr( pos + registryKvp.first.size() );
-            }
-        }
-        return expandedTestSpec;
-    }
-
-    void TagAliasRegistry::add( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ) {
-        CATCH_ENFORCE( startsWith(alias, "[@") && endsWith(alias, ']'),
-                      "error: tag alias, '" << alias << "' is not of the form [@alias name].\n" << lineInfo );
-
-        CATCH_ENFORCE( m_registry.insert(std::make_pair(alias, TagAlias(tag, lineInfo))).second,
-                      "error: tag alias, '" << alias << "' already registered.\n"
-                      << "\tFirst seen at: " << find(alias)->lineInfo << "\n"
-                      << "\tRedefined at: " << lineInfo );
-    }
-
-    ITagAliasRegistry::~ITagAliasRegistry() {}
-
-    ITagAliasRegistry const& ITagAliasRegistry::get() {
-        return getRegistryHub().getTagAliasRegistry();
-    }
-
-} // end namespace Catch
-// end catch_tag_alias_registry.cpp
-// start catch_test_case_info.cpp
-
-#include <cctype>
-#include <exception>
-#include <algorithm>
-#include <sstream>
-
-namespace Catch {
-
-    namespace {
-        TestCaseInfo::SpecialProperties parseSpecialTag( std::string const& tag ) {
-            if( startsWith( tag, '.' ) ||
-                tag == "!hide" )
-                return TestCaseInfo::IsHidden;
-            else if( tag == "!throws" )
-                return TestCaseInfo::Throws;
-            else if( tag == "!shouldfail" )
-                return TestCaseInfo::ShouldFail;
-            else if( tag == "!mayfail" )
-                return TestCaseInfo::MayFail;
-            else if( tag == "!nonportable" )
-                return TestCaseInfo::NonPortable;
-            else if( tag == "!benchmark" )
-                return static_cast<TestCaseInfo::SpecialProperties>( TestCaseInfo::Benchmark | TestCaseInfo::IsHidden );
-            else
-                return TestCaseInfo::None;
-        }
-        bool isReservedTag( std::string const& tag ) {
-            return parseSpecialTag( tag ) == TestCaseInfo::None && tag.size() > 0 && !std::isalnum( static_cast<unsigned char>(tag[0]) );
-        }
-        void enforceNotReservedTag( std::string const& tag, SourceLineInfo const& _lineInfo ) {
-            CATCH_ENFORCE( !isReservedTag(tag),
-                          "Tag name: [" << tag << "] is not allowed.\n"
-                          << "Tag names starting with non alphanumeric characters are reserved\n"
-                          << _lineInfo );
-        }
-    }
-
-    TestCase makeTestCase(  ITestInvoker* _testCase,
-                            std::string const& _className,
-                            NameAndTags const& nameAndTags,
-                            SourceLineInfo const& _lineInfo )
-    {
-        bool isHidden = false;
-
-        // Parse out tags
-        std::vector<std::string> tags;
-        std::string desc, tag;
-        bool inTag = false;
-        for (char c : nameAndTags.tags) {
-            if( !inTag ) {
-                if( c == '[' )
-                    inTag = true;
-                else
-                    desc += c;
-            }
-            else {
-                if( c == ']' ) {
-                    TestCaseInfo::SpecialProperties prop = parseSpecialTag( tag );
-                    if( ( prop & TestCaseInfo::IsHidden ) != 0 )
-                        isHidden = true;
-                    else if( prop == TestCaseInfo::None )
-                        enforceNotReservedTag( tag, _lineInfo );
-
-                    // Merged hide tags like `[.approvals]` should be added as
-                    // `[.][approvals]`. The `[.]` is added at later point, so
-                    // we only strip the prefix
-                    if (startsWith(tag, '.') && tag.size() > 1) {
-                        tag.erase(0, 1);
-                    }
-                    tags.push_back( tag );
-                    tag.clear();
-                    inTag = false;
-                }
-                else
-                    tag += c;
-            }
-        }
-        if( isHidden ) {
-            // Add all "hidden" tags to make them behave identically
-            tags.insert( tags.end(), { ".", "!hide" } );
-        }
-
-        TestCaseInfo info( static_cast<std::string>(nameAndTags.name), _className, desc, tags, _lineInfo );
-        return TestCase( _testCase, std::move(info) );
-    }
-
-    void setTags( TestCaseInfo& testCaseInfo, std::vector<std::string> tags ) {
-        std::sort(begin(tags), end(tags));
-        tags.erase(std::unique(begin(tags), end(tags)), end(tags));
-        testCaseInfo.lcaseTags.clear();
-
-        for( auto const& tag : tags ) {
-            std::string lcaseTag = toLower( tag );
-            testCaseInfo.properties = static_cast<TestCaseInfo::SpecialProperties>( testCaseInfo.properties | parseSpecialTag( lcaseTag ) );
-            testCaseInfo.lcaseTags.push_back( lcaseTag );
-        }
-        testCaseInfo.tags = std::move(tags);
-    }
-
-    TestCaseInfo::TestCaseInfo( std::string const& _name,
-                                std::string const& _className,
-                                std::string const& _description,
-                                std::vector<std::string> const& _tags,
-                                SourceLineInfo const& _lineInfo )
-    :   name( _name ),
-        className( _className ),
-        description( _description ),
-        lineInfo( _lineInfo ),
-        properties( None )
-    {
-        setTags( *this, _tags );
-    }
-
-    bool TestCaseInfo::isHidden() const {
-        return ( properties & IsHidden ) != 0;
-    }
-    bool TestCaseInfo::throws() const {
-        return ( properties & Throws ) != 0;
-    }
-    bool TestCaseInfo::okToFail() const {
-        return ( properties & (ShouldFail | MayFail ) ) != 0;
-    }
-    bool TestCaseInfo::expectedToFail() const {
-        return ( properties & (ShouldFail ) ) != 0;
-    }
-
-    std::string TestCaseInfo::tagsAsString() const {
-        std::string ret;
-        // '[' and ']' per tag
-        std::size_t full_size = 2 * tags.size();
-        for (const auto& tag : tags) {
-            full_size += tag.size();
-        }
-        ret.reserve(full_size);
-        for (const auto& tag : tags) {
-            ret.push_back('[');
-            ret.append(tag);
-            ret.push_back(']');
-        }
-
-        return ret;
-    }
-
-    TestCase::TestCase( ITestInvoker* testCase, TestCaseInfo&& info ) : TestCaseInfo( std::move(info) ), test( testCase ) {}
-
-    TestCase TestCase::withName( std::string const& _newName ) const {
-        TestCase other( *this );
-        other.name = _newName;
-        return other;
-    }
-
-    void TestCase::invoke() const {
-        test->invoke();
-    }
-
-    bool TestCase::operator == ( TestCase const& other ) const {
-        return  test.get() == other.test.get() &&
-                name == other.name &&
-                className == other.className;
-    }
-
-    bool TestCase::operator < ( TestCase const& other ) const {
-        return name < other.name;
-    }
-
-    TestCaseInfo const& TestCase::getTestCaseInfo() const
-    {
-        return *this;
-    }
-
-} // end namespace Catch
-// end catch_test_case_info.cpp
-// start catch_test_case_registry_impl.cpp
-
-#include <algorithm>
-#include <sstream>
-
-namespace Catch {
-
-    namespace {
-        struct TestHasher {
-            explicit TestHasher(Catch::SimplePcg32& rng) {
-                basis = rng();
-                basis <<= 32;
-                basis |= rng();
-            }
-
-            uint64_t basis;
-
-            uint64_t operator()(TestCase const& t) const {
-                // Modified FNV-1a hash
-                static constexpr uint64_t prime = 1099511628211;
-                uint64_t hash = basis;
-                for (const char c : t.name) {
-                    hash ^= c;
-                    hash *= prime;
-                }
-                return hash;
-            }
-        };
-    } // end unnamed namespace
-
-    std::vector<TestCase> sortTests( IConfig const& config, std::vector<TestCase> const& unsortedTestCases ) {
-        switch( config.runOrder() ) {
-            case RunTests::InDeclarationOrder:
-                // already in declaration order
-                break;
-
-            case RunTests::InLexicographicalOrder: {
-                std::vector<TestCase> sorted = unsortedTestCases;
-                std::sort( sorted.begin(), sorted.end() );
-                return sorted;
-            }
-
-            case RunTests::InRandomOrder: {
-                seedRng( config );
-                TestHasher h( rng() );
-
-                using hashedTest = std::pair<uint64_t, TestCase const*>;
-                std::vector<hashedTest> indexed_tests;
-                indexed_tests.reserve( unsortedTestCases.size() );
-
-                for (auto const& testCase : unsortedTestCases) {
-                    indexed_tests.emplace_back(h(testCase), &testCase);
-                }
-
-                std::sort(indexed_tests.begin(), indexed_tests.end(),
-                          [](hashedTest const& lhs, hashedTest const& rhs) {
-                          if (lhs.first == rhs.first) {
-                              return lhs.second->name < rhs.second->name;
-                          }
-                          return lhs.first < rhs.first;
-                });
-
-                std::vector<TestCase> sorted;
-                sorted.reserve( indexed_tests.size() );
-
-                for (auto const& hashed : indexed_tests) {
-                    sorted.emplace_back(*hashed.second);
-                }
-
-                return sorted;
-            }
-        }
-        return unsortedTestCases;
-    }
-
-    bool isThrowSafe( TestCase const& testCase, IConfig const& config ) {
-        return !testCase.throws() || config.allowThrows();
-    }
-
-    bool matchTest( TestCase const& testCase, TestSpec const& testSpec, IConfig const& config ) {
-        return testSpec.matches( testCase ) && isThrowSafe( testCase, config );
-    }
-
-    void enforceNoDuplicateTestCases( std::vector<TestCase> const& functions ) {
-        std::set<TestCase> seenFunctions;
-        for( auto const& function : functions ) {
-            auto prev = seenFunctions.insert( function );
-            CATCH_ENFORCE( prev.second,
-                    "error: TEST_CASE( \"" << function.name << "\" ) already defined.\n"
-                    << "\tFirst seen at " << prev.first->getTestCaseInfo().lineInfo << "\n"
-                    << "\tRedefined at " << function.getTestCaseInfo().lineInfo );
-        }
-    }
-
-    std::vector<TestCase> filterTests( std::vector<TestCase> const& testCases, TestSpec const& testSpec, IConfig const& config ) {
-        std::vector<TestCase> filtered;
-        filtered.reserve( testCases.size() );
-        for (auto const& testCase : testCases) {
-            if ((!testSpec.hasFilters() && !testCase.isHidden()) ||
-                (testSpec.hasFilters() && matchTest(testCase, testSpec, config))) {
-                filtered.push_back(testCase);
-            }
-        }
-        return filtered;
-    }
-    std::vector<TestCase> const& getAllTestCasesSorted( IConfig const& config ) {
-        return getRegistryHub().getTestCaseRegistry().getAllTestsSorted( config );
-    }
-
-    void TestRegistry::registerTest( TestCase const& testCase ) {
-        std::string name = testCase.getTestCaseInfo().name;
-        if( name.empty() ) {
-            ReusableStringStream rss;
-            rss << "Anonymous test case " << ++m_unnamedCount;
-            return registerTest( testCase.withName( rss.str() ) );
-        }
-        m_functions.push_back( testCase );
-    }
-
-    std::vector<TestCase> const& TestRegistry::getAllTests() const {
-        return m_functions;
-    }
-    std::vector<TestCase> const& TestRegistry::getAllTestsSorted( IConfig const& config ) const {
-        if( m_sortedFunctions.empty() )
-            enforceNoDuplicateTestCases( m_functions );
-
-        if(  m_currentSortOrder != config.runOrder() || m_sortedFunctions.empty() ) {
-            m_sortedFunctions = sortTests( config, m_functions );
-            m_currentSortOrder = config.runOrder();
-        }
-        return m_sortedFunctions;
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    TestInvokerAsFunction::TestInvokerAsFunction( void(*testAsFunction)() ) noexcept : m_testAsFunction( testAsFunction ) {}
-
-    void TestInvokerAsFunction::invoke() const {
-        m_testAsFunction();
-    }
-
-    std::string extractClassName( StringRef const& classOrQualifiedMethodName ) {
-        std::string className(classOrQualifiedMethodName);
-        if( startsWith( className, '&' ) )
-        {
-            std::size_t lastColons = className.rfind( "::" );
-            std::size_t penultimateColons = className.rfind( "::", lastColons-1 );
-            if( penultimateColons == std::string::npos )
-                penultimateColons = 1;
-            className = className.substr( penultimateColons, lastColons-penultimateColons );
-        }
-        return className;
-    }
-
-} // end namespace Catch
-// end catch_test_case_registry_impl.cpp
-// start catch_test_case_tracker.cpp
-
-#include <algorithm>
-#include <cassert>
-#include <stdexcept>
-#include <memory>
-#include <sstream>
-
-#if defined(__clang__)
-#    pragma clang diagnostic push
-#    pragma clang diagnostic ignored "-Wexit-time-destructors"
-#endif
-
-namespace Catch {
-namespace TestCaseTracking {
-
-    NameAndLocation::NameAndLocation( std::string const& _name, SourceLineInfo const& _location )
-    :   name( _name ),
-        location( _location )
-    {}
-
-    ITracker::~ITracker() = default;
-
-    ITracker& TrackerContext::startRun() {
-        m_rootTracker = std::make_shared<SectionTracker>( NameAndLocation( "{root}", CATCH_INTERNAL_LINEINFO ), *this, nullptr );
-        m_currentTracker = nullptr;
-        m_runState = Executing;
-        return *m_rootTracker;
-    }
-
-    void TrackerContext::endRun() {
-        m_rootTracker.reset();
-        m_currentTracker = nullptr;
-        m_runState = NotStarted;
-    }
-
-    void TrackerContext::startCycle() {
-        m_currentTracker = m_rootTracker.get();
-        m_runState = Executing;
-    }
-    void TrackerContext::completeCycle() {
-        m_runState = CompletedCycle;
-    }
-
-    bool TrackerContext::completedCycle() const {
-        return m_runState == CompletedCycle;
-    }
-    ITracker& TrackerContext::currentTracker() {
-        return *m_currentTracker;
-    }
-    void TrackerContext::setCurrentTracker( ITracker* tracker ) {
-        m_currentTracker = tracker;
-    }
-
-    TrackerBase::TrackerBase( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent )
-    :   m_nameAndLocation( nameAndLocation ),
-        m_ctx( ctx ),
-        m_parent( parent )
-    {}
-
-    NameAndLocation const& TrackerBase::nameAndLocation() const {
-        return m_nameAndLocation;
-    }
-    bool TrackerBase::isComplete() const {
-        return m_runState == CompletedSuccessfully || m_runState == Failed;
-    }
-    bool TrackerBase::isSuccessfullyCompleted() const {
-        return m_runState == CompletedSuccessfully;
-    }
-    bool TrackerBase::isOpen() const {
-        return m_runState != NotStarted && !isComplete();
-    }
-    bool TrackerBase::hasChildren() const {
-        return !m_children.empty();
-    }
-
-    void TrackerBase::addChild( ITrackerPtr const& child ) {
-        m_children.push_back( child );
-    }
-
-    ITrackerPtr TrackerBase::findChild( NameAndLocation const& nameAndLocation ) {
-        auto it = std::find_if( m_children.begin(), m_children.end(),
-            [&nameAndLocation]( ITrackerPtr const& tracker ){
-                return
-                    tracker->nameAndLocation().location == nameAndLocation.location &&
-                    tracker->nameAndLocation().name == nameAndLocation.name;
-            } );
-        return( it != m_children.end() )
-            ? *it
-            : nullptr;
-    }
-    ITracker& TrackerBase::parent() {
-        assert( m_parent ); // Should always be non-null except for root
-        return *m_parent;
-    }
-
-    void TrackerBase::openChild() {
-        if( m_runState != ExecutingChildren ) {
-            m_runState = ExecutingChildren;
-            if( m_parent )
-                m_parent->openChild();
-        }
-    }
-
-    bool TrackerBase::isSectionTracker() const { return false; }
-    bool TrackerBase::isGeneratorTracker() const { return false; }
-
-    void TrackerBase::open() {
-        m_runState = Executing;
-        moveToThis();
-        if( m_parent )
-            m_parent->openChild();
-    }
-
-    void TrackerBase::close() {
-
-        // Close any still open children (e.g. generators)
-        while( &m_ctx.currentTracker() != this )
-            m_ctx.currentTracker().close();
-
-        switch( m_runState ) {
-            case NeedsAnotherRun:
-                break;
-
-            case Executing:
-                m_runState = CompletedSuccessfully;
-                break;
-            case ExecutingChildren:
-                if( std::all_of(m_children.begin(), m_children.end(), [](ITrackerPtr const& t){ return t->isComplete(); }) )
-                    m_runState = CompletedSuccessfully;
-                break;
-
-            case NotStarted:
-            case CompletedSuccessfully:
-            case Failed:
-                CATCH_INTERNAL_ERROR( "Illogical state: " << m_runState );
-
-            default:
-                CATCH_INTERNAL_ERROR( "Unknown state: " << m_runState );
-        }
-        moveToParent();
-        m_ctx.completeCycle();
-    }
-    void TrackerBase::fail() {
-        m_runState = Failed;
-        if( m_parent )
-            m_parent->markAsNeedingAnotherRun();
-        moveToParent();
-        m_ctx.completeCycle();
-    }
-    void TrackerBase::markAsNeedingAnotherRun() {
-        m_runState = NeedsAnotherRun;
-    }
-
-    void TrackerBase::moveToParent() {
-        assert( m_parent );
-        m_ctx.setCurrentTracker( m_parent );
-    }
-    void TrackerBase::moveToThis() {
-        m_ctx.setCurrentTracker( this );
-    }
-
-    SectionTracker::SectionTracker( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent )
-    :   TrackerBase( nameAndLocation, ctx, parent ),
-        m_trimmed_name(trim(nameAndLocation.name))
-    {
-        if( parent ) {
-            while( !parent->isSectionTracker() )
-                parent = &parent->parent();
-
-            SectionTracker& parentSection = static_cast<SectionTracker&>( *parent );
-            addNextFilters( parentSection.m_filters );
-        }
-    }
-
-    bool SectionTracker::isComplete() const {
-        bool complete = true;
-
-        if ((m_filters.empty() || m_filters[0] == "")
-            || std::find(m_filters.begin(), m_filters.end(), m_trimmed_name) != m_filters.end()) {
-            complete = TrackerBase::isComplete();
-        }
-        return complete;
-    }
-
-    bool SectionTracker::isSectionTracker() const { return true; }
-
-    SectionTracker& SectionTracker::acquire( TrackerContext& ctx, NameAndLocation const& nameAndLocation ) {
-        std::shared_ptr<SectionTracker> section;
-
-        ITracker& currentTracker = ctx.currentTracker();
-        if( ITrackerPtr childTracker = currentTracker.findChild( nameAndLocation ) ) {
-            assert( childTracker );
-            assert( childTracker->isSectionTracker() );
-            section = std::static_pointer_cast<SectionTracker>( childTracker );
-        }
-        else {
-            section = std::make_shared<SectionTracker>( nameAndLocation, ctx, &currentTracker );
-            currentTracker.addChild( section );
-        }
-        if( !ctx.completedCycle() )
-            section->tryOpen();
-        return *section;
-    }
-
-    void SectionTracker::tryOpen() {
-        if( !isComplete() )
-            open();
-    }
-
-    void SectionTracker::addInitialFilters( std::vector<std::string> const& filters ) {
-        if( !filters.empty() ) {
-            m_filters.reserve( m_filters.size() + filters.size() + 2 );
-            m_filters.emplace_back(""); // Root - should never be consulted
-            m_filters.emplace_back(""); // Test Case - not a section filter
-            m_filters.insert( m_filters.end(), filters.begin(), filters.end() );
-        }
-    }
-    void SectionTracker::addNextFilters( std::vector<std::string> const& filters ) {
-        if( filters.size() > 1 )
-            m_filters.insert( m_filters.end(), filters.begin()+1, filters.end() );
-    }
-
-} // namespace TestCaseTracking
-
-using TestCaseTracking::ITracker;
-using TestCaseTracking::TrackerContext;
-using TestCaseTracking::SectionTracker;
-
-} // namespace Catch
-
-#if defined(__clang__)
-#    pragma clang diagnostic pop
-#endif
-// end catch_test_case_tracker.cpp
-// start catch_test_registry.cpp
-
-namespace Catch {
-
-    auto makeTestInvoker( void(*testAsFunction)() ) noexcept -> ITestInvoker* {
-        return new(std::nothrow) TestInvokerAsFunction( testAsFunction );
-    }
-
-    NameAndTags::NameAndTags( StringRef const& name_ , StringRef const& tags_ ) noexcept : name( name_ ), tags( tags_ ) {}
-
-    AutoReg::AutoReg( ITestInvoker* invoker, SourceLineInfo const& lineInfo, StringRef const& classOrMethod, NameAndTags const& nameAndTags ) noexcept {
-        CATCH_TRY {
-            getMutableRegistryHub()
-                    .registerTest(
-                        makeTestCase(
-                            invoker,
-                            extractClassName( classOrMethod ),
-                            nameAndTags,
-                            lineInfo));
-        } CATCH_CATCH_ALL {
-            // Do not throw when constructing global objects, instead register the exception to be processed later
-            getMutableRegistryHub().registerStartupException();
-        }
-    }
-
-    AutoReg::~AutoReg() = default;
-}
-// end catch_test_registry.cpp
-// start catch_test_spec.cpp
-
-#include <algorithm>
-#include <string>
-#include <vector>
-#include <memory>
-
-namespace Catch {
-
-    TestSpec::Pattern::Pattern( std::string const& name )
-    : m_name( name )
-    {}
-
-    TestSpec::Pattern::~Pattern() = default;
-
-    std::string const& TestSpec::Pattern::name() const {
-        return m_name;
-    }
-
-    TestSpec::NamePattern::NamePattern( std::string const& name, std::string const& filterString )
-    : Pattern( filterString )
-    , m_wildcardPattern( toLower( name ), CaseSensitive::No )
-    {}
-
-    bool TestSpec::NamePattern::matches( TestCaseInfo const& testCase ) const {
-        return m_wildcardPattern.matches( testCase.name );
-    }
-
-    TestSpec::TagPattern::TagPattern( std::string const& tag, std::string const& filterString )
-    : Pattern( filterString )
-    , m_tag( toLower( tag ) )
-    {}
-
-    bool TestSpec::TagPattern::matches( TestCaseInfo const& testCase ) const {
-        return std::find(begin(testCase.lcaseTags),
-                         end(testCase.lcaseTags),
-                         m_tag) != end(testCase.lcaseTags);
-    }
-
-    TestSpec::ExcludedPattern::ExcludedPattern( PatternPtr const& underlyingPattern )
-    : Pattern( underlyingPattern->name() )
-    , m_underlyingPattern( underlyingPattern )
-    {}
-
-    bool TestSpec::ExcludedPattern::matches( TestCaseInfo const& testCase ) const {
-        return !m_underlyingPattern->matches( testCase );
-    }
-
-    bool TestSpec::Filter::matches( TestCaseInfo const& testCase ) const {
-        return std::all_of( m_patterns.begin(), m_patterns.end(), [&]( PatternPtr const& p ){ return p->matches( testCase ); } );
-    }
-
-    std::string TestSpec::Filter::name() const {
-        std::string name;
-        for( auto const& p : m_patterns )
-            name += p->name();
-        return name;
-    }
-
-    bool TestSpec::hasFilters() const {
-        return !m_filters.empty();
-    }
-
-    bool TestSpec::matches( TestCaseInfo const& testCase ) const {
-        return std::any_of( m_filters.begin(), m_filters.end(), [&]( Filter const& f ){ return f.matches( testCase ); } );
-    }
-
-    TestSpec::Matches TestSpec::matchesByFilter( std::vector<TestCase> const& testCases, IConfig const& config ) const
-    {
-        Matches matches( m_filters.size() );
-        std::transform( m_filters.begin(), m_filters.end(), matches.begin(), [&]( Filter const& filter ){
-            std::vector<TestCase const*> currentMatches;
-            for( auto const& test : testCases )
-                if( isThrowSafe( test, config ) && filter.matches( test ) )
-                    currentMatches.emplace_back( &test );
-            return FilterMatch{ filter.name(), currentMatches };
-        } );
-        return matches;
-    }
-
-    const TestSpec::vectorStrings& TestSpec::getInvalidArgs() const{
-        return  (m_invalidArgs);
-    }
-
-}
-// end catch_test_spec.cpp
-// start catch_test_spec_parser.cpp
-
-namespace Catch {
-
-    TestSpecParser::TestSpecParser( ITagAliasRegistry const& tagAliases ) : m_tagAliases( &tagAliases ) {}
-
-    TestSpecParser& TestSpecParser::parse( std::string const& arg ) {
-        m_mode = None;
-        m_exclusion = false;
-        m_arg = m_tagAliases->expandAliases( arg );
-        m_escapeChars.clear();
-        m_substring.reserve(m_arg.size());
-        m_patternName.reserve(m_arg.size());
-        m_realPatternPos = 0;
-
-        for( m_pos = 0; m_pos < m_arg.size(); ++m_pos )
-          //if visitChar fails
-           if( !visitChar( m_arg[m_pos] ) ){
-               m_testSpec.m_invalidArgs.push_back(arg);
-               break;
-           }
-        endMode();
-        return *this;
-    }
-    TestSpec TestSpecParser::testSpec() {
-        addFilter();
-        return m_testSpec;
-    }
-    bool TestSpecParser::visitChar( char c ) {
-        if( (m_mode != EscapedName) && (c == '\\') ) {
-            escape();
-            addCharToPattern(c);
-            return true;
-        }else if((m_mode != EscapedName) && (c == ',') )  {
-            return separate();
-        }
-
-        switch( m_mode ) {
-        case None:
-            if( processNoneChar( c ) )
-                return true;
-            break;
-        case Name:
-            processNameChar( c );
-            break;
-        case EscapedName:
-            endMode();
-            addCharToPattern(c);
-            return true;
-        default:
-        case Tag:
-        case QuotedName:
-            if( processOtherChar( c ) )
-                return true;
-            break;
-        }
-
-        m_substring += c;
-        if( !isControlChar( c ) ) {
-            m_patternName += c;
-            m_realPatternPos++;
-        }
-        return true;
-    }
-    // Two of the processing methods return true to signal the caller to return
-    // without adding the given character to the current pattern strings
-    bool TestSpecParser::processNoneChar( char c ) {
-        switch( c ) {
-        case ' ':
-            return true;
-        case '~':
-            m_exclusion = true;
-            return false;
-        case '[':
-            startNewMode( Tag );
-            return false;
-        case '"':
-            startNewMode( QuotedName );
-            return false;
-        default:
-            startNewMode( Name );
-            return false;
-        }
-    }
-    void TestSpecParser::processNameChar( char c ) {
-        if( c == '[' ) {
-            if( m_substring == "exclude:" )
-                m_exclusion = true;
-            else
-                endMode();
-            startNewMode( Tag );
-        }
-    }
-    bool TestSpecParser::processOtherChar( char c ) {
-        if( !isControlChar( c ) )
-            return false;
-        m_substring += c;
-        endMode();
-        return true;
-    }
-    void TestSpecParser::startNewMode( Mode mode ) {
-        m_mode = mode;
-    }
-    void TestSpecParser::endMode() {
-        switch( m_mode ) {
-        case Name:
-        case QuotedName:
-            return addNamePattern();
-        case Tag:
-            return addTagPattern();
-        case EscapedName:
-            revertBackToLastMode();
-            return;
-        case None:
-        default:
-            return startNewMode( None );
-        }
-    }
-    void TestSpecParser::escape() {
-        saveLastMode();
-        m_mode = EscapedName;
-        m_escapeChars.push_back(m_realPatternPos);
-    }
-    bool TestSpecParser::isControlChar( char c ) const {
-        switch( m_mode ) {
-            default:
-                return false;
-            case None:
-                return c == '~';
-            case Name:
-                return c == '[';
-            case EscapedName:
-                return true;
-            case QuotedName:
-                return c == '"';
-            case Tag:
-                return c == '[' || c == ']';
-        }
-    }
-
-    void TestSpecParser::addFilter() {
-        if( !m_currentFilter.m_patterns.empty() ) {
-            m_testSpec.m_filters.push_back( m_currentFilter );
-            m_currentFilter = TestSpec::Filter();
-        }
-    }
-
-    void TestSpecParser::saveLastMode() {
-      lastMode = m_mode;
-    }
-
-    void TestSpecParser::revertBackToLastMode() {
-      m_mode = lastMode;
-    }
-
-    bool TestSpecParser::separate() {
-      if( (m_mode==QuotedName) || (m_mode==Tag) ){
-         //invalid argument, signal failure to previous scope.
-         m_mode = None;
-         m_pos = m_arg.size();
-         m_substring.clear();
-         m_patternName.clear();
-         m_realPatternPos = 0;
-         return false;
-      }
-      endMode();
-      addFilter();
-      return true; //success
-    }
-
-    std::string TestSpecParser::preprocessPattern() {
-        std::string token = m_patternName;
-        for (std::size_t i = 0; i < m_escapeChars.size(); ++i)
-            token = token.substr(0, m_escapeChars[i] - i) + token.substr(m_escapeChars[i] - i + 1);
-        m_escapeChars.clear();
-        if (startsWith(token, "exclude:")) {
-            m_exclusion = true;
-            token = token.substr(8);
-        }
-
-        m_patternName.clear();
-        m_realPatternPos = 0;
-
-        return token;
-    }
-
-    void TestSpecParser::addNamePattern() {
-        auto token = preprocessPattern();
-
-        if (!token.empty()) {
-            TestSpec::PatternPtr pattern = std::make_shared<TestSpec::NamePattern>(token, m_substring);
-            if (m_exclusion)
-                pattern = std::make_shared<TestSpec::ExcludedPattern>(pattern);
-            m_currentFilter.m_patterns.push_back(pattern);
-        }
-        m_substring.clear();
-        m_exclusion = false;
-        m_mode = None;
-    }
-
-    void TestSpecParser::addTagPattern() {
-        auto token = preprocessPattern();
-
-        if (!token.empty()) {
-            // If the tag pattern is the "hide and tag" shorthand (e.g. [.foo])
-            // we have to create a separate hide tag and shorten the real one
-            if (token.size() > 1 && token[0] == '.') {
-                token.erase(token.begin());
-                TestSpec::PatternPtr pattern = std::make_shared<TestSpec::TagPattern>(".", m_substring);
-                if (m_exclusion) {
-                    pattern = std::make_shared<TestSpec::ExcludedPattern>(pattern);
-                }
-                m_currentFilter.m_patterns.push_back(pattern);
-            }
-
-            TestSpec::PatternPtr pattern = std::make_shared<TestSpec::TagPattern>(token, m_substring);
-
-            if (m_exclusion) {
-                pattern = std::make_shared<TestSpec::ExcludedPattern>(pattern);
-            }
-            m_currentFilter.m_patterns.push_back(pattern);
-        }
-        m_substring.clear();
-        m_exclusion = false;
-        m_mode = None;
-    }
-
-    TestSpec parseTestSpec( std::string const& arg ) {
-        return TestSpecParser( ITagAliasRegistry::get() ).parse( arg ).testSpec();
-    }
-
-} // namespace Catch
-// end catch_test_spec_parser.cpp
-// start catch_timer.cpp
-
-#include <chrono>
-
-static const uint64_t nanosecondsInSecond = 1000000000;
-
-namespace Catch {
-
-    auto getCurrentNanosecondsSinceEpoch() -> uint64_t {
-        return std::chrono::duration_cast<std::chrono::nanoseconds>( std::chrono::high_resolution_clock::now().time_since_epoch() ).count();
-    }
-
-    namespace {
-        auto estimateClockResolution() -> uint64_t {
-            uint64_t sum = 0;
-            static const uint64_t iterations = 1000000;
-
-            auto startTime = getCurrentNanosecondsSinceEpoch();
-
-            for( std::size_t i = 0; i < iterations; ++i ) {
-
-                uint64_t ticks;
-                uint64_t baseTicks = getCurrentNanosecondsSinceEpoch();
-                do {
-                    ticks = getCurrentNanosecondsSinceEpoch();
-                } while( ticks == baseTicks );
-
-                auto delta = ticks - baseTicks;
-                sum += delta;
-
-                // If we have been calibrating for over 3 seconds -- the clock
-                // is terrible and we should move on.
-                // TBD: How to signal that the measured resolution is probably wrong?
-                if (ticks > startTime + 3 * nanosecondsInSecond) {
-                    return sum / ( i + 1u );
-                }
-            }
-
-            // We're just taking the mean, here. To do better we could take the std. dev and exclude outliers
-            // - and potentially do more iterations if there's a high variance.
-            return sum/iterations;
-        }
-    }
-    auto getEstimatedClockResolution() -> uint64_t {
-        static auto s_resolution = estimateClockResolution();
-        return s_resolution;
-    }
-
-    void Timer::start() {
-       m_nanoseconds = getCurrentNanosecondsSinceEpoch();
-    }
-    auto Timer::getElapsedNanoseconds() const -> uint64_t {
-        return getCurrentNanosecondsSinceEpoch() - m_nanoseconds;
-    }
-    auto Timer::getElapsedMicroseconds() const -> uint64_t {
-        return getElapsedNanoseconds()/1000;
-    }
-    auto Timer::getElapsedMilliseconds() const -> unsigned int {
-        return static_cast<unsigned int>(getElapsedMicroseconds()/1000);
-    }
-    auto Timer::getElapsedSeconds() const -> double {
-        return getElapsedMicroseconds()/1000000.0;
-    }
-
-} // namespace Catch
-// end catch_timer.cpp
-// start catch_tostring.cpp
-
-#if defined(__clang__)
-#    pragma clang diagnostic push
-#    pragma clang diagnostic ignored "-Wexit-time-destructors"
-#    pragma clang diagnostic ignored "-Wglobal-constructors"
-#endif
-
-// Enable specific decls locally
-#if !defined(CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER)
-#define CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER
-#endif
-
-#include <cmath>
-#include <iomanip>
-
-namespace Catch {
-
-namespace Detail {
-
-    const std::string unprintableString = "{?}";
-
-    namespace {
-        const int hexThreshold = 255;
-
-        struct Endianness {
-            enum Arch { Big, Little };
-
-            static Arch which() {
-                int one = 1;
-                // If the lowest byte we read is non-zero, we can assume
-                // that little endian format is used.
-                auto value = *reinterpret_cast<char*>(&one);
-                return value ? Little : Big;
-            }
-        };
-    }
-
-    std::string rawMemoryToString( const void *object, std::size_t size ) {
-        // Reverse order for little endian architectures
-        int i = 0, end = static_cast<int>( size ), inc = 1;
-        if( Endianness::which() == Endianness::Little ) {
-            i = end-1;
-            end = inc = -1;
-        }
-
-        unsigned char const *bytes = static_cast<unsigned char const *>(object);
-        ReusableStringStream rss;
-        rss << "0x" << std::setfill('0') << std::hex;
-        for( ; i != end; i += inc )
-             rss << std::setw(2) << static_cast<unsigned>(bytes[i]);
-       return rss.str();
-    }
-}
-
-template<typename T>
-std::string fpToString( T value, int precision ) {
-    if (Catch::isnan(value)) {
-        return "nan";
-    }
-
-    ReusableStringStream rss;
-    rss << std::setprecision( precision )
-        << std::fixed
-        << value;
-    std::string d = rss.str();
-    std::size_t i = d.find_last_not_of( '0' );
-    if( i != std::string::npos && i != d.size()-1 ) {
-        if( d[i] == '.' )
-            i++;
-        d = d.substr( 0, i+1 );
-    }
-    return d;
-}
-
-//// ======================================================= ////
-//
-//   Out-of-line defs for full specialization of StringMaker
-//
-//// ======================================================= ////
-
-std::string StringMaker<std::string>::convert(const std::string& str) {
-    if (!getCurrentContext().getConfig()->showInvisibles()) {
-        return '"' + str + '"';
-    }
-
-    std::string s("\"");
-    for (char c : str) {
-        switch (c) {
-        case '\n':
-            s.append("\\n");
-            break;
-        case '\t':
-            s.append("\\t");
-            break;
-        default:
-            s.push_back(c);
-            break;
-        }
-    }
-    s.append("\"");
-    return s;
-}
-
-#ifdef CATCH_CONFIG_CPP17_STRING_VIEW
-std::string StringMaker<std::string_view>::convert(std::string_view str) {
-    return ::Catch::Detail::stringify(std::string{ str });
-}
-#endif
-
-std::string StringMaker<char const*>::convert(char const* str) {
-    if (str) {
-        return ::Catch::Detail::stringify(std::string{ str });
-    } else {
-        return{ "{null string}" };
-    }
-}
-std::string StringMaker<char*>::convert(char* str) {
-    if (str) {
-        return ::Catch::Detail::stringify(std::string{ str });
-    } else {
-        return{ "{null string}" };
-    }
-}
-
-#ifdef CATCH_CONFIG_WCHAR
-std::string StringMaker<std::wstring>::convert(const std::wstring& wstr) {
-    std::string s;
-    s.reserve(wstr.size());
-    for (auto c : wstr) {
-        s += (c <= 0xff) ? static_cast<char>(c) : '?';
-    }
-    return ::Catch::Detail::stringify(s);
-}
-
-# ifdef CATCH_CONFIG_CPP17_STRING_VIEW
-std::string StringMaker<std::wstring_view>::convert(std::wstring_view str) {
-    return StringMaker<std::wstring>::convert(std::wstring(str));
-}
-# endif
-
-std::string StringMaker<wchar_t const*>::convert(wchar_t const * str) {
-    if (str) {
-        return ::Catch::Detail::stringify(std::wstring{ str });
-    } else {
-        return{ "{null string}" };
-    }
-}
-std::string StringMaker<wchar_t *>::convert(wchar_t * str) {
-    if (str) {
-        return ::Catch::Detail::stringify(std::wstring{ str });
-    } else {
-        return{ "{null string}" };
-    }
-}
-#endif
-
-#if defined(CATCH_CONFIG_CPP17_BYTE)
-#include <cstddef>
-std::string StringMaker<std::byte>::convert(std::byte value) {
-    return ::Catch::Detail::stringify(std::to_integer<unsigned long long>(value));
-}
-#endif // defined(CATCH_CONFIG_CPP17_BYTE)
-
-std::string StringMaker<int>::convert(int value) {
-    return ::Catch::Detail::stringify(static_cast<long long>(value));
-}
-std::string StringMaker<long>::convert(long value) {
-    return ::Catch::Detail::stringify(static_cast<long long>(value));
-}
-std::string StringMaker<long long>::convert(long long value) {
-    ReusableStringStream rss;
-    rss << value;
-    if (value > Detail::hexThreshold) {
-        rss << " (0x" << std::hex << value << ')';
-    }
-    return rss.str();
-}
-
-std::string StringMaker<unsigned int>::convert(unsigned int value) {
-    return ::Catch::Detail::stringify(static_cast<unsigned long long>(value));
-}
-std::string StringMaker<unsigned long>::convert(unsigned long value) {
-    return ::Catch::Detail::stringify(static_cast<unsigned long long>(value));
-}
-std::string StringMaker<unsigned long long>::convert(unsigned long long value) {
-    ReusableStringStream rss;
-    rss << value;
-    if (value > Detail::hexThreshold) {
-        rss << " (0x" << std::hex << value << ')';
-    }
-    return rss.str();
-}
-
-std::string StringMaker<bool>::convert(bool b) {
-    return b ? "true" : "false";
-}
-
-std::string StringMaker<signed char>::convert(signed char value) {
-    if (value == '\r') {
-        return "'\\r'";
-    } else if (value == '\f') {
-        return "'\\f'";
-    } else if (value == '\n') {
-        return "'\\n'";
-    } else if (value == '\t') {
-        return "'\\t'";
-    } else if ('\0' <= value && value < ' ') {
-        return ::Catch::Detail::stringify(static_cast<unsigned int>(value));
-    } else {
-        char chstr[] = "' '";
-        chstr[1] = value;
-        return chstr;
-    }
-}
-std::string StringMaker<char>::convert(char c) {
-    return ::Catch::Detail::stringify(static_cast<signed char>(c));
-}
-std::string StringMaker<unsigned char>::convert(unsigned char c) {
-    return ::Catch::Detail::stringify(static_cast<char>(c));
-}
-
-std::string StringMaker<std::nullptr_t>::convert(std::nullptr_t) {
-    return "nullptr";
-}
-
-int StringMaker<float>::precision = 5;
-
-std::string StringMaker<float>::convert(float value) {
-    return fpToString(value, precision) + 'f';
-}
-
-int StringMaker<double>::precision = 10;
-
-std::string StringMaker<double>::convert(double value) {
-    return fpToString(value, precision);
-}
-
-std::string ratio_string<std::atto>::symbol() { return "a"; }
-std::string ratio_string<std::femto>::symbol() { return "f"; }
-std::string ratio_string<std::pico>::symbol() { return "p"; }
-std::string ratio_string<std::nano>::symbol() { return "n"; }
-std::string ratio_string<std::micro>::symbol() { return "u"; }
-std::string ratio_string<std::milli>::symbol() { return "m"; }
-
-} // end namespace Catch
-
-#if defined(__clang__)
-#    pragma clang diagnostic pop
-#endif
-
-// end catch_tostring.cpp
-// start catch_totals.cpp
-
-namespace Catch {
-
-    Counts Counts::operator - ( Counts const& other ) const {
-        Counts diff;
-        diff.passed = passed - other.passed;
-        diff.failed = failed - other.failed;
-        diff.failedButOk = failedButOk - other.failedButOk;
-        return diff;
-    }
-
-    Counts& Counts::operator += ( Counts const& other ) {
-        passed += other.passed;
-        failed += other.failed;
-        failedButOk += other.failedButOk;
-        return *this;
-    }
-
-    std::size_t Counts::total() const {
-        return passed + failed + failedButOk;
-    }
-    bool Counts::allPassed() const {
-        return failed == 0 && failedButOk == 0;
-    }
-    bool Counts::allOk() const {
-        return failed == 0;
-    }
-
-    Totals Totals::operator - ( Totals const& other ) const {
-        Totals diff;
-        diff.assertions = assertions - other.assertions;
-        diff.testCases = testCases - other.testCases;
-        return diff;
-    }
-
-    Totals& Totals::operator += ( Totals const& other ) {
-        assertions += other.assertions;
-        testCases += other.testCases;
-        return *this;
-    }
-
-    Totals Totals::delta( Totals const& prevTotals ) const {
-        Totals diff = *this - prevTotals;
-        if( diff.assertions.failed > 0 )
-            ++diff.testCases.failed;
-        else if( diff.assertions.failedButOk > 0 )
-            ++diff.testCases.failedButOk;
-        else
-            ++diff.testCases.passed;
-        return diff;
-    }
-
-}
-// end catch_totals.cpp
-// start catch_uncaught_exceptions.cpp
-
-#include <exception>
-
-namespace Catch {
-    bool uncaught_exceptions() {
-#if defined(CATCH_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS)
-        return std::uncaught_exceptions() > 0;
-#else
-        return std::uncaught_exception();
-#endif
-  }
-} // end namespace Catch
-// end catch_uncaught_exceptions.cpp
-// start catch_version.cpp
-
-#include <ostream>
-
-namespace Catch {
-
-    Version::Version
-        (   unsigned int _majorVersion,
-            unsigned int _minorVersion,
-            unsigned int _patchNumber,
-            char const * const _branchName,
-            unsigned int _buildNumber )
-    :   majorVersion( _majorVersion ),
-        minorVersion( _minorVersion ),
-        patchNumber( _patchNumber ),
-        branchName( _branchName ),
-        buildNumber( _buildNumber )
-    {}
-
-    std::ostream& operator << ( std::ostream& os, Version const& version ) {
-        os  << version.majorVersion << '.'
-            << version.minorVersion << '.'
-            << version.patchNumber;
-        // branchName is never null -> 0th char is \0 if it is empty
-        if (version.branchName[0]) {
-            os << '-' << version.branchName
-               << '.' << version.buildNumber;
-        }
-        return os;
-    }
-
-    Version const& libraryVersion() {
-        static Version version( 2, 12, 1, "", 0 );
-        return version;
-    }
-
-}
-// end catch_version.cpp
-// start catch_wildcard_pattern.cpp
-
-namespace Catch {
-
-    WildcardPattern::WildcardPattern( std::string const& pattern,
-                                      CaseSensitive::Choice caseSensitivity )
-    :   m_caseSensitivity( caseSensitivity ),
-        m_pattern( normaliseString( pattern ) )
-    {
-        if( startsWith( m_pattern, '*' ) ) {
-            m_pattern = m_pattern.substr( 1 );
-            m_wildcard = WildcardAtStart;
-        }
-        if( endsWith( m_pattern, '*' ) ) {
-            m_pattern = m_pattern.substr( 0, m_pattern.size()-1 );
-            m_wildcard = static_cast<WildcardPosition>( m_wildcard | WildcardAtEnd );
-        }
-    }
-
-    bool WildcardPattern::matches( std::string const& str ) const {
-        switch( m_wildcard ) {
-            case NoWildcard:
-                return m_pattern == normaliseString( str );
-            case WildcardAtStart:
-                return endsWith( normaliseString( str ), m_pattern );
-            case WildcardAtEnd:
-                return startsWith( normaliseString( str ), m_pattern );
-            case WildcardAtBothEnds:
-                return contains( normaliseString( str ), m_pattern );
-            default:
-                CATCH_INTERNAL_ERROR( "Unknown enum" );
-        }
-    }
-
-    std::string WildcardPattern::normaliseString( std::string const& str ) const {
-        return trim( m_caseSensitivity == CaseSensitive::No ? toLower( str ) : str );
-    }
-}
-// end catch_wildcard_pattern.cpp
-// start catch_xmlwriter.cpp
-
-#include <iomanip>
-#include <type_traits>
-
-namespace Catch {
-
-namespace {
-
-    size_t trailingBytes(unsigned char c) {
-        if ((c & 0xE0) == 0xC0) {
-            return 2;
-        }
-        if ((c & 0xF0) == 0xE0) {
-            return 3;
-        }
-        if ((c & 0xF8) == 0xF0) {
-            return 4;
-        }
-        CATCH_INTERNAL_ERROR("Invalid multibyte utf-8 start byte encountered");
-    }
-
-    uint32_t headerValue(unsigned char c) {
-        if ((c & 0xE0) == 0xC0) {
-            return c & 0x1F;
-        }
-        if ((c & 0xF0) == 0xE0) {
-            return c & 0x0F;
-        }
-        if ((c & 0xF8) == 0xF0) {
-            return c & 0x07;
-        }
-        CATCH_INTERNAL_ERROR("Invalid multibyte utf-8 start byte encountered");
-    }
-
-    void hexEscapeChar(std::ostream& os, unsigned char c) {
-        std::ios_base::fmtflags f(os.flags());
-        os << "\\x"
-            << std::uppercase << std::hex << std::setfill('0') << std::setw(2)
-            << static_cast<int>(c);
-        os.flags(f);
-    }
-
-    bool shouldNewline(XmlFormatting fmt) {
-        return !!(static_cast<std::underlying_type<XmlFormatting>::type>(fmt & XmlFormatting::Newline));
-    }
-
-    bool shouldIndent(XmlFormatting fmt) {
-        return !!(static_cast<std::underlying_type<XmlFormatting>::type>(fmt & XmlFormatting::Indent));
-    }
-
-} // anonymous namespace
-
-    XmlFormatting operator | (XmlFormatting lhs, XmlFormatting rhs) {
-        return static_cast<XmlFormatting>(
-            static_cast<std::underlying_type<XmlFormatting>::type>(lhs) |
-            static_cast<std::underlying_type<XmlFormatting>::type>(rhs)
-        );
-    }
-
-    XmlFormatting operator & (XmlFormatting lhs, XmlFormatting rhs) {
-        return static_cast<XmlFormatting>(
-            static_cast<std::underlying_type<XmlFormatting>::type>(lhs) &
-            static_cast<std::underlying_type<XmlFormatting>::type>(rhs)
-        );
-    }
-
-    XmlEncode::XmlEncode( std::string const& str, ForWhat forWhat )
-    :   m_str( str ),
-        m_forWhat( forWhat )
-    {}
-
-    void XmlEncode::encodeTo( std::ostream& os ) const {
-        // Apostrophe escaping not necessary if we always use " to write attributes
-        // (see: http://www.w3.org/TR/xml/#syntax)
-
-        for( std::size_t idx = 0; idx < m_str.size(); ++ idx ) {
-            unsigned char c = m_str[idx];
-            switch (c) {
-            case '<':   os << "&lt;"; break;
-            case '&':   os << "&amp;"; break;
-
-            case '>':
-                // See: http://www.w3.org/TR/xml/#syntax
-                if (idx > 2 && m_str[idx - 1] == ']' && m_str[idx - 2] == ']')
-                    os << "&gt;";
-                else
-                    os << c;
-                break;
-
-            case '\"':
-                if (m_forWhat == ForAttributes)
-                    os << "&quot;";
-                else
-                    os << c;
-                break;
-
-            default:
-                // Check for control characters and invalid utf-8
-
-                // Escape control characters in standard ascii
-                // see http://stackoverflow.com/questions/404107/why-are-control-characters-illegal-in-xml-1-0
-                if (c < 0x09 || (c > 0x0D && c < 0x20) || c == 0x7F) {
-                    hexEscapeChar(os, c);
-                    break;
-                }
-
-                // Plain ASCII: Write it to stream
-                if (c < 0x7F) {
-                    os << c;
-                    break;
-                }
-
-                // UTF-8 territory
-                // Check if the encoding is valid and if it is not, hex escape bytes.
-                // Important: We do not check the exact decoded values for validity, only the encoding format
-                // First check that this bytes is a valid lead byte:
-                // This means that it is not encoded as 1111 1XXX
-                // Or as 10XX XXXX
-                if (c <  0xC0 ||
-                    c >= 0xF8) {
-                    hexEscapeChar(os, c);
-                    break;
-                }
-
-                auto encBytes = trailingBytes(c);
-                // Are there enough bytes left to avoid accessing out-of-bounds memory?
-                if (idx + encBytes - 1 >= m_str.size()) {
-                    hexEscapeChar(os, c);
-                    break;
-                }
-                // The header is valid, check data
-                // The next encBytes bytes must together be a valid utf-8
-                // This means: bitpattern 10XX XXXX and the extracted value is sane (ish)
-                bool valid = true;
-                uint32_t value = headerValue(c);
-                for (std::size_t n = 1; n < encBytes; ++n) {
-                    unsigned char nc = m_str[idx + n];
-                    valid &= ((nc & 0xC0) == 0x80);
-                    value = (value << 6) | (nc & 0x3F);
-                }
-
-                if (
-                    // Wrong bit pattern of following bytes
-                    (!valid) ||
-                    // Overlong encodings
-                    (value < 0x80) ||
-                    (0x80 <= value && value < 0x800   && encBytes > 2) ||
-                    (0x800 < value && value < 0x10000 && encBytes > 3) ||
-                    // Encoded value out of range
-                    (value >= 0x110000)
-                    ) {
-                    hexEscapeChar(os, c);
-                    break;
-                }
-
-                // If we got here, this is in fact a valid(ish) utf-8 sequence
-                for (std::size_t n = 0; n < encBytes; ++n) {
-                    os << m_str[idx + n];
-                }
-                idx += encBytes - 1;
-                break;
-            }
-        }
-    }
-
-    std::ostream& operator << ( std::ostream& os, XmlEncode const& xmlEncode ) {
-        xmlEncode.encodeTo( os );
-        return os;
-    }
-
-    XmlWriter::ScopedElement::ScopedElement( XmlWriter* writer, XmlFormatting fmt )
-    :   m_writer( writer ),
-        m_fmt(fmt)
-    {}
-
-    XmlWriter::ScopedElement::ScopedElement( ScopedElement&& other ) noexcept
-    :   m_writer( other.m_writer ),
-        m_fmt(other.m_fmt)
-    {
-        other.m_writer = nullptr;
-        other.m_fmt = XmlFormatting::None;
-    }
-    XmlWriter::ScopedElement& XmlWriter::ScopedElement::operator=( ScopedElement&& other ) noexcept {
-        if ( m_writer ) {
-            m_writer->endElement();
-        }
-        m_writer = other.m_writer;
-        other.m_writer = nullptr;
-        m_fmt = other.m_fmt;
-        other.m_fmt = XmlFormatting::None;
-        return *this;
-    }
-
-    XmlWriter::ScopedElement::~ScopedElement() {
-        if (m_writer) {
-            m_writer->endElement(m_fmt);
-        }
-    }
-
-    XmlWriter::ScopedElement& XmlWriter::ScopedElement::writeText( std::string const& text, XmlFormatting fmt ) {
-        m_writer->writeText( text, fmt );
-        return *this;
-    }
-
-    XmlWriter::XmlWriter( std::ostream& os ) : m_os( os )
-    {
-        writeDeclaration();
-    }
-
-    XmlWriter::~XmlWriter() {
-        while (!m_tags.empty()) {
-            endElement();
-        }
-        newlineIfNecessary();
-    }
-
-    XmlWriter& XmlWriter::startElement( std::string const& name, XmlFormatting fmt ) {
-        ensureTagClosed();
-        newlineIfNecessary();
-        if (shouldIndent(fmt)) {
-            m_os << m_indent;
-            m_indent += "  ";
-        }
-        m_os << '<' << name;
-        m_tags.push_back( name );
-        m_tagIsOpen = true;
-        applyFormatting(fmt);
-        return *this;
-    }
-
-    XmlWriter::ScopedElement XmlWriter::scopedElement( std::string const& name, XmlFormatting fmt ) {
-        ScopedElement scoped( this, fmt );
-        startElement( name, fmt );
-        return scoped;
-    }
-
-    XmlWriter& XmlWriter::endElement(XmlFormatting fmt) {
-        m_indent = m_indent.substr(0, m_indent.size() - 2);
-
-        if( m_tagIsOpen ) {
-            m_os << "/>";
-            m_tagIsOpen = false;
-        } else {
-            newlineIfNecessary();
-            if (shouldIndent(fmt)) {
-                m_os << m_indent;
-            }
-            m_os << "</" << m_tags.back() << ">";
-        }
-        m_os << std::flush;
-        applyFormatting(fmt);
-        m_tags.pop_back();
-        return *this;
-    }
-
-    XmlWriter& XmlWriter::writeAttribute( std::string const& name, std::string const& attribute ) {
-        if( !name.empty() && !attribute.empty() )
-            m_os << ' ' << name << "=\"" << XmlEncode( attribute, XmlEncode::ForAttributes ) << '"';
-        return *this;
-    }
-
-    XmlWriter& XmlWriter::writeAttribute( std::string const& name, bool attribute ) {
-        m_os << ' ' << name << "=\"" << ( attribute ? "true" : "false" ) << '"';
-        return *this;
-    }
-
-    XmlWriter& XmlWriter::writeText( std::string const& text, XmlFormatting fmt) {
-        if( !text.empty() ){
-            bool tagWasOpen = m_tagIsOpen;
-            ensureTagClosed();
-            if (tagWasOpen && shouldIndent(fmt)) {
-                m_os << m_indent;
-            }
-            m_os << XmlEncode( text );
-            applyFormatting(fmt);
-        }
-        return *this;
-    }
-
-    XmlWriter& XmlWriter::writeComment( std::string const& text, XmlFormatting fmt) {
-        ensureTagClosed();
-        if (shouldIndent(fmt)) {
-            m_os << m_indent;
-        }
-        m_os << "<!--" << text << "-->";
-        applyFormatting(fmt);
-        return *this;
-    }
-
-    void XmlWriter::writeStylesheetRef( std::string const& url ) {
-        m_os << "<?xml-stylesheet type=\"text/xsl\" href=\"" << url << "\"?>\n";
-    }
-
-    XmlWriter& XmlWriter::writeBlankLine() {
-        ensureTagClosed();
-        m_os << '\n';
-        return *this;
-    }
-
-    void XmlWriter::ensureTagClosed() {
-        if( m_tagIsOpen ) {
-            m_os << '>' << std::flush;
-            newlineIfNecessary();
-            m_tagIsOpen = false;
-        }
-    }
-
-    void XmlWriter::applyFormatting(XmlFormatting fmt) {
-        m_needsNewline = shouldNewline(fmt);
-    }
-
-    void XmlWriter::writeDeclaration() {
-        m_os << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
-    }
-
-    void XmlWriter::newlineIfNecessary() {
-        if( m_needsNewline ) {
-            m_os << std::endl;
-            m_needsNewline = false;
-        }
-    }
-}
-// end catch_xmlwriter.cpp
-// start catch_reporter_bases.cpp
-
-#include <cstring>
-#include <cfloat>
-#include <cstdio>
-#include <cassert>
-#include <memory>
-
-namespace Catch {
-    void prepareExpandedExpression(AssertionResult& result) {
-        result.getExpandedExpression();
-    }
-
-    // Because formatting using c++ streams is stateful, drop down to C is required
-    // Alternatively we could use stringstream, but its performance is... not good.
-    std::string getFormattedDuration( double duration ) {
-        // Max exponent + 1 is required to represent the whole part
-        // + 1 for decimal point
-        // + 3 for the 3 decimal places
-        // + 1 for null terminator
-        const std::size_t maxDoubleSize = DBL_MAX_10_EXP + 1 + 1 + 3 + 1;
-        char buffer[maxDoubleSize];
-
-        // Save previous errno, to prevent sprintf from overwriting it
-        ErrnoGuard guard;
-#ifdef _MSC_VER
-        sprintf_s(buffer, "%.3f", duration);
-#else
-        std::sprintf(buffer, "%.3f", duration);
-#endif
-        return std::string(buffer);
-    }
-
-    std::string serializeFilters( std::vector<std::string> const& container ) {
-        ReusableStringStream oss;
-        bool first = true;
-        for (auto&& filter : container)
-        {
-            if (!first)
-                oss << ' ';
-            else
-                first = false;
-
-            oss << filter;
-        }
-        return oss.str();
-    }
-
-    TestEventListenerBase::TestEventListenerBase(ReporterConfig const & _config)
-        :StreamingReporterBase(_config) {}
-
-    std::set<Verbosity> TestEventListenerBase::getSupportedVerbosities() {
-        return { Verbosity::Quiet, Verbosity::Normal, Verbosity::High };
-    }
-
-    void TestEventListenerBase::assertionStarting(AssertionInfo const &) {}
-
-    bool TestEventListenerBase::assertionEnded(AssertionStats const &) {
-        return false;
-    }
-
-} // end namespace Catch
-// end catch_reporter_bases.cpp
-// start catch_reporter_compact.cpp
-
-namespace {
-
-#ifdef CATCH_PLATFORM_MAC
-    const char* failedString() { return "FAILED"; }
-    const char* passedString() { return "PASSED"; }
-#else
-    const char* failedString() { return "failed"; }
-    const char* passedString() { return "passed"; }
-#endif
-
-    // Colour::LightGrey
-    Catch::Colour::Code dimColour() { return Catch::Colour::FileName; }
-
-    std::string bothOrAll( std::size_t count ) {
-        return count == 1 ? std::string() :
-               count == 2 ? "both " : "all " ;
-    }
-
-} // anon namespace
-
-namespace Catch {
-namespace {
-// Colour, message variants:
-// - white: No tests ran.
-// -   red: Failed [both/all] N test cases, failed [both/all] M assertions.
-// - white: Passed [both/all] N test cases (no assertions).
-// -   red: Failed N tests cases, failed M assertions.
-// - green: Passed [both/all] N tests cases with M assertions.
-void printTotals(std::ostream& out, const Totals& totals) {
-    if (totals.testCases.total() == 0) {
-        out << "No tests ran.";
-    } else if (totals.testCases.failed == totals.testCases.total()) {
-        Colour colour(Colour::ResultError);
-        const std::string qualify_assertions_failed =
-            totals.assertions.failed == totals.assertions.total() ?
-            bothOrAll(totals.assertions.failed) : std::string();
-        out <<
-            "Failed " << bothOrAll(totals.testCases.failed)
-            << pluralise(totals.testCases.failed, "test case") << ", "
-            "failed " << qualify_assertions_failed <<
-            pluralise(totals.assertions.failed, "assertion") << '.';
-    } else if (totals.assertions.total() == 0) {
-        out <<
-            "Passed " << bothOrAll(totals.testCases.total())
-            << pluralise(totals.testCases.total(), "test case")
-            << " (no assertions).";
-    } else if (totals.assertions.failed) {
-        Colour colour(Colour::ResultError);
-        out <<
-            "Failed " << pluralise(totals.testCases.failed, "test case") << ", "
-            "failed " << pluralise(totals.assertions.failed, "assertion") << '.';
-    } else {
-        Colour colour(Colour::ResultSuccess);
-        out <<
-            "Passed " << bothOrAll(totals.testCases.passed)
-            << pluralise(totals.testCases.passed, "test case") <<
-            " with " << pluralise(totals.assertions.passed, "assertion") << '.';
-    }
-}
-
-// Implementation of CompactReporter formatting
-class AssertionPrinter {
-public:
-    AssertionPrinter& operator= (AssertionPrinter const&) = delete;
-    AssertionPrinter(AssertionPrinter const&) = delete;
-    AssertionPrinter(std::ostream& _stream, AssertionStats const& _stats, bool _printInfoMessages)
-        : stream(_stream)
-        , result(_stats.assertionResult)
-        , messages(_stats.infoMessages)
-        , itMessage(_stats.infoMessages.begin())
-        , printInfoMessages(_printInfoMessages) {}
-
-    void print() {
-        printSourceInfo();
-
-        itMessage = messages.begin();
-
-        switch (result.getResultType()) {
-        case ResultWas::Ok:
-            printResultType(Colour::ResultSuccess, passedString());
-            printOriginalExpression();
-            printReconstructedExpression();
-            if (!result.hasExpression())
-                printRemainingMessages(Colour::None);
-            else
-                printRemainingMessages();
-            break;
-        case ResultWas::ExpressionFailed:
-            if (result.isOk())
-                printResultType(Colour::ResultSuccess, failedString() + std::string(" - but was ok"));
-            else
-                printResultType(Colour::Error, failedString());
-            printOriginalExpression();
-            printReconstructedExpression();
-            printRemainingMessages();
-            break;
-        case ResultWas::ThrewException:
-            printResultType(Colour::Error, failedString());
-            printIssue("unexpected exception with message:");
-            printMessage();
-            printExpressionWas();
-            printRemainingMessages();
-            break;
-        case ResultWas::FatalErrorCondition:
-            printResultType(Colour::Error, failedString());
-            printIssue("fatal error condition with message:");
-            printMessage();
-            printExpressionWas();
-            printRemainingMessages();
-            break;
-        case ResultWas::DidntThrowException:
-            printResultType(Colour::Error, failedString());
-            printIssue("expected exception, got none");
-            printExpressionWas();
-            printRemainingMessages();
-            break;
-        case ResultWas::Info:
-            printResultType(Colour::None, "info");
-            printMessage();
-            printRemainingMessages();
-            break;
-        case ResultWas::Warning:
-            printResultType(Colour::None, "warning");
-            printMessage();
-            printRemainingMessages();
-            break;
-        case ResultWas::ExplicitFailure:
-            printResultType(Colour::Error, failedString());
-            printIssue("explicitly");
-            printRemainingMessages(Colour::None);
-            break;
-            // These cases are here to prevent compiler warnings
-        case ResultWas::Unknown:
-        case ResultWas::FailureBit:
-        case ResultWas::Exception:
-            printResultType(Colour::Error, "** internal error **");
-            break;
-        }
-    }
-
-private:
-    void printSourceInfo() const {
-        Colour colourGuard(Colour::FileName);
-        stream << result.getSourceInfo() << ':';
-    }
-
-    void printResultType(Colour::Code colour, std::string const& passOrFail) const {
-        if (!passOrFail.empty()) {
-            {
-                Colour colourGuard(colour);
-                stream << ' ' << passOrFail;
-            }
-            stream << ':';
-        }
-    }
-
-    void printIssue(std::string const& issue) const {
-        stream << ' ' << issue;
-    }
-
-    void printExpressionWas() {
-        if (result.hasExpression()) {
-            stream << ';';
-            {
-                Colour colour(dimColour());
-                stream << " expression was:";
-            }
-            printOriginalExpression();
-        }
-    }
-
-    void printOriginalExpression() const {
-        if (result.hasExpression()) {
-            stream << ' ' << result.getExpression();
-        }
-    }
-
-    void printReconstructedExpression() const {
-        if (result.hasExpandedExpression()) {
-            {
-                Colour colour(dimColour());
-                stream << " for: ";
-            }
-            stream << result.getExpandedExpression();
-        }
-    }
-
-    void printMessage() {
-        if (itMessage != messages.end()) {
-            stream << " '" << itMessage->message << '\'';
-            ++itMessage;
-        }
-    }
-
-    void printRemainingMessages(Colour::Code colour = dimColour()) {
-        if (itMessage == messages.end())
-            return;
-
-        const auto itEnd = messages.cend();
-        const auto N = static_cast<std::size_t>(std::distance(itMessage, itEnd));
-
-        {
-            Colour colourGuard(colour);
-            stream << " with " << pluralise(N, "message") << ':';
-        }
-
-        while (itMessage != itEnd) {
-            // If this assertion is a warning ignore any INFO messages
-            if (printInfoMessages || itMessage->type != ResultWas::Info) {
-                printMessage();
-                if (itMessage != itEnd) {
-                    Colour colourGuard(dimColour());
-                    stream << " and";
-                }
-                continue;
-            }
-            ++itMessage;
-        }
-    }
-
-private:
-    std::ostream& stream;
-    AssertionResult const& result;
-    std::vector<MessageInfo> messages;
-    std::vector<MessageInfo>::const_iterator itMessage;
-    bool printInfoMessages;
-};
-
-} // anon namespace
-
-        std::string CompactReporter::getDescription() {
-            return "Reports test results on a single line, suitable for IDEs";
-        }
-
-        ReporterPreferences CompactReporter::getPreferences() const {
-            return m_reporterPrefs;
-        }
-
-        void CompactReporter::noMatchingTestCases( std::string const& spec ) {
-            stream << "No test cases matched '" << spec << '\'' << std::endl;
-        }
-
-        void CompactReporter::assertionStarting( AssertionInfo const& ) {}
-
-        bool CompactReporter::assertionEnded( AssertionStats const& _assertionStats ) {
-            AssertionResult const& result = _assertionStats.assertionResult;
-
-            bool printInfoMessages = true;
-
-            // Drop out if result was successful and we're not printing those
-            if( !m_config->includeSuccessfulResults() && result.isOk() ) {
-                if( result.getResultType() != ResultWas::Warning )
-                    return false;
-                printInfoMessages = false;
-            }
-
-            AssertionPrinter printer( stream, _assertionStats, printInfoMessages );
-            printer.print();
-
-            stream << std::endl;
-            return true;
-        }
-
-        void CompactReporter::sectionEnded(SectionStats const& _sectionStats) {
-            if (m_config->showDurations() == ShowDurations::Always) {
-                stream << getFormattedDuration(_sectionStats.durationInSeconds) << " s: " << _sectionStats.sectionInfo.name << std::endl;
-            }
-        }
-
-        void CompactReporter::testRunEnded( TestRunStats const& _testRunStats ) {
-            printTotals( stream, _testRunStats.totals );
-            stream << '\n' << std::endl;
-            StreamingReporterBase::testRunEnded( _testRunStats );
-        }
-
-        CompactReporter::~CompactReporter() {}
-
-    CATCH_REGISTER_REPORTER( "compact", CompactReporter )
-
-} // end namespace Catch
-// end catch_reporter_compact.cpp
-// start catch_reporter_console.cpp
-
-#include <cfloat>
-#include <cstdio>
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4061) // Not all labels are EXPLICITLY handled in switch
- // Note that 4062 (not all labels are handled and default is missing) is enabled
-#endif
-
-#if defined(__clang__)
-#  pragma clang diagnostic push
-// For simplicity, benchmarking-only helpers are always enabled
-#  pragma clang diagnostic ignored "-Wunused-function"
-#endif
-
-namespace Catch {
-
-namespace {
-
-// Formatter impl for ConsoleReporter
-class ConsoleAssertionPrinter {
-public:
-    ConsoleAssertionPrinter& operator= (ConsoleAssertionPrinter const&) = delete;
-    ConsoleAssertionPrinter(ConsoleAssertionPrinter const&) = delete;
-    ConsoleAssertionPrinter(std::ostream& _stream, AssertionStats const& _stats, bool _printInfoMessages)
-        : stream(_stream),
-        stats(_stats),
-        result(_stats.assertionResult),
-        colour(Colour::None),
-        message(result.getMessage()),
-        messages(_stats.infoMessages),
-        printInfoMessages(_printInfoMessages) {
-        switch (result.getResultType()) {
-        case ResultWas::Ok:
-            colour = Colour::Success;
-            passOrFail = "PASSED";
-            //if( result.hasMessage() )
-            if (_stats.infoMessages.size() == 1)
-                messageLabel = "with message";
-            if (_stats.infoMessages.size() > 1)
-                messageLabel = "with messages";
-            break;
-        case ResultWas::ExpressionFailed:
-            if (result.isOk()) {
-                colour = Colour::Success;
-                passOrFail = "FAILED - but was ok";
-            } else {
-                colour = Colour::Error;
-                passOrFail = "FAILED";
-            }
-            if (_stats.infoMessages.size() == 1)
-                messageLabel = "with message";
-            if (_stats.infoMessages.size() > 1)
-                messageLabel = "with messages";
-            break;
-        case ResultWas::ThrewException:
-            colour = Colour::Error;
-            passOrFail = "FAILED";
-            messageLabel = "due to unexpected exception with ";
-            if (_stats.infoMessages.size() == 1)
-                messageLabel += "message";
-            if (_stats.infoMessages.size() > 1)
-                messageLabel += "messages";
-            break;
-        case ResultWas::FatalErrorCondition:
-            colour = Colour::Error;
-            passOrFail = "FAILED";
-            messageLabel = "due to a fatal error condition";
-            break;
-        case ResultWas::DidntThrowException:
-            colour = Colour::Error;
-            passOrFail = "FAILED";
-            messageLabel = "because no exception was thrown where one was expected";
-            break;
-        case ResultWas::Info:
-            messageLabel = "info";
-            break;
-        case ResultWas::Warning:
-            messageLabel = "warning";
-            break;
-        case ResultWas::ExplicitFailure:
-            passOrFail = "FAILED";
-            colour = Colour::Error;
-            if (_stats.infoMessages.size() == 1)
-                messageLabel = "explicitly with message";
-            if (_stats.infoMessages.size() > 1)
-                messageLabel = "explicitly with messages";
-            break;
-            // These cases are here to prevent compiler warnings
-        case ResultWas::Unknown:
-        case ResultWas::FailureBit:
-        case ResultWas::Exception:
-            passOrFail = "** internal error **";
-            colour = Colour::Error;
-            break;
-        }
-    }
-
-    void print() const {
-        printSourceInfo();
-        if (stats.totals.assertions.total() > 0) {
-            printResultType();
-            printOriginalExpression();
-            printReconstructedExpression();
-        } else {
-            stream << '\n';
-        }
-        printMessage();
-    }
-
-private:
-    void printResultType() const {
-        if (!passOrFail.empty()) {
-            Colour colourGuard(colour);
-            stream << passOrFail << ":\n";
-        }
-    }
-    void printOriginalExpression() const {
-        if (result.hasExpression()) {
-            Colour colourGuard(Colour::OriginalExpression);
-            stream << "  ";
-            stream << result.getExpressionInMacro();
-            stream << '\n';
-        }
-    }
-    void printReconstructedExpression() const {
-        if (result.hasExpandedExpression()) {
-            stream << "with expansion:\n";
-            Colour colourGuard(Colour::ReconstructedExpression);
-            stream << Column(result.getExpandedExpression()).indent(2) << '\n';
-        }
-    }
-    void printMessage() const {
-        if (!messageLabel.empty())
-            stream << messageLabel << ':' << '\n';
-        for (auto const& msg : messages) {
-            // If this assertion is a warning ignore any INFO messages
-            if (printInfoMessages || msg.type != ResultWas::Info)
-                stream << Column(msg.message).indent(2) << '\n';
-        }
-    }
-    void printSourceInfo() const {
-        Colour colourGuard(Colour::FileName);
-        stream << result.getSourceInfo() << ": ";
-    }
-
-    std::ostream& stream;
-    AssertionStats const& stats;
-    AssertionResult const& result;
-    Colour::Code colour;
-    std::string passOrFail;
-    std::string messageLabel;
-    std::string message;
-    std::vector<MessageInfo> messages;
-    bool printInfoMessages;
-};
-
-std::size_t makeRatio(std::size_t number, std::size_t total) {
-    std::size_t ratio = total > 0 ? CATCH_CONFIG_CONSOLE_WIDTH * number / total : 0;
-    return (ratio == 0 && number > 0) ? 1 : ratio;
-}
-
-std::size_t& findMax(std::size_t& i, std::size_t& j, std::size_t& k) {
-    if (i > j && i > k)
-        return i;
-    else if (j > k)
-        return j;
-    else
-        return k;
-}
-
-struct ColumnInfo {
-    enum Justification { Left, Right };
-    std::string name;
-    int width;
-    Justification justification;
-};
-struct ColumnBreak {};
-struct RowBreak {};
-
-class Duration {
-    enum class Unit {
-        Auto,
-        Nanoseconds,
-        Microseconds,
-        Milliseconds,
-        Seconds,
-        Minutes
-    };
-    static const uint64_t s_nanosecondsInAMicrosecond = 1000;
-    static const uint64_t s_nanosecondsInAMillisecond = 1000 * s_nanosecondsInAMicrosecond;
-    static const uint64_t s_nanosecondsInASecond = 1000 * s_nanosecondsInAMillisecond;
-    static const uint64_t s_nanosecondsInAMinute = 60 * s_nanosecondsInASecond;
-
-    double m_inNanoseconds;
-    Unit m_units;
-
-public:
-    explicit Duration(double inNanoseconds, Unit units = Unit::Auto)
-        : m_inNanoseconds(inNanoseconds),
-        m_units(units) {
-        if (m_units == Unit::Auto) {
-            if (m_inNanoseconds < s_nanosecondsInAMicrosecond)
-                m_units = Unit::Nanoseconds;
-            else if (m_inNanoseconds < s_nanosecondsInAMillisecond)
-                m_units = Unit::Microseconds;
-            else if (m_inNanoseconds < s_nanosecondsInASecond)
-                m_units = Unit::Milliseconds;
-            else if (m_inNanoseconds < s_nanosecondsInAMinute)
-                m_units = Unit::Seconds;
-            else
-                m_units = Unit::Minutes;
-        }
-
-    }
-
-    auto value() const -> double {
-        switch (m_units) {
-        case Unit::Microseconds:
-            return m_inNanoseconds / static_cast<double>(s_nanosecondsInAMicrosecond);
-        case Unit::Milliseconds:
-            return m_inNanoseconds / static_cast<double>(s_nanosecondsInAMillisecond);
-        case Unit::Seconds:
-            return m_inNanoseconds / static_cast<double>(s_nanosecondsInASecond);
-        case Unit::Minutes:
-            return m_inNanoseconds / static_cast<double>(s_nanosecondsInAMinute);
-        default:
-            return m_inNanoseconds;
-        }
-    }
-    auto unitsAsString() const -> std::string {
-        switch (m_units) {
-        case Unit::Nanoseconds:
-            return "ns";
-        case Unit::Microseconds:
-            return "us";
-        case Unit::Milliseconds:
-            return "ms";
-        case Unit::Seconds:
-            return "s";
-        case Unit::Minutes:
-            return "m";
-        default:
-            return "** internal error **";
-        }
-
-    }
-    friend auto operator << (std::ostream& os, Duration const& duration) -> std::ostream& {
-        return os << duration.value() << ' ' << duration.unitsAsString();
-    }
-};
-} // end anon namespace
-
-class TablePrinter {
-    std::ostream& m_os;
-    std::vector<ColumnInfo> m_columnInfos;
-    std::ostringstream m_oss;
-    int m_currentColumn = -1;
-    bool m_isOpen = false;
-
-public:
-    TablePrinter( std::ostream& os, std::vector<ColumnInfo> columnInfos )
-    :   m_os( os ),
-        m_columnInfos( std::move( columnInfos ) ) {}
-
-    auto columnInfos() const -> std::vector<ColumnInfo> const& {
-        return m_columnInfos;
-    }
-
-    void open() {
-        if (!m_isOpen) {
-            m_isOpen = true;
-            *this << RowBreak();
-
-			Columns headerCols;
-			Spacer spacer(2);
-			for (auto const& info : m_columnInfos) {
-				headerCols += Column(info.name).width(static_cast<std::size_t>(info.width - 2));
-				headerCols += spacer;
-			}
-			m_os << headerCols << '\n';
-
-            m_os << Catch::getLineOfChars<'-'>() << '\n';
-        }
-    }
-    void close() {
-        if (m_isOpen) {
-            *this << RowBreak();
-            m_os << std::endl;
-            m_isOpen = false;
-        }
-    }
-
-    template<typename T>
-    friend TablePrinter& operator << (TablePrinter& tp, T const& value) {
-        tp.m_oss << value;
-        return tp;
-    }
-
-    friend TablePrinter& operator << (TablePrinter& tp, ColumnBreak) {
-        auto colStr = tp.m_oss.str();
-        const auto strSize = colStr.size();
-        tp.m_oss.str("");
-        tp.open();
-        if (tp.m_currentColumn == static_cast<int>(tp.m_columnInfos.size() - 1)) {
-            tp.m_currentColumn = -1;
-            tp.m_os << '\n';
-        }
-        tp.m_currentColumn++;
-
-        auto colInfo = tp.m_columnInfos[tp.m_currentColumn];
-        auto padding = (strSize + 1 < static_cast<std::size_t>(colInfo.width))
-            ? std::string(colInfo.width - (strSize + 1), ' ')
-            : std::string();
-        if (colInfo.justification == ColumnInfo::Left)
-            tp.m_os << colStr << padding << ' ';
-        else
-            tp.m_os << padding << colStr << ' ';
-        return tp;
-    }
-
-    friend TablePrinter& operator << (TablePrinter& tp, RowBreak) {
-        if (tp.m_currentColumn > 0) {
-            tp.m_os << '\n';
-            tp.m_currentColumn = -1;
-        }
-        return tp;
-    }
-};
-
-ConsoleReporter::ConsoleReporter(ReporterConfig const& config)
-    : StreamingReporterBase(config),
-    m_tablePrinter(new TablePrinter(config.stream(),
-        [&config]() -> std::vector<ColumnInfo> {
-        if (config.fullConfig()->benchmarkNoAnalysis())
-        {
-            return{
-                { "benchmark name", CATCH_CONFIG_CONSOLE_WIDTH - 43, ColumnInfo::Left },
-                { "     samples", 14, ColumnInfo::Right },
-                { "  iterations", 14, ColumnInfo::Right },
-                { "        mean", 14, ColumnInfo::Right }
-            };
-        }
-        else
-        {
-            return{
-                { "benchmark name", CATCH_CONFIG_CONSOLE_WIDTH - 43, ColumnInfo::Left },
-                { "samples      mean       std dev", 14, ColumnInfo::Right },
-                { "iterations   low mean   low std dev", 14, ColumnInfo::Right },
-                { "estimated    high mean  high std dev", 14, ColumnInfo::Right }
-            };
-        }
-    }())) {}
-ConsoleReporter::~ConsoleReporter() = default;
-
-std::string ConsoleReporter::getDescription() {
-    return "Reports test results as plain lines of text";
-}
-
-void ConsoleReporter::noMatchingTestCases(std::string const& spec) {
-    stream << "No test cases matched '" << spec << '\'' << std::endl;
-}
-
-void ConsoleReporter::reportInvalidArguments(std::string const&arg){
-    stream << "Invalid Filter: " << arg << std::endl;
-}
-
-void ConsoleReporter::assertionStarting(AssertionInfo const&) {}
-
-bool ConsoleReporter::assertionEnded(AssertionStats const& _assertionStats) {
-    AssertionResult const& result = _assertionStats.assertionResult;
-
-    bool includeResults = m_config->includeSuccessfulResults() || !result.isOk();
-
-    // Drop out if result was successful but we're not printing them.
-    if (!includeResults && result.getResultType() != ResultWas::Warning)
-        return false;
-
-    lazyPrint();
-
-    ConsoleAssertionPrinter printer(stream, _assertionStats, includeResults);
-    printer.print();
-    stream << std::endl;
-    return true;
-}
-
-void ConsoleReporter::sectionStarting(SectionInfo const& _sectionInfo) {
-    m_tablePrinter->close();
-    m_headerPrinted = false;
-    StreamingReporterBase::sectionStarting(_sectionInfo);
-}
-void ConsoleReporter::sectionEnded(SectionStats const& _sectionStats) {
-    m_tablePrinter->close();
-    if (_sectionStats.missingAssertions) {
-        lazyPrint();
-        Colour colour(Colour::ResultError);
-        if (m_sectionStack.size() > 1)
-            stream << "\nNo assertions in section";
-        else
-            stream << "\nNo assertions in test case";
-        stream << " '" << _sectionStats.sectionInfo.name << "'\n" << std::endl;
-    }
-    if (m_config->showDurations() == ShowDurations::Always) {
-        stream << getFormattedDuration(_sectionStats.durationInSeconds) << " s: " << _sectionStats.sectionInfo.name << std::endl;
-    }
-    if (m_headerPrinted) {
-        m_headerPrinted = false;
-    }
-    StreamingReporterBase::sectionEnded(_sectionStats);
-}
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-void ConsoleReporter::benchmarkPreparing(std::string const& name) {
-	lazyPrintWithoutClosingBenchmarkTable();
-
-	auto nameCol = Column(name).width(static_cast<std::size_t>(m_tablePrinter->columnInfos()[0].width - 2));
-
-	bool firstLine = true;
-	for (auto line : nameCol) {
-		if (!firstLine)
-			(*m_tablePrinter) << ColumnBreak() << ColumnBreak() << ColumnBreak();
-		else
-			firstLine = false;
-
-		(*m_tablePrinter) << line << ColumnBreak();
-	}
-}
-
-void ConsoleReporter::benchmarkStarting(BenchmarkInfo const& info) {
-    (*m_tablePrinter) << info.samples << ColumnBreak()
-        << info.iterations << ColumnBreak();
-    if (!m_config->benchmarkNoAnalysis())
-        (*m_tablePrinter) << Duration(info.estimatedDuration) << ColumnBreak();
-}
-void ConsoleReporter::benchmarkEnded(BenchmarkStats<> const& stats) {
-    if (m_config->benchmarkNoAnalysis())
-    {
-        (*m_tablePrinter) << Duration(stats.mean.point.count()) << ColumnBreak();
-    }
-    else
-    {
-        (*m_tablePrinter) << ColumnBreak()
-            << Duration(stats.mean.point.count()) << ColumnBreak()
-            << Duration(stats.mean.lower_bound.count()) << ColumnBreak()
-            << Duration(stats.mean.upper_bound.count()) << ColumnBreak() << ColumnBreak()
-            << Duration(stats.standardDeviation.point.count()) << ColumnBreak()
-            << Duration(stats.standardDeviation.lower_bound.count()) << ColumnBreak()
-            << Duration(stats.standardDeviation.upper_bound.count()) << ColumnBreak() << ColumnBreak() << ColumnBreak() << ColumnBreak() << ColumnBreak();
-    }
-}
-
-void ConsoleReporter::benchmarkFailed(std::string const& error) {
-	Colour colour(Colour::Red);
-    (*m_tablePrinter)
-        << "Benchmark failed (" << error << ')'
-        << ColumnBreak() << RowBreak();
-}
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-void ConsoleReporter::testCaseEnded(TestCaseStats const& _testCaseStats) {
-    m_tablePrinter->close();
-    StreamingReporterBase::testCaseEnded(_testCaseStats);
-    m_headerPrinted = false;
-}
-void ConsoleReporter::testGroupEnded(TestGroupStats const& _testGroupStats) {
-    if (currentGroupInfo.used) {
-        printSummaryDivider();
-        stream << "Summary for group '" << _testGroupStats.groupInfo.name << "':\n";
-        printTotals(_testGroupStats.totals);
-        stream << '\n' << std::endl;
-    }
-    StreamingReporterBase::testGroupEnded(_testGroupStats);
-}
-void ConsoleReporter::testRunEnded(TestRunStats const& _testRunStats) {
-    printTotalsDivider(_testRunStats.totals);
-    printTotals(_testRunStats.totals);
-    stream << std::endl;
-    StreamingReporterBase::testRunEnded(_testRunStats);
-}
-void ConsoleReporter::testRunStarting(TestRunInfo const& _testInfo) {
-    StreamingReporterBase::testRunStarting(_testInfo);
-    printTestFilters();
-}
-
-void ConsoleReporter::lazyPrint() {
-
-    m_tablePrinter->close();
-    lazyPrintWithoutClosingBenchmarkTable();
-}
-
-void ConsoleReporter::lazyPrintWithoutClosingBenchmarkTable() {
-
-    if (!currentTestRunInfo.used)
-        lazyPrintRunInfo();
-    if (!currentGroupInfo.used)
-        lazyPrintGroupInfo();
-
-    if (!m_headerPrinted) {
-        printTestCaseAndSectionHeader();
-        m_headerPrinted = true;
-    }
-}
-void ConsoleReporter::lazyPrintRunInfo() {
-    stream << '\n' << getLineOfChars<'~'>() << '\n';
-    Colour colour(Colour::SecondaryText);
-    stream << currentTestRunInfo->name
-        << " is a Catch v" << libraryVersion() << " host application.\n"
-        << "Run with -? for options\n\n";
-
-    if (m_config->rngSeed() != 0)
-        stream << "Randomness seeded to: " << m_config->rngSeed() << "\n\n";
-
-    currentTestRunInfo.used = true;
-}
-void ConsoleReporter::lazyPrintGroupInfo() {
-    if (!currentGroupInfo->name.empty() && currentGroupInfo->groupsCounts > 1) {
-        printClosedHeader("Group: " + currentGroupInfo->name);
-        currentGroupInfo.used = true;
-    }
-}
-void ConsoleReporter::printTestCaseAndSectionHeader() {
-    assert(!m_sectionStack.empty());
-    printOpenHeader(currentTestCaseInfo->name);
-
-    if (m_sectionStack.size() > 1) {
-        Colour colourGuard(Colour::Headers);
-
-        auto
-            it = m_sectionStack.begin() + 1, // Skip first section (test case)
-            itEnd = m_sectionStack.end();
-        for (; it != itEnd; ++it)
-            printHeaderString(it->name, 2);
-    }
-
-    SourceLineInfo lineInfo = m_sectionStack.back().lineInfo;
-
-    stream << getLineOfChars<'-'>() << '\n';
-    Colour colourGuard(Colour::FileName);
-    stream << lineInfo << '\n';
-    stream << getLineOfChars<'.'>() << '\n' << std::endl;
-}
-
-void ConsoleReporter::printClosedHeader(std::string const& _name) {
-    printOpenHeader(_name);
-    stream << getLineOfChars<'.'>() << '\n';
-}
-void ConsoleReporter::printOpenHeader(std::string const& _name) {
-    stream << getLineOfChars<'-'>() << '\n';
-    {
-        Colour colourGuard(Colour::Headers);
-        printHeaderString(_name);
-    }
-}
-
-// if string has a : in first line will set indent to follow it on
-// subsequent lines
-void ConsoleReporter::printHeaderString(std::string const& _string, std::size_t indent) {
-    std::size_t i = _string.find(": ");
-    if (i != std::string::npos)
-        i += 2;
-    else
-        i = 0;
-    stream << Column(_string).indent(indent + i).initialIndent(indent) << '\n';
-}
-
-struct SummaryColumn {
-
-    SummaryColumn( std::string _label, Colour::Code _colour )
-    :   label( std::move( _label ) ),
-        colour( _colour ) {}
-    SummaryColumn addRow( std::size_t count ) {
-        ReusableStringStream rss;
-        rss << count;
-        std::string row = rss.str();
-        for (auto& oldRow : rows) {
-            while (oldRow.size() < row.size())
-                oldRow = ' ' + oldRow;
-            while (oldRow.size() > row.size())
-                row = ' ' + row;
-        }
-        rows.push_back(row);
-        return *this;
-    }
-
-    std::string label;
-    Colour::Code colour;
-    std::vector<std::string> rows;
-
-};
-
-void ConsoleReporter::printTotals( Totals const& totals ) {
-    if (totals.testCases.total() == 0) {
-        stream << Colour(Colour::Warning) << "No tests ran\n";
-    } else if (totals.assertions.total() > 0 && totals.testCases.allPassed()) {
-        stream << Colour(Colour::ResultSuccess) << "All tests passed";
-        stream << " ("
-            << pluralise(totals.assertions.passed, "assertion") << " in "
-            << pluralise(totals.testCases.passed, "test case") << ')'
-            << '\n';
-    } else {
-
-        std::vector<SummaryColumn> columns;
-        columns.push_back(SummaryColumn("", Colour::None)
-                          .addRow(totals.testCases.total())
-                          .addRow(totals.assertions.total()));
-        columns.push_back(SummaryColumn("passed", Colour::Success)
-                          .addRow(totals.testCases.passed)
-                          .addRow(totals.assertions.passed));
-        columns.push_back(SummaryColumn("failed", Colour::ResultError)
-                          .addRow(totals.testCases.failed)
-                          .addRow(totals.assertions.failed));
-        columns.push_back(SummaryColumn("failed as expected", Colour::ResultExpectedFailure)
-                          .addRow(totals.testCases.failedButOk)
-                          .addRow(totals.assertions.failedButOk));
-
-        printSummaryRow("test cases", columns, 0);
-        printSummaryRow("assertions", columns, 1);
-    }
-}
-void ConsoleReporter::printSummaryRow(std::string const& label, std::vector<SummaryColumn> const& cols, std::size_t row) {
-    for (auto col : cols) {
-        std::string value = col.rows[row];
-        if (col.label.empty()) {
-            stream << label << ": ";
-            if (value != "0")
-                stream << value;
-            else
-                stream << Colour(Colour::Warning) << "- none -";
-        } else if (value != "0") {
-            stream << Colour(Colour::LightGrey) << " | ";
-            stream << Colour(col.colour)
-                << value << ' ' << col.label;
-        }
-    }
-    stream << '\n';
-}
-
-void ConsoleReporter::printTotalsDivider(Totals const& totals) {
-    if (totals.testCases.total() > 0) {
-        std::size_t failedRatio = makeRatio(totals.testCases.failed, totals.testCases.total());
-        std::size_t failedButOkRatio = makeRatio(totals.testCases.failedButOk, totals.testCases.total());
-        std::size_t passedRatio = makeRatio(totals.testCases.passed, totals.testCases.total());
-        while (failedRatio + failedButOkRatio + passedRatio < CATCH_CONFIG_CONSOLE_WIDTH - 1)
-            findMax(failedRatio, failedButOkRatio, passedRatio)++;
-        while (failedRatio + failedButOkRatio + passedRatio > CATCH_CONFIG_CONSOLE_WIDTH - 1)
-            findMax(failedRatio, failedButOkRatio, passedRatio)--;
-
-        stream << Colour(Colour::Error) << std::string(failedRatio, '=');
-        stream << Colour(Colour::ResultExpectedFailure) << std::string(failedButOkRatio, '=');
-        if (totals.testCases.allPassed())
-            stream << Colour(Colour::ResultSuccess) << std::string(passedRatio, '=');
-        else
-            stream << Colour(Colour::Success) << std::string(passedRatio, '=');
-    } else {
-        stream << Colour(Colour::Warning) << std::string(CATCH_CONFIG_CONSOLE_WIDTH - 1, '=');
-    }
-    stream << '\n';
-}
-void ConsoleReporter::printSummaryDivider() {
-    stream << getLineOfChars<'-'>() << '\n';
-}
-
-void ConsoleReporter::printTestFilters() {
-    if (m_config->testSpec().hasFilters()) {
-        Colour guard(Colour::BrightYellow);
-        stream << "Filters: " << serializeFilters(m_config->getTestsOrTags()) << '\n';
-    }
-}
-
-CATCH_REGISTER_REPORTER("console", ConsoleReporter)
-
-} // end namespace Catch
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
-
-#if defined(__clang__)
-#  pragma clang diagnostic pop
-#endif
-// end catch_reporter_console.cpp
-// start catch_reporter_junit.cpp
-
-#include <cassert>
-#include <sstream>
-#include <ctime>
-#include <algorithm>
-
-namespace Catch {
-
-    namespace {
-        std::string getCurrentTimestamp() {
-            // Beware, this is not reentrant because of backward compatibility issues
-            // Also, UTC only, again because of backward compatibility (%z is C++11)
-            time_t rawtime;
-            std::time(&rawtime);
-            auto const timeStampSize = sizeof("2017-01-16T17:06:45Z");
-
-#ifdef _MSC_VER
-            std::tm timeInfo = {};
-            gmtime_s(&timeInfo, &rawtime);
-#else
-            std::tm* timeInfo;
-            timeInfo = std::gmtime(&rawtime);
-#endif
-
-            char timeStamp[timeStampSize];
-            const char * const fmt = "%Y-%m-%dT%H:%M:%SZ";
-
-#ifdef _MSC_VER
-            std::strftime(timeStamp, timeStampSize, fmt, &timeInfo);
-#else
-            std::strftime(timeStamp, timeStampSize, fmt, timeInfo);
-#endif
-            return std::string(timeStamp);
-        }
-
-        std::string fileNameTag(const std::vector<std::string> &tags) {
-            auto it = std::find_if(begin(tags),
-                                   end(tags),
-                                   [] (std::string const& tag) {return tag.front() == '#'; });
-            if (it != tags.end())
-                return it->substr(1);
-            return std::string();
-        }
-    } // anonymous namespace
-
-    JunitReporter::JunitReporter( ReporterConfig const& _config )
-        :   CumulativeReporterBase( _config ),
-            xml( _config.stream() )
-        {
-            m_reporterPrefs.shouldRedirectStdOut = true;
-            m_reporterPrefs.shouldReportAllAssertions = true;
-        }
-
-    JunitReporter::~JunitReporter() {}
-
-    std::string JunitReporter::getDescription() {
-        return "Reports test results in an XML format that looks like Ant's junitreport target";
-    }
-
-    void JunitReporter::noMatchingTestCases( std::string const& /*spec*/ ) {}
-
-    void JunitReporter::testRunStarting( TestRunInfo const& runInfo )  {
-        CumulativeReporterBase::testRunStarting( runInfo );
-        xml.startElement( "testsuites" );
-    }
-
-    void JunitReporter::testGroupStarting( GroupInfo const& groupInfo ) {
-        suiteTimer.start();
-        stdOutForSuite.clear();
-        stdErrForSuite.clear();
-        unexpectedExceptions = 0;
-        CumulativeReporterBase::testGroupStarting( groupInfo );
-    }
-
-    void JunitReporter::testCaseStarting( TestCaseInfo const& testCaseInfo ) {
-        m_okToFail = testCaseInfo.okToFail();
-    }
-
-    bool JunitReporter::assertionEnded( AssertionStats const& assertionStats ) {
-        if( assertionStats.assertionResult.getResultType() == ResultWas::ThrewException && !m_okToFail )
-            unexpectedExceptions++;
-        return CumulativeReporterBase::assertionEnded( assertionStats );
-    }
-
-    void JunitReporter::testCaseEnded( TestCaseStats const& testCaseStats ) {
-        stdOutForSuite += testCaseStats.stdOut;
-        stdErrForSuite += testCaseStats.stdErr;
-        CumulativeReporterBase::testCaseEnded( testCaseStats );
-    }
-
-    void JunitReporter::testGroupEnded( TestGroupStats const& testGroupStats ) {
-        double suiteTime = suiteTimer.getElapsedSeconds();
-        CumulativeReporterBase::testGroupEnded( testGroupStats );
-        writeGroup( *m_testGroups.back(), suiteTime );
-    }
-
-    void JunitReporter::testRunEndedCumulative() {
-        xml.endElement();
-    }
-
-    void JunitReporter::writeGroup( TestGroupNode const& groupNode, double suiteTime ) {
-        XmlWriter::ScopedElement e = xml.scopedElement( "testsuite" );
-
-        TestGroupStats const& stats = groupNode.value;
-        xml.writeAttribute( "name", stats.groupInfo.name );
-        xml.writeAttribute( "errors", unexpectedExceptions );
-        xml.writeAttribute( "failures", stats.totals.assertions.failed-unexpectedExceptions );
-        xml.writeAttribute( "tests", stats.totals.assertions.total() );
-        xml.writeAttribute( "hostname", "tbd" ); // !TBD
-        if( m_config->showDurations() == ShowDurations::Never )
-            xml.writeAttribute( "time", "" );
-        else
-            xml.writeAttribute( "time", suiteTime );
-        xml.writeAttribute( "timestamp", getCurrentTimestamp() );
-
-        // Write properties if there are any
-        if (m_config->hasTestFilters() || m_config->rngSeed() != 0) {
-            auto properties = xml.scopedElement("properties");
-            if (m_config->hasTestFilters()) {
-                xml.scopedElement("property")
-                    .writeAttribute("name", "filters")
-                    .writeAttribute("value", serializeFilters(m_config->getTestsOrTags()));
-            }
-            if (m_config->rngSeed() != 0) {
-                xml.scopedElement("property")
-                    .writeAttribute("name", "random-seed")
-                    .writeAttribute("value", m_config->rngSeed());
-            }
-        }
-
-        // Write test cases
-        for( auto const& child : groupNode.children )
-            writeTestCase( *child );
-
-        xml.scopedElement( "system-out" ).writeText( trim( stdOutForSuite ), XmlFormatting::Newline );
-        xml.scopedElement( "system-err" ).writeText( trim( stdErrForSuite ), XmlFormatting::Newline );
-    }
-
-    void JunitReporter::writeTestCase( TestCaseNode const& testCaseNode ) {
-        TestCaseStats const& stats = testCaseNode.value;
-
-        // All test cases have exactly one section - which represents the
-        // test case itself. That section may have 0-n nested sections
-        assert( testCaseNode.children.size() == 1 );
-        SectionNode const& rootSection = *testCaseNode.children.front();
-
-        std::string className = stats.testInfo.className;
-
-        if( className.empty() ) {
-            className = fileNameTag(stats.testInfo.tags);
-            if ( className.empty() )
-                className = "global";
-        }
-
-        if ( !m_config->name().empty() )
-            className = m_config->name() + "." + className;
-
-        writeSection( className, "", rootSection );
-    }
-
-    void JunitReporter::writeSection(  std::string const& className,
-                        std::string const& rootName,
-                        SectionNode const& sectionNode ) {
-        std::string name = trim( sectionNode.stats.sectionInfo.name );
-        if( !rootName.empty() )
-            name = rootName + '/' + name;
-
-        if( !sectionNode.assertions.empty() ||
-            !sectionNode.stdOut.empty() ||
-            !sectionNode.stdErr.empty() ) {
-            XmlWriter::ScopedElement e = xml.scopedElement( "testcase" );
-            if( className.empty() ) {
-                xml.writeAttribute( "classname", name );
-                xml.writeAttribute( "name", "root" );
-            }
-            else {
-                xml.writeAttribute( "classname", className );
-                xml.writeAttribute( "name", name );
-            }
-            xml.writeAttribute( "time", ::Catch::Detail::stringify( sectionNode.stats.durationInSeconds ) );
-
-            writeAssertions( sectionNode );
-
-            if( !sectionNode.stdOut.empty() )
-                xml.scopedElement( "system-out" ).writeText( trim( sectionNode.stdOut ), XmlFormatting::Newline );
-            if( !sectionNode.stdErr.empty() )
-                xml.scopedElement( "system-err" ).writeText( trim( sectionNode.stdErr ), XmlFormatting::Newline );
-        }
-        for( auto const& childNode : sectionNode.childSections )
-            if( className.empty() )
-                writeSection( name, "", *childNode );
-            else
-                writeSection( className, name, *childNode );
-    }
-
-    void JunitReporter::writeAssertions( SectionNode const& sectionNode ) {
-        for( auto const& assertion : sectionNode.assertions )
-            writeAssertion( assertion );
-    }
-
-    void JunitReporter::writeAssertion( AssertionStats const& stats ) {
-        AssertionResult const& result = stats.assertionResult;
-        if( !result.isOk() ) {
-            std::string elementName;
-            switch( result.getResultType() ) {
-                case ResultWas::ThrewException:
-                case ResultWas::FatalErrorCondition:
-                    elementName = "error";
-                    break;
-                case ResultWas::ExplicitFailure:
-                case ResultWas::ExpressionFailed:
-                case ResultWas::DidntThrowException:
-                    elementName = "failure";
-                    break;
-
-                // We should never see these here:
-                case ResultWas::Info:
-                case ResultWas::Warning:
-                case ResultWas::Ok:
-                case ResultWas::Unknown:
-                case ResultWas::FailureBit:
-                case ResultWas::Exception:
-                    elementName = "internalError";
-                    break;
-            }
-
-            XmlWriter::ScopedElement e = xml.scopedElement( elementName );
-
-            xml.writeAttribute( "message", result.getExpression() );
-            xml.writeAttribute( "type", result.getTestMacroName() );
-
-            ReusableStringStream rss;
-            if (stats.totals.assertions.total() > 0) {
-                rss << "FAILED" << ":\n";
-                if (result.hasExpression()) {
-                    rss << "  ";
-                    rss << result.getExpressionInMacro();
-                    rss << '\n';
-                }
-                if (result.hasExpandedExpression()) {
-                    rss << "with expansion:\n";
-                    rss << Column(result.getExpandedExpression()).indent(2) << '\n';
-                }
-            } else {
-                rss << '\n';
-            }
-
-            if( !result.getMessage().empty() )
-                rss << result.getMessage() << '\n';
-            for( auto const& msg : stats.infoMessages )
-                if( msg.type == ResultWas::Info )
-                    rss << msg.message << '\n';
-
-            rss << "at " << result.getSourceInfo();
-            xml.writeText( rss.str(), XmlFormatting::Newline );
-        }
-    }
-
-    CATCH_REGISTER_REPORTER( "junit", JunitReporter )
-
-} // end namespace Catch
-// end catch_reporter_junit.cpp
-// start catch_reporter_listening.cpp
-
-#include <cassert>
-
-namespace Catch {
-
-    ListeningReporter::ListeningReporter() {
-        // We will assume that listeners will always want all assertions
-        m_preferences.shouldReportAllAssertions = true;
-    }
-
-    void ListeningReporter::addListener( IStreamingReporterPtr&& listener ) {
-        m_listeners.push_back( std::move( listener ) );
-    }
-
-    void ListeningReporter::addReporter(IStreamingReporterPtr&& reporter) {
-        assert(!m_reporter && "Listening reporter can wrap only 1 real reporter");
-        m_reporter = std::move( reporter );
-        m_preferences.shouldRedirectStdOut = m_reporter->getPreferences().shouldRedirectStdOut;
-    }
-
-    ReporterPreferences ListeningReporter::getPreferences() const {
-        return m_preferences;
-    }
-
-    std::set<Verbosity> ListeningReporter::getSupportedVerbosities() {
-        return std::set<Verbosity>{ };
-    }
-
-    void ListeningReporter::noMatchingTestCases( std::string const& spec ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->noMatchingTestCases( spec );
-        }
-        m_reporter->noMatchingTestCases( spec );
-    }
-
-    void ListeningReporter::reportInvalidArguments(std::string const&arg){
-        for ( auto const& listener : m_listeners ) {
-            listener->reportInvalidArguments( arg );
-        }
-        m_reporter->reportInvalidArguments( arg );
-    }
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-    void ListeningReporter::benchmarkPreparing( std::string const& name ) {
-		for (auto const& listener : m_listeners) {
-			listener->benchmarkPreparing(name);
-		}
-		m_reporter->benchmarkPreparing(name);
-	}
-    void ListeningReporter::benchmarkStarting( BenchmarkInfo const& benchmarkInfo ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->benchmarkStarting( benchmarkInfo );
-        }
-        m_reporter->benchmarkStarting( benchmarkInfo );
-    }
-    void ListeningReporter::benchmarkEnded( BenchmarkStats<> const& benchmarkStats ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->benchmarkEnded( benchmarkStats );
-        }
-        m_reporter->benchmarkEnded( benchmarkStats );
-    }
-
-	void ListeningReporter::benchmarkFailed( std::string const& error ) {
-		for (auto const& listener : m_listeners) {
-			listener->benchmarkFailed(error);
-		}
-		m_reporter->benchmarkFailed(error);
-	}
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-    void ListeningReporter::testRunStarting( TestRunInfo const& testRunInfo ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->testRunStarting( testRunInfo );
-        }
-        m_reporter->testRunStarting( testRunInfo );
-    }
-
-    void ListeningReporter::testGroupStarting( GroupInfo const& groupInfo ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->testGroupStarting( groupInfo );
-        }
-        m_reporter->testGroupStarting( groupInfo );
-    }
-
-    void ListeningReporter::testCaseStarting( TestCaseInfo const& testInfo ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->testCaseStarting( testInfo );
-        }
-        m_reporter->testCaseStarting( testInfo );
-    }
-
-    void ListeningReporter::sectionStarting( SectionInfo const& sectionInfo ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->sectionStarting( sectionInfo );
-        }
-        m_reporter->sectionStarting( sectionInfo );
-    }
-
-    void ListeningReporter::assertionStarting( AssertionInfo const& assertionInfo ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->assertionStarting( assertionInfo );
-        }
-        m_reporter->assertionStarting( assertionInfo );
-    }
-
-    // The return value indicates if the messages buffer should be cleared:
-    bool ListeningReporter::assertionEnded( AssertionStats const& assertionStats ) {
-        for( auto const& listener : m_listeners ) {
-            static_cast<void>( listener->assertionEnded( assertionStats ) );
-        }
-        return m_reporter->assertionEnded( assertionStats );
-    }
-
-    void ListeningReporter::sectionEnded( SectionStats const& sectionStats ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->sectionEnded( sectionStats );
-        }
-        m_reporter->sectionEnded( sectionStats );
-    }
-
-    void ListeningReporter::testCaseEnded( TestCaseStats const& testCaseStats ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->testCaseEnded( testCaseStats );
-        }
-        m_reporter->testCaseEnded( testCaseStats );
-    }
-
-    void ListeningReporter::testGroupEnded( TestGroupStats const& testGroupStats ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->testGroupEnded( testGroupStats );
-        }
-        m_reporter->testGroupEnded( testGroupStats );
-    }
-
-    void ListeningReporter::testRunEnded( TestRunStats const& testRunStats ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->testRunEnded( testRunStats );
-        }
-        m_reporter->testRunEnded( testRunStats );
-    }
-
-    void ListeningReporter::skipTest( TestCaseInfo const& testInfo ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->skipTest( testInfo );
-        }
-        m_reporter->skipTest( testInfo );
-    }
-
-    bool ListeningReporter::isMulti() const {
-        return true;
-    }
-
-} // end namespace Catch
-// end catch_reporter_listening.cpp
-// start catch_reporter_xml.cpp
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4061) // Not all labels are EXPLICITLY handled in switch
-                              // Note that 4062 (not all labels are handled
-                              // and default is missing) is enabled
-#endif
-
-namespace Catch {
-    XmlReporter::XmlReporter( ReporterConfig const& _config )
-    :   StreamingReporterBase( _config ),
-        m_xml(_config.stream())
-    {
-        m_reporterPrefs.shouldRedirectStdOut = true;
-        m_reporterPrefs.shouldReportAllAssertions = true;
-    }
-
-    XmlReporter::~XmlReporter() = default;
-
-    std::string XmlReporter::getDescription() {
-        return "Reports test results as an XML document";
-    }
-
-    std::string XmlReporter::getStylesheetRef() const {
-        return std::string();
-    }
-
-    void XmlReporter::writeSourceInfo( SourceLineInfo const& sourceInfo ) {
-        m_xml
-            .writeAttribute( "filename", sourceInfo.file )
-            .writeAttribute( "line", sourceInfo.line );
-    }
-
-    void XmlReporter::noMatchingTestCases( std::string const& s ) {
-        StreamingReporterBase::noMatchingTestCases( s );
-    }
-
-    void XmlReporter::testRunStarting( TestRunInfo const& testInfo ) {
-        StreamingReporterBase::testRunStarting( testInfo );
-        std::string stylesheetRef = getStylesheetRef();
-        if( !stylesheetRef.empty() )
-            m_xml.writeStylesheetRef( stylesheetRef );
-        m_xml.startElement( "Catch" );
-        if( !m_config->name().empty() )
-            m_xml.writeAttribute( "name", m_config->name() );
-        if (m_config->testSpec().hasFilters())
-            m_xml.writeAttribute( "filters", serializeFilters( m_config->getTestsOrTags() ) );
-        if( m_config->rngSeed() != 0 )
-            m_xml.scopedElement( "Randomness" )
-                .writeAttribute( "seed", m_config->rngSeed() );
-    }
-
-    void XmlReporter::testGroupStarting( GroupInfo const& groupInfo ) {
-        StreamingReporterBase::testGroupStarting( groupInfo );
-        m_xml.startElement( "Group" )
-            .writeAttribute( "name", groupInfo.name );
-    }
-
-    void XmlReporter::testCaseStarting( TestCaseInfo const& testInfo ) {
-        StreamingReporterBase::testCaseStarting(testInfo);
-        m_xml.startElement( "TestCase" )
-            .writeAttribute( "name", trim( testInfo.name ) )
-            .writeAttribute( "description", testInfo.description )
-            .writeAttribute( "tags", testInfo.tagsAsString() );
-
-        writeSourceInfo( testInfo.lineInfo );
-
-        if ( m_config->showDurations() == ShowDurations::Always )
-            m_testCaseTimer.start();
-        m_xml.ensureTagClosed();
-    }
-
-    void XmlReporter::sectionStarting( SectionInfo const& sectionInfo ) {
-        StreamingReporterBase::sectionStarting( sectionInfo );
-        if( m_sectionDepth++ > 0 ) {
-            m_xml.startElement( "Section" )
-                .writeAttribute( "name", trim( sectionInfo.name ) );
-            writeSourceInfo( sectionInfo.lineInfo );
-            m_xml.ensureTagClosed();
-        }
-    }
-
-    void XmlReporter::assertionStarting( AssertionInfo const& ) { }
-
-    bool XmlReporter::assertionEnded( AssertionStats const& assertionStats ) {
-
-        AssertionResult const& result = assertionStats.assertionResult;
-
-        bool includeResults = m_config->includeSuccessfulResults() || !result.isOk();
-
-        if( includeResults || result.getResultType() == ResultWas::Warning ) {
-            // Print any info messages in <Info> tags.
-            for( auto const& msg : assertionStats.infoMessages ) {
-                if( msg.type == ResultWas::Info && includeResults ) {
-                    m_xml.scopedElement( "Info" )
-                            .writeText( msg.message );
-                } else if ( msg.type == ResultWas::Warning ) {
-                    m_xml.scopedElement( "Warning" )
-                            .writeText( msg.message );
-                }
-            }
-        }
-
-        // Drop out if result was successful but we're not printing them.
-        if( !includeResults && result.getResultType() != ResultWas::Warning )
-            return true;
-
-        // Print the expression if there is one.
-        if( result.hasExpression() ) {
-            m_xml.startElement( "Expression" )
-                .writeAttribute( "success", result.succeeded() )
-                .writeAttribute( "type", result.getTestMacroName() );
-
-            writeSourceInfo( result.getSourceInfo() );
-
-            m_xml.scopedElement( "Original" )
-                .writeText( result.getExpression() );
-            m_xml.scopedElement( "Expanded" )
-                .writeText( result.getExpandedExpression() );
-        }
-
-        // And... Print a result applicable to each result type.
-        switch( result.getResultType() ) {
-            case ResultWas::ThrewException:
-                m_xml.startElement( "Exception" );
-                writeSourceInfo( result.getSourceInfo() );
-                m_xml.writeText( result.getMessage() );
-                m_xml.endElement();
-                break;
-            case ResultWas::FatalErrorCondition:
-                m_xml.startElement( "FatalErrorCondition" );
-                writeSourceInfo( result.getSourceInfo() );
-                m_xml.writeText( result.getMessage() );
-                m_xml.endElement();
-                break;
-            case ResultWas::Info:
-                m_xml.scopedElement( "Info" )
-                    .writeText( result.getMessage() );
-                break;
-            case ResultWas::Warning:
-                // Warning will already have been written
-                break;
-            case ResultWas::ExplicitFailure:
-                m_xml.startElement( "Failure" );
-                writeSourceInfo( result.getSourceInfo() );
-                m_xml.writeText( result.getMessage() );
-                m_xml.endElement();
-                break;
-            default:
-                break;
-        }
-
-        if( result.hasExpression() )
-            m_xml.endElement();
-
-        return true;
-    }
-
-    void XmlReporter::sectionEnded( SectionStats const& sectionStats ) {
-        StreamingReporterBase::sectionEnded( sectionStats );
-        if( --m_sectionDepth > 0 ) {
-            XmlWriter::ScopedElement e = m_xml.scopedElement( "OverallResults" );
-            e.writeAttribute( "successes", sectionStats.assertions.passed );
-            e.writeAttribute( "failures", sectionStats.assertions.failed );
-            e.writeAttribute( "expectedFailures", sectionStats.assertions.failedButOk );
-
-            if ( m_config->showDurations() == ShowDurations::Always )
-                e.writeAttribute( "durationInSeconds", sectionStats.durationInSeconds );
-
-            m_xml.endElement();
-        }
-    }
-
-    void XmlReporter::testCaseEnded( TestCaseStats const& testCaseStats ) {
-        StreamingReporterBase::testCaseEnded( testCaseStats );
-        XmlWriter::ScopedElement e = m_xml.scopedElement( "OverallResult" );
-        e.writeAttribute( "success", testCaseStats.totals.assertions.allOk() );
-
-        if ( m_config->showDurations() == ShowDurations::Always )
-            e.writeAttribute( "durationInSeconds", m_testCaseTimer.getElapsedSeconds() );
-
-        if( !testCaseStats.stdOut.empty() )
-            m_xml.scopedElement( "StdOut" ).writeText( trim( testCaseStats.stdOut ), XmlFormatting::Newline );
-        if( !testCaseStats.stdErr.empty() )
-            m_xml.scopedElement( "StdErr" ).writeText( trim( testCaseStats.stdErr ), XmlFormatting::Newline );
-
-        m_xml.endElement();
-    }
-
-    void XmlReporter::testGroupEnded( TestGroupStats const& testGroupStats ) {
-        StreamingReporterBase::testGroupEnded( testGroupStats );
-        // TODO: Check testGroupStats.aborting and act accordingly.
-        m_xml.scopedElement( "OverallResults" )
-            .writeAttribute( "successes", testGroupStats.totals.assertions.passed )
-            .writeAttribute( "failures", testGroupStats.totals.assertions.failed )
-            .writeAttribute( "expectedFailures", testGroupStats.totals.assertions.failedButOk );
-        m_xml.endElement();
-    }
-
-    void XmlReporter::testRunEnded( TestRunStats const& testRunStats ) {
-        StreamingReporterBase::testRunEnded( testRunStats );
-        m_xml.scopedElement( "OverallResults" )
-            .writeAttribute( "successes", testRunStats.totals.assertions.passed )
-            .writeAttribute( "failures", testRunStats.totals.assertions.failed )
-            .writeAttribute( "expectedFailures", testRunStats.totals.assertions.failedButOk );
-        m_xml.endElement();
-    }
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-    void XmlReporter::benchmarkPreparing(std::string const& name) {
-        m_xml.startElement("BenchmarkResults")
-            .writeAttribute("name", name);
-    }
-
-    void XmlReporter::benchmarkStarting(BenchmarkInfo const &info) {
-        m_xml.writeAttribute("samples", info.samples)
-            .writeAttribute("resamples", info.resamples)
-            .writeAttribute("iterations", info.iterations)
-            .writeAttribute("clockResolution", info.clockResolution)
-            .writeAttribute("estimatedDuration", info.estimatedDuration)
-            .writeComment("All values in nano seconds");
-    }
-
-    void XmlReporter::benchmarkEnded(BenchmarkStats<> const& benchmarkStats) {
-        m_xml.startElement("mean")
-            .writeAttribute("value", benchmarkStats.mean.point.count())
-            .writeAttribute("lowerBound", benchmarkStats.mean.lower_bound.count())
-            .writeAttribute("upperBound", benchmarkStats.mean.upper_bound.count())
-            .writeAttribute("ci", benchmarkStats.mean.confidence_interval);
-        m_xml.endElement();
-        m_xml.startElement("standardDeviation")
-            .writeAttribute("value", benchmarkStats.standardDeviation.point.count())
-            .writeAttribute("lowerBound", benchmarkStats.standardDeviation.lower_bound.count())
-            .writeAttribute("upperBound", benchmarkStats.standardDeviation.upper_bound.count())
-            .writeAttribute("ci", benchmarkStats.standardDeviation.confidence_interval);
-        m_xml.endElement();
-        m_xml.startElement("outliers")
-            .writeAttribute("variance", benchmarkStats.outlierVariance)
-            .writeAttribute("lowMild", benchmarkStats.outliers.low_mild)
-            .writeAttribute("lowSevere", benchmarkStats.outliers.low_severe)
-            .writeAttribute("highMild", benchmarkStats.outliers.high_mild)
-            .writeAttribute("highSevere", benchmarkStats.outliers.high_severe);
-        m_xml.endElement();
-        m_xml.endElement();
-    }
-
-    void XmlReporter::benchmarkFailed(std::string const &error) {
-        m_xml.scopedElement("failed").
-            writeAttribute("message", error);
-        m_xml.endElement();
-    }
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-    CATCH_REGISTER_REPORTER( "xml", XmlReporter )
-
-} // end namespace Catch
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
-// end catch_reporter_xml.cpp
-
-namespace Catch {
-    LeakDetector leakDetector;
-}
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-// end catch_impl.hpp
-#endif
-
-#ifdef CATCH_CONFIG_MAIN
-// start catch_default_main.hpp
-
-#ifndef __OBJC__
-
-#if defined(CATCH_CONFIG_WCHAR) && defined(CATCH_PLATFORM_WINDOWS) && defined(_UNICODE) && !defined(DO_NOT_USE_WMAIN)
-// Standard C/C++ Win32 Unicode wmain entry point
-extern "C" int wmain (int argc, wchar_t * argv[], wchar_t * []) {
-#else
-// Standard C/C++ main entry point
-int main (int argc, char * argv[]) {
-#endif
-
-    return Catch::Session().run( argc, argv );
-}
-
-#else // __OBJC__
-
-// Objective-C entry point
-int main (int argc, char * const argv[]) {
-#if !CATCH_ARC_ENABLED
-    NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
-#endif
-
-    Catch::registerTestMethods();
-    int result = Catch::Session().run( argc, (char**)argv );
-
-#if !CATCH_ARC_ENABLED
-    [pool drain];
-#endif
-
-    return result;
-}
-
-#endif // __OBJC__
-
-// end catch_default_main.hpp
-#endif
-
-#if !defined(CATCH_CONFIG_IMPL_ONLY)
-
-#ifdef CLARA_CONFIG_MAIN_NOT_DEFINED
-#  undef CLARA_CONFIG_MAIN
-#endif
-
-#if !defined(CATCH_CONFIG_DISABLE)
-//////
-// If this config identifier is defined then all CATCH macros are prefixed with CATCH_
-#ifdef CATCH_CONFIG_PREFIX_ALL
-
-#define CATCH_REQUIRE( ... ) INTERNAL_CATCH_TEST( "CATCH_REQUIRE", Catch::ResultDisposition::Normal, __VA_ARGS__ )
-#define CATCH_REQUIRE_FALSE( ... ) INTERNAL_CATCH_TEST( "CATCH_REQUIRE_FALSE", Catch::ResultDisposition::Normal | Catch::ResultDisposition::FalseTest, __VA_ARGS__ )
-
-#define CATCH_REQUIRE_THROWS( ... ) INTERNAL_CATCH_THROWS( "CATCH_REQUIRE_THROWS", Catch::ResultDisposition::Normal, __VA_ARGS__ )
-#define CATCH_REQUIRE_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "CATCH_REQUIRE_THROWS_AS", exceptionType, Catch::ResultDisposition::Normal, expr )
-#define CATCH_REQUIRE_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS_STR_MATCHES( "CATCH_REQUIRE_THROWS_WITH", Catch::ResultDisposition::Normal, matcher, expr )
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define CATCH_REQUIRE_THROWS_MATCHES( expr, exceptionType, matcher ) INTERNAL_CATCH_THROWS_MATCHES( "CATCH_REQUIRE_THROWS_MATCHES", exceptionType, Catch::ResultDisposition::Normal, matcher, expr )
-#endif// CATCH_CONFIG_DISABLE_MATCHERS
-#define CATCH_REQUIRE_NOTHROW( ... ) INTERNAL_CATCH_NO_THROW( "CATCH_REQUIRE_NOTHROW", Catch::ResultDisposition::Normal, __VA_ARGS__ )
-
-#define CATCH_CHECK( ... ) INTERNAL_CATCH_TEST( "CATCH_CHECK", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-#define CATCH_CHECK_FALSE( ... ) INTERNAL_CATCH_TEST( "CATCH_CHECK_FALSE", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::FalseTest, __VA_ARGS__ )
-#define CATCH_CHECKED_IF( ... ) INTERNAL_CATCH_IF( "CATCH_CHECKED_IF", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-#define CATCH_CHECKED_ELSE( ... ) INTERNAL_CATCH_ELSE( "CATCH_CHECKED_ELSE", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-#define CATCH_CHECK_NOFAIL( ... ) INTERNAL_CATCH_TEST( "CATCH_CHECK_NOFAIL", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::SuppressFail, __VA_ARGS__ )
-
-#define CATCH_CHECK_THROWS( ... )  INTERNAL_CATCH_THROWS( "CATCH_CHECK_THROWS", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-#define CATCH_CHECK_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "CATCH_CHECK_THROWS_AS", exceptionType, Catch::ResultDisposition::ContinueOnFailure, expr )
-#define CATCH_CHECK_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS_STR_MATCHES( "CATCH_CHECK_THROWS_WITH", Catch::ResultDisposition::ContinueOnFailure, matcher, expr )
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define CATCH_CHECK_THROWS_MATCHES( expr, exceptionType, matcher ) INTERNAL_CATCH_THROWS_MATCHES( "CATCH_CHECK_THROWS_MATCHES", exceptionType, Catch::ResultDisposition::ContinueOnFailure, matcher, expr )
-#endif // CATCH_CONFIG_DISABLE_MATCHERS
-#define CATCH_CHECK_NOTHROW( ... ) INTERNAL_CATCH_NO_THROW( "CATCH_CHECK_NOTHROW", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define CATCH_CHECK_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "CATCH_CHECK_THAT", matcher, Catch::ResultDisposition::ContinueOnFailure, arg )
-
-#define CATCH_REQUIRE_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "CATCH_REQUIRE_THAT", matcher, Catch::ResultDisposition::Normal, arg )
-#endif // CATCH_CONFIG_DISABLE_MATCHERS
-
-#define CATCH_INFO( msg ) INTERNAL_CATCH_INFO( "CATCH_INFO", msg )
-#define CATCH_UNSCOPED_INFO( msg ) INTERNAL_CATCH_UNSCOPED_INFO( "CATCH_UNSCOPED_INFO", msg )
-#define CATCH_WARN( msg ) INTERNAL_CATCH_MSG( "CATCH_WARN", Catch::ResultWas::Warning, Catch::ResultDisposition::ContinueOnFailure, msg )
-#define CATCH_CAPTURE( ... ) INTERNAL_CATCH_CAPTURE( INTERNAL_CATCH_UNIQUE_NAME(capturer), "CATCH_CAPTURE",__VA_ARGS__ )
-
-#define CATCH_TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE( __VA_ARGS__ )
-#define CATCH_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#define CATCH_METHOD_AS_TEST_CASE( method, ... ) INTERNAL_CATCH_METHOD_AS_TEST_CASE( method, __VA_ARGS__ )
-#define CATCH_REGISTER_TEST_CASE( Function, ... ) INTERNAL_CATCH_REGISTER_TESTCASE( Function, __VA_ARGS__ )
-#define CATCH_SECTION( ... ) INTERNAL_CATCH_SECTION( __VA_ARGS__ )
-#define CATCH_DYNAMIC_SECTION( ... ) INTERNAL_CATCH_DYNAMIC_SECTION( __VA_ARGS__ )
-#define CATCH_FAIL( ... ) INTERNAL_CATCH_MSG( "CATCH_FAIL", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, __VA_ARGS__ )
-#define CATCH_FAIL_CHECK( ... ) INTERNAL_CATCH_MSG( "CATCH_FAIL_CHECK", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-#define CATCH_SUCCEED( ... ) INTERNAL_CATCH_MSG( "CATCH_SUCCEED", Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-
-#define CATCH_ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE()
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-#define CATCH_TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
-#define CATCH_TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG( __VA_ARGS__ )
-#define CATCH_TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#define CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE( __VA_ARGS__ )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( __VA_ARGS__ )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ )
-#else
-#define CATCH_TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ ) )
-#define CATCH_TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG( __VA_ARGS__ ) )
-#define CATCH_TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ ) )
-#define CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ ) )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE( __VA_ARGS__ ) )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( __VA_ARGS__ ) )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, __VA_ARGS__ ) )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ ) )
-#endif
-
-#if !defined(CATCH_CONFIG_RUNTIME_STATIC_REQUIRE)
-#define CATCH_STATIC_REQUIRE( ... )       static_assert(   __VA_ARGS__ ,      #__VA_ARGS__ );     CATCH_SUCCEED( #__VA_ARGS__ )
-#define CATCH_STATIC_REQUIRE_FALSE( ... ) static_assert( !(__VA_ARGS__), "!(" #__VA_ARGS__ ")" ); CATCH_SUCCEED( #__VA_ARGS__ )
-#else
-#define CATCH_STATIC_REQUIRE( ... )       CATCH_REQUIRE( __VA_ARGS__ )
-#define CATCH_STATIC_REQUIRE_FALSE( ... ) CATCH_REQUIRE_FALSE( __VA_ARGS__ )
-#endif
-
-// "BDD-style" convenience wrappers
-#define CATCH_SCENARIO( ... ) CATCH_TEST_CASE( "Scenario: " __VA_ARGS__ )
-#define CATCH_SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, "Scenario: " __VA_ARGS__ )
-#define CATCH_GIVEN( desc )     INTERNAL_CATCH_DYNAMIC_SECTION( "    Given: " << desc )
-#define CATCH_AND_GIVEN( desc ) INTERNAL_CATCH_DYNAMIC_SECTION( "And given: " << desc )
-#define CATCH_WHEN( desc )      INTERNAL_CATCH_DYNAMIC_SECTION( "     When: " << desc )
-#define CATCH_AND_WHEN( desc )  INTERNAL_CATCH_DYNAMIC_SECTION( " And when: " << desc )
-#define CATCH_THEN( desc )      INTERNAL_CATCH_DYNAMIC_SECTION( "     Then: " << desc )
-#define CATCH_AND_THEN( desc )  INTERNAL_CATCH_DYNAMIC_SECTION( "      And: " << desc )
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-#define CATCH_BENCHMARK(...) \
-    INTERNAL_CATCH_BENCHMARK(INTERNAL_CATCH_UNIQUE_NAME(____C_A_T_C_H____B_E_N_C_H____), INTERNAL_CATCH_GET_1_ARG(__VA_ARGS__,,), INTERNAL_CATCH_GET_2_ARG(__VA_ARGS__,,))
-#define CATCH_BENCHMARK_ADVANCED(name) \
-    INTERNAL_CATCH_BENCHMARK_ADVANCED(INTERNAL_CATCH_UNIQUE_NAME(____C_A_T_C_H____B_E_N_C_H____), name)
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-// If CATCH_CONFIG_PREFIX_ALL is not defined then the CATCH_ prefix is not required
-#else
-
-#define REQUIRE( ... ) INTERNAL_CATCH_TEST( "REQUIRE", Catch::ResultDisposition::Normal, __VA_ARGS__  )
-#define REQUIRE_FALSE( ... ) INTERNAL_CATCH_TEST( "REQUIRE_FALSE", Catch::ResultDisposition::Normal | Catch::ResultDisposition::FalseTest, __VA_ARGS__ )
-
-#define REQUIRE_THROWS( ... ) INTERNAL_CATCH_THROWS( "REQUIRE_THROWS", Catch::ResultDisposition::Normal, __VA_ARGS__ )
-#define REQUIRE_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "REQUIRE_THROWS_AS", exceptionType, Catch::ResultDisposition::Normal, expr )
-#define REQUIRE_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS_STR_MATCHES( "REQUIRE_THROWS_WITH", Catch::ResultDisposition::Normal, matcher, expr )
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define REQUIRE_THROWS_MATCHES( expr, exceptionType, matcher ) INTERNAL_CATCH_THROWS_MATCHES( "REQUIRE_THROWS_MATCHES", exceptionType, Catch::ResultDisposition::Normal, matcher, expr )
-#endif // CATCH_CONFIG_DISABLE_MATCHERS
-#define REQUIRE_NOTHROW( ... ) INTERNAL_CATCH_NO_THROW( "REQUIRE_NOTHROW", Catch::ResultDisposition::Normal, __VA_ARGS__ )
-
-#define CHECK( ... ) INTERNAL_CATCH_TEST( "CHECK", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-#define CHECK_FALSE( ... ) INTERNAL_CATCH_TEST( "CHECK_FALSE", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::FalseTest, __VA_ARGS__ )
-#define CHECKED_IF( ... ) INTERNAL_CATCH_IF( "CHECKED_IF", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-#define CHECKED_ELSE( ... ) INTERNAL_CATCH_ELSE( "CHECKED_ELSE", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-#define CHECK_NOFAIL( ... ) INTERNAL_CATCH_TEST( "CHECK_NOFAIL", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::SuppressFail, __VA_ARGS__ )
-
-#define CHECK_THROWS( ... )  INTERNAL_CATCH_THROWS( "CHECK_THROWS", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-#define CHECK_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "CHECK_THROWS_AS", exceptionType, Catch::ResultDisposition::ContinueOnFailure, expr )
-#define CHECK_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS_STR_MATCHES( "CHECK_THROWS_WITH", Catch::ResultDisposition::ContinueOnFailure, matcher, expr )
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define CHECK_THROWS_MATCHES( expr, exceptionType, matcher ) INTERNAL_CATCH_THROWS_MATCHES( "CHECK_THROWS_MATCHES", exceptionType, Catch::ResultDisposition::ContinueOnFailure, matcher, expr )
-#endif // CATCH_CONFIG_DISABLE_MATCHERS
-#define CHECK_NOTHROW( ... ) INTERNAL_CATCH_NO_THROW( "CHECK_NOTHROW", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define CHECK_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "CHECK_THAT", matcher, Catch::ResultDisposition::ContinueOnFailure, arg )
-
-#define REQUIRE_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "REQUIRE_THAT", matcher, Catch::ResultDisposition::Normal, arg )
-#endif // CATCH_CONFIG_DISABLE_MATCHERS
-
-#define INFO( msg ) INTERNAL_CATCH_INFO( "INFO", msg )
-#define UNSCOPED_INFO( msg ) INTERNAL_CATCH_UNSCOPED_INFO( "UNSCOPED_INFO", msg )
-#define WARN( msg ) INTERNAL_CATCH_MSG( "WARN", Catch::ResultWas::Warning, Catch::ResultDisposition::ContinueOnFailure, msg )
-#define CAPTURE( ... ) INTERNAL_CATCH_CAPTURE( INTERNAL_CATCH_UNIQUE_NAME(capturer), "CAPTURE",__VA_ARGS__ )
-
-#define TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE( __VA_ARGS__ )
-#define TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#define METHOD_AS_TEST_CASE( method, ... ) INTERNAL_CATCH_METHOD_AS_TEST_CASE( method, __VA_ARGS__ )
-#define REGISTER_TEST_CASE( Function, ... ) INTERNAL_CATCH_REGISTER_TESTCASE( Function, __VA_ARGS__ )
-#define SECTION( ... ) INTERNAL_CATCH_SECTION( __VA_ARGS__ )
-#define DYNAMIC_SECTION( ... ) INTERNAL_CATCH_DYNAMIC_SECTION( __VA_ARGS__ )
-#define FAIL( ... ) INTERNAL_CATCH_MSG( "FAIL", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, __VA_ARGS__ )
-#define FAIL_CHECK( ... ) INTERNAL_CATCH_MSG( "FAIL_CHECK", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-#define SUCCEED( ... ) INTERNAL_CATCH_MSG( "SUCCEED", Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-#define ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE()
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-#define TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
-#define TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG( __VA_ARGS__ )
-#define TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#define TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ )
-#define TEMPLATE_PRODUCT_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE( __VA_ARGS__ )
-#define TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( __VA_ARGS__ )
-#define TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#define TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ )
-#define TEMPLATE_LIST_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE(__VA_ARGS__)
-#define TEMPLATE_LIST_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#else
-#define TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ ) )
-#define TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG( __VA_ARGS__ ) )
-#define TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ ) )
-#define TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ ) )
-#define TEMPLATE_PRODUCT_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE( __VA_ARGS__ ) )
-#define TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( __VA_ARGS__ ) )
-#define TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, __VA_ARGS__ ) )
-#define TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ ) )
-#define TEMPLATE_LIST_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE( __VA_ARGS__ ) )
-#define TEMPLATE_LIST_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD( className, __VA_ARGS__ ) )
-#endif
-
-#if !defined(CATCH_CONFIG_RUNTIME_STATIC_REQUIRE)
-#define STATIC_REQUIRE( ... )       static_assert(   __VA_ARGS__,  #__VA_ARGS__ ); SUCCEED( #__VA_ARGS__ )
-#define STATIC_REQUIRE_FALSE( ... ) static_assert( !(__VA_ARGS__), "!(" #__VA_ARGS__ ")" ); SUCCEED( "!(" #__VA_ARGS__ ")" )
-#else
-#define STATIC_REQUIRE( ... )       REQUIRE( __VA_ARGS__ )
-#define STATIC_REQUIRE_FALSE( ... ) REQUIRE_FALSE( __VA_ARGS__ )
-#endif
-
-#endif
-
-#define CATCH_TRANSLATE_EXCEPTION( signature ) INTERNAL_CATCH_TRANSLATE_EXCEPTION( signature )
-
-// "BDD-style" convenience wrappers
-#define SCENARIO( ... ) TEST_CASE( "Scenario: " __VA_ARGS__ )
-#define SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, "Scenario: " __VA_ARGS__ )
-
-#define GIVEN( desc )     INTERNAL_CATCH_DYNAMIC_SECTION( "    Given: " << desc )
-#define AND_GIVEN( desc ) INTERNAL_CATCH_DYNAMIC_SECTION( "And given: " << desc )
-#define WHEN( desc )      INTERNAL_CATCH_DYNAMIC_SECTION( "     When: " << desc )
-#define AND_WHEN( desc )  INTERNAL_CATCH_DYNAMIC_SECTION( " And when: " << desc )
-#define THEN( desc )      INTERNAL_CATCH_DYNAMIC_SECTION( "     Then: " << desc )
-#define AND_THEN( desc )  INTERNAL_CATCH_DYNAMIC_SECTION( "      And: " << desc )
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-#define BENCHMARK(...) \
-    INTERNAL_CATCH_BENCHMARK(INTERNAL_CATCH_UNIQUE_NAME(____C_A_T_C_H____B_E_N_C_H____), INTERNAL_CATCH_GET_1_ARG(__VA_ARGS__,,), INTERNAL_CATCH_GET_2_ARG(__VA_ARGS__,,))
-#define BENCHMARK_ADVANCED(name) \
-    INTERNAL_CATCH_BENCHMARK_ADVANCED(INTERNAL_CATCH_UNIQUE_NAME(____C_A_T_C_H____B_E_N_C_H____), name)
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-using Catch::Detail::Approx;
-
-#else // CATCH_CONFIG_DISABLE
-
-//////
-// If this config identifier is defined then all CATCH macros are prefixed with CATCH_
-#ifdef CATCH_CONFIG_PREFIX_ALL
-
-#define CATCH_REQUIRE( ... )        (void)(0)
-#define CATCH_REQUIRE_FALSE( ... )  (void)(0)
-
-#define CATCH_REQUIRE_THROWS( ... ) (void)(0)
-#define CATCH_REQUIRE_THROWS_AS( expr, exceptionType ) (void)(0)
-#define CATCH_REQUIRE_THROWS_WITH( expr, matcher )     (void)(0)
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define CATCH_REQUIRE_THROWS_MATCHES( expr, exceptionType, matcher ) (void)(0)
-#endif// CATCH_CONFIG_DISABLE_MATCHERS
-#define CATCH_REQUIRE_NOTHROW( ... ) (void)(0)
-
-#define CATCH_CHECK( ... )         (void)(0)
-#define CATCH_CHECK_FALSE( ... )   (void)(0)
-#define CATCH_CHECKED_IF( ... )    if (__VA_ARGS__)
-#define CATCH_CHECKED_ELSE( ... )  if (!(__VA_ARGS__))
-#define CATCH_CHECK_NOFAIL( ... )  (void)(0)
-
-#define CATCH_CHECK_THROWS( ... )  (void)(0)
-#define CATCH_CHECK_THROWS_AS( expr, exceptionType ) (void)(0)
-#define CATCH_CHECK_THROWS_WITH( expr, matcher )     (void)(0)
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define CATCH_CHECK_THROWS_MATCHES( expr, exceptionType, matcher ) (void)(0)
-#endif // CATCH_CONFIG_DISABLE_MATCHERS
-#define CATCH_CHECK_NOTHROW( ... ) (void)(0)
-
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define CATCH_CHECK_THAT( arg, matcher )   (void)(0)
-
-#define CATCH_REQUIRE_THAT( arg, matcher ) (void)(0)
-#endif // CATCH_CONFIG_DISABLE_MATCHERS
-
-#define CATCH_INFO( msg )          (void)(0)
-#define CATCH_UNSCOPED_INFO( msg ) (void)(0)
-#define CATCH_WARN( msg )          (void)(0)
-#define CATCH_CAPTURE( msg )       (void)(0)
-
-#define CATCH_TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
-#define CATCH_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
-#define CATCH_METHOD_AS_TEST_CASE( method, ... )
-#define CATCH_REGISTER_TEST_CASE( Function, ... ) (void)(0)
-#define CATCH_SECTION( ... )
-#define CATCH_DYNAMIC_SECTION( ... )
-#define CATCH_FAIL( ... ) (void)(0)
-#define CATCH_FAIL_CHECK( ... ) (void)(0)
-#define CATCH_SUCCEED( ... ) (void)(0)
-
-#define CATCH_ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-#define CATCH_TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(__VA_ARGS__)
-#define CATCH_TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(__VA_ARGS__)
-#define CATCH_TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION(className, __VA_ARGS__)
-#define CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION(className, __VA_ARGS__ )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE( ... ) CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#else
-#define CATCH_TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(__VA_ARGS__) )
-#define CATCH_TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(__VA_ARGS__) )
-#define CATCH_TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION(className, __VA_ARGS__ ) )
-#define CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION(className, __VA_ARGS__ ) )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE( ... ) CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#endif
-
-// "BDD-style" convenience wrappers
-#define CATCH_SCENARIO( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
-#define CATCH_SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_METHOD_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), className )
-#define CATCH_GIVEN( desc )
-#define CATCH_AND_GIVEN( desc )
-#define CATCH_WHEN( desc )
-#define CATCH_AND_WHEN( desc )
-#define CATCH_THEN( desc )
-#define CATCH_AND_THEN( desc )
-
-#define CATCH_STATIC_REQUIRE( ... )       (void)(0)
-#define CATCH_STATIC_REQUIRE_FALSE( ... ) (void)(0)
-
-// If CATCH_CONFIG_PREFIX_ALL is not defined then the CATCH_ prefix is not required
-#else
-
-#define REQUIRE( ... )       (void)(0)
-#define REQUIRE_FALSE( ... ) (void)(0)
-
-#define REQUIRE_THROWS( ... ) (void)(0)
-#define REQUIRE_THROWS_AS( expr, exceptionType ) (void)(0)
-#define REQUIRE_THROWS_WITH( expr, matcher ) (void)(0)
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define REQUIRE_THROWS_MATCHES( expr, exceptionType, matcher ) (void)(0)
-#endif // CATCH_CONFIG_DISABLE_MATCHERS
-#define REQUIRE_NOTHROW( ... ) (void)(0)
-
-#define CHECK( ... ) (void)(0)
-#define CHECK_FALSE( ... ) (void)(0)
-#define CHECKED_IF( ... ) if (__VA_ARGS__)
-#define CHECKED_ELSE( ... ) if (!(__VA_ARGS__))
-#define CHECK_NOFAIL( ... ) (void)(0)
-
-#define CHECK_THROWS( ... )  (void)(0)
-#define CHECK_THROWS_AS( expr, exceptionType ) (void)(0)
-#define CHECK_THROWS_WITH( expr, matcher ) (void)(0)
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define CHECK_THROWS_MATCHES( expr, exceptionType, matcher ) (void)(0)
-#endif // CATCH_CONFIG_DISABLE_MATCHERS
-#define CHECK_NOTHROW( ... ) (void)(0)
-
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define CHECK_THAT( arg, matcher ) (void)(0)
-
-#define REQUIRE_THAT( arg, matcher ) (void)(0)
-#endif // CATCH_CONFIG_DISABLE_MATCHERS
-
-#define INFO( msg ) (void)(0)
-#define UNSCOPED_INFO( msg ) (void)(0)
-#define WARN( msg ) (void)(0)
-#define CAPTURE( msg ) (void)(0)
-
-#define TEST_CASE( ... )  INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
-#define TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
-#define METHOD_AS_TEST_CASE( method, ... )
-#define REGISTER_TEST_CASE( Function, ... ) (void)(0)
-#define SECTION( ... )
-#define DYNAMIC_SECTION( ... )
-#define FAIL( ... ) (void)(0)
-#define FAIL_CHECK( ... ) (void)(0)
-#define SUCCEED( ... ) (void)(0)
-#define ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-#define TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(__VA_ARGS__)
-#define TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(__VA_ARGS__)
-#define TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION(className, __VA_ARGS__)
-#define TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION(className, __VA_ARGS__ )
-#define TEMPLATE_PRODUCT_TEST_CASE( ... ) TEMPLATE_TEST_CASE( __VA_ARGS__ )
-#define TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) TEMPLATE_TEST_CASE( __VA_ARGS__ )
-#define TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#define TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#else
-#define TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(__VA_ARGS__) )
-#define TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(__VA_ARGS__) )
-#define TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION(className, __VA_ARGS__ ) )
-#define TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION(className, __VA_ARGS__ ) )
-#define TEMPLATE_PRODUCT_TEST_CASE( ... ) TEMPLATE_TEST_CASE( __VA_ARGS__ )
-#define TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) TEMPLATE_TEST_CASE( __VA_ARGS__ )
-#define TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#define TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#endif
-
-#define STATIC_REQUIRE( ... )       (void)(0)
-#define STATIC_REQUIRE_FALSE( ... ) (void)(0)
-
-#endif
-
-#define CATCH_TRANSLATE_EXCEPTION( signature ) INTERNAL_CATCH_TRANSLATE_EXCEPTION_NO_REG( INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionTranslator ), signature )
-
-// "BDD-style" convenience wrappers
-#define SCENARIO( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ) )
-#define SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_METHOD_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), className )
-
-#define GIVEN( desc )
-#define AND_GIVEN( desc )
-#define WHEN( desc )
-#define AND_WHEN( desc )
-#define THEN( desc )
-#define AND_THEN( desc )
-
-using Catch::Detail::Approx;
-
-#endif
-
-#endif // ! CATCH_CONFIG_IMPL_ONLY
-
-// start catch_reenable_warnings.h
-
-
-#ifdef __clang__
-#    ifdef __ICC // icpc defines the __clang__ macro
-#        pragma warning(pop)
-#    else
-#        pragma clang diagnostic pop
-#    endif
-#elif defined __GNUC__
-#    pragma GCC diagnostic pop
-#endif
-
-// end catch_reenable_warnings.h
-// end catch.hpp
-#endif // TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED
-
diff --git a/extras/test/include/Arduino.h b/extras/test/include/Arduino.h
deleted file mode 100644
index f4daa589..00000000
--- a/extras/test/include/Arduino.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-  This file is part of the ArduinoBLE library.
-  Copyright (c) 2018 Arduino SA. All rights reserved.
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  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
-*/
-
-#ifndef TEST_ARDUINO_H_
-#define TEST_ARDUINO_H_
-
-/******************************************************************************
-   INCLUDE
- ******************************************************************************/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include "String.h"
-#include "Stream.h"
-#include "itoa.h"
-#include "Common.h"
-
-/******************************************************************************
-   TYPEDEF
- ******************************************************************************/
-
-typedef arduino::String String;
-typedef bool boolean;
-
-/******************************************************************************
-   FUNCTION PROTOTYPES
- ******************************************************************************/
-
-#endif /* TEST_ARDUINO_H_ */
diff --git a/extras/test/include/test_advertising_data/FakeBLELocalDevice.h b/extras/test/include/test_advertising_data/FakeBLELocalDevice.h
deleted file mode 100644
index 94e97730..00000000
--- a/extras/test/include/test_advertising_data/FakeBLELocalDevice.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-  This file is part of the ArduinoBLE library.
-  Copyright (c) 2018 Arduino SA. All rights reserved.
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  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
-*/
-
-#ifndef _FAKE_BLELOCALDEVICE_H_
-#define _FAKE_BLELOCALDEVICE_H_
-
-#define private public
-#define protected public
-#include "BLELocalDevice.h"
-
-class FakeBLELocalDevice : public BLELocalDevice {
-  public:
-    FakeBLELocalDevice();
-    virtual ~FakeBLELocalDevice();
-    
-    int advertise();
-};
-
-#endif
diff --git a/extras/test/include/test_discovered_device/FakeGAP.h b/extras/test/include/test_discovered_device/FakeGAP.h
deleted file mode 100644
index 35b3233b..00000000
--- a/extras/test/include/test_discovered_device/FakeGAP.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-  This file is part of the ArduinoBLE library.
-  Copyright (c) 2018 Arduino SA. All rights reserved.
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  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
-*/
-
-#ifndef _FAKE_GAP_H_
-#define _FAKE_GAP_H_
-
-#define private public
-#define protected public
-#include "GAP.h"
-
-class FakeGAPClass : public GAPClass {
-  public:
-    FakeGAPClass();
-    virtual ~FakeGAPClass();
-};
-
-#endif
diff --git a/extras/test/include/util/Common.h b/extras/test/include/util/Common.h
deleted file mode 100644
index 8d288e18..00000000
--- a/extras/test/include/util/Common.h
+++ /dev/null
@@ -1,167 +0,0 @@
-#pragma once
-#include <stdint.h>
-
-#ifdef __cplusplus
-extern "C"{
-#endif
-
-void yield(void);
-
-typedef enum {
-  LOW     = 0,
-  HIGH    = 1,
-  CHANGE  = 2,
-  FALLING = 3,
-  RISING  = 4,
-} PinStatus;
-
-typedef enum {
-  INPUT           = 0x0,
-  OUTPUT          = 0x1,
-  INPUT_PULLUP    = 0x2,
-  INPUT_PULLDOWN  = 0x3,
-} PinMode;
-
-typedef enum {
-  LSBFIRST = 0,
-  MSBFIRST = 1,
-} BitOrder;
-
-#define PI          3.1415926535897932384626433832795
-#define HALF_PI     1.5707963267948966192313216916398
-#define TWO_PI      6.283185307179586476925286766559
-#define DEG_TO_RAD  0.017453292519943295769236907684886
-#define RAD_TO_DEG  57.295779513082320876798154814105
-#define EULER       2.718281828459045235360287471352
-
-#define SERIAL      0x0
-#define DISPLAY     0x1
-
-#ifndef constrain
-#define constrain(amt,low,high) ((amt)<(low)?(low):((amt)>(high)?(high):(amt)))
-#endif
-
-#ifndef radians
-#define radians(deg) ((deg)*DEG_TO_RAD)
-#endif
-
-#ifndef degrees
-#define degrees(rad) ((rad)*RAD_TO_DEG)
-#endif
-
-#ifndef sq
-#define sq(x) ((x)*(x))
-#endif
-
-typedef void (*voidFuncPtr)(void);
-typedef void (*voidFuncPtrParam)(void*);
-
-// interrupts() / noInterrupts() must be defined by the core
-
-#define lowByte(w) ((uint8_t) ((w) & 0xff))
-#define highByte(w) ((uint8_t) ((w) >> 8))
-
-#define bitRead(value, bit) (((value) >> (bit)) & 0x01)
-#define bitSet(value, bit) ((value) |= (1UL << (bit)))
-#define bitClear(value, bit) ((value) &= ~(1UL << (bit)))
-#define bitToggle(value, bit) ((value) ^= (1UL << (bit)))
-#define bitWrite(value, bit, bitvalue) (bitvalue ? bitSet(value, bit) : bitClear(value, bit))
-
-#ifndef bit
-#define bit(b) (1UL << (b))
-#endif
-
-/* TODO: request for removal */
-typedef bool      boolean;
-typedef uint8_t   byte;
-typedef uint16_t  word;
-
-void init(void);
-void initVariant(void);
-
-int atexit(void (*func)()) __attribute__((weak));
-int main() __attribute__((weak));
-
-#ifdef EXTENDED_PIN_MODE
-// Platforms who wnat to declare more than 256 pins need to define EXTENDED_PIN_MODE globally
-typedef uint32_t pin_size_t;
-#else
-typedef uint8_t pin_size_t;
-#endif
-
-void pinMode(pin_size_t pinNumber, PinMode pinMode);
-void digitalWrite(pin_size_t pinNumber, PinStatus status);
-PinStatus digitalRead(pin_size_t pinNumber);
-int analogRead(pin_size_t pinNumber);
-void analogReference(uint8_t mode);
-void analogWrite(pin_size_t pinNumber, int value);
-
-unsigned long millis(void);
-unsigned long micros(void);
-void delay(unsigned long);
-void delayMicroseconds(unsigned int us);
-unsigned long pulseIn(pin_size_t pin, uint8_t state, unsigned long timeout);
-unsigned long pulseInLong(pin_size_t pin, uint8_t state, unsigned long timeout);
-
-void shiftOut(pin_size_t dataPin, pin_size_t clockPin, BitOrder bitOrder, uint8_t val);
-pin_size_t shiftIn(pin_size_t dataPin, pin_size_t clockPin, BitOrder bitOrder);
-
-void attachInterrupt(pin_size_t interruptNumber, voidFuncPtr callback, PinStatus mode);
-void attachInterruptParam(pin_size_t interruptNumber, voidFuncPtrParam callback, PinStatus mode, void* param);
-void detachInterrupt(pin_size_t interruptNumber);
-
-void setup(void);
-void loop(void);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
-
-#ifdef __cplusplus
-  template<class T, class L> 
-  auto min(const T& a, const L& b) -> decltype((b < a) ? b : a)
-  {
-    return (b < a) ? b : a;
-  }
-
-  template<class T, class L> 
-  auto max(const T& a, const L& b) -> decltype((b < a) ? b : a)
-  {
-    return (a < b) ? b : a;
-  }
-#else
-#ifndef min
-#define min(a,b) \
-   ({ __typeof__ (a) _a = (a); \
-       __typeof__ (b) _b = (b); \
-     _a < _b ? _a : _b; })
-#endif
-#ifndef max
-#define max(a,b) \
-   ({ __typeof__ (a) _a = (a); \
-       __typeof__ (b) _b = (b); \
-     _a > _b ? _a : _b; })
-#endif
-#endif
-
-#ifdef __cplusplus
-
-/* C++ prototypes */
-uint16_t makeWord(uint16_t w);
-uint16_t makeWord(byte h, byte l);
-
-#define word(...) makeWord(__VA_ARGS__)
-
-unsigned long pulseIn(uint8_t pin, uint8_t state, unsigned long timeout = 1000000L);
-unsigned long pulseInLong(uint8_t pin, uint8_t state, unsigned long timeout = 1000000L);
-
-void tone(uint8_t _pin, unsigned int frequency, unsigned long duration = 0);
-void noTone(uint8_t _pin);
-
-// WMath prototypes
-long random(long);
-long random(long, long);
-void randomSeed(unsigned long);
-long map(long, long, long, long, long);
-
-#endif // __cplusplus
diff --git a/extras/test/include/util/HCIFakeTransport.h b/extras/test/include/util/HCIFakeTransport.h
deleted file mode 100644
index 6c8ac08c..00000000
--- a/extras/test/include/util/HCIFakeTransport.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//#include "Common.h"
-#pragma once
-
-#include "HCITransport.h"
-
-class HCIFakeTransportClass : public HCITransportInterface
-{
-public:
-    HCIFakeTransportClass() {};
-    ~HCIFakeTransportClass() {};
-
-    int begin() {return 0;}
-    void end() {return;}
-    void wait(unsigned long timeout) {return;}
-    int available() {return 0;}
-    int peek() {return 0;}
-    int read() {return 0;}
-    size_t write(const uint8_t* data, size_t length) {return 0;}
-};
\ No newline at end of file
diff --git a/extras/test/include/util/Stream.h b/extras/test/include/util/Stream.h
deleted file mode 100644
index f367e34c..00000000
--- a/extras/test/include/util/Stream.h
+++ /dev/null
@@ -1,40 +0,0 @@
-//#include "Common.h"
-#pragma once
-
-#define DEC 10
-#define HEX 16
-#define OCT 8
-#define BIN 2
-
-class Stream 
-{
-public:
-  Stream(const char *name = NULL);
-  ~Stream();
-
-  void flush() {}
-
-  size_t print(const char[]) { return 0; }
-  size_t print(char) { return 0; }
-  size_t print(unsigned char, int) { return 0; }
-  size_t print(int, int) { return 0; }
-  size_t print(unsigned int, int) { return 0; }
-  size_t print(long, int) { return 0; }
-  size_t print(unsigned long, int) { return 0; }
-  size_t print(long long, int) { return 0; }
-  size_t print(unsigned long long, int) { return 0; }
-  size_t print(double, int) { return 0; }
-  size_t print(void) { return 0; }
-
-  size_t println(const char[]) { return 0; }
-  size_t println(char) { return 0; }
-  size_t println(unsigned char, int) { return 0; }
-  size_t println(int, int) { return 0; }
-  size_t println(unsigned int, int) { return 0; }
-  size_t println(long, int) { return 0; }
-  size_t println(unsigned long, int) { return 0; }
-  size_t println(long long, int) { return 0; }
-  size_t println(unsigned long long, int) { return 0; }
-  size_t println(double, int) { return 0; }
-  size_t println(void) { return 0; }
-};
diff --git a/extras/test/include/util/String.h b/extras/test/include/util/String.h
deleted file mode 100644
index 3021a31e..00000000
--- a/extras/test/include/util/String.h
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
-  String library for Wiring & Arduino
-  ...mostly rewritten by Paul Stoffregen...
-  Copyright (c) 2009-10 Hernando Barragan.  All right reserved.
-  Copyright 2011, Paul Stoffregen, paul@pjrc.com
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  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 St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
-
-#ifdef __cplusplus
-
-#ifndef __ARDUINO_STRINGS__
-#define __ARDUINO_STRINGS__
-
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-
-namespace arduino {
-
-// When compiling programs with this class, the following gcc parameters
-// dramatically increase performance and memory (RAM) efficiency, typically
-// with little or no increase in code size.
-//     -felide-constructors
-//     -std=c++0x
-
-class __FlashStringHelper;
-#define F(string_literal) (reinterpret_cast<const __FlashStringHelper *>(PSTR(string_literal)))
-
-// An inherited class for holding the result of a concatenation.  These
-// result objects are assumed to be writable by subsequent concatenations.
-class StringSumHelper;
-
-// The string class
-class String
-{
-	friend class StringSumHelper;
-	// use a function pointer to allow for "if (s)" without the
-	// complications of an operator bool(). for more information, see:
-	// http://www.artima.com/cppsource/safebool.html
-	typedef void (String::*StringIfHelperType)() const;
-	void StringIfHelper() const {}
-
-public:
-	// constructors
-	// creates a copy of the initial value.
-	// if the initial value is null or invalid, or if memory allocation
-	// fails, the string will be marked as invalid (i.e. "if (s)" will
-	// be false).
-	String(const char *cstr = "");
-	String(const String &str);
-	String(const __FlashStringHelper *str);
-	#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__)
-	String(String &&rval);
-	String(StringSumHelper &&rval);
-	#endif
-	explicit String(char c);
-	explicit String(unsigned char, unsigned char base=10);
-	explicit String(int, unsigned char base=10);
-	explicit String(unsigned int, unsigned char base=10);
-	explicit String(long, unsigned char base=10);
-	explicit String(unsigned long, unsigned char base=10);
-	//explicit String(float, unsigned char decimalPlaces=2);
-	//explicit String(double, unsigned char decimalPlaces=2);
-	~String(void);
-
-	// memory management
-	// return true on success, false on failure (in which case, the string
-	// is left unchanged).  reserve(0), if successful, will validate an
-	// invalid string (i.e., "if (s)" will be true afterwards)
-	unsigned char reserve(unsigned int size);
-	inline unsigned int length(void) const {return len;}
-
-	// creates a copy of the assigned value.  if the value is null or
-	// invalid, or if the memory allocation fails, the string will be
-	// marked as invalid ("if (s)" will be false).
-	String & operator = (const String &rhs);
-	String & operator = (const char *cstr);
-	//String & operator = (const __FlashStringHelper *str);
-	#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__)
-	String & operator = (String &&rval);
-	String & operator = (StringSumHelper &&rval);
-	#endif
-
-	// concatenate (works w/ built-in types)
-
-	// returns true on success, false on failure (in which case, the string
-	// is left unchanged).  if the argument is null or invalid, the
-	// concatenation is considered unsucessful.
-	unsigned char concat(const String &str);
-	unsigned char concat(const char *cstr);
-	unsigned char concat(char c);
-	unsigned char concat(unsigned char c);
-	unsigned char concat(int num);
-	unsigned char concat(unsigned int num);
-	unsigned char concat(long num);
-	unsigned char concat(unsigned long num);
-	unsigned char concat(float num);
-	//unsigned char concat(double num);
-	unsigned char concat(const __FlashStringHelper * str);
-
-	// if there's not enough memory for the concatenated value, the string
-	// will be left unchanged (but this isn't signalled in any way)
-	String & operator += (const String &rhs)	{concat(rhs); return (*this);}
-	String & operator += (const char *cstr)		{concat(cstr); return (*this);}
-	String & operator += (char c)			{concat(c); return (*this);}
-	String & operator += (unsigned char num)		{concat(num); return (*this);}
-	String & operator += (int num)			{concat(num); return (*this);}
-	String & operator += (unsigned int num)		{concat(num); return (*this);}
-	String & operator += (long num)			{concat(num); return (*this);}
-	String & operator += (unsigned long num)	{concat(num); return (*this);}
-	String & operator += (float num)		{concat(num); return (*this);}
-	//String & operator += (double num)		{concat(num); return (*this);}
-	String & operator += (const __FlashStringHelper *str){concat(str); return (*this);}
-
-	friend StringSumHelper & operator + (const StringSumHelper &lhs, const String &rhs);
-	friend StringSumHelper & operator + (const StringSumHelper &lhs, const char *cstr);
-	friend StringSumHelper & operator + (const StringSumHelper &lhs, char c);
-	friend StringSumHelper & operator + (const StringSumHelper &lhs, unsigned char num);
-	friend StringSumHelper & operator + (const StringSumHelper &lhs, int num);
-	friend StringSumHelper & operator + (const StringSumHelper &lhs, unsigned int num);
-	friend StringSumHelper & operator + (const StringSumHelper &lhs, long num);
-	friend StringSumHelper & operator + (const StringSumHelper &lhs, unsigned long num);
-	friend StringSumHelper & operator + (const StringSumHelper &lhs, float num);
-	//friend StringSumHelper & operator + (const StringSumHelper &lhs, double num);
-	//friend StringSumHelper & operator + (const StringSumHelper &lhs, const __FlashStringHelper *rhs);
-
-	// comparison (only works w/ Strings and "strings")
-	operator StringIfHelperType() const { return buffer ? &String::StringIfHelper : 0; }
-	int compareTo(const String &s) const;
-	int compareTo(const char *cstr) const;
-	unsigned char equals(const String &s) const;
-	unsigned char equals(const char *cstr) const;
-
-	friend unsigned char operator == (const String &a, const String &b) { return a.equals(b); }
-	friend unsigned char operator == (const String &a, const char   *b) { return a.equals(b); }
-	friend unsigned char operator == (const char   *a, const String &b) { return b == a; }
-	friend unsigned char operator <  (const String &a, const String &b) { return a.compareTo(b) < 0; }
-	friend unsigned char operator <  (const String &a, const char   *b) { return a.compareTo(b) < 0; }
-	friend unsigned char operator <  (const char   *a, const String &b) { return b.compareTo(a) > 0; }
-
-	friend unsigned char operator != (const String &a, const String &b) { return !(a == b); }
-	friend unsigned char operator != (const String &a, const char   *b) { return !(a == b); }
-	friend unsigned char operator != (const char   *a, const String &b) { return !(a == b); }
-	friend unsigned char operator >  (const String &a, const String &b) { return b < a; }
-	friend unsigned char operator >  (const String &a, const char   *b) { return b < a; }
-	friend unsigned char operator >  (const char   *a, const String &b) { return b < a; }
-	friend unsigned char operator <= (const String &a, const String &b) { return !(b < a); }
-	friend unsigned char operator <= (const String &a, const char   *b) { return !(b < a); }
-	friend unsigned char operator <= (const char   *a, const String &b) { return !(b < a); }
-	friend unsigned char operator >= (const String &a, const String &b) { return !(a < b); }
-	friend unsigned char operator >= (const String &a, const char   *b) { return !(a < b); }
-	friend unsigned char operator >= (const char   *a, const String &b) { return !(a < b); }
-
-	unsigned char equalsIgnoreCase(const String &s) const;
-	unsigned char startsWith( const String &prefix) const;
-	unsigned char startsWith(const String &prefix, unsigned int offset) const;
-	unsigned char endsWith(const String &suffix) const;
-
-	// character acccess
-	char charAt(unsigned int index) const;
-	void setCharAt(unsigned int index, char c);
-	char operator [] (unsigned int index) const;
-	char& operator [] (unsigned int index);
-	void getBytes(unsigned char *buf, unsigned int bufsize, unsigned int index=0) const;
-	void toCharArray(char *buf, unsigned int bufsize, unsigned int index=0) const
-		{ getBytes((unsigned char *)buf, bufsize, index); }
-	const char* c_str() const { return buffer; }
-	char* begin() { return buffer; }
-	char* end() { return buffer + length(); }
-	const char* begin() const { return c_str(); }
-	const char* end() const { return c_str() + length(); }
-
-	// search
-	int indexOf( char ch ) const;
-	int indexOf( char ch, unsigned int fromIndex ) const;
-	int indexOf( const String &str ) const;
-	int indexOf( const String &str, unsigned int fromIndex ) const;
-	int lastIndexOf( char ch ) const;
-	int lastIndexOf( char ch, unsigned int fromIndex ) const;
-	int lastIndexOf( const String &str ) const;
-	int lastIndexOf( const String &str, unsigned int fromIndex ) const;
-	String substring( unsigned int beginIndex ) const { return substring(beginIndex, len); };
-	String substring( unsigned int beginIndex, unsigned int endIndex ) const;
-
-	// modification
-	void replace(char find, char replace);
-	void replace(const String& find, const String& replace);
-	void remove(unsigned int index);
-	void remove(unsigned int index, unsigned int count);
-	void toLowerCase(void);
-	void toUpperCase(void);
-	void trim(void);
-
-	// parsing/conversion
-	long toInt(void) const;
-	float toFloat(void) const;
-	double toDouble(void) const;
-
-protected:
-	char *buffer;	        // the actual char array
-	unsigned int capacity;  // the array length minus one (for the '\0')
-	unsigned int len;       // the String length (not counting the '\0')
-protected:
-	void init(void);
-	void invalidate(void);
-	unsigned char changeBuffer(unsigned int maxStrLen);
-	unsigned char concat(const char *cstr, unsigned int length);
-
-	// copy and move
-	String & copy(const char *cstr, unsigned int length);
-	String & copy(const __FlashStringHelper *pstr, unsigned int length);
-	#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__)
-	void move(String &rhs);
-	#endif
-};
-
-class StringSumHelper : public String
-{
-public:
-    StringSumHelper(const String &s) : String(s) {}
-    StringSumHelper(const char *p) : String(p) {}
-    StringSumHelper(char c) : String(c) {}
-    StringSumHelper(unsigned char num) : String(num) {}
-    StringSumHelper(int num) : String(num) {}
-    StringSumHelper(unsigned int num) : String(num) {}
-    StringSumHelper(long num) : String(num) {}
-    StringSumHelper(unsigned long num) : String(num) {}
-    //StringSumHelper(float num) : String(num) {}
-    //StringSumHelper(double num) : String(num) {}
-};
-
-} // namespace arduino
-
-#endif  // __cplusplus
-#endif  // __ARDUINO_STRINGS__
diff --git a/extras/test/include/util/TestUtil.h b/extras/test/include/util/TestUtil.h
deleted file mode 100644
index 111607ec..00000000
--- a/extras/test/include/util/TestUtil.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/*
- * Copyright (c) 2020 Arduino.  All rights reserved.
- */
diff --git a/extras/test/include/util/itoa.h b/extras/test/include/util/itoa.h
deleted file mode 100644
index 55b28493..00000000
--- a/extras/test/include/util/itoa.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-  Copyright (c) 2016 Arduino LLC.  All right reserved.
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-  See the GNU Lesser General Public License for more details.
-
-  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 St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
-
-#pragma once
-
-// Standard C functions required in Arduino API
-// If these functions are not provided by the standard library, the
-// core should supply an implementation of them.
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern char* itoa(int value, char *string, int radix);
-extern char* ltoa(long value, char *string, int radix);
-extern char* utoa(unsigned value, char *string, int radix);
-extern char* ultoa(unsigned long value, char *string, int radix);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
-
diff --git a/extras/test/src/Arduino.cpp b/extras/test/src/Arduino.cpp
deleted file mode 100644
index 6a6ab4e5..00000000
--- a/extras/test/src/Arduino.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-  This file is part of the ArduinoBLE library.
-  Copyright (c) 2018 Arduino SA. All rights reserved.
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  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
-*/
-
-/******************************************************************************
-   INCLUDE
- ******************************************************************************/
-
-#include <Arduino.h>
-
-/******************************************************************************
-   GLOBAL VARIABLES
- ******************************************************************************/
-
-static unsigned long current_millis = 0;
-
-/******************************************************************************
-   PUBLIC FUNCTIONS
- ******************************************************************************/
-
-void set_millis(unsigned long const millis)
-{
-  current_millis = millis;
-}
-
-unsigned long millis()
-{
-  return current_millis;
-}
diff --git a/extras/test/src/test_advertising_data/FakeBLELocalDevice.cpp b/extras/test/src/test_advertising_data/FakeBLELocalDevice.cpp
deleted file mode 100644
index 7f5a71ad..00000000
--- a/extras/test/src/test_advertising_data/FakeBLELocalDevice.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-  This file is part of the ArduinoBLE library.
-  Copyright (c) 2018 Arduino SA. All rights reserved.
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  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
-*/
-
-#include "FakeBLELocalDevice.h"
-
-FakeBLELocalDevice::FakeBLELocalDevice()
-{
-
-}
-
-FakeBLELocalDevice::~FakeBLELocalDevice()
-{
-
-}
-
-int FakeBLELocalDevice::advertise()
-{
-  _advertisingData.updateData();
-  _scanResponseData.updateData();
-  return 1;
-}
-
-FakeBLELocalDevice FakeBLEObj;
-BLELocalDevice& BLE = FakeBLEObj;
diff --git a/extras/test/src/test_advertising_data/test_advertising_data.cpp b/extras/test/src/test_advertising_data/test_advertising_data.cpp
deleted file mode 100644
index 67fa1d25..00000000
--- a/extras/test/src/test_advertising_data/test_advertising_data.cpp
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
-  This file is part of the ArduinoBLE library.
-  Copyright (c) 2018 Arduino SA. All rights reserved.
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  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
-*/
-
-#include <catch.hpp>
-
-#define private public
-#define protected public
-
-#include "FakeBLELocalDevice.h"
-#include "BLEAdvertisingData.h"
-
-TEST_CASE("Test flags override", "[ArduinoBLE::BLEAdvertisingData]")
-{
-  // Mocking advertisement packet
-  BLEAdvertisingData advData;
-  // Expected results
-  uint8_t defaultData[] = {0x02, BLEFieldFlags, 0x06};
-  uint8_t goldenFlags[] = {0x02, 0x01, BLEFlagsBREDRNotSupported};
-
-  WHEN("Default options for flags")
-  {
-    BLE.advertise();
-    REQUIRE( 0 == (memcmp(defaultData, BLE.getAdvertisingData().data(), sizeof(defaultData))) );
-    REQUIRE( BLE.getScanResponseData().dataLength() == 0 );
-  }
-
-  WHEN("Setting external advertising data which has flags")
-  {
-    advData.setFlags(BLEFlagsBREDRNotSupported);
-    advData.updateData();
-    BLE.setAdvertisingData(advData);
-    BLE.advertise();
-    REQUIRE( 3 == BLE.getAdvertisingData().dataLength());
-    REQUIRE( 0 == (memcmp(goldenFlags, advData.data(), sizeof(goldenFlags))) );
-    REQUIRE( 0 == (memcmp(goldenFlags, BLE.getAdvertisingData().data(), sizeof(goldenFlags))) );
-    REQUIRE( 0 != (memcmp(defaultData, BLE.getAdvertisingData().data(), sizeof(defaultData))) );
-  }
-
-  WHEN("Setting external advertising data without flags")
-  {
-    advData.clear();
-    BLE.setAdvertisingData(advData);
-    BLE.advertise();
-    REQUIRE( 0 == (memcmp(defaultData, BLE.getAdvertisingData().data(), sizeof(defaultData))) );
-  }
-
-  // Clear BLE advertising data
-  advData.clear();
-  BLE.setAdvertisingData(advData);
-}
-
-TEST_CASE("Set default flags in an already full advertising data packet", "[ArduinoBLE::BLEAdvertisingData]")
-{
-    BLEAdvertisingData advData;
-    bool retVal;
-
-    const char* name = "tes";
-    const uint8_t manufacturerData[24] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
-                                          17, 18, 19, 20, 21, 22, 23};
-
-    uint8_t defaultFlags[3] = {0x02, 0x01, 0x06}; 
-
-    uint8_t goldenData[31] = { 
-       (sizeof(manufacturerData) + 1), BLEFieldManufacturerData, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
-                                                                17, 18, 19, 20, 21, 22, 23,
-        ((uint8_t)(strlen(name) + 1)), BLEFieldCompleteLocalName, 't', 'e', 's'
-    }; 
-
-  WHEN("Test flags when advertising data is full")
-  {
-    retVal = advData.setLocalName("tes");
-    retVal = advData.setManufacturerData(manufacturerData, sizeof(manufacturerData));
-
-    BLE.setAdvertisingData(advData);
-    BLE.advertise();
-    REQUIRE(0 != memcmp(defaultFlags, BLE.getAdvertisingData().data(), sizeof(defaultFlags)));
-    REQUIRE(0 == memcmp(goldenData, BLE.getAdvertisingData().data(), sizeof(goldenData)));
-  }
-
-  // Clear BLE advertising data
-  advData.clear();
-  BLE.setAdvertisingData(advData);
-}
-
-TEST_CASE("BLE overwrite a full internal advertising data with an external built one", "[ArduinoBLE::BLEAdvertisingData]")
-{
-  bool verify;
-  BLEAdvertisingData advData;
-  BLEAdvertisingData internalData;
-
-  WHEN("Copy empty external advertising data")
-  {
-    BLE.setLocalName("test");
-    BLE.setAdvertisedServiceUuid("1818");
-    BLE.advertise();
-    //WARN("data length: " << BLE.getAdvertisingData().dataLength());
-    verify = (BLE.getAdvertisingData().dataLength() == (3 + (2+2)));
-    REQUIRE(verify);
-    verify = (BLE.getScanResponseData().dataLength() == (4+2));
-    REQUIRE(verify);
-
-    BLE.setAdvertisingData(advData);
-    BLE.advertise();
-    //WARN(BLE.getAdvertisingData().dataLength());
-    verify = (BLE.getAdvertisingData().dataLength() == 3);
-    REQUIRE(verify);
-
-    BLE.setScanResponseData(advData);
-    BLE.advertise();
-    verify = (BLE.getScanResponseData().dataLength() == 0);
-    REQUIRE(verify);
-  }
-
-  // Clear BLE advertising data
-  advData.clear();
-  BLE.setAdvertisingData(advData);
-}
-
-TEST_CASE("BLE test raw data", "[ArduinoBLE::BLEAdvertisingData]")
-{
-  BLEAdvertisingData advData;
-  bool retVal;
-
-  WHEN("Set too large raw data")
-  {
-    uint8_t data[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
-                      11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
-                      21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32 };
-    advData.setRawData(data, sizeof(data));
-    REQUIRE(!retVal);
-    advData.clear();
-  }
-
-  WHEN("Set correct raw data")
-  {
-    uint8_t data[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
-                      11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
-                      21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31};
-    retVal = advData.setRawData(data, sizeof(data));
-    REQUIRE(retVal);
-    advData.updateData();
-    REQUIRE( 0 == memcmp(data, advData.data(), sizeof(data)) );
-    advData.clear();
-  }
-
-  WHEN("Hide other parameters by setting raw data")
-  {
-    uint8_t data[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
-    advData.setLocalName("test");
-    advData.setRawData(data, sizeof(data));
-
-    advData.updateData();
-    REQUIRE( 0 == memcmp(data, advData.data(), sizeof(data)) );
-
-    advData.setLocalName("test");
-    advData.updateData();
-    REQUIRE( 0 == memcmp(data, advData.data(), sizeof(data)) );
-    
-    advData.clear();
-    advData.setLocalName("test");
-    advData.updateData();
-    REQUIRE( 0 != memcmp(data, advData.data(), sizeof(data)) );
-  }
-
-  // Clear BLE advertising data
-  advData.clear();
-  BLE.setAdvertisingData(advData);
-}
diff --git a/extras/test/src/test_advertising_data/test_local_name.cpp b/extras/test/src/test_advertising_data/test_local_name.cpp
deleted file mode 100644
index 947224cc..00000000
--- a/extras/test/src/test_advertising_data/test_local_name.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-  This file is part of the ArduinoBLE library.
-  Copyright (c) 2018 Arduino SA. All rights reserved.
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  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
-*/
-
-#include <catch.hpp>
-
-#define private public
-#define protected public
-
-#include "FakeBLELocalDevice.h"
-#include "BLEAdvertisingData.h"
-
-TEST_CASE("Test local name setting", "[ArduinoBLE::BLEAdvertisingData]")
-{
-  BLEAdvertisingData advData;
-  int oldRemainingLength = advData.remainingLength();
-  bool retVal;
-
-  WHEN("Set correct local name")
-  {
-    const char* name = "test";
-    retVal = advData.setLocalName(name);
-    REQUIRE(retVal);
-    REQUIRE( (strlen(name) + 2) == (oldRemainingLength - advData.remainingLength()) );
-    oldRemainingLength = advData.remainingLength();
-
-    advData.updateData();
-    REQUIRE(advData.dataLength() == (strlen(name) + 2));
-  }
-
-  WHEN("Set too long local name")
-  {
-    const char* name = "way too long local name (len 32)";
-    retVal = advData.setLocalName(name);
-    REQUIRE(!retVal);
-    REQUIRE( oldRemainingLength == advData.remainingLength() );
-    advData.updateData();
-    REQUIRE( advData.dataLength() == (MAX_AD_DATA_LENGTH - oldRemainingLength) );
-  }
-
-  WHEN("Overwrite local name with a name as long as max data length")
-  {
-    const char* name = "local name with full length  ";
-    retVal = advData.setLocalName(name);
-    REQUIRE(retVal);
-    REQUIRE( (strlen(name) + 2) == (oldRemainingLength - advData.remainingLength()) );
-    oldRemainingLength = advData.remainingLength();
-
-    advData.updateData();
-    REQUIRE(advData.dataLength() == (strlen(name) + 2));
-    // advData should be full now
-    REQUIRE( 0 == advData.remainingLength() );
-    REQUIRE( 0 == advData.availableForWrite() );
-  }
-
-  WHEN("Check consistency when setting the external advertising data")
-  {
-    auto goldenData = advData.data();
-    BLE.setAdvertisingData(advData);
-    BLE.advertise();
-    REQUIRE( 0 == memcmp(goldenData, BLE.getAdvertisingData().data(), advData.dataLength()) );
-  }
-
-  // Clear BLE advertising data
-  advData.clear();
-  BLE.setAdvertisingData(advData);
-}
diff --git a/extras/test/src/test_advertising_data/test_manufacturer.cpp b/extras/test/src/test_advertising_data/test_manufacturer.cpp
deleted file mode 100644
index 39f7e955..00000000
--- a/extras/test/src/test_advertising_data/test_manufacturer.cpp
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
-  This file is part of the ArduinoBLE library.
-  Copyright (c) 2018 Arduino SA. All rights reserved.
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  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
-*/
-
-#include <catch.hpp>
-
-#define private public
-#define protected public
-
-#include "FakeBLELocalDevice.h"
-#include "BLEAdvertisingData.h"
-
-TEST_CASE("Test manufacturer data setting", "[ArduinoBLE::BLEAdvertisingData]")
-{
-  BLEAdvertisingData advData;
-  int oldRemainingLength = advData.remainingLength();
-  uint16_t companyId = 0x1100;
-  bool retVal;
-
-  WHEN("Set correct manufacturer data without id")
-  {
-    const uint8_t data[] = {0x00, 0x11, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
-    const uint8_t goldenData[] = {(sizeof(data) + 1), BLEFieldManufacturerData, 
-                                  0x00, 0x11, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
-    retVal = advData.setManufacturerData(data, sizeof(data));
-    REQUIRE(retVal);
-    REQUIRE( (sizeof(data) + 2) == (oldRemainingLength - advData.remainingLength()) );
-    oldRemainingLength = advData.remainingLength();
-
-    advData.updateData();
-    REQUIRE(advData.dataLength() == sizeof(goldenData));
-    REQUIRE( 0 == memcmp(goldenData, advData.data(), sizeof(goldenData)) );
-  }
-
-  WHEN("Set correct manufacturer data given a manufacturer id")
-  {
-    const uint8_t data[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
-    const uint8_t goldenData[] = {(sizeof(data) + sizeof(companyId) + 1), BLEFieldManufacturerData, 
-                                  0x00, 0x11, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
-    retVal = advData.setManufacturerData(companyId, data, sizeof(data));
-    REQUIRE(retVal);
-    REQUIRE( (sizeof(data) + sizeof(companyId) + 2) == (oldRemainingLength - advData.remainingLength()) );
-    oldRemainingLength = advData.remainingLength();
-
-    advData.updateData();
-    REQUIRE(advData.dataLength() == sizeof(goldenData));
-    REQUIRE( 0 == memcmp(goldenData, advData.data(), sizeof(goldenData)) );
-  }
-
-  WHEN("Set too long manufacturer data given id")
-  {
-    // extreme case, 1 byte more than the maximum
-    const uint8_t data[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-                            16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27};
-    retVal = advData.setManufacturerData(companyId, data, sizeof(data));
-    REQUIRE(!retVal);
-    REQUIRE( oldRemainingLength == advData.remainingLength() );
-    advData.updateData();
-    REQUIRE( advData.dataLength() == (MAX_AD_DATA_LENGTH - oldRemainingLength) );
-  }
-
-  WHEN("Set too long manufacturer data without id")
-  {
-    // extreme case, 1 byte more than the maximum
-    const uint8_t data[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-                            16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29};
-    retVal = advData.setManufacturerData(data, sizeof(data));
-    REQUIRE(!retVal);
-    REQUIRE( oldRemainingLength == advData.remainingLength() );
-    advData.updateData();
-    REQUIRE( advData.dataLength() == (MAX_AD_DATA_LENGTH - oldRemainingLength) );
-  }
-
-  WHEN("Set manufacturer data without id after setting manufacturer data given id")
-  {
-    advData.clear();
-    const uint8_t dataGivenId[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-                                  16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26};
-    const uint8_t data[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-                            16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28};
-    retVal = advData.setManufacturerData(companyId, dataGivenId, sizeof(dataGivenId));
-    REQUIRE(retVal);
-    retVal = advData.setManufacturerData(data, sizeof(data));
-    REQUIRE(retVal);
-    REQUIRE( 0 == advData.remainingLength() );
-    advData.updateData();
-    REQUIRE( advData.dataLength() == (MAX_AD_DATA_LENGTH) );
-  }
-
-  WHEN("Set manufacturer data given id after setting manufacturer data without id")
-  {
-    advData.clear();
-    // dataGivenId is too long!! it should not pass
-    const uint8_t dataGivenId[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-                                  16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27};
-    const uint8_t data[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-                            16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28};
-    retVal = advData.setManufacturerData(data, sizeof(data));
-    REQUIRE(retVal);
-    retVal = advData.setManufacturerData(companyId, dataGivenId, sizeof(dataGivenId));
-    REQUIRE(!retVal);
-  }
-
-  WHEN("Overwrite manufacturer data with one as long as max data length")
-  {
-    const uint8_t data[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-                            16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26};
-    const uint8_t goldenData[] = {(sizeof(data) + sizeof(companyId) + 1), BLEFieldManufacturerData, 
-                                  0x00, 0x11, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11,
-                                  12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26};
-    retVal = advData.setManufacturerData(companyId, data, sizeof(data));
-    REQUIRE(retVal);
-
-    advData.updateData();
-    REQUIRE( 0 == advData.remainingLength() );
-    REQUIRE( 0 == advData.availableForWrite() );
-    REQUIRE( 0 == memcmp(goldenData, advData.data(), sizeof(goldenData)) );
-  }
-
-  WHEN("Check consistency when setting the external advertising data")
-  {
-    auto goldenData = advData.data();
-    BLE.setAdvertisingData(advData);
-    BLE.advertise();
-    REQUIRE( 0 == memcmp(goldenData, BLE.getAdvertisingData().data(), advData.dataLength()) );
-  }
-
-  // Clear BLE advertising data
-  advData.clear();
-  BLE.setAdvertisingData(advData);
-}
diff --git a/extras/test/src/test_advertising_data/test_service.cpp b/extras/test/src/test_advertising_data/test_service.cpp
deleted file mode 100644
index 5c212c1f..00000000
--- a/extras/test/src/test_advertising_data/test_service.cpp
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
-  This file is part of the ArduinoBLE library.
-  Copyright (c) 2018 Arduino SA. All rights reserved.
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  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
-*/
-
-#include <catch.hpp>
-
-#define private public
-#define protected public
-
-#include "FakeBLELocalDevice.h"
-#include "BLEAdvertisingData.h"
-
-TEST_CASE("Test advertised service id setting", "[ArduinoBLE::BLEAdvertisingData]")
-{
-  BLEAdvertisingData advData;
-  int oldRemainingLength = advData.remainingLength();
-  bool retVal;
-
-  WHEN("Set correct advertised service")
-  {
-    const char* service = "00112233445566770011223344556677";
-    retVal = advData.setAdvertisedServiceUuid(service);
-    REQUIRE(retVal);
-    REQUIRE( (16 + 2) == (oldRemainingLength - advData.remainingLength()) );
-    oldRemainingLength = advData.remainingLength();
-
-    advData.updateData();
-    REQUIRE(advData.dataLength() == (16 + 2));
-  }
-
-  WHEN("Set an advertised id too long with respect to the remaining length")
-  {
-    advData.clear();
-    const char* name = "12 chars str";
-    const char* service = "00112233445566770011223344556677";
-    advData.setLocalName(name);
-    oldRemainingLength = advData.remainingLength();
-    retVal = advData.setAdvertisedServiceUuid(service);
-    REQUIRE(!retVal);
-
-    REQUIRE( oldRemainingLength == advData.remainingLength() );
-    advData.updateData();
-    REQUIRE( advData.dataLength() == (MAX_AD_DATA_LENGTH - oldRemainingLength) );
-  }
-
-  WHEN("Fill to maximum an advertising packet with a service id")
-  {
-    advData.clear();
-    const char* name = "11 char str";
-    const char* service = "00112233445566770011223344556677";
-    advData.setLocalName(name);
-    retVal = advData.setAdvertisedServiceUuid(service);
-    REQUIRE(retVal);
-
-    advData.updateData();
-    REQUIRE(advData.dataLength() == (MAX_AD_DATA_LENGTH));
-    // advData should be full now
-    REQUIRE( 0 == advData.remainingLength() );
-    REQUIRE( 0 == advData.availableForWrite() );
-  }
-
-  WHEN("Check consistency when setting the external advertising data")
-  {
-    auto goldenData = advData.data();
-    BLE.setAdvertisingData(advData);
-    BLE.advertise();
-    REQUIRE( 0 == memcmp(goldenData, BLE.getAdvertisingData().data(), advData.dataLength()) );
-  }
-
-  // Clear BLE advertising data
-  advData.clear();
-  BLE.setAdvertisingData(advData);
-}
-
-TEST_CASE("Test service data setting", "[ArduinoBLE::BLEAdvertisingData]")
-{
-  BLEAdvertisingData advData;
-  int oldRemainingLength = advData.remainingLength();
-  uint16_t uuid = 0x1100;
-  bool retVal;
-
-  WHEN("Set correct service data")
-  {
-    const uint8_t data[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
-    const uint8_t goldenData[] = {(sizeof(data) + sizeof(uuid) + 1), BLEFieldServiceData, 
-                                  0x00, 0x11, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
-    retVal = advData.setAdvertisedServiceData(uuid, data, sizeof(data));
-    REQUIRE(retVal);
-    REQUIRE( (sizeof(data) + 2 + sizeof(uuid)) == (oldRemainingLength - advData.remainingLength()) );
-    oldRemainingLength = advData.remainingLength();
-
-    advData.updateData();
-    REQUIRE(advData.dataLength() == (sizeof(data) + 2 + sizeof(uuid)));
-    REQUIRE(advData.dataLength() == sizeof(goldenData));
-    REQUIRE( 0 == memcmp(goldenData, advData.data(), sizeof(goldenData)) );
-  }
-
-  WHEN("Set too long service data")
-  {
-    // extreme case, 1 byte more than the maximum
-    const uint8_t data[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-                            16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27};
-    retVal = advData.setAdvertisedServiceData(uuid, data, sizeof(data));
-    REQUIRE(!retVal);
-    REQUIRE( oldRemainingLength == advData.remainingLength() );
-    advData.updateData();
-    REQUIRE( advData.dataLength() == (MAX_AD_DATA_LENGTH - oldRemainingLength) );
-  }
-
-  WHEN("Overwrite service data with one as long as max data length")
-  {
-    const uint8_t data[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-                            16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26};
-    retVal = advData.setAdvertisedServiceData(uuid, data, sizeof(data));
-    REQUIRE(retVal);
-
-    advData.updateData();
-    // advData should be full now
-    REQUIRE( 0 == advData.remainingLength() );
-    REQUIRE( 0 == advData.availableForWrite() );
-  }
-
-  WHEN("Check consistency when setting the external advertising data")
-  {
-    auto goldenData = advData.data();
-    BLE.setAdvertisingData(advData);
-    BLE.advertise();
-    REQUIRE( 0 == memcmp(goldenData, BLE.getAdvertisingData().data(), advData.dataLength()) );
-  }
-
-  // Clear BLE advertising data
-  advData.clear();
-  BLE.setAdvertisingData(advData);
-}
diff --git a/extras/test/src/test_discovered_device/FakeGAP.cpp b/extras/test/src/test_discovered_device/FakeGAP.cpp
deleted file mode 100644
index bbf78206..00000000
--- a/extras/test/src/test_discovered_device/FakeGAP.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-  This file is part of the ArduinoBLE library.
-  Copyright (c) 2018 Arduino SA. All rights reserved.
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  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
-*/
-
-#include "FakeGAP.h"
-
-FakeGAPClass::FakeGAPClass()
-{
-}
-
-FakeGAPClass::~FakeGAPClass()
-{
-}
-
-FakeGAPClass GAPFakeObj;
-GAPClass& GAP = GAPFakeObj;
diff --git a/extras/test/src/test_discovered_device/test_discovered_device.cpp b/extras/test/src/test_discovered_device/test_discovered_device.cpp
deleted file mode 100644
index a6b54eb4..00000000
--- a/extras/test/src/test_discovered_device/test_discovered_device.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-  This file is part of the ArduinoBLE library.
-  Copyright (c) 2018 Arduino SA. All rights reserved.
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  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
-*/
-
-#include <catch.hpp>
-
-#define private public
-#define protected public
-#include "BLEDevice.h"
-
-TEST_CASE("BLE discovered device test", "[ArduinoBLE::BLEDevice]")
-{
-
-  WHEN("Retrieve local name from advertisement packet")
-  {
-    // Mocking advertisement packet
-    uint8_t advType = 0x03;
-    uint8_t eirLength = 6;
-    uint8_t eirData[] = {0x05, 0x09, 't', 'e', 's', 't'};
-    uint8_t rssi = 0;
-
-    // Expected results
-    String goldenName = "test";
-
-    // Simulate device discovery
-    BLEDevice device = BLEDevice();
-    device.setAdvertisementData(0x03, eirLength, eirData, rssi); 
-
-    bool hasName = device.hasLocalName();
-    REQUIRE(hasName);
-
-    String name = device.localName();
-    REQUIRE(goldenName == name);
-
-  }
-
-}
diff --git a/extras/test/src/test_main.cpp b/extras/test/src/test_main.cpp
deleted file mode 100644
index 16dbfb81..00000000
--- a/extras/test/src/test_main.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-  This file is part of the ArduinoBLE library.
-  Copyright (c) 2018 Arduino SA. All rights reserved.
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  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
-*/
-
-#define CATCH_CONFIG_MAIN /* This tells Catch to provide a main() - only do this in one cpp file */
-#include <catch.hpp>
diff --git a/extras/test/src/test_uuid/test_uuid.cpp b/extras/test/src/test_uuid/test_uuid.cpp
deleted file mode 100644
index 13b655e6..00000000
--- a/extras/test/src/test_uuid/test_uuid.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-  This file is part of the ArduinoBLE library.
-  Copyright (c) 2018 Arduino SA. All rights reserved.
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  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
-*/
-
-#include <catch.hpp>
-
-#include "utility/BLEUuid.h"
-
-TEST_CASE("BLE uuid test", "[ArduinoBLE::BLEUuid]")
-{
-  WHEN("Set and retrieve uuid")
-  {
-    bool verify;
-
-    const char* goldenUuid = "19b10010-e8f2-537e-4f6c-d104768a1214";
-    // little-endian order
-    const uint8_t goldenData[] = {0x14,0x12,0x8A,0x76,0x04,0xD1,0x6C,0x4F,0x7E,0x53,0xF2,0xE8,0x10,0x00,0xB1,0x19};
-    uint8_t goldenLength = 16;
-
-    BLEUuid test(goldenUuid);
-
-    uint8_t testLength = test.length();
-    verify = (goldenLength == testLength);
-    REQUIRE(verify);
-
-    const uint8_t *testData = test.data();
-    verify = ( 0 == (memcmp(goldenData, testData, sizeof(goldenData))) );
-    REQUIRE(verify);
-
-    const char *testUuid = test.uuidToString(testData, testLength);
-    verify = ( 0 == strcmp(testUuid, goldenUuid) );
-    REQUIRE(verify);
-
-    // print the uuid
-    WARN("test: " << testUuid << ",  golden: " << goldenUuid);
-  }
-}
\ No newline at end of file
diff --git a/extras/test/src/util/Common.cpp b/extras/test/src/util/Common.cpp
deleted file mode 100644
index e2e1eeb5..00000000
--- a/extras/test/src/util/Common.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-  This file is part of the ArduinoBLE library.
-  Copyright (c) 2018 Arduino SA. All rights reserved.
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  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
-*/
-
-#include "Common.h"
-
-void delay(unsigned long)
-{
-
-}
-
-/* C++ prototypes */
-long map(long x, long in_min, long in_max, long out_min, long out_max)
-{
-  return (x - in_min) * (out_max - out_min) / (in_max - in_min) + out_min;
-}
-
-uint16_t makeWord(uint16_t w) { return w; }
-uint16_t makeWord(uint8_t h, uint8_t l) { return (h << 8) | l; }
\ No newline at end of file
diff --git a/extras/test/src/util/HCIFakeTransport.cpp b/extras/test/src/util/HCIFakeTransport.cpp
deleted file mode 100644
index 26645f5e..00000000
--- a/extras/test/src/util/HCIFakeTransport.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-  This file is part of the ArduinoBLE library.
-  Copyright (c) 2018 Arduino SA. All rights reserved.
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  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
-*/
-
-#include "HCIFakeTransport.h"
-
-HCIFakeTransportClass HCIFakeTransport;
-HCITransportInterface& HCITransport = HCIFakeTransport;
\ No newline at end of file
diff --git a/extras/test/src/util/String.cpp b/extras/test/src/util/String.cpp
deleted file mode 100644
index 618973b6..00000000
--- a/extras/test/src/util/String.cpp
+++ /dev/null
@@ -1,755 +0,0 @@
-/*
-  String library for Wiring & Arduino
-  ...mostly rewritten by Paul Stoffregen...
-  Copyright (c) 2009-10 Hernando Barragan.  All rights reserved.
-  Copyright 2011, Paul Stoffregen, paul@pjrc.com
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  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 St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
-
-#include "String.h"
-#include "itoa.h"
-
-/*********************************************/
-/*  Constructors                             */
-/*********************************************/
-
-namespace arduino {
-
-String::String(const char *cstr)
-{
-	init();
-	if (cstr) copy(cstr, strlen(cstr));
-}
-
-String::String(const String &value)
-{
-	init();
-	*this = value;
-}
-
-String::String(const __FlashStringHelper *pstr)
-{
-	init();
-	*this = pstr;
-}
-
-#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__)
-String::String(String &&rval)
-{
-	init();
-	move(rval);
-}
-String::String(StringSumHelper &&rval)
-{
-	init();
-	move(rval);
-}
-#endif
-
-String::String(char c)
-{
-	init();
-	char buf[2];
-	buf[0] = c;
-	buf[1] = 0;
-	*this = buf;
-}
-
-String::String(unsigned char value, unsigned char base)
-{
-	init();
-	char buf[1 + 8 * sizeof(unsigned char)];
-	utoa(value, buf, base);
-	*this = buf;
-}
-
-String::String(int value, unsigned char base)
-{
-	init();
-	char buf[2 + 8 * sizeof(int)];
-	itoa(value, buf, base);
-	*this = buf;
-}
-
-String::String(unsigned int value, unsigned char base)
-{
-	init();
-	char buf[1 + 8 * sizeof(unsigned int)];
-	utoa(value, buf, base);
-	*this = buf;
-}
-
-String::String(long value, unsigned char base)
-{
-	init();
-	char buf[2 + 8 * sizeof(long)];
-	ltoa(value, buf, base);
-	*this = buf;
-}
-
-String::String(unsigned long value, unsigned char base)
-{
-	init();
-	char buf[1 + 8 * sizeof(unsigned long)];
-	ultoa(value, buf, base);
-	*this = buf;
-}
-
-/*
-String::String(float value, unsigned char decimalPlaces)
-{
-	init();
-	char buf[33];
-	*this = dtostrf(value, (decimalPlaces + 2), decimalPlaces, buf);
-}
-
-String::String(double value, unsigned char decimalPlaces)
-{
-	init();
-	char buf[33];
-	*this = dtostrf(value, (decimalPlaces + 2), decimalPlaces, buf);
-}
-*/
-
-String::~String()
-{
-	if (buffer) free(buffer);
-}
-
-/*********************************************/
-/*  Memory Management                        */
-/*********************************************/
-
-inline void String::init(void)
-{
-	buffer = NULL;
-	capacity = 0;
-	len = 0;
-}
-
-void String::invalidate(void)
-{
-	if (buffer) free(buffer);
-	buffer = NULL;
-	capacity = len = 0;
-}
-
-unsigned char String::reserve(unsigned int size)
-{
-	if (buffer && capacity >= size) return 1;
-	if (changeBuffer(size)) {
-		if (len == 0) buffer[0] = 0;
-		return 1;
-	}
-	return 0;
-}
-
-unsigned char String::changeBuffer(unsigned int maxStrLen)
-{
-	char *newbuffer = (char *)realloc(buffer, maxStrLen + 1);
-	if (newbuffer) {
-		buffer = newbuffer;
-		capacity = maxStrLen;
-		return 1;
-	}
-	return 0;
-}
-
-/*********************************************/
-/*  Copy and Move                            */
-/*********************************************/
-
-String & String::copy(const char *cstr, unsigned int length)
-{
-	if (!reserve(length)) {
-		invalidate();
-		return *this;
-	}
-	len = length;
-	strcpy(buffer, cstr);
-	return *this;
-}
-
-/*
-String & String::copy(const __FlashStringHelper *pstr, unsigned int length)
-{
-	if (!reserve(length)) {
-		invalidate();
-		return *this;
-	}
-	len = length;
-	strcpy_P(buffer, (PGM_P)pstr);
-	return *this;
-}
-*/
-
-#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__)
-void String::move(String &rhs)
-{
-	if (buffer) {
-		if (rhs && capacity >= rhs.len) {
-			strcpy(buffer, rhs.buffer);
-			len = rhs.len;
-			rhs.len = 0;
-			return;
-		} else {
-			free(buffer);
-		}
-	}
-	buffer = rhs.buffer;
-	capacity = rhs.capacity;
-	len = rhs.len;
-	rhs.buffer = NULL;
-	rhs.capacity = 0;
-	rhs.len = 0;
-}
-#endif
-
-String & String::operator = (const String &rhs)
-{
-	if (this == &rhs) return *this;
-	
-	if (rhs.buffer) copy(rhs.buffer, rhs.len);
-	else invalidate();
-	
-	return *this;
-}
-
-#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__)
-String & String::operator = (String &&rval)
-{
-	if (this != &rval) move(rval);
-	return *this;
-}
-
-String & String::operator = (StringSumHelper &&rval)
-{
-	if (this != &rval) move(rval);
-	return *this;
-}
-#endif
-
-String & String::operator = (const char *cstr)
-{
-	if (cstr) copy(cstr, strlen(cstr));
-	else invalidate();
-	
-	return *this;
-}
-
-/*
-String & String::operator = (const __FlashStringHelper *pstr)
-{
-	if (pstr) copy(pstr, strlen_P((PGM_P)pstr));
-	else invalidate();
-
-	return *this;
-}
-*/
-
-/*********************************************/
-/*  concat                                   */
-/*********************************************/
-
-unsigned char String::concat(const String &s)
-{
-	return concat(s.buffer, s.len);
-}
-
-unsigned char String::concat(const char *cstr, unsigned int length)
-{
-	unsigned int newlen = len + length;
-	if (!cstr) return 0;
-	if (length == 0) return 1;
-	if (!reserve(newlen)) return 0;
-	strcpy(buffer + len, cstr);
-	len = newlen;
-	return 1;
-}
-
-unsigned char String::concat(const char *cstr)
-{
-	if (!cstr) return 0;
-	return concat(cstr, strlen(cstr));
-}
-
-unsigned char String::concat(char c)
-{
-	char buf[2];
-	buf[0] = c;
-	buf[1] = 0;
-	return concat(buf, 1);
-}
-
-unsigned char String::concat(unsigned char num)
-{
-	char buf[1 + 3 * sizeof(unsigned char)];
-	itoa(num, buf, 10);
-	return concat(buf, strlen(buf));
-}
-
-unsigned char String::concat(int num)
-{
-	char buf[2 + 3 * sizeof(int)];
-	itoa(num, buf, 10);
-	return concat(buf, strlen(buf));
-}
-
-unsigned char String::concat(unsigned int num)
-{
-	char buf[1 + 3 * sizeof(unsigned int)];
-	utoa(num, buf, 10);
-	return concat(buf, strlen(buf));
-}
-
-unsigned char String::concat(long num)
-{
-	char buf[2 + 3 * sizeof(long)];
-	ltoa(num, buf, 10);
-	return concat(buf, strlen(buf));
-}
-
-unsigned char String::concat(unsigned long num)
-{
-	char buf[1 + 3 * sizeof(unsigned long)];
-	ultoa(num, buf, 10);
-	return concat(buf, strlen(buf));
-}
-
-/*
-unsigned char String::concat(float num)
-{
-	char buf[20];
-	char* string = dtostrf(num, 4, 2, buf);
-	return concat(string, strlen(string));
-}
-
-unsigned char String::concat(double num)
-{
-	char buf[20];
-	char* string = dtostrf(num, 4, 2, buf);
-	return concat(string, strlen(string));
-}
-
-unsigned char String::concat(const __FlashStringHelper * str)
-{
-	if (!str) return 0;
-	int length = strlen_P((const char *) str);
-	if (length == 0) return 1;
-	unsigned int newlen = len + length;
-	if (!reserve(newlen)) return 0;
-	strcpy_P(buffer + len, (const char *) str);
-	len = newlen;
-	return 1;
-}
-*/
-
-/*********************************************/
-/*  Concatenate                              */
-/*********************************************/
-
-StringSumHelper & operator + (const StringSumHelper &lhs, const String &rhs)
-{
-	StringSumHelper &a = const_cast<StringSumHelper&>(lhs);
-	if (!a.concat(rhs.buffer, rhs.len)) a.invalidate();
-	return a;
-}
-
-StringSumHelper & operator + (const StringSumHelper &lhs, const char *cstr)
-{
-	StringSumHelper &a = const_cast<StringSumHelper&>(lhs);
-	if (!cstr || !a.concat(cstr, strlen(cstr))) a.invalidate();
-	return a;
-}
-
-StringSumHelper & operator + (const StringSumHelper &lhs, char c)
-{
-	StringSumHelper &a = const_cast<StringSumHelper&>(lhs);
-	if (!a.concat(c)) a.invalidate();
-	return a;
-}
-
-StringSumHelper & operator + (const StringSumHelper &lhs, unsigned char num)
-{
-	StringSumHelper &a = const_cast<StringSumHelper&>(lhs);
-	if (!a.concat(num)) a.invalidate();
-	return a;
-}
-
-StringSumHelper & operator + (const StringSumHelper &lhs, int num)
-{
-	StringSumHelper &a = const_cast<StringSumHelper&>(lhs);
-	if (!a.concat(num)) a.invalidate();
-	return a;
-}
-
-StringSumHelper & operator + (const StringSumHelper &lhs, unsigned int num)
-{
-	StringSumHelper &a = const_cast<StringSumHelper&>(lhs);
-	if (!a.concat(num)) a.invalidate();
-	return a;
-}
-
-StringSumHelper & operator + (const StringSumHelper &lhs, long num)
-{
-	StringSumHelper &a = const_cast<StringSumHelper&>(lhs);
-	if (!a.concat(num)) a.invalidate();
-	return a;
-}
-
-StringSumHelper & operator + (const StringSumHelper &lhs, unsigned long num)
-{
-	StringSumHelper &a = const_cast<StringSumHelper&>(lhs);
-	if (!a.concat(num)) a.invalidate();
-	return a;
-}
-
-/*
-StringSumHelper & operator + (const StringSumHelper &lhs, float num)
-{
-	StringSumHelper &a = const_cast<StringSumHelper&>(lhs);
-	if (!a.concat(num)) a.invalidate();
-	return a;
-}
-
-StringSumHelper & operator + (const StringSumHelper &lhs, double num)
-{
-	StringSumHelper &a = const_cast<StringSumHelper&>(lhs);
-	if (!a.concat(num)) a.invalidate();
-	return a;
-}
-
-StringSumHelper & operator + (const StringSumHelper &lhs, const __FlashStringHelper *rhs)
-{
-	StringSumHelper &a = const_cast<StringSumHelper&>(lhs);
-	if (!a.concat(rhs))	a.invalidate();
-	return a;
-}
-*/
-
-/*********************************************/
-/*  Comparison                               */
-/*********************************************/
-
-int String::compareTo(const String &s) const
-{
-	if (!buffer || !s.buffer) {
-		if (s.buffer && s.len > 0) return 0 - *(unsigned char *)s.buffer;
-		if (buffer && len > 0) return *(unsigned char *)buffer;
-		return 0;
-	}
-	return strcmp(buffer, s.buffer);
-}
-
-int String::compareTo(const char *cstr) const
-{
-	if (!buffer || !cstr) {
-		if (cstr && !*cstr) return 0 - *(unsigned char *)cstr;
-		if (buffer && len > 0) return *(unsigned char *)buffer;
-		return 0;
-	}
-	return strcmp(buffer, cstr);
-}
-
-unsigned char String::equals(const String &s2) const
-{
-	return (len == s2.len && compareTo(s2) == 0);
-}
-
-unsigned char String::equals(const char *cstr) const
-{
-	if (len == 0) return (cstr == NULL || *cstr == 0);
-	if (cstr == NULL) return buffer[0] == 0;
-	return strcmp(buffer, cstr) == 0;
-}
-
-unsigned char String::equalsIgnoreCase( const String &s2 ) const
-{
-	if (this == &s2) return 1;
-	if (len != s2.len) return 0;
-	if (len == 0) return 1;
-	const char *p1 = buffer;
-	const char *p2 = s2.buffer;
-	while (*p1) {
-		if (tolower(*p1++) != tolower(*p2++)) return 0;
-	} 
-	return 1;
-}
-
-unsigned char String::startsWith( const String &s2 ) const
-{
-	if (len < s2.len) return 0;
-	return startsWith(s2, 0);
-}
-
-unsigned char String::startsWith( const String &s2, unsigned int offset ) const
-{
-	if (offset > len - s2.len || !buffer || !s2.buffer) return 0;
-	return strncmp( &buffer[offset], s2.buffer, s2.len ) == 0;
-}
-
-unsigned char String::endsWith( const String &s2 ) const
-{
-	if ( len < s2.len || !buffer || !s2.buffer) return 0;
-	return strcmp(&buffer[len - s2.len], s2.buffer) == 0;
-}
-
-/*********************************************/
-/*  Character Access                         */
-/*********************************************/
-
-char String::charAt(unsigned int loc) const
-{
-	return operator[](loc);
-}
-
-void String::setCharAt(unsigned int loc, char c) 
-{
-	if (loc < len) buffer[loc] = c;
-}
-
-char & String::operator[](unsigned int index)
-{
-	static char dummy_writable_char;
-	if (index >= len || !buffer) {
-		dummy_writable_char = 0;
-		return dummy_writable_char;
-	}
-	return buffer[index];
-}
-
-char String::operator[]( unsigned int index ) const
-{
-	if (index >= len || !buffer) return 0;
-	return buffer[index];
-}
-
-void String::getBytes(unsigned char *buf, unsigned int bufsize, unsigned int index) const
-{
-	if (!bufsize || !buf) return;
-	if (index >= len) {
-		buf[0] = 0;
-		return;
-	}
-	unsigned int n = bufsize - 1;
-	if (n > len - index) n = len - index;
-	strncpy((char *)buf, buffer + index, n);
-	buf[n] = 0;
-}
-
-/*********************************************/
-/*  Search                                   */
-/*********************************************/
-
-int String::indexOf(char c) const
-{
-	return indexOf(c, 0);
-}
-
-int String::indexOf( char ch, unsigned int fromIndex ) const
-{
-	if (fromIndex >= len) return -1;
-	const char* temp = strchr(buffer + fromIndex, ch);
-	if (temp == NULL) return -1;
-	return temp - buffer;
-}
-
-int String::indexOf(const String &s2) const
-{
-	return indexOf(s2, 0);
-}
-
-int String::indexOf(const String &s2, unsigned int fromIndex) const
-{
-	if (fromIndex >= len) return -1;
-	const char *found = strstr(buffer + fromIndex, s2.buffer);
-	if (found == NULL) return -1;
-	return found - buffer;
-}
-
-int String::lastIndexOf( char theChar ) const
-{
-	return lastIndexOf(theChar, len - 1);
-}
-
-int String::lastIndexOf(char ch, unsigned int fromIndex) const
-{
-	if (fromIndex >= len) return -1;
-	char tempchar = buffer[fromIndex + 1];
-	buffer[fromIndex + 1] = '\0';
-	char* temp = strrchr( buffer, ch );
-	buffer[fromIndex + 1] = tempchar;
-	if (temp == NULL) return -1;
-	return temp - buffer;
-}
-
-int String::lastIndexOf(const String &s2) const
-{
-	return lastIndexOf(s2, len - s2.len);
-}
-
-int String::lastIndexOf(const String &s2, unsigned int fromIndex) const
-{
-	if (s2.len == 0 || len == 0 || s2.len > len) return -1;
-	if (fromIndex >= len) fromIndex = len - 1;
-	int found = -1;
-	for (char *p = buffer; p <= buffer + fromIndex; p++) {
-		p = strstr(p, s2.buffer);
-		if (!p) break;
-		if ((unsigned int)(p - buffer) <= fromIndex) found = p - buffer;
-	}
-	return found;
-}
-
-String String::substring(unsigned int left, unsigned int right) const
-{
-	if (left > right) {
-		unsigned int temp = right;
-		right = left;
-		left = temp;
-	}
-	String out;
-	if (left >= len) return out;
-	if (right > len) right = len;
-	char temp = buffer[right];  // save the replaced character
-	buffer[right] = '\0';	
-	out = buffer + left;  // pointer arithmetic
-	buffer[right] = temp;  //restore character
-	return out;
-}
-
-/*********************************************/
-/*  Modification                             */
-/*********************************************/
-
-void String::replace(char find, char replace)
-{
-	if (!buffer) return;
-	for (char *p = buffer; *p; p++) {
-		if (*p == find) *p = replace;
-	}
-}
-
-void String::replace(const String& find, const String& replace)
-{
-	if (len == 0 || find.len == 0) return;
-	int diff = replace.len - find.len;
-	char *readFrom = buffer;
-	char *foundAt;
-	if (diff == 0) {
-		while ((foundAt = strstr(readFrom, find.buffer)) != NULL) {
-			memcpy(foundAt, replace.buffer, replace.len);
-			readFrom = foundAt + replace.len;
-		}
-	} else if (diff < 0) {
-		char *writeTo = buffer;
-		while ((foundAt = strstr(readFrom, find.buffer)) != NULL) {
-			unsigned int n = foundAt - readFrom;
-			memcpy(writeTo, readFrom, n);
-			writeTo += n;
-			memcpy(writeTo, replace.buffer, replace.len);
-			writeTo += replace.len;
-			readFrom = foundAt + find.len;
-			len += diff;
-		}
-		strcpy(writeTo, readFrom);
-	} else {
-		unsigned int size = len; // compute size needed for result
-		while ((foundAt = strstr(readFrom, find.buffer)) != NULL) {
-			readFrom = foundAt + find.len;
-			size += diff;
-		}
-		if (size == len) return;
-		if (size > capacity && !changeBuffer(size)) return; // XXX: tell user!
-		int index = len - 1;
-		while (index >= 0 && (index = lastIndexOf(find, index)) >= 0) {
-			readFrom = buffer + index + find.len;
-			memmove(readFrom + diff, readFrom, len - (readFrom - buffer));
-			len += diff;
-			buffer[len] = 0;
-			memcpy(buffer + index, replace.buffer, replace.len);
-			index--;
-		}
-	}
-}
-
-void String::remove(unsigned int index){
-	// Pass the biggest integer as the count. The remove method
-	// below will take care of truncating it at the end of the
-	// string.
-	remove(index, (unsigned int)-1);
-}
-
-void String::remove(unsigned int index, unsigned int count){
-	if (index >= len) { return; }
-	if (count <= 0) { return; }
-	if (count > len - index) { count = len - index; }
-	char *writeTo = buffer + index;
-	len = len - count;
-	memmove(writeTo, buffer + index + count,len - index);
-	buffer[len] = 0;
-}
-
-void String::toLowerCase(void)
-{
-	if (!buffer) return;
-	for (char *p = buffer; *p; p++) {
-		*p = tolower(*p);
-	}
-}
-
-void String::toUpperCase(void)
-{
-	if (!buffer) return;
-	for (char *p = buffer; *p; p++) {
-		*p = toupper(*p);
-	}
-}
-
-void String::trim(void)
-{
-	if (!buffer || len == 0) return;
-	char *begin = buffer;
-	while (isspace(*begin)) begin++;
-	char *end = buffer + len - 1;
-	while (isspace(*end) && end >= begin) end--;
-	len = end + 1 - begin;
-	if (begin > buffer) memmove(buffer, begin, len);
-	buffer[len] = 0;
-}
-
-/*********************************************/
-/*  Parsing / Conversion                     */
-/*********************************************/
-
-long String::toInt(void) const
-{
-	if (buffer) return atol(buffer);
-	return 0;
-}
-
-float String::toFloat(void) const
-{
-	return float(toDouble());
-}
-
-double String::toDouble(void) const
-{
-	if (buffer) return atof(buffer);
-	return 0;
-}
-
-} // namespace arduino
diff --git a/extras/test/src/util/TestUtil.cpp b/extras/test/src/util/TestUtil.cpp
deleted file mode 100644
index 111607ec..00000000
--- a/extras/test/src/util/TestUtil.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-/*
- * Copyright (c) 2020 Arduino.  All rights reserved.
- */
diff --git a/extras/test/src/util/itoa.c b/extras/test/src/util/itoa.c
deleted file mode 100644
index c9a275f6..00000000
--- a/extras/test/src/util/itoa.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
-  Copyright (c) 2014 Arduino LLC.  All right reserved.
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-  See the GNU Lesser General Public License for more details.
-
-  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 St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
-
-#include <itoa.h>
-#include <string.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern char* itoa( int value, char *string, int radix )
-{
-  return ltoa( value, string, radix ) ;
-}
-
-extern char* ltoa( long value, char *string, int radix )
-{
-  char tmp[33];
-  char *tp = tmp;
-  long i;
-  unsigned long v;
-  int sign;
-  char *sp;
-
-  if ( string == NULL )
-  {
-    return 0 ;
-  }
-
-  if (radix > 36 || radix <= 1)
-  {
-    return 0 ;
-  }
-
-  sign = (radix == 10 && value < 0);
-  if (sign)
-  {
-    v = -value;
-  }
-  else
-  {
-    v = (unsigned long)value;
-  }
-
-  while (v || tp == tmp)
-  {
-    i = v % radix;
-    v = v / radix;
-    if (i < 10)
-      *tp++ = i+'0';
-    else
-      *tp++ = i + 'a' - 10;
-  }
-
-  sp = string;
-
-  if (sign)
-    *sp++ = '-';
-  while (tp > tmp)
-    *sp++ = *--tp;
-  *sp = 0;
-
-  return string;
-}
-
-extern char* utoa( unsigned int value, char *string, int radix )
-{
-  return ultoa( value, string, radix ) ;
-}
-
-extern char* ultoa( unsigned long value, char *string, int radix )
-{
-  char tmp[33];
-  char *tp = tmp;
-  long i;
-  unsigned long v = value;
-  char *sp;
-
-  if ( string == NULL )
-  {
-    return 0;
-  }
-
-  if (radix > 36 || radix <= 1)
-  {
-    return 0;
-  }
-
-  while (v || tp == tmp)
-  {
-    i = v % radix;
-    v = v / radix;
-    if (i < 10)
-      *tp++ = i+'0';
-    else
-      *tp++ = i + 'a' - 10;
-  }
-
-  sp = string;
-
-
-  while (tp > tmp)
-    *sp++ = *--tp;
-  *sp = 0;
-
-  return string;
-}
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
diff --git a/keywords.txt b/keywords.txt
index ecfbafbf..04ef0505 100644
--- a/keywords.txt
+++ b/keywords.txt
@@ -1,12 +1,12 @@
 #######################################
-# Syntax Coloring Map For ArduinoBLE
+# Syntax Coloring Map For STM32duinoBLE
 #######################################
 
 #######################################
 # Datatypes (KEYWORD1)
 #######################################
 
-ArduinoBLE	KEYWORD1
+STM32duinoBLE	KEYWORD1
 BLE	KEYWORD1
 
 BLEDevice	KEYWORD1
diff --git a/library.properties b/library.properties
index 6e248f5f..94860ca4 100644
--- a/library.properties
+++ b/library.properties
@@ -1,10 +1,10 @@
-name=ArduinoBLE
+name=STM32duinoBLE
 version=1.3.7
-author=Arduino
-maintainer=Arduino <info@arduino.cc>
-sentence=Enables Bluetooth® Low Energy connectivity on the Arduino MKR WiFi 1010, Arduino UNO WiFi Rev2, Arduino Nano 33 IoT, Arduino Nano 33 BLE, Nicla Sense ME and UNO R4 WiFi.
+author=Arduino, SRA
+maintainer=stm32duino
+sentence=Fork of ArduinoBLE library to add the support of SPBTLE-RF, SPBTLE-1S, BLUENRG-M2SP, BLUENRG-LP and BLUENRG-M0 BLE modules.
 paragraph=This library supports creating a Bluetooth® Low Energy peripheral & central mode.
 category=Communication
-url=https://www.arduino.cc/en/Reference/ArduinoBLE
-architectures=samd,megaavr,mbed,apollo3,mbed_nano,mbed_portenta,mbed_nicla,esp32,mbed_giga,renesas,renesas_portenta,mbed_opta,renesas_uno,silabs
-includes=ArduinoBLE.h
+url=https://github.com/stm32duino/STM32duinoBLE
+architectures=stm32
+includes=STM32duinoBLE.h
diff --git a/src/ArduinoBLE.h b/src/STM32duinoBLE.h
similarity index 94%
rename from src/ArduinoBLE.h
rename to src/STM32duinoBLE.h
index 588d5cb1..c603e3da 100644
--- a/src/ArduinoBLE.h
+++ b/src/STM32duinoBLE.h
@@ -17,8 +17,8 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#ifndef _ARDUINO_BLE_H_
-#define _ARDUINO_BLE_H_
+#ifndef _STM32DUINO_BLE_H_
+#define _STM32DUINO_BLE_H_
 
 #include "local/BLELocalDevice.h"
 #include "BLEProperty.h"
diff --git a/src/utility/CordioHCICustomDriver.h b/src/utility/CordioHCICustomDriver.h
deleted file mode 100644
index fc062ee8..00000000
--- a/src/utility/CordioHCICustomDriver.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#if defined(CORE_CM4)
-
-#include "CyH4TransportDriver.h"
-
-ble::vendor::cypress_ble::CyH4TransportDriver& ble_cordio_get_h4_transport_driver()
-{
-    static  ble::vendor::cypress_ble::CyH4TransportDriver s_transport_driver(
-        /* TX */ CYBSP_BT_UART_TX, /* RX */ CYBSP_BT_UART_RX,
-        /* cts */ CYBSP_BT_UART_CTS, /* rts */ CYBSP_BT_UART_RTS, NC, DEF_BT_BAUD_RATE,
-        CYBSP_BT_HOST_WAKE, CYBSP_BT_DEVICE_WAKE
-    );
-    return s_transport_driver;
-}
-
-#define CUSTOM_HCI_DRIVER
-
-#endif
\ No newline at end of file
diff --git a/src/utility/HCICordioTransport.cpp b/src/utility/HCICordioTransport.cpp
deleted file mode 100644
index 7848712f..00000000
--- a/src/utility/HCICordioTransport.cpp
+++ /dev/null
@@ -1,314 +0,0 @@
-/*
-  This file is part of the ArduinoBLE library.
-  Copyright (c) 2019 Arduino SA. All rights reserved.
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  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
-*/
-
-#if defined(ARDUINO_ARCH_MBED) && !defined(TARGET_NANO_RP2040_CONNECT) // && !defined(CORE_CM4)
-#include <Arduino.h>
-#include <mbed.h>
-
-#include <driver/CordioHCITransportDriver.h>
-#include <driver/CordioHCIDriver.h>
-
-#if defined(ARDUINO_PORTENTA_H7_M4) || defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_NICLA_VISION) || defined(ARDUINO_GIGA) || defined(ARDUINO_OPTA)
-#include "ble/BLE.h"
-#include <events/mbed_events.h>
-#endif
-
-// Parts of this file are based on: https://github.com/ARMmbed/mbed-os-cordio-hci-passthrough/pull/2
-// With permission from the Arm Mbed team to re-license
-
-#if CORDIO_ZERO_COPY_HCI
-#include <wsf_types.h>
-#include <wsf_buf.h>
-#include <wsf_msg.h>
-#include <wsf_os.h>
-#include <wsf_buf.h>
-#include <wsf_timer.h>
-
-/* avoid many small allocs (and WSF doesn't have smaller buffers) */
-#define MIN_WSF_ALLOC (16)
-#endif //CORDIO_ZERO_COPY_HCI
-
-#include "HCICordioTransport.h"
-
-#if (MBED_VERSION > MBED_ENCODE_VERSION(6, 2, 0))
-#define BLE_NAMESPACE ble 
-#else
-#define BLE_NAMESPACE ble::vendor::cordio
-#endif
-
-#include "CordioHCICustomDriver.h"
-
-extern BLE_NAMESPACE::CordioHCIDriver& ble_cordio_get_hci_driver();
-
-namespace BLE_NAMESPACE {
-  struct CordioHCIHook {
-    static CordioHCIDriver& getDriver() {
-      return ble_cordio_get_hci_driver();
-    }
-
-    static CordioHCITransportDriver& getTransportDriver() {
-      return getDriver()._transport_driver;
-    }
-
-    static void setDataReceivedHandler(void (*handler)(uint8_t*, uint8_t)) {
-      getTransportDriver().set_data_received_handler(handler);
-    }
-  };
-}
-
-using BLE_NAMESPACE::CordioHCIHook;
-
-#if CORDIO_ZERO_COPY_HCI
-extern uint8_t *SystemHeapStart;
-extern uint32_t SystemHeapSize;
-
-void init_wsf(BLE_NAMESPACE::buf_pool_desc_t& buf_pool_desc) {
-    static bool init = false;
-
-    if (init) {
-      return;
-    }
-    init = true;
-
-    // use the buffer for the WSF heap
-    SystemHeapStart = buf_pool_desc.buffer_memory;
-    SystemHeapSize = buf_pool_desc.buffer_size;
-
-    // Initialize buffers with the ones provided by the HCI driver
-    uint16_t bytes_used = WsfBufInit(
-        buf_pool_desc.pool_count,
-        (wsfBufPoolDesc_t*)buf_pool_desc.pool_description
-    );
-
-    // Raise assert if not enough memory was allocated
-    MBED_ASSERT(bytes_used != 0);
-
-    SystemHeapStart += bytes_used;
-    SystemHeapSize -= bytes_used;
-
-    WsfTimerInit();
-}
-
-
-extern "C" void wsf_mbed_ble_signal_event(void)
-{
-    // do nothing
-}
-#endif //CORDIO_ZERO_COPY_HCI
-
-static void bleLoop()
-{
-#if CORDIO_ZERO_COPY_HCI
-    uint64_t last_update_us = 0;
-    mbed::LowPowerTimer timer;
-
-    timer.start();
-
-    while (true) {
-        last_update_us += (uint64_t) timer.read_high_resolution_us();
-        timer.reset();
-
-        uint64_t last_update_ms = (last_update_us / 1000);
-        wsfTimerTicks_t wsf_ticks = (last_update_ms / WSF_MS_PER_TICK);
-
-        if (wsf_ticks > 0) {
-            WsfTimerUpdate(wsf_ticks);
-            last_update_us -= (last_update_ms * 1000);
-        }
-
-        wsfOsDispatcher();
-
-        bool sleep = false;
-        {
-            /* call needs interrupts disabled */
-            mbed::CriticalSectionLock critical_section;
-            if (wsfOsReadyToSleep()) {
-                sleep = true;
-            }
-        }
-
-        uint64_t time_spent = (uint64_t) timer.read_high_resolution_us();
-
-        /* don't bother sleeping if we're already past tick */
-        if (sleep && (WSF_MS_PER_TICK * 1000 > time_spent)) {
-            /* sleep to maintain constant tick rate */
-            uint64_t wait_time_us = WSF_MS_PER_TICK * 1000 - time_spent;
-            uint64_t wait_time_ms = wait_time_us / 1000;
-
-            wait_time_us = wait_time_us % 1000;
-
-            if (wait_time_ms) {
-              rtos::ThisThread::sleep_for(wait_time_ms);
-            }
-
-            if (wait_time_us) {
-              wait_us(wait_time_us);
-            }
-        }
-    }
-#else
-    while(true) {
-        rtos::ThisThread::sleep_for(osWaitForever);
-    }
-#endif // CORDIO_ZERO_COPY_HCI
-}
-
-static rtos::EventFlags bleEventFlags; 
-static rtos::Thread* bleLoopThread = NULL;
-
-
-HCICordioTransportClass::HCICordioTransportClass() :
-  _begun(false)
-{
-}
-
-HCICordioTransportClass::~HCICordioTransportClass()
-{
-}
-
-#if (defined(ARDUINO_PORTENTA_H7_M4) || defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_NICLA_VISION) || defined(ARDUINO_GIGA) || defined(ARDUINO_OPTA)) && !defined(CUSTOM_HCI_DRIVER)
-events::EventQueue eventQueue(10 * EVENTS_EVENT_SIZE);
-void scheduleMbedBleEvents(BLE::OnEventsToProcessCallbackContext *context) {
-  eventQueue.call(mbed::Callback<void()>(&context->ble, &BLE::processEvents));
-}
-
-void completeCallback(BLE::InitializationCompleteCallbackContext *context) {
-  eventQueue.break_dispatch();
-}
-#endif
-
-int HCICordioTransportClass::begin()
-{
-  _rxBuf.clear();
-
-#if CORDIO_ZERO_COPY_HCI
-  BLE_NAMESPACE::buf_pool_desc_t bufPoolDesc = CordioHCIHook::getDriver().get_buffer_pool_description();
-  init_wsf(bufPoolDesc);
-#endif
-
-#if (defined(ARDUINO_PORTENTA_H7_M4) || defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_NICLA_VISION) || defined(ARDUINO_GIGA) || defined(ARDUINO_OPTA)) && !defined(CUSTOM_HCI_DRIVER)
-
-  BLE &ble = BLE::Instance();
-  ble.onEventsToProcess(scheduleMbedBleEvents);
-
-  ble.init(completeCallback);
-  eventQueue.dispatch(10000);
-
-  if (!ble.hasInitialized()){
-    return 0;
-  } 
-#else 
-  CordioHCIHook::getDriver().initialize();
-#endif
-
-  if (bleLoopThread == NULL) {
-    bleLoopThread = new rtos::Thread();
-    bleLoopThread->start(bleLoop);
-  }
-
-  CordioHCIHook::setDataReceivedHandler(HCICordioTransportClass::onDataReceived);
-
-  _begun = true;
-
-  return 1;
-}
-
-void HCICordioTransportClass::end()
-{
-  if (bleLoopThread != NULL) {
-    bleLoopThread->terminate();
-    delete bleLoopThread;
-    bleLoopThread = NULL;
-  }
-
-#if !defined(TARGET_STM32H7)
-  CordioHCIHook::getDriver().terminate();
-#endif
-
-  _begun = false;
-}
-
-void HCICordioTransportClass::wait(unsigned long timeout)
-{
-  if (available()) {
-    return;
-  }
-
-  // wait for handleRxData to signal
-  bleEventFlags.wait_all(0x01, timeout, true);
-}
-
-int HCICordioTransportClass::available()
-{
-  return _rxBuf.available();
-}
-
-int HCICordioTransportClass::peek()
-{
-  return _rxBuf.peek();
-}
-
-int HCICordioTransportClass::read()
-{
-  return _rxBuf.read_char();
-}
-
-size_t HCICordioTransportClass::write(const uint8_t* data, size_t length)
-{
-  if (!_begun) {
-    return 0;
-  }
-
-  uint8_t packetLength = length - 1;
-  uint8_t packetType   = data[0];
-
-#if CORDIO_ZERO_COPY_HCI
-  uint8_t* packet = (uint8_t*)WsfMsgAlloc(max(packetLength, MIN_WSF_ALLOC));
-
-  memcpy(packet, &data[1], packetLength);
-
-  return CordioHCIHook::getTransportDriver().write(packetType, packetLength, packet);
-#else
-  return CordioHCIHook::getTransportDriver().write(packetType, packetLength, (uint8_t*)&data[1]);
-#endif
-}
-
-void HCICordioTransportClass::handleRxData(uint8_t* data, uint8_t len)
-{
-  if (_rxBuf.availableForStore() < len) {
-    // drop!
-    return;
-  }
-
-  for (int i = 0; i < len; i++) {
-    _rxBuf.store_char(data[i]);
-  }
-
-  bleEventFlags.set(0x01);
-}
-
-HCICordioTransportClass HCICordioTransport;
-HCITransportInterface& HCITransport = HCICordioTransport;
-
-void HCICordioTransportClass::onDataReceived(uint8_t* data, uint8_t len)
-{
-  HCICordioTransport.handleRxData(data, len);
-}
-
-#endif
diff --git a/src/utility/HCICordioTransport.h b/src/utility/HCICordioTransport.h
deleted file mode 100644
index b8d0596a..00000000
--- a/src/utility/HCICordioTransport.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
-  This file is part of the ArduinoBLE library.
-  Copyright (c) 2019 Arduino SA. All rights reserved.
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  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
-*/
-
-#ifndef _HCI_CORDIO_TRANSPORT_H_
-#define _HCI_CORDIO_TRANSPORT_H_
-
-#include <string.h>
-
-#include "api/RingBuffer.h"
-
-#include "HCITransport.h"
-
-class HCICordioTransportClass : public HCITransportInterface {
-public:
-  HCICordioTransportClass();
-  virtual ~HCICordioTransportClass();
-
-  virtual int begin();
-  virtual void end();
-
-  virtual void wait(unsigned long timeout);
-
-  virtual int available();
-  virtual int peek();
-  virtual int read();
-
-  virtual size_t write(const uint8_t* data, size_t length);
-
-private:
-  static void onDataReceived(uint8_t* data, uint8_t len);
-  void handleRxData(uint8_t* data, uint8_t len);
-
-private:
-  bool _begun;
-  RingBufferN<256> _rxBuf;
-};
-
-#endif
diff --git a/src/utility/HCISilabsTransport.cpp b/src/utility/HCISilabsTransport.cpp
deleted file mode 100644
index 135fd020..00000000
--- a/src/utility/HCISilabsTransport.cpp
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
-  This file is part of the ArduinoBLE library.
-  Copyright (c) 2024 Arduino SA. All rights reserved.
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  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
-*/
-
-#if defined(ARDUINO_SILABS)
-
-#include "HCISilabsTransport.h"
-#include "sl_string.h"
-
-extern "C" {
-#include "sl_btctrl_linklayer.h"
-#include "sl_hci_common_transport.h"
-}
-
-extern "C" int strcasecmp(char const *a, char const *b) {
-  return sl_strcasecmp(a, b);
-}
-
-static RingBufferN<512> buf;
-
-HCISilabsTransportClass::HCISilabsTransportClass()
-{
-}
-
-HCISilabsTransportClass::~HCISilabsTransportClass()
-{
-}
-
-int HCISilabsTransportClass::begin()
-{
-  if(!sl_btctrl_is_initialized()) {
-    sl_bt_controller_init(); 
-  }
-
-  /* Initialize adv & scan components */
-  sl_btctrl_init_adv();
-  sl_btctrl_init_scan();
-  sl_btctrl_init_conn(); 
-  sl_btctrl_init_adv_ext();
-  sl_btctrl_init_scan_ext();
-
-  /* Initialize HCI controller */
-  sl_bthci_init_upper(); 
-  sl_btctrl_hci_parser_init_default();
-  sl_btctrl_hci_parser_init_conn();
-  sl_btctrl_hci_parser_init_adv();
-  sl_btctrl_hci_parser_init_phy();
-
-  return 1;
-}
-
-void HCISilabsTransportClass::end()
-{
-  sl_bt_controller_deinit();
-}
-
-void HCISilabsTransportClass::wait(unsigned long timeout)
-{
-  for (unsigned long start = millis(); (millis() - start) < timeout;) {
-    if (available()) {
-      break;
-    }
-  }
-}
-
-int HCISilabsTransportClass::available()
-{
-  return buf.available();
-}
-
-int HCISilabsTransportClass::peek()
-{
-  return buf.peek();
-}
-
-int HCISilabsTransportClass::read()
-{
-  return buf.read_char();
-}
-
-size_t HCISilabsTransportClass::write(const uint8_t* data, size_t len)
-{
-  int ret = 0;
-  ret = hci_common_transport_receive((uint8_t *)data, len, true);
-
-  if (ret == 0) return len;
-
-  return 0;
-}
-
-extern "C" {
-  /**
-   * @brief Transmit HCI message using the currently used transport layer.
-   * The HCI calls this function to transmit a full HCI message.
-   * @param[in] data Packet type followed by HCI packet data.
-   * @param[in] len Length of the `data` parameter
-   * @return 0 - on success, or non-zero on failure.
-   */
-  uint32_t hci_common_transport_transmit(uint8_t *data, int16_t len)
-  {
-    for (int i = 0; i < len; i++) {
-      buf.store_char(data[i]);
-      if (buf.isFull()) return SL_STATUS_FAIL;
-    }
-    
-    sl_btctrl_hci_transmit_complete(0);
-    return 0;
-  }
-}
-
-HCISilabsTransportClass HCISilabsTransport;
-
-HCITransportInterface& HCITransport = HCISilabsTransport;
-
-#endif
diff --git a/src/utility/HCISilabsTransport.h b/src/utility/HCISilabsTransport.h
deleted file mode 100644
index 2061e782..00000000
--- a/src/utility/HCISilabsTransport.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-  This file is part of the ArduinoBLE library.
-  Copyright (c) 2018 Arduino SA. All rights reserved.
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  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
-*/
-
-#ifndef _HCI_SILABS_TRANSPORT_H_
-#define _HCI_SILABS_TRANSPORT_H_
-
-#include "HCITransport.h"
-
-class HCISilabsTransportClass : public HCITransportInterface {
-public:
-  HCISilabsTransportClass();
-  virtual ~HCISilabsTransportClass();
-
-  virtual int begin();
-  virtual void end();
-
-  virtual void wait(unsigned long timeout);
-
-  virtual int available();
-  virtual int peek();
-  virtual int read();
-
-  virtual size_t write(const uint8_t* data, size_t length);
-};
-
-#endif
\ No newline at end of file
diff --git a/src/utility/HCIUartTransport.cpp b/src/utility/HCIUartTransport.cpp
deleted file mode 100644
index 191811a7..00000000
--- a/src/utility/HCIUartTransport.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
-  This file is part of the ArduinoBLE library.
-  Copyright (c) 2018 Arduino SA. All rights reserved.
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  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
-*/
-
-#if !defined(ARDUINO_ARCH_MBED) && !defined(ESP32) && !defined(ARDUINO_SILABS) && !defined(ARDUINO_UNOR4_WIFI) || defined(TARGET_NANO_RP2040_CONNECT) //|| defined(CORE_CM4)
-
-#include "HCIUartTransport.h"
-
-#if defined(ARDUINO_SAMD_MKRWIFI1010) || defined(ARDUINO_AVR_UNO_WIFI_REV2)
-#define SerialHCI Serial2
-#elif defined(ARDUINO_SAMD_NANO_33_IOT) || defined(ARDUINO_NANO_RP2040_CONNECT)
-// SerialHCI is already defined in the variant
-#elif defined(ARDUINO_PORTENTA_H7_M4)
-// SerialHCI is already defined in the variant
-#elif defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_NICLA_VISION)
-#define SerialHCI Serial2
-#elif defined(ARDUINO_OPTA)
-#define SerialHCI Serial3
-#elif defined(ARDUINO_PORTENTA_C33)
-#define SerialHCI Serial5
-#elif defined(ARDUINO_GIGA)
-arduino::UART SerialHCI(CYBSP_BT_UART_TX, CYBSP_BT_UART_RX, CYBSP_BT_UART_RTS, CYBSP_BT_UART_CTS);
-#else
-#error "Unsupported board selected!"
-#endif
-
-HCIUartTransportClass::HCIUartTransportClass(HardwareSerial& uart, unsigned long baudrate) :
-  _uart(&uart),
-  _baudrate(baudrate)
-{
-}
-
-HCIUartTransportClass::~HCIUartTransportClass()
-{
-}
-
-int HCIUartTransportClass::begin()
-{
-  _uart->begin(_baudrate);
-
-  return 1;
-}
-
-void HCIUartTransportClass::end()
-{
-  _uart->end();
-}
-
-void HCIUartTransportClass::wait(unsigned long timeout)
-{
-  for (unsigned long start = millis(); (millis() - start) < timeout;) {
-    if (available()) {
-      break;
-    }
-  }
-}
-
-int HCIUartTransportClass::available()
-{
-  return _uart->available();
-}
-
-int HCIUartTransportClass::peek()
-{
-  return _uart->peek();
-}
-
-int HCIUartTransportClass::read()
-{
-  return _uart->read();
-}
-
-size_t HCIUartTransportClass::write(const uint8_t* data, size_t length)
-{
-#ifdef ARDUINO_AVR_UNO_WIFI_REV2
-  // wait while the CTS pin is low
-  while (digitalRead(NINA_CTS) == HIGH);
-#endif
-
-  size_t result = _uart->write(data, length);
-
-  _uart->flush();
-
-  return result;
-}
-
-#if defined(ARDUINO_AVR_UNO_WIFI_REV2) || defined(ARDUINO_NANO_RP2040_CONNECT)
-HCIUartTransportClass HCIUartTransport(SerialHCI, 119600);
-#else
-HCIUartTransportClass HCIUartTransport(SerialHCI, 912600);
-#endif
-HCITransportInterface& HCITransport = HCIUartTransport;
-
-#endif
diff --git a/src/utility/HCIUartTransport.h b/src/utility/HCIUartTransport.h
deleted file mode 100644
index ba70dff4..00000000
--- a/src/utility/HCIUartTransport.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-  This file is part of the ArduinoBLE library.
-  Copyright (c) 2018 Arduino SA. All rights reserved.
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  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
-*/
-
-#ifndef _HCI_UART_TRANSPORT_H_
-#define _HCI_UART_TRANSPORT_H_
-
-#include "HCITransport.h"
-
-class HCIUartTransportClass : public HCITransportInterface {
-public:
-  HCIUartTransportClass(HardwareSerial& uart, unsigned long baudrate);
-  virtual ~HCIUartTransportClass();
-
-  virtual int begin();
-  virtual void end();
-
-  virtual void wait(unsigned long timeout);
-
-  virtual int available();
-  virtual int peek();
-  virtual int read();
-
-  virtual size_t write(const uint8_t* data, size_t length);
-
-private:
-  HardwareSerial* _uart;
-  unsigned long _baudrate;
-};
-
-#endif
diff --git a/src/utility/HCIVirtualTransport.cpp b/src/utility/HCIVirtualTransport.cpp
deleted file mode 100644
index 046a0e72..00000000
--- a/src/utility/HCIVirtualTransport.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
-  This file is part of the ArduinoBLE library.
-  Copyright (c) 2018 Arduino SA. All rights reserved.
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  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
-*/
-
-#if defined(ESP32)
-
-#include "HCIVirtualTransport.h"
-
-StreamBufferHandle_t rec_buffer;
-StreamBufferHandle_t send_buffer;
-TaskHandle_t bleHandle;
-
-
-static void notify_host_send_available(void)
-{
-}
-
-static int notify_host_recv(uint8_t *data, uint16_t length)
-{
-  xStreamBufferSend(rec_buffer,data,length,portMAX_DELAY);  // !!!potentially waiting forever
-  return 0;
-}
-
-static esp_vhci_host_callback_t vhci_host_cb = {
-  notify_host_send_available,
-  notify_host_recv
-};
-
-void bleTask(void *pvParameters)
-{
-  esp_vhci_host_register_callback(&vhci_host_cb);
-  size_t length;
-  uint8_t mybuf[258];
-
-  while(true){
-    length = xStreamBufferReceive(send_buffer,mybuf,258,portMAX_DELAY);
-    while (!esp_vhci_host_check_send_available()) {}
-    esp_vhci_host_send_packet(mybuf, length);
-  }
-}
-
-
-HCIVirtualTransportClass::HCIVirtualTransportClass()
-{
-}
-
-HCIVirtualTransportClass::~HCIVirtualTransportClass()
-{
-}
-
-int HCIVirtualTransportClass::begin()
-{
-  btStarted(); // this somehow stops the arduino ide from initializing bluedroid
-
-  rec_buffer = xStreamBufferCreate(258, 1);
-  send_buffer = xStreamBufferCreate(258, 1);
-
-  esp_err_t ret = nvs_flash_init();
-  if (ret == ESP_ERR_NVS_NO_FREE_PAGES || ret == ESP_ERR_NVS_NEW_VERSION_FOUND) {
-    ESP_ERROR_CHECK(nvs_flash_erase());
-    ret = nvs_flash_init();
-  }
-  esp_bt_controller_config_t bt_cfg = BT_CONTROLLER_INIT_CONFIG_DEFAULT();
-  
-#if CONFIG_IDF_TARGET_ESP32
-  bt_cfg.mode = ESP_BT_MODE_BLE; //original esp32 chip
-#else
-  bt_cfg.bluetooth_mode = ESP_BT_MODE_BLE; //different api for newer models
-#endif
-
-  esp_bt_controller_mem_release(ESP_BT_MODE_CLASSIC_BT);
-  esp_bt_controller_init(&bt_cfg);
-  esp_bt_controller_enable(ESP_BT_MODE_BLE);
-  xTaskCreatePinnedToCore(&bleTask, "bleTask", 2048, NULL, 5, &bleHandle, 0);
-  return 1;
-}
-
-void HCIVirtualTransportClass::end()
-{
-  vStreamBufferDelete(rec_buffer);
-  vStreamBufferDelete(send_buffer);
-  esp_bt_controller_disable();
-  esp_bt_controller_deinit();
-  vTaskDelete(bleHandle);
-}
-
-void HCIVirtualTransportClass::wait(unsigned long timeout)
-{
-  for (unsigned long start = (esp_timer_get_time() / 1000ULL); ((esp_timer_get_time() / 1000ULL) - start) < timeout;) {
-    if (available()) {
-      break;
-    }
-  }
-}
-
-int HCIVirtualTransportClass::available()
-{
-  size_t bytes	= xStreamBufferBytesAvailable(rec_buffer);
-  return bytes;
-}
-
-// never called
-int HCIVirtualTransportClass::peek()
-{
-  return -1;
-}
-
-int HCIVirtualTransportClass::read()
-{
-  uint8_t c;
-  if(xStreamBufferReceive(rec_buffer, &c, 1, portMAX_DELAY)) {
-    return c;
-  }
-  return -1;
-}
-
-size_t HCIVirtualTransportClass::write(const uint8_t* data, size_t length)
-{
-  size_t result = xStreamBufferSend(send_buffer,data,length,portMAX_DELAY);
-  return result;
-}
-
-HCIVirtualTransportClass HCIVirtualTransport;
-
-HCITransportInterface& HCITransport = HCIVirtualTransport;
-
-#endif
diff --git a/src/utility/HCIVirtualTransport.h b/src/utility/HCIVirtualTransport.h
deleted file mode 100644
index 0da43cac..00000000
--- a/src/utility/HCIVirtualTransport.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-  This file is part of the ArduinoBLE library.
-  Copyright (c) 2018 Arduino SA. All rights reserved.
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  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
-*/
-
-#include "HCITransport.h"
-#include <stdint.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "freertos/FreeRTOS.h"
-#include "freertos/task.h"
-#include "freertos/stream_buffer.h"
-
-#include "esp_bt.h"
-#include "nvs_flash.h"
-
-#include "esp32-hal-bt.h" // this is needed to disable bluedroid
-
-
-class HCIVirtualTransportClass : public HCITransportInterface {
-public:
-  HCIVirtualTransportClass();
-  virtual ~HCIVirtualTransportClass();
-
-  virtual int begin();
-  virtual void end();
-
-  virtual void wait(unsigned long timeout);
-
-  virtual int available();
-  virtual int peek();
-  virtual int read();
-
-  virtual size_t write(const uint8_t* data, size_t length);
-};
\ No newline at end of file
diff --git a/src/utility/HCIVirtualTransportAT.cpp b/src/utility/HCIVirtualTransportAT.cpp
deleted file mode 100644
index 7b3a24a9..00000000
--- a/src/utility/HCIVirtualTransportAT.cpp
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
-  This file is part of the ArduinoBLE library.
-  Copyright (c) 2018 Arduino SA. All rights reserved.
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  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
-*/
-
-#if defined(ARDUINO_UNOR4_WIFI)
-
-#include "HCIVirtualTransportAT.h"
-
-extern ModemClass modem;
-
-HCIVirtualTransportATClass::HCIVirtualTransportATClass()
-{
-}
-
-HCIVirtualTransportATClass::~HCIVirtualTransportATClass()
-{
-}
-
-static RingBufferN<258> buf;
-
-int HCIVirtualTransportATClass::begin()
-{
-  // TODO: add this helper
-  //modem.debug(Serial);
-  buf.clear();
-  //modem.debug(true);
-  std::string res = "";
-  modem.begin();
-  if (modem.write(std::string(PROMPT(_HCI_BEGIN)), res, CMD(_HCI_BEGIN))) {
-      return 1;
-  }
-  return 0;
-}
-
-void HCIVirtualTransportATClass::end()
-{
-}
-
-void HCIVirtualTransportATClass::wait(unsigned long timeout)
-{
-  std::string res = "";
-  modem.write(std::string(PROMPT(_HCI_WAIT)), res, "%d\n\r", CMD_WRITE(_HCI_WAIT), timeout);
-}
-
-int HCIVirtualTransportATClass::available()
-{
-  std::string res = "";
-  if (buf.available()) {
-    return buf.available();
-  }
-  if (modem.write(std::string(PROMPT(_HCI_AVAILABLE)), res, CMD_READ(_HCI_AVAILABLE))) {
-    return atoi(res.c_str());
-  }
-
-  return 0;
-}
-
-// never called
-int HCIVirtualTransportATClass::peek()
-{
-  return -1;
-}
-
-int HCIVirtualTransportATClass::read()
-{
-  uint8_t c;
-  std::string res = "";
-  if (buf.available()) {
-    return buf.read_char();
-  }
-  modem.avoid_trim_results();
-  modem.read_using_size();
-  if (modem.write(std::string(PROMPT(_HCI_READ)), res, CMD(_HCI_READ))) {
-    for(int i = 0; i < res.size(); i++) {
-      buf.store_char((uint8_t)res[i]);
-    }
-    return buf.read_char();
-  }
-
-  return -1;
-}
-
-size_t HCIVirtualTransportATClass::write(const uint8_t* data, size_t length)
-{
-  std::string res = "";
-  modem.write_nowait(std::string(PROMPT(_HCI_WRITE)), res, "%s%d\r\n" , CMD_WRITE(_HCI_WRITE), length);
-  if(modem.passthrough(data, length)) {
-    return length;
-  }
-  return 0;
-}
-
-HCIVirtualTransportATClass HCIVirtualTransportAT;
-
-HCITransportInterface& HCITransport = HCIVirtualTransportAT;
-
-#endif
diff --git a/src/utility/HCIVirtualTransportAT.h b/src/utility/HCIVirtualTransportAT.h
deleted file mode 100644
index 8e29801d..00000000
--- a/src/utility/HCIVirtualTransportAT.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-  This file is part of the ArduinoBLE library.
-  Copyright (c) 2018 Arduino SA. All rights reserved.
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  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
-*/
-
-#include "HCITransport.h"
-#include <stdint.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "WiFiS3.h"
-
-class HCIVirtualTransportATClass : public HCITransportInterface {
-public:
-  HCIVirtualTransportATClass();
-  virtual ~HCIVirtualTransportATClass();
-
-  virtual int begin();
-  virtual void end();
-
-  virtual void wait(unsigned long timeout);
-
-  virtual int available();
-  virtual int peek();
-  virtual int read();
-
-  virtual size_t write(const uint8_t* data, size_t length);
-};
\ No newline at end of file
diff --git a/src/utility/btct.cpp b/src/utility/btct.cpp
index 6829494c..199c9e0d 100644
--- a/src/utility/btct.cpp
+++ b/src/utility/btct.cpp
@@ -1,7 +1,7 @@
 #include "btct.h"
 #include <Arduino.h>
 #include "HCI.h"
-#include "ArduinoBLE.h"
+#include "STM32duinoBLE.h"
 BluetoothCryptoToolbox::BluetoothCryptoToolbox(){}
 //    In step 1, AES-128 with key K is applied to an all-zero input block.
 //    In step 2, K1 is derived through the following operation:

From 197b2a51a831c0476924e1a6952d9aaf44408ac1 Mon Sep 17 00:00:00 2001
From: Frederic Pillon <frederic.pillon@st.com>
Date: Tue, 18 Mar 2025 16:38:00 +0100
Subject: [PATCH 091/112] feat: ability to define HCI SPI transport
 configuration

Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
---
 README.md                       | 55 +++++++++++++++++++++++++++++++++
 src/utility/HCISpiTransport.cpp | 13 ++++++--
 2 files changed, 65 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index e9f3a948..62186871 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,61 @@ https://github.com/stm32duino/Arduino_Core_STM32/wiki/STM32duinoBLE#stm32duinobl
 For more information about ArduinoBLE library please visit the official web page at:
 https://www.arduino.cc/en/Reference/ArduinoBLE
 
+# Configuration
+
+### 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
+```
+
 ## License
 
 ```
diff --git a/src/utility/HCISpiTransport.cpp b/src/utility/HCISpiTransport.cpp
index 91c2c5dc..9a3709da 100644
--- a/src/utility/HCISpiTransport.cpp
+++ b/src/utility/HCISpiTransport.cpp
@@ -19,7 +19,14 @@
 
 #include "HCISpiTransport.h"
 
-#if defined(ARDUINO_STEVAL_MKBOXPRO)
+#if __has_include("ble_spi_conf.h")
+  #include "ble_spi_conf.h"
+#endif
+
+#if defined(CUSTOM_BLE_SPI)
+SPIClass SpiHCI(BLE_SPI_MOSI, BLE_SPI_MISO, BLE_SPI_CLK);
+HCISpiTransportClass HCISpiTransport(SpiHCI, BLE_CHIP_TYPE, BLE_SPI_CS, BLE_SPI_IRQ, BLE_RESET, BLE_SPI_FREQ, BLE_SPI_MODE);
+#elif defined(ARDUINO_STEVAL_MKBOXPRO)
 /* STEVAL-MKBOXPRO */
 SPIClass SpiHCI(PA7, PA6, PA5);
 HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_LP, PA2, PB11, PD4, 1000000, SPI_MODE3);
@@ -51,11 +58,11 @@ HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, A1, A0, D7, 8000000, SPI
 /* Shield IDB05A1 with SPI clock on D13 */
 #define SpiHCI SPI
 HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, A1, A0, D7, 8000000, SPI_MODE0);
-#elif defined(BNRG2A1_CLOCK_D3)
+#elif defined(BNRG2A1_SPI_CLOCK_D3)
 /* Shield BNRG2A1 with SPI clock on D3 */
 SPIClass SpiHCI(D11, D12, D3);
 HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M2SP, A1, A0, D7, 1000000, SPI_MODE1);
-#elif defined(BNRG2A1_CLOCK_D13)
+#elif defined(BNRG2A1_SPI_CLOCK_D13)
 /* Shield BNRG2A1 with SPI clock on D13 */
 #define SpiHCI SPI
 HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M2SP, A1, A0, D7, 1000000, SPI_MODE1);

From 5c49886c5b571313528a4ad527a2ee8b8dd59e1c Mon Sep 17 00:00:00 2001
From: Frederic Pillon <frederic.pillon@st.com>
Date: Mon, 17 Feb 2020 10:08:13 +0100
Subject: [PATCH 092/112] chore(ci): add build-for-stm32 step

Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
---
 .github/workflows/compile-examples.yml | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/.github/workflows/compile-examples.yml b/.github/workflows/compile-examples.yml
index c298c638..f90e4784 100644
--- a/.github/workflows/compile-examples.yml
+++ b/.github/workflows/compile-examples.yml
@@ -15,3 +15,28 @@ on:
   workflow_dispatch:
 
 jobs:
+  build-for-stm32:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        fqbn:
+          - STMicroelectronics:stm32:Eval:pnum=STEVAL_MKSBOX1V1,usb=CDCgen
+          - STMicroelectronics:stm32:Nucleo_64:pnum=NUCLEO_L476RG
+          - STMicroelectronics:stm32:Disco:pnum=B_L475E_IOT01A
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: arduino/compile-sketches@v1
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          fqbn: ${{ matrix.fqbn }}
+          platforms: |
+            - 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
+

From 94ab67e28e58e39d80480eebe3a55b112f050c9a Mon Sep 17 00:00:00 2001
From: Frederic Pillon <frederic.pillon@st.com>
Date: Tue, 18 Mar 2025 09:27:33 +0100
Subject: [PATCH 093/112] feat: add editor config

Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
---
 .editorconfig  | 26 ++++++++++++++++++++++++++
 .gitattributes | 42 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 68 insertions(+)
 create mode 100644 .editorconfig
 create mode 100644 .gitattributes

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..47433680
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,26 @@
+[*]
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace =  true
+
+[*.patch]
+insert_final_newline = unset
+indent_style = unset
+indent_size = unset
+trim_trailing_whitespace =  unset
+
+[*.md]
+trim_trailing_whitespace =  false
+
+[*.sh]
+# like -i=2
+indent_style = space
+indent_size = 2
+
+#shell_variant      = posix # like -ln=posix
+#binary_next_line   = true  # like -bn
+switch_case_indent = true  # like -ci
+space_redirects    = true  # like -sr
+#keep_padding       = true  # like -kp
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..422ae6f5
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,42 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+* text=auto
+
+# Explicitly declare text files you want to always be normalized and converted
+# to native line endings on checkout.
+.editorconfig text eol=lf
+.flake8 text eol=lf
+.gitattributes text eol=lf
+.gitignore text eol=lf
+
+*.adoc text eol=lf
+*.c text eol=lf
+*.cmake text eol=lf
+*.cpp text eol=lf
+*.css text eol=lf
+*.dtsi text eol=lf
+*.gv text eol=lf
+*.h text eol=lf
+*.html text eol=lf
+*.in text eol=lf
+*.ino text eol=lf
+*.json text eol=lf
+*.ld text eol=lf
+*.md text eol=lf
+*.MD text eol=lf
+*.old text eol=lf
+*.patch text eol=lf
+*.pde text eol=lf
+*.properties text eol=lf
+*.py text eol=lf
+*.s text eol=lf
+*.S text eol=lf
+*.sh text eol=lf
+*.spec text eol=lf
+*.txt text eol=lf
+*.yml text eol=lf
+
+# Denote all files that are truly binary and should not be modified.
+*.jpg binary
+*.pdf binary
+*.png binary
+

From dd9eaa91a40244dc39dea45b51b370504c129bdc Mon Sep 17 00:00:00 2001
From: Francois Ramu <francois.ramu@st.com>
Date: Tue, 18 Mar 2025 09:33:50 +0100
Subject: [PATCH 094/112] feat: add HCISharedMemTransport

to support the shared memory transport layer for the
STM32WB built-in chip.
It also Allows HCI SPI Transport with STM32WBxx

Signed-off-by: Francois Ramu <francois.ramu@st.com>
Co-Authored-by: Frederic Pillon <frederic.pillon@st.com>
---
 keywords.txt                          |   1 +
 src/utility/HCISharedMemTransport.cpp | 782 ++++++++++++++++++++++++++
 src/utility/HCISharedMemTransport.h   |  93 +++
 3 files changed, 876 insertions(+)
 create mode 100644 src/utility/HCISharedMemTransport.cpp
 create mode 100644 src/utility/HCISharedMemTransport.h

diff --git a/keywords.txt b/keywords.txt
index 04ef0505..6e761812 100644
--- a/keywords.txt
+++ b/keywords.txt
@@ -31,6 +31,7 @@ BLEDoubleCharacteristic	KEYWORD1
 BLEStringCharacteristic	KEYWORD1
 
 HCISpiTransportClass	KEYWORD1
+HCISharedMemTransportClass	KEYWORD1
 
 #######################################
 # Methods and Functions (KEYWORD2)
diff --git a/src/utility/HCISharedMemTransport.cpp b/src/utility/HCISharedMemTransport.cpp
new file mode 100644
index 00000000..ab462dfa
--- /dev/null
+++ b/src/utility/HCISharedMemTransport.cpp
@@ -0,0 +1,782 @@
+/*
+  This file is part of the STM32duinoBLE library.
+  Copyright (c) 2019 STMicroelectronics. All rights reserved.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  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
+*/
+#if defined(STM32WBxx)
+
+#include "HCISharedMemTransport.h"
+#include "STM32_WPAN/hw.h"
+#include "otp.h"
+
+#if defined(ARDUINO_NUCLEO_WB15CC) || defined(ARDUINO_P_NUCLEO_WB55RG) ||\
+      defined(ARDUINO_STM32WB5MM_DK) || defined(ARDUINO_P_NUCLEO_WB55_USB_DONGLE)
+HCISharedMemTransportClass HCISharedMemTransport;
+#else
+#error "Unsupported board or shield selected!"
+#endif
+
+/* Private variables ---------------------------------------------------------*/
+PLACE_IN_SECTION("MB_MEM1") ALIGN(4) static TL_CmdPacket_t BleCmdBuffer;
+
+PLACE_IN_SECTION("MB_MEM1") ALIGN(4) static uint8_t EvtPool[POOL_SIZE];
+PLACE_IN_SECTION("MB_MEM2") ALIGN(4) static TL_CmdPacket_t SystemCmdBuffer;
+PLACE_IN_SECTION("MB_MEM2") ALIGN(4) static uint8_t
+SystemSpareEvtBuffer[sizeof(TL_PacketHeader_t) + TL_EVT_HDR_SIZE + 255];
+PLACE_IN_SECTION("MB_MEM2") ALIGN(4) static uint8_t
+BleSpareEvtBuffer[sizeof(TL_PacketHeader_t) + TL_EVT_HDR_SIZE + 255];
+PLACE_IN_SECTION("MB_MEM2") ALIGN(4) static uint8_t
+HciAclDataBuffer[sizeof(TL_PacketHeader_t) + 5 + 251];
+
+
+/* global var used as semaphore to control incoming events */
+volatile bool sys_event; /* true : M0 core is already up and running */
+volatile bool acl_data_on; /* true : sending ACL data in progress, false : send is possible */
+volatile bool data_overflow;
+
+/* buffer to store the received packets */
+volatile uint8_t _rxbuff[BLE_MODULE_SHARED_MEM_BUFFER_SIZE];
+volatile uint16_t _read_index; /* fifo position when reading */
+volatile uint16_t _write_index; /* fifo position when receiving */
+
+/* var of different device steps during init and receiving  */
+volatile bool phase_bd_addr;
+volatile bool phase_tx_power;
+volatile bool phase_reset;
+volatile bool phase_running;
+
+
+/** Bluetooth Device Address */
+static uint8_t bd_addr_udn[CONFIG_DATA_PUBADDR_LEN];
+
+/* Private functions ---------------------------------------------------------*/
+/**
+ * TL Mailbox synchronization means
+ */
+
+/*  returns true if sys_event was received, false otherwise */
+static bool sysevt_wait(void)
+{
+  /* sys_event remains false until event is received */
+  for (unsigned long start = millis(); (millis() - start) < BLE_IPCC_TIMEOUT;) {
+    /* Wait for 10sec max - if not return an error */
+    if (sys_event) {
+      break;
+    }
+  }
+
+  if (!sys_event) {
+#if defined(PRINT_IPCC_INFO)
+    printf("ERROR: sys_evt timeout\r\n");
+#endif /*(PRINT_IPCC_INFO)*/
+    /*  no event received, timeout occurs */
+    return false;
+  }
+  /*  release immediately, now that M0 runs */
+  return true;
+}
+
+/*  WEAK callbacks from the BLE TL driver - will be called under Interrupt */
+static void sysevt_received(void *pdata)
+{
+  UNUSED(pdata);
+  /* For now only READY event is received, so we know this is it */
+  __disable_irq();
+  sys_event = true;
+  __enable_irq();
+  /* But later on ... we'll have to parse the answer */
+}
+
+/*  returns true if sysevt was already received, which means M0 core is
+ *  already up and running */
+static bool sysevt_check(void)
+{
+  /*  Check if system is UP and running already */
+  for (unsigned long start = millis(); (millis() - start) < 10;) {
+    /* Wait for 10ms max - if not return an error */
+    if (sys_event) {
+      break;
+    }
+  }
+  if (sys_event) {
+    /*  release immediately as M0 already runs */
+    return true;
+  }
+  return false;
+}
+
+static void acl_data_ack(void)
+{
+  /**
+   * The current implementation assumes the taskGUI will not send a new HCI ACL DATA packet before this ack is received
+   * ( which means the CPU2 has handled the previous packet )
+   * In order to implement a secure mechanism, it is required either
+   * - a flow control with the stack
+   * - a local pool of buffer to store packets received from the stack
+   */
+  __disable_irq();
+  acl_data_on = false;
+  __enable_irq();
+}
+
+static bool acl_data_wait(void)
+{
+  /* Wait 10 sec for previous ACL command to be ack'ed by Low Layers
+   * before sending the next one */
+  for (unsigned long start = millis(); (millis() - start) < BLE_IPCC_TIMEOUT;) {
+    /* Wait for 10sec max - if not return an error */
+    if (!acl_data_on) {
+      break;
+    }
+  }
+  if (acl_data_on) {
+    /*  no event received, timeout occurs */
+#if defined(PRINT_IPCC_INFO)
+    printf("ERROR: acl data timeout\r\n");
+#endif /*(PRINT_IPCC_INFO)*/
+    return false;
+  }
+  /*  release immediately, now that M0 runs */
+  __disable_irq();
+  acl_data_on = false;
+  __enable_irq();
+  return true;
+}
+
+static void syscmd_status_not(SHCI_TL_CmdStatus_t status)
+{
+#if defined(PRINT_IPCC_INFO)
+  printf("syscmd_status_not, status:%d\r\n", status);
+#else
+  UNUSED(status);
+#endif /*(PRINT_IPCC_INFO)*/
+}
+
+/* to received BLE packet from the SharedMem */
+void evt_received(TL_EvtPacket_t *hcievt)
+{
+  uint16_t len = 0;
+
+  /* We need to memcpy the data before passing to higher layers.
+   * The received packet is copied in the _rxbuff
+   * but it must not exceed the BLE_MODULE_SHARED_MEM_BUFFER_SIZE
+   */
+  switch (hcievt->evtserial.type) {
+    case TL_BLEEVT_PKT_TYPE: {
+        /* before starting the running_phase', a RESET command (0x0C03) is sent
+         * by the HCI. Then this evt packet is temporarily kept in the _rxbuff
+         * the set_bd_address (0xFC0C) and the set_tw_power (0xFC0F) commands are sent.
+         * Only when both evt are received (not store in the _rxbuffer),
+         * the Reset packet is handled at HCI layer : the running_phase begins
+         */
+        if (phase_running == false) {
+          /* check the Rx event of complete the previous bd_addr or random address opcode 0xFC0C */
+          if ((hcievt->evtserial.evt.evtcode == TL_BLEEVT_CC_OPCODE) &&
+              (hcievt->evtserial.evt.payload[0] == 0x01) &&
+              (hcievt->evtserial.evt.payload[1] == 0x0C) &&
+              (hcievt->evtserial.evt.payload[2] == 0xFC)) {
+            /* First setting must be global address
+             */
+            phase_bd_addr = true;
+
+            if (hcievt->evtserial.evt.payload[3] != 0) {
+#if defined(PRINT_IPCC_INFO)
+              printf("Error: wrong BD Addr\r\n");
+#endif /*(PRINT_IPCC_INFO)*/
+            }
+            /* rx data is no more useful : not stored in the _rxbuff */
+            break;
+          }
+          /* check the Rx event of complete the previous tx power opcode 0xFC0F */
+          if ((hcievt->evtserial.evt.evtcode == TL_BLEEVT_CC_OPCODE) &&
+              (hcievt->evtserial.evt.payload[0] == 0x01) &&
+              (hcievt->evtserial.evt.payload[1] == 0x0F) &&
+              (hcievt->evtserial.evt.payload[2] == 0xFC)) {
+            phase_tx_power = true;
+            if (hcievt->evtserial.evt.payload[3] != 0) {
+#if defined(PRINT_IPCC_INFO)
+              printf("Error: wrong Tx power\r\n");
+#endif /*(PRINT_IPCC_INFO)*/
+            }
+            /* rx data is no more useful : not stored in the _rxbuff */
+            break;
+          }
+
+          /* check if the reset phase is in progress (opcode is 0x0C03) */
+          if ((hcievt->evtserial.evt.evtcode == TL_BLEEVT_CC_OPCODE) &&
+              (hcievt->evtserial.evt.payload[0] == 0x01) &&
+              (hcievt->evtserial.evt.payload[1] == 0x03) &&
+              (hcievt->evtserial.evt.payload[2] == 0x0C)) {
+            phase_reset = true;
+#if defined(PRINT_IPCC_INFO)
+            if (hcievt->evtserial.evt.payload[3] != 0) {
+              printf("Error: wrong reset\r\n");
+            }
+#endif /*(PRINT_IPCC_INFO)*/
+          }
+        }
+        __disable_irq();
+        /* store received data in the _rxbuff buffer */
+        len = hcievt->evtserial.evt.plen + TL_EVT_HDR_SIZE;
+        if (len < BLE_MODULE_SHARED_MEM_BUFFER_SIZE - _write_index) {
+          /* at the position of the _write_index */
+          memcpy((uint8_t *)&_rxbuff[_write_index], (uint8_t *)&hcievt->evtserial, len);
+          /* move index */
+          _write_index += len;
+        } else {
+          data_overflow = true;
+        }
+        __enable_irq();
+      }
+      break;
+    case TL_ACL_DATA_PKT_TYPE: {
+        TL_AclDataSerial_t *acl = &(((TL_AclDataPacket_t *)hcievt)->AclDataSerial);
+        __disable_irq();
+        len = acl->length + 5;
+        if (len < BLE_MODULE_SHARED_MEM_BUFFER_SIZE - _write_index) {
+          memcpy((uint8_t *)&_rxbuff[_write_index], (uint8_t *)acl, len);
+          /* move index */
+          _write_index += len;
+        } else {
+          data_overflow = true;
+        }
+        __enable_irq();
+      }
+      break;
+    default:
+      /* should not happen */
+#if defined(PRINT_IPCC_INFO)
+      printf("BLE TL evt_received, wrong type:%d\r\n", hcievt->evtserial.type);
+      while (1); /* let's block to check */
+#endif /*(PRINT_IPCC_INFO)*/
+      break;
+  }
+#if defined(PRINT_IPCC_INFO)
+  if (data_overflow) {
+    printf("Error: data read overflow\r\n");
+  }
+#endif /*(PRINT_IPCC_INFO)*/
+
+  /*  In case Event belongs to the Evt Pool we need to inform  */
+  if (((uint8_t *)hcievt >= EvtPool) && ((uint8_t *)hcievt < (EvtPool + POOL_SIZE))) {
+    /*  Free the message from shared memory */
+    TL_MM_EvtDone(hcievt);
+  }
+}
+
+/* to send BLE packet to the SharedMem : return nb of bytes actually written */
+uint16_t mbox_write(uint8_t type, uint16_t len, const uint8_t *pData)
+{
+  TL_CmdPacket_t *bleCmdBuf = &BleCmdBuffer;
+  // Note: Until enum is available
+  // type 01 Command
+  // type 02 ACL DATA
+  // type 03 SCO Voice (not supported)
+  // type 04 event - uplink (not supported)
+  switch (type) {
+    case 1: { //BLE command
+        bleCmdBuf->cmdserial.type = type; // for now this param is overwritten in TL_BLE_SendCmd
+        bleCmdBuf->cmdserial.cmd.plen = len;
+        memcpy((void *) &bleCmdBuf->cmdserial.cmd, pData, len);
+        /* We're tracing here the command, after copy in shared mem but before M0 trigger. */
+        TL_BLE_SendCmd(NULL, 0); // unused parameters for now
+      }
+      break;
+    case 2: { //ACL DATA
+        if (!acl_data_wait()) {
+#if defined(PRINT_IPCC_INFO)
+          printf("ERROR: previous ACL message not ACK'd\r\n");
+#endif /*(PRINT_IPCC_INFO)*/
+          /*  return number of bytes sent, 0 in this error case */
+          return 0;
+        }
+        TL_AclDataSerial_t *aclDataSerial = (TL_AclDataSerial_t *)(HciAclDataBuffer + sizeof(TL_PacketHeader_t));
+        aclDataSerial->type = type; // for now this param is overwritten in TL_BLE_SendCmd
+        memcpy(HciAclDataBuffer + sizeof(TL_PacketHeader_t) + sizeof(type), pData, len);
+        TL_BLE_SendAclData(NULL, 0); // unused parameters for now
+        __disable_irq();
+        acl_data_on = true; /* data being send */
+        __enable_irq();
+      }
+      break;
+    default:
+#if defined(PRINT_IPCC_INFO)
+      printf("ERROR: not supported type\r\n");
+#endif /*(PRINT_IPCC_INFO)*/
+      /*  return number of bytes sent, 0 in this error case */
+      len = 0;
+      break;
+  }
+  return len;
+}
+
+/**
+ * Few utilities functions
+ */
+/* This function fills in a BD address table */
+static bool get_bd_address(uint8_t *bd_addr)
+{
+  uint32_t udn;
+  uint32_t company_id;
+  uint32_t device_id;
+  bool bd_found;
+
+  udn = LL_FLASH_GetUDN();
+
+  if (udn != 0xFFFFFFFF) {
+    /* "Found Unique Device Number: %#06x", udn) */
+
+    company_id = LL_FLASH_GetSTCompanyID();
+    device_id = LL_FLASH_GetDeviceID();
+
+    bd_addr[0] = (uint8_t)(udn & 0x000000FF);
+    bd_addr[1] = (uint8_t)((udn & 0x0000FF00) >> 8);
+    bd_addr[2] = (uint8_t)device_id;
+    bd_addr[3] = (uint8_t)(company_id & 0x000000FF);
+    bd_addr[4] = (uint8_t)((company_id & 0x0000FF00) >> 8);
+    bd_addr[5] = (uint8_t)((company_id & 0x00FF0000) >> 16);
+
+    bd_found = true;
+  } else {
+    OTP_BT_t *p_otp = (OTP_BT_t *)OTP_Read(0);
+    if (p_otp) {
+      memcpy(bd_addr, p_otp->bd_address, CONFIG_DATA_PUBADDR_LEN);
+      bd_found = true;
+    } else {
+      bd_found = false;
+    }
+  }
+
+  return bd_found;
+}
+
+static void init_debug(void)
+{
+  /* In case of debug profile, configure debugger support */
+
+#if defined(CONFIG_DEBUG)
+#if defined(PRINT_IPCC_INFO)
+  printf("init_debug ENABLED\r\n");
+#endif /*(PRINT_IPCC_INFO)*/
+  /**
+   * Keep debugger enabled while in any low power mode
+   */
+  HAL_DBGMCU_EnableDBGSleepMode();
+  HAL_DBGMCU_EnableDBGStopMode();
+  HAL_DBGMCU_EnableDBGStandbyMode();
+
+  /* Enable debugger: Debug power up request wakeup EXTI line 48 */
+  LL_EXTI_EnableIT_32_63(LL_EXTI_LINE_48);
+  LL_C2_EXTI_EnableIT_32_63(LL_EXTI_LINE_48);
+
+#endif /* CONFIG_DEBUG */
+}
+
+/* Class definition ----------------------------------------------------------*/
+
+HCISharedMemTransportClass::HCISharedMemTransportClass()
+{
+  _read_index = 0; /* fifo position when reading */
+  _write_index = 0; /* fifo position when receiving */
+
+  memset((void *)_rxbuff, 0, sizeof(_rxbuff));
+
+  sys_event = false;
+  acl_data_on = false;
+
+  data_overflow = false;
+
+  phase_bd_addr = false;
+  phase_tx_power = false;
+  phase_reset = false;
+  phase_running = false;
+}
+
+HCISharedMemTransportClass::~HCISharedMemTransportClass()
+{
+}
+
+int HCISharedMemTransportClass::begin()
+{
+  int status = 1;
+  /* clean data Rx variables */
+  _read_index = 0;
+  _write_index = 0;
+
+  memset((void *)_rxbuff, 0, sizeof(_rxbuff));
+
+  /*  Check whether M0 sub-system was started already by
+   *  checking if the system event was already received
+   *  before. If it was not, then go through all init. */
+  if (!sysevt_check()) {
+    start_ble_rf();
+    init_debug();
+    /* Take BLE out of reset */
+    stm32wb_reset();
+    /* "C2 unlocking" */
+    transport_init();
+    /*  At this stage, we got the ready event,
+     *  passed through TL_SYS_EvtReceived */
+
+    WirelessFwInfo_t wireless_info_instance;
+    WirelessFwInfo_t *p_wireless_info = &wireless_info_instance;
+    SHCI_GetWirelessFwInfo(p_wireless_info);
+#if defined(PRINT_IPCC_INFO)
+    printf("WB copro FW version = %d.%d.%d\r\n", p_wireless_info->VersionMajor, p_wireless_info->VersionMinor, p_wireless_info->VersionSub);
+#endif /*(PRINT_IPCC_INFO)*/
+
+    /* Now start BLE service on firmware side, using Vendor specific
+     * command on the System Channel
+     */
+    status = stm32wb_start_ble();
+
+    /* Once reset complete event is received we will need
+     * to send a few more commands:
+     * set bd addr with bt_ipm_set_addr();
+     * during the HCI rest command */
+  }
+  /* IPM Channel is now open */
+#if defined(PRINT_IPCC_INFO)
+  printf("IPM Channel Open Completed\r\n");
+#endif /*(PRINT_IPCC_INFO)*/
+
+  return status;
+}
+
+void HCISharedMemTransportClass::end()
+{
+  /* M0 sub-system is already on (sys_event) */
+  acl_data_on = false;
+  data_overflow = false;
+
+  /* the HCI RESET command ready to be processed again */
+  phase_bd_addr = false;
+  phase_tx_power = false;
+  phase_reset = false;
+  phase_running = false;
+}
+
+void HCISharedMemTransportClass::wait(unsigned long timeout)
+{
+  for (unsigned long start = millis(); (millis() - start) < timeout;) {
+    if (available()) {
+      break;
+    }
+  }
+}
+
+int HCISharedMemTransportClass::available()
+{
+  /* assuming the reset is already achieved,
+   * the LL-only mode is already configured. */
+
+  if (_read_index != _write_index) {
+    return 1;
+  } else if (data_overflow) {
+    __disable_irq();
+    data_overflow = false;
+    __enable_irq();
+    if (_read_index != _write_index) {
+      return 1;
+    }
+  }
+
+  return 0;
+}
+
+int HCISharedMemTransportClass::peek()
+{
+  int peek_val = -1;
+  __disable_irq();
+  if (_read_index != _write_index) {
+    peek_val = _rxbuff[_read_index];
+  }
+  __enable_irq();
+  return peek_val;
+}
+
+int HCISharedMemTransportClass::read()
+{
+  int read_val = -1;
+  __disable_irq();
+  if (_read_index != _write_index) {
+    read_val = _rxbuff[_read_index];
+    _read_index++;
+    if (_read_index == _write_index) {
+      /* Reset buffer index */
+      _read_index = 0;
+      _write_index = 0;
+    }
+  }
+  __enable_irq();
+  return read_val;
+}
+
+size_t HCISharedMemTransportClass::write(const uint8_t *data, size_t length)
+{
+  const uint8_t *msg_data;
+  msg_data = &data[1];
+
+  /* capture the HCI reset send command opcode = 0x0C03
+   * After HCI reset event complete in the evt_received(),
+   * the bd_addr and tx_power must be sent
+   * before the phase_running begins.
+   */
+  if (phase_running) {
+    return mbox_write(data[0], (length - 1), msg_data);;
+  }
+  if ((data[1] == 0x03) && (data[2] == 0x0C)) {
+    phase_reset = false;
+
+    if (mbox_write(data[0], (length - 1), msg_data) != (length - 1)) {
+      /* Error: no data are written */
+      return 0;
+    }
+    /* capture event after HCI_RESET */
+    while (!phase_reset);
+
+    /* set the bd add */
+    if (!bt_ipm_set_addr()) {
+      /* in case of error, no data are written */
+      return 0;
+    }
+    /* wait for the Rx complete */
+    while (!phase_bd_addr);
+    /* this sequence is now complete */
+
+    /* set the Tx power */
+    bt_ipm_set_power();
+    /* wait for the Rx complete */
+    while (!phase_tx_power);
+
+    /* this sequence is now complete */
+    phase_running = true;
+
+    return (length - 1); /* mbox_size of the HCI reset command */
+  }
+  return 0; /* Error: no data written */
+}
+
+//private:
+void HCISharedMemTransportClass::start_ble_rf(void)
+{
+  /* Set the DBP bit in the Power control register 1 (PWR_CR1) */
+  LL_PWR_EnableBkUpAccess();
+
+  /* LSE belongs to the back-up domain, enable access.*/
+  while (!LL_PWR_IsEnabledBkUpAccess()) {
+  /* Wait for Backup domain access */
+  }
+  LL_RCC_ForceBackupDomainReset();
+  LL_RCC_ReleaseBackupDomainReset();
+
+  /* Enable LSE Oscillator (32.768 kHz) */
+  LL_RCC_LSE_Enable();
+  while (!LL_RCC_LSE_IsReady()) {
+    /* Wait for LSE ready */
+  }
+
+  LL_PWR_DisableBkUpAccess();
+
+  /* Switch OFF LSI as LSE is the source clock */
+  LL_RCC_LSI2_Disable();
+}
+
+void HCISharedMemTransportClass::stm32wb_reset(void)
+{
+  // Reset IPCC
+  LL_AHB3_GRP1_EnableClock(LL_AHB3_GRP1_PERIPH_IPCC);
+
+  LL_C1_IPCC_ClearFlag_CHx(
+    IPCC,
+    LL_IPCC_CHANNEL_1 | LL_IPCC_CHANNEL_2 | LL_IPCC_CHANNEL_3 | LL_IPCC_CHANNEL_4
+    | LL_IPCC_CHANNEL_5 | LL_IPCC_CHANNEL_6);
+
+  LL_C2_IPCC_ClearFlag_CHx(
+    IPCC,
+    LL_IPCC_CHANNEL_1 | LL_IPCC_CHANNEL_2 | LL_IPCC_CHANNEL_3 | LL_IPCC_CHANNEL_4
+    | LL_IPCC_CHANNEL_5 | LL_IPCC_CHANNEL_6);
+
+  LL_C1_IPCC_DisableTransmitChannel(
+    IPCC,
+    LL_IPCC_CHANNEL_1 | LL_IPCC_CHANNEL_2 | LL_IPCC_CHANNEL_3 | LL_IPCC_CHANNEL_4
+    | LL_IPCC_CHANNEL_5 | LL_IPCC_CHANNEL_6);
+
+  LL_C2_IPCC_DisableTransmitChannel(
+    IPCC,
+    LL_IPCC_CHANNEL_1 | LL_IPCC_CHANNEL_2 | LL_IPCC_CHANNEL_3 | LL_IPCC_CHANNEL_4
+    | LL_IPCC_CHANNEL_5 | LL_IPCC_CHANNEL_6);
+
+  LL_C1_IPCC_DisableReceiveChannel(
+    IPCC,
+    LL_IPCC_CHANNEL_1 | LL_IPCC_CHANNEL_2 | LL_IPCC_CHANNEL_3 | LL_IPCC_CHANNEL_4
+    | LL_IPCC_CHANNEL_5 | LL_IPCC_CHANNEL_6);
+
+  LL_C2_IPCC_DisableReceiveChannel(
+    IPCC,
+    LL_IPCC_CHANNEL_1 | LL_IPCC_CHANNEL_2 | LL_IPCC_CHANNEL_3 | LL_IPCC_CHANNEL_4
+    | LL_IPCC_CHANNEL_5 | LL_IPCC_CHANNEL_6);
+
+  /* IPCC default IRQ handlers: IPCC_C1_TX_IRQHandler & IPCC_C1_RX_IRQHandler
+   * are mapped in the flash mem area, so that NVIC does not need to SetVector
+   */
+}
+
+int HCISharedMemTransportClass::stm32wb_start_ble(void)
+{
+  SHCI_C2_Ble_Init_Cmd_Packet_t ble_init_cmd_packet = {
+    0, 0, 0,                            /**< Header unused */
+    0,                                  /** pBleBufferAddress not used */
+    0,                                  /** BleBufferSize not used */
+    CFG_BLE_NUM_GATT_ATTRIBUTES,
+    CFG_BLE_NUM_GATT_SERVICES,
+    CFG_BLE_ATT_VALUE_ARRAY_SIZE,
+    CFG_BLE_NUM_LINK,
+    CFG_BLE_DATA_LENGTH_EXTENSION,
+    CFG_BLE_PREPARE_WRITE_LIST_SIZE,
+    CFG_BLE_MBLOCK_COUNT,
+    CFG_BLE_MAX_ATT_MTU,
+    CFG_BLE_PERIPHERAL_SCA,
+    CFG_BLE_CENTRAL_SCA,
+    CFG_BLE_LS_SOURCE,
+    CFG_BLE_MAX_CONN_EVENT_LENGTH,
+    CFG_BLE_HSE_STARTUP_TIME,
+    CFG_BLE_VITERBI_MODE,
+    CFG_BLE_OPTIONS,
+    0,                                  /** TODO Should be read from HW */
+    CFG_BLE_MAX_COC_INITIATOR_NBR,
+    CFG_BLE_MIN_TX_POWER,
+    CFG_BLE_MAX_TX_POWER,
+    CFG_BLE_RX_MODEL_CONFIG,
+    CFG_BLE_MAX_ADV_SET_NBR,
+    CFG_BLE_MAX_ADV_DATA_LEN,
+    CFG_BLE_TX_PATH_COMPENS,
+    CFG_BLE_RX_PATH_COMPENS,
+    CFG_BLE_CORE_VERSION,
+    CFG_BLE_OPTIONS_EXT
+  };
+  /**
+   * Starts the BLE Stack on CPU2
+   */
+  if (SHCI_C2_BLE_Init(&ble_init_cmd_packet) == SHCI_Success) {
+    return 1;
+  }
+  return 0;
+}
+
+void HCISharedMemTransportClass::transport_init(void)
+{
+  TL_MM_Config_t tl_mm_config;
+  TL_BLE_InitConf_t tl_ble_config;
+  /* STM32WB offers a System Channel HCI interface for
+     offering system services, with proprietary commands.
+     System Channel must be used as well for starting up
+     BLE service so we need to initialize it. */
+  SHCI_TL_HciInitConf_t shci_init_config;
+
+  /**< Reference table initialization */
+  TL_Init();
+
+  /**< System channel initialization */
+  shci_init_config.p_cmdbuffer = (uint8_t *)&SystemCmdBuffer;
+  shci_init_config.StatusNotCallBack = syscmd_status_not;
+  shci_init(sysevt_received, (void *) &shci_init_config);
+
+  /**< Memory Manager channel initialization */
+  tl_mm_config.p_BleSpareEvtBuffer = BleSpareEvtBuffer;
+  tl_mm_config.p_SystemSpareEvtBuffer = SystemSpareEvtBuffer;
+  tl_mm_config.p_AsynchEvtPool = EvtPool;
+  tl_mm_config.AsynchEvtPoolSize = POOL_SIZE;
+  TL_MM_Init(&tl_mm_config);
+
+  TL_Enable();
+
+  /*  At this stage, we'll need to wait for ready event,
+   *  passed through TL_SYS_EvtReceived */
+  if (!sysevt_wait()) {
+#if defined(PRINT_IPCC_INFO)
+    printf("ERROR booting WB controller\r\n");
+#endif /*(PRINT_IPCC_INFO)*/
+  } else {
+    /**< BLE channel initialization */
+    tl_ble_config.p_cmdbuffer = (uint8_t *)&BleCmdBuffer;
+    tl_ble_config.p_AclDataBuffer = HciAclDataBuffer;
+    tl_ble_config.IoBusEvtCallBack = evt_received;
+    tl_ble_config.IoBusAclDataTxAck = acl_data_ack;
+    TL_BLE_Init((void *)&tl_ble_config);
+  }
+}
+
+int HCISharedMemTransportClass::bt_ipm_set_addr(void)
+{
+  /* the specific table for set addr is 8 bytes:
+   * one byte for config_offset
+   * one byte for length
+   * 6 bytes for payload */
+  uint8_t data[4 + 8];
+
+  phase_bd_addr = false;
+
+  if (get_bd_address(bd_addr_udn)) {
+    /* create ACI_HAL_WRITE_CONFIG_DATA */
+
+    data[0] = BT_BUF_CMD;
+    data[1] = uint8_t(ACI_WRITE_CONFIG_DATA_OPCODE & 0x000000FF); /* OCF */
+    data[2] = uint8_t((ACI_WRITE_CONFIG_DATA_OPCODE & 0x0000FF00) >> 8); /* OGF */
+    data[3] = 8; /* length of parameters */
+    /* fill the ACI_HAL_WRITE_CONFIG_DATA with the addr*/
+    data[4] = CONFIG_DATA_PUBADDR_OFFSET; /* the offset */
+    data[5] = 6; /* is the length of the bd_addr table */
+    memcpy(data + 6, bd_addr_udn, 6);
+    /* send the ACI_HAL_WRITE_CONFIG_DATA */
+    if (mbox_write(data[0], 11, &data[1]) != 11) {
+      /* Error: no data are written */
+      return 0;
+    }
+    /* now wait for the corresponding Rx event */
+    return 1; /* success */
+  }
+  return 0; /* Error */
+}
+
+
+int HCISharedMemTransportClass::bt_ipm_set_power(void)
+{
+  /* the specific table for power is 2 bytes:
+   * En_High_Power byte, PA_level byte */
+  uint8_t data[4 + 2];
+
+  phase_tx_power = false;
+
+  data[0] = BT_BUF_CMD; /* the type */
+  data[1] = (uint8_t)(ACI_HAL_SET_TX_POWER_LEVEL & 0x000000FF); /* the OPCODE */
+  data[2] = (uint8_t)((ACI_HAL_SET_TX_POWER_LEVEL & 0x0000FF00) >> 8);
+  data[3] = 2; /* the length */
+  /* fill the SET_POWER */
+  data[4] = 0x01; /* En_High_Power */
+  data[5] = CFG_TX_POWER; /* PA_level */
+
+  /* send the SET_POWER */
+  if (mbox_write(data[0], 5, &data[1]) != 5) {
+    /* Error: no data are written */
+    return 0;
+  }
+  /* now wait for the corresponding Rx event */
+  return 1; /* success */
+}
+
+HCITransportInterface& HCITransport = HCISharedMemTransport;
+#endif /* STM32WBxx */
diff --git a/src/utility/HCISharedMemTransport.h b/src/utility/HCISharedMemTransport.h
new file mode 100644
index 00000000..e739d63f
--- /dev/null
+++ b/src/utility/HCISharedMemTransport.h
@@ -0,0 +1,93 @@
+/*
+  This file is part of the STM32duinoBLE library.
+  Copyright (c) 2019 STMicroelectronics. All rights reserved.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  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
+*/
+
+#ifndef _HCI_SHARED_MEM_TRANSPORT_H_
+#define _HCI_SHARED_MEM_TRANSPORT_H_
+
+#include "HCITransport.h"
+
+/* STM32WB include files */
+#include "stm32wbxx_ll_rcc.h"
+#include "stm32wbxx_ll_ipcc.h"
+#include "stm32wbxx_ll_system.h"
+#include "STM32_WPAN/tl.h"
+#include "STM32_WPAN/shci.h"
+#include "STM32_WPAN/shci_tl.h"
+#include "STM32_WPAN/app_conf.h"
+
+/* this one is for printing info content when HW serial enabled */
+//#define PRINT_IPCC_INFO
+
+/* this CONFIG_DEBUG must be defined for -Og option */
+//#define CONFIG_DEBUG
+
+/******************************************************************************
+ * BLE config parameters
+ ******************************************************************************/
+/*  Defined from WB Cube reference SW */
+#define CFG_TLBLE_EVT_QUEUE_LENGTH 5
+#define CFG_TLBLE_MOST_EVENT_PAYLOAD_SIZE 255   /**< Set to 255 with the memory manager and the mailbox */
+#define TL_BLE_EVENT_FRAME_SIZE ( TL_EVT_HDR_SIZE + CFG_TLBLE_MOST_EVENT_PAYLOAD_SIZE )
+#define POOL_SIZE (CFG_TLBLE_EVT_QUEUE_LENGTH*4*DIVC(( sizeof(TL_PacketHeader_t) + TL_BLE_EVENT_FRAME_SIZE ), 4))
+
+#define CONFIG_DATA_PUBADDR_OFFSET          (0x00) /**< Bluetooth public address */
+#define CONFIG_DATA_PUBADDR_LEN             (6)
+
+#define BT_BUF_CMD 1
+#define BT_BUF_ACL_OUT 2
+
+/* timeout (in ms) to wait for an incoming event */
+#define BLE_IPCC_TIMEOUT 10000
+
+/* to received BLE packet from the SharedMem */
+void evt_received(TL_EvtPacket_t *hcievt);
+
+/* to send BLE packet to the SharedMem */
+uint16_t mbox_write(uint8_t type, uint16_t len, const uint8_t *pData);
+
+class HCISharedMemTransportClass : public HCITransportInterface {
+  public:
+    HCISharedMemTransportClass();
+    virtual ~HCISharedMemTransportClass();
+
+    virtual int begin();
+    virtual void end();
+
+    virtual void wait(unsigned long timeout);
+
+    virtual int available();
+    virtual int peek();
+    virtual int read();
+
+    virtual size_t write(const uint8_t *data, size_t length);
+
+  private:
+
+    /* method to initialize the BLE device */
+    void transport_init(void);
+    void start_ble_rf(void);
+    void stm32wb_reset(void);
+    int stm32wb_start_ble(void);
+    int bt_ipm_set_addr(void);
+    int bt_ipm_set_power(void);
+
+    uint8_t _random_addr[6];
+};
+
+#endif /* _HCI_SHARED_MEM_TRANSPORT_H_ */

From 93a265211bdd168f399ffb1d9691bac84473c427 Mon Sep 17 00:00:00 2001
From: Francois Ramu <francois.ramu@st.com>
Date: Tue, 18 Mar 2025 09:40:37 +0100
Subject: [PATCH 095/112] feat: add the STM32Cube_FW to support stm32wb

Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
---
 src/utility/STM32_WPAN/LICENSE.md          |  108 ++
 src/utility/STM32_WPAN/README.md           |    6 +
 src/utility/STM32_WPAN/app_conf.h          |   20 +
 src/utility/STM32_WPAN/app_conf_default.h  |  728 ++++++++++
 src/utility/STM32_WPAN/ble_bufsize.h       |  182 +++
 src/utility/STM32_WPAN/hw.h                |  114 ++
 src/utility/STM32_WPAN/hw_ipcc.c           |  749 +++++++++++
 src/utility/STM32_WPAN/mbox_def.h          |  280 ++++
 src/utility/STM32_WPAN/shci.c              |  763 +++++++++++
 src/utility/STM32_WPAN/shci.h              | 1402 ++++++++++++++++++++
 src/utility/STM32_WPAN/shci_tl.c           |  271 ++++
 src/utility/STM32_WPAN/shci_tl.h           |  173 +++
 src/utility/STM32_WPAN/stm32_wpan_common.h |  171 +++
 src/utility/STM32_WPAN/stm_list.c          |  210 +++
 src/utility/STM32_WPAN/stm_list.h          |   55 +
 src/utility/STM32_WPAN/tl.h                |  372 ++++++
 src/utility/STM32_WPAN/tl_dbg_conf.h       |  140 ++
 src/utility/STM32_WPAN/tl_mbox.c           |  855 ++++++++++++
 src/utility/STM32_WPAN/utilities_conf.h    |   66 +
 19 files changed, 6665 insertions(+)
 create mode 100644 src/utility/STM32_WPAN/LICENSE.md
 create mode 100644 src/utility/STM32_WPAN/README.md
 create mode 100644 src/utility/STM32_WPAN/app_conf.h
 create mode 100644 src/utility/STM32_WPAN/app_conf_default.h
 create mode 100644 src/utility/STM32_WPAN/ble_bufsize.h
 create mode 100644 src/utility/STM32_WPAN/hw.h
 create mode 100644 src/utility/STM32_WPAN/hw_ipcc.c
 create mode 100644 src/utility/STM32_WPAN/mbox_def.h
 create mode 100644 src/utility/STM32_WPAN/shci.c
 create mode 100644 src/utility/STM32_WPAN/shci.h
 create mode 100644 src/utility/STM32_WPAN/shci_tl.c
 create mode 100644 src/utility/STM32_WPAN/shci_tl.h
 create mode 100644 src/utility/STM32_WPAN/stm32_wpan_common.h
 create mode 100644 src/utility/STM32_WPAN/stm_list.c
 create mode 100644 src/utility/STM32_WPAN/stm_list.h
 create mode 100644 src/utility/STM32_WPAN/tl.h
 create mode 100644 src/utility/STM32_WPAN/tl_dbg_conf.h
 create mode 100644 src/utility/STM32_WPAN/tl_mbox.c
 create mode 100644 src/utility/STM32_WPAN/utilities_conf.h

diff --git a/src/utility/STM32_WPAN/LICENSE.md b/src/utility/STM32_WPAN/LICENSE.md
new file mode 100644
index 00000000..4e70ee7c
--- /dev/null
+++ b/src/utility/STM32_WPAN/LICENSE.md
@@ -0,0 +1,108 @@
+## Overview
+
+
+This Software Bill Of Material (SBOM) lists the software components of this
+software package, including the copyright owner and license terms for each
+component.
+
+__SOFTWARE BILL OF MATERIALS__
+
+Component                | Copyright                                                         | License
+---------                | ----------------------------------------------------------------- | -------
+Bluetooth Low Energy     | STMicroelectronics                                                | SLA
+Bluetooth Low Energy LLD | STMicroelectronics                                                | SLA
+Interface                | STMicroelectronics                                                | SLA
+MAC 802.15.4             | STMicroelectronics                                                | SLA
+PHY                      | STMicroelectronics                                                | SLA
+OpenThread               | The OpenThread Authors                                            | BSD-3-Clause
+Utilities                | STMicroelectronics, Amazon.com Inc.                               | SLA, MIT
+Zigbee                   | Exegin Technologies Limited, STMicroelectronics, Dr Brian Gladman | SLA
+
+
+__Notes:__ If the license is an open source license, then you can access the
+terms at [www.opensource.org](https://opensource.org/). Otherwise, the full
+license terms are below. If a component is not listed in the SBOM, then the SLA
+shall apply unless other terms are clearly stated in the package.
+
+
+
+SLA0044 Rev5/February 2018
+
+## Software license agreement
+
+### __ULTIMATE LIBERTY SOFTWARE LICENSE AGREEMENT__
+
+BY INSTALLING, COPYING, DOWNLOADING, ACCESSING OR OTHERWISE USING THIS SOFTWARE
+OR ANY PART THEREOF (AND THE RELATED DOCUMENTATION) FROM STMICROELECTRONICS
+INTERNATIONAL N.V, SWISS BRANCH AND/OR ITS AFFILIATED COMPANIES
+(STMICROELECTRONICS), THE RECIPIENT, ON BEHALF OF HIMSELF OR HERSELF, OR ON
+BEHALF OF ANY ENTITY BY WHICH SUCH RECIPIENT IS EMPLOYED AND/OR ENGAGED AGREES
+TO BE BOUND BY THIS SOFTWARE LICENSE AGREEMENT.
+
+Under STMicroelectronics’ intellectual property rights, the redistribution,
+reproduction and use in source and binary forms of the software or any part
+thereof, with or without modification, are permitted provided that the following
+conditions are met:
+
+1. Redistribution of source code (modified or not) must retain any copyright
+notice, this list of conditions and the disclaimer set forth below as items 10
+and 11.
+
+2. Redistributions in binary form, except as embedded into microcontroller or
+microprocessor device manufactured by or for STMicroelectronics or a software
+update for such device, must reproduce any copyright notice provided with the
+binary code, this list of conditions, and the disclaimer set forth below as
+items 10 and 11, in documentation and/or other materials provided with the
+distribution.
+
+3. Neither the name of STMicroelectronics nor the names of other contributors to
+this software may be used to endorse or promote products derived from this
+software or part thereof without specific written permission.
+
+4. This software or any part thereof, including modifications and/or derivative
+works of this software, must be used and execute solely and exclusively on or in
+combination with a microcontroller or microprocessor device manufactured by or
+for STMicroelectronics.
+
+5. No use, reproduction or redistribution of this software partially or totally
+may be done in any manner that would subject this software to any Open Source
+Terms. “Open Source Terms” shall mean any open source license which requires as
+part of distribution of software that the source code of such software is
+distributed therewith or otherwise made available, or open source license that
+substantially complies with the Open Source definition specified at
+www.opensource.org and any other comparable open source license such as for
+example GNU General Public License (GPL), Eclipse Public License (EPL), Apache
+Software License, BSD license or MIT license.
+
+6. STMicroelectronics has no obligation to provide any maintenance, support or
+updates for the software.
+
+7. The software is and will remain the exclusive property of STMicroelectronics
+and its licensors. The recipient will not take any action that jeopardizes
+STMicroelectronics and its licensors' proprietary rights or acquire any rights
+in the software, except the limited rights specified hereunder.
+
+8. The recipient shall comply with all applicable laws and regulations affecting
+the use of the software or any part thereof including any applicable export
+control law or regulation.
+
+9. Redistribution and use of this software or any part thereof other than as
+permitted under this license is void and will automatically terminate your
+rights under this license.
+
+10. THIS SOFTWARE IS PROVIDED BY STMICROELECTRONICS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS, IMPLIED OR STATUTORY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NON-INFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY RIGHTS, WHICH ARE
+DISCLAIMED TO THE FULLEST EXTENT PERMITTED BY LAW. IN NO EVENT SHALL
+STMICROELECTRONICS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+11. EXCEPT AS EXPRESSLY PERMITTED HEREUNDER, NO LICENSE OR OTHER RIGHTS, WHETHER
+EXPRESS OR IMPLIED, ARE GRANTED UNDER ANY PATENT OR OTHER INTELLECTUAL PROPERTY
+RIGHTS OF STMICROELECTRONICS OR ANY THIRD PARTY.
diff --git a/src/utility/STM32_WPAN/README.md b/src/utility/STM32_WPAN/README.md
new file mode 100644
index 00000000..90f96452
--- /dev/null
+++ b/src/utility/STM32_WPAN/README.md
@@ -0,0 +1,6 @@
+
+## Source
+
+[STMicroelectronics/STM32CubeWB Release v1.22.0](https://github.com/STMicroelectronics/STM32CubeWB/releases/tag/v1.22.0)
+- Application: [BLE_TransparentMode](https://github.com/STMicroelectronics/STM32CubeWB/tree/v1.22.0/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode)
+
diff --git a/src/utility/STM32_WPAN/app_conf.h b/src/utility/STM32_WPAN/app_conf.h
new file mode 100644
index 00000000..3246393f
--- /dev/null
+++ b/src/utility/STM32_WPAN/app_conf.h
@@ -0,0 +1,20 @@
+//-----------------------------
+// @file app_conf.h
+// @author Kasper Meldgaard
+// @brief Wrapper for BLE app configuration based on comment by fpistm
+// (https://github.com/stm32duino/STM32duinoBLE/issues/34).
+// @date 15-11-2021
+// @copyright Copyright (c) 2021
+
+#ifndef APP_CONF_H
+#define APP_CONF_H
+
+#include "hw.h"
+#include "ble_bufsize.h"
+
+#if __has_include("app_conf_custom.h")
+  #include "app_conf_custom.h"
+#endif
+#include "app_conf_default.h"
+
+#endif /* APP_CONF_H */
diff --git a/src/utility/STM32_WPAN/app_conf_default.h b/src/utility/STM32_WPAN/app_conf_default.h
new file mode 100644
index 00000000..ff2dc017
--- /dev/null
+++ b/src/utility/STM32_WPAN/app_conf_default.h
@@ -0,0 +1,728 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    app_conf_default.h
+  * @author  MCD Application Team
+  * @brief   Default application configuration file for STM32WPAN Middleware.
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2020-2021 STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef APP_CONF_DEFAULT_H
+#define APP_CONF_DEFAULT_H
+
+#if 0
+#include "hw.h"
+#include "hw_conf.h"
+#include "hw_if.h"
+#include "ble_bufsize.h"
+#endif
+
+/******************************************************************************
+ * Application Config
+ ******************************************************************************/
+
+/**< generic parameters ******************************************************/
+/* HCI related defines */
+
+#define ACI_HAL_SET_TX_POWER_LEVEL 0xFC0F
+#define ACI_WRITE_CONFIG_DATA_OPCODE 0xFC0C
+#define ACI_READ_CONFIG_DATA_OPCODE 0xFC0D
+#define MAX_HCI_ACL_PACKET_SIZE (sizeof(TL_PacketHeader_t) + 5 + 251)
+#define HCI_RESET 0x0C03
+
+#ifndef BLE_SHARED_MEM_BYTE_ORDER
+  #define BLE_SHARED_MEM_BYTE_ORDER  MSBFIRST
+#endif
+#define BLE_MODULE_SHARED_MEM_BUFFER_SIZE 128
+
+/**
+ * Define Tx Power
+ */
+#ifndef CFG_TX_POWER
+  #define CFG_TX_POWER                        (0x18) /* -0.15dBm */
+#endif
+
+#if 0
+/**
+ * Define Secure Connections Support
+ */
+#define CFG_SECURE_NOT_SUPPORTED              (0x00)
+#define CFG_SECURE_OPTIONAL                   (0x01)
+#define CFG_SECURE_MANDATORY                  (0x02)
+
+#define CFG_SC_SUPPORT                        CFG_SECURE_OPTIONAL
+
+/**
+ * Define Keypress Notification Support
+ */
+#define CFG_KEYPRESS_NOT_SUPPORTED            (0x00)
+#define CFG_KEYPRESS_SUPPORTED                (0x01)
+
+#define CFG_KEYPRESS_NOTIFICATION_SUPPORT     CFG_KEYPRESS_NOT_SUPPORTED
+
+/**
+ * Numeric Comparison Answers
+ */
+#define YES (0x01)
+#define NO  (0x00)
+
+/**
+ * Device name configuration for Generic Access Service
+ */
+#define CFG_GAP_DEVICE_NAME             "TEMPLATE"
+#define CFG_GAP_DEVICE_NAME_LENGTH      (8)
+
+/**
+*   Identity root key used to derive IRK and DHK(Legacy)
+*/
+#define CFG_BLE_IR     {0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xF0, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xF0}
+
+/**
+* Encryption root key used to derive LTK(Legacy) and CSRK
+*/
+#define CFG_BLE_ER     {0xFE, 0xDC, 0xBA, 0x09, 0x87, 0x65, 0x43, 0x21, 0xFE, 0xDC, 0xBA, 0x09, 0x87, 0x65, 0x43, 0x21}
+
+/**
+ * SMPS supply
+ * SMPS not used when Set to 0
+ * SMPS used when Set to 1
+ */
+#define CFG_USE_SMPS    0
+
+/* USER CODE BEGIN Generic_Parameters */
+/* USER CODE END Generic_Parameters */
+
+/**< specific parameters */
+/*****************************************************/
+
+/* USER CODE BEGIN Specific_Parameters */
+#define PUSH_BUTTON_SW1_EXTI_IRQHandler                         EXTI4_IRQHandler
+
+/* USER CODE END Specific_Parameters */
+
+/******************************************************************************
+ * Information Table
+ *
+  * Version
+  * [0:3]   = Build - 0: Untracked - 15:Released - x: Tracked version
+  * [4:7]   = branch - 0: Mass Market - x: ...
+  * [8:15]  = Subversion
+  * [16:23] = Version minor
+  * [24:31] = Version major
+  *
+ ******************************************************************************/
+#define CFG_FW_MAJOR_VERSION      (0)
+#define CFG_FW_MINOR_VERSION      (0)
+#define CFG_FW_SUBVERSION         (1)
+#define CFG_FW_BRANCH             (0)
+#define CFG_FW_BUILD              (0)
+#endif
+
+/******************************************************************************
+ * BLE Stack
+ ******************************************************************************/
+/**
+ * Maximum number of simultaneous connections that the device will support.
+ * Valid values are from 1 to 8
+ */
+#ifndef CFG_BLE_NUM_LINK
+#ifdef STM32WB15xx
+  #define CFG_BLE_NUM_LINK            3
+#else
+  #define CFG_BLE_NUM_LINK            8
+#endif
+#endif
+
+/**
+ * Maximum number of Services that can be stored in the GATT database.
+ * Note that the GAP and GATT services are automatically added so this parameter should be 2 plus the number of user services
+ */
+#ifndef CFG_BLE_NUM_GATT_SERVICES
+#ifdef STM32WB15xx
+  #define CFG_BLE_NUM_GATT_SERVICES   4
+#else
+  #define CFG_BLE_NUM_GATT_SERVICES   8
+#endif
+#endif
+
+/**
+ * Maximum number of Attributes
+ * (i.e. the number of characteristic + the number of characteristic values + the number of descriptors, excluding the services)
+ * that can be stored in the GATT database.
+ * Note that certain characteristics and relative descriptors are added automatically during device initialization
+ * so this parameters should be 9 plus the number of user Attributes
+ */
+#ifndef CFG_BLE_NUM_GATT_ATTRIBUTES
+#ifdef STM32WB15xx
+  #define CFG_BLE_NUM_GATT_ATTRIBUTES 30
+#else
+  #define CFG_BLE_NUM_GATT_ATTRIBUTES 68
+#endif
+#endif
+
+/**
+ * Maximum supported ATT_MTU size
+ * This parameter is ignored by the CPU2 when CFG_BLE_OPTIONS has SHCI_C2_BLE_INIT_OPTIONS_LL_ONLY flag set
+ */
+#define CFG_BLE_MAX_ATT_MTU             (156)
+
+/**
+ * Size of the storage area for Attribute values
+ *  This value depends on the number of attributes used by application. In particular the sum of the following quantities (in octets) should be made for each attribute:
+ *  - attribute value length
+ *  - 5, if UUID is 16 bit; 19, if UUID is 128 bit
+ *  - 2, if server configuration descriptor is used
+ *  - 2*DTM_NUM_LINK, if client configuration descriptor is used
+ *  - 2, if extended properties is used
+ *  The total amount of memory needed is the sum of the above quantities for each attribute.
+ * This parameter is ignored by the CPU2 when CFG_BLE_OPTIONS has SHCI_C2_BLE_INIT_OPTIONS_LL_ONLY flag set
+ */
+#define CFG_BLE_ATT_VALUE_ARRAY_SIZE    (1344)
+
+/**
+ * Prepare Write List size in terms of number of packet
+ * This parameter is ignored by the CPU2 when CFG_BLE_OPTIONS has SHCI_C2_BLE_INIT_OPTIONS_LL_ONLY flag set
+ */
+#define CFG_BLE_PREPARE_WRITE_LIST_SIZE         BLE_PREP_WRITE_X_ATT(CFG_BLE_MAX_ATT_MTU)
+
+/**
+ * Number of allocated memory blocks
+ * This parameter is overwritten by the CPU2 with an hardcoded optimal value when the parameter CFG_BLE_OPTIONS has SHCI_C2_BLE_INIT_OPTIONS_LL_ONLY flag set
+ */
+#define CFG_BLE_MBLOCK_COUNT            (BLE_MBLOCKS_CALC(CFG_BLE_PREPARE_WRITE_LIST_SIZE, CFG_BLE_MAX_ATT_MTU, CFG_BLE_NUM_LINK))
+
+/**
+ * Enable or disable the Extended Packet length feature. Valid values are 0 or 1.
+ */
+#ifndef CFG_BLE_DATA_LENGTH_EXTENSION
+  #define CFG_BLE_DATA_LENGTH_EXTENSION   1
+#endif
+
+/**
+ * Sleep clock accuracy in Peripheral mode (ppm value)
+ */
+#ifndef CFG_BLE_PERIPHERAL_SCA
+  #define CFG_BLE_PERIPHERAL_SCA   500
+#endif
+
+/**
+ * Sleep clock accuracy in Central mode
+ * 0 : 251 ppm to 500 ppm
+ * 1 : 151 ppm to 250 ppm
+ * 2 : 101 ppm to 150 ppm
+ * 3 : 76 ppm to 100 ppm
+ * 4 : 51 ppm to 75 ppm
+ * 5 : 31 ppm to 50 ppm
+ * 6 : 21 ppm to 30 ppm
+ * 7 : 0 ppm to 20 ppm
+ */
+#ifndef CFG_BLE_CENTRAL_SCA
+  #define CFG_BLE_CENTRAL_SCA   0
+#endif
+
+/**
+ * LsSource
+ * Some information for Low speed clock mapped in bits field
+ * - bit 0:   1: Calibration for the RF system wakeup clock source   0: No calibration for the RF system wakeup clock source
+ * - bit 1:   1: STM32WB5M Module device                             0: Other devices as STM32WBxx SOC, STM32WB1M module
+ * - bit 2:   1: HSE/1024 Clock config                               0: LSE Clock config
+ */
+#ifndef CFG_BLE_LS_SOURCE
+  #if defined(STM32WB5Mxx)
+    #define CFG_BLE_LS_SOURCE  (SHCI_C2_BLE_INIT_CFG_BLE_LS_NOCALIB | SHCI_C2_BLE_INIT_CFG_BLE_LS_MOD5MM_DEV | SHCI_C2_BLE_INIT_CFG_BLE_LS_CLK_LSE)
+  #else
+    #define CFG_BLE_LS_SOURCE  (SHCI_C2_BLE_INIT_CFG_BLE_LS_NOCALIB | SHCI_C2_BLE_INIT_CFG_BLE_LS_OTHER_DEV | SHCI_C2_BLE_INIT_CFG_BLE_LS_CLK_LSE)
+  #endif
+#endif
+
+/**
+ * Start up time of the high speed (16 or 32 MHz) crystal oscillator in units of 625/256 us (~2.44 us)
+ */
+#ifndef CFG_BLE_HSE_STARTUP_TIME
+  #define CFG_BLE_HSE_STARTUP_TIME  0x148
+#endif
+
+/**
+ * Maximum duration of the connection event when the device is in Peripheral mode in units of 625/256 us (~2.44 us)
+ */
+#ifndef CFG_BLE_MAX_CONN_EVENT_LENGTH
+  #define CFG_BLE_MAX_CONN_EVENT_LENGTH  (0xFFFFFFFF)
+#endif
+
+/**
+ * Viterbi Mode
+ * 1 : enabled
+ * 0 : disabled
+ */
+#define CFG_BLE_VITERBI_MODE  1
+
+/**
+ * BLE stack Options flags to be configured with:
+ * - SHCI_C2_BLE_INIT_OPTIONS_LL_ONLY
+ * - SHCI_C2_BLE_INIT_OPTIONS_LL_HOST
+ * - SHCI_C2_BLE_INIT_OPTIONS_NO_SVC_CHANGE_DESC
+ * - SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC
+ * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RO
+ * - SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW
+ * - SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV
+ * - SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV
+ * - SHCI_C2_BLE_INIT_OPTIONS_CS_ALGO2
+ * - SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2
+ * - SHCI_C2_BLE_INIT_OPTIONS_REDUC_GATTDB_NVM
+ * - SHCI_C2_BLE_INIT_OPTIONS_FULL_GATTDB_NVM
+ * - SHCI_C2_BLE_INIT_OPTIONS_GATT_CACHING_USED
+ * - SHCI_C2_BLE_INIT_OPTIONS_GATT_CACHING_NOTUSED
+ * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_1
+ * - SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3
+ * which are used to set following configuration bits:
+ * (bit 0): 1: LL only
+ *          0: LL + host
+ * (bit 1): 1: no service change desc.
+ *          0: with service change desc.
+ * (bit 2): 1: device name Read-Only
+ *          0: device name R/W
+ * (bit 3): 1: extended advertizing supported
+ *          0: extended advertizing not supported
+ * (bit 4): 1: CS Algo #2 supported
+ *          0: CS Algo #2 not supported
+ * (bit 5): 1: Reduced GATT database in NVM
+ *          0: Full GATT database in NVM
+ * (bit 6): 1: GATT caching is used
+ *          0: GATT caching is not used
+ * (bit 7): 1: LE Power Class 1
+ *          0: LE Power Class 2-3
+ * other bits: complete with Options_extension flag
+ */
+#define CFG_BLE_OPTIONS  (SHCI_C2_BLE_INIT_OPTIONS_LL_ONLY | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV | SHCI_C2_BLE_INIT_OPTIONS_CS_ALGO2 | SHCI_C2_BLE_INIT_OPTIONS_FULL_GATTDB_NVM | SHCI_C2_BLE_INIT_OPTIONS_GATT_CACHING_NOTUSED | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3)
+
+/**
+ * BLE stack Options_extension flags to be configured with:
+ * - SHCI_C2_BLE_INIT_OPTIONS_APPEARANCE_WRITABLE
+ * - SHCI_C2_BLE_INIT_OPTIONS_APPEARANCE_READONLY
+ * - SHCI_C2_BLE_INIT_OPTIONS_ENHANCED_ATT_SUPPORTED
+ * - SHCI_C2_BLE_INIT_OPTIONS_ENHANCED_ATT_NOTSUPPORTED
+ * which are used to set following configuration bits:
+ * (bit 0): 1: appearance Writable
+ *          0: appearance Read-Only
+ * (bit 1): 1: Enhanced ATT supported
+ *          0: Enhanced ATT not supported
+ * other bits: reserved (shall be set to 0)
+ */
+#define CFG_BLE_OPTIONS_EXT  (SHCI_C2_BLE_INIT_OPTIONS_APPEARANCE_READONLY | SHCI_C2_BLE_INIT_OPTIONS_ENHANCED_ATT_NOTSUPPORTED)
+
+#define CFG_BLE_MAX_COC_INITIATOR_NBR   (32)
+
+#define CFG_BLE_MIN_TX_POWER            (-40)
+
+#define CFG_BLE_MAX_TX_POWER            (6)
+
+/**
+ * BLE Rx model configuration flags to be configured with:
+ * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY
+ * - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_BLOCKER
+ * which are used to set following configuration bits:
+ * (bit 0): 1: agc_rssi model improved vs RF blockers
+ *          0: Legacy agc_rssi model
+ * other bits: reserved (shall be set to 0)
+ */
+
+#define CFG_BLE_RX_MODEL_CONFIG         (SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY)
+
+/* Maximum number of advertising sets.
+ * Range: 1 .. 8 with limitation:
+ * This parameter is linked to CFG_BLE_MAX_ADV_DATA_LEN such as both compliant with allocated Total memory computed with BLE_EXT_ADV_BUFFER_SIZE based
+ * on Max Extended advertising configuration supported.
+ * This parameter is considered by the CPU2 when CFG_BLE_OPTIONS has SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV flag set
+ */
+
+#if defined(STM32WB15xx)
+  #define CFG_BLE_MAX_ADV_SET_NBR     (3)
+#else
+  #define CFG_BLE_MAX_ADV_SET_NBR     (8)
+#endif
+
+ /* Maximum advertising data length (in bytes)
+ * Range: 31 .. 1650 with limitation:
+ * This parameter is linked to CFG_BLE_MAX_ADV_SET_NBR such as both compliant with allocated Total memory computed with BLE_EXT_ADV_BUFFER_SIZE based
+ * on Max Extended advertising configuration supported.
+ * This parameter is considered by the CPU2 when CFG_BLE_OPTIONS has SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV flag set
+ */
+
+#if defined(STM32WB15xx)
+  #define CFG_BLE_MAX_ADV_DATA_LEN    (414)
+#else
+  #define CFG_BLE_MAX_ADV_DATA_LEN    (207)
+#endif
+
+ /* RF TX Path Compensation Value (16-bit signed integer). Units: 0.1 dB.
+  * Range: -1280 .. 1280
+  */
+
+#define CFG_BLE_TX_PATH_COMPENS    (0)
+
+ /* RF RX Path Compensation Value (16-bit signed integer). Units: 0.1 dB.
+  * Range: -1280 .. 1280
+  */
+
+#define CFG_BLE_RX_PATH_COMPENS    (0)
+
+  /* BLE core version (16-bit signed integer).
+   * - SHCI_C2_BLE_INIT_BLE_CORE_5_2
+   * - SHCI_C2_BLE_INIT_BLE_CORE_5_3
+   * - SHCI_C2_BLE_INIT_BLE_CORE_5_4
+   * which are used to set: 11(5.2), 12(5.3), 13(5.4).
+   */
+
+#define CFG_BLE_CORE_VERSION   (SHCI_C2_BLE_INIT_BLE_CORE_5_4)
+
+#if 0
+/******************************************************************************
+ * Transport Layer
+ ******************************************************************************/
+/**
+ * Queue length of BLE Event
+ * This parameter defines the number of asynchronous events that can be stored in the HCI layer before
+ * being reported to the application. When a command is sent to the BLE core coprocessor, the HCI layer
+ * is waiting for the event with the Num_HCI_Command_Packets set to 1. The receive queue shall be large
+ * enough to store all asynchronous events received in between.
+ * When CFG_TLBLE_MOST_EVENT_PAYLOAD_SIZE is set to 27, this allow to store three 255 bytes long asynchronous events
+ * between the HCI command and its event.
+ * This parameter depends on the value given to CFG_TLBLE_MOST_EVENT_PAYLOAD_SIZE. When the queue size is to small,
+ * the system may hang if the queue is full with asynchronous events and the HCI layer is still waiting
+ * for a CC/CS event, In that case, the notification TL_BLE_HCI_ToNot() is called to indicate
+ * to the application a HCI command did not receive its command event within 30s (Default HCI Timeout).
+ */
+#define CFG_TLBLE_EVT_QUEUE_LENGTH 5
+/**
+ * This parameter should be set to fit most events received by the HCI layer. It defines the buffer size of each element
+ * allocated in the queue of received events and can be used to optimize the amount of RAM allocated by the Memory Manager.
+ * It should not exceed 255 which is the maximum HCI packet payload size (a greater value is a lost of memory as it will
+ * never be used)
+ * It shall be at least 4 to receive the command status event in one frame.
+ * The default value is set to 27 to allow receiving an event of MTU size in a single buffer. This value maybe reduced
+ * further depending on the application.
+ */
+#define CFG_TLBLE_MOST_EVENT_PAYLOAD_SIZE 255   /**< Set to 255 with the memory manager and the mailbox */
+
+#define TL_BLE_EVENT_FRAME_SIZE ( TL_EVT_HDR_SIZE + CFG_TLBLE_MOST_EVENT_PAYLOAD_SIZE )
+/******************************************************************************
+ * UART interfaces
+ ******************************************************************************/
+
+/**
+ * Select UART interfaces
+ */
+#define CFG_UART_GUI            hw_uart1
+#define CFG_DEBUG_TRACE_UART    0
+/******************************************************************************
+ * USB interface
+ ******************************************************************************/
+
+/**
+ * Enable/Disable USB interface
+ */
+#define CFG_USB_INTERFACE_ENABLE    0
+
+/******************************************************************************
+ * IPCC interface
+ ******************************************************************************/
+
+/**
+ * The IPCC is dedicated to the communication between the CPU2 and the CPU1
+ * and shall not be modified by the application
+ * The two following definitions shall not be modified
+ */
+#define HAL_IPCC_TX_IRQHandler(...)  HW_IPCC_Tx_Handler( )
+#define HAL_IPCC_RX_IRQHandler(...)  HW_IPCC_Rx_Handler( )
+
+/******************************************************************************
+ * Low Power
+ ******************************************************************************/
+/**
+ *  When set to 1, the low power mode is enable
+ *  When set to 0, the device stays in RUN mode
+ */
+#define CFG_LPM_SUPPORTED    1
+
+/******************************************************************************
+ * RTC interface
+ ******************************************************************************/
+#define HAL_RTCEx_WakeUpTimerIRQHandler(...)  HW_TS_RTC_Wakeup_Handler( )
+
+/******************************************************************************
+ * Timer Server
+ ******************************************************************************/
+/**
+ *  CFG_RTC_WUCKSEL_DIVIDER:  This sets the RTCCLK divider to the wakeup timer.
+ *  The lower is the value, the better is the power consumption and the accuracy of the timerserver
+ *  The higher is the value, the finest is the granularity
+ *
+ *  CFG_RTC_ASYNCH_PRESCALER: This sets the asynchronous prescaler of the RTC. It should as high as possible ( to output
+ *  clock as low as possible) but the output clock should be equal or higher frequency compare to the clock feeding
+ *  the wakeup timer. A lower clock speed would impact the accuracy of the timer server.
+ *
+ *  CFG_RTC_SYNCH_PRESCALER: This sets the synchronous prescaler of the RTC.
+ *  When the 1Hz calendar clock is required, it shall be sets according to other settings
+ *  When the 1Hz calendar clock is not needed, CFG_RTC_SYNCH_PRESCALER should be set to 0x7FFF (MAX VALUE)
+ *
+ *  CFG_RTCCLK_DIVIDER_CONF:
+ *  Shall be set to either 0,2,4,8,16
+ *  When set to either 2,4,8,16, the 1Hhz calendar is supported
+ *  When set to 0, the user sets its own configuration
+ *
+ *  The following settings are computed with LSI as input to the RTC
+ */
+
+#define CFG_RTCCLK_DIVIDER_CONF 0
+
+#if (CFG_RTCCLK_DIVIDER_CONF == 0)
+/**
+ * Custom configuration
+ * It does not support 1Hz calendar
+ * It divides the RTC CLK by 16
+ */
+
+#define CFG_RTCCLK_DIV            (16)
+#define CFG_RTC_WUCKSEL_DIVIDER   (0)
+#define CFG_RTC_ASYNCH_PRESCALER  (0x0F)
+#define CFG_RTC_SYNCH_PRESCALER   (0x7FFF)
+
+#else
+
+#if (CFG_RTCCLK_DIVIDER_CONF == 2)
+/**
+ * It divides the RTC CLK by 2
+ */
+#define CFG_RTC_WUCKSEL_DIVIDER (3)
+#endif
+
+#if (CFG_RTCCLK_DIVIDER_CONF == 4)
+/**
+ * It divides the RTC CLK by 4
+ */
+#define CFG_RTC_WUCKSEL_DIVIDER (2)
+#endif
+
+#if (CFG_RTCCLK_DIVIDER_CONF == 8)
+/**
+ * It divides the RTC CLK by 8
+ */
+#define CFG_RTC_WUCKSEL_DIVIDER (1)
+#endif
+
+#if (CFG_RTCCLK_DIVIDER_CONF == 16)
+/**
+ * It divides the RTC CLK by 16
+ */
+#define CFG_RTC_WUCKSEL_DIVIDER (0)
+#endif
+
+#define CFG_RTCCLK_DIV              CFG_RTCCLK_DIVIDER_CONF
+#define CFG_RTC_ASYNCH_PRESCALER    (CFG_RTCCLK_DIV - 1)
+#define CFG_RTC_SYNCH_PRESCALER     (DIVR( LSE_VALUE, (CFG_RTC_ASYNCH_PRESCALER+1) ) - 1 )
+
+#endif
+
+/** tick timer values */
+#define CFG_TS_TICK_VAL           DIVR( (CFG_RTCCLK_DIV * 1000000), LSE_VALUE )
+#define CFG_TS_TICK_VAL_PS        DIVR( ((uint64_t)CFG_RTCCLK_DIV * 1e12), (uint64_t)LSE_VALUE )
+
+typedef enum
+{
+  CFG_TIM_PROC_ID_ISR,
+  /* USER CODE BEGIN CFG_TimProcID_t */
+
+  /* USER CODE END CFG_TimProcID_t */
+} CFG_TimProcID_t;
+
+/******************************************************************************
+ * Debug
+ ******************************************************************************/
+/**
+ * When set, this resets some hw resources to put the device in the same state as at power up.
+ * It resets only register that may prevent the FW to run properly.
+ *
+ * This shall be set to 0 in a final product
+ *
+ */
+#define CFG_HW_RESET_BY_FW         0
+
+/**
+ * keep debugger enabled while in any low power mode when set to 1
+ * should be set to 0 in production
+ */
+#define CFG_DEBUGGER_SUPPORTED    0
+
+/**
+ * When set to 1, the traces are enabled in the BLE services
+ */
+#define CFG_DEBUG_BLE_TRACE     0
+
+/**
+ * Enable or Disable traces in application
+ */
+#define CFG_DEBUG_APP_TRACE     0
+
+#if (CFG_DEBUG_APP_TRACE != 0)
+#define APP_DBG_MSG                 PRINT_MESG_DBG
+#else
+#define APP_DBG_MSG                 PRINT_NO_MESG
+#endif
+
+#if ( (CFG_DEBUG_BLE_TRACE != 0) || (CFG_DEBUG_APP_TRACE != 0) )
+#define CFG_DEBUG_TRACE             1
+#endif
+
+#if (CFG_DEBUG_TRACE != 0)
+#undef CFG_LPM_SUPPORTED
+#undef CFG_DEBUGGER_SUPPORTED
+#define CFG_LPM_SUPPORTED           0
+#define CFG_DEBUGGER_SUPPORTED      1
+#endif
+
+/**
+ * When CFG_DEBUG_TRACE_FULL is set to 1, the trace are output with the API name, the file name and the line number
+ * When CFG_DEBUG_TRACE_LIGHT is set to 1, only the debug message is output
+ *
+ * When both are set to 0, no trace are output
+ * When both are set to 1,  CFG_DEBUG_TRACE_FULL is selected
+ */
+#define CFG_DEBUG_TRACE_LIGHT     0
+#define CFG_DEBUG_TRACE_FULL      0
+
+#if (( CFG_DEBUG_TRACE != 0 ) && ( CFG_DEBUG_TRACE_LIGHT == 0 ) && (CFG_DEBUG_TRACE_FULL == 0))
+#undef CFG_DEBUG_TRACE_FULL
+#undef CFG_DEBUG_TRACE_LIGHT
+#define CFG_DEBUG_TRACE_FULL      0
+#define CFG_DEBUG_TRACE_LIGHT     1
+#endif
+
+#if ( CFG_DEBUG_TRACE == 0 )
+#undef CFG_DEBUG_TRACE_FULL
+#undef CFG_DEBUG_TRACE_LIGHT
+#define CFG_DEBUG_TRACE_FULL      0
+#define CFG_DEBUG_TRACE_LIGHT     0
+#endif
+
+/**
+ * When not set, the traces is looping on sending the trace over UART
+ */
+#define DBG_TRACE_USE_CIRCULAR_QUEUE 1
+
+/**
+ * max buffer Size to queue data traces and max data trace allowed.
+ * Only Used if DBG_TRACE_USE_CIRCULAR_QUEUE is defined
+ */
+#define DBG_TRACE_MSG_QUEUE_SIZE 4096
+#define MAX_DBG_TRACE_MSG_SIZE   1024
+
+/* USER CODE BEGIN Defines */
+#define CFG_LED_SUPPORTED         1
+#define CFG_BUTTON_SUPPORTED      1
+
+#define PUSH_BUTTON_SW1_EXTI_IRQHandler     EXTI4_IRQHandler
+#define PUSH_BUTTON_SW2_EXTI_IRQHandler     EXTI0_IRQHandler
+#define PUSH_BUTTON_SW3_EXTI_IRQHandler     EXTI1_IRQHandler
+/* USER CODE END Defines */
+
+/******************************************************************************
+ * Scheduler
+ ******************************************************************************/
+
+/**
+ * These are the lists of task id registered to the scheduler
+ * Each task id shall be in the range [0:31]
+ * This mechanism allows to implement a generic code in the API TL_BLE_HCI_StatusNot() to comply with
+ * the requirement that a HCI/ACI command shall never be sent if there is already one pending
+ */
+
+/**< Add in that list all tasks that may send a ACI/HCI command */
+typedef enum
+{
+  CFG_TASK_BLE_HCI_CMD_ID,
+  CFG_TASK_SYS_HCI_CMD_ID,
+  CFG_TASK_HCI_ACL_DATA_ID,
+  CFG_TASK_SYS_LOCAL_CMD_ID,
+  CFG_TASK_TX_TO_HOST_ID,
+  /* USER CODE BEGIN CFG_Task_Id_With_HCI_Cmd_t */
+  CFG_TASK_SW1_BUTTON_PUSHED_ID,
+  CFG_TASK_SW2_BUTTON_PUSHED_ID,
+  CFG_TASK_SW3_BUTTON_PUSHED_ID,
+  /* USER CODE END CFG_Task_Id_With_HCI_Cmd_t */
+  CFG_LAST_TASK_ID_WITH_HCICMD,                                               /**< Shall be LAST in the list */
+} CFG_Task_Id_With_HCI_Cmd_t;
+
+/**< Add in that list all tasks that never send a ACI/HCI command */
+typedef enum
+{
+  CFG_FIRST_TASK_ID_WITH_NO_HCICMD = CFG_LAST_TASK_ID_WITH_HCICMD - 1,        /**< Shall be FIRST in the list */
+  CFG_TASK_SYSTEM_HCI_ASYNCH_EVT_ID,
+  /* USER CODE BEGIN CFG_Task_Id_With_NO_HCI_Cmd_t */
+
+  /* USER CODE END CFG_Task_Id_With_NO_HCI_Cmd_t */
+  CFG_LAST_TASK_ID_WITH_NO_HCICMD                                            /**< Shall be LAST in the list */
+} CFG_Task_Id_With_NO_HCI_Cmd_t;
+
+#define CFG_TASK_NBR    CFG_LAST_TASK_ID_WITH_NO_HCICMD
+
+/**
+ * This is the list of priority required by the application
+ * Each Id shall be in the range 0..31
+ */
+typedef enum
+{
+  CFG_SCH_PRIO_0,
+  /* USER CODE BEGIN CFG_SCH_Prio_Id_t */
+
+  /* USER CODE END CFG_SCH_Prio_Id_t */
+  CFG_SCH_PRIO_NBR
+} CFG_SCH_Prio_Id_t;
+
+/**
+ * This is a bit mapping over 32bits listing all events id supported in the application
+ */
+typedef enum
+{
+  CFG_IDLEEVT_SYSTEM_HCI_CMD_EVT_RSP_ID,
+  /* USER CODE BEGIN CFG_IdleEvt_Id_t */
+
+  /* USER CODE END CFG_IdleEvt_Id_t */
+} CFG_IdleEvt_Id_t;
+
+/******************************************************************************
+ * LOW POWER
+ ******************************************************************************/
+/**
+ * Supported requester to the MCU Low Power Manager - can be increased up  to 32
+ * It list a bit mapping of all user of the Low Power Manager
+ */
+typedef enum
+{
+  CFG_LPM_APP,
+  CFG_LPM_APP_BLE,
+  /* USER CODE BEGIN CFG_LPM_Id_t */
+
+  /* USER CODE END CFG_LPM_Id_t */
+} CFG_LPM_Id_t;
+
+/******************************************************************************
+ * OTP manager
+ ******************************************************************************/
+#define CFG_OTP_BASE_ADDRESS    OTP_AREA_BASE
+
+#define CFG_OTP_END_ADRESS      OTP_AREA_END_ADDR
+
+#endif
+#endif /*APP_CONF_DEFAULT_H */
diff --git a/src/utility/STM32_WPAN/ble_bufsize.h b/src/utility/STM32_WPAN/ble_bufsize.h
new file mode 100644
index 00000000..26551c09
--- /dev/null
+++ b/src/utility/STM32_WPAN/ble_bufsize.h
@@ -0,0 +1,182 @@
+/*****************************************************************************
+ * @file    ble_bufsize.h
+ *
+ * @brief   Definition of BLE stack buffers size
+ *****************************************************************************
+ * @attention
+ *
+ * Copyright (c) 2018-2025 STMicroelectronics.
+ * All rights reserved.
+ *
+ * This software is licensed under terms that can be found in the LICENSE file
+ * in the root directory of this software component.
+ * If no LICENSE file comes with this software, it is provided AS-IS.
+ *
+ *****************************************************************************
+ */
+
+#ifndef BLE_BUFSIZE_H__
+#define BLE_BUFSIZE_H__
+
+
+/*
+ * BLE_DEFAULT_ATT_MTU: minimum MTU value that GATT must support.
+ */
+#define BLE_DEFAULT_ATT_MTU                  23
+
+/*
+ * BLE_DEFAULT_MAX_ATT_SIZE: maximum attribute size.
+ */
+#define BLE_DEFAULT_MAX_ATT_SIZE            512
+
+/*
+ * BLE_PREP_WRITE_X_ATT: compute how many Prepare Write Request are needed to
+ * write a characteristic with size 'max_att' when the used ATT_MTU value is
+ * equal to BLE_DEFAULT_ATT_MTU (23).
+ */
+#define BLE_PREP_WRITE_X_ATT(max_att) \
+        (DIVC(max_att, BLE_DEFAULT_ATT_MTU - 5) * 2)
+
+/*
+ * BLE_DEFAULT_PREP_WRITE_LIST_SIZE: default minimum Prepare Write List size.
+ */
+#define BLE_DEFAULT_PREP_WRITE_LIST_SIZE \
+        BLE_PREP_WRITE_X_ATT(BLE_DEFAULT_MAX_ATT_SIZE)
+
+/*
+ * BLE_MEM_BLOCK_X_MTU: compute how many memory blocks are needed to compose
+ * an ATT packet with ATT_MTU=mtu.
+ */
+#define BLE_MEM_BLOCK_SIZE                   32
+
+#if (SLAVE_ONLY != 0) || (BASIC_FEATURES != 0)
+#define BLE_MEM_BLOCK_X_PTX(n_link)           0
+#else
+#define BLE_MEM_BLOCK_X_PTX(n_link)           (n_link)
+#endif
+
+#define BLE_MEM_BLOCK_X_TX(mtu) \
+        (DIVC((mtu) + 4U, BLE_MEM_BLOCK_SIZE) + 1)
+
+#define BLE_MEM_BLOCK_X_RX(mtu, n_link) \
+        ((DIVC((mtu) + 4U, BLE_MEM_BLOCK_SIZE) + 2U) * (n_link) + 1)
+
+#define BLE_MEM_BLOCK_X_MTU(mtu, n_link) \
+        (BLE_MEM_BLOCK_X_TX(mtu) + BLE_MEM_BLOCK_X_PTX(n_link) + \
+         BLE_MEM_BLOCK_X_RX(mtu, n_link))
+
+/*
+ * BLE_MBLOCKS_SECURE_CONNECTIONS: minimum number of blocks required for
+ * secure connections
+ */
+#define BLE_MBLOCKS_SECURE_CONNECTIONS        4
+
+/*
+ * BLE_MBLOCKS_CALC: minimum number of buffers needed by the stack.
+ * This is the minimum racomanded value and depends on:
+ *  - pw: size of Prepare Write List
+ *  - mtu: ATT_MTU size
+ *  - n_link: maximum number of simultaneous connections
+ */
+#define BLE_MBLOCKS_CALC(pw, mtu, n_link) \
+        ((pw) + MAX(BLE_MEM_BLOCK_X_MTU(mtu, n_link), \
+                    BLE_MBLOCKS_SECURE_CONNECTIONS))
+
+/*
+ * BLE_FIXED_BUFFER_SIZE_BYTES:
+ * A part of the RAM, is dynamically allocated by initializing all the pointers
+ * defined in a global context variable "mem_alloc_ctx_p".
+ * This initialization is made in the Dynamic_allocator functions, which
+ * assign a portion of RAM given by the external application to the above
+ * mentioned "global pointers".
+ *
+ * The size of this Dynamic RAM is made of 2 main components:
+ * - a part that is parameters-dependent (num of links, GATT buffers, ...),
+ *   and which value is made explicit by the following macro;
+ * - a part, that may be considered "fixed", i.e. independent from the above
+ *   mentioned parameters.
+*/
+#if (BEACON_ONLY != 0)
+#define BLE_FIXED_BUFFER_SIZE_BYTES  4200   /* Beacon only */
+#elif (LL_ONLY_BASIC != 0)
+#define BLE_FIXED_BUFFER_SIZE_BYTES  6040   /* LL only Basic*/
+#elif (LL_ONLY != 0)
+#define BLE_FIXED_BUFFER_SIZE_BYTES  6288   /* LL only Full */
+#elif (SLAVE_ONLY != 0)
+#define BLE_FIXED_BUFFER_SIZE_BYTES  6408   /* Peripheral only */
+#elif (BASIC_FEATURES != 0)
+#define BLE_FIXED_BUFFER_SIZE_BYTES  7184   /* Basic Features */
+#else
+#define BLE_FIXED_BUFFER_SIZE_BYTES  7468   /* Full stack */
+#endif
+
+/*
+ * BLE_PER_LINK_SIZE_BYTES: additional memory size used per link
+ */
+#if (BEACON_ONLY != 0)
+#define BLE_PER_LINK_SIZE_BYTES        76   /* Beacon only */
+#elif (LL_ONLY_BASIC != 0)
+#define BLE_PER_LINK_SIZE_BYTES       244   /* LL only Basic */
+#elif (LL_ONLY != 0)
+#define BLE_PER_LINK_SIZE_BYTES       244   /* LL only Full */
+#elif (SLAVE_ONLY != 0)
+#define BLE_PER_LINK_SIZE_BYTES       392   /* Peripheral only */
+#elif (BASIC_FEATURES != 0)
+#define BLE_PER_LINK_SIZE_BYTES       420   /* Basic Features */
+#else
+#define BLE_PER_LINK_SIZE_BYTES       432   /* Full stack */
+#endif
+
+/*
+ * BLE_TOTAL_BUFFER_SIZE: this macro returns the amount of memory, in bytes,
+ * needed for the storage of data structures (except GATT database elements)
+ * whose size depends on the number of supported connections.
+ *
+ * @param n_link: Maximum number of simultaneous connections that the device
+ * will support. Valid values are from 1 to 8.
+ *
+ * @param mblocks_count: Number of memory blocks allocated for packets.
+ */
+#define BLE_TOTAL_BUFFER_SIZE(n_link, mblocks_count) \
+        (16 + BLE_FIXED_BUFFER_SIZE_BYTES + \
+         (BLE_PER_LINK_SIZE_BYTES * (n_link)) + \
+         ((BLE_MEM_BLOCK_SIZE + 8) * (mblocks_count)))
+
+/*
+ * BLE_EXT_ADV_BUFFER_SIZE
+ * additional memory size used for Extended advertising;
+ * It has to be added to BLE_TOTAL_BUFFER_SIZE() if the Extended advertising
+ * feature is used.
+ *
+ * @param set_nbr: Maximum number of advertising sets.
+ * Valid values are from 1 to 8.
+ *
+ * @param data_len: Maximum size of advertising data.
+ * Valid values are from 31 to 1650.
+ */
+#define BLE_EXT_ADV_BUFFER_SIZE(set_nbr, data_len) \
+        (2512 + ((892 + (DIVC(data_len, 207) * 244)) * (set_nbr)))
+
+/*
+ * BLE_TOTAL_BUFFER_SIZE_GATT: this macro returns the amount of memory,
+ * in bytes, needed for the storage of GATT database elements.
+ *
+ * @param num_gatt_attributes: Maximum number of Attributes (i.e. the number
+ * of characteristic + the number of characteristic values + the number of
+ * descriptors, excluding the services) that can be stored in the GATT
+ * database. Note that certain characteristics and relative descriptors are
+ * added automatically during device initialization so this parameters should
+ * be 9 plus the number of user Attributes
+ *
+ * @param num_gatt_services: Maximum number of Services that can be stored in
+ * the GATT database. Note that the GAP and GATT services are automatically
+ * added so this parameter should be 2 plus the number of user services
+ *
+ * @param att_value_array_size: Size of the storage area for Attribute values.
+  */
+#define BLE_TOTAL_BUFFER_SIZE_GATT(num_gatt_attributes, num_gatt_services, att_value_array_size) \
+        (((((att_value_array_size) - 1) | 3) + 1) + \
+         (40 * (num_gatt_attributes)) + (48 * (num_gatt_services)))
+
+
+#endif /* BLE_BUFSIZE_H__ */
diff --git a/src/utility/STM32_WPAN/hw.h b/src/utility/STM32_WPAN/hw.h
new file mode 100644
index 00000000..1472a5e8
--- /dev/null
+++ b/src/utility/STM32_WPAN/hw.h
@@ -0,0 +1,114 @@
+/**
+  ******************************************************************************
+  * @file    hw.h
+  * @author  MCD Application Team
+  * @brief   Hardware
+  ******************************************************************************
+   * @attention
+  *
+  * Copyright (c) 2018-2021 STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
+ */
+
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __HW_H
+#define __HW_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+  /* Includes ------------------------------------------------------------------*/
+#include "stm32_def.h"
+#include "stm32wbxx_ll_bus.h"
+#include "stm32wbxx_ll_exti.h"
+#include "stm32wbxx_ll_system.h"
+#include "stm32wbxx_ll_rcc.h"
+#include "stm32wbxx_ll_ipcc.h"
+#include "stm32wbxx_ll_cortex.h"
+#include "stm32wbxx_ll_utils.h"
+#include "stm32wbxx_ll_pwr.h"
+
+  /******************************************************************************
+   * HW IPCC
+   ******************************************************************************/
+  void HW_IPCC_Enable( void );
+  void HW_IPCC_Init( void );
+#define HW_IPCC_Rx_Handler IPCC_C1_RX_IRQHandler
+#define HW_IPCC_Tx_Handler IPCC_C1_TX_IRQHandler
+
+  void HW_IPCC_BLE_Init( void );
+  void HW_IPCC_BLE_SendCmd( void );
+  void HW_IPCC_MM_SendFreeBuf( void (*cb)( void ) );
+  void HW_IPCC_BLE_RxEvtNot( void );
+  void HW_IPCC_BLE_SendAclData( void );
+  void HW_IPCC_BLE_AclDataAckNot( void );
+
+  void HW_IPCC_SYS_Init( void );
+  void HW_IPCC_SYS_SendCmd( void );
+  void HW_IPCC_SYS_CmdEvtNot( void );
+  void HW_IPCC_SYS_EvtNot( void );
+
+  void HW_IPCC_THREAD_Init( void );
+  void HW_IPCC_OT_SendCmd( void );
+  void HW_IPCC_CLI_SendCmd( void );
+  void HW_IPCC_THREAD_SendAck( void );
+  void HW_IPCC_OT_CmdEvtNot( void );
+  void HW_IPCC_CLI_CmdEvtNot( void );
+  void HW_IPCC_THREAD_EvtNot( void );
+  void HW_IPCC_THREAD_CliSendAck( void );
+  void HW_IPCC_THREAD_CliEvtNot( void );
+
+
+  void HW_IPCC_LLDTESTS_Init( void );
+  void HW_IPCC_LLDTESTS_SendCliCmd( void );
+  void HW_IPCC_LLDTESTS_ReceiveCliRsp( void );
+  void HW_IPCC_LLDTESTS_SendCliRspAck( void );
+  void HW_IPCC_LLDTESTS_ReceiveM0Cmd( void );
+  void HW_IPCC_LLDTESTS_SendM0CmdAck( void );
+
+
+  void HW_IPCC_BLE_LLD_Init( void );
+  void HW_IPCC_BLE_LLD_SendCliCmd( void );
+  void HW_IPCC_BLE_LLD_ReceiveCliRsp( void );
+  void HW_IPCC_BLE_LLD_SendCliRspAck( void );
+  void HW_IPCC_BLE_LLD_ReceiveM0Cmd( void );
+  void HW_IPCC_BLE_LLD_SendM0CmdAck( void );
+  void HW_IPCC_BLE_LLD_SendCmd( void );
+  void HW_IPCC_BLE_LLD_ReceiveRsp( void );
+  void HW_IPCC_BLE_LLD_SendRspAck( void );
+
+
+  void HW_IPCC_TRACES_Init( void );
+  void HW_IPCC_TRACES_EvtNot( void );
+
+  void HW_IPCC_MAC_802_15_4_Init( void );
+  void HW_IPCC_MAC_802_15_4_SendCmd( void );
+  void HW_IPCC_MAC_802_15_4_SendAck( void );
+  void HW_IPCC_MAC_802_15_4_CmdEvtNot( void );
+  void HW_IPCC_MAC_802_15_4_EvtNot( void );
+
+  void HW_IPCC_ZIGBEE_Init( void );
+
+  void HW_IPCC_ZIGBEE_SendM4RequestToM0(void); /* M4 Request to M0 */
+  void HW_IPCC_ZIGBEE_RecvAppliAckFromM0(void); /* Request ACK from M0 */
+
+  void HW_IPCC_ZIGBEE_RecvM0NotifyToM4(void); /* M0 Notify to M4 */
+  void HW_IPCC_ZIGBEE_SendM4AckToM0Notify(void); /* Notify ACK from M4 */
+  void HW_IPCC_ZIGBEE_RecvM0RequestToM4(void); /* M0 Request to M4 */
+  void HW_IPCC_ZIGBEE_SendM4AckToM0Request(void); /* Request ACK from M4 */
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__HW_H */
+
diff --git a/src/utility/STM32_WPAN/hw_ipcc.c b/src/utility/STM32_WPAN/hw_ipcc.c
new file mode 100644
index 00000000..ad3c9d4c
--- /dev/null
+++ b/src/utility/STM32_WPAN/hw_ipcc.c
@@ -0,0 +1,749 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    hw_ipcc.c
+  * @author  MCD Application Team
+  * @brief   Hardware IPCC source file for STM32WPAN Middleware.
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2020-2021 STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+#if defined(STM32WBxx)
+/* Includes ------------------------------------------------------------------*/
+#include "hw.h"
+#include "mbox_def.h"
+#include "utilities_conf.h"
+
+/* Global variables ---------------------------------------------------------*/
+/* Private defines -----------------------------------------------------------*/
+#define HW_IPCC_TX_PENDING( channel ) ( !(LL_C1_IPCC_IsActiveFlag_CHx( IPCC, channel )) ) &&  (((~(IPCC->C1MR)) & (channel << 16U)))
+#define HW_IPCC_RX_PENDING( channel )  (LL_C2_IPCC_IsActiveFlag_CHx( IPCC, channel )) && (((~(IPCC->C1MR)) & (channel << 0U)))
+
+/* Private macros ------------------------------------------------------------*/
+/* Private typedef -----------------------------------------------------------*/
+/* Private variables ---------------------------------------------------------*/
+static void (*FreeBufCb)( void );
+
+/* Private function prototypes -----------------------------------------------*/
+static void HW_IPCC_BLE_EvtHandler( void );
+static void HW_IPCC_BLE_AclDataEvtHandler( void );
+static void HW_IPCC_MM_FreeBufHandler( void );
+static void HW_IPCC_SYS_CmdEvtHandler( void );
+static void HW_IPCC_SYS_EvtHandler( void );
+static void HW_IPCC_TRACES_EvtHandler( void );
+
+#ifdef THREAD_WB
+static void HW_IPCC_OT_CmdEvtHandler( void );
+static void HW_IPCC_THREAD_NotEvtHandler( void );
+static void HW_IPCC_THREAD_CliNotEvtHandler( void );
+#endif
+
+#ifdef LLD_TESTS_WB
+static void HW_IPCC_LLDTESTS_ReceiveCliRspHandler( void );
+static void HW_IPCC_LLDTESTS_ReceiveM0CmdHandler( void );
+#endif
+#ifdef LLD_BLE_WB
+/*static void HW_IPCC_LLD_BLE_ReceiveCliRspHandler( void );*/
+static void HW_IPCC_LLD_BLE_ReceiveRspHandler( void );
+static void HW_IPCC_LLD_BLE_ReceiveM0CmdHandler( void );
+#endif
+
+#ifdef MAC_802_15_4_WB
+static void HW_IPCC_MAC_802_15_4_CmdEvtHandler( void );
+static void HW_IPCC_MAC_802_15_4_NotEvtHandler( void );
+#endif
+
+#ifdef ZIGBEE_WB
+static void HW_IPCC_ZIGBEE_CmdEvtHandler( void );
+static void HW_IPCC_ZIGBEE_StackNotifEvtHandler( void );
+static void HW_IPCC_ZIGBEE_StackM0RequestHandler( void );
+#endif
+
+/* Public function definition -----------------------------------------------*/
+
+/******************************************************************************
+ * INTERRUPT HANDLER
+ ******************************************************************************/
+void HW_IPCC_Rx_Handler( void )
+{
+  if (HW_IPCC_RX_PENDING( HW_IPCC_SYSTEM_EVENT_CHANNEL ))
+  {
+      HW_IPCC_SYS_EvtHandler();
+  }
+#ifdef MAC_802_15_4_WB
+  else if (HW_IPCC_RX_PENDING( HW_IPCC_MAC_802_15_4_NOTIFICATION_ACK_CHANNEL ))
+  {
+    HW_IPCC_MAC_802_15_4_NotEvtHandler();
+  }
+#endif /* MAC_802_15_4_WB */
+#ifdef THREAD_WB
+  else if (HW_IPCC_RX_PENDING( HW_IPCC_THREAD_NOTIFICATION_ACK_CHANNEL ))
+  {
+    HW_IPCC_THREAD_NotEvtHandler();
+  }
+  else if (HW_IPCC_RX_PENDING( HW_IPCC_THREAD_CLI_NOTIFICATION_ACK_CHANNEL ))
+  {
+    HW_IPCC_THREAD_CliNotEvtHandler();
+  }
+#endif /* THREAD_WB */
+#ifdef LLD_TESTS_WB
+  else if (HW_IPCC_RX_PENDING( HW_IPCC_LLDTESTS_CLI_RSP_CHANNEL ))
+  {
+    HW_IPCC_LLDTESTS_ReceiveCliRspHandler();
+  }
+  else if (HW_IPCC_RX_PENDING( HW_IPCC_LLDTESTS_M0_CMD_CHANNEL ))
+  {
+    HW_IPCC_LLDTESTS_ReceiveM0CmdHandler();
+  }
+#endif /* LLD_TESTS_WB */
+#ifdef LLD_BLE_WB
+  else if (HW_IPCC_RX_PENDING( HW_IPCC_LLD_BLE_RSP_CHANNEL ))
+  {
+    HW_IPCC_LLD_BLE_ReceiveRspHandler();
+  }
+  else if (HW_IPCC_RX_PENDING( HW_IPCC_LLD_BLE_M0_CMD_CHANNEL ))
+  {
+    HW_IPCC_LLD_BLE_ReceiveM0CmdHandler();
+  }
+#endif /* LLD_TESTS_WB */
+#ifdef ZIGBEE_WB
+  else if (HW_IPCC_RX_PENDING( HW_IPCC_ZIGBEE_APPLI_NOTIF_ACK_CHANNEL ))
+  {
+    HW_IPCC_ZIGBEE_StackNotifEvtHandler();
+  }
+  else if (HW_IPCC_RX_PENDING( HW_IPCC_ZIGBEE_M0_REQUEST_CHANNEL ))
+  {
+    HW_IPCC_ZIGBEE_StackM0RequestHandler();
+  }
+#endif /* ZIGBEE_WB */
+  else if (HW_IPCC_RX_PENDING( HW_IPCC_BLE_EVENT_CHANNEL ))
+  {
+    HW_IPCC_BLE_EvtHandler();
+  }
+  else if (HW_IPCC_RX_PENDING( HW_IPCC_TRACES_CHANNEL ))
+  {
+    HW_IPCC_TRACES_EvtHandler();
+  }
+
+  return;
+}
+
+void HW_IPCC_Tx_Handler( void )
+{
+  if (HW_IPCC_TX_PENDING( HW_IPCC_SYSTEM_CMD_RSP_CHANNEL ))
+  {
+    HW_IPCC_SYS_CmdEvtHandler();
+  }
+#ifdef MAC_802_15_4_WB
+  else if (HW_IPCC_TX_PENDING( HW_IPCC_MAC_802_15_4_CMD_RSP_CHANNEL ))
+  {
+    HW_IPCC_MAC_802_15_4_CmdEvtHandler();
+  }
+#endif /* MAC_802_15_4_WB */
+#ifdef THREAD_WB
+  else if (HW_IPCC_TX_PENDING( HW_IPCC_THREAD_OT_CMD_RSP_CHANNEL ))
+  {
+    HW_IPCC_OT_CmdEvtHandler();
+  }
+#endif /* THREAD_WB */
+#ifdef LLD_TESTS_WB
+// No TX handler for LLD tests
+#endif /* LLD_TESTS_WB */
+#ifdef ZIGBEE_WB
+  if (HW_IPCC_TX_PENDING( HW_IPCC_ZIGBEE_CMD_APPLI_CHANNEL ))
+  {
+      HW_IPCC_ZIGBEE_CmdEvtHandler();
+  }
+#endif /* ZIGBEE_WB */
+  else if (HW_IPCC_TX_PENDING( HW_IPCC_MM_RELEASE_BUFFER_CHANNEL ))
+  {
+    HW_IPCC_MM_FreeBufHandler();
+  }
+  else if (HW_IPCC_TX_PENDING( HW_IPCC_HCI_ACL_DATA_CHANNEL ))
+  {
+    HW_IPCC_BLE_AclDataEvtHandler();
+  }
+
+  return;
+}
+/******************************************************************************
+ * GENERAL
+ ******************************************************************************/
+void HW_IPCC_Enable( void )
+{
+  /**
+  * Such as IPCC IP available to the CPU2, it is required to keep the IPCC clock running
+  * when FUS is running on CPU2 and CPU1 enters deep sleep mode
+  */
+  LL_C2_AHB3_GRP1_EnableClock(LL_C2_AHB3_GRP1_PERIPH_IPCC);
+
+  /**
+  * When the device is out of standby, it is required to use the EXTI mechanism to wakeup CPU2
+  */
+  LL_EXTI_EnableRisingTrig_32_63( LL_EXTI_LINE_41 );
+  /* It is required to have at least a system clock cycle before a SEV after LL_EXTI_EnableRisingTrig_32_63() */
+  LL_C2_EXTI_EnableEvent_32_63( LL_EXTI_LINE_41 );
+
+  /**
+   * In case the SBSFU is implemented, it may have already set the C2BOOT bit to startup the CPU2.
+   * In that case, to keep the mechanism transparent to the user application, it shall call the system command
+   * SHCI_C2_Reinit( ) before jumping to the application.
+   * When the CPU2 receives that command, it waits for its event input to be set to restart the CPU2 firmware.
+   * This is required because once C2BOOT has been set once, a clear/set on C2BOOT has no effect.
+   * When SHCI_C2_Reinit( ) is not called, generating an event to the CPU2 does not have any effect
+   * So, by default, the application shall both set the event flag and set the C2BOOT bit.
+   */
+  __SEV( );       /* Set the internal event flag and send an event to the CPU2 */
+  __WFE( );       /* Clear the internal event flag */
+  LL_PWR_EnableBootC2( );
+
+  return;
+}
+
+void HW_IPCC_Init( void )
+{
+  LL_AHB3_GRP1_EnableClock( LL_AHB3_GRP1_PERIPH_IPCC );
+
+  LL_C1_IPCC_EnableIT_RXO( IPCC );
+  LL_C1_IPCC_EnableIT_TXF( IPCC );
+
+  HAL_NVIC_EnableIRQ(IPCC_C1_RX_IRQn);
+  HAL_NVIC_EnableIRQ(IPCC_C1_TX_IRQn);
+
+  return;
+}
+
+/******************************************************************************
+ * BLE
+ ******************************************************************************/
+void HW_IPCC_BLE_Init( void )
+{
+  UTILS_ENTER_CRITICAL_SECTION();
+  LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_BLE_EVENT_CHANNEL );
+  UTILS_EXIT_CRITICAL_SECTION();
+
+  return;
+}
+
+void HW_IPCC_BLE_SendCmd( void )
+{
+  LL_C1_IPCC_SetFlag_CHx( IPCC, HW_IPCC_BLE_CMD_CHANNEL );
+
+  return;
+}
+
+static void HW_IPCC_BLE_EvtHandler( void )
+{
+  HW_IPCC_BLE_RxEvtNot();
+
+  LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_BLE_EVENT_CHANNEL );
+
+  return;
+}
+
+void HW_IPCC_BLE_SendAclData( void )
+{
+  LL_C1_IPCC_SetFlag_CHx( IPCC, HW_IPCC_HCI_ACL_DATA_CHANNEL );
+  UTILS_ENTER_CRITICAL_SECTION();
+  LL_C1_IPCC_EnableTransmitChannel( IPCC, HW_IPCC_HCI_ACL_DATA_CHANNEL );
+  UTILS_EXIT_CRITICAL_SECTION();
+
+  return;
+}
+
+static void HW_IPCC_BLE_AclDataEvtHandler( void )
+{
+  UTILS_ENTER_CRITICAL_SECTION();
+  LL_C1_IPCC_DisableTransmitChannel( IPCC, HW_IPCC_HCI_ACL_DATA_CHANNEL );
+  UTILS_EXIT_CRITICAL_SECTION();
+
+  HW_IPCC_BLE_AclDataAckNot();
+
+  return;
+}
+
+__weak void HW_IPCC_BLE_AclDataAckNot( void ){};
+__weak void HW_IPCC_BLE_RxEvtNot( void ){};
+
+/******************************************************************************
+ * SYSTEM
+ ******************************************************************************/
+void HW_IPCC_SYS_Init( void )
+{
+  UTILS_ENTER_CRITICAL_SECTION();
+  LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_SYSTEM_EVENT_CHANNEL );
+  UTILS_EXIT_CRITICAL_SECTION();
+
+  return;
+}
+
+void HW_IPCC_SYS_SendCmd( void )
+{
+  LL_C1_IPCC_SetFlag_CHx( IPCC, HW_IPCC_SYSTEM_CMD_RSP_CHANNEL );
+  UTILS_ENTER_CRITICAL_SECTION();
+  LL_C1_IPCC_EnableTransmitChannel( IPCC, HW_IPCC_SYSTEM_CMD_RSP_CHANNEL );
+  UTILS_EXIT_CRITICAL_SECTION();
+
+  return;
+}
+
+static void HW_IPCC_SYS_CmdEvtHandler( void )
+{
+  UTILS_ENTER_CRITICAL_SECTION();
+  LL_C1_IPCC_DisableTransmitChannel( IPCC, HW_IPCC_SYSTEM_CMD_RSP_CHANNEL );
+  UTILS_EXIT_CRITICAL_SECTION();
+
+  HW_IPCC_SYS_CmdEvtNot();
+
+  return;
+}
+
+static void HW_IPCC_SYS_EvtHandler( void )
+{
+  HW_IPCC_SYS_EvtNot();
+
+  LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_SYSTEM_EVENT_CHANNEL );
+
+  return;
+}
+
+__weak void HW_IPCC_SYS_CmdEvtNot( void ){};
+__weak void HW_IPCC_SYS_EvtNot( void ){};
+
+/******************************************************************************
+ * MAC 802.15.4
+ ******************************************************************************/
+#ifdef MAC_802_15_4_WB
+void HW_IPCC_MAC_802_15_4_Init( void )
+{
+  UTILS_ENTER_CRITICAL_SECTION();
+  LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_MAC_802_15_4_NOTIFICATION_ACK_CHANNEL );
+  UTILS_EXIT_CRITICAL_SECTION();
+
+  return;
+}
+
+void HW_IPCC_MAC_802_15_4_SendCmd( void )
+{
+  LL_C1_IPCC_SetFlag_CHx( IPCC, HW_IPCC_MAC_802_15_4_CMD_RSP_CHANNEL );
+  UTILS_ENTER_CRITICAL_SECTION();
+  LL_C1_IPCC_EnableTransmitChannel( IPCC, HW_IPCC_MAC_802_15_4_CMD_RSP_CHANNEL );
+  UTILS_EXIT_CRITICAL_SECTION();
+
+  return;
+}
+
+void HW_IPCC_MAC_802_15_4_SendAck( void )
+{
+  LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_MAC_802_15_4_NOTIFICATION_ACK_CHANNEL );
+  UTILS_ENTER_CRITICAL_SECTION();
+  LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_MAC_802_15_4_NOTIFICATION_ACK_CHANNEL );
+  UTILS_EXIT_CRITICAL_SECTION();
+
+  return;
+}
+
+static void HW_IPCC_MAC_802_15_4_CmdEvtHandler( void )
+{
+  UTILS_ENTER_CRITICAL_SECTION();
+  LL_C1_IPCC_DisableTransmitChannel( IPCC, HW_IPCC_MAC_802_15_4_CMD_RSP_CHANNEL );
+  UTILS_EXIT_CRITICAL_SECTION();
+
+  HW_IPCC_MAC_802_15_4_CmdEvtNot();
+
+  return;
+}
+
+static void HW_IPCC_MAC_802_15_4_NotEvtHandler( void )
+{
+  UTILS_ENTER_CRITICAL_SECTION();
+  LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_MAC_802_15_4_NOTIFICATION_ACK_CHANNEL );
+  UTILS_EXIT_CRITICAL_SECTION();
+
+  HW_IPCC_MAC_802_15_4_EvtNot();
+
+  return;
+}
+__weak void HW_IPCC_MAC_802_15_4_CmdEvtNot( void ){};
+__weak void HW_IPCC_MAC_802_15_4_EvtNot( void ){};
+#endif
+
+/******************************************************************************
+ * THREAD
+ ******************************************************************************/
+#ifdef THREAD_WB
+void HW_IPCC_THREAD_Init( void )
+{
+  UTILS_ENTER_CRITICAL_SECTION();
+  LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_THREAD_NOTIFICATION_ACK_CHANNEL );
+  LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_THREAD_CLI_NOTIFICATION_ACK_CHANNEL );
+  UTILS_EXIT_CRITICAL_SECTION();
+
+  return;
+}
+
+void HW_IPCC_OT_SendCmd( void )
+{
+  LL_C1_IPCC_SetFlag_CHx( IPCC, HW_IPCC_THREAD_OT_CMD_RSP_CHANNEL );
+  UTILS_ENTER_CRITICAL_SECTION();
+  LL_C1_IPCC_EnableTransmitChannel( IPCC, HW_IPCC_THREAD_OT_CMD_RSP_CHANNEL );
+  UTILS_EXIT_CRITICAL_SECTION();
+
+  return;
+}
+
+void HW_IPCC_CLI_SendCmd( void )
+{
+  LL_C1_IPCC_SetFlag_CHx( IPCC, HW_IPCC_THREAD_CLI_CMD_CHANNEL );
+
+  return;
+}
+
+void HW_IPCC_THREAD_SendAck( void )
+{
+  LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_THREAD_NOTIFICATION_ACK_CHANNEL );
+  UTILS_ENTER_CRITICAL_SECTION();
+  LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_THREAD_NOTIFICATION_ACK_CHANNEL );
+  UTILS_EXIT_CRITICAL_SECTION();
+
+  return;
+}
+
+void HW_IPCC_THREAD_CliSendAck( void )
+{
+  LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_THREAD_CLI_NOTIFICATION_ACK_CHANNEL );
+  UTILS_ENTER_CRITICAL_SECTION();
+  LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_THREAD_CLI_NOTIFICATION_ACK_CHANNEL );
+  UTILS_EXIT_CRITICAL_SECTION();
+
+  return;
+}
+
+static void HW_IPCC_OT_CmdEvtHandler( void )
+{
+  UTILS_ENTER_CRITICAL_SECTION();
+  LL_C1_IPCC_DisableTransmitChannel( IPCC, HW_IPCC_THREAD_OT_CMD_RSP_CHANNEL );
+  UTILS_EXIT_CRITICAL_SECTION();
+
+  HW_IPCC_OT_CmdEvtNot();
+
+  return;
+}
+
+static void HW_IPCC_THREAD_NotEvtHandler( void )
+{
+  UTILS_ENTER_CRITICAL_SECTION();
+  LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_THREAD_NOTIFICATION_ACK_CHANNEL );
+  UTILS_EXIT_CRITICAL_SECTION();
+
+  HW_IPCC_THREAD_EvtNot();
+
+  return;
+}
+
+static void HW_IPCC_THREAD_CliNotEvtHandler( void )
+{
+  UTILS_ENTER_CRITICAL_SECTION();
+  LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_THREAD_CLI_NOTIFICATION_ACK_CHANNEL );
+  UTILS_EXIT_CRITICAL_SECTION();
+
+  HW_IPCC_THREAD_CliEvtNot();
+
+  return;
+}
+
+__weak void HW_IPCC_OT_CmdEvtNot( void ){};
+__weak void HW_IPCC_CLI_CmdEvtNot( void ){};
+__weak void HW_IPCC_THREAD_EvtNot( void ){};
+
+#endif /* THREAD_WB */
+
+/******************************************************************************
+ * LLD TESTS
+ ******************************************************************************/
+#ifdef LLD_TESTS_WB
+void HW_IPCC_LLDTESTS_Init( void )
+{
+  UTILS_ENTER_CRITICAL_SECTION();
+  LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_LLDTESTS_CLI_RSP_CHANNEL );
+  LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_LLDTESTS_M0_CMD_CHANNEL );
+  UTILS_EXIT_CRITICAL_SECTION();
+  return;
+}
+
+void HW_IPCC_LLDTESTS_SendCliCmd( void )
+{
+  LL_C1_IPCC_SetFlag_CHx( IPCC, HW_IPCC_LLDTESTS_CLI_CMD_CHANNEL );
+  return;
+}
+
+static void HW_IPCC_LLDTESTS_ReceiveCliRspHandler( void )
+{
+  UTILS_ENTER_CRITICAL_SECTION();
+  LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_LLDTESTS_CLI_RSP_CHANNEL );
+  UTILS_EXIT_CRITICAL_SECTION();
+
+  HW_IPCC_LLDTESTS_ReceiveCliRsp();
+  return;
+}
+
+void HW_IPCC_LLDTESTS_SendCliRspAck( void )
+{
+  LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_LLDTESTS_CLI_RSP_CHANNEL );
+  UTILS_ENTER_CRITICAL_SECTION();
+  LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_LLDTESTS_CLI_RSP_CHANNEL );
+  UTILS_EXIT_CRITICAL_SECTION();
+  return;
+}
+
+static void HW_IPCC_LLDTESTS_ReceiveM0CmdHandler( void )
+{
+  UTILS_ENTER_CRITICAL_SECTION();
+  LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_LLDTESTS_M0_CMD_CHANNEL );
+  UTILS_EXIT_CRITICAL_SECTION();
+  HW_IPCC_LLDTESTS_ReceiveM0Cmd();
+  return;
+}
+
+void HW_IPCC_LLDTESTS_SendM0CmdAck( void )
+{
+  LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_LLDTESTS_M0_CMD_CHANNEL );
+  UTILS_ENTER_CRITICAL_SECTION();
+  LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_LLDTESTS_M0_CMD_CHANNEL );
+  UTILS_EXIT_CRITICAL_SECTION();
+  return;
+}
+__weak void HW_IPCC_LLDTESTS_ReceiveCliRsp( void ){};
+__weak void HW_IPCC_LLDTESTS_ReceiveM0Cmd( void ){};
+#endif /* LLD_TESTS_WB */
+
+/******************************************************************************
+ * LLD BLE
+ ******************************************************************************/
+#ifdef LLD_BLE_WB
+void HW_IPCC_LLD_BLE_Init( void )
+{
+  UTILS_ENTER_CRITICAL_SECTION();
+  LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_LLD_BLE_RSP_CHANNEL );
+  LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_LLD_BLE_M0_CMD_CHANNEL );
+  UTILS_EXIT_CRITICAL_SECTION();
+  return;
+}
+
+void HW_IPCC_LLD_BLE_SendCliCmd( void )
+{
+  LL_C1_IPCC_SetFlag_CHx( IPCC, HW_IPCC_LLD_BLE_CLI_CMD_CHANNEL );
+  return;
+}
+
+/*static void HW_IPCC_LLD_BLE_ReceiveCliRspHandler( void )
+{
+  UTILS_ENTER_CRITICAL_SECTION();
+  LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_LLD_BLE_CLI_RSP_CHANNEL );
+  UTILS_EXIT_CRITICAL_SECTION();
+  HW_IPCC_LLD_BLE_ReceiveCliRsp();
+  return;
+}*/
+
+void HW_IPCC_LLD_BLE_SendCliRspAck( void )
+{
+  LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_LLD_BLE_CLI_RSP_CHANNEL );
+  UTILS_ENTER_CRITICAL_SECTION();
+  LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_LLD_BLE_CLI_RSP_CHANNEL );
+  UTILS_EXIT_CRITICAL_SECTION();
+  return;
+}
+
+static void HW_IPCC_LLD_BLE_ReceiveM0CmdHandler( void )
+{
+  //LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_LLD_BLE_M0_CMD_CHANNEL );
+  HW_IPCC_LLD_BLE_ReceiveM0Cmd();
+  return;
+}
+
+void HW_IPCC_LLD_BLE_SendM0CmdAck( void )
+{
+  LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_LLD_BLE_M0_CMD_CHANNEL );
+  //LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_LLD_BLE_M0_CMD_CHANNEL );
+  return;
+}
+__weak void HW_IPCC_LLD_BLE_ReceiveCliRsp( void ){};
+__weak void HW_IPCC_LLD_BLE_ReceiveM0Cmd( void ){};
+
+/* Transparent Mode */
+void HW_IPCC_LLD_BLE_SendCmd( void )
+{
+  LL_C1_IPCC_SetFlag_CHx( IPCC, HW_IPCC_LLD_BLE_CMD_CHANNEL );
+  return;
+}
+
+static void HW_IPCC_LLD_BLE_ReceiveRspHandler( void )
+{
+  UTILS_ENTER_CRITICAL_SECTION();
+  LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_LLD_BLE_RSP_CHANNEL );
+  UTILS_EXIT_CRITICAL_SECTION();
+  HW_IPCC_LLD_BLE_ReceiveRsp();
+  return;
+}
+
+void HW_IPCC_LLD_BLE_SendRspAck( void )
+{
+  LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_LLD_BLE_RSP_CHANNEL );
+  UTILS_ENTER_CRITICAL_SECTION();
+  LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_LLD_BLE_RSP_CHANNEL );
+  UTILS_EXIT_CRITICAL_SECTION();
+  return;
+}
+
+#endif /* LLD_BLE_WB */
+
+/******************************************************************************
+ * ZIGBEE
+ ******************************************************************************/
+#ifdef ZIGBEE_WB
+void HW_IPCC_ZIGBEE_Init( void )
+{
+  UTILS_ENTER_CRITICAL_SECTION();
+  LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_ZIGBEE_APPLI_NOTIF_ACK_CHANNEL );
+  LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_ZIGBEE_M0_REQUEST_CHANNEL );
+  UTILS_EXIT_CRITICAL_SECTION();
+
+  return;
+}
+
+void HW_IPCC_ZIGBEE_SendM4RequestToM0( void )
+{
+  LL_C1_IPCC_SetFlag_CHx( IPCC, HW_IPCC_ZIGBEE_CMD_APPLI_CHANNEL );
+  UTILS_ENTER_CRITICAL_SECTION();
+  LL_C1_IPCC_EnableTransmitChannel( IPCC, HW_IPCC_ZIGBEE_CMD_APPLI_CHANNEL );
+  UTILS_EXIT_CRITICAL_SECTION();
+
+  return;
+}
+
+void HW_IPCC_ZIGBEE_SendM4AckToM0Notify( void )
+{
+  LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_ZIGBEE_APPLI_NOTIF_ACK_CHANNEL );
+  UTILS_ENTER_CRITICAL_SECTION();
+  LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_ZIGBEE_APPLI_NOTIF_ACK_CHANNEL );
+  UTILS_EXIT_CRITICAL_SECTION();
+
+  return;
+}
+
+static void HW_IPCC_ZIGBEE_CmdEvtHandler( void )
+{
+  UTILS_ENTER_CRITICAL_SECTION();
+  LL_C1_IPCC_DisableTransmitChannel( IPCC, HW_IPCC_ZIGBEE_CMD_APPLI_CHANNEL );
+  UTILS_EXIT_CRITICAL_SECTION();
+
+  HW_IPCC_ZIGBEE_RecvAppliAckFromM0();
+
+  return;
+}
+
+static void HW_IPCC_ZIGBEE_StackNotifEvtHandler( void )
+{
+  UTILS_ENTER_CRITICAL_SECTION();
+  LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_ZIGBEE_APPLI_NOTIF_ACK_CHANNEL );
+  UTILS_EXIT_CRITICAL_SECTION();
+
+  HW_IPCC_ZIGBEE_RecvM0NotifyToM4();
+
+  return;
+}
+
+static void HW_IPCC_ZIGBEE_StackM0RequestHandler( void )
+{
+  UTILS_ENTER_CRITICAL_SECTION();
+  LL_C1_IPCC_DisableReceiveChannel( IPCC, HW_IPCC_ZIGBEE_M0_REQUEST_CHANNEL );
+  UTILS_EXIT_CRITICAL_SECTION();
+
+  HW_IPCC_ZIGBEE_RecvM0RequestToM4();
+
+  return;
+}
+
+void HW_IPCC_ZIGBEE_SendM4AckToM0Request( void )
+{
+  LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_ZIGBEE_M0_REQUEST_CHANNEL );
+  UTILS_ENTER_CRITICAL_SECTION();
+  LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_ZIGBEE_M0_REQUEST_CHANNEL );
+  UTILS_EXIT_CRITICAL_SECTION();
+
+  return;
+}
+
+__weak void HW_IPCC_ZIGBEE_RecvAppliAckFromM0( void ){};
+__weak void HW_IPCC_ZIGBEE_RecvM0NotifyToM4( void ){};
+__weak void HW_IPCC_ZIGBEE_RecvM0RequestToM4( void ){};
+#endif /* ZIGBEE_WB */
+
+/******************************************************************************
+ * MEMORY MANAGER
+ ******************************************************************************/
+void HW_IPCC_MM_SendFreeBuf( void (*cb)( void ) )
+{
+  if ( LL_C1_IPCC_IsActiveFlag_CHx( IPCC, HW_IPCC_MM_RELEASE_BUFFER_CHANNEL ) )
+  {
+    FreeBufCb = cb;
+    UTILS_ENTER_CRITICAL_SECTION();
+    LL_C1_IPCC_EnableTransmitChannel( IPCC, HW_IPCC_MM_RELEASE_BUFFER_CHANNEL );
+    UTILS_EXIT_CRITICAL_SECTION();
+  }
+  else
+  {
+    cb();
+
+    LL_C1_IPCC_SetFlag_CHx( IPCC, HW_IPCC_MM_RELEASE_BUFFER_CHANNEL );
+  }
+
+  return;
+}
+
+static void HW_IPCC_MM_FreeBufHandler( void )
+{
+  UTILS_ENTER_CRITICAL_SECTION();
+  LL_C1_IPCC_DisableTransmitChannel( IPCC, HW_IPCC_MM_RELEASE_BUFFER_CHANNEL );
+  UTILS_EXIT_CRITICAL_SECTION();
+
+  FreeBufCb();
+
+  LL_C1_IPCC_SetFlag_CHx( IPCC, HW_IPCC_MM_RELEASE_BUFFER_CHANNEL );
+
+  return;
+}
+
+/******************************************************************************
+ * TRACES
+ ******************************************************************************/
+void HW_IPCC_TRACES_Init( void )
+{
+  UTILS_ENTER_CRITICAL_SECTION();
+  LL_C1_IPCC_EnableReceiveChannel( IPCC, HW_IPCC_TRACES_CHANNEL );
+  UTILS_EXIT_CRITICAL_SECTION();
+
+  return;
+}
+
+static void HW_IPCC_TRACES_EvtHandler( void )
+{
+  HW_IPCC_TRACES_EvtNot();
+
+  LL_C1_IPCC_ClearFlag_CHx( IPCC, HW_IPCC_TRACES_CHANNEL );
+
+  return;
+}
+
+__weak void HW_IPCC_TRACES_EvtNot( void ){};
+#endif /* STM32WBxx */
diff --git a/src/utility/STM32_WPAN/mbox_def.h b/src/utility/STM32_WPAN/mbox_def.h
new file mode 100644
index 00000000..68b71f9c
--- /dev/null
+++ b/src/utility/STM32_WPAN/mbox_def.h
@@ -0,0 +1,280 @@
+/**
+ ******************************************************************************
+ * @file    mbox_def.h
+ * @author  MCD Application Team
+ * @brief   Mailbox definition
+ ******************************************************************************
+ * @attention
+ *
+ * Copyright (c) 2018-2021 STMicroelectronics.
+ * All rights reserved.
+ *
+ * This software is licensed under terms that can be found in the LICENSE file
+ * in the root directory of this software component.
+ * If no LICENSE file comes with this software, it is provided AS-IS.
+ *
+ ******************************************************************************
+ */
+
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __MBOX_H
+#define __MBOX_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "stm32_wpan_common.h"
+
+  /**
+   * This file shall be identical between the CPU1 and the CPU2
+   */
+
+  /**
+   *********************************************************************************
+   * TABLES
+   *********************************************************************************
+   */
+
+  /**
+   * Version
+   * [0:3]   = Build - 0: Untracked - 15:Released - x: Tracked version
+   * [4:7]   = branch - 0: Mass Market - x: ...
+   * [8:15]  = Subversion
+   * [16:23] = Version minor
+   * [24:31] = Version major
+   *
+   * Memory Size
+   * [0:7]   = Flash ( Number of 4k sector)
+   * [8:15]  = Reserved ( Shall be set to 0 - may be used as flash extension )
+   * [16:23] = SRAM2b ( Number of 1k sector)
+   * [24:31] = SRAM2a ( Number of 1k sector)
+   */
+  typedef PACKED_STRUCT
+  {
+    uint32_t    Version;
+  } MB_SafeBootInfoTable_t;
+
+  typedef PACKED_STRUCT
+  {
+    uint32_t    Version;
+    uint32_t    MemorySize;
+    uint32_t    FusInfo;
+  } MB_FusInfoTable_t;
+
+  typedef PACKED_STRUCT
+  {
+    uint32_t    Version;
+    uint32_t    MemorySize;
+    uint32_t    InfoStack;
+    uint32_t    Reserved;
+  } MB_WirelessFwInfoTable_t;
+
+  typedef struct
+  {
+    MB_SafeBootInfoTable_t      SafeBootInfoTable;
+    MB_FusInfoTable_t           FusInfoTable;
+    MB_WirelessFwInfoTable_t    WirelessFwInfoTable;
+  } MB_DeviceInfoTable_t;
+
+  typedef struct
+  {
+    uint8_t     *pcmd_buffer;
+    uint8_t     *pcs_buffer;
+    uint8_t     *pevt_queue;
+    uint8_t     *phci_acl_data_buffer;
+  } MB_BleTable_t;
+
+  typedef struct
+  {
+    uint8_t   *notack_buffer;
+    uint8_t   *clicmdrsp_buffer;
+    uint8_t   *otcmdrsp_buffer;
+    uint8_t   *clinot_buffer;
+  } MB_ThreadTable_t;
+
+  typedef struct
+  {
+    uint8_t   *clicmdrsp_buffer;
+    uint8_t   *m0cmd_buffer;
+  } MB_LldTestsTable_t;
+
+  typedef struct
+  {
+    uint8_t   *cmdrsp_buffer;
+    uint8_t   *m0cmd_buffer;
+  } MB_BleLldTable_t;
+
+  typedef struct
+  {
+    uint8_t   *notifM0toM4_buffer;
+    uint8_t   *appliCmdM4toM0_buffer;
+    uint8_t   *requestM0toM4_buffer;
+  } MB_ZigbeeTable_t;
+  /**
+   * msg
+   * [0:7]   = cmd/evt
+   * [8:31] = Reserved
+   */
+  typedef struct
+  {
+    uint8_t   *pcmd_buffer;
+    uint8_t   *sys_queue;
+  } MB_SysTable_t;
+
+  typedef struct
+  {
+    uint8_t     *spare_ble_buffer;
+    uint8_t     *spare_sys_buffer;
+    uint8_t     *blepool;
+    uint32_t    blepoolsize;
+    uint8_t     *pevt_free_buffer_queue;
+    uint8_t     *traces_evt_pool;
+    uint32_t    tracespoolsize;
+  } MB_MemManagerTable_t;
+
+  typedef struct
+  {
+    uint8_t   *traces_queue;
+  } MB_TracesTable_t;
+
+  typedef struct
+  {
+    uint8_t   *p_cmdrsp_buffer;
+    uint8_t   *p_notack_buffer;
+    uint8_t   *evt_queue;
+  } MB_Mac_802_15_4_t;
+
+  typedef struct
+  {
+    MB_DeviceInfoTable_t    *p_device_info_table;
+    MB_BleTable_t           *p_ble_table;
+    MB_ThreadTable_t        *p_thread_table;
+    MB_SysTable_t           *p_sys_table;
+    MB_MemManagerTable_t    *p_mem_manager_table;
+    MB_TracesTable_t        *p_traces_table;
+    MB_Mac_802_15_4_t       *p_mac_802_15_4_table;
+    MB_ZigbeeTable_t        *p_zigbee_table;
+    MB_LldTestsTable_t      *p_lld_tests_table;
+    MB_BleLldTable_t        *p_ble_lld_table;
+} MB_RefTable_t;
+
+/**
+ * This table shall be used only in the case the CPU2 runs the FUS.
+ * It is used by the command SHCI_GetWirelessFwInfo()
+ */
+typedef struct
+{
+  uint32_t  DeviceInfoTableState;
+  uint8_t   Reserved1;
+  uint8_t   LastFusActiveState;
+  uint8_t   LastWirelessStackState;
+  uint8_t   CurrentWirelessStackType;
+  uint32_t  SafeBootVersion;
+  uint32_t  FusVersion;
+  uint32_t  FusMemorySize;
+  uint32_t  WirelessStackVersion;
+  uint32_t  WirelessStackMemorySize;
+  uint32_t  WirelessFirmwareBleInfo;
+  uint32_t  WirelessFirmwareThreadInfo;
+  uint32_t  Reserved2;
+  uint64_t  UID64;
+  uint16_t  DeviceId;
+} MB_FUS_DeviceInfoTable_t ;
+
+#ifdef __cplusplus
+}
+#endif
+
+/**
+ *********************************************************************************
+ * IPCC CHANNELS
+ *********************************************************************************
+ */
+
+/*  CPU1                                             CPU2
+ *   |             (SYSTEM)                            |
+ *   |----HW_IPCC_SYSTEM_CMD_RSP_CHANNEL-------------->|
+ *   |                                                 |
+ *   |<---HW_IPCC_SYSTEM_EVENT_CHANNEL-----------------|
+ *   |                                                 |
+ *   |            (ZIGBEE)                             |
+ *   |----HW_IPCC_ZIGBEE_CMD_APPLI_CHANNEL------------>|
+ *   |                                                 |
+ *   |----HW_IPCC_ZIGBEE_CMD_CLI_CHANNEL-------------->|
+ *   |                                                 |
+ *   |<---HW_IPCC_ZIGBEE_APPLI_NOTIF_ACK_CHANNEL-------|
+ *   |                                                 |
+ *   |<---HW_IPCC_ZIGBEE_CLI_NOTIF_ACK_CHANNEL---------|
+ *   |                                                 |
+ *   |             (THREAD)                            |
+ *   |----HW_IPCC_THREAD_OT_CMD_RSP_CHANNEL----------->|
+ *   |                                                 |
+ *   |----HW_IPCC_THREAD_CLI_CMD_CHANNEL-------------->|
+ *   |                                                 |
+ *   |<---HW_IPCC_THREAD_NOTIFICATION_ACK_CHANNEL------|
+ *   |                                                 |
+ *   |<---HW_IPCC_THREAD_CLI_NOTIFICATION_ACK_CHANNEL--|
+ *   |                                                 |
+ *   |             (BLE)                               |
+ *   |----HW_IPCC_BLE_CMD_CHANNEL--------------------->|
+ *   |                                                 |
+ *   |----HW_IPCC_HCI_ACL_DATA_CHANNEL---------------->|
+ *   |                                                 |
+ *   |<---HW_IPCC_BLE_EVENT_CHANNEL--------------------|
+ *   |                                                 |
+ *   |             (BLE LLD)                           |
+ *   |----HW_IPCC_BLE_LLD_CMD_CHANNEL----------------->|
+ *   |                                                 |
+ *   |<---HW_IPCC_BLE_LLD_RSP_CHANNEL------------------|
+ *   |                                                 |
+ *   |<---HW_IPCC_BLE_LLD_M0_CMD_CHANNEL---------------|
+ *   |                                                 |
+ *   |             (MAC)                               |
+ *   |----HW_IPCC_MAC_802_15_4_CMD_RSP_CHANNEL-------->|
+ *   |                                                 |
+ *   |<---HW_IPCC_MAC_802_15_4_NOTIFICATION_ACK_CHANNEL|
+ *   |                                                 |
+ *   |             (BUFFER)                            |
+ *   |----HW_IPCC_MM_RELEASE_BUFFER_CHANNE------------>|
+ *   |                                                 |
+ *   |             (TRACE)                             |
+ *   |<----HW_IPCC_TRACES_CHANNEL----------------------|
+ *   |                                                 |
+ *
+ *
+ *
+ */
+
+
+
+/** CPU1 */
+#define HW_IPCC_BLE_CMD_CHANNEL                         LL_IPCC_CHANNEL_1
+#define HW_IPCC_SYSTEM_CMD_RSP_CHANNEL                  LL_IPCC_CHANNEL_2
+#define HW_IPCC_THREAD_OT_CMD_RSP_CHANNEL               LL_IPCC_CHANNEL_3
+#define HW_IPCC_ZIGBEE_CMD_APPLI_CHANNEL                LL_IPCC_CHANNEL_3
+#define HW_IPCC_MAC_802_15_4_CMD_RSP_CHANNEL            LL_IPCC_CHANNEL_3
+#define HW_IPCC_MM_RELEASE_BUFFER_CHANNEL               LL_IPCC_CHANNEL_4
+#define HW_IPCC_THREAD_CLI_CMD_CHANNEL                  LL_IPCC_CHANNEL_5
+#define HW_IPCC_LLDTESTS_CLI_CMD_CHANNEL                LL_IPCC_CHANNEL_5
+#define HW_IPCC_BLE_LLD_CLI_CMD_CHANNEL                 LL_IPCC_CHANNEL_5
+#define HW_IPCC_BLE_LLD_CMD_CHANNEL                     LL_IPCC_CHANNEL_5
+#define HW_IPCC_HCI_ACL_DATA_CHANNEL                    LL_IPCC_CHANNEL_6
+
+/** CPU2 */
+#define HW_IPCC_BLE_EVENT_CHANNEL                       LL_IPCC_CHANNEL_1
+#define HW_IPCC_SYSTEM_EVENT_CHANNEL                    LL_IPCC_CHANNEL_2
+#define HW_IPCC_THREAD_NOTIFICATION_ACK_CHANNEL         LL_IPCC_CHANNEL_3
+#define HW_IPCC_ZIGBEE_APPLI_NOTIF_ACK_CHANNEL          LL_IPCC_CHANNEL_3
+#define HW_IPCC_MAC_802_15_4_NOTIFICATION_ACK_CHANNEL   LL_IPCC_CHANNEL_3
+#define HW_IPCC_LLDTESTS_M0_CMD_CHANNEL                 LL_IPCC_CHANNEL_3
+#define HW_IPCC_BLE_LLD_M0_CMD_CHANNEL                  LL_IPCC_CHANNEL_3
+#define HW_IPCC_TRACES_CHANNEL                          LL_IPCC_CHANNEL_4
+#define HW_IPCC_THREAD_CLI_NOTIFICATION_ACK_CHANNEL     LL_IPCC_CHANNEL_5
+#define HW_IPCC_LLDTESTS_CLI_RSP_CHANNEL                LL_IPCC_CHANNEL_5
+#define HW_IPCC_BLE_LLD_CLI_RSP_CHANNEL                 LL_IPCC_CHANNEL_5
+#define HW_IPCC_BLE_LLD_RSP_CHANNEL                     LL_IPCC_CHANNEL_5
+#define HW_IPCC_ZIGBEE_M0_REQUEST_CHANNEL               LL_IPCC_CHANNEL_5
+#endif /*__MBOX_H */
+
diff --git a/src/utility/STM32_WPAN/shci.c b/src/utility/STM32_WPAN/shci.c
new file mode 100644
index 00000000..40110f42
--- /dev/null
+++ b/src/utility/STM32_WPAN/shci.c
@@ -0,0 +1,763 @@
+/**
+ ******************************************************************************
+ * @file    shci.c
+ * @author  MCD Application Team
+ * @brief   HCI command for the system channel
+ ******************************************************************************
+ * @attention
+ *
+ * Copyright (c) 2018-2021 STMicroelectronics.
+ * All rights reserved.
+ *
+ * This software is licensed under terms that can be found in the LICENSE file
+ * in the root directory of this software component.
+ * If no LICENSE file comes with this software, it is provided AS-IS.
+ *
+ ******************************************************************************
+ */
+
+
+#if defined(STM32WBxx)
+/* Includes ------------------------------------------------------------------*/
+#include "stm32_wpan_common.h"
+
+#include "shci_tl.h"
+#include "shci.h"
+#include "stm32wbxx.h"
+
+/* Private typedef -----------------------------------------------------------*/
+/* Private defines -----------------------------------------------------------*/
+/* Private macros ------------------------------------------------------------*/
+/* Private variables ---------------------------------------------------------*/
+/* Global variables ----------------------------------------------------------*/
+/* Private function prototypes -----------------------------------------------*/
+/* Local Functions Definition ------------------------------------------------------*/
+/* Public Functions Definition ------------------------------------------------------*/
+
+/**
+ *  C2 COMMAND
+ *  These commands are sent to the CPU2
+ */
+uint8_t SHCI_C2_FUS_GetState( SHCI_FUS_GetState_ErrorCode_t *p_error_code )
+{
+  /**
+   * Buffer is large enough to hold command complete with payload
+   */
+  uint8_t local_buffer[TL_BLEEVT_CC_BUFFER_SIZE + 1];
+  TL_EvtPacket_t * p_rsp;
+
+  p_rsp = (TL_EvtPacket_t *)local_buffer;
+
+  shci_send( SHCI_OPCODE_C2_FUS_GET_STATE,
+             0,
+             0,
+             p_rsp );
+
+  if(p_error_code != 0)
+  {
+    *p_error_code = (SHCI_FUS_GetState_ErrorCode_t)(((TL_CcEvt_t*)(p_rsp->evtserial.evt.payload))->payload[1]);
+  }
+
+  return (((TL_CcEvt_t*)(p_rsp->evtserial.evt.payload))->payload[0]);
+}
+
+SHCI_CmdStatus_t SHCI_C2_FUS_FwUpgrade( uint32_t fw_src_add,  uint32_t fw_dest_add )
+{
+  /**
+   * TL_BLEEVT_CC_BUFFER_SIZE is 16 bytes so it is large enough to hold the 8 bytes of command parameters
+   * Buffer is large enough to hold command complete without payload
+   */
+  uint8_t local_buffer[TL_BLEEVT_CC_BUFFER_SIZE];
+  TL_EvtPacket_t * p_rsp;
+  uint32_t *p_cmd;
+  uint8_t cmd_length;
+
+  p_cmd = (uint32_t*)local_buffer;
+  cmd_length = 0;
+
+  if(fw_src_add != 0)
+  {
+    *p_cmd = fw_src_add;
+    cmd_length += 4;
+  }
+
+  if(fw_dest_add != 0)
+  {
+    *(p_cmd+1) = fw_dest_add;
+    cmd_length += 4;
+  }
+
+  p_rsp = (TL_EvtPacket_t *)local_buffer;
+
+  shci_send( SHCI_OPCODE_C2_FUS_FW_UPGRADE,
+             cmd_length,
+             local_buffer,
+             p_rsp );
+
+  return (SHCI_CmdStatus_t)(((TL_CcEvt_t*)(p_rsp->evtserial.evt.payload))->payload[0]);
+}
+
+SHCI_CmdStatus_t SHCI_C2_FUS_FwDelete( void )
+{
+  /**
+   * Buffer is large enough to hold command complete without payload
+   */
+  uint8_t local_buffer[TL_BLEEVT_CC_BUFFER_SIZE];
+  TL_EvtPacket_t * p_rsp;
+
+  p_rsp = (TL_EvtPacket_t *)local_buffer;
+
+  shci_send( SHCI_OPCODE_C2_FUS_FW_DELETE,
+             0,
+             0,
+             p_rsp );
+
+  return (SHCI_CmdStatus_t)(((TL_CcEvt_t*)(p_rsp->evtserial.evt.payload))->payload[0]);
+}
+
+SHCI_CmdStatus_t SHCI_C2_FUS_UpdateAuthKey( SHCI_C2_FUS_UpdateAuthKey_Cmd_Param_t *pParam )
+{
+  /**
+   * Buffer is large enough to hold command complete without payload
+   */
+  uint8_t local_buffer[TL_BLEEVT_CC_BUFFER_SIZE];
+  TL_EvtPacket_t * p_rsp;
+
+  p_rsp = (TL_EvtPacket_t *)local_buffer;
+
+  shci_send( SHCI_OPCODE_C2_FUS_UPDATE_AUTH_KEY,
+             sizeof( SHCI_C2_FUS_UpdateAuthKey_Cmd_Param_t ),
+             (uint8_t*)pParam,
+             p_rsp );
+
+  return (SHCI_CmdStatus_t)(((TL_CcEvt_t*)(p_rsp->evtserial.evt.payload))->payload[0]);
+}
+
+SHCI_CmdStatus_t SHCI_C2_FUS_LockAuthKey( void )
+{
+  /**
+   * Buffer is large enough to hold command complete without payload
+   */
+  uint8_t local_buffer[TL_BLEEVT_CC_BUFFER_SIZE];
+  TL_EvtPacket_t * p_rsp;
+
+  p_rsp = (TL_EvtPacket_t *)local_buffer;
+
+  shci_send( SHCI_OPCODE_C2_FUS_LOCK_AUTH_KEY,
+             0,
+             0,
+             p_rsp );
+
+  return (SHCI_CmdStatus_t)(((TL_CcEvt_t*)(p_rsp->evtserial.evt.payload))->payload[0]);
+}
+
+SHCI_CmdStatus_t SHCI_C2_FUS_StoreUsrKey( SHCI_C2_FUS_StoreUsrKey_Cmd_Param_t *pParam, uint8_t *p_key_index )
+{
+  /**
+   * Buffer is large enough to hold command complete with payload
+   */
+  uint8_t local_buffer[TL_BLEEVT_CC_BUFFER_SIZE + 1];
+  TL_EvtPacket_t * p_rsp;
+  uint8_t local_payload_len;
+
+  if(pParam->KeyType == KEYTYPE_ENCRYPTED)
+  {
+    /**
+     * When the key is encrypted, the 12 bytes IV Key is included in the payload as well
+     * The IV key is always 12 bytes
+     */
+    local_payload_len = pParam->KeySize + 2 + 12;
+  }
+  else
+  {
+    local_payload_len = pParam->KeySize + 2;
+  }
+
+  p_rsp = (TL_EvtPacket_t *)local_buffer;
+
+  shci_send( SHCI_OPCODE_C2_FUS_STORE_USR_KEY,
+             local_payload_len ,
+             (uint8_t*)pParam,
+             p_rsp );
+
+  *p_key_index = (((TL_CcEvt_t*)(p_rsp->evtserial.evt.payload))->payload[1]);
+
+  return (SHCI_CmdStatus_t)(((TL_CcEvt_t*)(p_rsp->evtserial.evt.payload))->payload[0]);
+}
+
+SHCI_CmdStatus_t SHCI_C2_FUS_LoadUsrKey( uint8_t key_index )
+{
+  /**
+   * Buffer is large enough to hold command complete without payload
+   */
+  uint8_t local_buffer[TL_BLEEVT_CC_BUFFER_SIZE];
+  TL_EvtPacket_t * p_rsp;
+
+  p_rsp = (TL_EvtPacket_t *)local_buffer;
+
+  local_buffer[0] = key_index;
+
+  shci_send( SHCI_OPCODE_C2_FUS_LOAD_USR_KEY,
+             1,
+             local_buffer,
+             p_rsp );
+
+  return (SHCI_CmdStatus_t)(((TL_CcEvt_t*)(p_rsp->evtserial.evt.payload))->payload[0]);
+}
+
+SHCI_CmdStatus_t SHCI_C2_FUS_StartWs( void )
+{
+  /**
+   * Buffer is large enough to hold command complete without payload
+   */
+  uint8_t local_buffer[TL_BLEEVT_CC_BUFFER_SIZE];
+  TL_EvtPacket_t * p_rsp;
+
+  p_rsp = (TL_EvtPacket_t *)local_buffer;
+
+  shci_send( SHCI_OPCODE_C2_FUS_START_WS,
+             0,
+             0,
+             p_rsp );
+
+  return (SHCI_CmdStatus_t)(((TL_CcEvt_t*)(p_rsp->evtserial.evt.payload))->payload[0]);
+}
+
+SHCI_CmdStatus_t SHCI_C2_FUS_LockUsrKey( uint8_t key_index )
+{
+  /**
+   * Buffer is large enough to hold command complete without payload
+   */
+  uint8_t local_buffer[TL_BLEEVT_CC_BUFFER_SIZE];
+  TL_EvtPacket_t * p_rsp;
+
+  p_rsp = (TL_EvtPacket_t *)local_buffer;
+
+  local_buffer[0] = key_index;
+
+  shci_send( SHCI_OPCODE_C2_FUS_LOCK_USR_KEY,
+             1,
+             local_buffer,
+             p_rsp );
+
+  return (SHCI_CmdStatus_t)(((TL_CcEvt_t*)(p_rsp->evtserial.evt.payload))->payload[0]);
+}
+
+SHCI_CmdStatus_t SHCI_C2_FUS_UnloadUsrKey( uint8_t key_index )
+{
+  /**
+   * Buffer is large enough to hold command complete without payload
+   */
+  uint8_t local_buffer[TL_BLEEVT_CC_BUFFER_SIZE];
+  TL_EvtPacket_t * p_rsp;
+
+  p_rsp = (TL_EvtPacket_t *)local_buffer;
+
+  local_buffer[0] = key_index;
+
+  shci_send( SHCI_OPCODE_C2_FUS_UNLOAD_USR_KEY,
+             1,
+             local_buffer,
+             p_rsp );
+
+  return (SHCI_CmdStatus_t)(((TL_CcEvt_t*)(p_rsp->evtserial.evt.payload))->payload[0]);
+}
+
+SHCI_CmdStatus_t SHCI_C2_FUS_ActivateAntiRollback( void )
+{
+  /**
+   * Buffer is large enough to hold command complete without payload
+   */
+  uint8_t local_buffer[TL_BLEEVT_CC_BUFFER_SIZE];
+  TL_EvtPacket_t * p_rsp;
+
+  p_rsp = (TL_EvtPacket_t *)local_buffer;
+
+  shci_send( SHCI_OPCODE_C2_FUS_ACTIVATE_ANTIROLLBACK,
+             0,
+             0,
+             p_rsp );
+
+  return (SHCI_CmdStatus_t)(((TL_CcEvt_t*)(p_rsp->evtserial.evt.payload))->payload[0]);
+}
+
+SHCI_CmdStatus_t SHCI_C2_BLE_Init( SHCI_C2_Ble_Init_Cmd_Packet_t *pCmdPacket )
+{
+  /**
+   * Buffer is large enough to hold command complete without payload
+   */
+  uint8_t local_buffer[TL_BLEEVT_CC_BUFFER_SIZE];
+  TL_EvtPacket_t * p_rsp;
+
+  p_rsp = (TL_EvtPacket_t *)local_buffer;
+
+ shci_send( SHCI_OPCODE_C2_BLE_INIT,
+            sizeof( SHCI_C2_Ble_Init_Cmd_Param_t ),
+            (uint8_t*)&pCmdPacket->Param,
+            p_rsp );
+
+  return (SHCI_CmdStatus_t)(((TL_CcEvt_t*)(p_rsp->evtserial.evt.payload))->payload[0]);
+}
+
+SHCI_CmdStatus_t SHCI_C2_THREAD_Init( void )
+{
+  /**
+   * Buffer is large enough to hold command complete without payload
+   */
+  uint8_t local_buffer[TL_BLEEVT_CC_BUFFER_SIZE];
+  TL_EvtPacket_t * p_rsp;
+
+  p_rsp = (TL_EvtPacket_t *)local_buffer;
+
+  shci_send( SHCI_OPCODE_C2_THREAD_INIT,
+             0,
+             0,
+             p_rsp );
+
+  return (SHCI_CmdStatus_t)(((TL_CcEvt_t*)(p_rsp->evtserial.evt.payload))->payload[0]);
+}
+
+SHCI_CmdStatus_t SHCI_C2_LLDTESTS_Init( uint8_t param_size, uint8_t * p_param )
+{
+  /**
+   * Buffer is large enough to hold command complete without payload
+   */
+  uint8_t local_buffer[TL_BLEEVT_CC_BUFFER_SIZE];
+  TL_EvtPacket_t * p_rsp;
+
+  p_rsp = (TL_EvtPacket_t *)local_buffer;
+
+  shci_send( SHCI_OPCODE_C2_LLD_TESTS_INIT,
+             param_size,
+             p_param,
+             p_rsp );
+
+  return (SHCI_CmdStatus_t)(((TL_CcEvt_t*)(p_rsp->evtserial.evt.payload))->payload[0]);
+}
+
+SHCI_CmdStatus_t SHCI_C2_BLE_LLD_Init( uint8_t param_size, uint8_t * p_param )
+{
+  /**
+   * Buffer is large enough to hold command complete without payload
+   */
+  uint8_t local_buffer[TL_BLEEVT_CC_BUFFER_SIZE];
+  TL_EvtPacket_t * p_rsp;
+
+  p_rsp = (TL_EvtPacket_t *)local_buffer;
+
+  shci_send( SHCI_OPCODE_C2_BLE_LLD_INIT,
+             param_size,
+             p_param,
+             p_rsp );
+
+  return (SHCI_CmdStatus_t)(((TL_CcEvt_t*)(p_rsp->evtserial.evt.payload))->payload[0]);
+}
+
+SHCI_CmdStatus_t SHCI_C2_ZIGBEE_Init( void )
+{
+  /**
+   * Buffer is large enough to hold command complete without payload
+   */
+  uint8_t local_buffer[TL_BLEEVT_CC_BUFFER_SIZE];
+  TL_EvtPacket_t * p_rsp;
+
+  p_rsp = (TL_EvtPacket_t *)local_buffer;
+
+  shci_send( SHCI_OPCODE_C2_ZIGBEE_INIT,
+             0,
+             0,
+             p_rsp );
+
+  return (SHCI_CmdStatus_t)(((TL_CcEvt_t*)(p_rsp->evtserial.evt.payload))->payload[0]);
+}
+
+SHCI_CmdStatus_t SHCI_C2_DEBUG_Init( SHCI_C2_DEBUG_Init_Cmd_Packet_t *pCmdPacket  )
+{
+  /**
+   * Buffer is large enough to hold command complete without payload
+   */
+  uint8_t local_buffer[TL_BLEEVT_CC_BUFFER_SIZE];
+  TL_EvtPacket_t * p_rsp;
+
+  p_rsp = (TL_EvtPacket_t *)local_buffer;
+
+  shci_send( SHCI_OPCODE_C2_DEBUG_INIT,
+             sizeof( SHCI_C2_DEBUG_init_Cmd_Param_t ),
+             (uint8_t*)&pCmdPacket->Param,
+             p_rsp );
+
+  return (SHCI_CmdStatus_t)(((TL_CcEvt_t*)(p_rsp->evtserial.evt.payload))->payload[0]);
+}
+
+SHCI_CmdStatus_t SHCI_C2_FLASH_EraseActivity( SHCI_EraseActivity_t erase_activity )
+{
+  /**
+   * Buffer is large enough to hold command complete without payload
+   */
+  uint8_t local_buffer[TL_BLEEVT_CC_BUFFER_SIZE];
+  TL_EvtPacket_t * p_rsp;
+
+  p_rsp = (TL_EvtPacket_t *)local_buffer;
+
+  local_buffer[0] = erase_activity;
+
+  shci_send( SHCI_OPCODE_C2_FLASH_ERASE_ACTIVITY,
+             1,
+             local_buffer,
+             p_rsp );
+
+  return (SHCI_CmdStatus_t)(((TL_CcEvt_t*)(p_rsp->evtserial.evt.payload))->payload[0]);
+}
+
+SHCI_CmdStatus_t SHCI_C2_CONCURRENT_SetMode( SHCI_C2_CONCURRENT_Mode_Param_t Mode )
+{
+  /**
+   * Buffer is large enough to hold command complete without payload
+   */
+  uint8_t local_buffer[TL_BLEEVT_CC_BUFFER_SIZE];
+  TL_EvtPacket_t * p_rsp;
+
+  p_rsp = (TL_EvtPacket_t *)local_buffer;
+
+  local_buffer[0] = Mode;
+
+  shci_send( SHCI_OPCODE_C2_CONCURRENT_SET_MODE,
+             1,
+             local_buffer,
+             p_rsp );
+
+  return (SHCI_CmdStatus_t)(((TL_CcEvt_t*)(p_rsp->evtserial.evt.payload))->payload[0]);
+}
+
+SHCI_CmdStatus_t SHCI_C2_CONCURRENT_GetNextBleEvtTime( SHCI_C2_CONCURRENT_GetNextBleEvtTime_Param_t *pParam )
+{
+  /**
+   * Buffer is large enough to hold command complete with payload
+   */
+  uint8_t local_buffer[TL_BLEEVT_CC_BUFFER_SIZE+4];
+  TL_EvtPacket_t * p_rsp;
+
+  p_rsp = (TL_EvtPacket_t *)local_buffer;
+
+  shci_send( SHCI_OPCODE_C2_CONCURRENT_GET_NEXT_BLE_EVT_TIME,
+             0,
+             0,
+             p_rsp );
+
+  memcpy((void*)&(pParam->relative_time), (void*)&((TL_CcEvt_t*)(p_rsp->evtserial.evt.payload))->payload[1], sizeof(pParam->relative_time));
+
+  return (SHCI_CmdStatus_t)(((TL_CcEvt_t*)(p_rsp->evtserial.evt.payload))->payload[0]);
+}
+
+SHCI_CmdStatus_t SHCI_C2_CONCURRENT_EnableNext_802154_EvtNotification( void )
+{
+  /**
+   * Buffer is large enough to hold command complete without payload
+   */
+  uint8_t local_buffer[TL_BLEEVT_CC_BUFFER_SIZE];
+  TL_EvtPacket_t * p_rsp;
+
+  p_rsp = (TL_EvtPacket_t *)local_buffer;
+
+  shci_send( SHCI_OPCODE_C2_CONCURRENT_ENABLE_NEXT_802154_EVT_NOTIFICATION,
+             0,
+             0,
+             p_rsp );
+
+  return (SHCI_CmdStatus_t)(((TL_CcEvt_t*)(p_rsp->evtserial.evt.payload))->payload[0]);
+}
+
+SHCI_CmdStatus_t SHCI_C2_FLASH_StoreData( SHCI_C2_FLASH_Ip_t Ip )
+{
+  /**
+   * Buffer is large enough to hold command complete without payload
+   */
+  uint8_t local_buffer[TL_BLEEVT_CC_BUFFER_SIZE];
+  TL_EvtPacket_t * p_rsp;
+
+  p_rsp = (TL_EvtPacket_t *)local_buffer;
+
+  local_buffer[0] = Ip;
+
+  shci_send( SHCI_OPCODE_C2_FLASH_STORE_DATA,
+             1,
+             local_buffer,
+             p_rsp );
+
+  return (SHCI_CmdStatus_t)(((TL_CcEvt_t*)(p_rsp->evtserial.evt.payload))->payload[0]);
+}
+
+SHCI_CmdStatus_t SHCI_C2_FLASH_EraseData( SHCI_C2_FLASH_Ip_t Ip )
+{
+  /**
+   * Buffer is large enough to hold command complete without payload
+   */
+  uint8_t local_buffer[TL_BLEEVT_CC_BUFFER_SIZE];
+  TL_EvtPacket_t * p_rsp;
+
+  p_rsp = (TL_EvtPacket_t *)local_buffer;
+
+  local_buffer[0] = Ip;
+
+  shci_send( SHCI_OPCODE_C2_FLASH_ERASE_DATA,
+             1,
+             local_buffer,
+             p_rsp );
+
+  return (SHCI_CmdStatus_t)(((TL_CcEvt_t*)(p_rsp->evtserial.evt.payload))->payload[0]);
+}
+
+SHCI_CmdStatus_t SHCI_C2_RADIO_AllowLowPower( SHCI_C2_FLASH_Ip_t Ip,uint8_t  FlagRadioLowPowerOn)
+{
+  /**
+   * Buffer is large enough to hold command complete without payload
+   */
+  uint8_t local_buffer[TL_BLEEVT_CC_BUFFER_SIZE];
+  TL_EvtPacket_t * p_rsp;
+
+  p_rsp = (TL_EvtPacket_t *)local_buffer;
+
+  local_buffer[0] = Ip;
+  local_buffer[1] = FlagRadioLowPowerOn;
+
+  shci_send( SHCI_OPCODE_C2_RADIO_ALLOW_LOW_POWER,
+             2,
+             local_buffer,
+             p_rsp );
+
+  return (SHCI_CmdStatus_t)(((TL_CcEvt_t*)(p_rsp->evtserial.evt.payload))->payload[0]);
+}
+
+SHCI_CmdStatus_t SHCI_C2_MAC_802_15_4_Init( void )
+{
+  /**
+   * Buffer is large enough to hold command complete without payload
+   */
+  uint8_t local_buffer[TL_BLEEVT_CC_BUFFER_SIZE];
+  TL_EvtPacket_t * p_rsp;
+
+  p_rsp = (TL_EvtPacket_t *)local_buffer;
+
+  shci_send( SHCI_OPCODE_C2_MAC_802_15_4_INIT,
+             0,
+             0,
+             p_rsp );
+
+  return (SHCI_CmdStatus_t)(((TL_CcEvt_t*)(p_rsp->evtserial.evt.payload))->payload[0]);
+}
+
+SHCI_CmdStatus_t SHCI_C2_Reinit( void )
+{
+  /**
+   * Buffer is large enough to hold command complete without payload
+   */
+  uint8_t local_buffer[TL_BLEEVT_CC_BUFFER_SIZE];
+  TL_EvtPacket_t * p_rsp;
+
+  p_rsp = (TL_EvtPacket_t *)local_buffer;
+
+  shci_send( SHCI_OPCODE_C2_REINIT,
+             0,
+             0,
+             p_rsp );
+
+  return (SHCI_CmdStatus_t)(((TL_CcEvt_t*)(p_rsp->evtserial.evt.payload))->payload[0]);
+}
+
+SHCI_CmdStatus_t SHCI_C2_ExtpaConfig(uint32_t gpio_port, uint16_t gpio_pin_number, uint8_t gpio_polarity, uint8_t gpio_status)
+{
+  /**
+   * TL_BLEEVT_CC_BUFFER_SIZE is 16 bytes so it is large enough to hold the 8 bytes of command parameters
+   * Buffer is large enough to hold command complete without payload
+   */
+  uint8_t local_buffer[TL_BLEEVT_CC_BUFFER_SIZE];
+  TL_EvtPacket_t * p_rsp;
+
+  p_rsp = (TL_EvtPacket_t *)local_buffer;
+
+  ((SHCI_C2_EXTPA_CONFIG_Cmd_Param_t*)local_buffer)->gpio_port = gpio_port;
+  ((SHCI_C2_EXTPA_CONFIG_Cmd_Param_t*)local_buffer)->gpio_pin_number = gpio_pin_number;
+  ((SHCI_C2_EXTPA_CONFIG_Cmd_Param_t*)local_buffer)->gpio_polarity = gpio_polarity;
+  ((SHCI_C2_EXTPA_CONFIG_Cmd_Param_t*)local_buffer)->gpio_status = gpio_status;
+
+  shci_send( SHCI_OPCODE_C2_EXTPA_CONFIG,
+             8,
+             local_buffer,
+             p_rsp );
+
+  return (SHCI_CmdStatus_t)(((TL_CcEvt_t*)(p_rsp->evtserial.evt.payload))->payload[0]);
+}
+
+SHCI_CmdStatus_t SHCI_C2_SetFlashActivityControl(SHCI_C2_SET_FLASH_ACTIVITY_CONTROL_Source_t Source)
+{
+  /**
+   * TL_BLEEVT_CC_BUFFER_SIZE is 16 bytes so it is large enough to hold the 1 byte of command parameter
+   * Buffer is large enough to hold command complete without payload
+   */
+  uint8_t local_buffer[TL_BLEEVT_CC_BUFFER_SIZE];
+  TL_EvtPacket_t * p_rsp;
+
+  p_rsp = (TL_EvtPacket_t *)local_buffer;
+
+  local_buffer[0] = (uint8_t)Source;
+
+  shci_send( SHCI_OPCODE_C2_SET_FLASH_ACTIVITY_CONTROL,
+             1,
+             local_buffer,
+             p_rsp );
+
+  return (SHCI_CmdStatus_t)(((TL_CcEvt_t*)(p_rsp->evtserial.evt.payload))->payload[0]);
+}
+
+SHCI_CmdStatus_t SHCI_C2_Config(SHCI_C2_CONFIG_Cmd_Param_t *pCmdPacket)
+{
+  /**
+   * Buffer is large enough to hold command complete without payload
+   */
+  uint8_t local_buffer[TL_BLEEVT_CC_BUFFER_SIZE];
+  TL_EvtPacket_t * p_rsp;
+
+  p_rsp = (TL_EvtPacket_t *)local_buffer;
+
+  shci_send( SHCI_OPCODE_C2_CONFIG,
+             sizeof(SHCI_C2_CONFIG_Cmd_Param_t),
+             (uint8_t*)pCmdPacket,
+             p_rsp );
+
+  return (SHCI_CmdStatus_t)(((TL_CcEvt_t*)(p_rsp->evtserial.evt.payload))->payload[0]);
+}
+
+SHCI_CmdStatus_t SHCI_C2_802_15_4_DeInit( void )
+{
+  /**
+   * Buffer is large enough to hold command complete without payload
+   */
+  uint8_t local_buffer[TL_BLEEVT_CC_BUFFER_SIZE];
+  TL_EvtPacket_t * p_rsp;
+
+  p_rsp = (TL_EvtPacket_t *)local_buffer;
+
+  shci_send( SHCI_OPCODE_C2_802_15_4_DEINIT,
+             0,
+             0,
+             p_rsp );
+
+  return (SHCI_CmdStatus_t)(((TL_CcEvt_t*)(p_rsp->evtserial.evt.payload))->payload[0]);
+}
+
+SHCI_CmdStatus_t SHCI_C2_SetSystemClock( SHCI_C2_SET_SYSTEM_CLOCK_Cmd_Param_t clockSel )
+{
+  /**
+   * Buffer is large enough to hold command complete without payload
+   */
+  uint8_t local_buffer[TL_BLEEVT_CC_BUFFER_SIZE];
+  TL_EvtPacket_t * p_rsp;
+
+  p_rsp = (TL_EvtPacket_t *)local_buffer;
+
+  local_buffer[0] = (uint8_t)clockSel;
+
+  shci_send( SHCI_OPCODE_C2_SET_SYSTEM_CLOCK,
+             1,
+             local_buffer,
+             p_rsp );
+
+  return (SHCI_CmdStatus_t)(((TL_CcEvt_t*)(p_rsp->evtserial.evt.payload))->payload[0]);
+}
+
+/**
+ *  Local System COMMAND
+ *  These commands are NOT sent to the CPU2
+ */
+
+SHCI_CmdStatus_t SHCI_GetWirelessFwInfo( WirelessFwInfo_t* pWirelessInfo )
+{
+  uint32_t ipccdba = 0;
+  MB_RefTable_t * p_RefTable = NULL;
+  uint32_t wireless_firmware_version = 0;
+  uint32_t wireless_firmware_memorySize = 0;
+  uint32_t wireless_firmware_infoStack = 0;
+  MB_FUS_DeviceInfoTable_t * p_fus_device_info_table = NULL;
+  uint32_t fus_version = 0;
+  uint32_t fus_memorySize = 0;
+
+  ipccdba = READ_BIT( FLASH->IPCCBR, FLASH_IPCCBR_IPCCDBA );
+
+  /**
+   * The Device Info Table mapping depends on which firmware is running on CPU2.
+   * If the FUS is running on CPU2, FUS_DEVICE_INFO_TABLE_VALIDITY_KEYWORD shall be written in the table.
+   * Otherwise, it means the Wireless Firmware is running on the CPU2
+   */
+  p_fus_device_info_table = (MB_FUS_DeviceInfoTable_t*)(*(uint32_t*)((ipccdba<<2) + SRAM2A_BASE));
+
+  if(p_fus_device_info_table->DeviceInfoTableState == FUS_DEVICE_INFO_TABLE_VALIDITY_KEYWORD)
+  {
+    /* The FUS is running on CPU2 */
+    /**
+     *  Retrieve the WirelessFwInfoTable
+     *  This table is stored in RAM at startup during the TL (transport layer) initialization
+     */
+    wireless_firmware_version =  p_fus_device_info_table->WirelessStackVersion;
+    wireless_firmware_memorySize =  p_fus_device_info_table->WirelessStackMemorySize;
+    wireless_firmware_infoStack =  p_fus_device_info_table->WirelessFirmwareBleInfo;
+
+    /**
+     *  Retrieve the FusInfoTable
+     *  This table is stored in RAM at startup during the TL (transport layer) initialization
+     */
+    fus_version =  p_fus_device_info_table->FusVersion;
+    fus_memorySize =  p_fus_device_info_table->FusMemorySize;
+  }
+  else
+  {
+    /* The Wireless Firmware is running on CPU2 */
+    p_RefTable = (MB_RefTable_t*)((ipccdba<<2) + SRAM2A_BASE);
+
+    /**
+     *  Retrieve the WirelessFwInfoTable
+     *  This table is stored in RAM at startup during the TL (transport layer) initialization
+     */
+    wireless_firmware_version =  p_RefTable->p_device_info_table->WirelessFwInfoTable.Version;
+    wireless_firmware_memorySize =  p_RefTable->p_device_info_table->WirelessFwInfoTable.MemorySize;
+    wireless_firmware_infoStack =  p_RefTable->p_device_info_table->WirelessFwInfoTable.InfoStack;
+
+    /**
+     *  Retrieve the FusInfoTable
+     *  This table is stored in RAM at startup during the TL (transport layer) initialization
+     */
+    fus_version =  p_RefTable->p_device_info_table->FusInfoTable.Version;
+    fus_memorySize =  p_RefTable->p_device_info_table->FusInfoTable.MemorySize;
+  }
+
+  /**
+   *  Retrieve the WirelessFwInfoTable
+   *  This table is stored in RAM at startup during the TL (transport layer) initialization
+   */
+  pWirelessInfo->VersionMajor       = ((wireless_firmware_version & INFO_VERSION_MAJOR_MASK) >> INFO_VERSION_MAJOR_OFFSET);
+  pWirelessInfo->VersionMinor       = ((wireless_firmware_version & INFO_VERSION_MINOR_MASK) >> INFO_VERSION_MINOR_OFFSET);
+  pWirelessInfo->VersionSub         = ((wireless_firmware_version & INFO_VERSION_SUB_MASK) >> INFO_VERSION_SUB_OFFSET);
+  pWirelessInfo->VersionBranch      = ((wireless_firmware_version & INFO_VERSION_BRANCH_MASK) >> INFO_VERSION_BRANCH_OFFSET);
+  pWirelessInfo->VersionReleaseType = ((wireless_firmware_version & INFO_VERSION_TYPE_MASK) >> INFO_VERSION_TYPE_OFFSET);
+
+  pWirelessInfo->MemorySizeSram2B   = ((wireless_firmware_memorySize & INFO_SIZE_SRAM2B_MASK) >> INFO_SIZE_SRAM2B_OFFSET);
+  pWirelessInfo->MemorySizeSram2A   = ((wireless_firmware_memorySize & INFO_SIZE_SRAM2A_MASK) >> INFO_SIZE_SRAM2A_OFFSET);
+  pWirelessInfo->MemorySizeSram1    = ((wireless_firmware_memorySize & INFO_SIZE_SRAM1_MASK) >> INFO_SIZE_SRAM1_OFFSET);
+  pWirelessInfo->MemorySizeFlash    = ((wireless_firmware_memorySize & INFO_SIZE_FLASH_MASK) >> INFO_SIZE_FLASH_OFFSET);
+
+  pWirelessInfo->StackType          = ((wireless_firmware_infoStack & INFO_STACK_TYPE_MASK) >> INFO_STACK_TYPE_OFFSET);
+
+  /**
+   *  Retrieve the FusInfoTable
+   *  This table is stored in RAM at startup during the TL (transport layer) initialization
+   */
+  pWirelessInfo->FusVersionMajor       = ((fus_version & INFO_VERSION_MAJOR_MASK) >> INFO_VERSION_MAJOR_OFFSET);
+  pWirelessInfo->FusVersionMinor       = ((fus_version & INFO_VERSION_MINOR_MASK) >> INFO_VERSION_MINOR_OFFSET);
+  pWirelessInfo->FusVersionSub         = ((fus_version & INFO_VERSION_SUB_MASK) >> INFO_VERSION_SUB_OFFSET);
+
+  pWirelessInfo->FusMemorySizeSram2B   = ((fus_memorySize & INFO_SIZE_SRAM2B_MASK) >> INFO_SIZE_SRAM2B_OFFSET);
+  pWirelessInfo->FusMemorySizeSram2A   = ((fus_memorySize & INFO_SIZE_SRAM2A_MASK) >> INFO_SIZE_SRAM2A_OFFSET);
+  pWirelessInfo->FusMemorySizeFlash    = ((fus_memorySize & INFO_SIZE_FLASH_MASK) >> INFO_SIZE_FLASH_OFFSET);
+
+  return (SHCI_Success);
+}
+#endif /* STM32WBxx */
diff --git a/src/utility/STM32_WPAN/shci.h b/src/utility/STM32_WPAN/shci.h
new file mode 100644
index 00000000..59c6fd46
--- /dev/null
+++ b/src/utility/STM32_WPAN/shci.h
@@ -0,0 +1,1402 @@
+/**
+ ******************************************************************************
+ * @file    shci.h
+ * @author  MCD Application Team
+ * @brief   HCI command for the system channel
+ ******************************************************************************
+ * @attention
+ *
+ * Copyright (c) 2018-2021 STMicroelectronics.
+ * All rights reserved.
+ *
+ * This software is licensed under terms that can be found in the LICENSE file
+ * in the root directory of this software component.
+ * If no LICENSE file comes with this software, it is provided AS-IS.
+ *
+ ******************************************************************************
+ */
+
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __SHCI_H
+#define __SHCI_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+  /* Includes ------------------------------------------------------------------*/
+#include "mbox_def.h" /* Requested to expose the MB_WirelessFwInfoTable_t structure */
+
+  /* Exported types ------------------------------------------------------------*/
+
+  /* SYSTEM EVENT */
+  typedef enum
+  {
+    WIRELESS_FW_RUNNING = 0x00,
+    FUS_FW_RUNNING = 0x01,
+  } SHCI_SysEvt_Ready_Rsp_t;
+
+  /* ERROR CODES
+   *
+   * These error codes are detected on CPU2 side and are send back to the CPU1 via a system
+   * notification message. It is up to the application running on CPU1 to manage these errors
+   *
+   * These errors can be generated by all layers (low level driver, stack, framework infrastructure, etc..)
+   */
+   typedef enum
+   {
+     ERR_BLE_INIT = 0,                 /* This event is currently not reported by the CPU2                    */
+     ERR_THREAD_LLD_FATAL_ERROR = 125, /* The LLD driver used on 802_15_4 detected a fatal error              */
+     ERR_THREAD_UNKNOWN_CMD = 126,     /* The command send by the CPU1 to control the Thread stack is unknown */
+     ERR_ZIGBEE_UNKNOWN_CMD = 200,     /* The command send by the CPU1 to control the Zigbee stack is unknown */
+   } SCHI_SystemErrCode_t;
+
+#define SHCI_EVTCODE                    ( 0xFF )
+#define SHCI_SUB_EVT_CODE_BASE          ( 0x9200 )
+
+  /**
+   * THE ORDER SHALL NOT BE CHANGED TO GUARANTEE COMPATIBILITY WITH THE CPU1 DEFINITION
+   */
+  typedef enum
+  {
+    SHCI_SUB_EVT_CODE_READY =  SHCI_SUB_EVT_CODE_BASE,
+    SHCI_SUB_EVT_ERROR_NOTIF,
+    SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE,
+    SHCI_SUB_EVT_THREAD_NVM_RAM_UPDATE,
+    SHCI_SUB_EVT_NVM_START_WRITE,
+    SHCI_SUB_EVT_NVM_END_WRITE,
+    SHCI_SUB_EVT_NVM_START_ERASE,
+    SHCI_SUB_EVT_NVM_END_ERASE,
+    SHCI_SUB_EVT_CODE_CONCURRENT_802154_EVT,
+  } SHCI_SUB_EVT_CODE_t;
+
+  /**
+   * SHCI_SUB_EVT_CODE_READY
+   * This notifies the CPU1 that the CPU2 is now ready to receive commands
+   * It reports as well which firmware is running on CPU2 : The wireless stack of the FUS (previously named RSS)
+   */
+  typedef PACKED_STRUCT{
+    SHCI_SysEvt_Ready_Rsp_t sysevt_ready_rsp;
+  } SHCI_C2_Ready_Evt_t;
+
+  /**
+   * SHCI_SUB_EVT_ERROR_NOTIF
+   * This reports to the CPU1 some error form the CPU2
+   */
+  typedef PACKED_STRUCT{
+    SCHI_SystemErrCode_t errorCode;
+  } SHCI_C2_ErrorNotif_Evt_t;
+
+  /**
+   * SHCI_SUB_EVT_BLE_NVM_RAM_UPDATE
+   * This notifies the CPU1 which part of the BLE NVM RAM has been updated so that only the modified
+   * section could be written in Flash/NVM
+   * StartAddress : Start address of the section that has been modified
+   * Size : Size (in bytes) of the section that has been modified
+   */
+  typedef PACKED_STRUCT{
+    uint32_t StartAddress;
+    uint32_t Size;
+  } SHCI_C2_BleNvmRamUpdate_Evt_t;
+
+  /**
+   * SHCI_SUB_EVT_THREAD_NVM_RAM_UPDATE
+   * This notifies the CPU1 which part of the OT NVM RAM has been updated so that only the modified
+   * section could be written in Flash/NVM
+   * StartAddress : Start address of the section that has been modified
+   * Size : Size (in bytes) of the section that has been modified
+   */
+  typedef PACKED_STRUCT{
+    uint32_t StartAddress;
+    uint32_t Size;
+  } SHCI_C2_ThreadNvmRamUpdate_Evt_t;
+
+  /**
+   * SHCI_SUB_EVT_NVM_START_WRITE
+   * This notifies the CPU1 that the CPU2 has started a write procedure in Flash
+   * NumberOfWords : The number of 64bits data the CPU2 needs to write in Flash.
+   *                 For each 64bits data, the algorithm as described in AN5289 is executed.
+   *                 When this number is reported to 0, it means the Number of 64bits to be written
+   *                 was unknown when the procedure has started.
+   * When all data are written, the SHCI_SUB_EVT_NVM_END_WRITE event is reported
+   */
+  typedef PACKED_STRUCT{
+    uint32_t NumberOfWords;
+  } SHCI_C2_NvmStartWrite_Evt_t;
+
+  /**
+   * SHCI_SUB_EVT_NVM_END_WRITE
+   * This notifies the CPU1 that the CPU2 has written all expected data in Flash
+   */
+
+  /**
+   * SHCI_SUB_EVT_NVM_START_ERASE
+   * This notifies the CPU1 that the CPU2 has started a erase procedure in Flash
+   * NumberOfSectors : The number of sectors the CPU2 needs to erase in Flash.
+   *                   For each sector, the algorithm as described in AN5289 is executed.
+   *                   When this number is reported to 0, it means the Number of sectors to be erased
+   *                   was unknown when the procedure has started.
+   * When all sectors are erased, the SHCI_SUB_EVT_NVM_END_ERASE event is reported
+   */
+  typedef PACKED_STRUCT{
+    uint32_t NumberOfSectors;
+  } SHCI_C2_NvmStartErase_Evt_t;
+
+  /**
+   * SHCI_SUB_EVT_NVM_END_ERASE
+   * This notifies the CPU1 that the CPU2 has erased all expected flash sectors
+   */
+
+  /* SYSTEM COMMAND */
+  typedef PACKED_STRUCT
+  {
+    /**
+     * MetaData holds :
+     * 2*32bits for chaining list
+     * 1*32bits with BLE header (type + Opcode + Length)
+     */
+    uint32_t MetaData[3];
+  } SHCI_Header_t;
+
+  typedef enum
+  {
+    SHCI_Success = 0x00,
+    SHCI_UNKNOWN_CMD = 0x01,
+    SHCI_MEMORY_CAPACITY_EXCEEDED_ERR_CODE=  0x07,
+    SHCI_ERR_UNSUPPORTED_FEATURE = 0x11,
+    SHCI_ERR_INVALID_HCI_CMD_PARAMS = 0x12,
+    SHCI_ERR_INVALID_PARAMS = 0x42,    /* only used for release < v1.13.0 */
+    SHCI_ERR_INVALID_PARAMS_V2 = 0x92, /* available for release >= v1.13.0 */
+    SHCI_FUS_CMD_NOT_SUPPORTED = 0xFF,
+  } SHCI_CmdStatus_t;
+
+  typedef enum
+  {
+    SHCI_8BITS =  0x01,
+    SHCI_16BITS = 0x02,
+    SHCI_32BITS = 0x04,
+  } SHCI_Busw_t;
+
+#define SHCI_OGF                        ( 0x3F )
+#define SHCI_OCF_BASE                   ( 0x50 )
+
+  /**
+   * THE ORDER SHALL NOT BE CHANGED TO GUARANTEE COMPATIBILITY WITH THE CPU2 DEFINITION
+   */
+  typedef enum
+  {
+    SHCI_OCF_C2_RESERVED1 =  SHCI_OCF_BASE,
+    SHCI_OCF_C2_RESERVED2,
+    SHCI_OCF_C2_FUS_GET_STATE,
+    SHCI_OCF_C2_FUS_RESERVED1,
+    SHCI_OCF_C2_FUS_FW_UPGRADE,
+    SHCI_OCF_C2_FUS_FW_DELETE,
+    SHCI_OCF_C2_FUS_UPDATE_AUTH_KEY,
+    SHCI_OCF_C2_FUS_LOCK_AUTH_KEY,
+    SHCI_OCF_C2_FUS_STORE_USR_KEY,
+    SHCI_OCF_C2_FUS_LOAD_USR_KEY,
+    SHCI_OCF_C2_FUS_START_WS,
+    SHCI_OCF_C2_FUS_RESERVED2,
+    SHCI_OCF_C2_FUS_RESERVED3,
+    SHCI_OCF_C2_FUS_LOCK_USR_KEY,
+    SHCI_OCF_C2_FUS_UNLOAD_USR_KEY,
+    SHCI_OCF_C2_FUS_ACTIVATE_ANTIROLLBACK,
+    SHCI_OCF_C2_FUS_RESERVED7,
+    SHCI_OCF_C2_FUS_RESERVED8,
+    SHCI_OCF_C2_FUS_RESERVED9,
+    SHCI_OCF_C2_FUS_RESERVED10,
+    SHCI_OCF_C2_FUS_RESERVED11,
+    SHCI_OCF_C2_FUS_RESERVED12,
+    SHCI_OCF_C2_BLE_INIT,
+    SHCI_OCF_C2_THREAD_INIT,
+    SHCI_OCF_C2_DEBUG_INIT,
+    SHCI_OCF_C2_FLASH_ERASE_ACTIVITY,
+    SHCI_OCF_C2_CONCURRENT_SET_MODE,
+    SHCI_OCF_C2_FLASH_STORE_DATA,
+    SHCI_OCF_C2_FLASH_ERASE_DATA,
+    SHCI_OCF_C2_RADIO_ALLOW_LOW_POWER,
+    SHCI_OCF_C2_MAC_802_15_4_INIT,
+    SHCI_OCF_C2_REINIT,
+    SHCI_OCF_C2_ZIGBEE_INIT,
+    SHCI_OCF_C2_LLD_TESTS_INIT,
+    SHCI_OCF_C2_EXTPA_CONFIG,
+    SHCI_OCF_C2_SET_FLASH_ACTIVITY_CONTROL,
+    SHCI_OCF_C2_BLE_LLD_INIT,
+    SHCI_OCF_C2_CONFIG,
+    SHCI_OCF_C2_CONCURRENT_GET_NEXT_BLE_EVT_TIME,
+    SHCI_OCF_C2_CONCURRENT_ENABLE_NEXT_802154_EVT_NOTIFICATION,
+    SHCI_OCF_C2_802_15_4_DEINIT,
+    SHCI_OCF_C2_SET_SYSTEM_CLOCK,
+  } SHCI_OCF_t;
+
+#define SHCI_OPCODE_C2_FUS_GET_STATE         (( SHCI_OGF << 10) + SHCI_OCF_C2_FUS_GET_STATE)
+/** No command parameters */
+/** Response parameters*/
+/** It responds a 1 byte value holding FUS State error code when the FUS State value is 0xFF (FUS_STATE_VALUE_ERROR) */
+  typedef enum
+  {
+    FUS_STATE_ERROR_NO_ERROR =  0x00,
+    FUS_STATE_ERROR_IMG_NOT_FOUND = 0x01,
+    FUS_STATE_ERROR_IMG_CORRUPT = 0x02,
+    FUS_STATE_ERROR_IMG_NOT_AUTHENTIC = 0x03,
+    FUS_STATE_ERROR_IMG_NOT_ENOUGH_SPACE = 0x04,
+    FUS_STATE_ERROR_IMAGE_USRABORT = 0x05,
+    FUS_STATE_ERROR_IMAGE_ERSERROR = 0x06,
+    FUS_STATE_ERROR_IMAGE_WRTERROR = 0x07,
+    FUS_STATE_ERROR_AUTH_TAG_ST_NOTFOUND = 0x08,
+    FUS_STATE_ERROR_AUTH_TAG_CUST_NOTFOUND = 0x09,
+    FUS_STATE_ERROR_AUTH_KEY_LOCKED = 0x0A,
+    FUS_STATE_ERROR_FW_ROLLBACK_ERROR = 0x11,
+    FUS_STATE_ERROR_STATE_NOT_RUNNING = 0xFE,
+    FUS_STATE_ERROR_ERR_UNKNOWN = 0xFF,
+  } SHCI_FUS_GetState_ErrorCode_t;
+
+  enum
+  {
+    FUS_STATE_VALUE_IDLE =  0x00,
+    FUS_STATE_VALUE_FW_UPGRD_ONGOING =  0x10,
+    FUS_STATE_VALUE_FW_UPGRD_ONGOING_END = 0x1F,    /* All values between 0x10 and 0x1F has the same meaning */
+    FUS_STATE_VALUE_FUS_UPGRD_ONGOING =  0x20,
+    FUS_STATE_VALUE_FUS_UPGRD_ONGOING_END =  0x2F,  /* All values between 0x20 and 0x2F has the same meaning */
+    FUS_STATE_VALUE_SERVICE_ONGOING =  0x30,
+    FUS_STATE_VALUE_SERVICE_ONGOING_END =  0x3F,    /* All values between 0x30 and 0x3F has the same meaning */
+    FUS_STATE_VALUE_ERROR =  0xFF,
+  };
+
+#define SHCI_OPCODE_C2_FUS_RESERVED1         (( SHCI_OGF << 10) + SHCI_OCF_C2_FUS_RESERVED1)
+/** No command parameters */
+/** No response parameters*/
+
+#define SHCI_OPCODE_C2_FUS_FW_UPGRADE   (( SHCI_OGF << 10) + SHCI_OCF_C2_FUS_FW_UPGRADE)
+  /** No structure for command parameters */
+  /** No response parameters*/
+
+#define SHCI_OPCODE_C2_FUS_FW_DELETE   (( SHCI_OGF << 10) + SHCI_OCF_C2_FUS_FW_DELETE)
+/** No command parameters */
+/** No response parameters*/
+
+#define SHCI_OPCODE_C2_FUS_UPDATE_AUTH_KEY    (( SHCI_OGF << 10) + SHCI_OCF_C2_FUS_UPDATE_AUTH_KEY)
+  typedef PACKED_STRUCT{
+  uint8_t KeySize;
+  uint8_t KeyData[64];
+  } SHCI_C2_FUS_UpdateAuthKey_Cmd_Param_t;
+
+  /** No response parameters*/
+
+#define SHCI_OPCODE_C2_FUS_LOCK_AUTH_KEY    (( SHCI_OGF << 10) + SHCI_OCF_C2_FUS_LOCK_AUTH_KEY)
+/** No command parameters */
+/** No response parameters*/
+
+#define SHCI_OPCODE_C2_FUS_STORE_USR_KEY    (( SHCI_OGF << 10) + SHCI_OCF_C2_FUS_STORE_USR_KEY)
+  /** Command parameters */
+  /* List of supported key type */
+  enum
+  {
+    KEYTYPE_NONE =  0x00,
+    KEYTYPE_SIMPLE = 0x01,
+    KEYTYPE_MASTER = 0x02,
+    KEYTYPE_ENCRYPTED = 0x03,
+  };
+
+  /* List of supported key size */
+  enum
+  {
+    KEYSIZE_16 =  16,
+    KEYSIZE_32 = 32,
+  };
+
+  typedef PACKED_STRUCT{
+  uint8_t KeyType;
+  uint8_t KeySize;
+  uint8_t KeyData[32 + 12];
+  } SHCI_C2_FUS_StoreUsrKey_Cmd_Param_t;
+
+  /** Response parameters*/
+  /** It responds a 1 byte value holding the index given for the stored key */
+
+#define SHCI_OPCODE_C2_FUS_LOAD_USR_KEY         (( SHCI_OGF << 10) + SHCI_OCF_C2_FUS_LOAD_USR_KEY)
+  /** Command parameters */
+  /** 1 byte holding the key index value */
+
+  /** No response parameters*/
+
+#define SHCI_OPCODE_C2_FUS_START_WS             (( SHCI_OGF << 10) + SHCI_OCF_C2_FUS_START_WS)
+/** No command parameters */
+/** No response parameters*/
+
+#define SHCI_OPCODE_C2_FUS_RESERVED2            (( SHCI_OGF << 10) + SHCI_OCF_C2_FUS_RESERVED2)
+/** No command parameters */
+/** No response parameters*/
+
+#define SHCI_OPCODE_C2_FUS_RESERVED3            (( SHCI_OGF << 10) + SHCI_OCF_C2_FUS_RESERVED3)
+/** No command parameters */
+/** No response parameters*/
+
+#define SHCI_OPCODE_C2_FUS_LOCK_USR_KEY         (( SHCI_OGF << 10) + SHCI_OCF_C2_FUS_LOCK_USR_KEY)
+  /** Command parameters */
+  /** 1 byte holding the key index value */
+
+  /** No response parameters*/
+
+#define SHCI_OPCODE_C2_FUS_UNLOAD_USR_KEY       (( SHCI_OGF << 10) + SHCI_OCF_C2_FUS_UNLOAD_USR_KEY)
+/** No command parameters */
+/** 1 byte holding the key index value */
+
+#define SHCI_OPCODE_C2_FUS_ACTIVATE_ANTIROLLBACK  (( SHCI_OGF << 10) + SHCI_OCF_C2_FUS_ACTIVATE_ANTIROLLBACK)
+/** No command parameters */
+/** No response parameters*/
+
+#define SHCI_OPCODE_C2_FUS_RESERVED7            (( SHCI_OGF << 10) + SHCI_OCF_C2_FUS_RESERVED7)
+/** No command parameters */
+/** No response parameters*/
+
+#define SHCI_OPCODE_C2_FUS_RESERVED8            (( SHCI_OGF << 10) + SHCI_OCF_C2_FUS_RESERVED8)
+/** No command parameters */
+/** No response parameters*/
+
+#define SHCI_OPCODE_C2_FUS_RESERVED9            (( SHCI_OGF << 10) + SHCI_OCF_C2_FUS_RESERVED9)
+/** No command parameters */
+/** No response parameters*/
+
+#define SHCI_OPCODE_C2_FUS_RESERVED10           (( SHCI_OGF << 10) + SHCI_OCF_C2_FUS_RESERVED10)
+/** No command parameters */
+/** No response parameters*/
+
+#define SHCI_OPCODE_C2_FUS_RESERVED11           (( SHCI_OGF << 10) + SHCI_OCF_C2_FUS_RESERVED11)
+/** No command parameters */
+/** No response parameters*/
+
+#define SHCI_OPCODE_C2_FUS_RESERVED12           (( SHCI_OGF << 10) + SHCI_OCF_C2_FUS_RESERVED12)
+/** No command parameters */
+/** No response parameters*/
+
+#define SHCI_OPCODE_C2_BLE_INIT                 (( SHCI_OGF << 10) + SHCI_OCF_C2_BLE_INIT)
+  /** THE ORDER SHALL NOT BE CHANGED    */
+  typedef PACKED_STRUCT{
+  uint8_t* pBleBufferAddress;   /**< NOT USED - shall be set to 0 */
+  uint32_t BleBufferSize;       /**< NOT USED - shall be set to 0 */
+
+  /**
+   * NumAttrRecord
+   * Maximum number of attribute records related to all the required characteristics (excluding the services)
+   * that can be stored in the GATT database, for the specific BLE user application.
+   * For each characteristic, the number of attribute records goes from two to five depending on the characteristic properties:
+   *    - minimum of two (one for declaration and one for the value)
+   *    - add one more record for each additional property: notify or indicate, broadcast, extended property.
+   * The total calculated value must be increased by 9, due to the records related to the standard attribute profile and
+   * GAP service characteristics, and automatically added when initializing GATT and GAP layers
+   *  - Min value: <number of user attributes> + 9
+   *  - Max value: depending on the GATT database defined by user application
+   */
+  uint16_t NumAttrRecord;
+
+  /**
+   * NumAttrServ
+   * Defines the maximum number of services that can be stored in the GATT database. Note that the GAP and GATT services
+   * are automatically added at initialization so this parameter must be the number of user services increased by two.
+   *    - Min value: <number of user service> + 2
+   *    - Max value: depending GATT database defined by user application
+   */
+  uint16_t NumAttrServ;
+
+  /**
+   * AttrValueArrSize
+   * NOTE: This parameter is ignored by the CPU2 when the parameter "Options" is set to "LL_only" ( see Options description in that structure )
+   *
+   * Size of the storage area for the attribute values.
+   * Each characteristic contributes to the attrValueArrSize value as follows:
+   *    - Characteristic value length plus:
+   *        + 5 bytes if characteristic UUID is 16 bits
+   *        + 19 bytes if characteristic UUID is 128 bits
+   *        + 2 bytes if characteristic has a server configuration descriptor
+   *        + 2 bytes * NumOfLinks if the characteristic has a client configuration descriptor
+   *        + 2 bytes if the characteristic has extended properties
+   * Each descriptor contributes to the attrValueArrSize value as follows:
+   *    - Descriptor length
+   */
+  uint16_t AttrValueArrSize;
+
+  /**
+   * NumOfLinks
+   * Maximum number of BLE links supported
+   *    - Min value: 1
+   *    - Max value: 8
+   */
+  uint8_t NumOfLinks;
+
+  /**
+   * ExtendedPacketLengthEnable
+   * Disable/enable the extended packet length BLE 5.0 feature
+   *    - Disable: 0
+   *    - Enable: 1
+   */
+  uint8_t ExtendedPacketLengthEnable;
+
+  /**
+   * PrWriteListSize
+   * NOTE: This parameter is ignored by the CPU2 when the parameter "Options" is set to "LL_only" ( see Options description in that structure )
+   *
+   * Maximum number of supported "prepare write request"
+   *    - Min value: given by the macro DEFAULT_PREP_WRITE_LIST_SIZE
+   *    - Max value: a value higher than the minimum required can be specified, but it is not recommended
+   */
+  uint8_t PrWriteListSize;
+
+  /**
+   * MblockCount
+   * NOTE: This parameter is overwritten by the CPU2 with an hardcoded optimal value when the parameter "Options" is set to "LL_only"
+   * ( see Options description in that structure )
+   *
+   * Number of allocated memory blocks for the BLE stack
+   *     - Min value: given by the macro MBLOCKS_CALC
+   *     - Max value: a higher value can improve data throughput performance, but uses more memory
+   */
+  uint8_t MblockCount;
+
+  /**
+   * AttMtu
+   * NOTE: This parameter is ignored by the CPU2 when the parameter "Options" is set to "LL_only" ( see Options description in that structure )
+   *
+   * Maximum ATT MTU size supported
+   *     - Min value: 23
+   *     - Max value: 512
+   */
+  uint16_t AttMtu;
+
+  /**
+   * PeripheralSca
+   * The sleep clock accuracy (ppm value) that used in BLE connected Peripheral mode to calculate the window widening
+   * (in combination with the sleep clock accuracy sent by master in CONNECT_REQ PDU),
+   * refer to BLE 5.0 specifications - Vol 6 - Part B - chap 4.5.7 and 4.2.2
+   *     - Min value: 0
+   *     - Max value: 500 (worst possible admitted by specification)
+   */
+  uint16_t PeripheralSca;
+
+  /**
+   * CentralSca
+   * The sleep clock accuracy handled in Central mode. It is used to determine the connection and advertising events timing.
+   * It is transmitted to the slave in CONNEC_REQ PDU used by the slave to calculate the window widening,
+   * see PeripheralSca and Bluetooth Core Specification v5.0 Vol 6 - Part B - chap 4.5.7 and 4.2.2
+   * Possible values:
+   *    - 251 ppm to 500 ppm: 0
+   *    - 151 ppm to 250 ppm: 1
+   *    - 101 ppm to 150 ppm: 2
+   *    - 76 ppm to 100 ppm: 3
+   *    - 51 ppm to 75 ppm: 4
+   *    - 31 ppm to 50 ppm: 5
+   *    - 21 ppm to 30 ppm: 6
+   *    - 0 ppm to 20 ppm: 7
+   */
+  uint8_t CentralSca;
+
+  /**
+   * LsSource
+   * Some information for Low speed clock mapped in bits field
+   * - bit 0:   1: Calibration for the RF system wakeup clock source   0: No calibration for the RF system wakeup clock source
+   * - bit 1:   1: STM32W5M Module device                              0: Other devices as STM32WBxx SOC, STM32WB1M module
+   * - bit 2:   1: HSE/1024 Clock config                               0: LSE Clock config
+   */
+  uint8_t LsSource;
+
+  /**
+   * MaxConnEventLength
+   * This parameter determines the maximum duration of a slave connection event. When this duration is reached the slave closes
+   * the current connections event (whatever is the CE_length parameter specified by the master in HCI_CREATE_CONNECTION HCI command),
+   * expressed in units of 625/256 us (~2.44 us)
+   *    - Min value: 0 (if 0 is specified, the master and slave perform only a single TX-RX exchange per connection event)
+   *    - Max value: 1638400 (4000 ms). A higher value can be specified (max 0xFFFFFFFF) but results in a maximum connection time
+   *      of 4000 ms as specified. In this case the parameter is not applied, and the predicted CE length calculated on slave is not shortened
+   */
+  uint32_t MaxConnEventLength;
+
+  /**
+   * HsStartupTime
+   * Startup time of the high speed (16 or 32 MHz) crystal oscillator in units of 625/256 us (~2.44 us).
+   *    - Min value: 0
+   *    - Max value:  820 (~2 ms). A higher value can be specified, but the value that implemented in stack is forced to ~2 ms
+   */
+  uint16_t HsStartupTime;
+
+  /**
+   * ViterbiEnable
+   * Viterbi implementation in BLE LL reception.
+   *    - 0: Enable
+   *    - 1: Disable
+   */
+  uint8_t ViterbiEnable;
+
+  /**
+   * Options flags
+   * - bit 0:   1: LL only                          0: LL + host
+   * - bit 1:   1: no service change desc.          0: with service change desc.
+   * - bit 2:   1: device name Read-Only            0: device name R/W
+   * - bit 3:   1: extended advertizing supported   0: extended advertizing not supported
+   * - bit 4:   1: CS Algo #2 supported             0: CS Algo #2 not supported
+   * - bit 5:   1: Reduced GATT database in NVM     0: Full GATT database in NVM
+   * - bit 6:   1: GATT caching is used             0: GATT caching is not used
+   * - bit 7:   1: LE Power Class 1                 0: LE Power Class 2-3
+   * - other bits: complete with Options_extension flag
+   */
+  uint8_t Options;
+
+  /**
+   * HwVersion
+   * Reserved for future use - shall be set to 0
+   */
+  uint8_t HwVersion;
+
+  /**
+   * Maximum number of connection-oriented channels in initiator mode.
+   * Range: 0 .. 64
+   */
+  uint8_t max_coc_initiator_nbr;
+
+  /**
+   * Minimum transmit power in dBm supported by the Controller.
+   * Range: -127 .. 20
+   */
+  int8_t min_tx_power;
+
+  /**
+   * Maximum transmit power in dBm supported by the Controller.
+   * Range: -127 .. 20
+   */
+  int8_t max_tx_power;
+
+   /**
+   * RX model configuration
+   * - bit 0:   1: agc_rssi model improved vs RF blockers    0: Legacy agc_rssi model
+   * - other bits: reserved ( shall be set to 0)
+   */
+  uint8_t rx_model_config;
+
+  /* Maximum number of advertising sets.
+   * Range: 1 .. 8 with limitation:
+   * This parameter is linked to max_adv_data_len such as both compliant with allocated Total memory computed with BLE_EXT_ADV_BUFFER_SIZE based
+   * on Max Extended advertising configuration supported.
+   * This parameter is considered by the CPU2 when Options has SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV flag set
+   */
+  uint8_t max_adv_set_nbr;
+
+  /* Maximum advertising data length (in bytes)
+   * Range: 31 .. 1650 with limitation:
+   * This parameter is linked to max_adv_set_nbr such as both compliant with allocated Total memory computed with BLE_EXT_ADV_BUFFER_SIZE based
+   * on Max Extended advertising configuration supported.
+   * This parameter is considered by the CPU2 when Options has SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV flag set
+   */
+  uint16_t max_adv_data_len;
+
+  /* RF TX Path Compensation Value (16-bit signed integer). Units: 0.1 dB.
+   * Range: -1280 .. 1280
+   */
+  int16_t tx_path_compens;
+
+  /* RF RX Path Compensation Value (16-bit signed integer). Units: 0.1 dB.
+   * Range: -1280 .. 1280
+   */
+  int16_t rx_path_compens;
+
+  /* BLE core specification version (8-bit unsigned integer).
+   * values as: 11(5.2), 12(5.3), 13(5.4)
+   */
+  uint8_t ble_core_version;
+
+   /**
+   * Options flags extension
+   * - bit 0:   1: appearance Writable              0: appearance Read-Only
+   * - bit 1:   1: Enhanced ATT supported           0: Enhanced ATT not supported
+   * - other bits: reserved ( shall be set to 0)
+   */
+  uint8_t Options_extension;
+
+      } SHCI_C2_Ble_Init_Cmd_Param_t;
+
+  typedef PACKED_STRUCT{
+    SHCI_Header_t Header;       /** Does not need to be initialized by the user */
+    SHCI_C2_Ble_Init_Cmd_Param_t Param;
+  } SHCI_C2_Ble_Init_Cmd_Packet_t;
+
+  /**
+   * Options
+   * Each definition below may be added together to build the Options value
+   * WARNING : Only one definition per bit shall be added to build the Options value
+   */
+#define SHCI_C2_BLE_INIT_OPTIONS_LL_ONLY                              (1<<0)
+#define SHCI_C2_BLE_INIT_OPTIONS_LL_HOST                              (0<<0)
+
+#define SHCI_C2_BLE_INIT_OPTIONS_NO_SVC_CHANGE_DESC                   (1<<1)
+#define SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC                 (0<<1)
+
+#define SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RO                       (1<<2)
+#define SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW                       (0<<2)
+
+#define SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV                              (1<<3)
+#define SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV                           (0<<3)
+
+#define SHCI_C2_BLE_INIT_OPTIONS_CS_ALGO2                             (1<<4)
+#define SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2                          (0<<4)
+
+#define SHCI_C2_BLE_INIT_OPTIONS_REDUC_GATTDB_NVM                     (1<<5)
+#define SHCI_C2_BLE_INIT_OPTIONS_FULL_GATTDB_NVM                      (0<<5)
+
+#define SHCI_C2_BLE_INIT_OPTIONS_GATT_CACHING_USED                    (1<<6)
+#define SHCI_C2_BLE_INIT_OPTIONS_GATT_CACHING_NOTUSED                 (0<<6)
+
+#define SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_1                        (1<<7)
+#define SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3                      (0<<7)
+
+  /**
+   * Options extension
+   * Each definition below may be added together to build the Options value
+   * WARNING : Only one definition per bit shall be added to build the Options value
+   */
+#define SHCI_C2_BLE_INIT_OPTIONS_APPEARANCE_WRITABLE                  (1<<0)
+#define SHCI_C2_BLE_INIT_OPTIONS_APPEARANCE_READONLY                  (0<<0)
+
+#define SHCI_C2_BLE_INIT_OPTIONS_ENHANCED_ATT_SUPPORTED               (1<<1)
+#define SHCI_C2_BLE_INIT_OPTIONS_ENHANCED_ATT_NOTSUPPORTED            (0<<1)
+
+    /**
+   * RX models configuration
+   */
+#define SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY                     (0<<0)
+#define SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_BLOCKER                    (1<<0)
+
+  /**
+   * BLE core version
+   */
+#define SHCI_C2_BLE_INIT_BLE_CORE_5_2               11
+#define SHCI_C2_BLE_INIT_BLE_CORE_5_3               12
+#define SHCI_C2_BLE_INIT_BLE_CORE_5_4               13
+
+   /**
+   * LsSource information
+   */
+#define SHCI_C2_BLE_INIT_CFG_BLE_LS_NOCALIB                     (0<<0)
+#define SHCI_C2_BLE_INIT_CFG_BLE_LS_CALIB                       (1<<0)
+#define SHCI_C2_BLE_INIT_CFG_BLE_LS_OTHER_DEV                   (0<<1)
+#define SHCI_C2_BLE_INIT_CFG_BLE_LS_MOD5MM_DEV                  (1<<1)
+#define SHCI_C2_BLE_INIT_CFG_BLE_LS_CLK_LSE                     (0<<2)
+#define SHCI_C2_BLE_INIT_CFG_BLE_LS_CLK_HSE_1024                (1<<2)
+
+#define SHCI_OPCODE_C2_THREAD_INIT              (( SHCI_OGF << 10) + SHCI_OCF_C2_THREAD_INIT)
+/** No command parameters */
+/** No response parameters*/
+
+#define SHCI_OPCODE_C2_DEBUG_INIT              (( SHCI_OGF << 10) + SHCI_OCF_C2_DEBUG_INIT)
+  /** Command parameters */
+    typedef PACKED_STRUCT
+    {
+      uint8_t thread_config;
+      uint8_t ble_config;
+      uint8_t mac_802_15_4_config;
+      uint8_t zigbee_config;
+    } SHCI_C2_DEBUG_TracesConfig_t;
+
+    typedef PACKED_STRUCT
+    {
+      uint8_t ble_dtb_cfg;
+  /**
+   * sys_dbg_cfg1 options flag
+   * - bit 0:   0: IP BLE core in LP mode    1: IP BLE core in run mode (no LP supported)
+   * - bit 1:   0: CPU2 STOP mode Enable     1: CPU2 STOP mode Disable
+   * - bit [2-7]: bits reserved ( shall be set to 0)
+   */
+      uint8_t sys_dbg_cfg1;
+      uint8_t reserved[2];
+      uint16_t STBY_DebugGpioaPinList;
+      uint16_t STBY_DebugGpiobPinList;
+      uint16_t STBY_DebugGpiocPinList;
+      uint16_t STBY_DtbGpioaPinList;
+      uint16_t STBY_DtbGpiobPinList;
+    } SHCI_C2_DEBUG_GeneralConfig_t;
+
+    typedef PACKED_STRUCT{
+      uint8_t *pGpioConfig;
+      uint8_t *pTracesConfig;
+      uint8_t *pGeneralConfig;
+      uint8_t GpioConfigSize;
+      uint8_t TracesConfigSize;
+      uint8_t GeneralConfigSize;
+    } SHCI_C2_DEBUG_init_Cmd_Param_t;
+
+    typedef PACKED_STRUCT{
+      SHCI_Header_t Header;       /** Does not need to be initialized by the user */
+      SHCI_C2_DEBUG_init_Cmd_Param_t Param;
+    } SHCI_C2_DEBUG_Init_Cmd_Packet_t;
+    /** No response parameters*/
+
+    /**
+   * Options
+   * Each definition below may be added together to build the Options value
+   * WARNING : Only one definition per bit shall be added to build the Options value
+   */
+#define SHCI_C2_DEBUG_OPTIONS_IPCORE_LP                              (0<<0)
+#define SHCI_C2_DEBUG_OPTIONS_IPCORE_NO_LP                           (1<<0)
+
+#define SHCI_C2_DEBUG_OPTIONS_CPU2_STOP_EN                           (0<<1)
+#define SHCI_C2_DEBUG_OPTIONS_CPU2_STOP_DIS                          (1<<1)
+
+
+#define SHCI_OPCODE_C2_FLASH_ERASE_ACTIVITY     (( SHCI_OGF << 10) + SHCI_OCF_C2_FLASH_ERASE_ACTIVITY)
+  /** Command parameters */
+    typedef enum
+    {
+      ERASE_ACTIVITY_OFF =  0x00,
+      ERASE_ACTIVITY_ON = 0x01,
+    } SHCI_EraseActivity_t;
+
+    /** No response parameters*/
+
+#define SHCI_OPCODE_C2_CONCURRENT_SET_MODE          (( SHCI_OGF << 10) + SHCI_OCF_C2_CONCURRENT_SET_MODE)
+/** command parameters */
+    typedef enum
+    {
+      BLE_ENABLE,
+      THREAD_ENABLE,
+      ZIGBEE_ENABLE,
+      MAC_ENABLE,
+    } SHCI_C2_CONCURRENT_Mode_Param_t;
+      /** No response parameters*/
+
+#define SHCI_OPCODE_C2_CONCURRENT_GET_NEXT_BLE_EVT_TIME          (( SHCI_OGF << 10) + SHCI_OCF_C2_CONCURRENT_GET_NEXT_BLE_EVT_TIME)
+/** command parameters */
+    typedef PACKED_STRUCT
+    {
+      uint32_t relative_time;
+    } SHCI_C2_CONCURRENT_GetNextBleEvtTime_Param_t;
+      /** No response parameters*/
+
+#define SHCI_OPCODE_C2_CONCURRENT_ENABLE_NEXT_802154_EVT_NOTIFICATION    (( SHCI_OGF << 10) + SHCI_OCF_C2_CONCURRENT_ENABLE_NEXT_802154_EVT_NOTIFICATION)
+    /** No command parameters */
+    /** No response parameters*/
+
+#define SHCI_OPCODE_C2_FLASH_STORE_DATA          (( SHCI_OGF << 10) + SHCI_OCF_C2_FLASH_STORE_DATA)
+#define SHCI_OPCODE_C2_FLASH_ERASE_DATA          (( SHCI_OGF << 10) + SHCI_OCF_C2_FLASH_ERASE_DATA)
+/** command parameters */
+    typedef enum
+    {
+      BLE_IP,
+      THREAD_IP,
+      ZIGBEE_IP,
+    } SHCI_C2_FLASH_Ip_t;
+      /** No response parameters*/
+
+#define SHCI_OPCODE_C2_RADIO_ALLOW_LOW_POWER    (( SHCI_OGF << 10) + SHCI_OCF_C2_RADIO_ALLOW_LOW_POWER)
+
+#define SHCI_OPCODE_C2_MAC_802_15_4_INIT        (( SHCI_OGF << 10) + SHCI_OCF_C2_MAC_802_15_4_INIT)
+
+#define SHCI_OPCODE_C2_REINIT                   (( SHCI_OGF << 10) + SHCI_OCF_C2_REINIT)
+
+#define SHCI_OPCODE_C2_ZIGBEE_INIT              (( SHCI_OGF << 10) + SHCI_OCF_C2_ZIGBEE_INIT)
+
+#define SHCI_OPCODE_C2_LLD_TESTS_INIT           (( SHCI_OGF << 10) + SHCI_OCF_C2_LLD_TESTS_INIT)
+
+#define SHCI_OPCODE_C2_BLE_LLD_INIT             (( SHCI_OGF << 10) + SHCI_OCF_C2_BLE_LLD_INIT)
+
+#define SHCI_OPCODE_C2_EXTPA_CONFIG             (( SHCI_OGF << 10) + SHCI_OCF_C2_EXTPA_CONFIG)
+  /** Command parameters */
+    enum
+    {
+      EXT_PA_ENABLED_LOW,
+      EXT_PA_ENABLED_HIGH,
+    }/* gpio_polarity */;
+
+    enum
+    {
+      EXT_PA_DISABLED,
+      EXT_PA_ENABLED,
+    }/* gpio_status */;
+
+    typedef PACKED_STRUCT{
+      uint32_t gpio_port;
+      uint16_t gpio_pin_number;
+      uint8_t gpio_polarity;
+      uint8_t gpio_status;
+    } SHCI_C2_EXTPA_CONFIG_Cmd_Param_t;
+
+    /** No response parameters*/
+
+#define SHCI_OPCODE_C2_SET_FLASH_ACTIVITY_CONTROL   (( SHCI_OGF << 10) + SHCI_OCF_C2_SET_FLASH_ACTIVITY_CONTROL)
+  /** Command parameters */
+    typedef enum
+    {
+      FLASH_ACTIVITY_CONTROL_PES,
+      FLASH_ACTIVITY_CONTROL_SEM7,
+    }SHCI_C2_SET_FLASH_ACTIVITY_CONTROL_Source_t;
+
+    /** No response parameters*/
+
+#define SHCI_OPCODE_C2_CONFIG   (( SHCI_OGF << 10) + SHCI_OCF_C2_CONFIG)
+
+  /** Command parameters */
+    typedef PACKED_STRUCT{
+      uint8_t PayloadCmdSize;
+      uint8_t Config1;
+      uint8_t EvtMask1;
+      uint8_t Spare1;
+      uint32_t BleNvmRamAddress;
+      uint32_t ThreadNvmRamAddress;
+      uint16_t RevisionID;
+      uint16_t DeviceID;
+    } SHCI_C2_CONFIG_Cmd_Param_t;
+
+#define SHCI_OPCODE_C2_802_15_4_DEINIT    (( SHCI_OGF << 10) + SHCI_OCF_C2_802_15_4_DEINIT)
+
+#define SHCI_OPCODE_C2_SET_SYSTEM_CLOCK   (( SHCI_OGF << 10) + SHCI_OCF_C2_SET_SYSTEM_CLOCK)
+  /** Command parameters */
+    typedef enum
+    {
+      SET_SYSTEM_CLOCK_HSE_TO_PLL,
+      SET_SYSTEM_CLOCK_PLL_ON_TO_HSE,
+      SET_SYSTEM_CLOCK_PLL_OFF_TO_HSE,
+    }SHCI_C2_SET_SYSTEM_CLOCK_Cmd_Param_t;
+
+/**
+ * PayloadCmdSize
+ * Value that shall be used
+ */
+#define SHCI_C2_CONFIG_PAYLOAD_CMD_SIZE   (sizeof(SHCI_C2_CONFIG_Cmd_Param_t) - 1)
+
+/**
+ * Device revision ID
+ */
+#define SHCI_C2_CONFIG_CUT2_0                        (0x2000)
+#define SHCI_C2_CONFIG_CUT2_1                        (0x2001)
+#define SHCI_C2_CONFIG_CUT2_2                        (0x2003)
+
+/**
+ * Device ID
+ */
+#define SHCI_C2_CONFIG_STM32WB55xx                    (0x495)
+#define SHCI_C2_CONFIG_STM32WB15xx                    (0x494)
+
+/**
+ * Config1
+ * Each definition below may be added together to build the Config1 value
+ * WARNING : Only one definition per bit shall be added to build the Config1 value
+ */
+#define SHCI_C2_CONFIG_CONFIG1_BIT0_BLE_NVM_DATA_TO_INTERNAL_FLASH    (0<<0)
+#define SHCI_C2_CONFIG_CONFIG1_BIT0_BLE_NVM_DATA_TO_SRAM              (1<<0)
+#define SHCI_C2_CONFIG_CONFIG1_BIT1_THREAD_NVM_DATA_TO_INTERNAL_FLASH (0<<1)
+#define SHCI_C2_CONFIG_CONFIG1_BIT1_THREAD_NVM_DATA_TO_SRAM           (1<<1)
+#define SHCI_C2_CONFIG_CONFIG1_BIT2_SET_EUI64_FORMAT                  (1<<2)
+
+/**
+ * EvtMask1
+ * Each definition below may be added together to build the EvtMask1 value
+ */
+#define SHCI_C2_CONFIG_EVTMASK1_BIT0_ERROR_NOTIF_ENABLE               (1<<0)
+#define SHCI_C2_CONFIG_EVTMASK1_BIT1_BLE_NVM_RAM_UPDATE_ENABLE        (1<<1)
+#define SHCI_C2_CONFIG_EVTMASK1_BIT2_THREAD_NVM_RAM_UPDATE_ENABLE     (1<<2)
+#define SHCI_C2_CONFIG_EVTMASK1_BIT3_NVM_START_WRITE_ENABLE           (1<<3)
+#define SHCI_C2_CONFIG_EVTMASK1_BIT4_NVM_END_WRITE_ENABLE             (1<<4)
+#define SHCI_C2_CONFIG_EVTMASK1_BIT5_NVM_START_ERASE_ENABLE           (1<<5)
+#define SHCI_C2_CONFIG_EVTMASK1_BIT6_NVM_END_ERASE_ENABLE             (1<<6)
+
+/**
+ * BleNvmRamAddress
+ * The buffer shall have a size of BLE_NVM_SRAM_SIZE number of 32bits
+ * The buffer shall be allocated in SRAM2
+ */
+#define BLE_NVM_SRAM_SIZE (507)
+
+/**
+ * ThreadNvmRamAddress
+ * The buffer shall have a size of THREAD_NVM_SRAM_SIZE number of 32bits
+ * The buffer shall be allocated in SRAM2
+ */
+#define THREAD_NVM_SRAM_SIZE (1016)
+
+
+  /** No response parameters*/
+
+ /* Exported type --------------------------------------------------------*/
+#define FUS_DEVICE_INFO_TABLE_VALIDITY_KEYWORD    (0xA94656B9)
+
+/*
+  *   At startup, the information relative to the wireless binary are stored in RAM through a structure defined by
+  *   MB_WirelessFwInfoTable_t.This structure contains 4 fields (Version,MemorySize, Stack_info and a reserved part)
+  *   each of those coded on 32 bits as shown on the table below:
+  *
+  *
+  *               |7 |6 |5 |4 |3 |2 |1 |0 |7 |6 |5 |4 |3 |2 |1 |0 |7 |6 |5 |4 |3 |2 |1 |0 |7 |6 |5 |4 |3 |2 |1 |0 |
+  *               -------------------------------------------------------------------------------------------------
+  * Version       |   Major version       |    Minor version      |    Sub version        | Branch    |ReleaseType|
+  *               -------------------------------------------------------------------------------------------------
+  * MemorySize    |   SRAM2B (kB)         |    SRAM2A (kB)        |    SRAM1 (kB)         | FLASH (4kb)           |
+  *               -------------------------------------------------------------------------------------------------
+  * Info stack    |   Reserved            |    Reserved           |    Reserved           | Type (MAC,Thread,BLE) |
+  *               -------------------------------------------------------------------------------------------------
+  * Reserved      |   Reserved            |    Reserved           |    Reserved           | Reserved              |
+  *               -------------------------------------------------------------------------------------------------
+  *
+  */
+
+/* Field Version */
+#define INFO_VERSION_MAJOR_OFFSET                   24
+#define INFO_VERSION_MAJOR_MASK                     0xff000000
+#define INFO_VERSION_MINOR_OFFSET                   16
+#define INFO_VERSION_MINOR_MASK                     0x00ff0000
+#define INFO_VERSION_SUB_OFFSET                     8
+#define INFO_VERSION_SUB_MASK                       0x0000ff00
+#define INFO_VERSION_BRANCH_OFFSET                  4
+#define INFO_VERSION_BRANCH_MASK                    0x0000000f0
+#define INFO_VERSION_TYPE_OFFSET                    0
+#define INFO_VERSION_TYPE_MASK                      0x00000000f
+
+#define INFO_VERSION_TYPE_RELEASE                   1
+
+/* Field Memory */
+#define INFO_SIZE_SRAM2B_OFFSET                     24
+#define INFO_SIZE_SRAM2B_MASK                       0xff000000
+#define INFO_SIZE_SRAM2A_OFFSET                     16
+#define INFO_SIZE_SRAM2A_MASK                       0x00ff0000
+#define INFO_SIZE_SRAM1_OFFSET                      8
+#define INFO_SIZE_SRAM1_MASK                        0x0000ff00
+#define INFO_SIZE_FLASH_OFFSET                      0
+#define INFO_SIZE_FLASH_MASK                        0x000000ff
+
+/* Field stack information */
+#define INFO_STACK_TYPE_OFFSET                      0
+#define INFO_STACK_TYPE_MASK                        0x000000ff
+#define INFO_STACK_TYPE_NONE                        0
+
+#define INFO_STACK_TYPE_BLE_FULL                    0x01
+#define INFO_STACK_TYPE_BLE_HCI                     0x02
+#define INFO_STACK_TYPE_BLE_LIGHT                   0x03
+#define INFO_STACK_TYPE_BLE_BEACON                  0x04
+#define INFO_STACK_TYPE_BLE_BASIC                   0x05
+#define INFO_STACK_TYPE_BLE_FULL_EXT_ADV            0x06
+#define INFO_STACK_TYPE_BLE_HCI_EXT_ADV             0x07
+#define INFO_STACK_TYPE_THREAD_FTD                  0x10
+#define INFO_STACK_TYPE_THREAD_MTD                  0x11
+#define INFO_STACK_TYPE_ZIGBEE_FFD                  0x30
+#define INFO_STACK_TYPE_ZIGBEE_RFD                  0x31
+#define INFO_STACK_TYPE_MAC                         0x40
+#define INFO_STACK_TYPE_BLE_THREAD_FTD_STATIC       0x50
+#define INFO_STACK_TYPE_BLE_THREAD_FTD_DYNAMIC      0x51
+#define INFO_STACK_TYPE_BLE_THREAD_LIGHT_DYNAMIC    0x52
+#define INFO_STACK_TYPE_802154_LLD_TESTS            0x60
+#define INFO_STACK_TYPE_802154_PHY_VALID            0x61
+#define INFO_STACK_TYPE_BLE_PHY_VALID               0x62
+#define INFO_STACK_TYPE_BLE_LLD_TESTS               0x63
+#define INFO_STACK_TYPE_BLE_RLV                     0x64
+#define INFO_STACK_TYPE_802154_RLV                  0x65
+#define INFO_STACK_TYPE_BLE_ZIGBEE_FFD_STATIC       0x70
+#define INFO_STACK_TYPE_BLE_ZIGBEE_RFD_STATIC       0x71
+#define INFO_STACK_TYPE_BLE_ZIGBEE_FFD_DYNAMIC      0x78
+#define INFO_STACK_TYPE_BLE_ZIGBEE_RFD_DYNAMIC      0x79
+#define INFO_STACK_TYPE_RLV                         0x80
+#define INFO_STACK_TYPE_BLE_MAC_STATIC              0x90
+
+typedef struct {
+/**
+ * Wireless Info
+ */
+  uint8_t VersionMajor;
+  uint8_t VersionMinor;
+  uint8_t VersionSub;
+  uint8_t VersionBranch;
+  uint8_t VersionReleaseType;
+  uint8_t MemorySizeSram2B;     /*< Multiple of 1K */
+  uint8_t MemorySizeSram2A;     /*< Multiple of 1K */
+  uint8_t MemorySizeSram1;      /*< Multiple of 1K */
+  uint8_t MemorySizeFlash;      /*< Multiple of 4K */
+  uint8_t StackType;
+/**
+ * Fus Info
+ */
+  uint8_t FusVersionMajor;
+  uint8_t FusVersionMinor;
+  uint8_t FusVersionSub;
+  uint8_t FusMemorySizeSram2B;  /*< Multiple of 1K */
+  uint8_t FusMemorySizeSram2A;  /*< Multiple of 1K */
+  uint8_t FusMemorySizeFlash;   /*< Multiple of 4K */
+}WirelessFwInfo_t;
+
+
+/* Exported functions ------------------------------------------------------- */
+
+  /**
+  * SHCI_C2_FUS_GetState
+  * @brief Read the FUS State
+  *        If the user is not interested by the Error code response, a null value may
+  *        be passed as parameter
+  *
+  *        Note:  This command is fully supported only by the FUS.
+  *               When the wireless firmware receives that command, it responds SHCI_FUS_CMD_NOT_SUPPORTED the first time.
+  *               When the wireless firmware receives that command a second time, it reboots the full device with the FUS running on CPU2
+  *
+  * @param  p_rsp : return the error code when the FUS State Value = 0xFF
+  * @retval FUS State Values
+  */
+  uint8_t SHCI_C2_FUS_GetState( SHCI_FUS_GetState_ErrorCode_t *p_rsp );
+
+  /**
+  * SHCI_C2_FUS_FwUpgrade
+  * @brief Request the FUS to install the CPU2 firmware update
+  *        Note:  This command is only supported by the FUS.
+  *
+  * @param  fw_src_add: Address of the firmware image location
+  * @param  fw_dest_add: Address of the firmware destination
+  * @retval Status
+  */
+  SHCI_CmdStatus_t SHCI_C2_FUS_FwUpgrade( uint32_t fw_src_add,  uint32_t fw_dest_add );
+
+  /**
+  * SHCI_C2_FUS_FwDelete
+  * @brief Delete the wireless stack on CPU2
+  *        Note:  This command is only supported by the FUS.
+  *
+  * @param  None
+  * @retval Status
+  */
+  SHCI_CmdStatus_t SHCI_C2_FUS_FwDelete( void );
+
+  /**
+  * SHCI_C2_FUS_UpdateAuthKey
+  * @brief Request the FUS to update the authentication key
+  *        Note:  This command is only supported by the FUS.
+  *
+  * @param  pCmdPacket
+  * @retval Status
+  */
+  SHCI_CmdStatus_t SHCI_C2_FUS_UpdateAuthKey( SHCI_C2_FUS_UpdateAuthKey_Cmd_Param_t *pParam );
+
+  /**
+  * SHCI_C2_FUS_LockAuthKey
+  * @brief Request the FUS to prevent any future update of the authentication key
+  *        Note:  This command is only supported by the FUS.
+  *
+  * @param  None
+  * @retval Status
+  */
+  SHCI_CmdStatus_t SHCI_C2_FUS_LockAuthKey( void );
+
+  /**
+  * SHCI_C2_FUS_StoreUsrKey
+  * @brief Request the FUS to store the user key
+  *        Note:  This command is supported by both the FUS and the wireless stack.
+  *
+  * @param  pParam : command parameter
+  * @param  p_key_index : Index allocated by the FUS to the stored key
+  *
+  * @retval Status
+  */
+  SHCI_CmdStatus_t SHCI_C2_FUS_StoreUsrKey( SHCI_C2_FUS_StoreUsrKey_Cmd_Param_t *pParam, uint8_t *p_key_index );
+
+  /**
+  * SHCI_C2_FUS_LoadUsrKey
+  * @brief Request the FUS to load the user key into the AES
+  *        Note:  This command is supported by both the FUS and the wireless stack.
+  *
+  * @param  key_index : index of the user key to load in AES1
+  * @retval Status
+  */
+  SHCI_CmdStatus_t SHCI_C2_FUS_LoadUsrKey( uint8_t key_index );
+
+  /**
+  * SHCI_C2_FUS_StartWs
+  * @brief Request the FUS to reboot on the wireless stack
+  *        Note:  This command is only supported by the FUS.
+  *
+  * @param  None
+  * @retval Status
+  */
+  SHCI_CmdStatus_t SHCI_C2_FUS_StartWs( void );
+
+  /**
+  * SHCI_C2_FUS_LockUsrKey
+  * @brief Request the FUS to lock the user key so that it cannot be updated later on
+  *        Note:  This command is supported by both the FUS and the wireless stack.
+  *
+  * @param  key_index : index of the user key to lock
+  * @retval Status
+  */
+  SHCI_CmdStatus_t SHCI_C2_FUS_LockUsrKey( uint8_t key_index );
+
+  /**
+  * SHCI_C2_FUS_UnloadUsrKey
+  * @brief Request the FUS to Unload the user key so that the CPU1 may use the AES with another Key
+  *        Note:  This command is supported by both the FUS and the wireless stack.
+  *
+  * @param  key_index : index of the user key to unload
+  * @retval Status
+  */
+  SHCI_CmdStatus_t SHCI_C2_FUS_UnloadUsrKey( uint8_t key_index );
+
+  /**
+  * SHCI_C2_FUS_ActivateAntiRollback
+  * @brief Request the FUS to enable the AntiRollback feature so that it is not possible to update the wireless firmware
+  *        with an older version than the current one.
+  *        Note:
+  *               - This command is only supported by the FUS.
+  *               - Once this feature is enabled, it is not possible anymore to disable it.
+  *
+  * @param  None
+  * @retval Status
+  */
+  SHCI_CmdStatus_t SHCI_C2_FUS_ActivateAntiRollback( void );
+
+  /**
+  * SHCI_C2_BLE_Init
+  * @brief Provides parameters and starts the BLE Stack
+  *
+  * @param  pCmdPacket : Parameters are described SHCI_C2_Ble_Init_Cmd_Packet_t declaration
+  * @retval Status
+  */
+  SHCI_CmdStatus_t SHCI_C2_BLE_Init( SHCI_C2_Ble_Init_Cmd_Packet_t *pCmdPacket );
+
+  /**
+  * SHCI_C2_THREAD_Init
+  * @brief Starts the THREAD Stack
+  *
+  * @param  None
+  * @retval Status
+  */
+  SHCI_CmdStatus_t SHCI_C2_THREAD_Init( void );
+
+  /**
+  * SHCI_C2_LLDTESTS_Init
+  * @brief Starts the LLD tests CLI
+  *
+  * @param  param_size : Nb of bytes
+  * @param  p_param : pointer with data to give from M4 to M0
+  * @retval Status
+  */
+  SHCI_CmdStatus_t SHCI_C2_LLDTESTS_Init( uint8_t param_size, uint8_t * p_param );
+
+    /**
+  * SHCI_C2_BLE_LLD_Init
+  * @brief Starts the LLD tests BLE
+  *
+  * @param  param_size : Nb of bytes
+  * @param  p_param : pointer with data to give from M4 to M0
+  * @retval Status
+  */
+  SHCI_CmdStatus_t SHCI_C2_BLE_LLD_Init( uint8_t param_size, uint8_t * p_param );
+
+    /**
+  * SHCI_C2_ZIGBEE_Init
+  * @brief Starts the Zigbee Stack
+  *
+  * @param  None
+  * @retval Status
+  */
+  SHCI_CmdStatus_t SHCI_C2_ZIGBEE_Init( void );
+
+  /**
+  * SHCI_C2_DEBUG_Init
+  * @brief Starts the Traces
+  *
+  * @param  None
+  * @retval Status
+  */
+  SHCI_CmdStatus_t SHCI_C2_DEBUG_Init( SHCI_C2_DEBUG_Init_Cmd_Packet_t *pCmdPacket );
+
+  /**
+  * SHCI_C2_FLASH_EraseActivity
+  * @brief Provides the information of the start and the end of a flash erase window on the CPU1
+  *        The protection will be active until next end of radio event.
+  *
+  * @param  erase_activity: Start/End of erase activity
+  * @retval Status
+  */
+  SHCI_CmdStatus_t SHCI_C2_FLASH_EraseActivity( SHCI_EraseActivity_t erase_activity );
+
+  /**
+  * SHCI_C2_CONCURRENT_SetMode
+  * @brief Enable/Disable Thread on CPU2 (M0+)
+  *
+  * @param  Mode: BLE or Thread enable flag
+  * @retval Status
+  */
+  SHCI_CmdStatus_t SHCI_C2_CONCURRENT_SetMode( SHCI_C2_CONCURRENT_Mode_Param_t Mode );
+
+  /**
+  * SHCI_C2_CONCURRENT_GetNextBleEvtTime
+  * @brief Get the next BLE event date (relative time)
+  *
+  * @param  Command Packet
+  * @retval None
+  */
+  SHCI_CmdStatus_t SHCI_C2_CONCURRENT_GetNextBleEvtTime( SHCI_C2_CONCURRENT_GetNextBleEvtTime_Param_t *pParam );
+
+  /**
+  * SHCI_C2_CONCURRENT_EnableNext_802154_EvtNotification
+  * @brief Activate the next 802.15.4 event notification (one shot)
+  *
+  * @param  None
+  * @retval None
+  */
+  SHCI_CmdStatus_t SHCI_C2_CONCURRENT_EnableNext_802154_EvtNotification( void );
+
+  /**
+  * SHCI_C2_FLASH_StoreData
+  * @brief Store Data in Flash
+  *
+  * @param  Ip: BLE or THREAD
+  * @retval Status
+  */
+  SHCI_CmdStatus_t SHCI_C2_FLASH_StoreData( SHCI_C2_FLASH_Ip_t Ip );
+
+  /**
+  * SHCI_C2_FLASH_EraseData
+  * @brief Erase Data in Flash
+  *
+  * @param  Ip: BLE or THREAD
+  * @retval Status
+  */
+  SHCI_CmdStatus_t SHCI_C2_FLASH_EraseData( SHCI_C2_FLASH_Ip_t Ip );
+
+  /**
+  * SHCI_C2_RADIO_AllowLowPower
+  * @brief Allow or forbid IP_radio (802_15_4 or BLE) to enter in low power mode.
+  *
+  * @param  Ip: BLE or 802_15_5
+  * @param  FlagRadioLowPowerOn: True or false
+  * @retval Status
+  */
+  SHCI_CmdStatus_t SHCI_C2_RADIO_AllowLowPower( SHCI_C2_FLASH_Ip_t Ip,uint8_t  FlagRadioLowPowerOn);
+
+
+  /**
+  * SHCI_C2_MAC_802_15_4_Init
+  * @brief Starts the MAC 802.15.4 on M0
+  *
+  * @param  None
+  * @retval Status
+  */
+  SHCI_CmdStatus_t SHCI_C2_MAC_802_15_4_Init( void );
+
+  /**
+   * SHCI_GetWirelessFwInfo
+   * @brief This function read back the information relative to the wireless binary loaded.
+   *         Refer yourself to MB_WirelessFwInfoTable_t structure to get the significance
+   *         of the different parameters returned.
+   * @param  pWirelessInfo : Pointer to WirelessFwInfo_t.
+   *
+   * @retval SHCI_Success
+   */
+  SHCI_CmdStatus_t SHCI_GetWirelessFwInfo( WirelessFwInfo_t* pWirelessInfo );
+
+  /**
+  * SHCI_C2_Reinit
+  * @brief This is required to allow the CPU1 to fake a set C2BOOT when it has already been set.
+  *        In order to fake a C2BOOT, the CPU1 shall :
+  *        - Send SHCI_C2_Reinit()
+  *        - call SEV instruction
+  *        WARNING:
+  *        This function is intended to be used by the SBSFU
+  *
+  * @param  None
+  * @retval Status
+  */
+  SHCI_CmdStatus_t SHCI_C2_Reinit( void );
+
+  /**
+  * SHCI_C2_ExtpaConfig
+  * @brief Send the Ext PA configuration
+  *        When the CPU2 receives the command, it controls the Ext PA as requested by the configuration
+  *        This configures only which IO is used to enable/disable the ExtPA and the associated polarity
+  *        This command has no effect on the other IO that is used to control the mode of the Ext PA (Rx/Tx)
+  *
+  * @param gpio_port: GPIOx where x can be (A..F) to select the GPIO peripheral for STM32WBxx family
+  * @param gpio_pin_number: This parameter can be one of GPIO_PIN_x (= LL_GPIO_PIN_x)  where x can be (0..15).
+  * @param gpio_polarity: This parameter can be either
+  *                       - EXT_PA_ENABLED_LOW: ExtPA is enabled when GPIO is low
+  *                       - EXT_PA_ENABLED_HIGH: ExtPA is enabled when GPIO is high
+  * @param gpio_status: This parameter can be either
+  *                       - EXT_PA_DISABLED: Stop driving the ExtPA
+  *                       - EXT_PA_ENABLED: Drive the ExtPA according to radio activity
+  *                                          (ON before the Event and OFF at the end of the event)
+  * @retval Status
+  */
+  SHCI_CmdStatus_t SHCI_C2_ExtpaConfig(uint32_t gpio_port, uint16_t gpio_pin_number, uint8_t gpio_polarity, uint8_t gpio_status);
+
+  /**
+  * SHCI_C2_SetFlashActivityControl
+  * @brief Set the mechanism to be used on CPU2 to prevent the CPU1 to either write or erase in flash
+  *
+  * @param Source: It can be one of the following list
+  *                -  FLASH_ACTIVITY_CONTROL_PES : The CPU2 set the PES bit to prevent the CPU1 to either read or write in flash
+  *                -  FLASH_ACTIVITY_CONTROL_SEM7 : The CPU2 gets the semaphore 7 to prevent the CPU1 to either read or write in flash.
+  *                                                 This requires the CPU1 to first get semaphore 7 before erasing or writing the flash.
+  *
+  * @retval Status
+  */
+  SHCI_CmdStatus_t SHCI_C2_SetFlashActivityControl(SHCI_C2_SET_FLASH_ACTIVITY_CONTROL_Source_t Source);
+
+  /**
+  * SHCI_C2_Config
+  * @brief Send the system configuration to the CPU2
+  *
+  * @param pCmdPacket: address of the buffer holding following parameters
+  *                    uint8_t PayloadCmdSize : Size of the payload - shall be SHCI_C2_CONFIG_PAYLOAD_CMD_SIZE
+  *                    uint8_t Config1 :
+  *                     - bit0 :  0 - BLE NVM Data  data are flushed in internal secure flash
+  *                               1 - BLE NVM Data are written in SRAM cache pointed by BleNvmRamAddress
+  *                     - bit1 :  0 - THREAD NVM Data  data are flushed in internal secure flash
+  *                               1 - THREAD NVM Data are written in SRAM cache pointed by ThreadNvmRamAddress
+  *                     - bit2 :  0 - Thread EUI64 is set to new (and current) format
+  *                               1 - Thread EUI64 is set to old format
+  *                     - bit3 to bit7 : Unused, shall be set to 0
+  *                    uint8_t EvtMask1 :
+  *                            When a bit is set to 0, the event is not reported
+  *                            bit0 : Asynchronous Event with Sub Evt Code 0x9201 (= SHCI_SUB_EVT_ERROR_NOTIF)
+  *                            ...
+  *                            bit31 : Asynchronous Event with Sub Evt Code 0x9220
+  *                    uint8_t Spare1 : Unused, shall be set to 0
+  *                    uint32_t BleNvmRamAddress :
+  *                               Only considered when Config1.bit0 = 1
+  *                               When set to 0, data are kept in internal SRAM on CPU2
+  *                               Otherwise, data are copied in the cache pointed by BleNvmRamAddress
+  *                               The size of the buffer shall be BLE_NVM_SRAM_SIZE (number of 32bits)
+  *                               The buffer shall be allocated in SRAM2
+  *                    uint32_t ThreadNvmRamAddress :
+  *                               Only considered when Config1.bit1 = 1
+  *                               When set to 0, data are kept in internal SRAM on CPU2
+  *                               Otherwise, data are copied in the cache pointed by ThreadNvmRamAddress
+  *                               The size of the buffer shall be THREAD_NVM_SRAM_SIZE (number of 32bits)
+  *                               The buffer shall be allocated in SRAM1
+  *
+  *                    Please check macro definition to be used for this function
+  *                    They are defined in this file next to the definition of SHCI_OPCODE_C2_CONFIG
+  *
+  * @retval Status
+  */
+  SHCI_CmdStatus_t SHCI_C2_Config(SHCI_C2_CONFIG_Cmd_Param_t *pCmdPacket);
+
+  /**
+   * SHCI_C2_802_15_4_DeInit
+   * @brief Deinit 802.15.4 layer (to be used before entering StandBy mode)
+   *
+   * @param  None
+   * @retval Status
+   */
+  SHCI_CmdStatus_t SHCI_C2_802_15_4_DeInit( void );
+
+  /**
+  * SHCI_C2_SetSystemClock
+  * @brief Request CPU2 to change system clock
+  *
+  * @param clockSel: It can be one of the following list
+  *                -  SET_SYSTEM_CLOCK_HSE_TO_PLL : CPU2 set system clock to PLL, PLL must be configured and started before.
+  *                -  SET_SYSTEM_CLOCK_PLL_ON_TO_HSE : CPU2 set System clock to HSE, PLL is still ON after command execution.
+  *                -  SET_SYSTEM_CLOCK_PLL_OFF_TO_HSE : CPU2 set System clock to HSE, PLL is turned OFF after command execution.
+  *
+  * @retval Status
+  */
+  SHCI_CmdStatus_t SHCI_C2_SetSystemClock( SHCI_C2_SET_SYSTEM_CLOCK_Cmd_Param_t clockSel );
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__SHCI_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/src/utility/STM32_WPAN/shci_tl.c b/src/utility/STM32_WPAN/shci_tl.c
new file mode 100644
index 00000000..25e1a214
--- /dev/null
+++ b/src/utility/STM32_WPAN/shci_tl.c
@@ -0,0 +1,271 @@
+/**
+ ******************************************************************************
+ * @file    shci.c
+ * @author  MCD Application Team
+ * @brief   System HCI command implementation
+ ******************************************************************************
+ * @attention
+ *
+ * Copyright (c) 2018-2021 STMicroelectronics.
+ * All rights reserved.
+ *
+ * This software is licensed under terms that can be found in the LICENSE file
+ * in the root directory of this software component.
+ * If no LICENSE file comes with this software, it is provided AS-IS.
+ *
+ ******************************************************************************
+ */
+
+
+#if defined(STM32WBxx)
+/* Includes ------------------------------------------------------------------*/
+#include "stm32_wpan_common.h"
+
+#include "stm_list.h"
+#include "shci_tl.h"
+#include "stm32_def.h"
+#include "wiring_time.h"
+
+/* Private typedef -----------------------------------------------------------*/
+typedef enum
+{
+  SHCI_TL_CMD_RESP_RELEASE,
+  SHCI_TL_CMD_RESP_WAIT,
+} SHCI_TL_CmdRespStatus_t;
+
+/* Private defines -----------------------------------------------------------*/
+/**
+ * The default System HCI layer timeout is set to 33s
+ */
+#define SHCI_TL_DEFAULT_TIMEOUT (33000)
+
+/* Private macros ------------------------------------------------------------*/
+/* Public variables ---------------------------------------------------------*/
+/* Private variables ---------------------------------------------------------*/
+/**
+ * START of Section SYSTEM_DRIVER_CONTEXT
+ */
+PLACE_IN_SECTION("SYSTEM_DRIVER_CONTEXT") static tListNode SHciAsynchEventQueue;
+PLACE_IN_SECTION("SYSTEM_DRIVER_CONTEXT") static volatile SHCI_TL_CmdStatus_t SHCICmdStatus;
+PLACE_IN_SECTION("SYSTEM_DRIVER_CONTEXT") static TL_CmdPacket_t *pCmdBuffer;
+PLACE_IN_SECTION("SYSTEM_DRIVER_CONTEXT") SHCI_TL_UserEventFlowStatus_t SHCI_TL_UserEventFlow;
+/**
+ * END of Section SYSTEM_DRIVER_CONTEXT
+ */
+
+static tSHciContext shciContext;
+static void (* StatusNotCallBackFunction) (SHCI_TL_CmdStatus_t status);
+
+static volatile SHCI_TL_CmdRespStatus_t CmdRspStatusFlag;
+
+/* Private function prototypes -----------------------------------------------*/
+static void Cmd_SetStatus(SHCI_TL_CmdStatus_t shcicmdstatus);
+static void TlCmdEvtReceived(TL_EvtPacket_t *shcievt);
+static void TlUserEvtReceived(TL_EvtPacket_t *shcievt);
+static void TlInit( TL_CmdPacket_t * p_cmdbuffer );
+
+/* Interface ------- ---------------------------------------------------------*/
+void shci_init(void(* UserEvtRx)(void* pData), void* pConf)
+{
+  StatusNotCallBackFunction = ((SHCI_TL_HciInitConf_t *)pConf)->StatusNotCallBack;
+  shciContext.UserEvtRx = UserEvtRx;
+
+  shci_register_io_bus (&shciContext.io);
+
+  TlInit((TL_CmdPacket_t *)(((SHCI_TL_HciInitConf_t *)pConf)->p_cmdbuffer));
+
+  return;
+}
+
+void shci_user_evt_proc(void)
+{
+  TL_EvtPacket_t *phcievtbuffer;
+  tSHCI_UserEvtRxParam UserEvtRxParam;
+
+  /**
+   * Up to release version v1.2.0, a while loop was implemented to read out events from the queue as long as
+   * it is not empty. However, in a bare metal implementation, this leads to calling in a "blocking" mode
+   * shci_user_evt_proc() as long as events are received without giving the opportunity to run other tasks
+   * in the background.
+   * From now, the events are reported one by one. When it is checked there is still an event pending in the queue,
+   * a request to the user is made to call again shci_user_evt_proc().
+   * This gives the opportunity to the application to run other background tasks between each event.
+   */
+
+  /**
+   * It is more secure to use LST_remove_head()/LST_insert_head() compare to LST_get_next_node()/LST_remove_node()
+   * in case the user overwrite the header where the next/prev pointers are located
+   */
+  if((LST_is_empty(&SHciAsynchEventQueue) == FALSE) && (SHCI_TL_UserEventFlow != SHCI_TL_UserEventFlow_Disable))
+  {
+    LST_remove_head ( &SHciAsynchEventQueue, (tListNode **)&phcievtbuffer );
+
+    if (shciContext.UserEvtRx != NULL)
+    {
+      UserEvtRxParam.pckt = phcievtbuffer;
+      UserEvtRxParam.status = SHCI_TL_UserEventFlow_Enable;
+      shciContext.UserEvtRx((void *)&UserEvtRxParam);
+      SHCI_TL_UserEventFlow = UserEvtRxParam.status;
+    }
+    else
+    {
+      SHCI_TL_UserEventFlow = SHCI_TL_UserEventFlow_Enable;
+    }
+
+    if(SHCI_TL_UserEventFlow != SHCI_TL_UserEventFlow_Disable)
+    {
+      TL_MM_EvtDone( phcievtbuffer );
+    }
+    else
+    {
+      /**
+       * put back the event in the queue
+       */
+      LST_insert_head ( &SHciAsynchEventQueue, (tListNode *)phcievtbuffer );
+    }
+  }
+
+  if((LST_is_empty(&SHciAsynchEventQueue) == FALSE) && (SHCI_TL_UserEventFlow != SHCI_TL_UserEventFlow_Disable))
+  {
+    shci_notify_asynch_evt((void*) &SHciAsynchEventQueue);
+  }
+
+
+  return;
+}
+
+void shci_resume_flow( void )
+{
+  SHCI_TL_UserEventFlow = SHCI_TL_UserEventFlow_Enable;
+
+  /**
+   * It is better to go through the background process as it is not sure from which context this API may
+   * be called
+   */
+  shci_notify_asynch_evt((void*) &SHciAsynchEventQueue);
+
+  return;
+}
+
+void shci_send( uint16_t cmd_code, uint8_t len_cmd_payload, uint8_t * p_cmd_payload, TL_EvtPacket_t * p_rsp )
+{
+  Cmd_SetStatus(SHCI_TL_CmdBusy);
+
+  pCmdBuffer->cmdserial.cmd.cmdcode = cmd_code;
+  pCmdBuffer->cmdserial.cmd.plen = len_cmd_payload;
+
+  memcpy(pCmdBuffer->cmdserial.cmd.payload, p_cmd_payload, len_cmd_payload );
+  CmdRspStatusFlag = SHCI_TL_CMD_RESP_WAIT;
+  shciContext.io.Send(0,0);
+
+  shci_cmd_resp_wait(SHCI_TL_DEFAULT_TIMEOUT);
+
+  /**
+   * The command complete of a system command does not have the header
+   * It starts immediately with the evtserial field
+   */
+  memcpy( &(p_rsp->evtserial), pCmdBuffer, ((TL_EvtSerial_t*)pCmdBuffer)->evt.plen + TL_EVT_HDR_SIZE );
+
+  Cmd_SetStatus(SHCI_TL_CmdAvailable);
+
+  return;
+}
+
+void shci_notify_asynch_evt(void *pdata)
+{
+  UNUSED(pdata);
+  /* Need to parse data in future version */
+  shci_user_evt_proc();
+}
+
+void shci_register_io_bus(tSHciIO *fops)
+{
+  /* Register IO bus services */
+  fops->Init    = TL_SYS_Init;
+  fops->Send    = TL_SYS_SendCmd;
+}
+
+/* Private functions ---------------------------------------------------------*/
+static void TlInit( TL_CmdPacket_t * p_cmdbuffer )
+{
+  TL_SYS_InitConf_t Conf;
+
+  pCmdBuffer = p_cmdbuffer;
+
+  LST_init_head (&SHciAsynchEventQueue);
+
+  Cmd_SetStatus(SHCI_TL_CmdAvailable);
+
+  SHCI_TL_UserEventFlow = SHCI_TL_UserEventFlow_Enable;
+
+  /* Initialize low level driver */
+  if (shciContext.io.Init)
+  {
+
+    Conf.p_cmdbuffer = (uint8_t *)p_cmdbuffer;
+    Conf.IoBusCallBackCmdEvt = TlCmdEvtReceived;
+    Conf.IoBusCallBackUserEvt = TlUserEvtReceived;
+    shciContext.io.Init(&Conf);
+  }
+
+  return;
+}
+
+static void Cmd_SetStatus(SHCI_TL_CmdStatus_t shcicmdstatus)
+{
+  if(shcicmdstatus == SHCI_TL_CmdBusy)
+  {
+    if(StatusNotCallBackFunction != 0)
+    {
+      StatusNotCallBackFunction( SHCI_TL_CmdBusy );
+    }
+    SHCICmdStatus = SHCI_TL_CmdBusy;
+  }
+  else
+  {
+    SHCICmdStatus = SHCI_TL_CmdAvailable;
+    if(StatusNotCallBackFunction != 0)
+    {
+      StatusNotCallBackFunction( SHCI_TL_CmdAvailable );
+    }
+  }
+
+  return;
+}
+
+static void TlCmdEvtReceived(TL_EvtPacket_t *shcievt)
+{
+  (void)(shcievt);
+  shci_cmd_resp_release(0); /**< Notify the application the Cmd response has been received */
+
+  return;
+}
+
+static void TlUserEvtReceived(TL_EvtPacket_t *shcievt)
+{
+  LST_insert_tail(&SHciAsynchEventQueue, (tListNode *)shcievt);
+  shci_notify_asynch_evt((void*) &SHciAsynchEventQueue); /**< Notify the application a full HCI event has been received */
+
+  return;
+}
+
+/* Weak implementation ----------------------------------------------------------------*/
+__WEAK void shci_cmd_resp_wait(uint32_t timeout)
+{
+  for (unsigned long start = millis(); (millis() - start) < timeout;) {
+    if (CmdRspStatusFlag == SHCI_TL_CMD_RESP_RELEASE) {
+      break;
+    }
+  }
+  return;
+}
+
+__WEAK void shci_cmd_resp_release(uint32_t flag)
+{
+  (void)flag;
+
+  CmdRspStatusFlag = SHCI_TL_CMD_RESP_RELEASE;
+
+  return;
+}
+#endif /* STM32WBxx */
diff --git a/src/utility/STM32_WPAN/shci_tl.h b/src/utility/STM32_WPAN/shci_tl.h
new file mode 100644
index 00000000..74d0ff38
--- /dev/null
+++ b/src/utility/STM32_WPAN/shci_tl.h
@@ -0,0 +1,173 @@
+/**
+ ******************************************************************************
+ * @file    shci_tl.h
+ * @author  MCD Application Team
+ * @brief   System HCI command header for the system channel
+ ******************************************************************************
+ * @attention
+ *
+ * Copyright (c) 2018-2021 STMicroelectronics.
+ * All rights reserved.
+ *
+ * This software is licensed under terms that can be found in the LICENSE file
+ * in the root directory of this software component.
+ * If no LICENSE file comes with this software, it is provided AS-IS.
+ *
+ ******************************************************************************
+ */
+
+#ifndef __SHCI_TL_H_
+#define __SHCI_TL_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "tl.h"
+
+/* Exported defines -----------------------------------------------------------*/
+typedef enum
+{
+  SHCI_TL_UserEventFlow_Disable,
+  SHCI_TL_UserEventFlow_Enable,
+} SHCI_TL_UserEventFlowStatus_t;
+
+typedef enum
+{
+  SHCI_TL_CmdBusy,
+  SHCI_TL_CmdAvailable
+} SHCI_TL_CmdStatus_t;
+
+/**
+ * @brief Structure used to manage the BUS IO operations.
+ *        All the structure fields will point to functions defined at user level.
+ * @{
+ */ 
+typedef struct
+{                
+  int32_t (* Init)    (void* pConf); /**< Pointer to SHCI TL function for the IO Bus initialization */
+  int32_t (* DeInit)  (void); /**< Pointer to SHCI TL function for the IO Bus de-initialization */
+  int32_t (* Reset)   (void); /**< Pointer to SHCI TL function for the IO Bus reset */
+  int32_t (* Receive) (uint8_t*, uint16_t); /**< Pointer to SHCI TL function for the IO Bus data reception */
+  int32_t (* Send)    (uint8_t*, uint16_t); /**< Pointer to SHCI TL function for the IO Bus data transmission */
+  int32_t (* DataAck) (uint8_t*, uint16_t* len); /**< Pointer to SHCI TL function for the IO Bus data ack reception */
+  int32_t (* GetTick) (void); /**< Pointer to BSP function for getting the HAL time base timestamp */    
+} tSHciIO;
+/**
+ * @}
+ */
+
+/**
+ * @brief Contain the SHCI context
+ * @{
+ */
+typedef struct
+{   
+  tSHciIO io; /**< Manage the BUS IO operations */
+  void (* UserEvtRx) (void * pData); /**< User System events callback function pointer */
+} tSHciContext;
+
+typedef struct
+{
+  SHCI_TL_UserEventFlowStatus_t status;
+  TL_EvtPacket_t *pckt;
+} tSHCI_UserEvtRxParam;
+
+typedef struct
+{
+  uint8_t *p_cmdbuffer;
+  void (* StatusNotCallBack) (SHCI_TL_CmdStatus_t status);
+} SHCI_TL_HciInitConf_t;
+
+/**
+  * shci_send
+  * @brief  Send an System HCI Command
+  *
+  * @param : cmd_code = Opcode of the command
+  * @param : len_cmd_payload = Length of the command payload
+  * @param : p_cmd_payload = Address of the command payload
+  * @param : p_rsp_status = Address of the full buffer holding the command complete event
+  * @retval : None
+  */
+void shci_send( uint16_t cmd_code, uint8_t len_cmd_payload, uint8_t * p_cmd_payload, TL_EvtPacket_t * p_rsp_status );
+ 
+/**
+ * @brief  Register IO bus services.
+ * @param  fops The SHCI IO structure managing the IO BUS
+ * @retval None
+ */
+void shci_register_io_bus(tSHciIO* fops);
+
+/**
+ * @brief  Interrupt service routine that must be called when the system channel
+ *         reports a packet has been received
+ *
+ * @param  pdata Packet or event pointer
+ * @retval None
+ */
+void shci_notify_asynch_evt(void* pdata);
+
+/**
+ * @brief  This function resume the User Event Flow which has been stopped on return 
+ *         from UserEvtRx() when the User Event has not been processed.
+ *
+ * @param  None
+ * @retval None
+ */
+void shci_resume_flow(void);
+
+
+/**
+ * @brief  This function is called when an System HCI Command is sent to the CPU2 and the response is waited.
+ *         It is called from the same context the System HCI command has been sent.
+ *         It shall not return until the command response notified by shci_cmd_resp_release() is received.
+ *         A weak implementation is available in shci_tl.c based on polling mechanism
+ *         The user may re-implement this function in the application to improve performance :
+ *         - It may use UTIL_SEQ_WaitEvt() API when using the Sequencer
+ *         - It may use a semaphore when using cmsis_os interface
+ *
+ * @param  timeout: Waiting timeout
+ * @retval None
+ */
+void shci_cmd_resp_wait(uint32_t timeout);
+
+/**
+ * @brief  This function is called when an System HCI command is received from the CPU2.
+ *         A weak implementation is available in shci_tl.c based on polling mechanism
+ *         The user may re-implement this function in the application to improve performance :
+ *         - It may use UTIL_SEQ_SetEvt() API when using the Sequencer
+ *         - It may use a semaphore when using cmsis_os interface
+ *
+ *
+ * @param  flag: Release flag
+ * @retval None
+ */
+void shci_cmd_resp_release(uint32_t flag);
+
+
+/**
+ * @brief  This process shall be called each time the shci_notify_asynch_evt notification is received
+ *
+ * @param  None
+ * @retval None
+ */
+
+void shci_user_evt_proc(void);
+
+/**
+ * @brief Initialize the System Host Controller Interface.
+ *        This function must be called before any communication on the System Channel
+ *
+ * @param  UserEvtRx: System events callback function pointer
+ *         This callback is triggered when an user event is received on
+ *         the System Channel from CPU2.
+ * @param  pConf: Configuration structure pointer
+ * @retval None
+ */
+void shci_init(void(* UserEvtRx)(void* pData), void* pConf);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __SHCI_TL_H_ */
diff --git a/src/utility/STM32_WPAN/stm32_wpan_common.h b/src/utility/STM32_WPAN/stm32_wpan_common.h
new file mode 100644
index 00000000..f407bb98
--- /dev/null
+++ b/src/utility/STM32_WPAN/stm32_wpan_common.h
@@ -0,0 +1,171 @@
+/**
+ ******************************************************************************
+ * @file    stm32_wpan_common.h
+ * @author  MCD Application Team
+ * @brief   Common file to utilities
+ ******************************************************************************
+ * @attention
+ *
+ * Copyright (c) 2018-2021 STMicroelectronics.
+ * All rights reserved.
+ *
+ * This software is licensed under terms that can be found in the LICENSE file
+ * in the root directory of this software component.
+ * If no LICENSE file comes with this software, it is provided AS-IS.
+ *
+ ******************************************************************************
+ */
+
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __STM32_WPAN_COMMON_H
+#define __STM32_WPAN_COMMON_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if   defined ( __CC_ARM )||defined (__ARMCC_VERSION)
+ #define __ASM            __asm                                      /*!< asm keyword for ARM Compiler          */
+ #define __INLINE         __inline                                   /*!< inline keyword for ARM Compiler       */
+ #define __STATIC_INLINE  static __inline
+#elif defined ( __ICCARM__ )
+ #define __ASM            __asm                                      /*!< asm keyword for IAR Compiler          */
+ #define __INLINE         inline                                     /*!< inline keyword for IAR Compiler. Only available in High optimization mode! */
+ #define __STATIC_INLINE  static inline
+#elif defined ( __GNUC__ )
+ #define __ASM            __asm                                      /*!< asm keyword for GNU Compiler          */
+ #define __INLINE         inline                                     /*!< inline keyword for GNU Compiler       */
+ #define __STATIC_INLINE  static inline
+#endif
+
+#include <stdint.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include "cmsis_compiler.h"
+
+  /* -------------------------------- *
+   *  Basic definitions               *
+   * -------------------------------- */
+
+#undef NULL
+#define NULL                    0U
+
+#undef FALSE
+#define FALSE                   0U
+
+#undef TRUE
+#define TRUE                    (!0U)
+
+  /* -------------------------------- *
+   *  Critical Section definition     *
+   * -------------------------------- */
+#undef BACKUP_PRIMASK
+#define BACKUP_PRIMASK()    uint32_t primask_bit= __get_PRIMASK()
+
+#undef DISABLE_IRQ
+#define DISABLE_IRQ()       __disable_irq()
+
+#undef RESTORE_PRIMASK
+#define RESTORE_PRIMASK()   __set_PRIMASK(primask_bit)
+
+  /* -------------------------------- *
+   *  Macro delimiters                *
+   * -------------------------------- */
+#undef M_BEGIN
+#define M_BEGIN     do {
+
+#undef  M_END
+#define M_END       } while(0)
+
+  /* -------------------------------- *
+   *  Some useful macro definitions   *
+   * -------------------------------- */
+#undef MAX
+#define MAX(a, b)  (((a) > (b)) ? (a) : (b))
+
+#undef MIN
+#define MIN(a, b)  (((a) < (b)) ? (a) : (b))
+
+#undef MODINC
+#define MODINC( a, m )       M_BEGIN  (a)++;  if ((a)>=(m)) (a)=0;  M_END
+
+#undef MODDEC
+#define MODDEC( a, m )       M_BEGIN  if ((a)==0) (a)=(m);  (a)--;  M_END
+
+#undef MODADD
+#define MODADD( a, b, m )    M_BEGIN  (a)+=(b);  if ((a)>=(m)) (a)-=(m);  M_END
+
+#undef MODSUB
+#define MODSUB( a, b, m )    MODADD( a, (m)-(b), m )
+
+#undef ALIGN
+#ifdef WIN32
+#define ALIGN(n)
+#else
+#define ALIGN(n)             __attribute__((aligned(n)))
+#endif
+
+#undef PAUSE
+#define PAUSE( t )           M_BEGIN \
+                               volatile int _i; \
+                               for ( _i = t; _i > 0; _i -- ); \
+                             M_END
+#undef DIVF
+#define DIVF( x, y )         ((x)/(y))
+
+#undef DIVC
+#define DIVC( x, y )         (((x)+(y)-1)/(y))
+
+#undef DIVR
+#define DIVR( x, y )         (((x)+((y)/2))/(y))
+
+#undef SHRR
+#define SHRR( x, n )         ((((x)>>((n)-1))+1)>>1)
+
+#undef BITN
+#define BITN( w, n )         (((w)[(n)/32] >> ((n)%32)) & 1)
+
+#undef BITNSET
+#define BITNSET( w, n, b )   M_BEGIN (w)[(n)/32] |= ((U32)(b))<<((n)%32); M_END
+
+/* -------------------------------- *
+ *  Section attribute               *
+ * -------------------------------- */
+#undef PLACE_IN_SECTION
+#define PLACE_IN_SECTION( __x__ )  __attribute__((section (__x__)))
+
+/* ----------------------------------- *
+ *  Packed usage (compiler dependent)  *
+ * ----------------------------------- */
+#undef PACKED__
+#undef PACKED_STRUCT
+
+#if defined ( __CC_ARM )
+  #if defined ( __GNUC__ )
+    /* GNU extension */
+    #define PACKED__ __attribute__((packed))
+    #define PACKED_STRUCT struct PACKED__
+  #elif defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050U)
+    #define PACKED__ __attribute__((packed))
+    #define PACKED_STRUCT struct PACKED__
+  #else
+    #define PACKED__(TYPE) __packed TYPE
+    #define PACKED_STRUCT PACKED__(struct)
+  #endif
+#elif defined   ( __GNUC__ )
+  #define PACKED__ __attribute__((packed))
+  #define PACKED_STRUCT struct PACKED__
+#elif defined (__ICCARM__)
+  #define PACKED_STRUCT __packed struct
+#else
+  #define PACKED_STRUCT __packed struct
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__STM32_WPAN_COMMON_H */
diff --git a/src/utility/STM32_WPAN/stm_list.c b/src/utility/STM32_WPAN/stm_list.c
new file mode 100644
index 00000000..df6c2155
--- /dev/null
+++ b/src/utility/STM32_WPAN/stm_list.c
@@ -0,0 +1,210 @@
+/**
+ ******************************************************************************
+  * @file    stm_list.c
+  * @author  MCD Application Team
+  * @brief   TCircular Linked List Implementation.
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2018-2021 STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
+  */
+
+
+#if defined(STM32WBxx)
+/******************************************************************************
+ * Include Files
+ ******************************************************************************/
+#include "stdint.h"
+#include "cmsis_gcc.h"
+#include "stm32_wpan_common.h"
+
+#include "stm_list.h"
+
+/******************************************************************************
+ * Function Definitions
+ ******************************************************************************/
+void LST_init_head (tListNode * listHead)
+{
+  listHead->next = listHead;
+  listHead->prev = listHead;
+}
+
+uint8_t LST_is_empty (tListNode * listHead)
+{
+  uint32_t primask_bit;
+  uint8_t return_value;
+
+  primask_bit = __get_PRIMASK();  /**< backup PRIMASK bit */
+  __disable_irq();                  /**< Disable all interrupts by setting PRIMASK bit on Cortex*/
+  if(listHead->next == listHead)
+  {
+    return_value = TRUE;
+  }
+  else
+  {
+    return_value = FALSE;
+  }
+  __set_PRIMASK(primask_bit);     /**< Restore PRIMASK bit*/
+
+  return return_value;
+}
+
+void LST_insert_head (tListNode * listHead, tListNode * node)
+{
+  uint32_t primask_bit;
+
+  primask_bit = __get_PRIMASK();  /**< backup PRIMASK bit */
+  __disable_irq();                  /**< Disable all interrupts by setting PRIMASK bit on Cortex*/
+
+  node->next = listHead->next;
+  node->prev = listHead;
+  listHead->next = node;
+  (node->next)->prev = node;
+
+  __set_PRIMASK(primask_bit);     /**< Restore PRIMASK bit*/
+}
+
+
+void LST_insert_tail (tListNode * listHead, tListNode * node)
+{
+  uint32_t primask_bit;
+
+  primask_bit = __get_PRIMASK();  /**< backup PRIMASK bit */
+  __disable_irq();                  /**< Disable all interrupts by setting PRIMASK bit on Cortex*/
+
+  node->next = listHead;
+  node->prev = listHead->prev;
+  listHead->prev = node;
+  (node->prev)->next = node;
+
+  __set_PRIMASK(primask_bit);     /**< Restore PRIMASK bit*/
+}
+
+
+void LST_remove_node (tListNode * node)
+{
+  uint32_t primask_bit;
+
+  primask_bit = __get_PRIMASK();  /**< backup PRIMASK bit */
+  __disable_irq();                  /**< Disable all interrupts by setting PRIMASK bit on Cortex*/
+
+  (node->prev)->next = node->next;
+  (node->next)->prev = node->prev;
+
+  __set_PRIMASK(primask_bit);     /**< Restore PRIMASK bit*/
+}
+
+
+void LST_remove_head (tListNode * listHead, tListNode ** node )
+{
+  uint32_t primask_bit;
+
+  primask_bit = __get_PRIMASK();  /**< backup PRIMASK bit */
+  __disable_irq();                  /**< Disable all interrupts by setting PRIMASK bit on Cortex*/
+
+  *node = listHead->next;
+  LST_remove_node (listHead->next);
+
+  __set_PRIMASK(primask_bit);     /**< Restore PRIMASK bit*/
+}
+
+
+void LST_remove_tail (tListNode * listHead, tListNode ** node )
+{
+  uint32_t primask_bit;
+
+  primask_bit = __get_PRIMASK();  /**< backup PRIMASK bit */
+  __disable_irq();                  /**< Disable all interrupts by setting PRIMASK bit on Cortex*/
+
+  *node = listHead->prev;
+  LST_remove_node (listHead->prev);
+
+  __set_PRIMASK(primask_bit);     /**< Restore PRIMASK bit*/
+}
+
+
+void LST_insert_node_after (tListNode * node, tListNode * ref_node)
+{
+  uint32_t primask_bit;
+
+  primask_bit = __get_PRIMASK();  /**< backup PRIMASK bit */
+  __disable_irq();                  /**< Disable all interrupts by setting PRIMASK bit on Cortex*/
+
+  node->next = ref_node->next;
+  node->prev = ref_node;
+  ref_node->next = node;
+  (node->next)->prev = node;
+
+  __set_PRIMASK(primask_bit);     /**< Restore PRIMASK bit*/
+}
+
+
+void LST_insert_node_before (tListNode * node, tListNode * ref_node)
+{
+  uint32_t primask_bit;
+
+  primask_bit = __get_PRIMASK();  /**< backup PRIMASK bit */
+  __disable_irq();                  /**< Disable all interrupts by setting PRIMASK bit on Cortex*/
+
+  node->next = ref_node;
+  node->prev = ref_node->prev;
+  ref_node->prev = node;
+  (node->prev)->next = node;
+
+  __set_PRIMASK(primask_bit);     /**< Restore PRIMASK bit*/
+}
+
+
+int LST_get_size (tListNode * listHead)
+{
+  int size = 0;
+  tListNode * temp;
+  uint32_t primask_bit;
+
+  primask_bit = __get_PRIMASK();  /**< backup PRIMASK bit */
+  __disable_irq();                  /**< Disable all interrupts by setting PRIMASK bit on Cortex*/
+
+  temp = listHead->next;
+  while (temp != listHead)
+  {
+    size++;
+    temp = temp->next;
+  }
+
+  __set_PRIMASK(primask_bit);     /**< Restore PRIMASK bit*/
+
+  return (size);
+}
+
+void LST_get_next_node (tListNode * ref_node, tListNode ** node)
+{
+  uint32_t primask_bit;
+
+  primask_bit = __get_PRIMASK();  /**< backup PRIMASK bit */
+  __disable_irq();                  /**< Disable all interrupts by setting PRIMASK bit on Cortex*/
+
+  *node = ref_node->next;
+
+  __set_PRIMASK(primask_bit);     /**< Restore PRIMASK bit*/
+}
+
+
+void LST_get_prev_node (tListNode * ref_node, tListNode ** node)
+{
+  uint32_t primask_bit;
+
+  primask_bit = __get_PRIMASK();  /**< backup PRIMASK bit */
+  __disable_irq();                  /**< Disable all interrupts by setting PRIMASK bit on Cortex*/
+
+  *node = ref_node->prev;
+
+  __set_PRIMASK(primask_bit);      /**< Restore PRIMASK bit*/
+}
+#endif /* STM32WBxx */
diff --git a/src/utility/STM32_WPAN/stm_list.h b/src/utility/STM32_WPAN/stm_list.h
new file mode 100644
index 00000000..b7c3254c
--- /dev/null
+++ b/src/utility/STM32_WPAN/stm_list.h
@@ -0,0 +1,55 @@
+/**
+  ******************************************************************************
+  * @file    stm_list.h
+  * @author  MCD Application Team
+  * @brief   Header file for linked list library.
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2018-2021 STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
+  */
+
+
+#ifndef _STM_LIST_H_
+#define _STM_LIST_H_
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32_wpan_common.h"
+
+typedef PACKED_STRUCT _tListNode {
+    struct _tListNode * next;
+    struct _tListNode * prev;
+} tListNode;
+
+void LST_init_head (tListNode * listHead);
+
+uint8_t LST_is_empty (tListNode * listHead);
+
+void LST_insert_head (tListNode * listHead, tListNode * node);
+
+void LST_insert_tail (tListNode * listHead, tListNode * node);
+
+void LST_remove_node (tListNode * node);
+
+void LST_remove_head (tListNode * listHead, tListNode ** node );
+
+void LST_remove_tail (tListNode * listHead, tListNode ** node );
+
+void LST_insert_node_after (tListNode * node, tListNode * ref_node);
+
+void LST_insert_node_before (tListNode * node, tListNode * ref_node);
+
+int LST_get_size (tListNode * listHead);
+
+void LST_get_next_node (tListNode * ref_node, tListNode ** node);
+
+void LST_get_prev_node (tListNode * ref_node, tListNode ** node);
+
+#endif /* _STM_LIST_H_ */
diff --git a/src/utility/STM32_WPAN/tl.h b/src/utility/STM32_WPAN/tl.h
new file mode 100644
index 00000000..74520878
--- /dev/null
+++ b/src/utility/STM32_WPAN/tl.h
@@ -0,0 +1,372 @@
+/**
+ ******************************************************************************
+ * @file    tl.h
+ * @author  MCD Application Team
+ * @brief   Header for tl module
+ ******************************************************************************
+ * @attention
+ *
+ * Copyright (c) 2018-2021 STMicroelectronics.
+ * All rights reserved.
+ *
+ * This software is licensed under terms that can be found in the LICENSE file
+ * in the root directory of this software component.
+ * If no LICENSE file comes with this software, it is provided AS-IS.
+ *
+ ******************************************************************************
+ */
+
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __TL_H
+#define __TL_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32_wpan_common.h"
+
+/* Exported defines -----------------------------------------------------------*/
+#define TL_BLECMD_PKT_TYPE             ( 0x01 )
+#define TL_ACL_DATA_PKT_TYPE           ( 0x02 )
+#define TL_BLEEVT_PKT_TYPE             ( 0x04 )
+#define TL_OTCMD_PKT_TYPE              ( 0x08 )
+#define TL_OTRSP_PKT_TYPE              ( 0x09 )
+#define TL_CLICMD_PKT_TYPE             ( 0x0A )
+#define TL_OTNOT_PKT_TYPE              ( 0x0C )
+#define TL_OTACK_PKT_TYPE              ( 0x0D )
+#define TL_CLINOT_PKT_TYPE             ( 0x0E )
+#define TL_CLIACK_PKT_TYPE             ( 0x0F )
+#define TL_SYSCMD_PKT_TYPE             ( 0x10 )
+#define TL_SYSRSP_PKT_TYPE             ( 0x11 )
+#define TL_SYSEVT_PKT_TYPE             ( 0x12 )
+#define TL_CLIRESP_PKT_TYPE            ( 0x15 )
+#define TL_M0CMD_PKT_TYPE              ( 0x16 )
+#define TL_LOCCMD_PKT_TYPE             ( 0x20 )
+#define TL_LOCRSP_PKT_TYPE             ( 0x21 )
+#define TL_TRACES_APP_PKT_TYPE         ( 0x40 )
+#define TL_TRACES_WL_PKT_TYPE          ( 0x41 )
+
+#define TL_CMD_HDR_SIZE                (4)
+#define TL_EVT_HDR_SIZE                (3)
+#define TL_EVT_CS_PAYLOAD_SIZE         (4)
+
+#define TL_BLEEVT_CC_OPCODE            (0x0E)
+#define TL_BLEEVT_CS_OPCODE            (0x0F)
+#define TL_BLEEVT_VS_OPCODE            (0xFF)
+
+#define TL_BLEEVT_CC_PACKET_SIZE       (TL_EVT_HDR_SIZE + sizeof(TL_CcEvt_t))
+#define TL_BLEEVT_CC_BUFFER_SIZE       (sizeof(TL_PacketHeader_t) + TL_BLEEVT_CC_PACKET_SIZE)
+/* Exported types ------------------------------------------------------------*/
+/**< Packet header */
+typedef PACKED_STRUCT
+{
+  uint32_t *next;
+  uint32_t *prev;
+} TL_PacketHeader_t;
+
+/*******************************************************************************
+ * Event type
+ */
+
+/**
+ * This the payload of TL_Evt_t for a command status event
+ */
+typedef PACKED_STRUCT
+{
+  uint8_t   status;
+  uint8_t   numcmd;
+  uint16_t  cmdcode;
+} TL_CsEvt_t;
+
+/**
+ * This the payload of TL_Evt_t for a command complete event, only used a pointer
+ */
+typedef PACKED_STRUCT
+{
+  uint8_t   numcmd;
+  uint16_t  cmdcode;
+  uint8_t   payload[2];
+} TL_CcEvt_t;
+
+/**
+ * This the payload of TL_Evt_t for an asynchronous event, only used a pointer
+ */
+typedef PACKED_STRUCT
+{
+  uint16_t  subevtcode;
+  uint8_t   payload[2];
+} TL_AsynchEvt_t;
+
+/**
+ * This the payload of TL_Evt_t, only used a pointer
+ */
+typedef PACKED_STRUCT
+{
+  uint8_t   evtcode;
+  uint8_t   plen;
+  uint8_t   payload[4];
+} TL_Evt_t;
+
+typedef PACKED_STRUCT
+{
+  uint8_t   type;
+  TL_Evt_t  evt;
+} TL_EvtSerial_t;
+
+/**
+ * This format shall be used for all events (asynchronous and command response) reported
+ * by the CPU2 except for the command response of a system command where the header is not there
+ * and the format to be used shall be TL_EvtSerial_t.
+ * Note: Be careful that the asynchronous events reported by the CPU2 on the system channel do
+ * include the header and shall use TL_EvtPacket_t format. Only the command response format on the
+ * system channel is different.
+ */
+typedef PACKED_STRUCT
+{
+  TL_PacketHeader_t  header;
+  TL_EvtSerial_t     evtserial;
+} TL_EvtPacket_t;
+
+/*****************************************************************************************
+ * Command type
+ */
+
+typedef PACKED_STRUCT
+{
+  uint16_t   cmdcode;
+  uint8_t   plen;
+  uint8_t   payload[255];
+} TL_Cmd_t;
+
+typedef PACKED_STRUCT
+{
+  uint8_t   type;
+  TL_Cmd_t  cmd;
+} TL_CmdSerial_t;
+
+typedef PACKED_STRUCT
+{
+  TL_PacketHeader_t  header;
+  TL_CmdSerial_t     cmdserial;
+} TL_CmdPacket_t;
+
+/*****************************************************************************************
+ * HCI ACL DATA type
+ */
+typedef PACKED_STRUCT
+{
+  uint8_t   type;
+  uint16_t  handle;
+  uint16_t  length;
+  uint8_t   acl_data[1];
+} TL_AclDataSerial_t;
+
+typedef PACKED_STRUCT
+{
+  TL_PacketHeader_t  header;
+  TL_AclDataSerial_t   AclDataSerial;
+} TL_AclDataPacket_t;
+
+typedef struct
+{
+  uint8_t  *p_BleSpareEvtBuffer;
+  uint8_t  *p_SystemSpareEvtBuffer;
+  uint8_t  *p_AsynchEvtPool;
+  uint32_t AsynchEvtPoolSize;
+  uint8_t  *p_TracesEvtPool;
+  uint32_t TracesEvtPoolSize;
+} TL_MM_Config_t;
+
+typedef struct
+{
+  uint8_t *p_ThreadOtCmdRspBuffer;
+  uint8_t *p_ThreadCliRspBuffer;
+  uint8_t *p_ThreadNotAckBuffer;
+  uint8_t *p_ThreadCliNotBuffer;
+} TL_TH_Config_t;
+
+typedef struct
+{
+  uint8_t *p_LldTestsCliCmdRspBuffer;
+  uint8_t *p_LldTestsM0CmdBuffer;
+} TL_LLD_tests_Config_t;
+
+typedef struct
+{
+  uint8_t *p_BleLldCmdRspBuffer;
+  uint8_t *p_BleLldM0CmdBuffer;
+} TL_BLE_LLD_Config_t;
+
+typedef struct
+{
+  uint8_t *p_Mac_802_15_4_CmdRspBuffer;
+  uint8_t *p_Mac_802_15_4_NotAckBuffer;
+} TL_MAC_802_15_4_Config_t;
+
+typedef struct
+{
+  uint8_t *p_ZigbeeOtCmdRspBuffer;
+  uint8_t *p_ZigbeeNotAckBuffer;
+  uint8_t *p_ZigbeeNotifRequestBuffer;
+} TL_ZIGBEE_Config_t;
+
+/**
+ * @brief Contain the BLE HCI Init Configuration
+ * @{
+ */
+typedef struct
+{
+  void (* IoBusEvtCallBack) ( TL_EvtPacket_t *phcievt );
+  void (* IoBusAclDataTxAck) ( void );
+  uint8_t *p_cmdbuffer;
+  uint8_t *p_AclDataBuffer;
+} TL_BLE_InitConf_t;
+
+/**
+ * @brief Contain the SYSTEM HCI Init Configuration
+ * @{
+ */
+typedef struct
+{
+  void (* IoBusCallBackCmdEvt) (TL_EvtPacket_t *phcievt);
+  void (* IoBusCallBackUserEvt) (TL_EvtPacket_t *phcievt);
+  uint8_t *p_cmdbuffer;
+} TL_SYS_InitConf_t;
+
+/*****************************************************************************************
+ * Event type copied from ble_legacy.h
+ */
+
+typedef PACKED_STRUCT
+{
+  uint8_t type;
+  uint8_t data[1];
+} hci_uart_pckt;
+
+typedef PACKED_STRUCT
+{
+  uint8_t         evt;
+  uint8_t         plen;
+  uint8_t         data[1];
+} hci_event_pckt;
+
+typedef PACKED_STRUCT
+{
+  uint8_t         subevent;
+  uint8_t         data[1];
+} evt_le_meta_event;
+
+/**
+ * Vendor specific event for BLE core.
+ */
+typedef PACKED_STRUCT
+{
+  uint16_t ecode; /**< One of the BLE core event codes. */
+  uint8_t  data[1];
+} evt_blecore_aci;
+
+/* Bluetooth 48 bit address (in little-endian order).
+ */
+typedef	uint8_t	tBDAddr[6];
+
+
+/* Exported constants --------------------------------------------------------*/
+/* External variables --------------------------------------------------------*/
+/* Exported macros -----------------------------------------------------------*/
+/* Exported functions ------------------------------------------------------- */
+
+/******************************************************************************
+ * GENERAL
+ ******************************************************************************/
+void TL_Enable( void );
+void TL_Init( void );
+
+/******************************************************************************
+ * BLE
+ ******************************************************************************/
+int32_t TL_BLE_Init( void* pConf );
+int32_t TL_BLE_SendCmd( uint8_t* buffer, uint16_t size );
+int32_t TL_BLE_SendAclData( uint8_t* buffer, uint16_t size );
+
+/******************************************************************************
+ * SYSTEM
+ ******************************************************************************/
+int32_t TL_SYS_Init( void* pConf  );
+int32_t TL_SYS_SendCmd( uint8_t* buffer, uint16_t size );
+
+/******************************************************************************
+ * THREAD
+ ******************************************************************************/
+void TL_THREAD_Init( TL_TH_Config_t *p_Config );
+void TL_OT_SendCmd( void );
+void TL_CLI_SendCmd( void );
+void TL_OT_CmdEvtReceived( TL_EvtPacket_t * Otbuffer );
+void TL_THREAD_NotReceived( TL_EvtPacket_t * Notbuffer );
+void TL_THREAD_SendAck ( void );
+void TL_THREAD_CliSendAck ( void );
+void TL_THREAD_CliNotReceived( TL_EvtPacket_t * Notbuffer );
+
+/******************************************************************************
+ * LLD TESTS
+ ******************************************************************************/
+void TL_LLDTESTS_Init( TL_LLD_tests_Config_t *p_Config );
+void TL_LLDTESTS_SendCliCmd( void );
+void TL_LLDTESTS_ReceiveCliRsp( TL_CmdPacket_t * Notbuffer );
+void TL_LLDTESTS_SendCliRspAck( void );
+void TL_LLDTESTS_ReceiveM0Cmd( TL_CmdPacket_t * Notbuffer );
+void TL_LLDTESTS_SendM0CmdAck( void );
+
+/******************************************************************************
+ * BLE LLD
+ ******************************************************************************/
+void TL_BLE_LLD_Init( TL_BLE_LLD_Config_t *p_Config );
+void TL_BLE_LLD_SendCliCmd( void );
+void TL_BLE_LLD_ReceiveCliRsp( TL_CmdPacket_t * Notbuffer );
+void TL_BLE_LLD_SendCliRspAck( void );
+void TL_BLE_LLD_ReceiveM0Cmd( TL_CmdPacket_t * Notbuffer );
+void TL_BLE_LLD_SendM0CmdAck( void );
+void TL_BLE_LLD_SendCmd( void );
+void TL_BLE_LLD_ReceiveRsp( TL_CmdPacket_t * Notbuffer );
+void TL_BLE_LLD_SendRspAck( void );
+/******************************************************************************
+ * MEMORY MANAGER
+ ******************************************************************************/
+void TL_MM_Init( TL_MM_Config_t *p_Config );
+void TL_MM_EvtDone( TL_EvtPacket_t * hcievt );
+
+/******************************************************************************
+ * TRACES
+ ******************************************************************************/
+void TL_TRACES_Init( void );
+void TL_TRACES_EvtReceived( TL_EvtPacket_t * hcievt );
+
+/******************************************************************************
+ * MAC 802.15.4
+ ******************************************************************************/
+void TL_MAC_802_15_4_Init( TL_MAC_802_15_4_Config_t *p_Config );
+void TL_MAC_802_15_4_SendCmd( void );
+void TL_MAC_802_15_4_CmdEvtReceived( TL_EvtPacket_t * Otbuffer );
+void TL_MAC_802_15_4_NotReceived( TL_EvtPacket_t * Notbuffer );
+void TL_MAC_802_15_4_SendAck ( void );
+
+/******************************************************************************
+ * ZIGBEE
+ ******************************************************************************/
+void TL_ZIGBEE_Init( TL_ZIGBEE_Config_t *p_Config );
+void TL_ZIGBEE_SendM4RequestToM0( void );
+void TL_ZIGBEE_SendM4AckToM0Notify ( void );
+void TL_ZIGBEE_NotReceived( TL_EvtPacket_t * Notbuffer );
+void TL_ZIGBEE_CmdEvtReceived( TL_EvtPacket_t * Otbuffer );
+void TL_ZIGBEE_M0RequestReceived(TL_EvtPacket_t * Otbuffer );
+void TL_ZIGBEE_SendM4AckToM0Request(void);
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /*__TL_H */
+
diff --git a/src/utility/STM32_WPAN/tl_dbg_conf.h b/src/utility/STM32_WPAN/tl_dbg_conf.h
new file mode 100644
index 00000000..841d1968
--- /dev/null
+++ b/src/utility/STM32_WPAN/tl_dbg_conf.h
@@ -0,0 +1,140 @@
+/* USER CODE BEGIN Header */
+/**
+ ******************************************************************************
+  * File Name          : tl_dbg_conf.h
+  * Description        : Debug configuration file for stm32wpan transport layer interface.
+  *
+ ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2019-2021 STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef TL_DBG_CONF_H
+#define TL_DBG_CONF_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* USER CODE BEGIN Tl_Conf */
+
+/* Includes ------------------------------------------------------------------*/
+#include "core_debug.h"
+
+/**
+ * Enable or Disable traces
+ * The raw data output is the hci binary packet format as specified by the BT specification *
+ */
+#ifndef TL_SHCI_CMD_DBG_EN
+#define TL_SHCI_CMD_DBG_EN      1   /* Reports System commands sent to CPU2 and the command response */
+#endif
+
+#ifndef TL_SHCI_EVT_DBG_EN
+#define TL_SHCI_EVT_DBG_EN      1   /* Reports System Asynchronous Events received from CPU2 */
+#endif
+
+#ifndef TL_HCI_CMD_DBG_EN
+#define TL_HCI_CMD_DBG_EN       1   /* Reports BLE command sent to CPU2 and the command response */
+#endif
+
+#ifndef TL_HCI_EVT_DBG_EN
+#define TL_HCI_EVT_DBG_EN       1   /* Reports BLE Asynchronous Events received from CPU2 */
+#endif
+
+#ifndef TL_MM_DBG_EN
+#define TL_MM_DBG_EN            1   /* Reports the information of the buffer released to CPU2 */
+#endif
+
+/**
+ * Macro definition
+ */
+
+/**
+ * System Transport Layer
+ */
+#if (TL_SHCI_CMD_DBG_EN != 0)
+#define TL_SHCI_CMD_DBG_MSG             core_debug
+#define TL_SHCI_CMD_DBG_BUF             PRINT_LOG_BUFF_DBG
+#else
+#define TL_SHCI_CMD_DBG_MSG(...)
+#define TL_SHCI_CMD_DBG_BUF(...)
+#endif
+
+#define TL_SHCI_CMD_DBG_RAW(...)
+
+#if (TL_SHCI_EVT_DBG_EN != 0)
+#define TL_SHCI_EVT_DBG_MSG             core_debug
+#define TL_SHCI_EVT_DBG_BUF             PRINT_LOG_BUFF_DBG
+#else
+#define TL_SHCI_EVT_DBG_MSG(...)
+#define TL_SHCI_EVT_DBG_BUF(...)
+#endif
+
+#define TL_SHCI_EVT_DBG_RAW(...)
+
+/**
+ * BLE Transport Layer
+ */
+#if (TL_HCI_CMD_DBG_EN != 0)
+#define TL_HCI_CMD_DBG_MSG             core_debug
+#define TL_HCI_CMD_DBG_BUF             PRINT_LOG_BUFF_DBG
+#else
+#define TL_HCI_CMD_DBG_MSG(...)
+#define TL_HCI_CMD_DBG_BUF(...)
+#endif
+
+#define TL_HCI_CMD_DBG_RAW(...)
+
+#if (TL_HCI_EVT_DBG_EN != 0)
+#define TL_HCI_EVT_DBG_MSG             core_debug
+#define TL_HCI_EVT_DBG_BUF             PRINT_LOG_BUFF_DBG
+#else
+#define TL_HCI_EVT_DBG_MSG(...)
+#define TL_HCI_EVT_DBG_BUF(...)
+#endif
+
+#define TL_HCI_EVT_DBG_RAW(...)
+
+/**
+ * Memory Manager - Released buffer tracing
+ */
+#if (TL_MM_DBG_EN != 0)
+#define TL_MM_DBG_MSG             core_debug
+#else
+#define TL_MM_DBG_MSG(...)
+#endif
+
+
+#define PRINT_LOG_BUFF_DBG(...) DbgTraceBuffer(__VA_ARGS__)
+
+void DbgTraceBuffer(const void *pBuffer, uint32_t u32Length, const char *strFormat, ...)
+{
+  va_list vaArgs;
+  uint32_t u32Index;
+  va_start(vaArgs, strFormat);
+  vprintf(strFormat, vaArgs);
+  va_end(vaArgs);
+  for (u32Index = 0; u32Index < u32Length; u32Index ++)
+  {
+    core_debug(" %02X", ((const uint8_t *) pBuffer)[u32Index]);
+  }
+}
+
+/* USER CODE END Tl_Conf */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* TL_DBG_CONF_H */
+
diff --git a/src/utility/STM32_WPAN/tl_mbox.c b/src/utility/STM32_WPAN/tl_mbox.c
new file mode 100644
index 00000000..9a2a2973
--- /dev/null
+++ b/src/utility/STM32_WPAN/tl_mbox.c
@@ -0,0 +1,855 @@
+/**
+ ******************************************************************************
+ * @file    tl_mbox.c
+ * @author  MCD Application Team
+ * @brief   Transport layer for the mailbox interface
+ ******************************************************************************
+ * @attention
+ *
+ * Copyright (c) 2018-2021 STMicroelectronics.
+ * All rights reserved.
+ *
+ * This software is licensed under terms that can be found in the LICENSE file
+ * in the root directory of this software component.
+ * If no LICENSE file comes with this software, it is provided AS-IS.
+ *
+ ******************************************************************************
+ */
+
+#if defined(STM32WBxx)
+/* Includes ------------------------------------------------------------------*/
+#include "stm32_wpan_common.h"
+#include "hw.h"
+
+#include "stm_list.h"
+#include "tl.h"
+#include "mbox_def.h"
+#include "tl_dbg_conf.h"
+
+/* Private typedef -----------------------------------------------------------*/
+typedef enum
+{
+  TL_MB_MM_RELEASE_BUFFER,
+  TL_MB_BLE_CMD,
+  TL_MB_BLE_CMD_RSP,
+  TL_MB_BLE_ASYNCH_EVT,
+  TL_MB_SYS_CMD,
+  TL_MB_SYS_CMD_RSP,
+  TL_MB_SYS_ASYNCH_EVT,
+} TL_MB_PacketType_t;
+
+/* Private defines -----------------------------------------------------------*/
+/* Private macros ------------------------------------------------------------*/
+/* Private variables ---------------------------------------------------------*/
+
+/**< reference table */
+PLACE_IN_SECTION("MAPPING_TABLE") static volatile MB_RefTable_t TL_RefTable;
+PLACE_IN_SECTION("MB_MEM1") ALIGN(4) static MB_DeviceInfoTable_t TL_DeviceInfoTable;
+PLACE_IN_SECTION("MB_MEM1") ALIGN(4) static MB_BleTable_t TL_BleTable;
+PLACE_IN_SECTION("MB_MEM1") ALIGN(4) static MB_ThreadTable_t TL_ThreadTable;
+PLACE_IN_SECTION("MB_MEM1") ALIGN(4) static MB_LldTestsTable_t TL_LldTestsTable;
+PLACE_IN_SECTION("MB_MEM1") ALIGN(4) static MB_BleLldTable_t TL_BleLldTable;
+PLACE_IN_SECTION("MB_MEM1") ALIGN(4) static MB_SysTable_t TL_SysTable;
+PLACE_IN_SECTION("MB_MEM1") ALIGN(4) static MB_MemManagerTable_t TL_MemManagerTable;
+PLACE_IN_SECTION("MB_MEM1") ALIGN(4) static MB_TracesTable_t TL_TracesTable;
+#if 0
+PLACE_IN_SECTION("MB_MEM1") ALIGN(4) static MB_Mac_802_15_4_t TL_Mac_802_15_4_Table;
+PLACE_IN_SECTION("MB_MEM1") ALIGN(4) static MB_ZigbeeTable_t TL_Zigbee_Table;
+#endif
+
+/**< tables */
+PLACE_IN_SECTION("MB_MEM1") ALIGN(4) static tListNode  FreeBufQueue;
+PLACE_IN_SECTION("MB_MEM1") ALIGN(4) static tListNode  TracesEvtQueue;
+PLACE_IN_SECTION("MB_MEM2") ALIGN(4) static uint8_t    CsBuffer[sizeof(TL_PacketHeader_t) + TL_EVT_HDR_SIZE + sizeof(TL_CsEvt_t)];
+PLACE_IN_SECTION("MB_MEM1") ALIGN(4) static tListNode  EvtQueue;
+PLACE_IN_SECTION("MB_MEM1") ALIGN(4) static tListNode  SystemEvtQueue;
+
+
+static tListNode  LocalFreeBufQueue;
+static void (* BLE_IoBusEvtCallBackFunction) (TL_EvtPacket_t *phcievt);
+static void (* BLE_IoBusAclDataTxAck) ( void );
+static void (* SYS_CMD_IoBusCallBackFunction) (TL_EvtPacket_t *phcievt);
+static void (* SYS_EVT_IoBusCallBackFunction) (TL_EvtPacket_t *phcievt);
+
+
+/* Global variables ----------------------------------------------------------*/
+/* Private function prototypes -----------------------------------------------*/
+static void SendFreeBuf( void );
+static void OutputDbgTrace(TL_MB_PacketType_t packet_type, uint8_t* buffer);
+
+/* Public Functions Definition ------------------------------------------------------*/
+
+/******************************************************************************
+ * GENERAL - refer to AN5289 for functions description.
+ ******************************************************************************/
+void TL_Enable( void )
+{
+  HW_IPCC_Enable();
+
+  return;
+}
+
+
+void TL_Init( void )
+{
+  TL_RefTable.p_device_info_table = &TL_DeviceInfoTable;
+  TL_RefTable.p_ble_table = &TL_BleTable;
+  TL_RefTable.p_thread_table = &TL_ThreadTable;
+  TL_RefTable.p_lld_tests_table = &TL_LldTestsTable;
+  TL_RefTable.p_ble_lld_table = &TL_BleLldTable;
+  TL_RefTable.p_sys_table = &TL_SysTable;
+  TL_RefTable.p_mem_manager_table = &TL_MemManagerTable;
+  TL_RefTable.p_traces_table = &TL_TracesTable;
+#if 0
+  TL_RefTable.p_mac_802_15_4_table = &TL_Mac_802_15_4_Table;
+  TL_RefTable.p_zigbee_table = &TL_Zigbee_Table;
+#endif
+  HW_IPCC_Init();
+
+  return;
+}
+
+/******************************************************************************
+ * BLE
+ ******************************************************************************/
+int32_t TL_BLE_Init( void* pConf )
+{
+  MB_BleTable_t  * p_bletable;
+
+  TL_BLE_InitConf_t *pInitHciConf = (TL_BLE_InitConf_t *) pConf;
+
+  LST_init_head (&EvtQueue);
+
+  p_bletable = TL_RefTable.p_ble_table;
+
+  p_bletable->pcmd_buffer = pInitHciConf->p_cmdbuffer;
+  p_bletable->phci_acl_data_buffer = pInitHciConf->p_AclDataBuffer;
+  p_bletable->pcs_buffer  = (uint8_t*)CsBuffer;
+  p_bletable->pevt_queue  = (uint8_t*)&EvtQueue;
+
+  HW_IPCC_BLE_Init();
+
+  BLE_IoBusEvtCallBackFunction = pInitHciConf->IoBusEvtCallBack;
+  BLE_IoBusAclDataTxAck = pInitHciConf->IoBusAclDataTxAck;
+
+  return 0;
+}
+
+int32_t TL_BLE_SendCmd( uint8_t* buffer, uint16_t size )
+{
+  (void)(buffer);
+  (void)(size);
+
+  ((TL_CmdPacket_t*)(TL_RefTable.p_ble_table->pcmd_buffer))->cmdserial.type = TL_BLECMD_PKT_TYPE;
+
+  OutputDbgTrace(TL_MB_BLE_CMD, TL_RefTable.p_ble_table->pcmd_buffer);
+
+  HW_IPCC_BLE_SendCmd();
+
+  return 0;
+}
+
+void HW_IPCC_BLE_RxEvtNot(void)
+{
+  TL_EvtPacket_t *phcievt;
+
+  while(LST_is_empty(&EvtQueue) == FALSE)
+  {
+    LST_remove_head (&EvtQueue, (tListNode **)&phcievt);
+
+    if ( ((phcievt->evtserial.evt.evtcode) == TL_BLEEVT_CS_OPCODE) || ((phcievt->evtserial.evt.evtcode) == TL_BLEEVT_CC_OPCODE ) )
+    {
+      OutputDbgTrace(TL_MB_BLE_CMD_RSP, (uint8_t*)phcievt);
+    }
+    else
+    {
+      OutputDbgTrace(TL_MB_BLE_ASYNCH_EVT, (uint8_t*)phcievt);
+    }
+
+    BLE_IoBusEvtCallBackFunction(phcievt);
+  }
+
+  return;
+}
+
+int32_t TL_BLE_SendAclData( uint8_t* buffer, uint16_t size )
+{
+  (void)(buffer);
+  (void)(size);
+
+  ((TL_AclDataPacket_t *)(TL_RefTable.p_ble_table->phci_acl_data_buffer))->AclDataSerial.type = TL_ACL_DATA_PKT_TYPE;
+
+  HW_IPCC_BLE_SendAclData();
+
+  return 0;
+}
+
+void HW_IPCC_BLE_AclDataAckNot(void)
+{
+  BLE_IoBusAclDataTxAck( );
+
+  return;
+}
+
+/******************************************************************************
+ * SYSTEM
+ ******************************************************************************/
+int32_t TL_SYS_Init( void* pConf  )
+{
+  MB_SysTable_t  * p_systable;
+
+  TL_SYS_InitConf_t *pInitHciConf = (TL_SYS_InitConf_t *) pConf;
+
+  LST_init_head (&SystemEvtQueue);
+  p_systable = TL_RefTable.p_sys_table;
+  p_systable->pcmd_buffer = pInitHciConf->p_cmdbuffer;
+  p_systable->sys_queue = (uint8_t*)&SystemEvtQueue;
+
+  HW_IPCC_SYS_Init();
+
+  SYS_CMD_IoBusCallBackFunction = pInitHciConf->IoBusCallBackCmdEvt;
+  SYS_EVT_IoBusCallBackFunction = pInitHciConf->IoBusCallBackUserEvt;
+
+  return 0;
+}
+
+int32_t TL_SYS_SendCmd( uint8_t* buffer, uint16_t size )
+{
+  (void)(buffer);
+  (void)(size);
+
+  ((TL_CmdPacket_t *)(TL_RefTable.p_sys_table->pcmd_buffer))->cmdserial.type = TL_SYSCMD_PKT_TYPE;
+
+  OutputDbgTrace(TL_MB_SYS_CMD, TL_RefTable.p_sys_table->pcmd_buffer);
+
+  HW_IPCC_SYS_SendCmd();
+
+  return 0;
+}
+
+void HW_IPCC_SYS_CmdEvtNot(void)
+{
+  OutputDbgTrace(TL_MB_SYS_CMD_RSP, (uint8_t*)(TL_RefTable.p_sys_table->pcmd_buffer) );
+
+  SYS_CMD_IoBusCallBackFunction( (TL_EvtPacket_t*)(TL_RefTable.p_sys_table->pcmd_buffer) );
+
+  return;
+}
+
+void HW_IPCC_SYS_EvtNot( void )
+{
+  TL_EvtPacket_t *p_evt;
+
+  while(LST_is_empty(&SystemEvtQueue) == FALSE)
+  {
+    LST_remove_head (&SystemEvtQueue, (tListNode **)&p_evt);
+
+    OutputDbgTrace(TL_MB_SYS_ASYNCH_EVT, (uint8_t*)p_evt );
+
+    SYS_EVT_IoBusCallBackFunction( p_evt );
+  }
+
+  return;
+}
+
+/******************************************************************************
+ * THREAD
+ ******************************************************************************/
+#ifdef THREAD_WB
+void TL_THREAD_Init( TL_TH_Config_t *p_Config )
+{
+  MB_ThreadTable_t  * p_thread_table;
+
+  p_thread_table = TL_RefTable.p_thread_table;
+
+  p_thread_table->clicmdrsp_buffer = p_Config->p_ThreadCliRspBuffer;
+  p_thread_table->otcmdrsp_buffer = p_Config->p_ThreadOtCmdRspBuffer;
+  p_thread_table->notack_buffer = p_Config->p_ThreadNotAckBuffer;
+  p_thread_table->clinot_buffer = p_Config->p_ThreadCliNotBuffer;
+
+  HW_IPCC_THREAD_Init();
+
+  return;
+}
+
+void TL_OT_SendCmd( void )
+{
+  ((TL_CmdPacket_t *)(TL_RefTable.p_thread_table->otcmdrsp_buffer))->cmdserial.type = TL_OTCMD_PKT_TYPE;
+
+  HW_IPCC_OT_SendCmd();
+
+  return;
+}
+
+void TL_CLI_SendCmd( void )
+{
+  ((TL_CmdPacket_t *)(TL_RefTable.p_thread_table->clicmdrsp_buffer))->cmdserial.type = TL_CLICMD_PKT_TYPE;
+
+  HW_IPCC_CLI_SendCmd();
+
+  return;
+}
+
+void TL_THREAD_SendAck ( void )
+{
+  ((TL_CmdPacket_t *)(TL_RefTable.p_thread_table->notack_buffer))->cmdserial.type = TL_OTACK_PKT_TYPE;
+
+  HW_IPCC_THREAD_SendAck();
+
+  return;
+}
+
+void TL_THREAD_CliSendAck ( void )
+{
+  ((TL_CmdPacket_t *)(TL_RefTable.p_thread_table->notack_buffer))->cmdserial.type = TL_OTACK_PKT_TYPE;
+
+  HW_IPCC_THREAD_CliSendAck();
+
+  return;
+}
+
+void HW_IPCC_OT_CmdEvtNot(void)
+{
+  TL_OT_CmdEvtReceived( (TL_EvtPacket_t*)(TL_RefTable.p_thread_table->otcmdrsp_buffer) );
+
+  return;
+}
+
+void HW_IPCC_THREAD_EvtNot( void )
+{
+  TL_THREAD_NotReceived( (TL_EvtPacket_t*)(TL_RefTable.p_thread_table->notack_buffer) );
+
+  return;
+}
+
+void HW_IPCC_THREAD_CliEvtNot( void )
+{
+  TL_THREAD_CliNotReceived( (TL_EvtPacket_t*)(TL_RefTable.p_thread_table->clinot_buffer) );
+
+  return;
+}
+
+__WEAK void TL_OT_CmdEvtReceived( TL_EvtPacket_t * Otbuffer  ){};
+__WEAK void TL_THREAD_NotReceived( TL_EvtPacket_t * Notbuffer ){};
+__WEAK void TL_THREAD_CliNotReceived( TL_EvtPacket_t * Notbuffer ){};
+
+#endif /* THREAD_WB */
+
+/******************************************************************************
+ * LLD TESTS
+ ******************************************************************************/
+#ifdef LLD_TESTS_WB
+void TL_LLDTESTS_Init( TL_LLD_tests_Config_t *p_Config )
+{
+  MB_LldTestsTable_t  * p_lld_tests_table;
+
+  p_lld_tests_table = TL_RefTable.p_lld_tests_table;
+  p_lld_tests_table->clicmdrsp_buffer = p_Config->p_LldTestsCliCmdRspBuffer;
+  p_lld_tests_table->m0cmd_buffer = p_Config->p_LldTestsM0CmdBuffer;
+  HW_IPCC_LLDTESTS_Init();
+  return;
+}
+
+void TL_LLDTESTS_SendCliCmd( void )
+{
+  ((TL_CmdPacket_t *)(TL_RefTable.p_lld_tests_table->clicmdrsp_buffer))->cmdserial.type = TL_CLICMD_PKT_TYPE;
+  HW_IPCC_LLDTESTS_SendCliCmd();
+  return;
+}
+
+void HW_IPCC_LLDTESTS_ReceiveCliRsp( void )
+{
+  TL_LLDTESTS_ReceiveCliRsp( (TL_CmdPacket_t*)(TL_RefTable.p_lld_tests_table->clicmdrsp_buffer) );
+  return;
+}
+
+void TL_LLDTESTS_SendCliRspAck( void )
+{
+  HW_IPCC_LLDTESTS_SendCliRspAck();
+  return;
+}
+
+void HW_IPCC_LLDTESTS_ReceiveM0Cmd( void )
+{
+  TL_LLDTESTS_ReceiveM0Cmd( (TL_CmdPacket_t*)(TL_RefTable.p_lld_tests_table->m0cmd_buffer) );
+  return;
+}
+
+
+void TL_LLDTESTS_SendM0CmdAck( void )
+{
+  HW_IPCC_LLDTESTS_SendM0CmdAck();
+  return;
+}
+
+__WEAK void TL_LLDTESTS_ReceiveCliRsp( TL_CmdPacket_t * Notbuffer ){};
+__WEAK void TL_LLDTESTS_ReceiveM0Cmd( TL_CmdPacket_t * Notbuffer ){};
+#endif /* LLD_TESTS_WB */
+
+/******************************************************************************
+ * BLE LLD
+ ******************************************************************************/
+#ifdef BLE_LLD_WB
+void TL_BLE_LLD_Init( TL_BLE_LLD_Config_t *p_Config )
+{
+  MB_BleLldTable_t  * p_ble_lld_table;
+
+  p_ble_lld_table = TL_RefTable.p_ble_lld_table;
+  p_ble_lld_table->cmdrsp_buffer = p_Config->p_BleLldCmdRspBuffer;
+  p_ble_lld_table->m0cmd_buffer = p_Config->p_BleLldM0CmdBuffer;
+  HW_IPCC_BLE_LLD_Init();
+  return;
+}
+
+void TL_BLE_LLD_SendCliCmd( void )
+{
+  ((TL_CmdPacket_t *)(TL_RefTable.p_ble_lld_table->cmdrsp_buffer))->cmdserial.type = TL_CLICMD_PKT_TYPE;
+  HW_IPCC_BLE_LLD_SendCliCmd();
+  return;
+}
+
+void HW_IPCC_BLE_LLD_ReceiveCliRsp( void )
+{
+  TL_BLE_LLD_ReceiveCliRsp( (TL_CmdPacket_t*)(TL_RefTable.p_ble_lld_table->cmdrsp_buffer) );
+  return;
+}
+
+void TL_BLE_LLD_SendCliRspAck( void )
+{
+  HW_IPCC_BLE_LLD_SendCliRspAck();
+  return;
+}
+
+void HW_IPCC_BLE_LLD_ReceiveM0Cmd( void )
+{
+  TL_BLE_LLD_ReceiveM0Cmd( (TL_CmdPacket_t*)(TL_RefTable.p_ble_lld_table->m0cmd_buffer) );
+  return;
+}
+
+
+void TL_BLE_LLD_SendM0CmdAck( void )
+{
+  HW_IPCC_BLE_LLD_SendM0CmdAck();
+  return;
+}
+
+__WEAK void TL_BLE_LLD_ReceiveCliRsp( TL_CmdPacket_t * Notbuffer ){};
+__WEAK void TL_BLE_LLD_ReceiveM0Cmd( TL_CmdPacket_t * Notbuffer ){};
+
+/* Transparent Mode */
+void TL_BLE_LLD_SendCmd( void )
+{
+  ((TL_CmdPacket_t *)(TL_RefTable.p_ble_lld_table->cmdrsp_buffer))->cmdserial.type = TL_CLICMD_PKT_TYPE;
+  HW_IPCC_BLE_LLD_SendCmd();
+  return;
+}
+
+void HW_IPCC_BLE_LLD_ReceiveRsp( void )
+{
+  TL_BLE_LLD_ReceiveRsp( (TL_CmdPacket_t*)(TL_RefTable.p_ble_lld_table->cmdrsp_buffer) );
+  return;
+}
+
+void TL_BLE_LLD_SendRspAck( void )
+{
+  HW_IPCC_BLE_LLD_SendRspAck();
+  return;
+}
+#endif /* BLE_LLD_WB */
+
+#ifdef MAC_802_15_4_WB
+/******************************************************************************
+ * MAC 802.15.4
+ ******************************************************************************/
+void TL_MAC_802_15_4_Init( TL_MAC_802_15_4_Config_t *p_Config )
+{
+  MB_Mac_802_15_4_t  * p_mac_802_15_4_table;
+
+  p_mac_802_15_4_table = TL_RefTable.p_mac_802_15_4_table;
+
+  p_mac_802_15_4_table->p_cmdrsp_buffer = p_Config->p_Mac_802_15_4_CmdRspBuffer;
+  p_mac_802_15_4_table->p_notack_buffer = p_Config->p_Mac_802_15_4_NotAckBuffer;
+
+  HW_IPCC_MAC_802_15_4_Init();
+
+  return;
+}
+
+void TL_MAC_802_15_4_SendCmd( void )
+{
+  ((TL_CmdPacket_t *)(TL_RefTable.p_mac_802_15_4_table->p_cmdrsp_buffer))->cmdserial.type = TL_OTCMD_PKT_TYPE;
+
+  HW_IPCC_MAC_802_15_4_SendCmd();
+
+  return;
+}
+
+void TL_MAC_802_15_4_SendAck ( void )
+{
+  ((TL_CmdPacket_t *)(TL_RefTable.p_mac_802_15_4_table->p_notack_buffer))->cmdserial.type = TL_OTACK_PKT_TYPE;
+
+  HW_IPCC_MAC_802_15_4_SendAck();
+
+  return;
+}
+
+void HW_IPCC_MAC_802_15_4_CmdEvtNot(void)
+{
+  TL_MAC_802_15_4_CmdEvtReceived( (TL_EvtPacket_t*)(TL_RefTable.p_mac_802_15_4_table->p_cmdrsp_buffer) );
+
+  return;
+}
+
+void HW_IPCC_MAC_802_15_4_EvtNot( void )
+{
+  TL_MAC_802_15_4_NotReceived( (TL_EvtPacket_t*)(TL_RefTable.p_mac_802_15_4_table->p_notack_buffer) );
+
+  return;
+}
+
+__WEAK void TL_MAC_802_15_4_CmdEvtReceived( TL_EvtPacket_t * Otbuffer  ){};
+__WEAK void TL_MAC_802_15_4_NotReceived( TL_EvtPacket_t * Notbuffer ){};
+#endif
+
+#ifdef ZIGBEE_WB
+/******************************************************************************
+ * ZIGBEE
+ ******************************************************************************/
+void TL_ZIGBEE_Init( TL_ZIGBEE_Config_t *p_Config )
+{
+  MB_ZigbeeTable_t  * p_zigbee_table;
+
+  p_zigbee_table = TL_RefTable.p_zigbee_table;
+  p_zigbee_table->appliCmdM4toM0_buffer = p_Config->p_ZigbeeOtCmdRspBuffer;
+  p_zigbee_table->notifM0toM4_buffer = p_Config->p_ZigbeeNotAckBuffer;
+  p_zigbee_table->requestM0toM4_buffer = p_Config->p_ZigbeeNotifRequestBuffer;
+
+  HW_IPCC_ZIGBEE_Init();
+
+  return;
+}
+
+/* Zigbee M4 to M0 Request */
+void TL_ZIGBEE_SendM4RequestToM0( void )
+{
+  ((TL_CmdPacket_t *)(TL_RefTable.p_zigbee_table->appliCmdM4toM0_buffer))->cmdserial.type = TL_OTCMD_PKT_TYPE;
+
+  HW_IPCC_ZIGBEE_SendM4RequestToM0();
+
+  return;
+}
+
+/* Used to receive an ACK from the M0 */
+void HW_IPCC_ZIGBEE_RecvAppliAckFromM0(void)
+{
+  TL_ZIGBEE_CmdEvtReceived( (TL_EvtPacket_t*)(TL_RefTable.p_zigbee_table->appliCmdM4toM0_buffer) );
+
+  return;
+}
+
+/* Zigbee notification from M0 to M4 */
+void HW_IPCC_ZIGBEE_RecvM0NotifyToM4( void )
+{
+  TL_ZIGBEE_NotReceived( (TL_EvtPacket_t*)(TL_RefTable.p_zigbee_table->notifM0toM4_buffer) );
+
+  return;
+}
+
+/* Send an ACK to the M0 for a Notification */
+void TL_ZIGBEE_SendM4AckToM0Notify ( void )
+{
+  ((TL_CmdPacket_t *)(TL_RefTable.p_zigbee_table->notifM0toM4_buffer))->cmdserial.type = TL_OTACK_PKT_TYPE;
+
+  HW_IPCC_ZIGBEE_SendM4AckToM0Notify();
+
+  return;
+}
+
+/* Zigbee M0 to M4 Request */
+void HW_IPCC_ZIGBEE_RecvM0RequestToM4( void )
+{
+  TL_ZIGBEE_M0RequestReceived( (TL_EvtPacket_t*)(TL_RefTable.p_zigbee_table->requestM0toM4_buffer) );
+
+  return;
+}
+
+/* Send an ACK to the M0 for a Request */
+void TL_ZIGBEE_SendM4AckToM0Request(void)
+{
+  ((TL_CmdPacket_t *)(TL_RefTable.p_zigbee_table->requestM0toM4_buffer))->cmdserial.type = TL_OTACK_PKT_TYPE;
+
+  HW_IPCC_ZIGBEE_SendM4AckToM0Request();
+
+  return;
+}
+
+
+__WEAK void TL_ZIGBEE_CmdEvtReceived( TL_EvtPacket_t * Otbuffer  ){};
+__WEAK void TL_ZIGBEE_NotReceived( TL_EvtPacket_t * Notbuffer ){};
+#endif
+
+
+
+/******************************************************************************
+ * MEMORY MANAGER
+ ******************************************************************************/
+void TL_MM_Init( TL_MM_Config_t *p_Config )
+{
+  static MB_MemManagerTable_t  * p_mem_manager_table;
+
+  LST_init_head (&FreeBufQueue);
+  LST_init_head (&LocalFreeBufQueue);
+
+  p_mem_manager_table = TL_RefTable.p_mem_manager_table;
+
+  p_mem_manager_table->blepool = p_Config->p_AsynchEvtPool;
+  p_mem_manager_table->blepoolsize = p_Config->AsynchEvtPoolSize;
+  p_mem_manager_table->pevt_free_buffer_queue = (uint8_t*)&FreeBufQueue;
+  p_mem_manager_table->spare_ble_buffer = p_Config->p_BleSpareEvtBuffer;
+  p_mem_manager_table->spare_sys_buffer = p_Config->p_SystemSpareEvtBuffer;
+  p_mem_manager_table->traces_evt_pool = p_Config->p_TracesEvtPool;
+  p_mem_manager_table->tracespoolsize = p_Config->TracesEvtPoolSize;
+
+  return;
+}
+
+void TL_MM_EvtDone(TL_EvtPacket_t * phcievt)
+{
+  LST_insert_tail(&LocalFreeBufQueue, (tListNode *)phcievt);
+
+  OutputDbgTrace(TL_MB_MM_RELEASE_BUFFER, (uint8_t*)phcievt);
+
+  HW_IPCC_MM_SendFreeBuf( SendFreeBuf );
+
+  return;
+}
+
+static void SendFreeBuf( void )
+{
+  tListNode *p_node;
+
+  while ( FALSE == LST_is_empty (&LocalFreeBufQueue) )
+  {
+    LST_remove_head( &LocalFreeBufQueue, (tListNode **)&p_node );
+    LST_insert_tail( (tListNode*)(TL_RefTable.p_mem_manager_table->pevt_free_buffer_queue), p_node );
+  }
+
+  return;
+}
+
+/******************************************************************************
+ * TRACES
+ ******************************************************************************/
+void TL_TRACES_Init( void )
+{
+  LST_init_head (&TracesEvtQueue);
+
+  TL_RefTable.p_traces_table->traces_queue = (uint8_t*)&TracesEvtQueue;
+
+  HW_IPCC_TRACES_Init();
+
+  return;
+}
+
+void HW_IPCC_TRACES_EvtNot(void)
+{
+  TL_EvtPacket_t *phcievt;
+
+  while(LST_is_empty(&TracesEvtQueue) == FALSE)
+  {
+    LST_remove_head (&TracesEvtQueue, (tListNode **)&phcievt);
+    TL_TRACES_EvtReceived( phcievt );
+  }
+
+  return;
+}
+
+__WEAK void TL_TRACES_EvtReceived( TL_EvtPacket_t * hcievt )
+{
+  (void)(hcievt);
+}
+
+/******************************************************************************
+ * DEBUG INFORMATION
+ ******************************************************************************/
+static void OutputDbgTrace(TL_MB_PacketType_t packet_type, uint8_t* buffer)
+{
+  TL_EvtPacket_t *p_evt_packet;
+  TL_CmdPacket_t *p_cmd_packet;
+  TL_EvtSerial_t *p_cmd_rsp_packet;
+
+  switch(packet_type)
+  {
+    case TL_MB_MM_RELEASE_BUFFER:
+      p_evt_packet = (TL_EvtPacket_t*)buffer;
+      switch(p_evt_packet->evtserial.evt.evtcode)
+      {
+        case TL_BLEEVT_CS_OPCODE:
+          TL_MM_DBG_MSG("mm evt released: 0x%02X", p_evt_packet->evtserial.evt.evtcode);
+          TL_MM_DBG_MSG(" cmd opcode: 0x%04X", ((TL_CsEvt_t*)(p_evt_packet->evtserial.evt.payload))->cmdcode);
+          TL_MM_DBG_MSG(" buffer addr: 0x%08X", p_evt_packet);
+          break;
+
+        case TL_BLEEVT_CC_OPCODE:
+          TL_MM_DBG_MSG("mm evt released: 0x%02X", p_evt_packet->evtserial.evt.evtcode);
+          TL_MM_DBG_MSG(" cmd opcode: 0x%04X", ((TL_CcEvt_t*)(p_evt_packet->evtserial.evt.payload))->cmdcode);
+          TL_MM_DBG_MSG(" buffer addr: 0x%08X", p_evt_packet);
+          break;
+
+        case TL_BLEEVT_VS_OPCODE:
+          TL_MM_DBG_MSG("mm evt released: 0x%02X", p_evt_packet->evtserial.evt.evtcode);
+          TL_MM_DBG_MSG(" subevtcode: 0x%04X", ((TL_AsynchEvt_t*)(p_evt_packet->evtserial.evt.payload))->subevtcode);
+          TL_MM_DBG_MSG(" buffer addr: 0x%08X", p_evt_packet);
+          break;
+
+        default:
+          TL_MM_DBG_MSG("mm evt released: 0x%02X", p_evt_packet->evtserial.evt.evtcode);
+          TL_MM_DBG_MSG(" buffer addr: 0x%08X", p_evt_packet);
+          break;
+      }
+
+      TL_MM_DBG_MSG("\r\n");
+      break;
+
+    case TL_MB_BLE_CMD:
+      p_cmd_packet = (TL_CmdPacket_t*)buffer;
+      TL_HCI_CMD_DBG_MSG("ble cmd: 0x%04X", p_cmd_packet->cmdserial.cmd.cmdcode);
+      if(p_cmd_packet->cmdserial.cmd.plen != 0)
+      {
+        TL_HCI_CMD_DBG_MSG(" payload:");
+        TL_HCI_CMD_DBG_BUF(p_cmd_packet->cmdserial.cmd.payload, p_cmd_packet->cmdserial.cmd.plen, "");
+      }
+      TL_HCI_CMD_DBG_MSG("\r\n");
+
+      TL_HCI_CMD_DBG_RAW(&p_cmd_packet->cmdserial, p_cmd_packet->cmdserial.cmd.plen+TL_CMD_HDR_SIZE);
+      break;
+
+    case TL_MB_BLE_CMD_RSP:
+      p_evt_packet = (TL_EvtPacket_t*)buffer;
+      switch(p_evt_packet->evtserial.evt.evtcode)
+      {
+        case TL_BLEEVT_CS_OPCODE:
+          TL_HCI_CMD_DBG_MSG("ble rsp: 0x%02X", p_evt_packet->evtserial.evt.evtcode);
+          TL_HCI_CMD_DBG_MSG(" cmd opcode: 0x%04X", ((TL_CsEvt_t*)(p_evt_packet->evtserial.evt.payload))->cmdcode);
+          TL_HCI_CMD_DBG_MSG(" numhci: 0x%02X", ((TL_CsEvt_t*)(p_evt_packet->evtserial.evt.payload))->numcmd);
+          TL_HCI_CMD_DBG_MSG(" status: 0x%02X", ((TL_CsEvt_t*)(p_evt_packet->evtserial.evt.payload))->status);
+          break;
+
+        case TL_BLEEVT_CC_OPCODE:
+          TL_HCI_CMD_DBG_MSG("ble rsp: 0x%02X", p_evt_packet->evtserial.evt.evtcode);
+          TL_HCI_CMD_DBG_MSG(" cmd opcode: 0x%04X", ((TL_CcEvt_t*)(p_evt_packet->evtserial.evt.payload))->cmdcode);
+          TL_HCI_CMD_DBG_MSG(" numhci: 0x%02X", ((TL_CcEvt_t*)(p_evt_packet->evtserial.evt.payload))->numcmd);
+          TL_HCI_CMD_DBG_MSG(" status: 0x%02X", ((TL_CcEvt_t*)(p_evt_packet->evtserial.evt.payload))->payload[0]);
+          if((p_evt_packet->evtserial.evt.plen-4) != 0)
+          {
+            TL_HCI_CMD_DBG_MSG(" payload:");
+            TL_HCI_CMD_DBG_BUF(&((TL_CcEvt_t*)(p_evt_packet->evtserial.evt.payload))->payload[1], p_evt_packet->evtserial.evt.plen-4, "");
+          }
+          break;
+
+        default:
+          TL_HCI_CMD_DBG_MSG("unknown ble rsp received: %02X", p_evt_packet->evtserial.evt.evtcode);
+          break;
+      }
+
+      TL_HCI_CMD_DBG_MSG("\r\n");
+
+      TL_HCI_CMD_DBG_RAW(&p_evt_packet->evtserial, p_evt_packet->evtserial.evt.plen+TL_EVT_HDR_SIZE);
+      break;
+
+    case TL_MB_BLE_ASYNCH_EVT:
+      p_evt_packet = (TL_EvtPacket_t*)buffer;
+      if(p_evt_packet->evtserial.evt.evtcode != TL_BLEEVT_VS_OPCODE)
+      {
+        TL_HCI_EVT_DBG_MSG("ble evt: 0x%02X", p_evt_packet->evtserial.evt.evtcode);
+        if((p_evt_packet->evtserial.evt.plen) != 0)
+        {
+          TL_HCI_EVT_DBG_MSG(" payload:");
+          TL_HCI_EVT_DBG_BUF(p_evt_packet->evtserial.evt.payload, p_evt_packet->evtserial.evt.plen, "");
+        }
+      }
+      else
+      {
+        TL_HCI_EVT_DBG_MSG("ble evt: 0x%02X", p_evt_packet->evtserial.evt.evtcode);
+        TL_HCI_EVT_DBG_MSG(" subevtcode: 0x%04X", ((TL_AsynchEvt_t*)(p_evt_packet->evtserial.evt.payload))->subevtcode);
+        if((p_evt_packet->evtserial.evt.plen-2) != 0)
+        {
+          TL_HCI_EVT_DBG_MSG(" payload:");
+          TL_HCI_EVT_DBG_BUF(((TL_AsynchEvt_t*)(p_evt_packet->evtserial.evt.payload))->payload, p_evt_packet->evtserial.evt.plen-2, "");
+        }
+      }
+
+      TL_HCI_EVT_DBG_MSG("\r\n");
+
+      TL_HCI_EVT_DBG_RAW(&p_evt_packet->evtserial, p_evt_packet->evtserial.evt.plen+TL_EVT_HDR_SIZE);
+      break;
+
+    case TL_MB_SYS_CMD:
+      p_cmd_packet = (TL_CmdPacket_t*)buffer;
+
+      TL_SHCI_CMD_DBG_MSG("sys cmd: 0x%04X", p_cmd_packet->cmdserial.cmd.cmdcode);
+
+      if(p_cmd_packet->cmdserial.cmd.plen != 0)
+      {
+        TL_SHCI_CMD_DBG_MSG(" payload:");
+        TL_SHCI_CMD_DBG_BUF(p_cmd_packet->cmdserial.cmd.payload, p_cmd_packet->cmdserial.cmd.plen, "");
+      }
+      TL_SHCI_CMD_DBG_MSG("\r\n");
+
+      TL_SHCI_CMD_DBG_RAW(&p_cmd_packet->cmdserial, p_cmd_packet->cmdserial.cmd.plen+TL_CMD_HDR_SIZE);
+      break;
+
+    case TL_MB_SYS_CMD_RSP:
+      p_cmd_rsp_packet = (TL_EvtSerial_t*)buffer;
+      switch(p_cmd_rsp_packet->evt.evtcode)
+      {
+        case TL_BLEEVT_CC_OPCODE:
+          TL_SHCI_CMD_DBG_MSG("sys rsp: 0x%02X", p_cmd_rsp_packet->evt.evtcode);
+          TL_SHCI_CMD_DBG_MSG(" cmd opcode: 0x%02X", ((TL_CcEvt_t*)(p_cmd_rsp_packet->evt.payload))->cmdcode);
+          TL_SHCI_CMD_DBG_MSG(" status: 0x%02X", ((TL_CcEvt_t*)(p_cmd_rsp_packet->evt.payload))->payload[0]);
+          if((p_cmd_rsp_packet->evt.plen-4) != 0)
+          {
+            TL_SHCI_CMD_DBG_MSG(" payload:");
+            TL_SHCI_CMD_DBG_BUF(&((TL_CcEvt_t*)(p_cmd_rsp_packet->evt.payload))->payload[1], p_cmd_rsp_packet->evt.plen-4, "");
+          }
+          break;
+
+        default:
+          TL_SHCI_CMD_DBG_MSG("unknown sys rsp received: %02X", p_cmd_rsp_packet->evt.evtcode);
+          break;
+      }
+
+      TL_SHCI_CMD_DBG_MSG("\r\n");
+
+      TL_SHCI_CMD_DBG_RAW(&p_cmd_rsp_packet->evt, p_cmd_rsp_packet->evt.plen+TL_EVT_HDR_SIZE);
+      break;
+
+    case  TL_MB_SYS_ASYNCH_EVT:
+      p_evt_packet = (TL_EvtPacket_t*)buffer;
+      if(p_evt_packet->evtserial.evt.evtcode != TL_BLEEVT_VS_OPCODE)
+      {
+        TL_SHCI_EVT_DBG_MSG("unknown sys evt received: %02X", p_evt_packet->evtserial.evt.evtcode);
+      }
+      else
+      {
+        TL_SHCI_EVT_DBG_MSG("sys evt: 0x%02X", p_evt_packet->evtserial.evt.evtcode);
+        TL_SHCI_EVT_DBG_MSG(" subevtcode: 0x%04X", ((TL_AsynchEvt_t*)(p_evt_packet->evtserial.evt.payload))->subevtcode);
+        if((p_evt_packet->evtserial.evt.plen-2) != 0)
+        {
+          TL_SHCI_EVT_DBG_MSG(" payload:");
+          TL_SHCI_EVT_DBG_BUF(((TL_AsynchEvt_t*)(p_evt_packet->evtserial.evt.payload))->payload, p_evt_packet->evtserial.evt.plen-2, "");
+        }
+      }
+
+      TL_SHCI_EVT_DBG_MSG("\r\n");
+
+      TL_SHCI_EVT_DBG_RAW(&p_evt_packet->evtserial, p_evt_packet->evtserial.evt.plen+TL_EVT_HDR_SIZE);
+      break;
+
+    default:
+      break;
+  }
+
+  return;
+}
+#endif /* STM32WBxx */
diff --git a/src/utility/STM32_WPAN/utilities_conf.h b/src/utility/STM32_WPAN/utilities_conf.h
new file mode 100644
index 00000000..d6221a73
--- /dev/null
+++ b/src/utility/STM32_WPAN/utilities_conf.h
@@ -0,0 +1,66 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    utilities_conf.h
+  * @author  MCD Application Team
+  * @brief   Configuration file for STM32 Utilities.
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2019-2021 STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef UTILITIES_CONF_H
+#define UTILITIES_CONF_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "cmsis_compiler.h"
+#include "string.h"
+#include "app_conf.h"
+
+/******************************************************************************
+ * common
+ ******************************************************************************/
+#define UTILS_ENTER_CRITICAL_SECTION( )   uint32_t primask_bit = __get_PRIMASK( );\
+                                          __disable_irq( )
+
+#define UTILS_EXIT_CRITICAL_SECTION( )          __set_PRIMASK( primask_bit )
+
+#define UTILS_MEMSET8( dest, value, size )      memset( dest, value, size);
+
+/******************************************************************************
+ * tiny low power manager
+ * (any macro that does not need to be modified can be removed)
+ ******************************************************************************/
+#define UTIL_LPM_INIT_CRITICAL_SECTION( )
+#define UTIL_LPM_ENTER_CRITICAL_SECTION( )      UTILS_ENTER_CRITICAL_SECTION( )
+#define UTIL_LPM_EXIT_CRITICAL_SECTION( )       UTILS_EXIT_CRITICAL_SECTION( )
+
+/******************************************************************************
+ * sequencer
+ * (any macro that does not need to be modified can be removed)
+ ******************************************************************************/
+#define UTIL_SEQ_INIT_CRITICAL_SECTION( )
+#define UTIL_SEQ_ENTER_CRITICAL_SECTION( )      UTILS_ENTER_CRITICAL_SECTION( )
+#define UTIL_SEQ_EXIT_CRITICAL_SECTION( )       UTILS_EXIT_CRITICAL_SECTION( )
+#define UTIL_SEQ_CONF_TASK_NBR                  (32)
+#define UTIL_SEQ_CONF_PRIO_NBR                  CFG_SCH_PRIO_NBR
+#define UTIL_SEQ_MEMSET8( dest, value, size )   UTILS_MEMSET8( dest, value, size )
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*UTILITIES_CONF_H */

From 5293858c42ff57748d672a64ad80d9abf95f1f36 Mon Sep 17 00:00:00 2001
From: Alexandre Bourdiol <alexandre.bourdiol@st.com>
Date: Tue, 18 Mar 2025 09:42:32 +0100
Subject: [PATCH 096/112] feat: add patch files to be applied on stm32wb Cube
 update

Signed-off-by: Alexandre Bourdiol <alexandre.bourdiol@st.com>
---
 .../0001-chore-adapt-STM32_WPAN-sources.patch | 310 ++++++++++++++++++
 ...imeout-when-waiting-for-the-cmd_resp.patch |  41 +++
 ...ort-for-customize-app_conf_default.h.patch | 135 ++++++++
 ...-fix-TL_Evt_t-payload-size-for-reset.patch |  30 ++
 4 files changed, 516 insertions(+)
 create mode 100644 extras/STM32_WPAN/0001-chore-adapt-STM32_WPAN-sources.patch
 create mode 100644 extras/STM32_WPAN/0002-fix-include-a-timeout-when-waiting-for-the-cmd_resp.patch
 create mode 100644 extras/STM32_WPAN/0003-chore-add-support-for-customize-app_conf_default.h.patch
 create mode 100644 extras/STM32_WPAN/0004-fix-TL_Evt_t-payload-size-for-reset.patch

diff --git a/extras/STM32_WPAN/0001-chore-adapt-STM32_WPAN-sources.patch b/extras/STM32_WPAN/0001-chore-adapt-STM32_WPAN-sources.patch
new file mode 100644
index 00000000..a3f62011
--- /dev/null
+++ b/extras/STM32_WPAN/0001-chore-adapt-STM32_WPAN-sources.patch
@@ -0,0 +1,310 @@
+From 7f99c89e8a6f834daf4a76bf98307e9ebcd01c91 Mon Sep 17 00:00:00 2001
+From: Frederic Pillon <frederic.pillon@st.com>
+Date: Wed, 10 Jan 2024 18:16:01 +0100
+Subject: [PATCH 1/4] chore: adapt STM32_WPAN sources
+
+Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
+---
+ src/utility/STM32_WPAN/app_conf_default.h | 49 +++++++++++++++++++----
+ src/utility/STM32_WPAN/hw.h               | 13 +++++-
+ src/utility/STM32_WPAN/hw_ipcc.c          |  4 +-
+ src/utility/STM32_WPAN/shci.c             |  2 +
+ src/utility/STM32_WPAN/shci_tl.c          | 17 ++++++++
+ src/utility/STM32_WPAN/stm_list.c         |  6 ++-
+ src/utility/STM32_WPAN/tl_mbox.c          |  6 +++
+ 7 files changed, 85 insertions(+), 12 deletions(-)
+
+diff --git a/src/utility/STM32_WPAN/app_conf_default.h b/src/utility/STM32_WPAN/app_conf_default.h
+index 71fc107..bf2274a 100644
+--- a/src/utility/STM32_WPAN/app_conf_default.h
++++ b/src/utility/STM32_WPAN/app_conf_default.h
+@@ -1,9 +1,9 @@
+ /* USER CODE BEGIN Header */
+ /**
+   ******************************************************************************
+-  * @file    app_conf.h
++  * @file    app_conf_default.h
+   * @author  MCD Application Team
+-  * @brief   Application configuration file for STM32WPAN Middleware.
++  * @brief   Default application configuration file for STM32WPAN Middleware.
+   ******************************************************************************
+   * @attention
+   *
+@@ -19,18 +19,40 @@
+ /* USER CODE END Header */
+ 
+ /* Define to prevent recursive inclusion -------------------------------------*/
+-#ifndef APP_CONF_H
+-#define APP_CONF_H
++#ifndef APP_CONF_DEFAULT_H
++#define APP_CONF_DEFAULT_H
+ 
++#if 0
+ #include "hw.h"
+ #include "hw_conf.h"
+ #include "hw_if.h"
+ #include "ble_bufsize.h"
++#endif
+ 
+ /******************************************************************************
+  * Application Config
+  ******************************************************************************/
+ 
++/**< generic parameters ******************************************************/
++/* HCI related defines */
++
++#define ACI_HAL_SET_TX_POWER_LEVEL 0xFC0F
++#define ACI_WRITE_CONFIG_DATA_OPCODE 0xFC0C
++#define ACI_READ_CONFIG_DATA_OPCODE 0xFC0D
++#define MAX_HCI_ACL_PACKET_SIZE (sizeof(TL_PacketHeader_t) + 5 + 251)
++#define HCI_RESET 0x0C03
++
++#ifndef BLE_SHARED_MEM_BYTE_ORDER
++  #define BLE_SHARED_MEM_BYTE_ORDER  MSBFIRST
++#endif
++#define BLE_MODULE_SHARED_MEM_BUFFER_SIZE 128
++
++/**
++ * Define Tx Power
++ */
++#define CFG_TX_POWER                      (0x18) /* -0.15dBm */
++
++#if 0
+ /**
+  * Define Secure Connections Support
+  */
+@@ -104,6 +126,7 @@
+ #define CFG_FW_SUBVERSION         (1)
+ #define CFG_FW_BRANCH             (0)
+ #define CFG_FW_BUILD              (0)
++#endif
+ 
+ /******************************************************************************
+  * BLE Stack
+@@ -250,7 +273,7 @@
+  *          0: LE Power Class 2-3
+  * other bits: complete with Options_extension flag
+  */
+-#define CFG_BLE_OPTIONS  (SHCI_C2_BLE_INIT_OPTIONS_LL_HOST | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV | SHCI_C2_BLE_INIT_OPTIONS_CS_ALGO2 | SHCI_C2_BLE_INIT_OPTIONS_FULL_GATTDB_NVM | SHCI_C2_BLE_INIT_OPTIONS_GATT_CACHING_NOTUSED | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3)
++#define CFG_BLE_OPTIONS  (SHCI_C2_BLE_INIT_OPTIONS_LL_ONLY | SHCI_C2_BLE_INIT_OPTIONS_WITH_SVC_CHANGE_DESC | SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW | SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV | SHCI_C2_BLE_INIT_OPTIONS_CS_ALGO2 | SHCI_C2_BLE_INIT_OPTIONS_FULL_GATTDB_NVM | SHCI_C2_BLE_INIT_OPTIONS_GATT_CACHING_NOTUSED | SHCI_C2_BLE_INIT_OPTIONS_POWER_CLASS_2_3)
+ 
+ /**
+  * BLE stack Options_extension flags to be configured with:
+@@ -292,7 +315,11 @@
+  * This parameter is considered by the CPU2 when CFG_BLE_OPTIONS has SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV flag set
+  */
+ 
+-#define CFG_BLE_MAX_ADV_SET_NBR     (8)
++#if defined(STM32WB15xx)
++  #define CFG_BLE_MAX_ADV_SET_NBR     (3)
++#else
++  #define CFG_BLE_MAX_ADV_SET_NBR     (8)
++#endif
+ 
+  /* Maximum advertising data length (in bytes)
+  * Range: 31 .. 1650 with limitation:
+@@ -301,7 +328,11 @@
+  * This parameter is considered by the CPU2 when CFG_BLE_OPTIONS has SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV flag set
+  */
+ 
+-#define CFG_BLE_MAX_ADV_DATA_LEN    (207)
++#if defined(STM32WB15xx)
++  #define CFG_BLE_MAX_ADV_DATA_LEN    (414)
++#else
++  #define CFG_BLE_MAX_ADV_DATA_LEN    (207)
++#endif
+ 
+  /* RF TX Path Compensation Value (16-bit signed integer). Units: 0.1 dB.
+   * Range: -1280 .. 1280
+@@ -324,6 +355,7 @@
+ 
+ #define CFG_BLE_CORE_VERSION   (SHCI_C2_BLE_INIT_BLE_CORE_5_4)
+ 
++#if 0
+ /******************************************************************************
+  * Transport Layer
+  ******************************************************************************/
+@@ -660,4 +692,5 @@ typedef enum
+ 
+ #define CFG_OTP_END_ADRESS      OTP_AREA_END_ADDR
+ 
+-#endif /*APP_CONF_H */
++#endif
++#endif /*APP_CONF_DEFAULT_H */
+diff --git a/src/utility/STM32_WPAN/hw.h b/src/utility/STM32_WPAN/hw.h
+index 651e1f1..1472a5e 100644
+--- a/src/utility/STM32_WPAN/hw.h
++++ b/src/utility/STM32_WPAN/hw.h
+@@ -26,14 +26,23 @@ extern "C" {
+ #endif
+ 
+   /* Includes ------------------------------------------------------------------*/
++#include "stm32_def.h"
++#include "stm32wbxx_ll_bus.h"
++#include "stm32wbxx_ll_exti.h"
++#include "stm32wbxx_ll_system.h"
++#include "stm32wbxx_ll_rcc.h"
++#include "stm32wbxx_ll_ipcc.h"
++#include "stm32wbxx_ll_cortex.h"
++#include "stm32wbxx_ll_utils.h"
++#include "stm32wbxx_ll_pwr.h"
+ 
+   /******************************************************************************
+    * HW IPCC
+    ******************************************************************************/
+   void HW_IPCC_Enable( void );
+   void HW_IPCC_Init( void );
+-  void HW_IPCC_Rx_Handler( void );
+-  void HW_IPCC_Tx_Handler( void );
++#define HW_IPCC_Rx_Handler IPCC_C1_RX_IRQHandler
++#define HW_IPCC_Tx_Handler IPCC_C1_TX_IRQHandler
+ 
+   void HW_IPCC_BLE_Init( void );
+   void HW_IPCC_BLE_SendCmd( void );
+diff --git a/src/utility/STM32_WPAN/hw_ipcc.c b/src/utility/STM32_WPAN/hw_ipcc.c
+index 6a311b1..ad3c9d4 100644
+--- a/src/utility/STM32_WPAN/hw_ipcc.c
++++ b/src/utility/STM32_WPAN/hw_ipcc.c
+@@ -18,8 +18,9 @@
+   */
+ /* USER CODE END Header */
+ 
++#if defined(STM32WBxx)
+ /* Includes ------------------------------------------------------------------*/
+-#include "app_common.h"
++#include "hw.h"
+ #include "mbox_def.h"
+ #include "utilities_conf.h"
+ 
+@@ -745,3 +746,4 @@ static void HW_IPCC_TRACES_EvtHandler( void )
+ }
+ 
+ __weak void HW_IPCC_TRACES_EvtNot( void ){};
++#endif /* STM32WBxx */
+diff --git a/src/utility/STM32_WPAN/shci.c b/src/utility/STM32_WPAN/shci.c
+index 5c32555..40110f4 100644
+--- a/src/utility/STM32_WPAN/shci.c
++++ b/src/utility/STM32_WPAN/shci.c
+@@ -17,6 +17,7 @@
+  */
+ 
+ 
++#if defined(STM32WBxx)
+ /* Includes ------------------------------------------------------------------*/
+ #include "stm32_wpan_common.h"
+ 
+@@ -759,3 +760,4 @@ SHCI_CmdStatus_t SHCI_GetWirelessFwInfo( WirelessFwInfo_t* pWirelessInfo )
+ 
+   return (SHCI_Success);
+ }
++#endif /* STM32WBxx */
+diff --git a/src/utility/STM32_WPAN/shci_tl.c b/src/utility/STM32_WPAN/shci_tl.c
+index 0f60430..daa988c 100644
+--- a/src/utility/STM32_WPAN/shci_tl.c
++++ b/src/utility/STM32_WPAN/shci_tl.c
+@@ -17,11 +17,13 @@
+  */
+ 
+ 
++#if defined(STM32WBxx)
+ /* Includes ------------------------------------------------------------------*/
+ #include "stm32_wpan_common.h"
+ 
+ #include "stm_list.h"
+ #include "shci_tl.h"
++#include "stm32_def.h"
+ 
+ /* Private typedef -----------------------------------------------------------*/
+ typedef enum
+@@ -168,6 +170,20 @@ void shci_send( uint16_t cmd_code, uint8_t len_cmd_payload, uint8_t * p_cmd_payl
+   return;
+ }
+ 
++void shci_notify_asynch_evt(void *pdata)
++{
++  UNUSED(pdata);
++  /* Need to parse data in future version */
++  shci_user_evt_proc();
++}
++
++void shci_register_io_bus(tSHciIO *fops)
++{
++  /* Register IO bus services */
++  fops->Init    = TL_SYS_Init;
++  fops->Send    = TL_SYS_SendCmd;
++}
++
+ /* Private functions ---------------------------------------------------------*/
+ static void TlInit( TL_CmdPacket_t * p_cmdbuffer )
+ {
+@@ -250,3 +266,4 @@ __WEAK void shci_cmd_resp_release(uint32_t flag)
+ 
+   return;
+ }
++#endif /* STM32WBxx */
+diff --git a/src/utility/STM32_WPAN/stm_list.c b/src/utility/STM32_WPAN/stm_list.c
+index 4c92864..df6c215 100644
+--- a/src/utility/STM32_WPAN/stm_list.c
++++ b/src/utility/STM32_WPAN/stm_list.c
+@@ -17,10 +17,13 @@
+   */
+ 
+ 
++#if defined(STM32WBxx)
+ /******************************************************************************
+  * Include Files
+  ******************************************************************************/
+-#include "utilities_common.h"
++#include "stdint.h"
++#include "cmsis_gcc.h"
++#include "stm32_wpan_common.h"
+ 
+ #include "stm_list.h"
+ 
+@@ -204,3 +207,4 @@ void LST_get_prev_node (tListNode * ref_node, tListNode ** node)
+ 
+   __set_PRIMASK(primask_bit);      /**< Restore PRIMASK bit*/
+ }
++#endif /* STM32WBxx */
+diff --git a/src/utility/STM32_WPAN/tl_mbox.c b/src/utility/STM32_WPAN/tl_mbox.c
+index df07a19..9a2a297 100644
+--- a/src/utility/STM32_WPAN/tl_mbox.c
++++ b/src/utility/STM32_WPAN/tl_mbox.c
+@@ -16,6 +16,7 @@
+  ******************************************************************************
+  */
+ 
++#if defined(STM32WBxx)
+ /* Includes ------------------------------------------------------------------*/
+ #include "stm32_wpan_common.h"
+ #include "hw.h"
+@@ -51,8 +52,10 @@ PLACE_IN_SECTION("MB_MEM1") ALIGN(4) static MB_BleLldTable_t TL_BleLldTable;
+ PLACE_IN_SECTION("MB_MEM1") ALIGN(4) static MB_SysTable_t TL_SysTable;
+ PLACE_IN_SECTION("MB_MEM1") ALIGN(4) static MB_MemManagerTable_t TL_MemManagerTable;
+ PLACE_IN_SECTION("MB_MEM1") ALIGN(4) static MB_TracesTable_t TL_TracesTable;
++#if 0
+ PLACE_IN_SECTION("MB_MEM1") ALIGN(4) static MB_Mac_802_15_4_t TL_Mac_802_15_4_Table;
+ PLACE_IN_SECTION("MB_MEM1") ALIGN(4) static MB_ZigbeeTable_t TL_Zigbee_Table;
++#endif
+ 
+ /**< tables */
+ PLACE_IN_SECTION("MB_MEM1") ALIGN(4) static tListNode  FreeBufQueue;
+@@ -97,8 +100,10 @@ void TL_Init( void )
+   TL_RefTable.p_sys_table = &TL_SysTable;
+   TL_RefTable.p_mem_manager_table = &TL_MemManagerTable;
+   TL_RefTable.p_traces_table = &TL_TracesTable;
++#if 0
+   TL_RefTable.p_mac_802_15_4_table = &TL_Mac_802_15_4_Table;
+   TL_RefTable.p_zigbee_table = &TL_Zigbee_Table;
++#endif
+   HW_IPCC_Init();
+ 
+   return;
+@@ -847,3 +852,4 @@ static void OutputDbgTrace(TL_MB_PacketType_t packet_type, uint8_t* buffer)
+ 
+   return;
+ }
++#endif /* STM32WBxx */
+-- 
+2.34.1
+
diff --git a/extras/STM32_WPAN/0002-fix-include-a-timeout-when-waiting-for-the-cmd_resp.patch b/extras/STM32_WPAN/0002-fix-include-a-timeout-when-waiting-for-the-cmd_resp.patch
new file mode 100644
index 00000000..bd6f66a2
--- /dev/null
+++ b/extras/STM32_WPAN/0002-fix-include-a-timeout-when-waiting-for-the-cmd_resp.patch
@@ -0,0 +1,41 @@
+From a33328182e334e1ddedd368a047d75cf1662e330 Mon Sep 17 00:00:00 2001
+From: Frederic Pillon <frederic.pillon@st.com>
+Date: Thu, 13 Jul 2023 17:16:40 +0200
+Subject: [PATCH 2/4] fix: include a timeout when waiting for the cmd_resp
+
+Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
+---
+ src/utility/STM32_WPAN/shci_tl.c | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/src/utility/STM32_WPAN/shci_tl.c b/src/utility/STM32_WPAN/shci_tl.c
+index daa988c..25e1a21 100644
+--- a/src/utility/STM32_WPAN/shci_tl.c
++++ b/src/utility/STM32_WPAN/shci_tl.c
+@@ -24,6 +24,7 @@
+ #include "stm_list.h"
+ #include "shci_tl.h"
+ #include "stm32_def.h"
++#include "wiring_time.h"
+ 
+ /* Private typedef -----------------------------------------------------------*/
+ typedef enum
+@@ -251,10 +252,11 @@ static void TlUserEvtReceived(TL_EvtPacket_t *shcievt)
+ /* Weak implementation ----------------------------------------------------------------*/
+ __WEAK void shci_cmd_resp_wait(uint32_t timeout)
+ {
+-  (void)timeout;
+-
+-  while(CmdRspStatusFlag != SHCI_TL_CMD_RESP_RELEASE);
+-
++  for (unsigned long start = millis(); (millis() - start) < timeout;) {
++    if (CmdRspStatusFlag == SHCI_TL_CMD_RESP_RELEASE) {
++      break;
++    }
++  }
+   return;
+ }
+ 
+-- 
+2.34.1
+
diff --git a/extras/STM32_WPAN/0003-chore-add-support-for-customize-app_conf_default.h.patch b/extras/STM32_WPAN/0003-chore-add-support-for-customize-app_conf_default.h.patch
new file mode 100644
index 00000000..3c5e66ae
--- /dev/null
+++ b/extras/STM32_WPAN/0003-chore-add-support-for-customize-app_conf_default.h.patch
@@ -0,0 +1,135 @@
+From a973b405bf34a93b0c300c8bbc4aa5d59fa182e5 Mon Sep 17 00:00:00 2001
+From: Frederic Pillon <frederic.pillon@st.com>
+Date: Wed, 10 Jan 2024 18:45:17 +0100
+Subject: [PATCH 3/4] chore: add support for customize app_conf_default.h
+
+Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
+---
+ src/utility/STM32_WPAN/app_conf_default.h | 58 ++++++++++++++++++-----
+ 1 file changed, 45 insertions(+), 13 deletions(-)
+
+diff --git a/src/utility/STM32_WPAN/app_conf_default.h b/src/utility/STM32_WPAN/app_conf_default.h
+index bf2274a..ff2dc01 100644
+--- a/src/utility/STM32_WPAN/app_conf_default.h
++++ b/src/utility/STM32_WPAN/app_conf_default.h
+@@ -50,7 +50,9 @@
+ /**
+  * Define Tx Power
+  */
+-#define CFG_TX_POWER                      (0x18) /* -0.15dBm */
++#ifndef CFG_TX_POWER
++  #define CFG_TX_POWER                        (0x18) /* -0.15dBm */
++#endif
+ 
+ #if 0
+ /**
+@@ -135,13 +137,25 @@
+  * Maximum number of simultaneous connections that the device will support.
+  * Valid values are from 1 to 8
+  */
+-#define CFG_BLE_NUM_LINK            8
++#ifndef CFG_BLE_NUM_LINK
++#ifdef STM32WB15xx
++  #define CFG_BLE_NUM_LINK            3
++#else
++  #define CFG_BLE_NUM_LINK            8
++#endif
++#endif
+ 
+ /**
+  * Maximum number of Services that can be stored in the GATT database.
+  * Note that the GAP and GATT services are automatically added so this parameter should be 2 plus the number of user services
+  */
+-#define CFG_BLE_NUM_GATT_SERVICES   8
++#ifndef CFG_BLE_NUM_GATT_SERVICES
++#ifdef STM32WB15xx
++  #define CFG_BLE_NUM_GATT_SERVICES   4
++#else
++  #define CFG_BLE_NUM_GATT_SERVICES   8
++#endif
++#endif
+ 
+ /**
+  * Maximum number of Attributes
+@@ -150,7 +164,13 @@
+  * Note that certain characteristics and relative descriptors are added automatically during device initialization
+  * so this parameters should be 9 plus the number of user Attributes
+  */
+-#define CFG_BLE_NUM_GATT_ATTRIBUTES 68
++#ifndef CFG_BLE_NUM_GATT_ATTRIBUTES
++#ifdef STM32WB15xx
++  #define CFG_BLE_NUM_GATT_ATTRIBUTES 30
++#else
++  #define CFG_BLE_NUM_GATT_ATTRIBUTES 68
++#endif
++#endif
+ 
+ /**
+  * Maximum supported ATT_MTU size
+@@ -186,12 +206,16 @@
+ /**
+  * Enable or disable the Extended Packet length feature. Valid values are 0 or 1.
+  */
+-#define CFG_BLE_DATA_LENGTH_EXTENSION   1
++#ifndef CFG_BLE_DATA_LENGTH_EXTENSION
++  #define CFG_BLE_DATA_LENGTH_EXTENSION   1
++#endif
+ 
+ /**
+  * Sleep clock accuracy in Peripheral mode (ppm value)
+  */
+-#define CFG_BLE_PERIPHERAL_SCA   500
++#ifndef CFG_BLE_PERIPHERAL_SCA
++  #define CFG_BLE_PERIPHERAL_SCA   500
++#endif
+ 
+ /**
+  * Sleep clock accuracy in Central mode
+@@ -204,7 +228,9 @@
+  * 6 : 21 ppm to 30 ppm
+  * 7 : 0 ppm to 20 ppm
+  */
+-#define CFG_BLE_CENTRAL_SCA   0
++#ifndef CFG_BLE_CENTRAL_SCA
++  #define CFG_BLE_CENTRAL_SCA   0
++#endif
+ 
+ /**
+  * LsSource
+@@ -213,21 +239,27 @@
+  * - bit 1:   1: STM32WB5M Module device                             0: Other devices as STM32WBxx SOC, STM32WB1M module
+  * - bit 2:   1: HSE/1024 Clock config                               0: LSE Clock config
+  */
+-#if defined(STM32WB5Mxx)
+-  #define CFG_BLE_LS_SOURCE  (SHCI_C2_BLE_INIT_CFG_BLE_LS_NOCALIB | SHCI_C2_BLE_INIT_CFG_BLE_LS_MOD5MM_DEV | SHCI_C2_BLE_INIT_CFG_BLE_LS_CLK_LSE)
+-#else
+-  #define CFG_BLE_LS_SOURCE  (SHCI_C2_BLE_INIT_CFG_BLE_LS_NOCALIB | SHCI_C2_BLE_INIT_CFG_BLE_LS_OTHER_DEV | SHCI_C2_BLE_INIT_CFG_BLE_LS_CLK_LSE)
++#ifndef CFG_BLE_LS_SOURCE
++  #if defined(STM32WB5Mxx)
++    #define CFG_BLE_LS_SOURCE  (SHCI_C2_BLE_INIT_CFG_BLE_LS_NOCALIB | SHCI_C2_BLE_INIT_CFG_BLE_LS_MOD5MM_DEV | SHCI_C2_BLE_INIT_CFG_BLE_LS_CLK_LSE)
++  #else
++    #define CFG_BLE_LS_SOURCE  (SHCI_C2_BLE_INIT_CFG_BLE_LS_NOCALIB | SHCI_C2_BLE_INIT_CFG_BLE_LS_OTHER_DEV | SHCI_C2_BLE_INIT_CFG_BLE_LS_CLK_LSE)
++  #endif
+ #endif
+ 
+ /**
+  * Start up time of the high speed (16 or 32 MHz) crystal oscillator in units of 625/256 us (~2.44 us)
+  */
+-#define CFG_BLE_HSE_STARTUP_TIME  0x148
++#ifndef CFG_BLE_HSE_STARTUP_TIME
++  #define CFG_BLE_HSE_STARTUP_TIME  0x148
++#endif
+ 
+ /**
+  * Maximum duration of the connection event when the device is in Peripheral mode in units of 625/256 us (~2.44 us)
+  */
+-#define CFG_BLE_MAX_CONN_EVENT_LENGTH  (0xFFFFFFFF)
++#ifndef CFG_BLE_MAX_CONN_EVENT_LENGTH
++  #define CFG_BLE_MAX_CONN_EVENT_LENGTH  (0xFFFFFFFF)
++#endif
+ 
+ /**
+  * Viterbi Mode
+-- 
+2.34.1
+
diff --git a/extras/STM32_WPAN/0004-fix-TL_Evt_t-payload-size-for-reset.patch b/extras/STM32_WPAN/0004-fix-TL_Evt_t-payload-size-for-reset.patch
new file mode 100644
index 00000000..110a8410
--- /dev/null
+++ b/extras/STM32_WPAN/0004-fix-TL_Evt_t-payload-size-for-reset.patch
@@ -0,0 +1,30 @@
+From 324eef795bfd0a754aae4d5f9b528d4c8ad706c8 Mon Sep 17 00:00:00 2001
+From: Frederic Pillon <frederic.pillon@st.com>
+Date: Mon, 24 Jul 2023 10:55:20 +0200
+Subject: [PATCH 4/4] fix: TL_Evt_t payload size for reset
+
+Within STM32CubeWB v1.17.0 update TL_Evt_t payload size was reduced.
+This produce a warning -Warray-bounds due to the reset management
+which require 4 bytes.
+
+Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
+---
+ src/utility/STM32_WPAN/tl.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/utility/STM32_WPAN/tl.h b/src/utility/STM32_WPAN/tl.h
+index 8e8c6cb..7452087 100644
+--- a/src/utility/STM32_WPAN/tl.h
++++ b/src/utility/STM32_WPAN/tl.h
+@@ -108,7 +108,7 @@ typedef PACKED_STRUCT
+ {
+   uint8_t   evtcode;
+   uint8_t   plen;
+-  uint8_t   payload[2];
++  uint8_t   payload[4];
+ } TL_Evt_t;
+ 
+ typedef PACKED_STRUCT
+-- 
+2.34.1
+

From 0f5ca9f32d824030496d1960837e75bd79f32d92 Mon Sep 17 00:00:00 2001
From: Frederic Pillon <frederic.pillon@st.com>
Date: Wed, 26 Mar 2025 10:14:02 +0100
Subject: [PATCH 097/112] chore: update with stm32wb

Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
---
 .github/workflows/compile-examples.yml |  2 ++
 .github/workflows/spell-check.yml      |  7 ++++++
 README.md                              | 30 +++++++++++++++++++++++---
 library.properties                     |  2 +-
 src/utility/HCISharedMemTransport.cpp  |  4 ++--
 src/utility/HCISpiTransport.cpp        |  6 ++----
 src/utility/HCITransport.h             |  4 ++++
 7 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/compile-examples.yml b/.github/workflows/compile-examples.yml
index f90e4784..903abc44 100644
--- a/.github/workflows/compile-examples.yml
+++ b/.github/workflows/compile-examples.yml
@@ -24,6 +24,8 @@ jobs:
           - STMicroelectronics:stm32:Eval:pnum=STEVAL_MKSBOX1V1,usb=CDCgen
           - STMicroelectronics:stm32:Nucleo_64:pnum=NUCLEO_L476RG
           - STMicroelectronics:stm32:Disco:pnum=B_L475E_IOT01A
+          - STMicroelectronics:stm32:Nucleo_64:pnum=P_NUCLEO_WB55RG
+          - STMicroelectronics:stm32:Nucleo_64:pnum=P_NUCLEO_WB55_USB_DONGLE
 
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/spell-check.yml b/.github/workflows/spell-check.yml
index 6faf09c8..61af09cd 100644
--- a/.github/workflows/spell-check.yml
+++ b/.github/workflows/spell-check.yml
@@ -23,3 +23,10 @@ jobs:
 
       - 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/README.md b/README.md
index 62186871..94d95daa 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,14 @@
 # STM32duinoBLE
 
-This library is a fork of ArduinoBLE library to add the support of SPBTLE-RF, SPBTLE-1S, BLUENRG-M2SP, BLUENRG-LP and BLUENRG-M0 BLE modules.
+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 [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].
+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:
 
@@ -17,6 +23,14 @@ 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:
@@ -70,6 +84,12 @@ This is equivalent to the below configuration using the `CUSTOM_BLE_SPI`:
 #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
 
 ```
@@ -91,14 +111,18 @@ 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
\ No newline at end of file
+X-NUCLEO-IDB05A1: https://www.st.com/en/ecosystems/x-nucleo-idb05a1.html
diff --git a/library.properties b/library.properties
index 94860ca4..1842c0ee 100644
--- a/library.properties
+++ b/library.properties
@@ -2,7 +2,7 @@ name=STM32duinoBLE
 version=1.3.7
 author=Arduino, SRA
 maintainer=stm32duino
-sentence=Fork of ArduinoBLE library to add the support of SPBTLE-RF, SPBTLE-1S, BLUENRG-M2SP, BLUENRG-LP and BLUENRG-M0 BLE modules.
+sentence=Fork of ArduinoBLE library to add the support of STM32WB, SPBTLE-RF, SPBTLE-1S, BLUENRG-M2SP, BLUENRG-LP and BLUENRG-M0 BLE modules.
 paragraph=This library supports creating a Bluetooth® Low Energy peripheral & central mode.
 category=Communication
 url=https://github.com/stm32duino/STM32duinoBLE
diff --git a/src/utility/HCISharedMemTransport.cpp b/src/utility/HCISharedMemTransport.cpp
index ab462dfa..f4ce1d0b 100644
--- a/src/utility/HCISharedMemTransport.cpp
+++ b/src/utility/HCISharedMemTransport.cpp
@@ -16,7 +16,7 @@
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
-#if defined(STM32WBxx)
+#if defined(STM32WBxx) && !defined(USE_BLE_SPI)
 
 #include "HCISharedMemTransport.h"
 #include "STM32_WPAN/hw.h"
@@ -779,4 +779,4 @@ int HCISharedMemTransportClass::bt_ipm_set_power(void)
 }
 
 HCITransportInterface& HCITransport = HCISharedMemTransport;
-#endif /* STM32WBxx */
+#endif /* STM32WBxx && !USE_BLE_SPI */
diff --git a/src/utility/HCISpiTransport.cpp b/src/utility/HCISpiTransport.cpp
index 9a3709da..16b81623 100644
--- a/src/utility/HCISpiTransport.cpp
+++ b/src/utility/HCISpiTransport.cpp
@@ -17,12 +17,9 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
+#if !defined(STM32WBxx) || defined(USE_BLE_SPI)
 #include "HCISpiTransport.h"
 
-#if __has_include("ble_spi_conf.h")
-  #include "ble_spi_conf.h"
-#endif
-
 #if defined(CUSTOM_BLE_SPI)
 SPIClass SpiHCI(BLE_SPI_MOSI, BLE_SPI_MISO, BLE_SPI_CLK);
 HCISpiTransportClass HCISpiTransport(SpiHCI, BLE_CHIP_TYPE, BLE_SPI_CS, BLE_SPI_IRQ, BLE_RESET, BLE_SPI_FREQ, BLE_SPI_MODE);
@@ -1404,3 +1401,4 @@ void HCISpiTransportClass::wait_for_set_address()
 }
 
 HCITransportInterface& HCITransport = HCISpiTransport;
+#endif // !STM32WBxx || USE_BLE_SPI
diff --git a/src/utility/HCITransport.h b/src/utility/HCITransport.h
index d8aa6a95..02e7962f 100644
--- a/src/utility/HCITransport.h
+++ b/src/utility/HCITransport.h
@@ -22,6 +22,10 @@
 
 #include <Arduino.h>
 
+#if __has_include("ble_spi_conf.h")
+  #include "ble_spi_conf.h"
+#endif
+
 class HCITransportInterface {
 public:
   virtual int begin() = 0;

From da833f61ce793fa7eddb68e9f3ecfa9940cf803e Mon Sep 17 00:00:00 2001
From: Carlo Parata <carlo.parata@st.com>
Date: Tue, 9 Feb 2021 15:35:13 +0100
Subject: [PATCH 098/112] feat: add possibility to choose the ownAddressType in
 the Arduino stack

Signed-off-by: Carlo Parata <carlo.parata@st.com>
---
 src/local/BLELocalDevice.cpp |  6 +++++-
 src/local/BLELocalDevice.h   | 11 ++++++++++-
 src/utility/ATT.cpp          | 12 +++++++++++-
 src/utility/ATT.h            |  6 ++++++
 src/utility/GAP.cpp          |  9 +++++++--
 src/utility/GAP.h            |  3 +++
 6 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/src/local/BLELocalDevice.cpp b/src/local/BLELocalDevice.cpp
index 5792353f..3a620e32 100644
--- a/src/local/BLELocalDevice.cpp
+++ b/src/local/BLELocalDevice.cpp
@@ -39,7 +39,7 @@
 #endif
 #endif
 
-BLELocalDevice::BLELocalDevice()
+BLELocalDevice::BLELocalDevice(uint8_t ownBdaddrType): _ownBdaddrType(ownBdaddrType)
 {
   _advertisingData.setFlags(BLEFlagsGeneralDiscoverable | BLEFlagsBREDRNotSupported);
 }
@@ -207,6 +207,10 @@ int BLELocalDevice::begin()
 
   GATT.begin();
 
+  GAP.setOwnBdaddrType(_ownBdaddrType);
+
+  ATT.setOwnBdaddrType(_ownBdaddrType);
+
   return 1;
 }
 
diff --git a/src/local/BLELocalDevice.h b/src/local/BLELocalDevice.h
index 6c45c063..4c39fb16 100644
--- a/src/local/BLELocalDevice.h
+++ b/src/local/BLELocalDevice.h
@@ -30,9 +30,16 @@ enum Pairable {
   ONCE = 2,
 };
 
+enum AddressType {
+  PUBLIC_ADDR = 0,
+  STATIC_RANDOM_ADDR = 1,
+  RESOLVABLE_PRIVATE_ADDR = 2,
+  NON_RESOLVABLE_PRIVATE_ADDR = 3,
+};
+
 class BLELocalDevice {
 public:
-  BLELocalDevice();
+  BLELocalDevice(uint8_t ownBdaddrType = STATIC_RANDOM_ADDR);
   virtual ~BLELocalDevice();
 
   virtual int begin();
@@ -107,6 +114,7 @@ class BLELocalDevice {
 
   virtual void setDisplayCode(void (*displayCode)(uint32_t confirmationCode));
   virtual void setBinaryConfirmPairing(bool (*binaryConfirmPairing)());
+
   uint8_t BDaddress[6];
   
 protected:
@@ -116,6 +124,7 @@ class BLELocalDevice {
 private:
   BLEAdvertisingData _advertisingData;
   BLEAdvertisingData _scanResponseData;
+  uint8_t _ownBdaddrType;
 };
 
 extern BLELocalDevice& BLE;
diff --git a/src/utility/ATT.cpp b/src/utility/ATT.cpp
index 9367cfbf..193ad1ef 100644
--- a/src/utility/ATT.cpp
+++ b/src/utility/ATT.cpp
@@ -114,7 +114,7 @@ ATTClass::~ATTClass()
 
 bool ATTClass::connect(uint8_t peerBdaddrType, uint8_t peerBdaddr[6])
 {
-  if (HCI.leCreateConn(0x0060, 0x0030, 0x00, peerBdaddrType, peerBdaddr, 0x00,
+  if (HCI.leCreateConn(0x0060, 0x0030, 0x00, peerBdaddrType, peerBdaddr, _ownBdaddrType,
                         0x0006, 0x000c, 0x0000, 0x00c8, 0x0004, 0x0006) != 0) {
     return false;
   }
@@ -1941,6 +1941,16 @@ int ATTClass::getPeerResolvedAddress(uint16_t connectionHandle, uint8_t resolved
   return 0;
 }
 
+void ATTClass::setOwnBdaddrType(uint8_t ownBdaddrType)
+{
+  _ownBdaddrType = ownBdaddrType;
+}
+
+uint8_t ATTClass::getOwnBdaddrType(void)
+{
+  return _ownBdaddrType;
+}
+
 #if !defined(FAKE_ATT)
 ATTClass ATTObj;
 ATTClass& ATT = ATTObj;
diff --git a/src/utility/ATT.h b/src/utility/ATT.h
index c9f007f9..5e41e1fa 100644
--- a/src/utility/ATT.h
+++ b/src/utility/ATT.h
@@ -109,6 +109,10 @@ class ATTClass {
   uint8_t peerIRK[16];
   /// This is just a random number... Not sure it has use unless privacy mode is active.
   uint8_t localIRK[16] = {0x54,0x83,0x63,0x7c,0xc5,0x1e,0xf7,0xec,0x32,0xdd,0xad,0x51,0x89,0x4b,0x9e,0x07};
+
+  void setOwnBdaddrType(uint8_t ownBdaddrType);
+  uint8_t getOwnBdaddrType(); // Used in L2CAPSignaling to encryption
+
 private:
   virtual void error(uint16_t connectionHandle, uint8_t dlen, uint8_t data[]);
   virtual void mtuReq(uint16_t connectionHandle, uint8_t dlen, uint8_t data[]);
@@ -170,6 +174,8 @@ class ATTClass {
   } _pendingResp;
 
   BLEDeviceEventHandler _eventHandlers[2];
+
+  uint8_t _ownBdaddrType;
 };
 
 extern ATTClass& ATT;
diff --git a/src/utility/GAP.cpp b/src/utility/GAP.cpp
index f1bf02fe..fac04a67 100644
--- a/src/utility/GAP.cpp
+++ b/src/utility/GAP.cpp
@@ -54,7 +54,7 @@ int GAPClass::advertise(uint8_t* advData, uint8_t advDataLen, uint8_t* scanData,
 
   stopAdvertise();
 
-  if (HCI.leSetAdvertisingParameters(_advertisingInterval, _advertisingInterval, type, 0x00, 0x00, directBdaddr, 0x07, 0) != 0) {
+  if (HCI.leSetAdvertisingParameters(_advertisingInterval, _advertisingInterval, type, _ownBdaddrType, 0x00, directBdaddr, 0x07, 0) != 0) {
     return 0;
   }
 
@@ -93,7 +93,7 @@ int GAPClass::scan(bool withDuplicates)
     - scan window: mandatory range from 0x0011 to 0x1000
     - The scan window can only be less than or equal to the scan interval
   */
-  if (HCI.leSetScanParameters(0x01, 0x0020, 0x0020, 0x00, 0x00) != 0) {
+  if (HCI.leSetScanParameters(0x01, 0x0020, 0x0020, _ownBdaddrType, 0x00) != 0) {
     return false;
   }
 
@@ -266,6 +266,11 @@ bool GAPClass::matchesScanFilter(const BLEDevice& device)
   return true;
 }
 
+void GAPClass::setOwnBdaddrType(uint8_t ownBdaddrType)
+{
+  _ownBdaddrType = ownBdaddrType;
+}
+
 #if !defined(FAKE_GAP)
 GAPClass GAPObj;
 GAPClass& GAP = GAPObj;
diff --git a/src/utility/GAP.h b/src/utility/GAP.h
index 2ea22938..cadd0cba 100644
--- a/src/utility/GAP.h
+++ b/src/utility/GAP.h
@@ -45,6 +45,8 @@ class GAPClass {
 
   virtual void setEventHandler(BLEDeviceEvent event, BLEDeviceEventHandler eventHandler);
 
+  void setOwnBdaddrType(uint8_t ownBdaddrType);
+
 protected:
   friend class HCIClass;
 
@@ -67,6 +69,7 @@ class GAPClass {
   String _scanNameFilter;
   String _scanUuidFilter;
   String _scanAddressFilter;
+  uint8_t _ownBdaddrType;
 };
 
 extern GAPClass& GAP;

From 622497cd7b39f1cff1d325412ec1a9b936d9dbb2 Mon Sep 17 00:00:00 2001
From: Alexandre Bourdiol <alexandre.bourdiol@st.com>
Date: Mon, 24 Oct 2022 11:35:21 +0200
Subject: [PATCH 099/112] fix: HCI only Firmware not supporting ACI_GAP_INIT
 ACI_GATT_INIT

On STM32WB, Cube FW version 1.14.1,
messages ACI_GATT_INIT and ACI_GAP_INIT
are not available on HCI only BLE firmware
(stm32wb5x_BLE_HCILayer_fw.bin)
This imply to move Random Address to host instead of relying on controller

Signed-off-by: Alexandre Bourdiol <alexandre.bourdiol@st.com>
---
 src/local/BLELocalDevice.cpp | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/local/BLELocalDevice.cpp b/src/local/BLELocalDevice.cpp
index 3a620e32..e333b22f 100644
--- a/src/local/BLELocalDevice.cpp
+++ b/src/local/BLELocalDevice.cpp
@@ -124,6 +124,20 @@ int BLELocalDevice::begin()
     return 0;
   }
 
+  uint8_t randomNumber[8];
+  if (HCI.leRand(randomNumber) != 0) {
+    end();
+    return 0;
+  }
+  /* Random address only requires 6 bytes (48 bits)
+   * Force both MSB bits to b00 in order to define Static Random Address
+   */
+  randomNumber[5] |= 0xC0;
+  if (HCI.leSetRandomAddress((uint8_t*)randomNumber) != 0) {
+    end();
+    return 0;
+  }
+
   uint8_t hciVer;
   uint16_t hciRev;
   uint8_t lmpVer;

From a44c940a58f5b05ede02e0cf7af2b31b4deffa89 Mon Sep 17 00:00:00 2001
From: Lorenzo Bini <lorenzo.bini@studenti.unimi.it>
Date: Tue, 14 Mar 2023 17:19:12 +0100
Subject: [PATCH 100/112] feat: add API to get random address

Signed-off-by: Lorenzo Bini <lorenzo.bini@studenti.unimi.it>
---
 src/local/BLELocalDevice.cpp | 19 +++++++++++++++++++
 src/local/BLELocalDevice.h   |  3 +++
 2 files changed, 22 insertions(+)

diff --git a/src/local/BLELocalDevice.cpp b/src/local/BLELocalDevice.cpp
index e333b22f..a888963a 100644
--- a/src/local/BLELocalDevice.cpp
+++ b/src/local/BLELocalDevice.cpp
@@ -133,6 +133,15 @@ int BLELocalDevice::begin()
    * Force both MSB bits to b00 in order to define Static Random Address
    */
   randomNumber[5] |= 0xC0;
+
+  // Copy the random address in private variable as it will be sent to the BLE chip
+  randomAddress [0] = randomNumber[0];
+  randomAddress [1] = randomNumber[1];
+  randomAddress [2] = randomNumber[2];
+  randomAddress [3] = randomNumber[3];
+  randomAddress [4] = randomNumber[4];
+  randomAddress [5] = randomNumber[5];
+
   if (HCI.leSetRandomAddress((uint8_t*)randomNumber) != 0) {
     end();
     return 0;
@@ -247,6 +256,16 @@ void BLELocalDevice::end()
   _scanResponseData.clear();
 }
 
+void BLELocalDevice::getRandomAddress(uint8_t buff[6])
+{
+  buff [0] = randomAddress[0];
+  buff [1] = randomAddress[1];
+  buff [2] = randomAddress[2];
+  buff [3] = randomAddress[3];
+  buff [4] = randomAddress[4];
+  buff [5] = randomAddress[5];
+}
+
 void BLELocalDevice::poll()
 {
   HCI.poll();
diff --git a/src/local/BLELocalDevice.h b/src/local/BLELocalDevice.h
index 4c39fb16..137ab69f 100644
--- a/src/local/BLELocalDevice.h
+++ b/src/local/BLELocalDevice.h
@@ -91,6 +91,8 @@ class BLELocalDevice {
 
   virtual void setTimeout(unsigned long timeout);
 
+  virtual void getRandomAddress(uint8_t buff[6]);
+
   virtual void debug(Stream& stream);
   virtual void noDebug();
   
@@ -122,6 +124,7 @@ class BLELocalDevice {
   virtual BLEAdvertisingData& getScanResponseData();
 
 private:
+  uint8_t randomAddress[6];
   BLEAdvertisingData _advertisingData;
   BLEAdvertisingData _scanResponseData;
   uint8_t _ownBdaddrType;

From 107c7c963c7d01bbb5f5a7a3f81c11479ede522b Mon Sep 17 00:00:00 2001
From: Carlo Parata <carlo.parata@st.com>
Date: Fri, 7 Feb 2020 11:20:49 +0100
Subject: [PATCH 101/112] chore(GAP): improve scan

Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
---
 src/local/BLELocalDevice.cpp |  4 ++--
 src/local/BLELocalDevice.h   |  2 +-
 src/utility/GAP.cpp          | 18 +++++++++++++++---
 src/utility/GAP.h            |  2 +-
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/local/BLELocalDevice.cpp b/src/local/BLELocalDevice.cpp
index a888963a..d1128788 100644
--- a/src/local/BLELocalDevice.cpp
+++ b/src/local/BLELocalDevice.cpp
@@ -421,9 +421,9 @@ int BLELocalDevice::scanForAddress(String address, bool withDuplicates)
   return GAP.scanForAddress(address, withDuplicates);
 }
 
-void BLELocalDevice::stopScan()
+int BLELocalDevice::stopScan()
 {
-  GAP.stopScan();
+  return GAP.stopScan();
 }
 
 BLEDevice BLELocalDevice::central()
diff --git a/src/local/BLELocalDevice.h b/src/local/BLELocalDevice.h
index 137ab69f..8217669f 100644
--- a/src/local/BLELocalDevice.h
+++ b/src/local/BLELocalDevice.h
@@ -77,7 +77,7 @@ class BLELocalDevice {
   virtual int scanForName(String name, bool withDuplicates = false);
   virtual int scanForUuid(String uuid, bool withDuplicates = false);
   virtual int scanForAddress(String address, bool withDuplicates = false);
-  virtual void stopScan();
+  virtual int stopScan();
 
   virtual BLEDevice central();
   virtual BLEDevice available();
diff --git a/src/utility/GAP.cpp b/src/utility/GAP.cpp
index fac04a67..ed001a96 100644
--- a/src/utility/GAP.cpp
+++ b/src/utility/GAP.cpp
@@ -84,7 +84,12 @@ void GAPClass::stopAdvertise()
 
 int GAPClass::scan(bool withDuplicates)
 {
-  HCI.leSetScanEnable(false, true);
+  if(_scanning) {
+    // Check if the HCI command fails
+    if (HCI.leSetScanEnable(false, true) != 0) {
+      return 0;
+    }
+  }
 
   // active scan, 20 ms scan interval (N * 0.625), 20 ms scan window (N * 0.625), public own address type, no filter
   /*
@@ -133,9 +138,14 @@ int GAPClass::scanForAddress(String address, bool withDuplicates)
   return scan(withDuplicates);
 }
 
-void GAPClass::stopScan()
+int GAPClass::stopScan()
 {
-  HCI.leSetScanEnable(false, false);
+  if(_scanning) {
+    // Check if the HCI command fails
+    if (HCI.leSetScanEnable(false, false) != 0) {
+      return 0;
+    }
+  }
 
   _scanning = false;
 
@@ -146,6 +156,8 @@ void GAPClass::stopScan()
   }
 
   _discoveredDevices.clear();
+
+  return 1;
 }
 
 BLEDevice GAPClass::available()
diff --git a/src/utility/GAP.h b/src/utility/GAP.h
index cadd0cba..c79a2aa7 100644
--- a/src/utility/GAP.h
+++ b/src/utility/GAP.h
@@ -37,7 +37,7 @@ class GAPClass {
   virtual int scanForName(String name, bool withDuplicates);
   virtual int scanForUuid(String uuid, bool withDuplicates);
   virtual int scanForAddress(String address, bool withDuplicates);
-  virtual void stopScan();
+  virtual int stopScan();
   virtual BLEDevice available();
 
   virtual void setAdvertisingInterval(uint16_t advertisingInterval);

From e24f12cff211b774a5e8dca25a70e396c7a968fe Mon Sep 17 00:00:00 2001
From: Frederic Pillon <frederic.pillon@st.com>
Date: Thu, 20 Mar 2025 11:29:22 +0100
Subject: [PATCH 102/112] chore(examples): enhance button support

Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
---
 examples/Central/LedControl/LedControl.ino  | 15 ++++++++++++---
 examples/Peripheral/ButtonLED/ButtonLED.ino |  8 ++++++--
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/examples/Central/LedControl/LedControl.ino b/examples/Central/LedControl/LedControl.ino
index 064bb29e..fa4ebfc3 100644
--- a/examples/Central/LedControl/LedControl.ino
+++ b/examples/Central/LedControl/LedControl.ino
@@ -17,19 +17,28 @@
 #include <STM32duinoBLE.h>
 
 // variables for button
-const int buttonPin = 2;
+#ifdef USER_BTN
+const int buttonPin = USER_BTN; // set buttonPin to on-board button
+#else
+const int buttonPin = PC13; // set buttonPin to digital pin PC13 */
+#endif
 int oldButtonState = LOW;
+int initialButtonState = LOW;
 
 void setup() {
   Serial.begin(9600);
   while (!Serial);
 
   // configure the button pin as input
-  pinMode(buttonPin, INPUT);
+  pinMode(buttonPin, INPUT_PULLUP);
 
   // initialize the Bluetooth® Low Energy hardware
   BLE.begin();
 
+  // Get initial button state
+  initialButtonState = digitalRead(buttonPin);
+  oldButtonState = initialButtonState;
+
   Serial.println("Bluetooth® Low Energy Central - LED control");
 
   // start scanning for peripherals
@@ -108,7 +117,7 @@ void controlLed(BLEDevice peripheral) {
       // button changed
       oldButtonState = buttonState;
 
-      if (buttonState) {
+      if (buttonState != initialButtonState) {
         Serial.println("button pressed");
 
         // button is pressed, write 0x01 to turn the LED on
diff --git a/examples/Peripheral/ButtonLED/ButtonLED.ino b/examples/Peripheral/ButtonLED/ButtonLED.ino
index baa64b87..8ae7d665 100644
--- a/examples/Peripheral/ButtonLED/ButtonLED.ino
+++ b/examples/Peripheral/ButtonLED/ButtonLED.ino
@@ -18,7 +18,11 @@
 #include <STM32duinoBLE.h>
 
 const int ledPin = LED_BUILTIN; // set ledPin to on-board LED
-const int buttonPin = 4; // set buttonPin to digital pin 4
+#ifdef USER_BTN
+const int buttonPin = USER_BTN; // set buttonPin to on-board button
+#else
+const int buttonPin = PC13; // set buttonPin to digital pin PC13 */
+#endif
 
 BLEService ledService("19B10010-E8F2-537E-4F6C-D104768A1214"); // create service
 
@@ -32,7 +36,7 @@ void setup() {
   while (!Serial);
 
   pinMode(ledPin, OUTPUT); // use the LED as an output
-  pinMode(buttonPin, INPUT); // use button pin as an input
+  pinMode(buttonPin, INPUT_PULLUP); // use button pin as an input
 
   // begin initialization
   if (!BLE.begin()) {

From 7d735c7a97b66cd7e1478d74dd8ca4cad1b6538b Mon Sep 17 00:00:00 2001
From: Frederic Pillon <frederic.pillon@st.com>
Date: Thu, 20 Mar 2025 11:32:00 +0100
Subject: [PATCH 103/112] chore(examples): enhance scan management

Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
---
 examples/Central/LedControl/LedControl.ino    | 33 +++++++++++++++--
 .../PeripheralExplorer/PeripheralExplorer.ino | 22 ++++++++++--
 examples/Central/Scan/Scan.ino                | 13 +++++--
 .../Central/ScanCallback/ScanCallback.ino     | 11 +++++-
 .../SensorTagButton/SensorTagButton.ino       | 35 ++++++++++++++++---
 5 files changed, 102 insertions(+), 12 deletions(-)

diff --git a/examples/Central/LedControl/LedControl.ino b/examples/Central/LedControl/LedControl.ino
index fa4ebfc3..cbda07d1 100644
--- a/examples/Central/LedControl/LedControl.ino
+++ b/examples/Central/LedControl/LedControl.ino
@@ -42,7 +42,16 @@ void setup() {
   Serial.println("Bluetooth® Low Energy Central - LED control");
 
   // start scanning for peripherals
-  BLE.scanForUuid("19b10000-e8f2-537e-4f6c-d104768a1214");
+  int ret = 1;
+  do
+  {
+    ret = BLE.scanForUuid("19b10000-e8f2-537e-4f6c-d104768a1214");
+    if (ret == 0)
+    {
+      BLE.end();
+      BLE.begin();
+    }
+  } while(ret == 0);
 }
 
 void loop() {
@@ -64,12 +73,30 @@ void loop() {
     }
 
     // stop scanning
-    BLE.stopScan();
+    int ret = 1;
+    do
+    {
+      ret = BLE.stopScan();
+      if (ret == 0)
+      {
+        BLE.end();
+        BLE.begin();
+      }
+    } while(ret == 0);
 
     controlLed(peripheral);
 
     // peripheral disconnected, start scanning again
-    BLE.scanForUuid("19b10000-e8f2-537e-4f6c-d104768a1214");
+    ret = 1;
+    do
+    {
+      ret = BLE.scanForUuid("19b10000-e8f2-537e-4f6c-d104768a1214");
+      if (ret == 0)
+      {
+        BLE.end();
+        BLE.begin();
+      }
+    } while(ret == 0);
   }
 }
 
diff --git a/examples/Central/PeripheralExplorer/PeripheralExplorer.ino b/examples/Central/PeripheralExplorer/PeripheralExplorer.ino
index 4a72a697..7d4841ae 100644
--- a/examples/Central/PeripheralExplorer/PeripheralExplorer.ino
+++ b/examples/Central/PeripheralExplorer/PeripheralExplorer.ino
@@ -29,7 +29,16 @@ void setup() {
   Serial.println("Bluetooth® Low Energy Central - Peripheral Explorer");
 
   // start scanning for peripherals
-  BLE.scan();
+  int ret = 1;
+  do
+  {
+    ret = BLE.scan();
+    if (ret == 0)
+    {
+      BLE.end();
+      BLE.begin();
+    }
+  } while(ret == 0);
 }
 
 void loop() {
@@ -49,7 +58,16 @@ void loop() {
     // see if peripheral is a LED
     if (peripheral.localName() == "LED") {
       // stop scanning
-      BLE.stopScan();
+      int ret = 1;
+      do
+      {
+        ret = BLE.stopScan();
+        if (ret == 0)
+        {
+          BLE.end();
+          BLE.begin();
+        }
+      } while(ret == 0);
 
       explorerPeripheral(peripheral);
 
diff --git a/examples/Central/Scan/Scan.ino b/examples/Central/Scan/Scan.ino
index 99e13696..ca6b2b9a 100644
--- a/examples/Central/Scan/Scan.ino
+++ b/examples/Central/Scan/Scan.ino
@@ -25,8 +25,17 @@ void setup() {
 
   Serial.println("Bluetooth® Low Energy Central scan");
 
-  // start scanning for peripheral
-  BLE.scan();
+  // start scanning for peripherals
+  int ret = 1;
+  do
+  {
+    ret = BLE.scan();
+    if (ret == 0)
+    {
+      BLE.end();
+      BLE.begin();
+    }
+  } while(ret == 0);
 }
 
 void loop() {
diff --git a/examples/Central/ScanCallback/ScanCallback.ino b/examples/Central/ScanCallback/ScanCallback.ino
index 63ab2753..cc33ee85 100644
--- a/examples/Central/ScanCallback/ScanCallback.ino
+++ b/examples/Central/ScanCallback/ScanCallback.ino
@@ -31,7 +31,16 @@ void setup() {
   BLE.setEventHandler(BLEDiscovered, bleCentralDiscoverHandler);
 
   // start scanning for peripherals with duplicates
-  BLE.scan(true);
+  int ret = 1;
+  do
+  {
+    ret = BLE.scan(true);
+    if (ret == 0)
+    {
+      BLE.end();
+      BLE.begin();
+    }
+  } while(ret == 0);
 }
 
 void loop() {
diff --git a/examples/Central/SensorTagButton/SensorTagButton.ino b/examples/Central/SensorTagButton/SensorTagButton.ino
index 26ee667d..f063ac68 100644
--- a/examples/Central/SensorTagButton/SensorTagButton.ino
+++ b/examples/Central/SensorTagButton/SensorTagButton.ino
@@ -30,8 +30,17 @@ void setup() {
   Serial.println("Bluetooth® Low Energy Central - SensorTag button");
   Serial.println("Make sure to turn on the device.");
 
-  // start scanning for peripheral
-  BLE.scan();
+  // start scanning for peripherals
+  int ret = 1;
+  do
+  {
+    ret = BLE.scan();
+    if (ret == 0)
+    {
+      BLE.end();
+      BLE.begin();
+    }
+  } while(ret == 0);
 }
 
 void loop() {
@@ -52,12 +61,30 @@ void loop() {
     // "CC2650 SensorTag"
     if (peripheral.localName() == "CC2650 SensorTag") {
       // stop scanning
-      BLE.stopScan();
+      int ret = 1;
+      do
+      {
+        ret = BLE.stopScan();
+        if (ret == 0)
+        {
+          BLE.end();
+          BLE.begin();
+        }
+      } while(ret == 0);
 
       monitorSensorTagButtons(peripheral);
 
       // peripheral disconnected, start scanning again
-      BLE.scan();
+      ret = 1;
+      do
+      {
+        ret = BLE.scan();
+        if (ret == 0)
+        {
+          BLE.end();
+          BLE.begin();
+         }
+      } while(ret == 0);
     }
   }
 }

From ae6881e35cc3b1b328b8cf6683bcaeda638997d5 Mon Sep 17 00:00:00 2001
From: Carlo Parata <carlo.parata@st.com>
Date: Wed, 19 Mar 2025 17:54:37 +0100
Subject: [PATCH 104/112] fix(HCI): SetAdvertise only if enabled

Signed-off-by: Carlo Parata <carlo.parata@st.com>
Co-Auhthored-by: Frederic Pillon <frederic.pillon@st.com>
---
 src/utility/HCI.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/utility/HCI.cpp b/src/utility/HCI.cpp
index fb30b3ca..c95f76d2 100644
--- a/src/utility/HCI.cpp
+++ b/src/utility/HCI.cpp
@@ -820,7 +820,10 @@ void HCIClass::handleEventPkt(uint8_t /*plen*/, uint8_t pdata[])
     ATT.removeConnection(disconnComplete->handle, disconnComplete->reason);
     L2CAPSignaling.removeConnection(disconnComplete->handle, disconnComplete->reason);
 
-    HCI.leSetAdvertiseEnable(0x01);
+    if (GAP.advertising())
+    {
+      HCI.leSetAdvertiseEnable(0x01);
+    }
   }
   else if (eventHdr->evt == EVT_ENCRYPTION_CHANGE)
   {

From c8997be5a11ac65779eb504d76758c36fea718bf Mon Sep 17 00:00:00 2001
From: Arkadiusz Ambroziak <arekambroziak@op.pl>
Date: Tue, 18 Mar 2025 15:36:06 +0100
Subject: [PATCH 105/112] fix: for pairing with Static Random Address

Signed-off-by: Arkadiusz Ambroziak <arekambroziak@op.pl>
Co-Auhthored-by: Frederic Pillon <frederic.pillon@st.com>
---
 src/local/BLELocalDevice.cpp   | 23 +++++++++++++++++++++--
 src/utility/L2CAPSignaling.cpp |  8 +++++---
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/local/BLELocalDevice.cpp b/src/local/BLELocalDevice.cpp
index d1128788..6137e14b 100644
--- a/src/local/BLELocalDevice.cpp
+++ b/src/local/BLELocalDevice.cpp
@@ -142,10 +142,22 @@ int BLELocalDevice::begin()
   randomAddress [4] = randomNumber[4];
   randomAddress [5] = randomNumber[5];
 
-  if (HCI.leSetRandomAddress((uint8_t*)randomNumber) != 0) {
+  // Set Random address only when type is STATIC_RANDOM_ADDR
+  if ((_ownBdaddrType == STATIC_RANDOM_ADDR) && (HCI.leSetRandomAddress((uint8_t*)randomNumber) != 0)) {
     end();
     return 0;
   }
+  // Save address to HCI.localAddr variable, which is used to encryption in pairing
+  if(_ownBdaddrType == PUBLIC_ADDR){
+    if (HCI.readBdAddr() != 0) {
+      end();
+      return 0;
+    }
+  } else {
+    for(int k=0; k<6; k++){
+      HCI.localAddr[5-k] = randomAddress[k];
+    }
+  }
 
   uint8_t hciVer;
   uint16_t hciRev;
@@ -301,7 +313,14 @@ bool BLELocalDevice::disconnect()
 String BLELocalDevice::address() const
 {
   uint8_t addr[6] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
-  HCI.readBdAddr(addr);
+  // return correct device address when is set to STATIC RANDOM (set by HCI)
+  if(_ownBdaddrType == PUBLIC_ADDR) {
+    HCI.readBdAddr(addr);
+  } else {
+    for(int k=0; k<6; k++) {
+        addr[k]=HCI.localAddr[5-k];
+    }
+  }
 
   char result[18];
   sprintf(result, "%02x:%02x:%02x:%02x:%02x:%02x", addr[5], addr[4], addr[3], addr[2], addr[1], addr[0]);
diff --git a/src/utility/L2CAPSignaling.cpp b/src/utility/L2CAPSignaling.cpp
index 7af170df..1d2fa426 100644
--- a/src/utility/L2CAPSignaling.cpp
+++ b/src/utility/L2CAPSignaling.cpp
@@ -369,10 +369,12 @@ void L2CAPSignalingClass::smCalculateLTKandConfirm(uint16_t handle, uint8_t expe
   uint8_t localAddress[7];
   uint8_t remoteAddress[7];
   ATT.getPeerAddrWithType(handle, remoteAddress);
-  
-  HCI.readBdAddr();
+
+  // Address is taken directly from HCI.localaddress,
+  //  which is set when object DeviceLocal is created
+  // HCI.readBdAddr();
   memcpy(&localAddress[1],HCI.localAddr,6);
-  localAddress[0] = 0; // IOT 33 uses a static address // TODO: confirm for Nano BLE
+  localAddress[0] = ATT.getOwnBdaddrType(); // Adding bit with address type (e.g. Static random or public address)
 
   // Compute the LTK and MacKey
   uint8_t MacKey[16];

From 33348de697c66fbb8a2e26586857b99931e1458b Mon Sep 17 00:00:00 2001
From: Frederic Pillon <frederic.pillon@st.com>
Date: Thu, 20 Mar 2025 10:35:12 +0100
Subject: [PATCH 106/112] fix(HCI): missing LE_Event_Mask

Linked to:
 https://github.com/arduino-libraries/ArduinoBLE/issues/310

Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
---
 src/utility/HCI.cpp | 3 ++-
 src/utility/HCI.h   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/utility/HCI.cpp b/src/utility/HCI.cpp
index c95f76d2..d53c8e3e 100644
--- a/src/utility/HCI.cpp
+++ b/src/utility/HCI.cpp
@@ -82,6 +82,7 @@ String metaEventToString(LE_META_EVENT event)
     case LONG_TERM_KEY_REQUEST: return F("LE_LONG_TERM_KEY_REQUEST");
     case READ_LOCAL_P256_COMPLETE: return F("READ_LOCAL_P256_COMPLETE");
     case GENERATE_DH_KEY_COMPLETE: return F("GENERATE_DH_KEY_COMPLETE");
+    case ENHANCED_CONN_COMPLETE: return F("ENHANCED_CONN_COMPLETE");
     default: return "event unknown";
   }
 }
@@ -990,7 +991,7 @@ void HCIClass::handleEventPkt(uint8_t /*plen*/, uint8_t pdata[])
     Serial.println(leMetaHeader->subevent,HEX);
 #endif
     switch((LE_META_EVENT)leMetaHeader->subevent){
-      case 0x0A:{
+      case ENHANCED_CONN_COMPLETE:{
         struct __attribute__ ((packed)) EvtLeConnectionComplete {
           uint8_t status;
           uint16_t handle;
diff --git a/src/utility/HCI.h b/src/utility/HCI.h
index 0a530ceb..a6fa66e8 100644
--- a/src/utility/HCI.h
+++ b/src/utility/HCI.h
@@ -46,7 +46,8 @@ enum LE_META_EVENT {
   LONG_TERM_KEY_REQUEST     = 0x05,
   REMOTE_CONN_PARAM_REQ     = 0x06,
   READ_LOCAL_P256_COMPLETE  = 0x08,
-  GENERATE_DH_KEY_COMPLETE  = 0x09
+  GENERATE_DH_KEY_COMPLETE  = 0x09,
+  ENHANCED_CONN_COMPLETE    = 0x0A,
 };
 String metaEventToString(LE_META_EVENT event);
 String commandToString(LE_COMMAND command);

From 348dc55733eeec41a960f35b59a1f406b8ca6343 Mon Sep 17 00:00:00 2001
From: Frederic Pillon <frederic.pillon@st.com>
Date: Thu, 20 Mar 2025 10:36:52 +0100
Subject: [PATCH 107/112] fix: wrong Le Event Mask set

See LE_META_EVENT supported.

Note:
Value should be 0x3B3 but set to 0x1B3 to explicitly
ignore ENHANCED_CONN_COMPLETE event

Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
---
 src/local/BLELocalDevice.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/local/BLELocalDevice.cpp b/src/local/BLELocalDevice.cpp
index 6137e14b..0aa30313 100644
--- a/src/local/BLELocalDevice.cpp
+++ b/src/local/BLELocalDevice.cpp
@@ -174,7 +174,7 @@ int BLELocalDevice::begin()
     end();
     return 0;
   }
-  if (HCI.setLeEventMask(0x00000000000003FF) != 0) {
+  if (HCI.setLeEventMask(0x00000000000001B3) != 0) {
     end();
     return 0;
   }

From a35e40b7460cef694a1aa0310510fd79be9053c7 Mon Sep 17 00:00:00 2001
From: Andrew Childs <tidy.desk9426@fastmail.com>
Date: Sun, 4 Feb 2024 21:03:55 -0500
Subject: [PATCH 108/112] Reset scan filters when stopScan is called [Fixes
 #350]

---
 src/utility/GAP.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/utility/GAP.cpp b/src/utility/GAP.cpp
index ed001a96..649b7e5d 100644
--- a/src/utility/GAP.cpp
+++ b/src/utility/GAP.cpp
@@ -147,6 +147,9 @@ int GAPClass::stopScan()
     }
   }
 
+  _scanNameFilter    = "";
+  _scanUuidFilter    = "";
+  _scanAddressFilter = "";
   _scanning = false;
 
   for (unsigned int i = 0; i < _discoveredDevices.size(); i++) {

From e76c7d9120d2403c79de1fc517f75c6ea5998893 Mon Sep 17 00:00:00 2001
From: Derek Carter <carter_derek@live.com>
Date: Sun, 25 Sep 2022 15:29:12 +0100
Subject: [PATCH 109/112] Fix for issue #245 - ATT_OP_FIND_INFO_RESP incorrect
 processing during ATTClass::discoverDescriptors causes crashing

I've highlighted this issue on 9th July ... this is an issue of causing __CRASHES__ if using ArduinoBLE to connect as central and the response to ATT_OP_FIND_INFO_RESP includes 128-bit UUIDs.
---
 src/utility/ATT.cpp | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/utility/ATT.cpp b/src/utility/ATT.cpp
index 193ad1ef..d19b9b92 100644
--- a/src/utility/ATT.cpp
+++ b/src/utility/ATT.cpp
@@ -1729,8 +1729,19 @@ bool ATTClass::discoverDescriptors(uint16_t connectionHandle, BLERemoteDevice* d
         }
 
         if (responseBuffer[0] == ATT_OP_FIND_INFO_RESP) {
-          uint16_t lengthPerDescriptor = responseBuffer[1] * 4;
-          uint8_t uuidLen = 2;
+          //
+          // Format parameter (responseBuffer[1]) either 0x01 - 16-bit Bluetooth UUID(s), or 0x02 - 128 bit UUID(s)
+          //
+          // Therefore for:
+          //   0x01 - uuidLen = 2 (octets)
+          //          lengthPerDescriptor = 4 (Handle 2 octets + UUID 2 octets)
+          //   0x02 - uuidLen = 16 (octets)
+          //          lengthPerDescriptor = 18 (Handle 2 octets + UUID 16 octets)
+          //
+          // See section 3.4.3.2 ATT_FIND_INFORMATION_RSP of Bluetooth Core Specification 5.3.
+          //
+          uint16_t lengthPerDescriptor = responseBuffer[1] * 14 - 10;
+          uint8_t uuidLen = lengthPerDescriptor - 2;
 
           for (int i = 2; i < respLength; i += lengthPerDescriptor) {
             struct __attribute__ ((packed)) RawDescriptor {

From 45c96af0953240aa91bf215067350c23e8fe4df9 Mon Sep 17 00:00:00 2001
From: Frederic Pillon <frederic.pillon@st.com>
Date: Tue, 18 Mar 2025 10:27:57 +0100
Subject: [PATCH 110/112] fix: keywords.txt

Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
---
 keywords.txt | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/keywords.txt b/keywords.txt
index 6e761812..b908b573 100644
--- a/keywords.txt
+++ b/keywords.txt
@@ -97,7 +97,7 @@ setValue	KEYWORD2
 broadcast	KEYWORD2
 written	KEYWORD2
 subscribed	KEYWORD2
-valueUpdated	KEYWORD2	
+valueUpdated	KEYWORD2
 addDescriptor	KEYWORD2
 descriptorCount	KEYWORD2
 hasDescriptor	KEYWORD2
@@ -108,7 +108,7 @@ canWrite	KEYWORD2
 canSubscribe	KEYWORD2
 subscribe	KEYWORD2
 canUnsubscribe	KEYWORD2
-unsubscribe	KEYWORD2	
+unsubscribe	KEYWORD2
 writeValueLE	KEYWORD2
 setValueLE	KEYWORD2
 valueLE	KEYWORD2
@@ -117,7 +117,11 @@ setValueBE	KEYWORD2
 valueBE	KEYWORD2
 
 uuid	KEYWORD2
-addCharacteristic	KEYWORD
+addCharacteristic	KEYWORD2
+
+wait	KEYWORD2
+peek	KEYWORD2
+write	KEYWORD2
 
 #######################################
 # Constants (LITERAL1)
@@ -137,7 +141,7 @@ BLEIndicate	LITERAL1
 BLESubscribed	LITERAL1
 BLEUnsubscribed	LITERAL1
 BLEWritten	LITERAL1
-BLEUpdated	LITERAL1	
+BLEUpdated	LITERAL1
 
 SPBTLE_RF	LITERAL1
 SPBTLE_1S	LITERAL1

From 1a2c1aefc688a1316aa6afb058799dac511584d0 Mon Sep 17 00:00:00 2001
From: FidelSch <honoratofidel@protonmail.com>
Date: Wed, 19 Feb 2025 17:28:07 -0300
Subject: [PATCH 111/112] fix: compilation error when using _BLE_TRACE

Now correctly acceses the existing variables and uses an unsigned int for size comparison

fpistm: changed the uint type to uint32_t to avoid build issue with below target:
- arduino:megaavr:uno2018
- arduino:renesas_uno:unor4wif
---
 src/utility/L2CAPSignaling.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/utility/L2CAPSignaling.cpp b/src/utility/L2CAPSignaling.cpp
index 1d2fa426..0a5807cf 100644
--- a/src/utility/L2CAPSignaling.cpp
+++ b/src/utility/L2CAPSignaling.cpp
@@ -230,9 +230,9 @@ void L2CAPSignalingClass::handleSecurityData(uint16_t connectionHandle, uint8_t
     Serial.print("V      : ");
     btct.printBytes(V,32);
     Serial.print("X      : ");
-    btct.printBytes(X,16);
+    btct.printBytes(HCI.Na,16);
     Serial.print("Y      : ");
-    btct.printBytes(Y,16);
+    btct.printBytes(HCI.Nb,16);
     Serial.print("g2res  : ");
     btct.printBytes(g2Result,4);
     Serial.print("Result : ");
@@ -415,7 +415,7 @@ void L2CAPSignalingClass::smCalculateLTKandConfirm(uint16_t handle, uint8_t expe
     // Send our confirmation value to complete authentication stage 2
     uint8_t ret[17];
     ret[0] = CONNECTION_PAIRING_DHKEY_CHECK;
-    for(int i=0; i<sizeof(Eb); i++){
+    for(uint32_t i=0; i<sizeof(Eb); i++){
       ret[sizeof(Eb)-i] = Eb[i];
     }
     HCI.sendAclPkt(handle, SECURITY_CID, sizeof(ret), ret );

From f892330866a5eaf56bfec43e55b816d30bc601ff Mon Sep 17 00:00:00 2001
From: Frederic Pillon <frederic.pillon@st.com>
Date: Wed, 5 Mar 2025 18:53:08 +0100
Subject: [PATCH 112/112] fix: signed and init field warnings

Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
---
 src/utility/HCI.cpp            | 14 +++++++++-----
 src/utility/L2CAPSignaling.cpp |  6 ++++--
 src/utility/btct.cpp           |  6 +++---
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/utility/HCI.cpp b/src/utility/HCI.cpp
index d53c8e3e..8ac2419a 100644
--- a/src/utility/HCI.cpp
+++ b/src/utility/HCI.cpp
@@ -139,7 +139,7 @@ void HCIClass::poll(unsigned long timeout)
   while (HCITransport.available()) {
     byte b = HCITransport.read();
 
-    if (_recvIndex >= sizeof(_recvBuffer)) {
+    if (_recvIndex >= (int)sizeof(_recvBuffer)) {
         _recvIndex = 0;
         if (_debug) {
             _debug->println("_recvBuffer overflow");
@@ -462,6 +462,8 @@ int HCIClass::leConnUpdate(uint16_t handle, uint16_t minInterval, uint16_t maxIn
   return sendCommand(OGF_LE_CTL << 10 | OCF_LE_CONN_UPDATE, sizeof(leConnUpdateData), &leConnUpdateData);
 }
 void HCIClass::saveNewAddress(uint8_t addressType, uint8_t* address, uint8_t* peerIrk, uint8_t* localIrk){
+  (void)addressType;
+  (void)localIrk;
   if(_storeIRK!=0){
     _storeIRK(address, peerIrk);
   }
@@ -504,6 +506,7 @@ int HCIClass::leStartResolvingAddresses(){
   return HCI.sendCommand(OGF_LE_CTL << 10 | 0x2D, 1,&enable); // Disable address resolution
 }
 int HCIClass::leReadPeerResolvableAddress(uint8_t peerAddressType, uint8_t* peerIdentityAddress, uint8_t* peerResolvableAddress){
+  (void)peerResolvableAddress;
   struct __attribute__ ((packed)) Request {
     uint8_t addressType;
     uint8_t identityAddress[6];
@@ -547,7 +550,7 @@ int HCIClass::readStoredLK(uint8_t BD_ADDR[], uint8_t read_all ){
   struct __attribute__ ((packed)) Request {
     uint8_t BD_ADDR[6];
     uint8_t read_a;
-  } request = {0,0};
+  } request = {{0},0};
   for(int i=0; i<6; i++) request.BD_ADDR[5-i] = BD_ADDR[i];
   request.read_a = read_all;
   return sendCommand(OGF_HOST_CTL << 10 | 0xD, sizeof(request), &request);
@@ -1272,7 +1275,7 @@ void HCIClass::handleEventPkt(uint8_t /*plen*/, uint8_t pdata[])
             uint8_t U[32];
             uint8_t V[32];
             uint8_t Z;
-          } f4Params = {0,0,Z};
+          } f4Params = {{0},{0},Z};
           for(int i=0; i<32; i++){
             f4Params.U[31-i] = pairingPublicKey.publicKey[i];
             f4Params.V[31-i] = HCI.remotePublicKeyBuffer[i];
@@ -1292,7 +1295,7 @@ void HCIClass::handleEventPkt(uint8_t /*plen*/, uint8_t pdata[])
 #endif
 
           uint8_t cb_temp[sizeof(pairingConfirm.cb)];
-          for(int i=0; i<sizeof(pairingConfirm.cb);i++){
+          for(unsigned int i=0; i<sizeof(pairingConfirm.cb);i++){
             cb_temp[sizeof(pairingConfirm.cb)-1-i] = pairingConfirm.cb[i];
           }
           /// cb wa back to front.
@@ -1376,11 +1379,12 @@ void HCIClass::handleEventPkt(uint8_t /*plen*/, uint8_t pdata[])
   }
 }
 int HCIClass::leEncrypt(uint8_t* key, uint8_t* plaintext, uint8_t* status, uint8_t* ciphertext){
+  (void)status;
   struct __attribute__ ((packed)) LeEncryptCommand
   {
     uint8_t key[16];
     uint8_t plaintext[16];
-  } leEncryptCommand = {0,0};
+  } leEncryptCommand = {{0},{0}};
   for(int i=0; i<16; i++){
     leEncryptCommand.key[15-i] = key[i];
     leEncryptCommand.plaintext[15-i] = plaintext[i];
diff --git a/src/utility/L2CAPSignaling.cpp b/src/utility/L2CAPSignaling.cpp
index 0a5807cf..e88189cf 100644
--- a/src/utility/L2CAPSignaling.cpp
+++ b/src/utility/L2CAPSignaling.cpp
@@ -122,6 +122,8 @@ void L2CAPSignalingClass::handleSecurityData(uint16_t connectionHandle, uint8_t
 #ifdef _BLE_TRACE_
   Serial.print("dlen: ");
   Serial.println(dlen);
+#else
+  (void)dlen;
 #endif
   uint8_t code = l2capSignalingHdr->code;
 
@@ -310,8 +312,8 @@ void L2CAPSignalingClass::handleSecurityData(uint16_t connectionHandle, uint8_t
       uint8_t x[32];
       uint8_t y[32];
     } generateDHKeyCommand = {
-      0x00,
-      0x00,
+      {0x00},
+      {0x00},
     };
     memcpy(generateDHKeyCommand.x,connectionPairingPublicKey->x,32);
     memcpy(generateDHKeyCommand.y,connectionPairingPublicKey->y,32);
diff --git a/src/utility/btct.cpp b/src/utility/btct.cpp
index 199c9e0d..eeb7a8cd 100644
--- a/src/utility/btct.cpp
+++ b/src/utility/btct.cpp
@@ -71,7 +71,7 @@ int BluetoothCryptoToolbox::f5(uint8_t DHKey[],uint8_t N_master[], uint8_t N_sla
         uint8_t A1[7];
         uint8_t A2[7];
         uint8_t length[2];
-    } cmacInput = {0,0,0,0,0,0,0};
+    } cmacInput = {0,{0},{0},{0},{0},{0},{0}};
     cmacInput.counter = 0;
     memcpy(cmacInput.keyID, keyID, 4);
     memcpy(cmacInput.N1,N_master,16);
@@ -97,7 +97,7 @@ int BluetoothCryptoToolbox::f6(uint8_t W[], uint8_t N1[],uint8_t N2[],uint8_t R[
         uint8_t IOCap[3];
         uint8_t A1[7];
         uint8_t A2[7];
-    } f6Input = {0,0,0,0,0,0};
+    } f6Input = {{0},{0},{0},{0},{0},{0}};
 
     memcpy(f6Input.N1, N1, 16);
     memcpy(f6Input.N2, N2, 16);
@@ -145,7 +145,7 @@ int BluetoothCryptoToolbox::g2(uint8_t U[], uint8_t V[], uint8_t X[], uint8_t Y[
         uint8_t U[32];
         uint8_t V[32];
         uint8_t Y[16];
-    } cmacInput= {0,0,0};
+    } cmacInput= {{0},{0},{0}};
     memcpy(cmacInput.U,U,32);
     memcpy(cmacInput.V,V,32);
     memcpy(cmacInput.Y,Y,16);