Fix/cleanup examples

Author: h2zero

examples/BLE_EddystoneTLM_Beacon/BLE_EddystoneTLM_Beacon.ino

@@ -66,7 +66,7 @@ void setup() {
     Serial.printf("Deep sleep (%llds since last reset, %llds since last boot)\n",
                   nowTimeStruct.tv_sec,
                   nowTimeStruct.tv_sec - last);
-    last      = nowTimeStruct.tv_sec;
+    last = nowTimeStruct.tv_sec;
 
     NimBLEDevice::init("TLMBeacon");
     NimBLEDevice::setPower(BEACON_POWER);

examples/Bluetooth_5/NimBLE_extended_client/NimBLE_extended_client.ino

@@ -6,7 +6,7 @@
  *  Created: on April 2 2022
  *      Author: H2zero
  *
-*/
+ */
 
 #include <Arduino.h>
 #include <NimBLEDevice.h>

examples/Bluetooth_5/NimBLE_extended_scan/NimBLE_extended_scan.ino

@@ -20,9 +20,9 @@ static NimBLEScan::Phy scanPhy  = NimBLEScan::Phy::SCAN_ALL;
 class ScanCallbacks : public NimBLEScanCallbacks {
     void onResult(const NimBLEAdvertisedDevice* advertisedDevice) {
         Serial.printf("Advertised Device found: %s\n PHY1: %d\n PHY2: %d\n",
-               advertisedDevice->toString().c_str(),
-               advertisedDevice->getPrimaryPhy(),
-               advertisedDevice->getSecondaryPhy());
+                      advertisedDevice->toString().c_str(),
+                      advertisedDevice->getPrimaryPhy(),
+                      advertisedDevice->getSecondaryPhy());
     }
 
     /** Callback to process the results of the completed scan or restart it */
@@ -52,6 +52,7 @@ class ScanCallbacks : public NimBLEScanCallbacks {
 } scanCallbacks;
 
 void setup() {
+    Serial.begin(115200);
     Serial.printf("Starting Extended Scanner\n");
 
     /** Initialize NimBLE and set the device name */

examples/Bluetooth_5/NimBLE_extended_server/NimBLE_extended_server.ino

@@ -75,15 +75,13 @@ class AdvertisingCallbacks : public NimBLEExtAdvertisingCallbacks {
 #ifdef ESP_PLATFORM
         esp_deep_sleep_start();
 #else
-        systemRestart(); // nRF platforms restart then sleep via delay in setup.
+        delay(sleepSeconds * 1000); // system ON sleep mode for nRF platforms to simulate the esp deep sleep with timer wakeup
+        systemRestart();            // nRF platforms restart then sleep via delay in setup.
 #endif
     }
 } advertisingCallbacks;
 
 void setup() {
-#ifndef ESP_PLATFORM
-    delay(sleepSeconds * 1000); // system ON sleep mode for nRF platforms to simulate the esp deep sleep with timer wakeup
-#endif
     Serial.begin(115200);
 
     /** Initialize NimBLE and set the device name */

examples/Bluetooth_5/NimBLE_multi_advertiser/NimBLE_multi_advertiser.ino

@@ -79,7 +79,8 @@ class AdvCallbacks : public NimBLEExtAdvertisingCallbacks {
 #ifdef ESP_PLATFORM
         esp_deep_sleep_start();
 #else
-        systemRestart(); // nRF platforms restart then sleep via delay in setup.
+        delay(sleepSeconds * 1000); // system ON sleep mode for nRF platforms to simulate the esp deep sleep with timer wakeup
+        systemRestart();            // nRF platforms restart then sleep via delay in setup.
 #endif
     }
 
@@ -99,9 +100,6 @@ class AdvCallbacks : public NimBLEExtAdvertisingCallbacks {
 } advCallbacks;
 
 void setup() {
-#ifndef ESP_PLATFORM
-    delay(sleepSeconds * 1000); // system ON sleep mode for nRF platforms to simulate the esp deep sleep with timer wakeup
-#endif
     Serial.begin(115200);
 
     /** Initialize NimBLE and set the device name */
@@ -143,7 +141,7 @@ void setup() {
     extScannable.enableScanRequestCallback(true);
 
     /** Optional custom address for this advertisment. */
-    legacyConnectable.setAddress(NimBLEAddress("DE:AD:BE:EF:BA:AD"));
+    legacyConnectable.setAddress(NimBLEAddress("DE:AD:BE:EF:BA:AD", BLE_ADDR_RANDOM));
 
     /** Set the advertising data. */
     legacyConnectable.setName("Legacy");

examples/NimBLE_Scan_Continuous/NimBLE_Scan_Continuous.ino

@@ -40,8 +40,8 @@ void setup() {
     NimBLEDevice::init("");                         // Initialize the device, you can specify a device name if you want.
     NimBLEScan* pBLEScan = NimBLEDevice::getScan(); // Create the scan object.
     pBLEScan->setScanCallbacks(&scanCallbacks, false); // Set the callback for when devices are discovered, no duplicates.
-    pBLEScan->setActiveScan(true);          // Set active scanning, this will get more data from the advertiser.
-    pBLEScan->setMaxResults(0);             // Do not store the scan results, use callback only.
+    pBLEScan->setActiveScan(true);            // Set active scanning, this will get more data from the advertiser.
+    pBLEScan->setMaxResults(0);               // Do not store the scan results, use callback only.
     pBLEScan->start(scanTimeMs, false, true); // duration, not a continuation of last scan, restart to get all devices again.
     printf("Scanning...\n");
 }

examples/NimBLE_Secure_Client/NimBLE_Secure_Client.ino

@@ -29,8 +29,8 @@ void setup() {
     Serial.println("Starting NimBLE Client");
 
     NimBLEDevice::init("");
-    NimBLEDevice::setPower(3); /** +3db */
-    NimBLEDevice::setSecurityAuth(true, true, true); /** bonding, MITM, BLE secure connections */
+    NimBLEDevice::setPower(3);                               /** +3db */
+    NimBLEDevice::setSecurityAuth(true, true, true);         /** bonding, MITM, BLE secure connections */
     NimBLEDevice::setSecurityIOCap(BLE_HS_IO_KEYBOARD_ONLY); /** passkey */
     NimBLEScan*       pScan   = NimBLEDevice::getScan();
     NimBLEScanResults results = pScan->getResults(5 * 1000);

examples/NimBLE_Server/NimBLE_Server.ino

@@ -71,14 +71,14 @@ class ServerCallbacks : public NimBLEServerCallbacks {
 class CharacteristicCallbacks : public NimBLECharacteristicCallbacks {
     void onRead(NimBLECharacteristic* pCharacteristic, NimBLEConnInfo& connInfo) override {
         Serial.printf("%s : onRead(), value: %s\n",
-               pCharacteristic->getUUID().toString().c_str(),
-               pCharacteristic->getValue().c_str());
+                      pCharacteristic->getUUID().toString().c_str(),
+                      pCharacteristic->getValue().c_str());
     }
 
     void onWrite(NimBLECharacteristic* pCharacteristic, NimBLEConnInfo& connInfo) override {
         Serial.printf("%s : onWrite(), value: %s\n",
-               pCharacteristic->getUUID().toString().c_str(),
-               pCharacteristic->getValue().c_str());
+                      pCharacteristic->getUUID().toString().c_str(),
+                      pCharacteristic->getValue().c_str());
     }
 
     /**