Merge pull request #1081 from justcallmekoko/develop

Remove verbose print statements
2026-01-26 03:05:00 -08:00 · 2026-01-25 17:46:33 -05:00 · 2026-01-25 17:16:15 -05:00 · 2026-01-25 01:18:47 -05:00 · 2026-01-25 00:38:21 -05:00 · 2026-01-24 23:02:40 -05:00
18 changed files with 2071 additions and 617 deletions
--- a/.github/workflows/build_parallel.yml
+++ b/.github/workflows/build_parallel.yml
@@ -19,24 +19,23 @@ jobs:
        board:
          - { name: "Flipper Zero WiFi Dev Board",   flag: "MARAUDER_FLIPPER",         fbqn: "esp32:esp32:esp32s2:PartitionScheme=min_spiffs,FlashSize=4M,PSRAM=enabled",                     file_name: "flipper",                 tft: false, tft_file: "",                                   build_dir: "esp32s2",                    addr: "0x1000",   idf_ver: "2.0.11",   nimble_ver: "1.3.8",    esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
          - { name: "Flipper Zero Multi Board S3",   flag: "MARAUDER_MULTIBOARD_S3",   fbqn: "esp32:esp32:esp32s3:PartitionScheme=min_spiffs,FlashSize=4M",                                   file_name: "multiboardS3",            tft: false, tft_file: "",                                   build_dir: "esp32s3",                    addr: "0x0",      idf_ver: "2.0.11",   nimble_ver: "1.3.8",    esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
-          - { name: "OG Marauder",                   flag: "MARAUDER_V4",              fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs",                                                    file_name: "old_hardware",            tft: true,  tft_file: "User_Setup_og_marauder.h",           build_dir: "d32",                        addr: "0x1000",   idf_ver: "2.0.11",   nimble_ver: "1.3.8",    esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
-          - { name: "Marauder v6",                   flag: "MARAUDER_V6",              fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs",                                                    file_name: "v6",                      tft: true,  tft_file: "User_Setup_og_marauder.h",           build_dir: "d32",                        addr: "0x1000",   idf_ver: "2.0.11",   nimble_ver: "1.3.8",    esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
-          - { name: "Marauder v6.1",                 flag: "MARAUDER_V6_1",            fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs",                                                    file_name: "v6_1",                    tft: true,  tft_file: "User_Setup_og_marauder.h",           build_dir: "d32",                        addr: "0x1000",   idf_ver: "2.0.11",   nimble_ver: "1.3.8",    esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
-          - { name: "Marauder Kit",                  flag: "MARAUDER_KIT",             fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs",                                                    file_name: "kit",                     tft: true,  tft_file: "User_Setup_og_marauder.h",           build_dir: "d32",                        addr: "0x1000",   idf_ver: "2.0.11",   nimble_ver: "1.3.8",    esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
-          - { name: "Marauder Mini",                 flag: "MARAUDER_MINI",            fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs",                                                    file_name: "mini",                    tft: true,  tft_file: "User_Setup_marauder_mini.h",         build_dir: "d32",                        addr: "0x1000",   idf_ver: "2.0.11",   nimble_ver: "1.3.8",    esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
-          - { name: "ESP32 LDDB",                    flag: "ESP32_LDDB",               fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs",                                                    file_name: "esp32_lddb",              tft: false, tft_file: "",                                   build_dir: "d32",                        addr: "0x1000",   idf_ver: "2.0.11",   nimble_ver: "1.3.8",    esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
-          - { name: "Marauder Dev Board Pro",        flag: "MARAUDER_DEV_BOARD_PRO",   fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs",                                                    file_name: "marauder_dev_board_pro",  tft: false, tft_file: "",                                   build_dir: "d32",                        addr: "0x1000",   idf_ver: "2.0.11",   nimble_ver: "1.3.8",    esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
+          - { name: "OG Marauder",                   flag: "MARAUDER_V4",              fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs",                                                    file_name: "old_hardware",            tft: true,  tft_file: "User_Setup_og_marauder.h",           build_dir: "d32",                        addr: "0x1000",   idf_ver: "3.3.4",    nimble_ver: "master",   esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
+          - { name: "Marauder v6",                   flag: "MARAUDER_V6",              fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs",                                                    file_name: "v6",                      tft: true,  tft_file: "User_Setup_og_marauder.h",           build_dir: "d32",                        addr: "0x1000",   idf_ver: "3.3.4",    nimble_ver: "master",   esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
+          - { name: "Marauder v6.1",                 flag: "MARAUDER_V6_1",            fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs",                                                    file_name: "v6_1",                    tft: true,  tft_file: "User_Setup_og_marauder.h",           build_dir: "d32",                        addr: "0x1000",   idf_ver: "3.3.4",    nimble_ver: "master",   esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
+          - { name: "Marauder Kit",                  flag: "MARAUDER_KIT",             fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs",                                                    file_name: "kit",                     tft: true,  tft_file: "User_Setup_og_marauder.h",           build_dir: "d32",                        addr: "0x1000",   idf_ver: "3.3.4",    nimble_ver: "master",   esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
+          - { name: "Marauder Mini",                 flag: "MARAUDER_MINI",            fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs",                                                    file_name: "mini",                    tft: true,  tft_file: "User_Setup_marauder_mini.h",         build_dir: "d32",                        addr: "0x1000",   idf_ver: "3.3.4",    nimble_ver: "master",   esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
+          - { name: "ESP32 LDDB",                    flag: "ESP32_LDDB",               fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs",                                                    file_name: "esp32_lddb",              tft: false, tft_file: "",                                   build_dir: "d32",                        addr: "0x1000",   idf_ver: "3.3.4",    nimble_ver: "master",   esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
+          - { name: "Marauder Dev Board Pro",        flag: "MARAUDER_DEV_BOARD_PRO",   fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs",                                                    file_name: "marauder_dev_board_pro",  tft: false, tft_file: "",                                   build_dir: "d32",                        addr: "0x1000",   idf_ver: "3.3.4",    nimble_ver: "master",   esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
          - { name: "M5StickCPlus",                  flag: "MARAUDER_M5STICKC",        fbqn: "esp32:esp32:m5stick-c:PartitionScheme=min_spiffs",                                              file_name: "m5stickc_plus",           tft: true,  tft_file: "User_Setup_marauder_m5stickc.h",     build_dir: "m5stick-c",                  addr: "0x1000",   idf_ver: "2.0.11",   nimble_ver: "1.3.8",    esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
          - { name: "M5StickCPlus 2",                flag: "MARAUDER_M5STICKCP2",      fbqn: "esp32:esp32:m5stick-c:PartitionScheme=min_spiffs",                                              file_name: "m5stickc_plus2",          tft: true,  tft_file: "User_Setup_marauder_m5stickcp2.h",   build_dir: "m5stick-c",                  addr: "0x1000",   idf_ver: "2.0.11",   nimble_ver: "1.3.8",    esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
          - { name: "Rev Feather",                   flag: "MARAUDER_REV_FEATHER",     fbqn: "esp32:esp32:esp32s2:PartitionScheme=min_spiffs,FlashSize=4M,PSRAM=enabled",                     file_name: "rev_feather",             tft: true,  tft_file: "User_Setup_marauder_rev_feather.h",  build_dir: "esp32s2",                    addr: "0x1000",   idf_ver: "2.0.11",   nimble_ver: "1.3.8",    esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
-          - { name: "Marauder v7",                   flag: "MARAUDER_V7",              fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs",                                                    file_name: "marauder_v7",             tft: true,  tft_file: "User_Setup_dual_nrf24.h",            build_dir: "d32",                        addr: "0x1000",   idf_ver: "2.0.11",   nimble_ver: "1.3.8",    esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
+          - { name: "Marauder v7",                   flag: "MARAUDER_V7",              fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs",                                                    file_name: "marauder_v7",             tft: true,  tft_file: "User_Setup_dual_nrf24.h",            build_dir: "d32",                        addr: "0x1000",   idf_ver: "3.3.4",    nimble_ver: "master",   esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
          - { name: "Marauder CYD 2432S028",         flag: "MARAUDER_CYD_MICRO",       fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs",                                                    file_name: "cyd_2432S028",            tft: true,  tft_file: "User_Setup_cyd_micro.h",             build_dir: "d32",                        addr: "0x1000",   idf_ver: "2.0.11",   nimble_ver: "1.3.8",    esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
          - { name: "Marauder CYD 2432S024 GUITION", flag: "MARAUDER_CYD_GUITION",     fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs",                                                    file_name: "cyd_2432S024_guition",    tft: true,  tft_file: "User_Setup_cyd_guition.h",           build_dir: "d32",                        addr: "0x1000",   idf_ver: "2.0.11",   nimble_ver: "1.3.8",    esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
          - { name: "Marauder CYD 2432S028 2 USB",   flag: "MARAUDER_CYD_2USB",        fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs",                                                    file_name: "cyd_2432S028_2usb",       tft: true,  tft_file: "User_Setup_cyd_2usb.h",              build_dir: "d32",                        addr: "0x1000",   idf_ver: "2.0.11",   nimble_ver: "1.3.8",    esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
          - { name: "Marauder CYD 3.5inch",          flag: "MARAUDER_CYD_3_5_INCH",    fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs",                                                    file_name: "cyd_3_5_inch",            tft: true,  tft_file: "User_Setup_cyd_3_5_inch.h",          build_dir: "d32",                        addr: "0x1000",   idf_ver: "2.0.11",   nimble_ver: "1.3.8",    esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
-          - { name: "Marauder v7.1",                 flag: "MARAUDER_V7_1",            fbqn: "esp32:esp32:dfrobot_firebeetle2_esp32e:FlashSize=16M,PartitionScheme=min_spiffs,PSRAM=enabled", file_name: "marauder_v7_1",           tft: true,  tft_file: "User_Setup_dual_nrf24.h",            build_dir: "dfrobot_firebeetle2_esp32e", addr: "0x1000",   idf_ver: "2.0.11",   nimble_ver: "1.3.8",    esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
          - { name: "M5Cardputer",                   flag: "MARAUDER_CARDPUTER",       fbqn: "esp32:esp32:esp32s3:PartitionScheme=min_spiffs,FlashSize=8M,PSRAM=disabled",                    file_name: "m5cardputer",             tft: true,  tft_file: "User_Setup_marauder_m5cardputer.h",  build_dir: "esp32s3",                    addr: "0x1000",   idf_ver: "2.0.11",   nimble_ver: "1.3.8",    esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
-          - { name: "ESP32-C5-DevKitC-1",            flag: "MARAUDER_C5",              fbqn: "esp32:esp32:esp32c5:FlashSize=8M,PartitionScheme=min_spiffs,PSRAM=enabled",                     file_name: "esp32c5devkitc1",         tft: false, tft_file: "",                                   build_dir: "esp32c5",                    addr: "0x2000",   idf_ver: "3.3.4",    nimble_ver: "2.3.6",    esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
+          - { name: "ESP32-C5-DevKitC-1",            flag: "MARAUDER_C5",              fbqn: "esp32:esp32:esp32c5:FlashSize=8M,PartitionScheme=min_spiffs,PSRAM=enabled",                     file_name: "esp32c5devkitc1",         tft: false, tft_file: "",                                   build_dir: "esp32c5",                    addr: "0x2000",   idf_ver: "3.3.4",    nimble_ver: "master",   esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
          
    steps:
      - name: Checkout Code
--- a/.github/workflows/nightly_build.yml
+++ b/.github/workflows/nightly_build.yml
@@ -68,24 +68,23 @@ jobs:
        board:
          - { name: "Flipper Zero WiFi Dev Board",   flag: "MARAUDER_FLIPPER",         fbqn: "esp32:esp32:esp32s2:PartitionScheme=min_spiffs,FlashSize=4M,PSRAM=enabled",                     file_name: "flipper",                 tft: false, tft_file: "",                                   build_dir: "esp32s2",                    addr: "0x1000",   idf_ver: "2.0.11",   nimble_ver: "1.3.8",    esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
          - { name: "Flipper Zero Multi Board S3",   flag: "MARAUDER_MULTIBOARD_S3",   fbqn: "esp32:esp32:esp32s3:PartitionScheme=min_spiffs,FlashSize=4M",                                   file_name: "multiboardS3",            tft: false, tft_file: "",                                   build_dir: "esp32s3",                    addr: "0x0",      idf_ver: "2.0.11",   nimble_ver: "1.3.8",    esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
-          - { name: "OG Marauder",                   flag: "MARAUDER_V4",              fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs",                                                    file_name: "old_hardware",            tft: true,  tft_file: "User_Setup_og_marauder.h",           build_dir: "d32",                        addr: "0x1000",   idf_ver: "2.0.11",   nimble_ver: "1.3.8",    esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
-          - { name: "Marauder v6",                   flag: "MARAUDER_V6",              fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs",                                                    file_name: "v6",                      tft: true,  tft_file: "User_Setup_og_marauder.h",           build_dir: "d32",                        addr: "0x1000",   idf_ver: "2.0.11",   nimble_ver: "1.3.8",    esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
-          - { name: "Marauder v6.1",                 flag: "MARAUDER_V6_1",            fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs",                                                    file_name: "v6_1",                    tft: true,  tft_file: "User_Setup_og_marauder.h",           build_dir: "d32",                        addr: "0x1000",   idf_ver: "2.0.11",   nimble_ver: "1.3.8",    esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
-          - { name: "Marauder Kit",                  flag: "MARAUDER_KIT",             fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs",                                                    file_name: "kit",                     tft: true,  tft_file: "User_Setup_og_marauder.h",           build_dir: "d32",                        addr: "0x1000",   idf_ver: "2.0.11",   nimble_ver: "1.3.8",    esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
-          - { name: "Marauder Mini",                 flag: "MARAUDER_MINI",            fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs",                                                    file_name: "mini",                    tft: true,  tft_file: "User_Setup_marauder_mini.h",         build_dir: "d32",                        addr: "0x1000",   idf_ver: "2.0.11",   nimble_ver: "1.3.8",    esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
-          - { name: "ESP32 LDDB",                    flag: "ESP32_LDDB",               fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs",                                                    file_name: "esp32_lddb",              tft: false, tft_file: "",                                   build_dir: "d32",                        addr: "0x1000",   idf_ver: "2.0.11",   nimble_ver: "1.3.8",    esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
-          - { name: "Marauder Dev Board Pro",        flag: "MARAUDER_DEV_BOARD_PRO",   fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs",                                                    file_name: "marauder_dev_board_pro",  tft: false, tft_file: "",                                   build_dir: "d32",                        addr: "0x1000",   idf_ver: "2.0.11",   nimble_ver: "1.3.8",    esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
+          - { name: "OG Marauder",                   flag: "MARAUDER_V4",              fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs",                                                    file_name: "old_hardware",            tft: true,  tft_file: "User_Setup_og_marauder.h",           build_dir: "d32",                        addr: "0x1000",   idf_ver: "3.3.4",    nimble_ver: "master",   esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
+          - { name: "Marauder v6",                   flag: "MARAUDER_V6",              fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs",                                                    file_name: "v6",                      tft: true,  tft_file: "User_Setup_og_marauder.h",           build_dir: "d32",                        addr: "0x1000",   idf_ver: "3.3.4",    nimble_ver: "master",   esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
+          - { name: "Marauder v6.1",                 flag: "MARAUDER_V6_1",            fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs",                                                    file_name: "v6_1",                    tft: true,  tft_file: "User_Setup_og_marauder.h",           build_dir: "d32",                        addr: "0x1000",   idf_ver: "3.3.4",    nimble_ver: "master",   esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
+          - { name: "Marauder Kit",                  flag: "MARAUDER_KIT",             fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs",                                                    file_name: "kit",                     tft: true,  tft_file: "User_Setup_og_marauder.h",           build_dir: "d32",                        addr: "0x1000",   idf_ver: "3.3.4",    nimble_ver: "master",   esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
+          - { name: "Marauder Mini",                 flag: "MARAUDER_MINI",            fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs",                                                    file_name: "mini",                    tft: true,  tft_file: "User_Setup_marauder_mini.h",         build_dir: "d32",                        addr: "0x1000",   idf_ver: "3.3.4",    nimble_ver: "master",   esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
+          - { name: "ESP32 LDDB",                    flag: "ESP32_LDDB",               fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs",                                                    file_name: "esp32_lddb",              tft: false, tft_file: "",                                   build_dir: "d32",                        addr: "0x1000",   idf_ver: "3.3.4",    nimble_ver: "master",   esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
+          - { name: "Marauder Dev Board Pro",        flag: "MARAUDER_DEV_BOARD_PRO",   fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs",                                                    file_name: "marauder_dev_board_pro",  tft: false, tft_file: "",                                   build_dir: "d32",                        addr: "0x1000",   idf_ver: "3.3.4",    nimble_ver: "master",   esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
          - { name: "M5StickCPlus",                  flag: "MARAUDER_M5STICKC",        fbqn: "esp32:esp32:m5stick-c:PartitionScheme=min_spiffs",                                              file_name: "m5stickc_plus",           tft: true,  tft_file: "User_Setup_marauder_m5stickc.h",     build_dir: "m5stick-c",                  addr: "0x1000",   idf_ver: "2.0.11",   nimble_ver: "1.3.8",    esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
          - { name: "M5StickCPlus 2",                flag: "MARAUDER_M5STICKCP2",      fbqn: "esp32:esp32:m5stick-c:PartitionScheme=min_spiffs",                                              file_name: "m5stickc_plus2",          tft: true,  tft_file: "User_Setup_marauder_m5stickcp2.h",   build_dir: "m5stick-c",                  addr: "0x1000",   idf_ver: "2.0.11",   nimble_ver: "1.3.8",    esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
          - { name: "Rev Feather",                   flag: "MARAUDER_REV_FEATHER",     fbqn: "esp32:esp32:esp32s2:PartitionScheme=min_spiffs,FlashSize=4M,PSRAM=enabled",                     file_name: "rev_feather",             tft: true,  tft_file: "User_Setup_marauder_rev_feather.h",  build_dir: "esp32s2",                    addr: "0x1000",   idf_ver: "2.0.11",   nimble_ver: "1.3.8",    esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
-          - { name: "Marauder v7",                   flag: "MARAUDER_V7",              fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs",                                                    file_name: "marauder_v7",             tft: true,  tft_file: "User_Setup_dual_nrf24.h",            build_dir: "d32",                        addr: "0x1000",   idf_ver: "2.0.11",   nimble_ver: "1.3.8",    esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
+          - { name: "Marauder v7",                   flag: "MARAUDER_V7",              fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs",                                                    file_name: "marauder_v7",             tft: true,  tft_file: "User_Setup_dual_nrf24.h",            build_dir: "d32",                        addr: "0x1000",   idf_ver: "3.3.4",    nimble_ver: "master",   esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
          - { name: "Marauder CYD 2432S028",         flag: "MARAUDER_CYD_MICRO",       fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs",                                                    file_name: "cyd_2432S028",            tft: true,  tft_file: "User_Setup_cyd_micro.h",             build_dir: "d32",                        addr: "0x1000",   idf_ver: "2.0.11",   nimble_ver: "1.3.8",    esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
          - { name: "Marauder CYD 2432S024 GUITION", flag: "MARAUDER_CYD_GUITION",     fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs",                                                    file_name: "cyd_2432S024_guition",    tft: true,  tft_file: "User_Setup_cyd_guition.h",           build_dir: "d32",                        addr: "0x1000",   idf_ver: "2.0.11",   nimble_ver: "1.3.8",    esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
          - { name: "Marauder CYD 2432S028 2 USB",   flag: "MARAUDER_CYD_2USB",        fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs",                                                    file_name: "cyd_2432S028_2usb",       tft: true,  tft_file: "User_Setup_cyd_2usb.h",              build_dir: "d32",                        addr: "0x1000",   idf_ver: "2.0.11",   nimble_ver: "1.3.8",    esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
          - { name: "Marauder CYD 3.5inch",          flag: "MARAUDER_CYD_3_5_INCH",    fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs",                                                    file_name: "cyd_3_5_inch",            tft: true,  tft_file: "User_Setup_cyd_3_5_inch.h",          build_dir: "d32",                        addr: "0x1000",   idf_ver: "2.0.11",   nimble_ver: "1.3.8",    esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
-          - { name: "Marauder v7.1",                 flag: "MARAUDER_V7_1",            fbqn: "esp32:esp32:dfrobot_firebeetle2_esp32e:FlashSize=16M,PartitionScheme=min_spiffs,PSRAM=enabled", file_name: "marauder_v7_1",           tft: true,  tft_file: "User_Setup_dual_nrf24.h",            build_dir: "dfrobot_firebeetle2_esp32e", addr: "0x1000",   idf_ver: "2.0.11",   nimble_ver: "1.3.8",    esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
          - { name: "M5Cardputer",                   flag: "MARAUDER_CARDPUTER",       fbqn: "esp32:esp32:esp32s3:PartitionScheme=min_spiffs,FlashSize=8M,PSRAM=disabled",                    file_name: "m5cardputer",             tft: true,  tft_file: "User_Setup_marauder_m5cardputer.h",  build_dir: "esp32s3",                    addr: "0x1000",   idf_ver: "2.0.11",   nimble_ver: "1.3.8",    esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
-          - { name: "ESP32-C5-DevKitC-1",            flag: "MARAUDER_C5",              fbqn: "esp32:esp32:esp32c5:FlashSize=8M,PartitionScheme=min_spiffs,PSRAM=enabled",                     file_name: "esp32c5devkitc1",         tft: false, tft_file: "",                                   build_dir: "esp32c5",                    addr: "0x2000",   idf_ver: "3.3.4",    nimble_ver: "2.3.6",    esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
+          - { name: "ESP32-C5-DevKitC-1",            flag: "MARAUDER_C5",              fbqn: "esp32:esp32:esp32c5:FlashSize=8M,PartitionScheme=min_spiffs,PSRAM=enabled",                     file_name: "esp32c5devkitc1",         tft: false, tft_file: "",                                   build_dir: "esp32c5",                    addr: "0x2000",   idf_ver: "3.3.4",    nimble_ver: "master",   esp_async: "bigbrodude6119/ESPAsyncWebServer",    esp_async_ver: "master" }
          
    steps:
      - name: Checkout Code
--- a/User_Setup_marauder_mini.h
+++ b/User_Setup_marauder_mini.h
@@ -169,9 +169,9 @@
 #define TFT_DC   16  // Data Command control pin
 #define TFT_RST  5  // Reset pin (could connect to NodeMCU RST, see next line)
 #define TOUCH_CS -1
-//#define TFT_MISO 19
-//#define TFT_MOSI 23
-//#define TFT_SCLK 18
+#define TFT_MISO 19
+#define TFT_MOSI 23
+#define TFT_SCLK 18
 //#define TFT_BL   32

 /*
--- a/esp32_marauder/Buffer.cpp
+++ b/esp32_marauder/Buffer.cpp
@@ -52,6 +52,10 @@ void Buffer::open(bool is_pcap){
  }
 }

+String Buffer::getFileName() {
+  return this->fileName;
+}
+
 void Buffer::openFile(String file_name, fs::FS* fs, bool serial, bool is_pcap, bool is_gpx) {
  bool save_pcap = settings_obj.loadSetting<bool>("SavePCAP");
  if (!save_pcap) {
--- a/esp32_marauder/Buffer.h
+++ b/esp32_marauder/Buffer.h
@@ -25,6 +25,7 @@ class Buffer {
    void append(wifi_promiscuous_pkt_t *packet, int len);
    void append(String log);
    void save();
+    String getFileName();
  private:
    void createFile(String name, bool is_pcap, bool is_gpx = false);
    void open(bool is_pcap);
--- a/esp32_marauder/CommandLine.cpp
+++ b/esp32_marauder/CommandLine.cpp
@@ -240,10 +240,12 @@ void CommandLine::runCommand(String input) {
    Serial.println(HELP_SNIFF_ESP_CMD);
    Serial.println(HELP_SNIFF_DEAUTH_CMD);
    Serial.println(HELP_SNIFF_PMKID_CMD);
+    Serial.println(HELP_SNIFF_SAE_CMD);
    Serial.println(HELP_STOPSCAN_CMD);
    #ifdef HAS_GPS
      Serial.println(HELP_WARDRIVE_CMD);
    #endif
+    Serial.println(HELP_MAC_TRACK_CMD);
    
    // WiFi attack
    Serial.println(HELP_ATTACK_CMD);
@@ -323,7 +325,8 @@ void CommandLine::runCommand(String input) {
  else if (cmd_args.get(0) == GPS_DATA_CMD) {
    #ifdef HAS_GPS
      if (gps_obj.getGpsModuleStatus()) {
-        Serial.println("Getting GPS Data. Stop with " + (String)STOPSCAN_CMD);
+        Serial.print(F("Getting GPS Data. Stop with "));
+        Serial.println((String)STOPSCAN_CMD);
        wifi_scan_obj.currentScanMode = WIFI_SCAN_GPS_DATA;
        #ifdef HAS_SCREEN
          menu_function_obj.changeMenu(&menu_function_obj.gpsInfoMenu);
@@ -388,7 +391,8 @@ void CommandLine::runCommand(String input) {
                nmea_type="beidou_bd";
            }
            gps_obj.setType(nmea_type);
-            Serial.println("GPS Output Type Set To: " + nmea_type);
+            Serial.print(F("GPS Output Type Set To: "));
+            Serial.println(nmea_type);
          }
          else
            Serial.println(F("You did not provide a valid argument"));
@@ -466,12 +470,14 @@ void CommandLine::runCommand(String input) {
    int ch_set = this->argSearch(&cmd_args, "-s");
    
    if (cmd_args.size() == 1) {
-      Serial.println("Current channel: " + (String)wifi_scan_obj.set_channel);
+      Serial.print(F("Current channel: "));
+      Serial.println(wifi_scan_obj.set_channel);
    }
    else if (ch_set != -1) {
      wifi_scan_obj.set_channel = cmd_args.get(ch_set + 1).toInt();
      wifi_scan_obj.changeChannel();
-      Serial.println("Set channel: " + (String)wifi_scan_obj.set_channel);
+      Serial.print(F("Set channel: "));
+      Serial.println(wifi_scan_obj.set_channel);
    }
  }
  // Clear APs
@@ -529,7 +535,8 @@ void CommandLine::runCommand(String input) {
      }

      if (!result) {
-        Serial.println("Could not successfully update setting \"" + setting_name + "\"");
+        Serial.print(F("Could not successfully update setting \""));
+        Serial.println(setting_name + "\"");
        return;
      }
    }
@@ -547,7 +554,8 @@ void CommandLine::runCommand(String input) {

    // Signal strength scan
    if (cmd_args.get(0) == SIGSTREN_CMD) {
-      Serial.println("Starting Signal Strength Scan. Stop with " + (String)STOPSCAN_CMD);
+      Serial.print(F("Starting Signal Strength Scan. Stop with "));
+      Serial.println(STOPSCAN_CMD);
      #ifdef HAS_SCREEN
        display_obj.clearScreen();
        menu_function_obj.drawStatusBar();
@@ -557,7 +565,8 @@ void CommandLine::runCommand(String input) {
    }
    // Packet count
    else if (cmd_args.get(0) == PACKET_COUNT_CMD) {
-      Serial.println("Starting Packet Count Scan. Stop with " + (String)STOPSCAN_CMD);
+      Serial.print(F("Starting Packet Count Scan. Stop with "));
+      Serial.println(STOPSCAN_CMD);
      #ifdef HAS_SCREEN
        display_obj.clearScreen();
        menu_function_obj.drawStatusBar();
@@ -571,8 +580,9 @@ void CommandLine::runCommand(String input) {
          int sta_sw = this->argSearch(&cmd_args, "-s");
          int flk_sw = this->argSearch(&cmd_args, "-f");

-          if (flk_sw == -1) {
-            Serial.println("Starting Flock Wardrive. Stop with " + (String)STOPSCAN_CMD);
+          if (flk_sw != -1) {
+            Serial.print(F("Starting Flock Wardrive. Stop with "));
+            Serial.println(STOPSCAN_CMD);
            #ifdef HAS_SCREEN
              display_obj.clearScreen();
              menu_function_obj.drawStatusBar();
@@ -580,7 +590,8 @@ void CommandLine::runCommand(String input) {
            wifi_scan_obj.StartScan(BT_SCAN_FLOCK_WARDRIVE, TFT_GREEN);
          }
          else if (sta_sw != -1) {
-            Serial.println("Starting Station Wardrive. Stop with " + (String)STOPSCAN_CMD);
+            Serial.print(F("Starting Station Wardrive. Stop with "));
+            Serial.println(STOPSCAN_CMD);
            #ifdef HAS_SCREEN
              display_obj.clearScreen();
              menu_function_obj.drawStatusBar();
@@ -588,7 +599,8 @@ void CommandLine::runCommand(String input) {
            wifi_scan_obj.StartScan(WIFI_SCAN_STATION_WAR_DRIVE, TFT_GREEN);
          }
          else {
-            Serial.println("Starting Wardrive. Stop with " + (String)STOPSCAN_CMD);
+            Serial.print(F("Starting Wardrive. Stop with "));
+            Serial.println(STOPSCAN_CMD);
            #ifdef HAS_SCREEN
              display_obj.clearScreen();
              menu_function_obj.drawStatusBar();
@@ -619,7 +631,10 @@ void CommandLine::runCommand(String input) {
      }

      if (evil_portal_obj.setAP(probe_req_ssids->get(pr_index).essid)) {
-        Serial.println("Starting Karma Attack with " + probe_req_ssids->get(pr_index).essid + ". Stop with " + (String)STOPSCAN_CMD);
+        Serial.print(F("Starting Karma Attack with "));
+        Serial.print(probe_req_ssids->get(pr_index).essid);
+        Serial.print(F(". Stop with "));
+        Serial.println(STOPSCAN_CMD);
        #ifdef HAS_SCREEN
          display_obj.clearScreen();
          menu_function_obj.drawStatusBar();
@@ -641,7 +656,8 @@ void CommandLine::runCommand(String input) {
      if (cmd_sw != -1) {
        String et_command = cmd_args.get(cmd_sw + 1);
        if (et_command == "start") {
-          Serial.println("Starting Evil Portal. Stop with " + (String)STOPSCAN_CMD);
+          Serial.print(F("Starting Evil Portal. Stop with "));
+          Serial.println(STOPSCAN_CMD);
          #ifdef HAS_SCREEN
            display_obj.clearScreen();
            menu_function_obj.drawStatusBar();
@@ -650,7 +666,8 @@ void CommandLine::runCommand(String input) {
            String target_html_name = cmd_args.get(html_sw + 1);
            evil_portal_obj.target_html_name = target_html_name;
            evil_portal_obj.using_serial_html = false;
-            Serial.println("Set html file as " + evil_portal_obj.target_html_name);
+            Serial.print(F("Set html file as "));
+            Serial.println(evil_portal_obj.target_html_name);
          }
          //else {
          //  evil_portal_obj.target_html_name = "index.html";
@@ -667,7 +684,8 @@ void CommandLine::runCommand(String input) {
          String target_html_name = cmd_args.get(cmd_sw + 2);
          evil_portal_obj.target_html_name = target_html_name;
          evil_portal_obj.using_serial_html = false;
-          Serial.println("Set html file as " + evil_portal_obj.target_html_name);
+          Serial.print(F("Set html file as "));
+          Serial.println(evil_portal_obj.target_html_name);
        }
        else if (et_command == "sethtmlstr") {
          evil_portal_obj.setHtmlFromSerial();
@@ -686,7 +704,8 @@ void CommandLine::runCommand(String input) {
      }
    }
    else if (cmd_args.get(0) == SCAN_ALL_CMD) {
-      Serial.println("Scanning for APs and Stations. Stop with " + (String)STOPSCAN_CMD);
+      Serial.print(F("Scanning for APs and Stations. Stop with "));
+      Serial.println(STOPSCAN_CMD);
      wifi_scan_obj.StartScan(WIFI_SCAN_AP_STA, TFT_MAGENTA);
    }
    else if (cmd_args.get(0) == SCANAP_CMD) {
@@ -697,17 +716,20 @@ void CommandLine::runCommand(String input) {
      #endif

      if (full_sw == -1) {
-        Serial.println("Starting AP scan. Stop with " + (String)STOPSCAN_CMD);
+        Serial.print(F("Starting AP scan. Stop with "));
+        Serial.println(STOPSCAN_CMD);
        wifi_scan_obj.StartScan(WIFI_SCAN_TARGET_AP, TFT_MAGENTA);
      }
      else {
-        Serial.println("Starting Full AP scan. Stop with " + (String)STOPSCAN_CMD);
+        Serial.print(F("Starting Full AP scan. Stop with "));
+        Serial.println(STOPSCAN_CMD);
        wifi_scan_obj.StartScan(WIFI_SCAN_TARGET_AP_FULL, TFT_MAGENTA);
      }
    }
    // Raw sniff
    else if (cmd_args.get(0) == SNIFF_RAW_CMD) {
-      Serial.println("Starting Raw sniff. Stop with " + (String)STOPSCAN_CMD);
+      Serial.print(F("Starting Raw sniff. Stop with "));
+      Serial.println(STOPSCAN_CMD);
      #ifdef HAS_SCREEN
        display_obj.clearScreen();
        menu_function_obj.drawStatusBar();
@@ -717,9 +739,11 @@ void CommandLine::runCommand(String input) {
    // Scan stations
    else if (cmd_args.get(0) == SCANSTA_CMD) {    
      if(access_points->size() < 1)
-        Serial.println("The AP list is empty. Scan APs first with " + (String)SCANAP_CMD);  
+        Serial.print(F("The AP list is empty. Scan APs first with "));
+        Serial.println(SCANAP_CMD);  

-      Serial.println("Starting Station scan. Stop with " + (String)STOPSCAN_CMD);  
+      Serial.print(F("Starting Station scan. Stop with "));
+      Serial.println(STOPSCAN_CMD);  
      #ifdef HAS_SCREEN
        display_obj.clearScreen();
        menu_function_obj.drawStatusBar();
@@ -728,16 +752,28 @@ void CommandLine::runCommand(String input) {
    }
    // Beacon sniff
    else if (cmd_args.get(0) == SNIFF_BEACON_CMD) {
-      Serial.println("Starting Beacon sniff. Stop with " + (String)STOPSCAN_CMD);
+      Serial.print(F("Starting Beacon sniff. Stop with "));
+      Serial.println(STOPSCAN_CMD);
      #ifdef HAS_SCREEN
        display_obj.clearScreen();
        menu_function_obj.drawStatusBar();
      #endif
      wifi_scan_obj.StartScan(WIFI_SCAN_AP, TFT_MAGENTA);
    }
+    // SAE sniff
+    else if (cmd_args.get(0) == SNIFF_SAE_CMD) {
+      Serial.print(F("Starting SAE Commit sniff. Stop with "));
+      Serial.println(STOPSCAN_CMD);
+      #ifdef HAS_SCREEN
+        display_obj.clearScreen();
+        menu_function_obj.drawStatusBar();
+      #endif
+      wifi_scan_obj.StartScan(WIFI_SCAN_SAE_COMMIT, TFT_MAGENTA);
+    }
    // Probe sniff
    else if (cmd_args.get(0) == SNIFF_PROBE_CMD) {
-      Serial.println("Starting Probe sniff. Stop with " + (String)STOPSCAN_CMD);
+      Serial.print(F("Starting Probe sniff. Stop with "));
+      Serial.println(STOPSCAN_CMD);
      #ifdef HAS_SCREEN
        display_obj.clearScreen();
        menu_function_obj.drawStatusBar();
@@ -746,7 +782,8 @@ void CommandLine::runCommand(String input) {
    }
    // Deauth sniff
    else if (cmd_args.get(0) == SNIFF_DEAUTH_CMD) {
-      Serial.println("Starting Deauth sniff. Stop with " + (String)STOPSCAN_CMD);
+      Serial.print(F("Starting Deauth sniff. Stop with "));
+      Serial.println(STOPSCAN_CMD);
      #ifdef HAS_SCREEN
        display_obj.clearScreen();
        menu_function_obj.drawStatusBar();
@@ -755,7 +792,8 @@ void CommandLine::runCommand(String input) {
    }
    // Pwn sniff
    else if (cmd_args.get(0) == SNIFF_PWN_CMD) {
-      Serial.println("Starting Pwnagotchi sniff. Stop with " + (String)STOPSCAN_CMD);
+      Serial.print(F("Starting Pwnagotchi sniff. Stop with "));
+      Serial.println(STOPSCAN_CMD);
      #ifdef HAS_SCREEN
        display_obj.clearScreen();
        menu_function_obj.drawStatusBar();
@@ -764,7 +802,8 @@ void CommandLine::runCommand(String input) {
    }
    // PineScan sniff
    else if (cmd_args.get(0) == SNIFF_PINESCAN_CMD) {
-      Serial.println("Starting Pinescan sniff. Stop with " + (String)STOPSCAN_CMD);
+      Serial.print(F("Starting Pinescan sniff. Stop with "));
+      Serial.println(STOPSCAN_CMD);
      #ifdef HAS_SCREEN
        display_obj.clearScreen();
        menu_function_obj.drawStatusBar();
@@ -773,7 +812,8 @@ void CommandLine::runCommand(String input) {
    }
    // MultiSSID sniff
    else if (cmd_args.get(0) == SNIFF_MULTISSID_CMD) {
-      Serial.println("Starting MultiSSID sniff. Stop with " + (String)STOPSCAN_CMD);
+      Serial.print(F("Starting MultiSSID sniff. Stop with "));
+      Serial.println(STOPSCAN_CMD);
      #ifdef HAS_SCREEN
        display_obj.clearScreen();
        menu_function_obj.drawStatusBar();
@@ -782,7 +822,8 @@ void CommandLine::runCommand(String input) {
    }
    // Espressif sniff
    else if (cmd_args.get(0) == SNIFF_ESP_CMD) {
-      Serial.println("Starting Espressif device sniff. Stop with " + (String)STOPSCAN_CMD);
+      Serial.print(F("Starting Espressif device sniff. Stop with "));
+      Serial.println(STOPSCAN_CMD);
      #ifdef HAS_SCREEN
        display_obj.clearScreen();
        menu_function_obj.drawStatusBar();
@@ -822,6 +863,16 @@ void CommandLine::runCommand(String input) {
        wifi_scan_obj.StartScan(WIFI_SCAN_ACTIVE_EAPOL, TFT_VIOLET);
      }
    }    
+    // MAC Tracking
+    else if (cmd_args.get(0) == MAC_TRACK_CMD) {
+      Serial.print(F("Starting MAC Tracker. Stop with "));
+      Serial.println(STOPSCAN_CMD);
+      #ifdef HAS_SCREEN
+        display_obj.clearScreen();
+        menu_function_obj.drawStatusBar();
+      #endif
+      wifi_scan_obj.StartScan(WIFI_SCAN_DETECT_FOLLOW, TFT_MAGENTA);
+    }


  //// MAC Address commands    (Added by H4W9_4)
@@ -1068,13 +1119,23 @@ void CommandLine::runCommand(String input) {
          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);
+          Serial.print(F("Starting Funny SSID Beacon spam. Stop with "));
+          Serial.println(STOPSCAN_CMD);
          #ifdef HAS_SCREEN
            display_obj.clearScreen();
            menu_function_obj.drawStatusBar();
          #endif
          wifi_scan_obj.StartScan(WIFI_ATTACK_FUNNY_BEACON, TFT_CYAN);
        }
+        else if (attack_type == ATTACK_TYPE_SAE) {
+          Serial.print(F("Starting SAE Commit spam. Stop with "));
+          Serial.println(STOPSCAN_CMD);
+          #ifdef HAS_SCREEN
+            display_obj.clearScreen();
+            menu_function_obj.drawStatusBar();
+          #endif
+          wifi_scan_obj.StartScan(WIFI_ATTACK_SAE_COMMIT, TFT_CYAN);
+        }
        else {
          Serial.println(F("Attack type not properly defined"));
          return;
@@ -1096,7 +1157,8 @@ void CommandLine::runCommand(String input) {

          // Airtag sniff
          if (bt_type == "airtag") {
-            Serial.println("Starting Airtag sniff. Stop with " + (String)STOPSCAN_CMD);
+            Serial.print(F("Starting Airtag sniff. Stop with "));
+            Serial.println(STOPSCAN_CMD);
            #ifdef HAS_SCREEN
              display_obj.clearScreen();
              menu_function_obj.drawStatusBar();
@@ -1104,7 +1166,8 @@ void CommandLine::runCommand(String input) {
            wifi_scan_obj.StartScan(BT_SCAN_AIRTAG, TFT_WHITE);
          }
          else if (bt_type == "flipper") {
-            Serial.println("Starting Flipper sniff. Stop with " + (String)STOPSCAN_CMD);
+            Serial.print(F("Starting Flipper sniff. Stop with "));
+            Serial.println(STOPSCAN_CMD);
            #ifdef HAS_SCREEN
              display_obj.clearScreen();
              menu_function_obj.drawStatusBar();
@@ -1112,7 +1175,8 @@ void CommandLine::runCommand(String input) {
            wifi_scan_obj.StartScan(BT_SCAN_FLIPPER, TFT_ORANGE);
          }
          else if (bt_type == "flock") {
-            Serial.println("Starting Flock sniff. Stop with " + (String)STOPSCAN_CMD);
+            Serial.print(F("Starting Flock sniff. Stop with "));
+            Serial.println(STOPSCAN_CMD);
            #ifdef HAS_SCREEN
              display_obj.clearScreen();
              menu_function_obj.drawStatusBar();
@@ -1122,7 +1186,8 @@ void CommandLine::runCommand(String input) {
        }
        // General bluetooth sniff
        else {
-          Serial.println("Starting Bluetooth scan. Stop with " + (String)STOPSCAN_CMD);
+          Serial.print(F("Starting Bluetooth scan. Stop with "));
+          Serial.println(STOPSCAN_CMD);
          #ifdef HAS_SCREEN
            display_obj.clearScreen();
            menu_function_obj.drawStatusBar();
@@ -1147,7 +1212,8 @@ void CommandLine::runCommand(String input) {
                at.selected = false;
              airtags->set(i, at);
            }
-            Serial.println("Spoofing Airtag: " + airtags->get(target_mac).mac);
+            Serial.print(F("Spoofing Airtag: "));
+            Serial.println(airtags->get(target_mac).mac);
            #ifdef HAS_SCREEN
              display_obj.clearScreen();
              menu_function_obj.drawStatusBar();
@@ -1155,7 +1221,8 @@ void CommandLine::runCommand(String input) {
            wifi_scan_obj.StartScan(BT_SPOOF_AIRTAG, TFT_WHITE);
          }
          else {
-            Serial.println("Provided index is out of range: " + (String)target_mac);
+            Serial.print(F("Provided index is out of range: "));
+            Serial.println(target_mac);
            return;
          }
        #endif
@@ -1168,7 +1235,8 @@ void CommandLine::runCommand(String input) {

        if (bt_type == "apple") {
          #ifdef HAS_BT
-            Serial.println("Starting Sour Apple attack. Stop with " + (String)STOPSCAN_CMD);
+            Serial.print(F("Starting Sour Apple attack. Stop with "));
+            Serial.println(STOPSCAN_CMD);
            #ifdef HAS_SCREEN
              display_obj.clearScreen();
              menu_function_obj.drawStatusBar();
@@ -1180,7 +1248,8 @@ void CommandLine::runCommand(String input) {
        }
        else if (bt_type == "windows") {
          #ifdef HAS_BT
-            Serial.println("Starting Swiftpair Spam attack. Stop with " + (String)STOPSCAN_CMD);
+            Serial.print(F("Starting Swiftpair Spam attack. Stop with "));
+            Serial.println(STOPSCAN_CMD);
            #ifdef HAS_SCREEN
              display_obj.clearScreen();
              menu_function_obj.drawStatusBar();
@@ -1192,7 +1261,8 @@ void CommandLine::runCommand(String input) {
        }
        else if (bt_type == "samsung") {
          #ifdef HAS_BT
-            Serial.println("Starting Samsung Spam attack. Stop with " + (String)STOPSCAN_CMD);
+            Serial.print(F("Starting Samsung Spam attack. Stop with "));
+            Serial.println(STOPSCAN_CMD);
            #ifdef HAS_SCREEN
              display_obj.clearScreen();
              menu_function_obj.drawStatusBar();
@@ -1204,7 +1274,8 @@ void CommandLine::runCommand(String input) {
        }
        else if (bt_type == "google") {
          #ifdef HAS_BT
-            Serial.println("Starting Google Spam attack. Stop with " + (String)STOPSCAN_CMD);
+            Serial.print(F("Starting Google Spam attack. Stop with "));
+            Serial.println(STOPSCAN_CMD);
            #ifdef HAS_SCREEN
              display_obj.clearScreen();
              menu_function_obj.drawStatusBar();
@@ -1216,7 +1287,8 @@ void CommandLine::runCommand(String input) {
        }
        else if (bt_type == "flipper") {
          #ifdef HAS_BT
-            Serial.println("Starting Flipper Spam attack. Stop with " + (String)STOPSCAN_CMD);
+            Serial.print(F("Starting Flipper Spam attack. Stop with "));
+            Serial.println(STOPSCAN_CMD);
            #ifdef HAS_SCREEN
              display_obj.clearScreen();
              menu_function_obj.drawStatusBar();
@@ -1228,7 +1300,8 @@ void CommandLine::runCommand(String input) {
        }
        else if (bt_type == "all") {
          #ifdef HAS_BT
-            Serial.println("Starting BT Spam All attack. Stop with " + (String)STOPSCAN_CMD);
+            Serial.print(F("Starting BT Spam All attack. Stop with "));
+            Serial.println(STOPSCAN_CMD);
            #ifdef HAS_SCREEN
              display_obj.clearScreen();
              menu_function_obj.drawStatusBar();
@@ -1248,23 +1321,14 @@ void CommandLine::runCommand(String input) {
      #ifdef HAS_BT
        #ifdef HAS_GPS
          if (gps_obj.getGpsModuleStatus()) {
-            int cont_sw = this->argSearch(&cmd_args, "-c");

-            if (cont_sw == -1) {
-              Serial.println("Starting BT Wardrive. Stop with " + (String)STOPSCAN_CMD);
-              #ifdef HAS_SCREEN
-                display_obj.clearScreen();
-                menu_function_obj.drawStatusBar();
-              #endif
-              wifi_scan_obj.StartScan(BT_SCAN_WAR_DRIVE, TFT_GREEN);
-            }
-            else {Serial.println("Starting Continuous BT Wardrive. Stop with " + (String)STOPSCAN_CMD);
-              #ifdef HAS_SCREEN
-                display_obj.clearScreen();
-                menu_function_obj.drawStatusBar();
-              #endif
-              wifi_scan_obj.StartScan(BT_SCAN_WAR_DRIVE_CONT, TFT_GREEN);
-            }
+            Serial.print(F("Starting BT Wardrive. Stop with "));
+            Serial.println(STOPSCAN_CMD);
+            #ifdef HAS_SCREEN
+              display_obj.clearScreen();
+              menu_function_obj.drawStatusBar();
+            #endif
+            wifi_scan_obj.StartScan(BT_SCAN_WAR_DRIVE, TFT_GREEN);
          }
          else
            Serial.println(F("GPS Module not detected"));
@@ -1279,7 +1343,8 @@ void CommandLine::runCommand(String input) {
    // 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);
+        Serial.print(F("Starting Bluetooth CC Skimmer scan. Stop with "));
+        Serial.println(STOPSCAN_CMD);
        #ifdef HAS_SCREEN
          display_obj.clearScreen();
          menu_function_obj.drawStatusBar();
@@ -1324,7 +1389,8 @@ void CommandLine::runCommand(String input) {
  if (wifi_scan_obj.wifi_connected) {
    // Ping Scan
    if (cmd_args.get(0) == PING_CMD) {
-      Serial.println("Starting Ping Scan. Stop with " + (String)STOPSCAN_CMD);
+      Serial.print(F("Starting Ping Scan. Stop with "));
+      Serial.println(STOPSCAN_CMD);
      #ifdef HAS_SCREEN
        display_obj.clearScreen();
        menu_function_obj.drawStatusBar();
@@ -1334,7 +1400,8 @@ void CommandLine::runCommand(String input) {

    if (cmd_args.get(0) == ARP_SCAN_CMD) {
      #ifndef HAS_DUAL_BAND
-        Serial.println("Starting ARP Scan. Stop with " + (String)STOPSCAN_CMD);
+        Serial.print(F("Starting ARP Scan. Stop with "));
+        Serial.println(STOPSCAN_CMD);
        #ifdef HAS_SCREEN
          display_obj.clearScreen();
          menu_function_obj.drawStatusBar();
@@ -1442,7 +1509,8 @@ void CommandLine::runCommand(String input) {
          target_mode = WIFI_SCAN_RDP;

        if (target_mode != 0) {
-          Serial.println("Starting port scan for service " + port_name);
+          Serial.print(F("Starting port scan for service "));
+          Serial.println(port_name);
          #ifdef HAS_SCREEN
            display_obj.clearScreen();
            menu_function_obj.drawStatusBar();
@@ -1519,7 +1587,7 @@ void CommandLine::runCommand(String input) {
          if (stations->get(access_points->get(x).stations->get(i)).selected) {
            Serial.print("  [" + (String)access_points->get(x).stations->get(i) + "] ");
            Serial.print(sta_mac);
-            Serial.println(" (selected)");
+            Serial.println(F(" (selected)"));
            count_selected += 1;
          }
          else {
@@ -1640,7 +1708,8 @@ void CommandLine::runCommand(String input) {
          for (int i = 0; i < ap_index.size(); i++) {
            int index = ap_index.get(i).toInt();
            if (!this->inRange(access_points->size(), index)) {
-              Serial.println("Index not in range: " + (String)index);
+              Serial.print(F("Index not in range: "));
+              Serial.println(index);
              continue;
            }
            if (access_points->get(index).selected) {
@@ -1691,7 +1760,8 @@ void CommandLine::runCommand(String input) {
        for (int i = 0; i < sta_index.size(); i++) {
          int index = sta_index.get(i).toInt();
          if (!this->inRange(stations->size(), index)) {
-            Serial.println("Index not in range: " + (String)index);
+            Serial.print(F("Index not in range: "));
+            Serial.println(index);
            continue;
          }
          if (stations->get(index).selected) {
@@ -1739,7 +1809,8 @@ void CommandLine::runCommand(String input) {
        for (int i = 0; i < ss_index.size(); i++) {
          int index = ss_index.get(i).toInt();
          if (!this->inRange(ssids->size(), index)) {
-            Serial.println("Index not in range: " + (String)index);
+            Serial.print(F("Index not in range: "));
+            Serial.println(index);
            continue;
          }
          if (ssids->get(index).selected) {
@@ -1825,7 +1896,8 @@ void CommandLine::runCommand(String input) {
    else if (rem_sw != -1) {
      int index = cmd_args.get(rem_sw + 1).toInt();
      if (!this->inRange(ssids->size(), index)) {
-        Serial.println("Index not in range: " + (String)index);
+        Serial.print(F("Index not in range: "));
+        Serial.println(index);
        return;
      }
      ssids->remove(index);
@@ -1835,41 +1907,4 @@ void CommandLine::runCommand(String input) {
      return;
    }
  }
-  // Join WiFi
-  /*else if (cmd_args.get(0) == JOINWIFI_CMD) {
-    int n_sw = this->argSearch(&cmd_args, "-n"); // name
-    int a_sw = this->argSearch(&cmd_args, "-a"); // access point
-    int s_sw = this->argSearch(&cmd_args, "-s"); // ssid
-    int p_sw = this->argSearch(&cmd_args, "-p");   
-    
-    String essid = "";
-    String pwx = "";
-    
-    if (s_sw != -1) {
-      int index = cmd_args.get(s_sw + 1).toInt();
-      if (!this->inRange(ssids->size(), index)) {
-        Serial.println("Index not in range: " + (String)index);
-        return;
-      }
-      essid = ssids->get(index).essid;
-    } else if (a_sw != -1) {
-      int index = cmd_args.get(a_sw + 1).toInt();
-      if (!this->inRange(access_points->size(), index)) {
-        Serial.println("Index not in range: " + (String)index);
-        return;
-      }
-      essid = access_points->get(index).essid;
-    } else if (n_sw != -1) {
-      essid = cmd_args.get(n_sw + 1);
-    } else {
-      Serial.println("You must specify an access point or ssid");
-      return;
-    }
-    
-    if (p_sw != -1) {
-      pwx = cmd_args.get(p_sw + 1);
-    }
-    Serial.println("Attempting to join WiFi with ssid " + (String)essid);
-    wifi_scan_obj.joinWiFi(essid, pwx);
-  }*/
 }
--- a/esp32_marauder/CommandLine.h
+++ b/esp32_marauder/CommandLine.h
@@ -78,6 +78,8 @@ const char PROGMEM WARDRIVE_CMD[] = "wardrive";
 const char PROGMEM PING_CMD[] = "pingscan";
 const char PROGMEM PORT_SCAN_CMD[] = "portscan";
 const char PROGMEM ARP_SCAN_CMD[] = "arpscan";
+const char PROGMEM MAC_TRACK_CMD[] = "mactrack";
+const char PROGMEM SNIFF_SAE_CMD[] = "sniffsae";

 // WiFi attack
 const char PROGMEM ATTACK_CMD[] = "attack";
@@ -88,6 +90,7 @@ 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";
+const char PROGMEM ATTACK_TYPE_SAE[] = "sae";

 // WiFi Aux
 const char PROGMEM LIST_AP_CMD[] = "list";
@@ -152,9 +155,11 @@ const char PROGMEM HELP_WARDRIVE_CMD[] = "wardrive [-s/-f]";
 const char PROGMEM HELP_PING_CMD[] = "pingscan";
 const char PROGMEM HELP_PORT_SCAN_CMD[] = "portscan [-a -t <ip index>]/[-s <ssh/telnet/dns/http/smtp/https/rdp>]";
 const char PROGMEM HELP_ARP_SCAN_CMD[] = "arpscan [-f]";
+const char PROGMEM HELP_MAC_TRACK_CMD[] = "mactrack";
+const char PROGMEM HELP_SNIFF_SAE_CMD[] = "sniffsae";

 // WiFi attack
-const char PROGMEM HELP_ATTACK_CMD[] = "attack -t <beacon [-l/-r/-a]/deauth [-c]/[-s <src mac>] [-d <dst mac>]/probe/rickroll/badmsg [-c]/sleep [-c]>";
+const char PROGMEM HELP_ATTACK_CMD[] = "attack -t <sae/beacon [-l/-r/-a]/deauth [-c]/[-s <src mac>] [-d <dst mac>]/probe/rickroll/badmsg [-c]/sleep [-c]>";

 // WiFi Aux
 const char PROGMEM HELP_LIST_AP_CMD_A[] = "list -s";
@@ -183,7 +188,7 @@ const char PROGMEM HELP_BT_SPOOFAT_CMD[] = "spoofat -t <index>";
 //const char PROGMEM HELP_BT_SWIFTPAIR_SPAM_CMD[] = "swiftpair";
 //const char PROGMEM HELP_BT_SAMSUNG_SPAM_CMD[] = "samsungblespam";
 //onst char PROGMEM HELP_BT_SPAM_ALL_CMD[] = "btspamall";
-const char PROGMEM HELP_BT_WARDRIVE_CMD[] = "btwardrive [-c]";
+const char PROGMEM HELP_BT_WARDRIVE_CMD[] = "btwardrive";
 const char PROGMEM HELP_BT_SKIM_CMD[] = "sniffskim";
 const char PROGMEM HELP_FOOT[] = "==================================";

--- a/esp32_marauder/Display.cpp
+++ b/esp32_marauder/Display.cpp
@@ -475,33 +475,37 @@ void Display::processAndPrintString(TFT_eSPI& tft, const String& originalString)
  String new_string = originalString;

  // Check for color macros at the start of the string
-  if (new_string.startsWith(RED_KEY)) {
-    text_color = TFT_RED;
-    new_string.remove(0, strlen(RED_KEY)); // Remove the macro
-  } else if (new_string.startsWith(GREEN_KEY)) {
-    text_color = TFT_GREEN;
-    new_string.remove(0, strlen(GREEN_KEY)); // Remove the macro
-  } else if (new_string.startsWith(CYAN_KEY)) {
-    text_color = TFT_CYAN;
-    new_string.remove(0, strlen(CYAN_KEY)); // Remove the macro
-  } else if (new_string.startsWith(WHITE_KEY)) {
-    text_color = TFT_WHITE;
-    new_string.remove(0, strlen(WHITE_KEY)); // Remove the macro
-  } else if (new_string.startsWith(MAGENTA_KEY)) {
-    text_color = TFT_MAGENTA;
-    new_string.remove(0, strlen(MAGENTA_KEY)); // Remove the macro
+  if (new_string.startsWith(";")) {
+    if (new_string.startsWith(RED_KEY)) {
+      text_color = TFT_RED;
+      new_string.remove(0, strlen(RED_KEY)); // Remove the macro
+    } else if (new_string.startsWith(GREEN_KEY)) {
+      text_color = TFT_GREEN;
+      new_string.remove(0, strlen(GREEN_KEY)); // Remove the macro
+    } else if (new_string.startsWith(CYAN_KEY)) {
+      text_color = TFT_CYAN;
+      new_string.remove(0, strlen(CYAN_KEY)); // Remove the macro
+    } else if (new_string.startsWith(WHITE_KEY)) {
+      text_color = TFT_WHITE;
+      new_string.remove(0, strlen(WHITE_KEY)); // Remove the macro
+    } else if (new_string.startsWith(MAGENTA_KEY)) {
+      text_color = TFT_MAGENTA;
+      new_string.remove(0, strlen(MAGENTA_KEY)); // Remove the macro
+    }
  }

+  String spaces = String(' ', TFT_WIDTH / CHAR_WIDTH);
+
  // Set text color and print the string
  tft.setTextColor(text_color, background_color);
-  tft.print(new_string);
+  tft.print(new_string + spaces);
 }

 void Display::displayBuffer(bool do_clear)
 {
  if (this->display_buffer->size() > 0)
  {
-    int print_count = 1;
+    int print_count = 10;
    while ((display_buffer->size() > 0) && (print_count > 0))
    {

@@ -530,9 +534,9 @@ void Display::displayBuffer(bool do_clear)
        screen_buffer->add(display_buffer->shift());

        for (int i = 0; i < this->screen_buffer->size(); i++) {
-          tft.setCursor(xPos, (i * 12) + (SCREEN_HEIGHT / 6));
-          String spaces = String(' ', TFT_WIDTH / CHAR_WIDTH);
-          tft.print(spaces);
+          //tft.setCursor(xPos, (i * 12) + (SCREEN_HEIGHT / 6));
+          //String spaces = String(' ', TFT_WIDTH / CHAR_WIDTH);
+          //tft.print(spaces);
          tft.setCursor(xPos, (i * 12) + (SCREEN_HEIGHT / 6));

          this->processAndPrintString(tft, this->screen_buffer->get(i));
--- a/esp32_marauder/Display.h
+++ b/esp32_marauder/Display.h
@@ -13,7 +13,7 @@
 #include <LinkedList.h>
 #include <SPI.h>
 //#include <lvgl.h>
-#include <Ticker.h>
+//#include <Ticker.h>
 #include "SPIFFS.h"
 #include "Assets.h"

--- a/esp32_marauder/GpsInterface.cpp
+++ b/esp32_marauder/GpsInterface.cpp
@@ -10,23 +10,22 @@ MicroNMEA nmea(nmeaBuffer, sizeof(nmeaBuffer));

 HardwareSerial Serial2(GPS_SERIAL_INDEX);

+static const char *PCAS_SET_115200 = "$PCAS01,5*19\r\n";
+
+static const uint32_t PROBE_MS = 1200;
+
 void GpsInterface::begin() {

-  /*#ifdef MARAUDER_MINI
-    pinMode(26, OUTPUT);
-
-    delay(1);
-
-    analogWrite(26, 243);
-    delay(1);
-
-    Serial.println("Activated GPS");
-    delay(100);
-  #endif*/
-
  
  Serial2.begin(9600, SERIAL_8N1, GPS_TX, GPS_RX);

+  uint32_t gps_baud = this->initGpsBaudAndForce115200();
+
+  if ((gps_baud != 9600) && (gps_baud != 115200))
+    Serial.println("Could not detect GPS baudrate");
+
+  delay(1000);
+
  MicroNMEA::sendSentence(Serial2, "$PSTMSETPAR,1201,0x00000042");
  MicroNMEA::sendSentence(Serial2, "$PSTMSAVEPAR");

@@ -35,7 +34,6 @@ void GpsInterface::begin() {
  delay(1000);

  if (Serial2.available()) {
-    Serial.println("GPS Attached Successfully");
    this->gps_enabled = true;
    while (Serial2.available()) {
      //Fetch the character one by one
@@ -58,6 +56,67 @@ void GpsInterface::begin() {

 }

+bool GpsInterface::probeBaud(uint32_t baud) {
+  Serial2.end();
+  delay(50);
+
+  Serial2.begin(baud, SERIAL_8N1, GPS_TX, GPS_RX);
+
+  uint32_t start = millis();
+  bool sawDollar = false;
+  bool parsedSentence = false;
+
+  while (millis() - start < PROBE_MS) {
+    while (Serial2.available()) {
+      char c = (char)Serial2.read();
+
+      if (c == '$') {
+        sawDollar = true;
+      }
+
+      // Feed characters directly to MicroNMEA
+      if (nmea.process(c)) {
+        parsedSentence = true;
+      }
+
+      // If we’ve seen real NMEA traffic and MicroNMEA parsed something,
+      // this baud is almost certainly correct
+      if (sawDollar && parsedSentence) {
+        return true;
+      }
+    }
+    delay(1);
+  }
+
+  return false;
+}
+
+void GpsInterface::setGpsTo115200From9600() {
+  Serial2.print(PCAS_SET_115200);
+  Serial2.flush();
+  delay(200);
+}
+
+uint32_t GpsInterface::initGpsBaudAndForce115200() {
+  if (probeBaud(115200)) {
+    return 115200;
+  }
+
+  if (probeBaud(9600)) {
+    setGpsTo115200From9600();
+
+    if (probeBaud(115200)) {
+      return 115200;
+    }
+
+    probeBaud(9600);
+    return 9600;
+  }
+
+  probeBaud(9600);
+  return 0;
+}
+
 //passthrough for other objects
 void gps_nmea_notimp(MicroNMEA& nmea){
  gps_obj.enqueue(nmea);
@@ -518,6 +577,9 @@ void GpsInterface::setGPSInfo() {

  this->datetime = this->dt_string_from_gps();

+  this->lat_int = nmea.getLatitude();
+  this->lon_int = nmea.getLongitude();
+
  this->lat = String((float)nmea.getLatitude()/1000000, 7);
  this->lon = String((float)nmea.getLongitude()/1000000, 7);
  long alt = 0;
@@ -543,6 +605,14 @@ String GpsInterface::getLon() {
  return this->lon;
 }

+int32_t GpsInterface::getLatInt() {
+  return this->lat_int;
+}
+
+int32_t GpsInterface::getLonInt() {
+  return this->lon_int;
+}
+
 float GpsInterface::getAlt() {
  return this->altf;
 }
--- a/esp32_marauder/GpsInterface.h
+++ b/esp32_marauder/GpsInterface.h
@@ -46,6 +46,8 @@ class GpsInterface {
    bool getGpsModuleStatus();
    String getLat();
    String getLon();
+    int32_t getLatInt();
+    int32_t getLonInt();
    float getAlt();
    float getAccuracy();
    String getDatetime();
@@ -93,6 +95,8 @@ class GpsInterface {
    String notparsed_nmea_sentence = "";
    String lat = "";
    String lon = "";
+    int32_t lat_int = 0;
+    int32_t lon_int = 0;
    float altf = 0.0;
    float accuracy = 0.0;
    String datetime = "";
@@ -117,6 +121,9 @@ class GpsInterface {
    void flush_queue_nmea();
    String dt_string_from_gps();
    void setGPSInfo();
+    bool probeBaud(uint32_t baud);
+    void setGpsTo115200From9600();
+    uint32_t initGpsBaudAndForce115200();
 };

 #endif
--- a/esp32_marauder/MenuFunctions.cpp
+++ b/esp32_marauder/MenuFunctions.cpp
@@ -203,6 +203,8 @@ void MenuFunctions::main(uint32_t currentTime)
    {
      // Stop the current scan
      if ((wifi_scan_obj.currentScanMode == WIFI_SCAN_PROBE) ||
+          (wifi_scan_obj.currentScanMode == WIFI_SCAN_SAE_COMMIT) ||
+          (wifi_scan_obj.currentScanMode == WIFI_SCAN_DETECT_FOLLOW) ||
          (wifi_scan_obj.currentScanMode == WIFI_SCAN_STATION_WAR_DRIVE) ||
          (wifi_scan_obj.currentScanMode == WIFI_SCAN_STATION) ||
          (wifi_scan_obj.currentScanMode == WIFI_SCAN_AP) ||
@@ -237,6 +239,7 @@ void MenuFunctions::main(uint32_t currentTime)
          (wifi_scan_obj.currentScanMode == WIFI_ATTACK_BAD_MSG) ||
          (wifi_scan_obj.currentScanMode == WIFI_ATTACK_SLEEP) ||
          (wifi_scan_obj.currentScanMode == WIFI_ATTACK_SLEEP_TARGETED) ||
+          (wifi_scan_obj.currentScanMode == WIFI_ATTACK_SAE_COMMIT) ||
          (wifi_scan_obj.currentScanMode == WIFI_ATTACK_MIMIC) ||
 		      (wifi_scan_obj.currentScanMode == WIFI_ATTACK_FUNNY_BEACON) ||
          (wifi_scan_obj.currentScanMode == WIFI_ATTACK_RICK_ROLL) ||
@@ -300,6 +303,8 @@ void MenuFunctions::main(uint32_t currentTime)
      {
        // Stop the current scan
        if ((wifi_scan_obj.currentScanMode == WIFI_SCAN_PROBE) ||
+            (wifi_scan_obj.currentScanMode == WIFI_SCAN_SAE_COMMIT) ||
+            (wifi_scan_obj.currentScanMode == WIFI_SCAN_DETECT_FOLLOW) ||
            (wifi_scan_obj.currentScanMode == WIFI_SCAN_STATION_WAR_DRIVE) ||
            (wifi_scan_obj.currentScanMode == WIFI_SCAN_RAW_CAPTURE) ||
            (wifi_scan_obj.currentScanMode == WIFI_SCAN_STATION) ||
@@ -336,6 +341,7 @@ void MenuFunctions::main(uint32_t currentTime)
            (wifi_scan_obj.currentScanMode == WIFI_ATTACK_BAD_MSG) ||
            (wifi_scan_obj.currentScanMode == WIFI_ATTACK_SLEEP) ||
            (wifi_scan_obj.currentScanMode == WIFI_ATTACK_SLEEP_TARGETED) ||
+            (wifi_scan_obj.currentScanMode == WIFI_ATTACK_SAE_COMMIT) ||
            (wifi_scan_obj.currentScanMode == WIFI_ATTACK_MIMIC) ||
 			      (wifi_scan_obj.currentScanMode == WIFI_ATTACK_FUNNY_BEACON) ||
            (wifi_scan_obj.currentScanMode == WIFI_ATTACK_RICK_ROLL) ||
@@ -401,6 +407,7 @@ void MenuFunctions::main(uint32_t currentTime)
        (wifi_scan_obj.currentScanMode != WIFI_ATTACK_BAD_MSG) &&
        (wifi_scan_obj.currentScanMode != WIFI_ATTACK_SLEEP) &&
        (wifi_scan_obj.currentScanMode != WIFI_ATTACK_SLEEP_TARGETED) &&
+        (wifi_scan_obj.currentScanMode != WIFI_ATTACK_SAE_COMMIT) &&
        (wifi_scan_obj.currentScanMode != WIFI_ATTACK_MIMIC) &&
        (wifi_scan_obj.currentScanMode != WIFI_SCAN_PACKET_RATE) &&
        (wifi_scan_obj.currentScanMode != WIFI_SCAN_RAW_CAPTURE) &&
@@ -1669,6 +1676,16 @@ void MenuFunctions::RunSetup()
    this->drawStatusBar();
    wifi_scan_obj.StartScan(WIFI_SCAN_SIG_STREN, TFT_CYAN);
  });
+  this->addNodes(&wifiSnifferMenu, "MAC Monitor", TFTMAGENTA, NULL, SCANNERS, [this]() {
+    display_obj.clearScreen();
+    this->drawStatusBar();
+    wifi_scan_obj.StartScan(WIFI_SCAN_DETECT_FOLLOW, TFT_MAGENTA);
+  });
+  this->addNodes(&wifiSnifferMenu, "SAE Commit", TFTLIME, NULL, EAPOL, [this]() {
+    display_obj.clearScreen();
+    this->drawStatusBar();
+    wifi_scan_obj.StartScan(WIFI_SCAN_SAE_COMMIT, TFT_GREEN);
+  });

  // Build Wardriving menu
  #ifdef HAS_GPS
@@ -1835,6 +1852,11 @@ void MenuFunctions::RunSetup()
    this->drawStatusBar();
    wifi_scan_obj.StartScan(WIFI_ATTACK_SLEEP_TARGETED, TFT_MAGENTA);
  });
+  this->addNodes(&wifiAttackMenu, "SAE Commit Flood", TFTLIME, NULL, EAPOL, [this]() {
+    display_obj.clearScreen();
+    this->drawStatusBar();
+    wifi_scan_obj.StartScan(WIFI_ATTACK_SAE_COMMIT, TFT_GREEN);
+  });

  evilPortalMenu.parentMenu = &wifiAttackMenu;
  this->addNodes(&evilPortalMenu, text09, TFTLIGHTGREY, NULL, 0, [this]() {
@@ -2039,6 +2061,8 @@ void MenuFunctions::RunSetup()
    });

    this->addNodes(&wifiGeneralMenu, "View AP Info", TFTCYAN, NULL, KEYBOARD_ICO, [this](){
+      wifiAPMenu.parentMenu = &wifiGeneralMenu;
+      
      // Add the back button
      wifiAPMenu.list->clear();
        this->addNodes(&wifiAPMenu, text09, TFTLIGHTGREY, NULL, 0, [this]() {
@@ -2074,6 +2098,8 @@ void MenuFunctions::RunSetup()

    // Select Stations on Mini v2
    this->addNodes(&wifiGeneralMenu, "Select Stations", TFTCYAN, NULL, KEYBOARD_ICO, [this](){
+      wifiAPMenu.parentMenu = &wifiGeneralMenu;
+
      wifiAPMenu.list->clear();
        this->addNodes(&wifiAPMenu, text09, TFTLIGHTGREY, NULL, 0, [this]() {
        this->changeMenu(wifiAPMenu.parentMenu, true);
@@ -2140,6 +2166,9 @@ void MenuFunctions::RunSetup()
    });

    this->addNodes(&wifiGeneralMenu, "Join WiFi", TFTWHITE, NULL, KEYBOARD_ICO, [this](){
+
+      wifiAPMenu.parentMenu = &wifiGeneralMenu;
+
      // Add the back button
      wifiAPMenu.list->clear();
        this->addNodes(&wifiAPMenu, text09, TFTLIGHTGREY, NULL, 0, [this]() {
@@ -2186,6 +2215,8 @@ void MenuFunctions::RunSetup()
        this->changeMenu(&wifiGeneralMenu, true);
      }
      else {
+        wifiAPMenu.parentMenu = &wifiGeneralMenu;
+
        // Add the back button
        wifiAPMenu.list->clear();
          this->addNodes(&wifiAPMenu, text09, TFTLIGHTGREY, NULL, 0, [this]() {
@@ -2303,6 +2334,8 @@ void MenuFunctions::RunSetup()
  // Clone AP MAC to ESP32 for button folks
  //#ifndef HAS_ILI9341
    this->addNodes(&setMacMenu, "Clone AP MAC", TFTRED, NULL, CLEAR_ICO, [this](){
+      wifiAPMenu.parentMenu = &wifiGeneralMenu;
+
      // Add the back button
      wifiAPMenu.list->clear();
        this->addNodes(&wifiAPMenu, text09, TFTLIGHTGREY, NULL, 0, [this]() {
@@ -2321,6 +2354,8 @@ void MenuFunctions::RunSetup()
    });

    this->addNodes(&setMacMenu, "Clone STA MAC", TFTMAGENTA, NULL, CLEAR_ICO, [this](){
+      wifiAPMenu.parentMenu = &wifiGeneralMenu;
+
      // Add the back button
      wifiAPMenu.list->clear();
        this->addNodes(&wifiAPMenu, text09, TFTLIGHTGREY, NULL, 0, [this]() {
@@ -2405,11 +2440,6 @@ void MenuFunctions::RunSetup()
        this->drawStatusBar();
        wifi_scan_obj.StartScan(BT_SCAN_WAR_DRIVE, TFT_GREEN);
      });
-      this->addNodes(&bluetoothSnifferMenu, "BT Wardrive Continuous", TFTRED, NULL, REBOOT, [this]() {
-        display_obj.clearScreen();
-        this->drawStatusBar();
-        wifi_scan_obj.StartScan(BT_SCAN_WAR_DRIVE_CONT, TFT_GREEN);
-      });
    }
  #endif
  this->addNodes(&bluetoothSnifferMenu, text_table1[35], TFTMAGENTA, NULL, CC_SKIMMERS, [this]() {
@@ -2474,6 +2504,8 @@ void MenuFunctions::RunSetup()
    #ifdef HAS_BT
    // Select Airtag on Mini
      this->addNodes(&bluetoothAttackMenu, "Spoof Airtag", TFTWHITE, NULL, ATTACKS, [this](){
+          wifiAPMenu.parentMenu = &bluetoothAttackMenu;
+
          // Clear nodes and add back button
          wifiAPMenu.list->clear();
          this->addNodes(&wifiAPMenu, text09, TFT_LIGHTGREY, NULL, 0, [this]() {
--- a/esp32_marauder/MenuFunctions.h
+++ b/esp32_marauder/MenuFunctions.h
@@ -193,7 +193,7 @@ class MenuFunctions

    Menu evilPortalMenu;

-    static void lv_tick_handler();
+    //static void lv_tick_handler();

    // Menu icons

@@ -260,7 +260,7 @@ class MenuFunctions
    Menu infoMenu;
    Menu apInfoMenu;

-    Ticker tick;
+    //Ticker tick;

    uint16_t x = -1, y = -1;
    boolean pressed = false;
--- a/esp32_marauder/WiFiScan.cpp
+++ b/esp32_marauder/WiFiScan.cpp
--- a/esp32_marauder/WiFiScan.h
+++ b/esp32_marauder/WiFiScan.h
@@ -14,7 +14,7 @@
  #include <NimBLEDevice.h> // 1.3.8, 2.3.2
 #endif

-#ifdef HAS_DUAL_BAND
+#ifdef HAS_IDF_3
  extern "C" {
    #include "esp_netif.h"
    #include "esp_netif_net_stack.h"
@@ -28,14 +28,19 @@
 #include "esp_wifi.h"
 #include "esp_wifi_types.h"
 #include <esp_timer.h>
-#ifndef HAS_DUAL_BAND
+#include "mbedtls/entropy.h"
+#include "mbedtls/bignum.h"
+#include "mbedtls/ctr_drbg.h"
+#include "mbedtls/ecp.h"
+#ifndef HAS_IDF_3
  #include <lwip/etharp.h>
  #include <lwip/ip_addr.h>
 #endif
-#ifdef HAS_DUAL_BAND
+#ifdef HAS_IDF_3
  #include "esp_system.h"
+  #include "esp_mac.h"
 #endif
-#if defined(HAS_BT) && !defined(HAS_DUAL_BAND)
+#if defined(HAS_BT) && !defined(HAS_NIMBLE_2)
  #include "esp_bt.h"
 #endif
 #ifdef HAS_SCREEN
@@ -144,6 +149,9 @@
 #define BT_SCAN_SIMPLE 73
 #define BT_SCAN_SIMPLE_TWO 74
 #define BT_SCAN_FLOCK_WARDRIVE 75
+#define WIFI_SCAN_DETECT_FOLLOW 76
+#define WIFI_SCAN_SAE_COMMIT 77
+#define WIFI_ATTACK_SAE_COMMIT 78

 #define WIFI_ATTACK_FUNNY_BEACON 99 

@@ -215,9 +223,25 @@ extern Settings settings_obj;

 esp_err_t esp_wifi_80211_tx(wifi_interface_t ifx, const void *buffer, int len, bool en_sys_seq);

-#ifdef HAS_DUAL_BAND
-  esp_err_t esp_base_mac_addr_set(uint8_t *Mac);
-#endif
+#define EMPTY_ENTRY 0
+#define VALID_ENTRY 1
+#define TOMBSTONE_ENTRY 2
+
+#pragma pack(push, 1)
+struct MacEntry {
+  uint8_t  mac[6];
+  uint32_t last_seen_ms;
+  uint16_t frame_count;
+  int32_t  first_lat_e6;
+  int32_t  first_lon_e6;
+  int32_t  last_lat_e6;
+  int32_t  last_lon_e6;
+  bool following;
+  int32_t dloc;
+  int8_t rssi;
+  bool bt;
+};
+#pragma pack(pop)

 struct AirTag {
    String mac;                  // MAC address of the AirTag
@@ -237,6 +261,11 @@ struct Flipper {
  extern struct mac_addr* mac_history;
 #endif

+enum class MacSortMode : uint8_t {
+  MOST_RECENT,
+  MOST_FRAMES
+};
+
 class WiFiScan
 {
  private:
@@ -246,6 +275,8 @@ class WiFiScan
      struct mac_addr mac_history[mac_history_len];
    #endif

+    int current_act_len = 0;
+
    uint32_t chanActTime = 0;

    uint8_t ap_mac[6] = {0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0xED};
@@ -281,6 +312,8 @@ class WiFiScan
    //int num_deauth = 0; // RED

    uint32_t initTime = 0;
+    uint32_t last_ui_update = 0;
+    uint32_t last_sour_apple_update = 0;
    bool run_setup = true;
    void initWiFi(uint8_t scan_mode);
    uint8_t bluetoothScanTime = 5;
@@ -406,6 +439,15 @@ class WiFiScan
    LinkedList<ConfirmedMultiSSID>* confirmed_multissid;
    bool multissid_list_full_reported;

+    uint8_t sae_commit[32] = {
+      0xb0, 0x00, 0x00, 0x00,                     // Type/Subtype, Duration
+      0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB,         // Destination
+      0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA,         // Source
+      0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB,         // BSSID (Destination)
+      0x00, 0x00,                                 // Frag num
+      0x03, 0x00, 0x01, 0x00, 0x00, 0x00, 0x13, 0x00  // Auth alg (SAE), SAE sequence, group 19
+    };
+
    // barebones packet
    uint8_t packet[128] = { 0x80, 0x00, 0x00, 0x00, //Frame Control, Duration
                    /*4*/   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, //Destination address 
@@ -525,6 +567,7 @@ class WiFiScan
      NimBLEAdvertisementData GetUniversalAdvertisementData(EBLEPayloadType type);
    #endif

+    void updateTrackerUI();
    void showNetworkInfo();
    void setNetworkInfo();
    void fullARP();
@@ -535,17 +578,19 @@ class WiFiScan
    bool isHostAlive(IPAddress ip);
    bool checkHostPort(IPAddress ip, uint16_t port, uint16_t timeout = 100);
    String extractManufacturer(const uint8_t* payload);
-    int checkMatchAP(char addr[]);
+    int checkMatchAP(char addr[], bool update_ap = true);
    bool beaconHasWPS(const uint8_t* payload, int len);
    uint8_t getSecurityType(const uint8_t* beacon, uint16_t len);
    void addAnalyzerValue(int16_t value, int rssi_avg, int16_t target_array[], int array_size);
    bool mac_cmp(struct mac_addr addr1, struct mac_addr addr2);
+    bool mac_cmp(uint8_t addr1[6], uint8_t addr2[6]);
    void clearMacHistory();
    void executeWarDrive();
    void executeSourApple();
    void executeSpoofAirtag();
    void executeSwiftpairSpam(EBLEPayloadType type);
    void startWardriverWiFi();
+    void saeAttackLoop(uint32_t currentTime);
    //void generateRandomMac(uint8_t* mac);
    //void generateRandomName(char *name, size_t length);
    String processPwnagotchiBeacon(const uint8_t* frame, int length);
@@ -564,6 +609,7 @@ class WiFiScan
    void tftDrawChannelScaleButtons();
    void tftDrawColorKey();
    void tftDrawGraphObjects();
+    bool sendSAECommitFrame(uint8_t* targ_addr, uint8_t* src_addr) ;
    void sendProbeAttack(uint32_t currentTime);
    void sendDeauthAttack(uint32_t currentTime, String dst_mac_str = "ff:ff:ff:ff:ff:ff");
    void sendBadMsgAttack(uint32_t currentTime, bool all = false);
@@ -590,6 +636,7 @@ class WiFiScan
    void RunDeauthScan(uint8_t scan_mode, uint16_t color);
    void RunEapolScan(uint8_t scan_mode, uint16_t color);
    void RunProbeScan(uint8_t scan_mode, uint16_t color);
+    void RunSAEScan(uint8_t scan_mode, uint16_t color);
    void RunPacketMonitor(uint8_t scan_mode, uint16_t color);
    void RunBluetoothScan(uint8_t scan_mode, uint16_t color);
    void RunSourApple(uint8_t scan_mode, uint16_t color);
@@ -601,6 +648,7 @@ class WiFiScan
    void parseBSSID(const char* bssidStr, uint8_t* bssid);
    void writeHeader(bool poi = false);
    void writeFooter(bool poi = false);
+    void displayWardriveStats();


  public:
@@ -610,6 +658,13 @@ class WiFiScan

    //LinkedList<ssid>* ssids;

+    volatile bool bt_cb_busy = false;
+    volatile bool bt_pending_clear = false;
+
+
+    static MacEntry mac_entries[mac_history_len];
+    static uint8_t mac_entry_state[mac_history_len];
+
    // Stuff for RAW stats
    uint32_t mgmt_frames = 0;
    uint32_t data_frames = 0;
@@ -687,7 +742,7 @@ class WiFiScan

    wifi_init_config_t cfg = WIFI_INIT_CONFIG_DEFAULT();

-    #ifndef HAS_DUAL_BAND
+    #ifndef HAS_IDF_3
      wifi_init_config_t cfg2 = { \
          .event_handler = &esp_event_send_internal, \
          .osi_funcs = &g_wifi_osi_funcs, \
@@ -730,7 +785,12 @@ class WiFiScan
    #ifdef HAS_SCREEN
      int8_t checkAnalyzerButtons(uint32_t currentTime);
    #endif
-    bool seen_mac(unsigned char* mac);
+    bool seen_mac(unsigned char* mac, bool simple = true);
+    int16_t seen_mac_int(unsigned char* mac, bool simple = true);
+    int update_mac_entry(const uint8_t mac[6], int8_t rssi = 0, bool bt = false);
+    inline void insert_mac_entry(uint32_t idx, const uint8_t mac[6], uint32_t now_ms, int8_t rssi = 0, bool bt = false);
+    void evict_and_insert(const uint8_t mac[6], uint32_t now_ms);
+    uint8_t build_top10_for_ui(MacEntry* out_top10, MacSortMode mode);
    void save_mac(unsigned char* mac);
    #ifdef HAS_BT
      void copyNimbleMac(const BLEAddress &addr, unsigned char out[6]);
@@ -760,8 +820,7 @@ class WiFiScan
    bool scanning();
    bool joinWiFi(String ssid, String password, bool gui = true);
    bool startWiFi(String ssid, String password, bool gui = true);
-    String getStaMAC();
-    String getApMAC();
+    void getMAC(bool get_sta, uint8_t* mac);
    String freeRAM();
    void changeChannel();
    void changeChannel(int chan);
@@ -795,7 +854,14 @@ class WiFiScan
    void startGPX(String file_name);
    //String macToString(const Station& station);

+    static bool initMbedtls();
+    static int mbedtls_entropy_source(void *data, unsigned char *output, size_t len);
+    static bool getSAEACT(const uint8_t *frame, size_t frame_len, uint16_t &group_out, size_t &act_len_out);
+    static bool sae_group_sizes(uint16_t group, size_t &scalar_len, size_t &element_len);
+    static bool mac_cmp(const uint8_t *a, const uint8_t *b);
+    static inline uint16_t le16(const uint8_t *p);
    static void getMAC(char *addr, uint8_t* data, uint16_t offset);
+    static void getMAC(uint8_t* mac, const uint8_t* data, uint16_t offset);
    static void pwnSnifferCallback(void* buf, wifi_promiscuous_pkt_type_t type);
    static void beaconSnifferCallback(void* buf, wifi_promiscuous_pkt_type_t type);
    //static void rawSnifferCallback(void* buf, wifi_promiscuous_pkt_type_t type);
@@ -811,5 +877,6 @@ class WiFiScan
    static void pineScanSnifferCallback(void* buf, wifi_promiscuous_pkt_type_t type); // Pineapple
    static int extractPineScanChannel(const uint8_t* payload, int len); // Pineapple
    static void multiSSIDSnifferCallback(void* buf, wifi_promiscuous_pkt_type_t type); // MultiSSID
+    static inline uint32_t hash_mac(const uint8_t mac[6]);
 };
 #endif
--- a/esp32_marauder/configs.h
+++ b/esp32_marauder/configs.h
@@ -6,6 +6,8 @@

  #define POLISH_POTATO

+  //#define DEVELOPER
+
  //// BOARD TARGETS
  //#define MARAUDER_M5STICKC
  //#define MARAUDER_M5STICKCP2
@@ -32,10 +34,12 @@
  //#define MARAUDER_V8
  //// END BOARD TARGETS

-  #define MARAUDER_VERSION "v1.9.0"
+  #define MARAUDER_VERSION "v1.10.0"

  #define GRAPH_REFRESH   100

+  #define TRACK_EVICT_SEC 90 // Seconds before marking tracked MAC as tombstone
+
  #define DUAL_BAND_CHANNELS 51

  //// HARDWARE NAMES
@@ -136,6 +140,10 @@
    #define USE_SD
    #define HAS_TEMP_SENSOR
    #define HAS_GPS
+    #define HAS_NIMBLE_2
+    #define HAS_IDF_3
+    //#define HAS_C5_SD
+    #define HAS_SIMPLEX_DISPLAY
  #endif

  #ifdef MARAUDER_V7
@@ -153,6 +161,8 @@
    #define USE_SD
    #define HAS_TEMP_SENSOR
    #define HAS_GPS
+    #define HAS_NIMBLE_2
+    #define HAS_IDF_3
  #endif

  #ifdef MARAUDER_V7_1
@@ -171,6 +181,7 @@
    #define HAS_TEMP_SENSOR
    #define HAS_GPS
    #define HAS_PSRAM
+    //#define HAS_NIMBLE_2
  #endif

  #ifdef MARAUDER_REV_FEATHER
@@ -203,6 +214,9 @@
    #define USE_SD
    #define HAS_TEMP_SENSOR
    #define HAS_GPS
+    #define HAS_NIMBLE_2
+    #define HAS_IDF_3
+    #define HAS_C5_SD
  #endif

  #if defined(MARAUDER_V6) || defined(MARAUDER_V6_1)
@@ -220,6 +234,9 @@
    #define USE_SD
    #define HAS_TEMP_SENSOR
    #define HAS_GPS
+    #define HAS_NIMBLE_2
+    #define HAS_IDF_3
+    #define HAS_C5_SD
  #endif

  #ifdef MARAUDER_CYD_MICRO
@@ -239,6 +256,7 @@
    #define HAS_TEMP_SENSOR
    #define HAS_GPS
    #define HAS_CYD_TOUCH
+    //#define HAS_NIMBLE_2
  #endif

  #ifdef MARAUDER_CYD_2USB
@@ -259,6 +277,7 @@
    #define HAS_GPS
    #define HAS_CYD_TOUCH
    #define HAS_CYD_PORTRAIT
+    //#define HAS_NIMBLE_2
  #endif

  #ifdef MARAUDER_CYD_3_5_INCH
@@ -280,6 +299,7 @@
    //#define HAS_CYD_TOUCH
    #define HAS_SEPARATE_SD
    #define HAS_CYD_PORTRAIT
+    //#define HAS_NIMBLE_2
  #endif

  #ifdef MARAUDER_CYD_GUITION
@@ -299,6 +319,7 @@
    #define HAS_TEMP_SENSOR
    #define HAS_GPS
    //#define HAS_CYD_TOUCH
+    //#define HAS_NIMBLE_2
  #endif

  #ifdef MARAUDER_KIT
@@ -315,6 +336,9 @@
    #define USE_SD
    #define HAS_TEMP_SENSOR
    #define HAS_GPS
+    #define HAS_NIMBLE_2
+    #define HAS_IDF_3
+    #define HAS_C5_SD
  #endif

  #ifdef GENERIC_ESP32
@@ -328,6 +352,7 @@
    //#define HAS_SD
    //#define HAS_TEMP_SENSOR
    //#define HAS_GPS
+    //#define HAS_NIMBLE_2
  #endif

  #ifdef MARAUDER_FLIPPER
@@ -374,6 +399,8 @@
    #define USE_SD
    //#define HAS_TEMP_SENSOR
    //#define HAS_GPS
+    #define HAS_NIMBLE_2
+    #define HAS_IDF_3
  #endif

  #ifdef MARAUDER_DEV_BOARD_PRO
@@ -388,6 +415,8 @@
    #define USE_SD
    //#define HAS_TEMP_SENSOR
    #define HAS_GPS
+    #define HAS_NIMBLE_2
+    #define HAS_IDF_3
  #endif

  #ifdef XIAO_ESP32_S3
@@ -419,6 +448,8 @@
    #define HAS_DUAL_BAND
    //#define HAS_PSRAM
    //#define HAS_TEMP_SENSOR
+    #define HAS_NIMBLE_2
+    #define HAS_IDF_3
  #endif

  #ifdef MARAUDER_V8
@@ -439,6 +470,8 @@
    #define HAS_DUAL_BAND
    #define HAS_PSRAM
    //#define HAS_TEMP_SENSOR
+    #define HAS_NIMBLE_2
+    #define HAS_IDF_3
  #endif
  //// END BOARD FEATURES

@@ -2536,6 +2569,36 @@
      #define SD_MOSI TFT_MOSI
      #define SD_SCK  TFT_SCLK
    #endif
+
+    #ifdef MARAUDER_V4
+      #define SD_MISO TFT_MISO
+      #define SD_MOSI TFT_MOSI
+      #define SD_SCK  TFT_SCLK
+    #endif
+
+    #ifdef MARAUDER_V6
+      #define SD_MISO TFT_MISO
+      #define SD_MOSI TFT_MOSI
+      #define SD_SCK  TFT_SCLK
+    #endif
+
+    #ifdef MARAUDER_V6_1
+      #define SD_MISO TFT_MISO
+      #define SD_MOSI TFT_MOSI
+      #define SD_SCK  TFT_SCLK
+    #endif
+
+    #ifdef MARAUDER_KIT
+      #define SD_MISO TFT_MISO
+      #define SD_MOSI TFT_MOSI
+      #define SD_SCK  TFT_SCLK
+    #endif
+
+    #ifdef MARAUDER_MINI
+      #define SD_MISO TFT_MISO
+      #define SD_MOSI TFT_MOSI
+      #define SD_SCK  TFT_SCLK
+    #endif
  #endif
  //// END STUPID CYD STUFF

--- a/esp32_marauder/esp32_marauder.ino
+++ b/esp32_marauder/esp32_marauder.ino
@@ -154,10 +154,21 @@ void backlightOff() {

 void setup()
 {
-  #ifndef HAS_DUAL_BAND
+  randomSeed(esp_random());
+  
+  #ifndef DEVELOPER
+    esp_log_level_set("*", ESP_LOG_NONE);
+  #endif
+  
+  #ifndef HAS_IDF_3
    esp_spiram_init();
  #endif

+  Serial.begin(115200);
+
+  while(!Serial)
+    delay(10);
+
  #ifdef HAS_C5_SD
    Serial.println("Starting shared SPI for C5 SD configuration...");
    sharedSPI.begin(SD_SCK, SD_MISO, SD_MOSI);
@@ -198,21 +209,30 @@ void setup()
    delay(10);
  #endif

-  Serial.begin(115200);
+  //Serial.begin(115200);

-  while(!Serial)
-    delay(10);
+  //while(!Serial)
+  //  delay(10);

  Serial.println("ESP-IDF version is: " + String(esp_get_idf_version()));

  #ifdef HAS_PSRAM
    if (psramInit()) {
-      Serial.println("PSRAM is correctly initialized");
+      Serial.println(F("PSRAM is correctly initialized"));
    } else {
-      Serial.println("PSRAM not available");
+      Serial.println(F("PSRAM not available"));
    }
  #endif

+  #ifdef HAS_SIMPLEX_DISPLAY
+    #if defined(HAS_SD)
+      // Do some SD stuff
+      if(!sd_obj.initSD())
+        Serial.println(F("SD Card NOT Supported"));
+
+    #endif
+  #endif
+
  #ifdef HAS_SCREEN
    display_obj.RunSetup();
    display_obj.tft.setTextColor(TFT_WHITE, TFT_BLACK);
@@ -243,7 +263,7 @@ void setup()

        backlightOff();

-        Serial.println("Headless Mode enabled");
+        Serial.println(F("Headless Mode enabled"));
      }
    #endif
  #endif
@@ -251,11 +271,14 @@ void setup()
  settings_obj.begin();

  buffer_obj = Buffer();
-  #if defined(HAS_SD)
-    // Do some SD stuff
-    if(!sd_obj.initSD())
-      Serial.println(F("SD Card NOT Supported"));

+  #ifndef HAS_SIMPLEX_DISPLAY
+    #if defined(HAS_SD)
+      // Do some SD stuff
+      if(!sd_obj.initSD())
+        Serial.println(F("SD Card NOT Supported"));
+
+    #endif
  #endif

  wifi_scan_obj.RunSetup();
--- a/esp32_marauder/utils.h
+++ b/esp32_marauder/utils.h
@@ -56,6 +56,25 @@ uint8_t getDRAMUsagePercent() {
  }
 #endif

+String hexDump(const uint8_t *buf, size_t len) {
+  String out;
+  out.reserve(len * 3);  // "FF " per byte (approx)
+
+  for (size_t i = 0; i < len; i++) {
+    if (buf[i] < 0x10) {
+      out += '0';
+    }
+    out += String(buf[i], HEX);
+
+    if (i < len - 1) {
+      out += ' ';
+    }
+  }
+
+  out.toUpperCase();
+  return out;
+}
+
 String byteArrayToHexString(const std::vector<uint8_t>& byteArray) {
  String result;

@@ -156,6 +175,14 @@ String macToString(uint8_t macAddr[6]) {
  return String(macStr);
 }

+String macToString(const uint8_t macAddr[6]) {
+  char macStr[18]; // 17 characters for "XX:XX:XX:XX:XX:XX" + 1 null terminator
+  snprintf(macStr, sizeof(macStr), "%02X:%02X:%02X:%02X:%02X:%02X", 
+    macAddr[0], macAddr[1], macAddr[2], 
+    macAddr[3], macAddr[4], macAddr[5]);
+  return String(macStr);
+}
+
 void convertMacStringToUint8(const String& macStr, uint8_t macAddr[6]) {
    // Ensure the input string is in the format "XX:XX:XX:XX:XX:XX"
    if (macStr.length() != 17) {
Author	SHA1	Message	Date
Just Call Me Koko	4fb65cd186	Merge pull request #1081 from justcallmekoko/develop Remove verbose print statements	2026-01-25 17:46:33 -05:00
Just Call Me Koko	419dd434e5	Remove verbose print statements	2026-01-25 17:16:15 -05:00
Just Call Me Koko	44f51d2f70	Merge pull request #1077 from justcallmekoko/develop Add prints	2026-01-25 01:18:47 -05:00
Just Call Me Koko	c4c652741e	Adjust IDF versions for standard ESP32	2026-01-25 00:38:21 -05:00
Just Call Me Koko	4ec9d50562	Adjust IDF version	2026-01-24 23:02:40 -05:00
Just Call Me Koko	014cae1cb0	Fix macros	2026-01-24 11:13:19 -05:00
Just Call Me Koko	832e99cccd	Only v6 NimBLE update	2026-01-24 11:06:50 -05:00
Just Call Me Koko	1648effcb2	Add prints	2026-01-23 22:31:53 -05:00
Just Call Me Koko	a1b02691d0	Merge pull request #1075 from justcallmekoko/develop Update all standard ESP32 NimBLE	2026-01-23 16:01:50 -05:00
Just Call Me Koko	85c4802322	Update NimBLE in nightly build workflow	2026-01-23 15:46:28 -05:00
Just Call Me Koko	4ea8a44931	Update NimBLE in build workflow	2026-01-23 15:35:50 -05:00
Just Call Me Koko	f82b6c5ce3	Update all standard ESP32 NimBLE	2026-01-23 15:21:15 -05:00
Just Call Me Koko	a54a311995	Merge pull request #1073 from justcallmekoko/develop Fix airtag sniffing crash	2026-01-22 21:09:52 -05:00
Just Call Me Koko	e689858891	Fix airtag sniffing crash	2026-01-22 18:58:08 -05:00
Just Call Me Koko	ebcfc9392e	Merge pull request #1072 from justcallmekoko/develop Bluetooth can deinit on ESP32 C5	2026-01-22 09:48:27 -05:00
Just Call Me Koko	9173785218	Bluetooth can deinit on ESP32 C5	2026-01-22 09:17:16 -05:00
Just Call Me Koko	64f6b4c582	Merge pull request #1071 from justcallmekoko/develop Update NimBLE for ESP32-C5	2026-01-22 08:42:36 -05:00
Just Call Me Koko	6d2d1d7a0d	Update NimBLE for ESP32-C5	2026-01-21 21:24:20 -05:00
Just Call Me Koko	467c58fef3	Merge pull request #1067 from justcallmekoko/develop Add commands for SAE sniff and attack	2026-01-20 11:38:41 -05:00
Just Call Me Koko	52eea5f4f7	Add commands for SAE sniff and attack	2026-01-20 11:15:05 -05:00
Just Call Me Koko	2430db99b3	Merge pull request #1066 from justcallmekoko/develop Output SAE attack stats	2026-01-19 22:54:30 -05:00
Just Call Me Koko	1ed63e3386	Output SAE attack stats	2026-01-19 22:49:28 -05:00
Just Call Me Koko	0196c00220	Merge pull request #1065 from justcallmekoko/develop Add SAE sniff and SAE spam attack	2026-01-19 20:24:55 -05:00
Just Call Me Koko	6456527f5f	Sniff SAE tokens while attacking	2026-01-19 19:15:18 -05:00
Just Call Me Koko	e7e8fc7d80	Add SAE commit sniff and attack	2026-01-19 16:20:27 -05:00
Just Call Me Koko	5fdf09c8fa	Adjust capture of ACT	2026-01-18 14:23:18 -05:00
Just Call Me Koko	af9938f8eb	Merge pull request #1059 from justcallmekoko/develop Capture and parse SAE commit frames	2026-01-17 10:26:37 -05:00
Just Call Me Koko	14e18a12bf	Capture and parse SAE commit frames	2026-01-17 10:14:51 -05:00
Just Call Me Koko	0ba3d0f60a	Merge pull request #1056 from justcallmekoko/develop Remove v7.1 from build list	2026-01-15 16:47:16 -05:00
Just Call Me Koko	d94a059b81	Remove v7.1 from build list	2026-01-15 16:12:44 -05:00
Just Call Me Koko	140668448f	Merge pull request #1055 from justcallmekoko/develop Remove continuous BT wardrive	2026-01-14 10:03:10 -05:00
Just Call Me Koko	18e582b9a9	Remove continuous BT wardrive	2026-01-14 09:47:41 -05:00
Just Call Me Koko	961bcb6cf5	Merge pull request #1052 from justcallmekoko/develop Fix PCAPs not saving for MAC tracker	2026-01-13 15:42:46 -05:00
Just Call Me Koko	2fa969552a	Remove frame check print	2026-01-13 15:23:48 -05:00
Just Call Me Koko	e4528d9dea	Fix tracking not saving PCAPs	2026-01-13 14:33:31 -05:00
Just Call Me Koko	774d5f0707	Merge pull request #1050 from justcallmekoko/develop Update Sour Apple	2026-01-13 08:13:54 -05:00
Just Call Me Koko	bab011e618	Refactor sour apple	2026-01-13 07:37:59 -05:00
Just Call Me Koko	07a684a03e	Merge pull request #1045 from justcallmekoko/develop Following MACs save PCAPs	2026-01-11 14:24:16 -05:00
Just Call Me Koko	cbb2d33f24	Following MACs save PCAPs	2026-01-11 14:01:19 -05:00
Just Call Me Koko	3bb45c1ff3	Fix not saving APs during wardrive	2026-01-11 13:01:32 -05:00
Just Call Me Koko	e3fe40ede0	Merge pull request #1043 from justcallmekoko/develop Fix distance threshold	2026-01-11 00:39:49 -05:00
Just Call Me Koko	b09be1c093	Fix distance threshold	2026-01-10 22:32:30 -05:00
Just Call Me Koko	8e0ed07483	Merge pull request #1042 from justcallmekoko/develop Oopsie	2026-01-09 23:02:25 -05:00
Just Call Me Koko	0ff6411407	Oopsie	2026-01-09 22:57:35 -05:00
Just Call Me Koko	249ba6eabe	Merge pull request #1041 from justcallmekoko/develop MAC track BLE and revamp wardrive UI	2026-01-09 17:41:00 -05:00
Just Call Me Koko	7a19fcb458	MAC track BLE and revamp wardrive UI	2026-01-09 17:32:56 -05:00
Just Call Me Koko	88762063ff	Merge pull request #1040 from justcallmekoko/develop Add CLI command for MAC tracking	2026-01-08 12:45:44 -05:00
Just Call Me Koko	26370241ee	Add CLI command for MAC tracking	2026-01-08 12:40:54 -05:00
Just Call Me Koko	9d2a1ab3aa	Merge pull request #1036 from justcallmekoko/develop GPS now operates at 115200 baud	2026-01-07 17:51:54 -05:00
Just Call Me Koko	6a360b236c	GPS now operates at 115200 baud	2026-01-07 17:44:41 -05:00
Just Call Me Koko	a20b25a39c	Merge pull request #1034 from justcallmekoko/develop Fix eviction criteria and work mini displays	2026-01-06 16:35:03 -05:00
Just Call Me Koko	cb4a6cd51e	Fix eviction criteria and work mini displays	2026-01-06 13:47:06 -05:00
Just Call Me Koko	a785a3b125	Merge pull request #1033 from justcallmekoko/develop Add MAC tracking backend	2026-01-05 20:55:24 -05:00
Just Call Me Koko	7a7c01512b	Fix non-display hardware	2026-01-05 20:29:42 -05:00
Just Call Me Koko	60f446245d	Add location for MAC tracking	2026-01-05 19:02:02 -05:00
Just Call Me Koko	fb73afd359	Add backend for MAC tracking	2026-01-05 00:17:49 -05:00
Just Call Me Koko	337cf18dac	Add menu item for mac monitor	2026-01-04 03:03:50 -05:00
Just Call Me Koko	380875d32f	Merge pull request #1029 from justcallmekoko/develop Update version number	2026-01-03 14:50:37 -05:00
Just Call Me Koko	ae79653628	Update version number	2026-01-03 14:44:51 -05:00
Just Call Me Koko	d03c079080	Merge pull request #1028 from justcallmekoko/develop Fix wardriving function on CLI	2026-01-03 14:29:58 -05:00
Just Call Me Koko	70154f5074	Fix wardriving function on CLI	2026-01-03 14:19:36 -05:00
Just Call Me Koko	8ef5cf3b92	Merge pull request #1015 from justcallmekoko/develop Faster display buffer	2025-12-13 14:48:34 -05:00
Just Call Me Koko	b3eade1e06	Faster display buffer	2025-12-13 14:43:08 -05:00
Just Call Me Koko	1dd5502c1d	Merge pull request #1012 from justcallmekoko/develop Fix crash during BT wardrive	2025-12-12 18:11:10 -05:00
Just Call Me Koko	1862a5b812	Fix crash during BT wardrive	2025-12-12 18:06:07 -05:00
Just Call Me Koko	f5375eedaf	Merge pull request #1006 from justcallmekoko/develop Wardriving is asynchronous now	2025-12-08 16:45:31 -05:00
Just Call Me Koko	2910addb8a	Ensure async wardrive	2025-12-08 16:32:25 -05:00
Just Call Me Koko	be3971d081	Wardriving is async	2025-12-08 15:40:24 -05:00
Just Call Me Koko	86e2fb206a	Merge pull request #1005 from justcallmekoko/develop Add wifi to flock wardrive	2025-12-08 15:10:53 -05:00
Just Call Me Koko	431fa175a0	Update WiFiScan.cpp	2025-12-08 15:04:09 -05:00
Just Call Me Koko	976687980c	Add wifi to flock wardrive	2025-12-08 14:53:55 -05:00
Just Call Me Koko	1d419605f7	Merge pull request #1001 from justcallmekoko/develop Fix menu navigation for back button	2025-12-04 18:36:50 -05:00
Just Call Me Koko	1624d98183	Fix menu navigation for back button	2025-12-04 18:12:28 -05:00