From e5387b80fc25906d900561897c3604e2447fc3c1 Mon Sep 17 00:00:00 2001
From: H4W9 <hoferwade@gmail.com>
Date: Wed, 20 Aug 2025 11:32:10 -0500
Subject: [PATCH 01/21] Update README.md

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index aa0cf1f..d0d6712 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,6 @@
 <!---Shields/Badges https://shields.io/--->
 
 # ESP32 Marauder
-<p align="center"><img alt="Marauder logo" src="https://github.com/justcallmekoko/ESP32Marauder/blob/master/pictures/marauder_skull_patch_04_full_final.png?raw=true" width="300"></p>
 <p align="center">
   <b>A suite of WiFi/Bluetooth offensive and defensive tools for the ESP32</b>
   <br><br>

From 06293a0a4cb804814cda548e9b32ba9ff3a701e9 Mon Sep 17 00:00:00 2001
From: H4W9 <hoferwade@gmail.com>
Date: Wed, 20 Aug 2025 19:48:17 -0500
Subject: [PATCH 02/21] Add files via upload

---
 pictures/icons/funny_beacon_22.bmp | Bin 0 -> 1606 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 pictures/icons/funny_beacon_22.bmp

diff --git a/pictures/icons/funny_beacon_22.bmp b/pictures/icons/funny_beacon_22.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..0922a4b1c6f6e3352035b12fc9c5e15eba1ed11e
GIT binary patch
literal 1606
zcmbW#Kd#h3499VU5TZg<)Gj#zwM9Yq?%<>NC@v7^uqZhLg^%$1Etc=ZnPvACNRZ@{
zpJ(!KlFXN<uW#j8KEDz9MD_9XO5Pp)A6|?6ct4Jg+b%@dBw~U+rBs#Fuaf7V-$m5m
z;D9CyEn)%%g*gI=LW{USVW8oGM4`{;Drs;85``9_lvEfTfkdGhq(EVC1QLZ7VUt!E
z9Dzik#e`vsVy%uqqR{hds-(dYNECWr+mtjo0*OM;CvhbWjzFT&^SMGvgCmeA^nA)x
z(%=Xr3O%2>lr%U3i9#R0z*<RzBakSx1n(cBSa0rFYogE+Do_|4fkdI_x0#X#M<7w?
z`K7L;!4XIldVV(#i7+?<i9*j*NF@!9K%&qyO-f0FBakTcF@>U)G&ll@LQC=fB?^Nh
zkXUQa)KVo4jzFT&Gwn=CgCmeA^h`-t(%=Xr3O&;`lr%U3i9*j*P9+VFK%&qy%}Ysx
zBarfZxym=r3+^X!JvO;sR|VG9wRZoxT#n`C#h1(U>^zU3y{mOsPQC8)cwjZ>_Q#Ri
z6%_lvD|i3OT_45S*nRt&ebVmV?VW$^zrW{0J&lKfuCDW;_v3syw(~akqo>}ZS>=8G
W=j`La*}T2marzwDAN1DsPsMN9<Cs_g

literal 0
HcmV?d00001


From 2f9d70b72538a93948ed6bb71bb9e75c8940d514 Mon Sep 17 00:00:00 2001
From: H4W9 <hoferwade@gmail.com>
Date: Wed, 20 Aug 2025 19:49:57 -0500
Subject: [PATCH 03/21] Update Assets.h

add funny beacon icon
---
 esp32_marauder/Assets.h | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/esp32_marauder/Assets.h b/esp32_marauder/Assets.h
index bcc2c51..1da29aa 100644
--- a/esp32_marauder/Assets.h
+++ b/esp32_marauder/Assets.h
@@ -227,7 +227,13 @@ PROGMEM static const unsigned char menu_icons[][66] = {
     0x67, 0xDB, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF},
     {0xFF, 0xFF, 0x1F, 0xF8, 0x0F, 0xF0, 0x07, 0xE0, 0x07, 0xE0, 0x07, 0xE0, // FORCE: 39
     0x67, 0xE6, 0x77, 0xEE, 0x87, 0xE0, 0x8F, 0xF1, 0x0F, 0xF0, 0x4F, 0xF5, 
-    0x1F, 0xF8, 0x3F, 0xFC, 0xFF, 0xFF, 0xFF, 0xFF}
+    0x1F, 0xF8, 0x3F, 0xFC, 0xFF, 0xFF, 0xFF, 0xFF},
+    {0xFF, 0xFF, 0x3F, 0xFF, 0xFF, 0x3F, 0xFF, 0xC0, 0x3F, 0x3F, 0x3F, 0x3F, // FUNNY BEACON: 40
+    0xDF, 0xFF, 0x3E, 0xEF, 0xFF, 0x3D, 0x77, 0xBF, 0x3B, 0x77, 0x3E, 0x3B, 
+    0x7B, 0x3E, 0x37, 0x7B, 0xBF, 0x37, 0xFB, 0xF7, 0x37, 0xFB, 0xF7, 0x37, 
+    0xFB, 0xF3, 0x37, 0xBB, 0x7F, 0x37, 0x37, 0x3F, 0x3B, 0x77, 0x80, 0x3B, 
+    0xEF, 0xE1, 0x3D, 0xDF, 0xFF, 0x3E, 0x3F, 0x3F, 0x3F, 0xFF, 0xC0, 0x3F, 
+    0xFF, 0xFF, 0x3F, 0xFF, 0xFF, 0x3F}
 };
 
 /*#ifndef MARAUDER_MINI

From d5c5e0e011729520a40569d72a06c515451967f7 Mon Sep 17 00:00:00 2001
From: H4W9 <hoferwade@gmail.com>
Date: Wed, 20 Aug 2025 19:52:38 -0500
Subject: [PATCH 04/21] Update MenuFunctions.h

define funny beacon icon
---
 esp32_marauder/MenuFunctions.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/esp32_marauder/MenuFunctions.h b/esp32_marauder/MenuFunctions.h
index a6dbeb6..df70564 100644
--- a/esp32_marauder/MenuFunctions.h
+++ b/esp32_marauder/MenuFunctions.h
@@ -92,6 +92,7 @@ extern Settings settings_obj;
 #define MULTISSID_SNIFF 37 // Use blanks icon
 #define JOINED 38
 #define FORCE 39
+#define FUNNY_BEACON 40
 
 PROGMEM void my_disp_flush(lv_disp_drv_t *disp, const lv_area_t *area, lv_color_t *color_p);
 PROGMEM bool my_touchpad_read(lv_indev_drv_t * indev_driver, lv_indev_data_t * data);
@@ -300,3 +301,4 @@ class MenuFunctions
 
 #endif
 #endif
+

From 6840d4c7acd4ef7ab3e92a5878e9b28c1bc09dc1 Mon Sep 17 00:00:00 2001
From: H4W9 <hoferwade@gmail.com>
Date: Wed, 20 Aug 2025 20:00:05 -0500
Subject: [PATCH 05/21] Update MenuFunctions.cpp

Add Funny Beacon button to the Wi-Fi Attack Menu
---
 esp32_marauder/MenuFunctions.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/esp32_marauder/MenuFunctions.cpp b/esp32_marauder/MenuFunctions.cpp
index 8b3d7ab..efccf27 100644
--- a/esp32_marauder/MenuFunctions.cpp
+++ b/esp32_marauder/MenuFunctions.cpp
@@ -2258,6 +2258,11 @@ void MenuFunctions::RunSetup()
     this->drawStatusBar();
     wifi_scan_obj.StartScan(WIFI_ATTACK_BEACON_SPAM, TFT_ORANGE);
   });
+  this->addNodes(&wifiAttackMenu, text1_68, TFTYELLOW, NULL, FUNNY_BEACON, [this]() {
+    display_obj.clearScreen();
+    this->drawStatusBar();
+    wifi_scan_obj.StartScan(WIFI_ATTACK_FUNNY_BEACON, TFT_YELLOW);
+  });
   this->addNodes(&wifiAttackMenu, text_table1[52], TFTYELLOW, NULL, RICK_ROLL, [this]() {
     display_obj.clearScreen();
     this->drawStatusBar();
@@ -4146,3 +4151,4 @@ void MenuFunctions::displayCurrentMenu(int start_index)
 }
 
 #endif
+

From 3c093f6c9c2fa4812def4aad90f25d4c1c4884ca Mon Sep 17 00:00:00 2001
From: H4W9 <hoferwade@gmail.com>
Date: Wed, 20 Aug 2025 20:01:44 -0500
Subject: [PATCH 06/21] Update lang_var.h

Add text1_68[] = "Funny Beacon Spam";
---
 esp32_marauder/lang_var.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/esp32_marauder/lang_var.h b/esp32_marauder/lang_var.h
index a1c78ba..642760b 100644
--- a/esp32_marauder/lang_var.h
+++ b/esp32_marauder/lang_var.h
@@ -106,6 +106,7 @@ PROGMEM const char text1_62[] = "Deauth Targeted";
 PROGMEM const char text1_63[] = "Detect Pineapple";
 PROGMEM const char text1_64[] = "Detect MultiSSID";
 PROGMEM const char text1_65[] = "Select probe SSIDs";
+PROGMEM const char text1_68[] = "Funny Beacon Spam";
 
 //SDInterface.cpp texts
 PROGMEM const char text2_0[] = "Error, could not find update.bin";

From 5a1269d062dd9dc0b1fbff625dea74f6fb2a0bb7 Mon Sep 17 00:00:00 2001
From: H4W9 <hoferwade@gmail.com>
Date: Wed, 20 Aug 2025 20:12:04 -0500
Subject: [PATCH 07/21] Update WiFiScan.h

add Funny Beacon Spam attack defs
---
 esp32_marauder/WiFiScan.h | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/esp32_marauder/WiFiScan.h b/esp32_marauder/WiFiScan.h
index 0c4f7bb..d6af81a 100644
--- a/esp32_marauder/WiFiScan.h
+++ b/esp32_marauder/WiFiScan.h
@@ -130,6 +130,7 @@
 #define WIFI_ATTACK_SLEEP 61
 #define WIFI_ATTACK_SLEEP_TARGETED 62
 #define GPS_POI 63
+#define WIFI_ATTACK_FUNNY_BEACON 64 
 
 #define BASE_MULTIPLIER 4
 
@@ -284,6 +285,22 @@ class WiFiScan
       "08 and hurt you"
     };
 
+    // H4W9 added Funny Beacon Spam
+    const char* funny_beacon[12] = {
+      "Abraham Linksys",
+      "Benjamin FrankLAN",
+      "Dora the Internet Explorer",
+      "FBI Surveillance Van 4",
+      "Get Off My LAN",
+      "Loading...",
+      "Martin Router King",
+      "404 Wi-Fi Unavailable",
+      "Test Wi-Fi Please Ignore",
+      "This LAN is My LAN",
+      "Titanic Syncing",
+      "Winternet is Coming"
+    };
+
     char* prefix = "G";
 
     typedef struct

From fc8f9629fac2679dce9506a2e7fd2193778aff0c Mon Sep 17 00:00:00 2001
From: H4W9 <hoferwade@gmail.com>
Date: Wed, 20 Aug 2025 20:26:29 -0500
Subject: [PATCH 08/21] Update WiFiScan.cpp

Add Funny Beacon Spam attack
---
 esp32_marauder/WiFiScan.cpp | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/esp32_marauder/WiFiScan.cpp b/esp32_marauder/WiFiScan.cpp
index 4871e0a..fa73b02 100644
--- a/esp32_marauder/WiFiScan.cpp
+++ b/esp32_marauder/WiFiScan.cpp
@@ -936,6 +936,8 @@ void WiFiScan::StartScan(uint8_t scan_mode, uint16_t color)
     this->startWiFiAttacks(scan_mode, color, text_table1[51]);
   else if (scan_mode == WIFI_ATTACK_RICK_ROLL)
     this->startWiFiAttacks(scan_mode, color, text_table1[52]);
+  else if (scan_mode == WIFI_ATTACK_FUNNY_BEACON)
+    this->startWiFiAttacks(scan_mode, color, text1_68);
   else if (scan_mode == WIFI_ATTACK_AUTH)
     this->startWiFiAttacks(scan_mode, color, text_table1[53]);
   else if (scan_mode == WIFI_ATTACK_DEAUTH)
@@ -1209,6 +1211,7 @@ void WiFiScan::StopScan(uint8_t scan_mode)
   (currentScanMode == WIFI_ATTACK_SLEEP_TARGETED) ||
   (currentScanMode == WIFI_ATTACK_MIMIC) ||
   (currentScanMode == WIFI_ATTACK_RICK_ROLL) ||
+  (currentScanMode == WIFI_ATTACK_FUNNY_BEACON) ||
   (currentScanMode == WIFI_PACKET_MONITOR) ||
   (currentScanMode == WIFI_SCAN_CHAN_ANALYZER) ||
   (currentScanMode == WIFI_SCAN_PACKET_RATE) ||
@@ -8655,6 +8658,36 @@ void WiFiScan::main(uint32_t currentTime)
       }
     }
 
+    if (currentTime - initTime >= 1000)
+    {
+      initTime = millis();
+      //Serial.print("packets/sec: ");
+      //Serial.println(packets_sent);
+      String displayString = "";
+      String displayString2 = "";
+      displayString.concat(text18);
+      displayString.concat(packets_sent);
+      for (int x = 0; x < STANDARD_FONT_CHAR_LIMIT; x++)
+        displayString2.concat(" ");
+      #ifdef HAS_SCREEN
+        display_obj.tft.setTextColor(TFT_GREEN, TFT_BLACK);
+        display_obj.showCenterText(displayString2, TFT_HEIGHT / 2);
+        display_obj.showCenterText(displayString, TFT_HEIGHT / 2);
+      #endif
+      packets_sent = 0;
+    }
+  else if ((currentScanMode == WIFI_ATTACK_FUNNY_BEACON))
+  {
+    // Need this for loop because getTouch causes ~10ms delay
+    // which makes beacon spam less effective
+    for (int i = 0; i < 7; i++)
+    {
+      for (int x = 0; x < (sizeof(funny_beacon)/sizeof(char *)); x++)
+      {
+        broadcastSetSSID(currentTime, rick_roll[x]);
+      }
+    }
+
     if (currentTime - initTime >= 1000)
     {
       initTime = millis();

From f35d88122c9a20f0cc63444f6f1d4b5a7bc0b3a0 Mon Sep 17 00:00:00 2001
From: H4W9 <hoferwade@gmail.com>
Date: Wed, 20 Aug 2025 20:28:07 -0500
Subject: [PATCH 09/21] Update lang_var.h

---
 esp32_marauder/lang_var.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esp32_marauder/lang_var.h b/esp32_marauder/lang_var.h
index 642760b..24a64f8 100644
--- a/esp32_marauder/lang_var.h
+++ b/esp32_marauder/lang_var.h
@@ -106,7 +106,7 @@ PROGMEM const char text1_62[] = "Deauth Targeted";
 PROGMEM const char text1_63[] = "Detect Pineapple";
 PROGMEM const char text1_64[] = "Detect MultiSSID";
 PROGMEM const char text1_65[] = "Select probe SSIDs";
-PROGMEM const char text1_68[] = "Funny Beacon Spam";
+PROGMEM const char text1_68[] = "Funny SSID Beacon";
 
 //SDInterface.cpp texts
 PROGMEM const char text2_0[] = "Error, could not find update.bin";

From 7f522d8e15bcd8cae74f6b64564a1c9247e85c73 Mon Sep 17 00:00:00 2001
From: H4W9 <hoferwade@gmail.com>
Date: Wed, 20 Aug 2025 20:56:10 -0500
Subject: [PATCH 10/21] Update WiFiScan.cpp

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

diff --git a/esp32_marauder/WiFiScan.cpp b/esp32_marauder/WiFiScan.cpp
index fa73b02..41a93ee 100644
--- a/esp32_marauder/WiFiScan.cpp
+++ b/esp32_marauder/WiFiScan.cpp
@@ -8676,6 +8676,7 @@ void WiFiScan::main(uint32_t currentTime)
       #endif
       packets_sent = 0;
     }
+  }
   else if ((currentScanMode == WIFI_ATTACK_FUNNY_BEACON))
   {
     // Need this for loop because getTouch causes ~10ms delay

From ef5d9527ef3c720ee18f48b5356fb46f959006bc Mon Sep 17 00:00:00 2001
From: H4W9 <hoferwade@gmail.com>
Date: Wed, 20 Aug 2025 22:25:15 -0500
Subject: [PATCH 11/21] Update MenuFunctions.cpp

---
 esp32_marauder/MenuFunctions.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/esp32_marauder/MenuFunctions.cpp b/esp32_marauder/MenuFunctions.cpp
index efccf27..cf497af 100644
--- a/esp32_marauder/MenuFunctions.cpp
+++ b/esp32_marauder/MenuFunctions.cpp
@@ -819,6 +819,7 @@ void MenuFunctions::main(uint32_t currentTime)
       (wifi_scan_obj.currentScanMode != WIFI_ATTACK_SLEEP) &&
       (wifi_scan_obj.currentScanMode != WIFI_ATTACK_SLEEP_TARGETED) &&
       (wifi_scan_obj.currentScanMode != WIFI_ATTACK_MIMIC) &&
+	  (wifi_scan_obj.currentScanMode != WIFI_ATTACK_FUNNY_BEACON) &&
       (wifi_scan_obj.currentScanMode != WIFI_ATTACK_RICK_ROLL))
     display_obj.displayBuffer();
 
@@ -876,6 +877,7 @@ void MenuFunctions::main(uint32_t currentTime)
           (wifi_scan_obj.currentScanMode == WIFI_ATTACK_SLEEP) ||
           (wifi_scan_obj.currentScanMode == WIFI_ATTACK_SLEEP_TARGETED) ||
           (wifi_scan_obj.currentScanMode == WIFI_ATTACK_MIMIC) ||
+		  (wifi_scan_obj.currentScanMode == WIFI_ATTACK_FUNNY_BEACON) ||
           (wifi_scan_obj.currentScanMode == WIFI_ATTACK_RICK_ROLL) ||
           (wifi_scan_obj.currentScanMode == WIFI_ATTACK_BEACON_LIST) ||
           (wifi_scan_obj.currentScanMode == BT_SCAN_ALL) ||
@@ -964,6 +966,7 @@ void MenuFunctions::main(uint32_t currentTime)
             (wifi_scan_obj.currentScanMode == WIFI_ATTACK_SLEEP) ||
             (wifi_scan_obj.currentScanMode == WIFI_ATTACK_SLEEP_TARGETED) ||
             (wifi_scan_obj.currentScanMode == WIFI_ATTACK_MIMIC) ||
+			(wifi_scan_obj.currentScanMode == WIFI_ATTACK_FUNNY_BEACON) ||
             (wifi_scan_obj.currentScanMode == WIFI_ATTACK_RICK_ROLL) ||
             (wifi_scan_obj.currentScanMode == WIFI_ATTACK_BEACON_LIST) ||
             (wifi_scan_obj.currentScanMode == BT_SCAN_ALL) ||
@@ -1026,6 +1029,7 @@ void MenuFunctions::main(uint32_t currentTime)
         (wifi_scan_obj.currentScanMode != WIFI_SCAN_RAW_CAPTURE) &&
         (wifi_scan_obj.currentScanMode != WIFI_SCAN_CHAN_ANALYZER) &&
         (wifi_scan_obj.currentScanMode != WIFI_SCAN_SIG_STREN) &&
+		(wifi_scan_obj.currentScanMode != WIFI_ATTACK_FUNNY_BEACON) &&
         (wifi_scan_obj.currentScanMode != WIFI_ATTACK_RICK_ROLL))
     {
       // Need this to set all keys to false
@@ -2258,10 +2262,10 @@ void MenuFunctions::RunSetup()
     this->drawStatusBar();
     wifi_scan_obj.StartScan(WIFI_ATTACK_BEACON_SPAM, TFT_ORANGE);
   });
-  this->addNodes(&wifiAttackMenu, text1_68, TFTYELLOW, NULL, FUNNY_BEACON, [this]() {
+  this->addNodes(&wifiAttackMenu, text1_68, TFTCYAN, NULL, FUNNY_BEACON, [this]() {
     display_obj.clearScreen();
     this->drawStatusBar();
-    wifi_scan_obj.StartScan(WIFI_ATTACK_FUNNY_BEACON, TFT_YELLOW);
+    wifi_scan_obj.StartScan(WIFI_ATTACK_FUNNY_BEACON, TFT_CYAN);
   });
   this->addNodes(&wifiAttackMenu, text_table1[52], TFTYELLOW, NULL, RICK_ROLL, [this]() {
     display_obj.clearScreen();
@@ -4152,3 +4156,4 @@ void MenuFunctions::displayCurrentMenu(int start_index)
 
 #endif
 
+

From 4e88212e2f5c9b33475aa7f16326c1ca756900c2 Mon Sep 17 00:00:00 2001
From: H4W9 <hoferwade@gmail.com>
Date: Wed, 20 Aug 2025 22:38:23 -0500
Subject: [PATCH 12/21] Update WiFiScan.cpp

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

diff --git a/esp32_marauder/WiFiScan.cpp b/esp32_marauder/WiFiScan.cpp
index 41a93ee..268d0f9 100644
--- a/esp32_marauder/WiFiScan.cpp
+++ b/esp32_marauder/WiFiScan.cpp
@@ -8685,7 +8685,7 @@ void WiFiScan::main(uint32_t currentTime)
     {
       for (int x = 0; x < (sizeof(funny_beacon)/sizeof(char *)); x++)
       {
-        broadcastSetSSID(currentTime, rick_roll[x]);
+        broadcastSetSSID(currentTime, funny_beacon[x]);
       }
     }
 

From de05c9be2b8395efaebac031913d81d55a11ee07 Mon Sep 17 00:00:00 2001
From: H4W9 <hoferwade@gmail.com>
Date: Wed, 20 Aug 2025 22:51:43 -0500
Subject: [PATCH 13/21] Update WiFiScan.cpp

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

diff --git a/esp32_marauder/WiFiScan.cpp b/esp32_marauder/WiFiScan.cpp
index 268d0f9..648926b 100644
--- a/esp32_marauder/WiFiScan.cpp
+++ b/esp32_marauder/WiFiScan.cpp
@@ -8646,8 +8646,7 @@ void WiFiScan::main(uint32_t currentTime)
       packets_sent = 0;
     }
   }
-  else if ((currentScanMode == WIFI_ATTACK_RICK_ROLL))
-  {
+  else if ((currentScanMode == WIFI_ATTACK_RICK_ROLL)) {
     // Need this for loop because getTouch causes ~10ms delay
     // which makes beacon spam less effective
     for (int i = 0; i < 7; i++)
@@ -8677,8 +8676,7 @@ void WiFiScan::main(uint32_t currentTime)
       packets_sent = 0;
     }
   }
-  else if ((currentScanMode == WIFI_ATTACK_FUNNY_BEACON))
-  {
+  else if ((currentScanMode == WIFI_ATTACK_FUNNY_BEACON)) {
     // Need this for loop because getTouch causes ~10ms delay
     // which makes beacon spam less effective
     for (int i = 0; i < 7; i++)

From fbf2e9ab18830f25854664f0ff8cad0fa92e00c0 Mon Sep 17 00:00:00 2001
From: H4W9 <hoferwade@gmail.com>
Date: Wed, 20 Aug 2025 23:52:36 -0500
Subject: [PATCH 14/21] Update CommandLine.cpp

Add Funny SSID Spam to CLI
---
 esp32_marauder/CommandLine.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/esp32_marauder/CommandLine.cpp b/esp32_marauder/CommandLine.cpp
index 2ba2698..d2395e7 100644
--- a/esp32_marauder/CommandLine.cpp
+++ b/esp32_marauder/CommandLine.cpp
@@ -976,6 +976,14 @@ void CommandLine::runCommand(String input) {
           #endif
           wifi_scan_obj.StartScan(WIFI_ATTACK_RICK_ROLL, TFT_YELLOW);
         }
+        else if (attack_type == ATTACK_TYPE_FUNNY) {
+          Serial.println("Starting Funny SSID Beacon spam. Stop with " + (String)STOPSCAN_CMD);
+          #ifdef HAS_SCREEN
+            display_obj.clearScreen();
+            menu_function_obj.drawStatusBar();
+          #endif
+          wifi_scan_obj.StartScan(WIFI_ATTACK_FUNNY_BEACON, TFT_CYAN);
+        }
         else {
           Serial.println("Attack type not properly defined");
           return;

From bbf245859a69e91ad4ce6a638fbc686101db0ca1 Mon Sep 17 00:00:00 2001
From: H4W9 <hoferwade@gmail.com>
Date: Wed, 20 Aug 2025 23:54:50 -0500
Subject: [PATCH 15/21] Update CommandLine.h

Add Funny SSID Spam
---
 esp32_marauder/CommandLine.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/esp32_marauder/CommandLine.h b/esp32_marauder/CommandLine.h
index 529ef37..73c978f 100644
--- a/esp32_marauder/CommandLine.h
+++ b/esp32_marauder/CommandLine.h
@@ -82,6 +82,7 @@ const char PROGMEM ATTACK_CMD[] = "attack";
 const char PROGMEM ATTACK_TYPE_DEAUTH[] = "deauth";
 const char PROGMEM ATTACK_TYPE_BEACON[] = "beacon";
 const char PROGMEM ATTACK_TYPE_PROBE[] = "probe";
+const char PROGMEM ATTACK_TYPE_FUNNY[] = "funny";
 const char PROGMEM ATTACK_TYPE_RR[] = "rickroll";
 const char PROGMEM ATTACK_TYPE_BM[] = "badmsg";
 const char PROGMEM ATTACK_TYPE_S[] = "sleep";

From ac3e4ab4270ef0aa85336b188bc1c94f527c91f2 Mon Sep 17 00:00:00 2001
From: H4W9 <hoferwade@gmail.com>
Date: Thu, 21 Aug 2025 11:26:09 -0500
Subject: [PATCH 16/21] Update MenuFunctions.cpp

---
 esp32_marauder/MenuFunctions.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/esp32_marauder/MenuFunctions.cpp b/esp32_marauder/MenuFunctions.cpp
index cf497af..8e80d53 100644
--- a/esp32_marauder/MenuFunctions.cpp
+++ b/esp32_marauder/MenuFunctions.cpp
@@ -2262,7 +2262,7 @@ void MenuFunctions::RunSetup()
     this->drawStatusBar();
     wifi_scan_obj.StartScan(WIFI_ATTACK_BEACON_SPAM, TFT_ORANGE);
   });
-  this->addNodes(&wifiAttackMenu, text1_68, TFTCYAN, NULL, FUNNY_BEACON, [this]() {
+  this->addNodes(&wifiAttackMenu, text1_67, TFTCYAN, NULL, FUNNY_BEACON, [this]() {
     display_obj.clearScreen();
     this->drawStatusBar();
     wifi_scan_obj.StartScan(WIFI_ATTACK_FUNNY_BEACON, TFT_CYAN);
@@ -4157,3 +4157,4 @@ void MenuFunctions::displayCurrentMenu(int start_index)
 #endif
 
 
+

From b1c256036f15c4bb9084de762b75216fb7761984 Mon Sep 17 00:00:00 2001
From: H4W9 <hoferwade@gmail.com>
Date: Thu, 21 Aug 2025 11:26:44 -0500
Subject: [PATCH 17/21] Update WiFiScan.cpp

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

diff --git a/esp32_marauder/WiFiScan.cpp b/esp32_marauder/WiFiScan.cpp
index 648926b..08757d0 100644
--- a/esp32_marauder/WiFiScan.cpp
+++ b/esp32_marauder/WiFiScan.cpp
@@ -937,7 +937,7 @@ void WiFiScan::StartScan(uint8_t scan_mode, uint16_t color)
   else if (scan_mode == WIFI_ATTACK_RICK_ROLL)
     this->startWiFiAttacks(scan_mode, color, text_table1[52]);
   else if (scan_mode == WIFI_ATTACK_FUNNY_BEACON)
-    this->startWiFiAttacks(scan_mode, color, text1_68);
+    this->startWiFiAttacks(scan_mode, color, text1_67);
   else if (scan_mode == WIFI_ATTACK_AUTH)
     this->startWiFiAttacks(scan_mode, color, text_table1[53]);
   else if (scan_mode == WIFI_ATTACK_DEAUTH)

From 2d195ea697bd9e4656d69f79a8d164b2bee79e79 Mon Sep 17 00:00:00 2001
From: H4W9 <hoferwade@gmail.com>
Date: Thu, 21 Aug 2025 11:28:05 -0500
Subject: [PATCH 18/21] Update lang_var.h

---
 esp32_marauder/lang_var.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esp32_marauder/lang_var.h b/esp32_marauder/lang_var.h
index 24a64f8..cdf8b37 100644
--- a/esp32_marauder/lang_var.h
+++ b/esp32_marauder/lang_var.h
@@ -106,7 +106,7 @@ PROGMEM const char text1_62[] = "Deauth Targeted";
 PROGMEM const char text1_63[] = "Detect Pineapple";
 PROGMEM const char text1_64[] = "Detect MultiSSID";
 PROGMEM const char text1_65[] = "Select probe SSIDs";
-PROGMEM const char text1_68[] = "Funny SSID Beacon";
+PROGMEM const char text1_67[] = "Funny SSID Beacon";
 
 //SDInterface.cpp texts
 PROGMEM const char text2_0[] = "Error, could not find update.bin";

From 614c7099f93ce33dc6fb43e6b66351aff268bf6e Mon Sep 17 00:00:00 2001
From: H4W9 <hoferwade@gmail.com>
Date: Tue, 26 Aug 2025 12:44:45 -0500
Subject: [PATCH 19/21] Update README.md

Fix my goof-up... I had accidentally removed the Marauder Logo
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index d0d6712..aa0cf1f 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,7 @@
 <!---Shields/Badges https://shields.io/--->
 
 # ESP32 Marauder
+<p align="center"><img alt="Marauder logo" src="https://github.com/justcallmekoko/ESP32Marauder/blob/master/pictures/marauder_skull_patch_04_full_final.png?raw=true" width="300"></p>
 <p align="center">
   <b>A suite of WiFi/Bluetooth offensive and defensive tools for the ESP32</b>
   <br><br>

From 16d0101ce6dbd4c784d7d1bbeaa7b0efc5110179 Mon Sep 17 00:00:00 2001
From: H4W9 <hoferwade@gmail.com>
Date: Tue, 16 Sep 2025 18:47:23 -0500
Subject: [PATCH 20/21] Update WiFiScan.h

---
 esp32_marauder/WiFiScan.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/esp32_marauder/WiFiScan.h b/esp32_marauder/WiFiScan.h
index d6af81a..ce7b0b6 100644
--- a/esp32_marauder/WiFiScan.h
+++ b/esp32_marauder/WiFiScan.h
@@ -130,7 +130,8 @@
 #define WIFI_ATTACK_SLEEP 61
 #define WIFI_ATTACK_SLEEP_TARGETED 62
 #define GPS_POI 63
-#define WIFI_ATTACK_FUNNY_BEACON 64 
+
+#define WIFI_ATTACK_FUNNY_BEACON 9999 
 
 #define BASE_MULTIPLIER 4
 

From 77f3fa7025e3f75b225a9ccc68a1d623a4aed0b9 Mon Sep 17 00:00:00 2001
From: H4W9 <hoferwade@gmail.com>
Date: Tue, 16 Sep 2025 19:14:23 -0500
Subject: [PATCH 21/21] Update WiFiScan.h

---
 esp32_marauder/WiFiScan.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esp32_marauder/WiFiScan.h b/esp32_marauder/WiFiScan.h
index ee3183f..74a1fc4 100644
--- a/esp32_marauder/WiFiScan.h
+++ b/esp32_marauder/WiFiScan.h
@@ -136,7 +136,7 @@
 #define WIFI_SCAN_SMTP 67
 #define WIFI_SCAN_RDP 68
 
-#define WIFI_ATTACK_FUNNY_BEACON 9999 
+#define WIFI_ATTACK_FUNNY_BEACON 99 
 
 #define BASE_MULTIPLIER 4