From 2f023a6dbe48b8896c9bb21d965b61962f05b4bb Mon Sep 17 00:00:00 2001
From: Just Call Me Koko <25190487+justcallmekoko@users.noreply.github.com>
Date: Fri, 28 Aug 2020 18:38:05 -0400
Subject: [PATCH] Shutdown BLE menu

---
 esp32_marauder/MenuFunctions.cpp |  1 +
 esp32_marauder/WiFiScan.cpp      | 13 +++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/esp32_marauder/MenuFunctions.cpp b/esp32_marauder/MenuFunctions.cpp
index 4b65326..65e402f 100644
--- a/esp32_marauder/MenuFunctions.cpp
+++ b/esp32_marauder/MenuFunctions.cpp
@@ -811,6 +811,7 @@ void MenuFunctions::RunSetup()
   });
   addNodes(&bluetoothGeneralMenu, "Shutdown BLE", TFT_ORANGE, NULL, SCANNERS, [this]() {
     changeMenu(&shutdownBLEMenu);
+    wifi_scan_obj.RunShutdownBLE();
   });
 
   // Build shutdown BLE menu
diff --git a/esp32_marauder/WiFiScan.cpp b/esp32_marauder/WiFiScan.cpp
index c9b30f5..b9694ab 100644
--- a/esp32_marauder/WiFiScan.cpp
+++ b/esp32_marauder/WiFiScan.cpp
@@ -433,6 +433,19 @@ void WiFiScan::RunShutdownBLE() {
   display_obj.tft.setCursor(0, 100);
   display_obj.tft.setTextSize(1);
   display_obj.tft.setTextColor(TFT_CYAN);
+
+  display_obj.tft.print(F("Shutting down BLE..."));
+
+  if (this->ble_initialized) {
+    this->shutdownBLE();
+    display_obj.tft.setTextColor(TFT_GREEN);
+    display_obj.tft.println(F("OK"));
+  }
+  else {
+    display_obj.tft.setTextColor(TFT_RED);
+    display_obj.tft.println(F("FAIL"));
+    display_obj.tft.println(F("BLE not currently initialized"));
+  }
 }
 
 void WiFiScan::RunInfo()