From e3c815298ecac19f0683f50975b019b1dfd0ff69 Mon Sep 17 00:00:00 2001
From: Just Call Me Koko <at.the.red.team@gmail.com>
Date: Tue, 21 Jul 2026 12:30:43 -0400
Subject: [PATCH 1/2] Add command for findmy sound

---
 esp32_marauder/CommandLine.cpp | 20 ++++++++++++++++++++
 esp32_marauder/CommandLine.h   |  2 ++
 2 files changed, 22 insertions(+)

diff --git a/esp32_marauder/CommandLine.cpp b/esp32_marauder/CommandLine.cpp
index 47097e1..be1b001 100644
--- a/esp32_marauder/CommandLine.cpp
+++ b/esp32_marauder/CommandLine.cpp
@@ -294,6 +294,7 @@ void CommandLine::runCommand(String input) {
     #ifdef HAS_BT
       Serial.println(HELP_BT_SNIFF_CMD);
       Serial.println(HELP_BT_SPAM_CMD);
+      Serial.println(HELP_BT_FINDMY_CMD);
       Serial.println(HELP_BT_SPOOFAT_CMD);
       Serial.println(HELP_BT_SKIM_CMD);
     #endif
@@ -1091,6 +1092,25 @@ void CommandLine::runCommand(String input) {
         #endif
       }
     }
+    else if (cmd_args.get(0) == BT_FINDMY_CMD) {
+      int index_sw = this->argSearch(&cmd_args, "-t");
+
+      if (index_sw != -1) {
+        int targ_index = cmd_args.get(index_sw + 1).toInt();
+        if (targ_index < airtags->size()) {
+          for (int x = 0; x < airtags->size(); x++) {
+            AirTag new_atx = airtags->get(x);
+            if (x != targ_index)
+              new_atx.selected = false;
+            else
+              new_atx.selected = true;
+            airtags->set(x, new_atx);
+          }
+
+          wifi_scan_obj.executeFindMySound(false);
+        }
+      }
+    }
     else if (cmd_args.get(0) == BT_SPAM_CMD) {
       int bt_type_sw = this->argSearch(&cmd_args, "-t");
       if (bt_type_sw != -1) {
diff --git a/esp32_marauder/CommandLine.h b/esp32_marauder/CommandLine.h
index 5c3fa73..259eac3 100644
--- a/esp32_marauder/CommandLine.h
+++ b/esp32_marauder/CommandLine.h
@@ -114,6 +114,7 @@ const char PROGMEM UPLOAD_CMD[] = "upload";
 
 // Bluetooth sniff/scan
 const char PROGMEM BT_SPAM_CMD[] = "blespam";
+const char PROGMEM BT_FINDMY_CMD[] = "findmy";
 const char PROGMEM BT_SNIFF_CMD[] = "sniffbt";
 const char PROGMEM BT_SPOOFAT_CMD[] = "spoofat";
 //const char PROGMEM BT_WARDRIVE_CMD[] = "btwardrive";
@@ -189,6 +190,7 @@ const char PROGMEM HELP_UPLOAD_CMD[] = "upload -d <wdg/wigle/both>";
 
 // Bluetooth sniff/scan
 const char PROGMEM HELP_BT_SNIFF_CMD[] = "sniffbt [-t] <airtag/flipper/flock/meta>";
+const char PROGMEM HELP_BT_FINDMY_CMD[] = "findmy -t <index>";
 const char PROGMEM HELP_BT_SPAM_CMD[] = "blespam -t <sourapple/applejuice/google/samsung/windows/flipper/all>";
 const char PROGMEM HELP_BT_SPOOFAT_CMD[] = "spoofat -t <index>";
 //const char PROGMEM HELP_BT_SOUR_APPLE_CMD[] = "sourapple";

From 57d39b521183c6be24133002a62f4342904fdc1f Mon Sep 17 00:00:00 2001
From: Just Call Me Koko <at.the.red.team@gmail.com>
Date: Tue, 21 Jul 2026 12:49:09 -0400
Subject: [PATCH 2/2] ayo

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

diff --git a/esp32_marauder/CommandLine.cpp b/esp32_marauder/CommandLine.cpp
index be1b001..7588775 100644
--- a/esp32_marauder/CommandLine.cpp
+++ b/esp32_marauder/CommandLine.cpp
@@ -1093,6 +1093,7 @@ void CommandLine::runCommand(String input) {
       }
     }
     else if (cmd_args.get(0) == BT_FINDMY_CMD) {
+      #ifdef HAS_NIMBLE_2
       int index_sw = this->argSearch(&cmd_args, "-t");
 
       if (index_sw != -1) {
@@ -1110,6 +1111,7 @@ void CommandLine::runCommand(String input) {
           wifi_scan_obj.executeFindMySound(false);
         }
       }
+      #endif
     }
     else if (cmd_args.get(0) == BT_SPAM_CMD) {
       int bt_type_sw = this->argSearch(&cmd_args, "-t");