From 80f817660f022bd6a0ab5541b059a9803c2fd8ce Mon Sep 17 00:00:00 2001 From: Just Call Me Koko Date: Wed, 30 Apr 2025 08:53:40 -0400 Subject: [PATCH] Expose AP name for evil portal --- .github/workflows/build_parallel.yml | 31 +++--- esp32_marauder/EvilPortal.cpp | 4 + esp32_marauder/configs.h | 148 +++++++++++++++++++++++++++ 3 files changed, 168 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build_parallel.yml b/.github/workflows/build_parallel.yml index 23bbaab..47943a0 100644 --- a/.github/workflows/build_parallel.yml +++ b/.github/workflows/build_parallel.yml @@ -17,21 +17,22 @@ jobs: fail-fast: false matrix: 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" } - - { name: "Flipper Zero Multi Board", flag: "MARAUDER_FLIPPER", fbqn: "esp32:esp32:esp32s3:PartitionScheme=min_spiffs,FlashSize=8M,PSRAM=enabled", file_name: "multiboardS3", tft: false, tft_file: "", build_dir: "esp32s3", addr: "0x0" } - - { name: "OG Marauder", flag: "MARAUDER_V4", fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs", file_name: "og", tft: true, tft_file: "User_Setup_og_marauder.h", build_dir: "d32", addr: "0x1000" } - - { 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" } - - { 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" } - - { 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" } - - { 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" } - - { 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" } - - { 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" } - - { 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" } - - { 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" } - - { 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" } - - { 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" } - - { 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" } - - { 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" } + - { 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" } + - { name: "Flipper Zero Multi Board", flag: "MARAUDER_FLIPPER", fbqn: "esp32:esp32:esp32s3:PartitionScheme=min_spiffs,FlashSize=8M,PSRAM=enabled", file_name: "multiboardS3", tft: false, tft_file: "", build_dir: "esp32s3", addr: "0x0" } + - { name: "OG Marauder", flag: "MARAUDER_V4", fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs", file_name: "og", tft: true, tft_file: "User_Setup_og_marauder.h", build_dir: "d32", addr: "0x1000" } + - { 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" } + - { 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" } + - { 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" } + - { 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" } + - { 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" } + - { 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" } + - { 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" } + - { 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" } + - { 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" } + - { 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" } + - { 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" } + - { 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" } + - { 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" } steps: - name: Checkout Code diff --git a/esp32_marauder/EvilPortal.cpp b/esp32_marauder/EvilPortal.cpp index 5586a06..cbe329f 100644 --- a/esp32_marauder/EvilPortal.cpp +++ b/esp32_marauder/EvilPortal.cpp @@ -51,6 +51,10 @@ void EvilPortal::setupServer() { #endif }); + server.on("/get-ap-name", HTTP_GET, [this](AsyncWebServerRequest *request) { + request->send(200, "text/plain", WiFi.softAPSSID()); + }); + server.on("/get", HTTP_GET, [this](AsyncWebServerRequest *request) { String inputMessage; String inputParam; diff --git a/esp32_marauder/configs.h b/esp32_marauder/configs.h index 9cf385e..c956aad 100644 --- a/esp32_marauder/configs.h +++ b/esp32_marauder/configs.h @@ -14,6 +14,7 @@ //#define MARAUDER_V6 //#define MARAUDER_V6_1 //#define MARAUDER_V7 + #define MARAUDER_V7_1 //#define MARAUDER_KIT //#define GENERIC_ESP32 //#define MARAUDER_FLIPPER @@ -38,6 +39,8 @@ #define HARDWARE_NAME "Marauder Mini" #elif defined(MARAUDER_V7) #define HARDWARE_NAME "Marauder v7" + #elif defined(MARAUDER_V7_1) + #define HARDWARE_NAME "Marauder v7.1" #elif defined(MARAUDER_REV_FEATHER) #define HARDWARE_NAME "Adafruit Feather ESP32-S2 Reverse TFT" #elif defined(MARAUDER_V4) @@ -113,6 +116,22 @@ #define HAS_GPS #endif + #ifdef MARAUDER_V7_1 + //#define FLIPPER_ZERO_HAT + #define HAS_BATTERY + #define HAS_BT + #define HAS_BT_REMOTE + #define HAS_BUTTONS + #define HAS_NEOPIXEL_LED + //#define HAS_PWR_MGMT + #define HAS_SCREEN + #define HAS_FULL_SCREEN + #define HAS_SD + #define USE_SD + #define HAS_TEMP_SENSOR + #define HAS_GPS + #endif + #ifdef MARAUDER_REV_FEATHER //#define FLIPPER_ZERO_HAT //#define HAS_BATTERY @@ -356,6 +375,26 @@ #define D_PULL true #endif + #ifdef MARAUDER_V7_1 + #define L_BTN 13 + #define C_BTN 34 + #define U_BTN 36 + #define R_BTN 39 + #define D_BTN 35 + + #define HAS_L + #define HAS_R + #define HAS_U + #define HAS_D + #define HAS_C + + #define L_PULL true + #define C_PULL true + #define U_PULL true + #define R_PULL true + #define D_PULL true + #endif + #if defined(MARAUDER_M5STICKC) || defined(MARAUDER_M5STICKCP2) #define L_BTN -1 #define C_BTN 37 @@ -943,6 +982,73 @@ #define KIT_LED_BUILTIN 13 #endif + #ifdef MARAUDER_V7_1 + #define SCREEN_CHAR_WIDTH 40 + //#define HAS_ILI9341 + + #define BANNER_TEXT_SIZE 2 + + #ifndef TFT_WIDTH + #define TFT_WIDTH 240 + #endif + + #ifndef TFT_HEIGHT + #define TFT_HEIGHT 320 + #endif + + #define GRAPH_VERT_LIM TFT_HEIGHT/2 + + #define TFT_DIY + + #define SCREEN_BUFFER + + #define MAX_SCREEN_BUFFER 22 + + #define EXT_BUTTON_WIDTH 0 + + #define CHAR_WIDTH 12 + #define SCREEN_WIDTH TFT_WIDTH + #define SCREEN_HEIGHT TFT_HEIGHT + #define HEIGHT_1 TFT_WIDTH + #define WIDTH_1 TFT_HEIGHT + #define STANDARD_FONT_CHAR_LIMIT (TFT_WIDTH/6) // number of characters on a single line with normal font + #define TEXT_HEIGHT 16 // Height of text to be printed and scrolled + #define BOT_FIXED_AREA 0 // Number of lines in bottom fixed area (lines counted from bottom of screen) + #define TOP_FIXED_AREA 48 // Number of lines in top fixed area (lines counted from top of screen) + #define YMAX 320 // Bottom of screen area + #define minimum(a,b) (((a) < (b)) ? (a) : (b)) + //#define MENU_FONT NULL + #define MENU_FONT &FreeMono9pt7b // Winner + //#define MENU_FONT &FreeMonoBold9pt7b + //#define MENU_FONT &FreeSans9pt7b + //#define MENU_FONT &FreeSansBold9pt7b + #define BUTTON_SCREEN_LIMIT 12 + #define BUTTON_ARRAY_LEN BUTTON_SCREEN_LIMIT + #define STATUS_BAR_WIDTH 16 + #define LVGL_TICK_PERIOD 6 + + #define FRAME_X 100 + #define FRAME_Y 64 + #define FRAME_W 120 + #define FRAME_H 50 + + // Red zone size + #define REDBUTTON_X FRAME_X + #define REDBUTTON_Y FRAME_Y + #define REDBUTTON_W (FRAME_W/2) + #define REDBUTTON_H FRAME_H + + // Green zone size + #define GREENBUTTON_X (REDBUTTON_X + REDBUTTON_W) + #define GREENBUTTON_Y FRAME_Y + #define GREENBUTTON_W (FRAME_W/2) + #define GREENBUTTON_H FRAME_H + + #define STATUSBAR_COLOR 0x4A49 + + #define KIT_LED_BUILTIN 13 + #endif + #ifdef MARAUDER_KIT #define SCREEN_CHAR_WIDTH 40 #define HAS_ILI9341 @@ -1248,6 +1354,25 @@ //#define BUTTON_ARRAY_LEN 5 #endif + #ifdef MARAUDER_V7_1 + #define BANNER_TIME 100 + + #define COMMAND_PREFIX "!" + + // Keypad start position, key sizes and spacing + #define KEY_X 120 // Centre of key + #define KEY_Y 50 + #define KEY_W 240 // Width and height + #define KEY_H 22 + #define KEY_SPACING_X 0 // X and Y gap + #define KEY_SPACING_Y 1 + #define KEY_TEXTSIZE 1 // Font size multiplier + #define ICON_W 22 + #define ICON_H 22 + #define BUTTON_PADDING 22 + //#define BUTTON_ARRAY_LEN 5 + #endif + #ifdef MARAUDER_KIT #define BANNER_TIME 100 @@ -1357,6 +1482,10 @@ #define SD_CS 4 #endif + #ifdef MARAUDER_V7_1 + #define SD_CS 4 + #endif + #ifdef MARAUDER_REV_FEATHER #define SD_CS 5 #endif @@ -1441,6 +1570,8 @@ #define MEM_LOWER_LIM 10000 #elif defined(MARAUDER_V7) #define MEM_LOWER_LIM 10000 + #elif defined(MARAUDER_V7_1) + #define MEM_LOWER_LIM 10000 #elif defined(MARAUDER_REV_FEATHER) #define MEM_LOWER_LIM 10000 #elif defined(MARAUDER_V4) @@ -1493,6 +1624,8 @@ #define MAX_HTML_SIZE 11400 #elif defined(MARAUDER_V7) #define MAX_HTML_SIZE 11400 + #elif defined(MARAUDER_V7_1) + #define MAX_HTML_SIZE 11400 #elif defined(MARAUDER_REV_FEATHER) #define MAX_HTML_SIZE 11400 #elif defined(MARAUDER_V4) @@ -1562,6 +1695,11 @@ #define GPS_TX 21 #define GPS_RX 22 #define mac_history_len 100 + #elif defined(MARAUDER_V7_1) + #define GPS_SERIAL_INDEX 2 + #define GPS_TX 21 + #define GPS_RX 22 + #define mac_history_len 100 #elif defined(MARAUDER_FLIPPER) #define GPS_SERIAL_INDEX 1 #define GPS_TX 9 @@ -1621,6 +1759,11 @@ #define I2C_SCL 16 #endif + #ifdef MARAUDER_V7_1 + #define I2C_SDA 33 + #define I2C_SCL 27 + #endif + #endif //// MARAUDER TITLE STUFF @@ -1638,6 +1781,8 @@ #define MARAUDER_TITLE_BYTES 13578 #elif defined(MARAUDER_V7) #define MARAUDER_TITLE_BYTES 13578 + #elif defined(MARAUDER_V7_1) + #define MARAUDER_TITLE_BYTES 13578 #elif defined(MARAUDER_REV_FEATHER) #define MARAUDER_TITLE_BYTES 13578 #else @@ -1650,6 +1795,9 @@ #ifdef MARAUDER_V7 #define BUF_SIZE 8 * 1024 // Had to reduce buffer size to save RAM. GG @spacehuhn #define SNAP_LEN 4096 // max len of each recieved packet + #elif defined(MARAUDER_V7_1) + #define BUF_SIZE 8 * 1024 // Had to reduce buffer size to save RAM. GG @spacehuhn + #define SNAP_LEN 4096 // max len of each recieved packet #elif defined(MARAUDER_MINI) #define BUF_SIZE 8 * 1024 // Had to reduce buffer size to save RAM. GG @spacehuhn #define SNAP_LEN 4096 // max len of each recieved packet