Add BLE Scanning to Wardriving

src/core/menu_items/GpsMenu.cpp

@@ -8,16 +8,26 @@
 
 void GpsMenu::optionsMenu() {
     options = {
-        {"Wardriving",  [=]() { Wardriving(); }   },
-        {"GPS Tracker", [=]() { GPSTracker(); }   },
-        {"Config",      [this]() { configMenu(); }},
+        {"Wardriving",  [this]() { wardrivingMenu(); }},
+        {"GPS Tracker", [=]() { GPSTracker(); }       },
+        {"Config",      [this]() { configMenu(); }    },
     };
     addOptionToMainMenu();
 
     String txt = "GPS (" + String(bruceConfigPins.gpsBaudrate) + " bps)";
     loopOptions(options, MENU_TYPE_SUBMENU, txt.c_str());
 }
 
+void GpsMenu::wardrivingMenu() {
+    options = {
+        {"Scan WiFi Networks", []() { Wardriving(true, false); }},
+        {"Scan BLE Devices",   []() { Wardriving(false, true); }},
+        {"Scan Both",          []() { Wardriving(true, true); } },
+        {"Back",               [this]() { optionsMenu(); }      },
+    };
+
+    loopOptions(options, MENU_TYPE_SUBMENU, "Wardriving");
+}
 void GpsMenu::configMenu() {
     options = {
         {"Baudrate", setGpsBaudrateMenu                                 },

src/core/menu_items/GpsMenu.h

@@ -8,6 +8,7 @@ class GpsMenu : public MenuItemInterface {
     GpsMenu() : MenuItemInterface("GPS") {}
 
     void optionsMenu(void);
+    void wardrivingMenu(void);
     void drawIcon(float scale);
     void drawIconImg();
     bool getTheme() { return bruceConfig.theme.gps; }

src/modules/ble/ble_common.cpp

@@ -6,15 +6,13 @@
 #define CHARACTERISTIC_RX_UUID "1bc68da0-f3e3-11e9-81b4-2a2ae2dbcce4"
 #define CHARACTERISTIC_TX_UUID "1bc68efe-f3e3-11e9-81b4-2a2ae2dbcce4"
 
+BLEScan *pBLEScan = nullptr;
+int scanTime = SCANTIME; // In seconds
+
 #if __has_include(<NimBLEExtAdvertising.h>)
 #define NIMBLE_V2_PLUS 1
 #endif
 
-#define SCANTIME 5
-#define SCANTYPE ACTIVE
-#define SCAN_INT 100
-#define SCAN_WINDOW 99
-
 #define ENDIAN_CHANGE_U16(x) ((((x) & 0xFF00) >> 8) + (((x) & 0xFF) << 8))
 
 BLEServer *pServer = NULL;
@@ -37,9 +35,6 @@ class MyCallbacks : public BLECharacteristicCallbacks {
     void onWrite(NimBLECharacteristic *pCharacteristic) { data = pCharacteristic->getValue(); }
 };
 
-int scanTime = SCANTIME; // In seconds
-BLEScan *pBLEScan;
-
 uint8_t sta_mac[6];
 char strID[18];
 char strAddl[200];

src/modules/ble/ble_common.h

@@ -1,20 +1,29 @@
 #ifndef __BLE_COMMON_H__
 #define __BLE_COMMON_H__
 
-//#include "BLE2902.h"
+// #include "BLE2902.h"
 #include <NimBLEDevice.h>
 #include <NimBLEServer.h>
 #include <NimBLEUtils.h>
 
-#include <NimBLEScan.h>
 #include <NimBLEAdvertisedDevice.h>
 #include <NimBLEBeacon.h>
+#include <NimBLEScan.h>
 
-#include <globals.h>
 #include "core/display.h"
+#include <globals.h>
+
+#define SCANTIME 5
+#define SCANTYPE ACTIVE
+#define SCAN_INT 100
+#define SCAN_WINDOW 99
+
+extern BLEScan *pBLEScan;
+extern int scanTime;
 
 void ble_test();
 
+void ble_scan_setup();
 void ble_scan();
 
 void disPlayBLESend();