From 09615832b36a95ca81bbcf2d4eb00430abdadfec Mon Sep 17 00:00:00 2001
From: wallali <612794+wallali@users.noreply.github.com>
Date: Fri, 21 Apr 2023 14:24:09 +0100
Subject: [PATCH 1/4] Helpful serial output if BT unsupported in fw

---
 esp32_marauder/CommandLine.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/esp32_marauder/CommandLine.cpp b/esp32_marauder/CommandLine.cpp
index 8253d79..9f0f96a 100644
--- a/esp32_marauder/CommandLine.cpp
+++ b/esp32_marauder/CommandLine.cpp
@@ -493,21 +493,29 @@ void CommandLine::runCommand(String input) {
     //// Bluetooth scan/attack commands
     // Bluetooth scan
     if (cmd_args.get(0) == BT_SNIFF_CMD) {
+      #ifdef HAS_BT
       Serial.println("Starting Bluetooth scan. Stop with " + (String)STOPSCAN_CMD);
       #ifdef HAS_SCREEN
         display_obj.clearScreen();
         menu_function_obj.drawStatusBar();
       #endif
       wifi_scan_obj.StartScan(BT_SCAN_ALL, TFT_GREEN);
+      #else
+        Serial.println("Bluetooth not supported");
+      #endif
     }
     // Bluetooth CC Skimmer scan
     else if (cmd_args.get(0) == BT_SKIM_CMD) {
+      #ifdef HAS_BT
       Serial.println("Starting Bluetooth CC Skimmer scan. Stop with " + (String)STOPSCAN_CMD);
       #ifdef HAS_SCREEN
         display_obj.clearScreen();
         menu_function_obj.drawStatusBar();
       #endif
       wifi_scan_obj.StartScan(BT_SCAN_SKIMMERS, TFT_MAGENTA);
+      #else
+        Serial.println("Bluetooth not supported");
+      #endif
     }
 
     // Update command

From ce6a40e554fb997fba3f31ba2f35c4abaa3802dd Mon Sep 17 00:00:00 2001
From: wallali <612794+wallali@users.noreply.github.com>
Date: Fri, 21 Apr 2023 14:26:43 +0100
Subject: [PATCH 2/4] Improve output during pkimd sniff

---
 esp32_marauder/WiFiScan.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/esp32_marauder/WiFiScan.cpp b/esp32_marauder/WiFiScan.cpp
index bde1940..e79a066 100644
--- a/esp32_marauder/WiFiScan.cpp
+++ b/esp32_marauder/WiFiScan.cpp
@@ -2935,6 +2935,8 @@ void WiFiScan::eapolSnifferCallback(void* buf, wifi_promiscuous_pkt_type_t type)
           display_obj.loading = false;
         }
       #endif
+    #else
+      Serial.println(addr);    
     #endif
     
 //    for (int i = 0; i < len; i++) {

From f4486ec19188039dbd70125f24490cd163348f70 Mon Sep 17 00:00:00 2001
From: wallali <612794+wallali@users.noreply.github.com>
Date: Fri, 21 Apr 2023 14:38:43 +0100
Subject: [PATCH 3/4] Helpful serial output if BT unsupported in fw

---
 esp32_marauder/CommandLine.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/esp32_marauder/CommandLine.cpp b/esp32_marauder/CommandLine.cpp
index 079fb98..5047f27 100644
--- a/esp32_marauder/CommandLine.cpp
+++ b/esp32_marauder/CommandLine.cpp
@@ -593,21 +593,29 @@ void CommandLine::runCommand(String input) {
     //// Bluetooth scan/attack commands
     // Bluetooth scan
     if (cmd_args.get(0) == BT_SNIFF_CMD) {
+      #ifdef HAS_BT
         Serial.println("Starting Bluetooth scan. Stop with " + (String)STOPSCAN_CMD);
         #ifdef HAS_SCREEN
           display_obj.clearScreen();
           menu_function_obj.drawStatusBar();
         #endif
         wifi_scan_obj.StartScan(BT_SCAN_ALL, TFT_GREEN);
+      #else
+        Serial.println("Bluetooth not supported");
+      #endif
     }
     // Bluetooth CC Skimmer scan
     else if (cmd_args.get(0) == BT_SKIM_CMD) {
+      #ifdef HAS_BT
         Serial.println("Starting Bluetooth CC Skimmer scan. Stop with " + (String)STOPSCAN_CMD);
         #ifdef HAS_SCREEN
           display_obj.clearScreen();
           menu_function_obj.drawStatusBar();
         #endif
         wifi_scan_obj.StartScan(BT_SCAN_SKIMMERS, TFT_MAGENTA);
+      #else
+        Serial.println("Bluetooth not supported");
+      #endif
     }
 
     // Update command

From 6ff61f4991e031b0eaa15336565346099edbd0f4 Mon Sep 17 00:00:00 2001
From: wallali <612794+wallali@users.noreply.github.com>
Date: Fri, 21 Apr 2023 14:39:43 +0100
Subject: [PATCH 4/4] Improve output during pkimd sniff

---
 esp32_marauder/WiFiScan.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/esp32_marauder/WiFiScan.cpp b/esp32_marauder/WiFiScan.cpp
index 7cfbcf0..b788824 100644
--- a/esp32_marauder/WiFiScan.cpp
+++ b/esp32_marauder/WiFiScan.cpp
@@ -2938,6 +2938,8 @@ void WiFiScan::eapolSnifferCallback(void* buf, wifi_promiscuous_pkt_type_t type)
           display_obj.loading = false;
         }
       #endif
+    #else
+      Serial.println(addr);    
     #endif
     
 //    for (int i = 0; i < len; i++) {