From 48b09b70900aeb35c5cc52d5d87a13bd3d9f4f6b Mon Sep 17 00:00:00 2001
From: Just Call Me Koko <at.the.red.team@gmail.com>
Date: Sun, 26 Nov 2023 14:38:40 -0500
Subject: [PATCH] Fix not BT device issues

---
 esp32_marauder/WiFiScan.cpp | 58 ++++++++++++++++++-------------------
 esp32_marauder/WiFiScan.h   | 17 ++++++-----
 2 files changed, 38 insertions(+), 37 deletions(-)

diff --git a/esp32_marauder/WiFiScan.cpp b/esp32_marauder/WiFiScan.cpp
index 9fdc1a4..cc3bd6e 100644
--- a/esp32_marauder/WiFiScan.cpp
+++ b/esp32_marauder/WiFiScan.cpp
@@ -297,36 +297,36 @@ void WiFiScan::RunSetup() {
   access_points = new LinkedList<AccessPoint>();
   stations = new LinkedList<Station>();
 
-  watch_models = new WatchModel[26] {
-    {0x1A, "Fallback Watch"},
-    {0x01, "White Watch4 Classic 44m"},
-    {0x02, "Black Watch4 Classic 40m"},
-    {0x03, "White Watch4 Classic 40m"},
-    {0x04, "Black Watch4 44mm"},
-    {0x05, "Silver Watch4 44mm"},
-    {0x06, "Green Watch4 44mm"},
-    {0x07, "Black Watch4 40mm"},
-    {0x08, "White Watch4 40mm"},
-    {0x09, "Gold Watch4 40mm"},
-    {0x0A, "French Watch4"},
-    {0x0B, "French Watch4 Classic"},
-    {0x0C, "Fox Watch5 44mm"},
-    {0x11, "Black Watch5 44mm"},
-    {0x12, "Sapphire Watch5 44mm"},
-    {0x13, "Purpleish Watch5 40mm"},
-    {0x14, "Gold Watch5 40mm"},
-    {0x15, "Black Watch5 Pro 45mm"},
-    {0x16, "Gray Watch5 Pro 45mm"},
-    {0x17, "White Watch5 44mm"},
-    {0x18, "White & Black Watch5"},
-    {0x1B, "Black Watch6 Pink 40mm"},
-    {0x1C, "Gold Watch6 Gold 40mm"},
-    {0x1D, "Silver Watch6 Cyan 44mm"},
-    {0x1E, "Black Watch6 Classic 43m"},
-    {0x20, "Green Watch6 Classic 43m"},
-  };
-
   #ifdef HAS_BT
+    watch_models = new WatchModel[26] {
+      {0x1A, "Fallback Watch"},
+      {0x01, "White Watch4 Classic 44m"},
+      {0x02, "Black Watch4 Classic 40m"},
+      {0x03, "White Watch4 Classic 40m"},
+      {0x04, "Black Watch4 44mm"},
+      {0x05, "Silver Watch4 44mm"},
+      {0x06, "Green Watch4 44mm"},
+      {0x07, "Black Watch4 40mm"},
+      {0x08, "White Watch4 40mm"},
+      {0x09, "Gold Watch4 40mm"},
+      {0x0A, "French Watch4"},
+      {0x0B, "French Watch4 Classic"},
+      {0x0C, "Fox Watch5 44mm"},
+      {0x11, "Black Watch5 44mm"},
+      {0x12, "Sapphire Watch5 44mm"},
+      {0x13, "Purpleish Watch5 40mm"},
+      {0x14, "Gold Watch5 40mm"},
+      {0x15, "Black Watch5 Pro 45mm"},
+      {0x16, "Gray Watch5 Pro 45mm"},
+      {0x17, "White Watch5 44mm"},
+      {0x18, "White & Black Watch5"},
+      {0x1B, "Black Watch6 Pink 40mm"},
+      {0x1C, "Gold Watch6 Gold 40mm"},
+      {0x1D, "Silver Watch6 Cyan 44mm"},
+      {0x1E, "Black Watch6 Classic 43m"},
+      {0x20, "Green Watch6 Classic 43m"},
+    };
+    
     NimBLEDevice::setScanFilterMode(CONFIG_BTDM_SCAN_DUPL_TYPE_DEVICE);
     NimBLEDevice::setScanDuplicateCacheSize(200);
     NimBLEDevice::init("");
diff --git a/esp32_marauder/WiFiScan.h b/esp32_marauder/WiFiScan.h
index be25e72..5d81dd0 100644
--- a/esp32_marauder/WiFiScan.h
+++ b/esp32_marauder/WiFiScan.h
@@ -254,14 +254,15 @@ class WiFiScan
                               0xf0, 0xff, 0x02, 0x00
                           };
 
-    #ifdef HAS_BT
-      enum EBLEPayloadType
-      {
-        Microsoft,
-        Apple,
-        Samsung,
-        Google
-      };
+    enum EBLEPayloadType
+    {
+      Microsoft,
+      Apple,
+      Samsung,
+      Google
+    };
+
+      #ifdef HAS_BT
 
       struct BLEData
       {