From f119555c12c57d725f940bb310d7da9d1cccf9b1 Mon Sep 17 00:00:00 2001
From: Ben Meadors <benmmeadors@gmail.com>
Date: Sat, 11 Dec 2021 21:26:03 -0600
Subject: [PATCH] Convert to NimBLE Arduino (#985)

---
 .vscode/settings.json             | 3 ++-
 platformio.ini                    | 6 +++++-
 src/nimble/BluetoothUtil.cpp      | 1 -
 src/nimble/BluetoothUtil.h        | 1 -
 src/nimble/NimbleBluetoothAPI.cpp | 1 -
 src/nimble/NimbleDefs.h           | 1 -
 6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 455d58ff..4a61ccd2 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -50,7 +50,8 @@
         "cassert": "cpp",
         "iterator": "cpp",
         "shared_mutex": "cpp",
-        "iostream": "cpp"
+        "iostream": "cpp",
+        "esp_nimble_hci.h": "c"
     },
     "cSpell.words": [
         "Blox",
diff --git a/platformio.ini b/platformio.ini
index 4c223d65..8d9b0297 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -113,9 +113,13 @@ lib_deps =
   adafruit/Adafruit Unified Sensor@^1.1.4
   paulstoffregen/OneWire@^2.3.5
   robtillaart/DS18B20@^0.1.11
+  h2zero/NimBLE-Arduino@^1.3.1
 # Hmm - this doesn't work yet
 # board_build.ldscript = linker/esp32.extram.bss.ld
-lib_ignore = segger_rtt
+lib_ignore = 
+  segger_rtt
+  ESP32 BLE Arduino
+
 platform_packages =
     framework-arduinoespressif32@https://github.com/meshtastic/arduino-esp32.git#4cde0f5d412d2695184f32e8a47e9bea57b45276
 
diff --git a/src/nimble/BluetoothUtil.cpp b/src/nimble/BluetoothUtil.cpp
index 2c69b0bc..eae2a6db 100644
--- a/src/nimble/BluetoothUtil.cpp
+++ b/src/nimble/BluetoothUtil.cpp
@@ -11,7 +11,6 @@
 #include "services/gap/ble_svc_gap.h"
 #include "services/gatt/ble_svc_gatt.h"
 #include "sleep.h"
-#include <Arduino.h>
 #include <WiFi.h>
 
 #ifndef NO_ESP32
diff --git a/src/nimble/BluetoothUtil.h b/src/nimble/BluetoothUtil.h
index fe6d0e67..4e423769 100644
--- a/src/nimble/BluetoothUtil.h
+++ b/src/nimble/BluetoothUtil.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <Arduino.h>
 #include <functional>
 
 /// We only allow one BLE connection at a time
diff --git a/src/nimble/NimbleBluetoothAPI.cpp b/src/nimble/NimbleBluetoothAPI.cpp
index da2f80ea..6b44e44d 100644
--- a/src/nimble/NimbleBluetoothAPI.cpp
+++ b/src/nimble/NimbleBluetoothAPI.cpp
@@ -3,7 +3,6 @@
 #include "configuration.h"
 #include "nimble/BluetoothUtil.h"
 #include "nimble/NimbleDefs.h"
-#include <Arduino.h>
 
 // This scratch buffer is used for various bluetooth reads/writes - but it is safe because only one bt operation can be in
 // proccess at once
diff --git a/src/nimble/NimbleDefs.h b/src/nimble/NimbleDefs.h
index 6b1db22e..7a2b0b46 100644
--- a/src/nimble/NimbleDefs.h
+++ b/src/nimble/NimbleDefs.h
@@ -11,7 +11,6 @@
 #include "host/ble_uuid.h"
 #include "nimble/nimble_port.h"
 #include "nimble/nimble_port_freertos.h"
-#include <Arduino.h>
 
 #ifdef __cplusplus
 extern "C" {