Solve conflicts

.github/workflows/compile-examples.yml

@@ -0,0 +1,22 @@
+name: Compile Examples
+on: [push, pull_request]
+jobs:
+ build:
+   runs-on: ubuntu-latest
+
+   strategy:
+     matrix:
+       fqbn: [
+         "arduino:samd:mkrwifi1010",
+         "arduino:samd:nano_33_iot",
+         "arduino:megaavr:uno2018:mode=on",
+         "arduino:mbed:nano33ble"
+       ]
+
+   steps:
+     - uses: actions/checkout@v1
+       with:
+         fetch-depth: 1
+     - uses: arduino/actions/libraries/compile-examples@master
+       with:
+         fqbn: ${{ matrix.fqbn }}

.github/workflows/spell-check.yml

@@ -0,0 +1,11 @@
+name: Spell Check
+on: [push, pull_request]
+jobs:
+ build:
+   runs-on: ubuntu-latest
+
+   steps:
+     - uses: actions/checkout@v1
+       with:
+         fetch-depth: 1
+     - uses: arduino/actions/libraries/spell-check@master

examples/Central/PeripheralExplorer/PeripheralExplorer.ino

@@ -120,7 +120,7 @@ void exploreService(BLEService service) {
 }
 
 void exploreCharacteristic(BLECharacteristic characteristic) {
-  // print the UUID and properies of the characteristic
+  // print the UUID and properties of the characteristic
   Serial.print("\tCharacteristic ");
   Serial.print(characteristic.uuid());
   Serial.print(", properties 0x");

src/utility/ATT.cpp

@@ -519,20 +519,20 @@ bool ATTClass::handleNotify(uint16_t handle, const uint8_t* value, int length)
       continue;
     }
 
-    uint8_t notication[_peers[i].mtu];
-    uint16_t noticationLength = 0;
+    uint8_t notification[_peers[i].mtu];
+    uint16_t notificationLength = 0;
 
-    notication[0] = ATT_OP_HANDLE_NOTIFY;
-    noticationLength++;
+    notification[0] = ATT_OP_HANDLE_NOTIFY;
+    notificationLength++;
 
-    memcpy(&notication[1], &handle, sizeof(handle));
-    noticationLength += sizeof(handle);
+    memcpy(&notification[1], &handle, sizeof(handle));
+    notificationLength += sizeof(handle);
 
-    length = min((uint16_t)(_peers[i].mtu - noticationLength), (uint16_t)length);
-    memcpy(&notication[noticationLength], value, length);
-    noticationLength += length;
+    length = min((uint16_t)(_peers[i].mtu - notificationLength), (uint16_t)length);
+    memcpy(&notification[notificationLength], value, length);
+    notificationLength += length;
 
-    HCI.sendAclPkt(_peers[i].connectionHandle, ATT_CID, noticationLength, notication);
+    HCI.sendAclPkt(_peers[i].connectionHandle, ATT_CID, notificationLength, notification);
 
     numNotifications++;
   }