Merge pull request #826 from justcallmekoko/develop

Develop

.github/workflows/build_parallel.yml

@@ -18,7 +18,7 @@ jobs:
       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: "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" }
           - { 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" }
@@ -69,6 +69,13 @@ jobs:
         run: |
           find /home/runner/.arduino15/packages/esp32/hardware/
           
+      - name: Install ESP32Ping
+        uses: actions/checkout@v2
+        with:
+          repository: marian-craciunescu/ESP32Ping
+          ref: 1.6
+          path: CustomESP32Ping
+          
       - name: Install AsyncTCP
         uses: actions/checkout@v2
         with:
@@ -122,7 +129,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: h2zero/NimBLE-Arduino
-          ref: 1.3.5
+          ref: 1.3.8
           path: CustomNimBLE-Arduino
 
       - name: Install Adafruit_NeoPixel

User_Setup_Select.h

@@ -30,6 +30,7 @@
 //#include <User_Setup_pocket_sdr.h>
 //#include <User_Setup_dual_nrf24.h>
 //#include <User_Setup_pocket_sdr_2.h>
+//#include <User_Setup_pocket_sdr_3.h>
 //#include <User_Setup_cyd_micro.h>
 //#include <User_Setup_cyd_guition.h>
 //#include <User_Setup_cyd_2usb.h>

User_Setup_pocket_sdr_3.h

@@ -0,0 +1,330 @@
+//                            USER DEFINED SETTINGS
+//   Set driver type, fonts to be loaded, pins used and SPI control method etc
+//
+//   See the User_Setup_Select.h file if you wish to be able to define multiple
+//   setups and then easily select which setup file is used by the compiler.
+//
+//   If this file is edited correctly then all the library example sketches should
+//   run without the need to make any more changes for a particular hardware setup!
+//   Note that some sketches are designed for a particular TFT pixel width/height
+
+
+// ##################################################################################
+//
+// Section 1. Call up the right driver file and any options for it
+//
+// ##################################################################################
+
+// Display type -  only define if RPi display
+//#define RPI_DRIVER
+
+// Only define one driver, the other ones must be commented out
+//#define ILI9341_DRIVER // OG Marauder
+#define ST7735_DRIVER    // Marauder Mini  // Define additional parameters below for this display
+//#define ILI9163_DRIVER     // Define additional parameters below for this display
+//#define S6D02A1_DRIVER
+//#define RPI_ILI9486_DRIVER // 20MHz maximum SPI
+//#define HX8357D_DRIVER
+//#define ILI9481_DRIVER
+//#define ILI9486_DRIVER
+//#define ILI9488_DRIVER     // WARNING: Do not connect ILI9488 display SDO to MISO if other devices share the SPI bus (TFT SDO does NOT tristate when CS is high)
+//#define ST7789_DRIVER      // Full configuration option, define additional parameters below for this display
+//#define ST7789_2_DRIVER    // Minimal configuration option, define additional parameters below for this display
+//#define R61581_DRIVER
+//#define RM68140_DRIVER
+//#define ST7796_DRIVER
+
+// Some displays support SPI reads via the MISO pin, other displays have a single
+// bi-directional SDA pin and the library will try to read this via the MOSI line.
+// To use the SDA line for reading data from the TFT uncomment the following line:
+
+// #define TFT_SDA_READ      // This option is for ESP32 ONLY, tested with ST7789 display only
+
+// For ST7789 and ILI9341 ONLY, define the colour order IF the blue and red are swapped on your display
+// Try ONE option at a time to find the correct colour order for your display
+
+//  #define TFT_RGB_ORDER TFT_RGB  // Colour order Red-Green-Blue
+  #define TFT_RGB_ORDER TFT_BGR  // Colour order Blue-Green-Red
+
+// For M5Stack ESP32 module with integrated ILI9341 display ONLY, remove // in line below
+
+// #define M5STACK
+
+// For ST7789, ST7735 and ILI9163 ONLY, define the pixel width and height in portrait orientation
+ #define TFT_WIDTH  80
+// #define TFT_WIDTH  128 // Marauder Mini
+// #define TFT_WIDTH  240 // ST7789 240 x 240 and 240 x 320
+ #define TFT_HEIGHT 160
+// #define TFT_HEIGHT 128 // Marauder Mini
+// #define TFT_HEIGHT 240 // ST7789 240 x 240
+// #define TFT_HEIGHT 320 // ST7789 240 x 320
+
+// For ST7735 ONLY, define the type of display, originally this was based on the
+// colour of the tab on the screen protector film but this is not always true, so try
+// out the different options below if the screen does not display graphics correctly,
+// e.g. colours wrong, mirror images, or tray pixels at the edges.
+// Comment out ALL BUT ONE of these options for a ST7735 display driver, save this
+// this User_Setup file, then rebuild and upload the sketch to the board again:
+
+// #define ST7735_INITB
+// #define ST7735_GREENTAB
+// #define ST7735_GREENTAB2
+// #define ST7735_GREENTAB3
+// #define ST7735_GREENTAB128    // For 128 x 128 display
+// #define ST7735_GREENTAB160x80 // For 160 x 80 display (BGR, inverted, 26 offset)
+// #define ST7735_REDTAB
+// #define ST7735_BLACKTAB
+ #define ST7735_REDTAB160x80   // For 160 x 80 display with 24 pixel offset
+
+// If colours are inverted (white shows as black) then uncomment one of the next
+// 2 lines try both options, one of the options should correct the inversion.
+
+// #define TFT_INVERSION_ON
+ #define TFT_INVERSION_OFF
+
+// If a backlight control signal is available then define the TFT_BL pin in Section 2
+// below. The backlight will be turned ON when tft.begin() is called, but the library
+// needs to know if the LEDs are ON with the pin HIGH or LOW. If the LEDs are to be
+// driven with a PWM signal or turned OFF/ON then this must be handled by the user
+// sketch. e.g. with digitalWrite(TFT_BL, LOW);
+
+ #define TFT_BACKLIGHT_ON LOW  // HIGH or LOW are options
+
+// ##################################################################################
+//
+// Section 2. Define the pins that are used to interface with the display here
+//
+// ##################################################################################
+
+// We must use hardware SPI, a minimum of 3 GPIO pins is needed.
+// Typical setup for ESP8266 NodeMCU ESP-12 is :
+//
+// Display SDO/MISO  to NodeMCU pin D6 (or leave disconnected if not reading TFT)
+// Display LED       to NodeMCU pin VIN (or 5V, see below)
+// Display SCK       to NodeMCU pin D5
+// Display SDI/MOSI  to NodeMCU pin D7
+// Display DC (RS/AO)to NodeMCU pin D3
+// Display RESET     to NodeMCU pin D4 (or RST, see below)
+// Display CS        to NodeMCU pin D8 (or GND, see below)
+// Display GND       to NodeMCU pin GND (0V)
+// Display VCC       to NodeMCU 5V or 3.3V
+//
+// The TFT RESET pin can be connected to the NodeMCU RST pin or 3.3V to free up a control pin
+//
+// The DC (Data Command) pin may be labeled AO or RS (Register Select)
+//
+// With some displays such as the ILI9341 the TFT CS pin can be connected to GND if no more
+// SPI devices (e.g. an SD Card) are connected, in this case comment out the #define TFT_CS
+// line below so it is NOT defined. Other displays such at the ST7735 require the TFT CS pin
+// to be toggled during setup, so in these cases the TFT_CS line must be defined and connected.
+//
+// The NodeMCU D0 pin can be used for RST
+//
+//
+// Note: only some versions of the NodeMCU provide the USB 5V on the VIN pin
+// If 5V is not available at a pin you can use 3.3V but backlight brightness
+// will be lower.
+
+
+// ###### EDIT THE PIN NUMBERS IN THE LINES FOLLOWING TO SUIT YOUR ESP8266 SETUP ######
+
+// For NodeMCU - use pin numbers in the form PIN_Dx where Dx is the NodeMCU pin designation
+//#define TFT_CS   PIN_D8  // Chip select control pin D8
+//#define TFT_DC   PIN_D3  // Data Command control pin
+//#define TFT_RST  PIN_D4  // Reset pin (could connect to NodeMCU RST, see next line)
+//#define TFT_RST  -1    // Set TFT_RST to -1 if the display RESET is connected to NodeMCU RST or 3.3V
+
+//#define TFT_BL PIN_D1  // LED back-light (only for ST7789 with backlight control pin)
+
+//#define TOUCH_CS PIN_D2     // Chip select pin (T_CS) of touch screen
+
+//#define TFT_WR PIN_D2       // Write strobe for modified Raspberry Pi TFT only
+
+
+// ######  FOR ESP8266 OVERLAP MODE EDIT THE PIN NUMBERS IN THE FOLLOWING LINES  ######
+
+// Overlap mode shares the ESP8266 FLASH SPI bus with the TFT so has a performance impact
+// but saves pins for other functions. It is best not to connect MISO as some displays
+// do not tristate that line wjen chip select is high!
+// On NodeMCU 1.0 SD0=MISO, SD1=MOSI, CLK=SCLK to connect to TFT in overlap mode
+// On NodeMCU V3  S0 =MISO, S1 =MOSI, S2 =SCLK
+// In ESP8266 overlap mode the following must be defined
+
+//#define TFT_SPI_OVERLAP
+
+// In ESP8266 overlap mode the TFT chip select MUST connect to pin D3
+//#define TFT_CS   PIN_D3
+//#define TFT_DC   PIN_D5  // Data Command control pin
+//#define TFT_RST  PIN_D4  // Reset pin (could connect to NodeMCU RST, see next line)
+//#define TFT_RST  -1  // Set TFT_RST to -1 if the display RESET is connected to NodeMCU RST or 3.3V
+
+
+// ###### EDIT THE PIN NUMBERS IN THE LINES FOLLOWING TO SUIT YOUR ESP32 SETUP   ######
+
+// For ESP32 Dev board (only tested with ILI9341 display)
+// The hardware SPI can be mapped to any pins
+
+// Marauder Mini
+// Drone Detector v1
+
+#define TFT_CS   23  // Chip select control pin D8
+#define TFT_DC   24  // Data Command control pin
+#define TFT_RST  -1  // Reset pin (could connect to NodeMCU RST, see next line)
+#define TOUCH_CS -1
+//#define TFT_MISO 16
+#define TFT_MOSI 7
+#define TFT_SCLK 6
+#define TFT_BL   27
+
+
+// Drone Detector v2
+/*
+#define TFT_CS   17  // Chip select control pin D8
+#define TFT_DC   26  // Data Command control pin
+#define TFT_RST  -1  // Reset pin (could connect to NodeMCU RST, see next line)
+#define TOUCH_CS -1
+//#define TFT_MISO 16
+#define TFT_MOSI 23
+#define TFT_SCLK 18
+#define TFT_BL   32
+*/
+/*
+// ESP32 Marauder 
+#define TFT_MISO 19
+#define TFT_MOSI 23
+#define TFT_SCLK 18
+#define TFT_CS   17  // Chip select control pin
+#define TFT_DC   16  // Data Command control pin
+#define TFT_RST   5  // Reset pin (could connect to RST pin)
+//#define TFT_RST  -1  // Set TFT_RST to -1 if display RESET is connected to ESP32 board RST
+
+#define TFT_BL   32  // LED back-light (only for ST7789 with backlight control pin)
+
+#define TOUCH_CS 21     // Chip select pin (T_CS) of touch screen
+*/
+/////////////////////////////
+
+// ESP32 Centauri
+/*
+#define TFT_MISO 19
+#define TFT_MOSI 23
+#define TFT_SCLK 18
+#define TFT_CS   27  // Chip select control pin
+#define TFT_DC   26  // Data Command control pin
+#define TFT_RST   5  // Reset pin (could connect to RST pin)
+//#define TFT_RST  -1  // Set TFT_RST to -1 if display RESET is connected to ESP32 board RST
+
+#define TFT_BL   32  // LED back-light (only for ST7789 with backlight control pin)
+
+#define TOUCH_CS 21     // Chip select pin (T_CS) of touch screen
+*/
+/////////////////////////////
+
+//#define TFT_WR 22    // Write strobe for modified Raspberry Pi TFT only
+
+// For the M5Stack module use these #define lines
+//#define TFT_MISO 19
+//#define TFT_MOSI 23
+//#define TFT_SCLK 18
+//#define TFT_CS   14  // Chip select control pin
+//#define TFT_DC   27  // Data Command control pin
+//#define TFT_RST  33  // Reset pin (could connect to Arduino RESET pin)
+//#define TFT_BL   32  // LED back-light (required for M5Stack)
+
+// ######       EDIT THE PINs BELOW TO SUIT YOUR ESP32 PARALLEL TFT SETUP        ######
+
+// The library supports 8 bit parallel TFTs with the ESP32, the pin
+// selection below is compatible with ESP32 boards in UNO format.
+// Wemos D32 boards need to be modified, see diagram in Tools folder.
+// Only ILI9481 and ILI9341 based displays have been tested!
+
+// Parallel bus is only supported on ESP32
+// Uncomment line below to use ESP32 Parallel interface instead of SPI
+
+//#define ESP32_PARALLEL
+
+// The ESP32 and TFT the pins used for testing are:
+//#define TFT_CS   33  // Chip select control pin (library pulls permanently low
+//#define TFT_DC   15  // Data Command control pin - must use a pin in the range 0-31
+//#define TFT_RST  32  // Reset pin, toggles on startup
+
+//#define TFT_WR    4  // Write strobe control pin - must use a pin in the range 0-31
+//#define TFT_RD    2  // Read strobe control pin
+
+//#define TFT_D0   12  // Must use pins in the range 0-31 for the data bus
+//#define TFT_D1   13  // so a single register write sets/clears all bits.
+//#define TFT_D2   26  // Pins can be randomly assigned, this does not affect
+//#define TFT_D3   25  // TFT screen update performance.
+//#define TFT_D4   17
+//#define TFT_D5   16
+//#define TFT_D6   27
+//#define TFT_D7   14
+
+
+// ##################################################################################
+//
+// Section 3. Define the fonts that are to be used here
+//
+// ##################################################################################
+
+// Comment out the #defines below with // to stop that font being loaded
+// The ESP8366 and ESP32 have plenty of memory so commenting out fonts is not
+// normally necessary. If all fonts are loaded the extra FLASH space required is
+// about 17Kbytes. To save FLASH space only enable the fonts you need!
+
+#define LOAD_GLCD   // Font 1. Original Adafruit 8 pixel font needs ~1820 bytes in FLASH
+#define LOAD_FONT2  // Font 2. Small 16 pixel high font, needs ~3534 bytes in FLASH, 96 characters
+#define LOAD_FONT4  // Font 4. Medium 26 pixel high font, needs ~5848 bytes in FLASH, 96 characters
+#define LOAD_FONT6  // Font 6. Large 48 pixel font, needs ~2666 bytes in FLASH, only characters 1234567890:-.apm
+#define LOAD_FONT7  // Font 7. 7 segment 48 pixel font, needs ~2438 bytes in FLASH, only characters 1234567890:-.
+#define LOAD_FONT8  // Font 8. Large 75 pixel font needs ~3256 bytes in FLASH, only characters 1234567890:-.
+//#define LOAD_FONT8N // Font 8. Alternative to Font 8 above, slightly narrower, so 3 digits fit a 160 pixel TFT
+#define LOAD_GFXFF  // FreeFonts. Include access to the 48 Adafruit_GFX free fonts FF1 to FF48 and custom fonts
+
+// Comment out the #define below to stop the SPIFFS filing system and smooth font code being loaded
+// this will save ~20kbytes of FLASH
+#define SMOOTH_FONT
+
+
+// ##################################################################################
+//
+// Section 4. Other options
+//
+// ##################################################################################
+
+// Define the SPI clock frequency, this affects the graphics rendering speed. Too
+// fast and the TFT driver will not keep up and display corruption appears.
+// With an ILI9341 display 40MHz works OK, 80MHz sometimes fails
+// With a ST7735 display more than 27MHz may not work (spurious pixels and lines)
+// With an ILI9163 display 27 MHz works OK.
+
+// #define SPI_FREQUENCY   1000000
+//#define SPI_FREQUENCY   5000000
+// #define SPI_FREQUENCY  10000000
+// #define SPI_FREQUENCY  20000000
+#define SPI_FREQUENCY  27000000 // Marauder // Actually sets it to 26.67MHz = 80/3
+// #define SPI_FREQUENCY  40000000
+// #define SPI_FREQUENCY  80000000
+
+// Optional reduced SPI frequency for reading TFT
+//#define SPI_READ_FREQUENCY  20000000
+
+// The XPT2046 requires a lower SPI clock rate of 2.5MHz so we define that here:
+//#define SPI_TOUCH_FREQUENCY  2500000
+
+// The ESP32 has 2 free SPI ports i.e. VSPI and HSPI, the VSPI is the default.
+// If the VSPI port is in use and pins are not accessible (e.g. TTGO T-Beam)
+// then uncomment the following line:
+//#define USE_HSPI_PORT
+
+// Comment out the following #define if "SPI Transactions" do not need to be
+// supported. When commented out the code size will be smaller and sketches will
+// run slightly faster, so leave it commented out unless you need it!
+
+// Transaction support is needed to work with SD library but not needed with TFT_SdFat
+// Transaction support is required if other SPI devices are connected.
+
+// Transactions are automatically enabled by the library for an ESP32 (to use HAL mutex)
+// so changing it here has no effect
+
+// #define SUPPORT_TRANSACTIONS

esp32_marauder/Assets.h

@@ -221,7 +221,13 @@ PROGMEM static const unsigned char menu_icons[][66] = {
     0x3B, 0x77, 0x37, 0xBD, 0x6A, 0x2F, 0xD6, 0xBD, 0x1A, 0xDA, 0xDA, 0x16, 
     0x5A, 0x6F, 0x16, 0x9A, 0xF7, 0x16, 0xD6, 0x5A, 0x1A, 0xDD, 0xBD, 0x2E, 
     0xBB, 0x5A, 0x37, 0x3F, 0x6F, 0x3F, 0x7F, 0xB7, 0x3F, 0xFF, 0xCC, 0x3F, 
-    0xFF, 0xF3, 0x3F, 0xFF, 0xFF, 0x3F}
+    0xFF, 0xF3, 0x3F, 0xFF, 0xFF, 0x3F},
+    {0xFF, 0xFF, 0xFF, 0xFF, 0x07, 0xFF, 0xFF, 0xFC, 0xFF, 0xF3, 0x87, 0xF7, // JOINED: 38
+    0x7F, 0xEE, 0xFF, 0xED, 0xC7, 0xDD, 0xBF, 0xDB, 0x7F, 0xDB, 0x67, 0xDB, 
+    0x67, 0xDB, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF},
+    {0xFF, 0xFF, 0x1F, 0xF8, 0x0F, 0xF0, 0x07, 0xE0, 0x07, 0xE0, 0x07, 0xE0, // FORCE: 39
+    0x67, 0xE6, 0x77, 0xEE, 0x87, 0xE0, 0x8F, 0xF1, 0x0F, 0xF0, 0x4F, 0xF5, 
+    0x1F, 0xF8, 0x3F, 0xFC, 0xFF, 0xFF, 0xFF, 0xFF}
 };
 
 /*#ifndef MARAUDER_MINI

esp32_marauder/CommandLine.cpp

@@ -221,6 +221,8 @@ void CommandLine::runCommand(String input) {
     // WiFi sniff/scan
     Serial.println(HELP_EVIL_PORTAL_CMD);
     Serial.println(HELP_PACKET_COUNT_CMD);
+    Serial.println(HELP_PING_CMD);
+    Serial.println(HELP_PORT_SCAN_CMD);
     Serial.println(HELP_SIGSTREN_CMD);
     Serial.println(HELP_SCAN_ALL_CMD);
     Serial.println(HELP_SCANAP_CMD);
@@ -248,11 +250,13 @@ void CommandLine::runCommand(String input) {
     Serial.println(HELP_LIST_AP_CMD_B);
     Serial.println(HELP_LIST_AP_CMD_C);
     Serial.println(HELP_LIST_AP_CMD_D);
+    Serial.println(HELP_LIST_AP_CMD_E);
     Serial.println(HELP_SEL_CMD_A);
     Serial.println(HELP_SSID_CMD_A);
     Serial.println(HELP_SSID_CMD_B);
     Serial.println(HELP_SAVE_CMD);
     Serial.println(HELP_LOAD_CMD);
+    Serial.println(HELP_JOIN_CMD);
     
     // Bluetooth sniff/scan
     #ifdef HAS_BT
@@ -282,9 +286,16 @@ void CommandLine::runCommand(String input) {
     //  web_obj.shutdownServer();
     //  return;
     //}
+
+    int f_arg = this->argSearch(&cmd_args, "-f");
     
     uint8_t old_scan_mode=wifi_scan_obj.currentScanMode;
 
+    if (f_arg != -1) {
+      WiFi.disconnect(true);
+      delay(100);
+    }
+
     wifi_scan_obj.StartScan(WIFI_SCAN_OFF);
 
     if(old_scan_mode == WIFI_SCAN_GPS_NMEA)
@@ -1160,6 +1171,52 @@ 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);
+      #ifdef HAS_SCREEN
+        display_obj.clearScreen();
+        menu_function_obj.drawStatusBar();
+      #endif
+      wifi_scan_obj.StartScan(WIFI_PING_SCAN, TFT_GREEN);
+    }
+
+    // Port Scan
+    if (cmd_args.get(0) == PORT_SCAN_CMD) {
+      int all_sw = this->argSearch(&cmd_args, "-a");
+      int ip_sw = this->argSearch(&cmd_args, "-t");
+
+      // Check they specified ip index
+      if (ip_sw != -1) {
+        int ip_index = cmd_args.get(ip_sw + 1).toInt();
+
+        // Check provided index is in list
+        if (ip_index < ipList->size()) {
+
+          // Full port scan
+          if (all_sw != -1) {
+            Serial.println("Selected: " + ipList->get(ip_index).toString());
+            wifi_scan_obj.current_scan_ip = ipList->get(ip_index);
+            #ifdef HAS_SCREEN
+              display_obj.clearScreen();
+              menu_function_obj.drawStatusBar();
+            #endif
+            wifi_scan_obj.StartScan(WIFI_PORT_SCAN_ALL, TFT_BLUE);
+          }
+        }
+        else {
+          Serial.println("The IP index specified is out of range");
+          return;
+        }
+      }
+      else {
+        Serial.println("You did not specify an IP index");
+        return;
+      }
+    }
+  }
+
 
   int count_selected = 0;
   //// WiFi aux commands
@@ -1169,6 +1226,7 @@ void CommandLine::runCommand(String input) {
     int ss_sw = this->argSearch(&cmd_args, "-s");
     int cl_sw = this->argSearch(&cmd_args, "-c");
     int at_sw = this->argSearch(&cmd_args, "-t");
+    int ip_sw = this->argSearch(&cmd_args, "-i");
 
     // List APs
     if (ap_sw != -1) {
@@ -1182,6 +1240,12 @@ void CommandLine::runCommand(String input) {
       }
       this->showCounts(count_selected);
     }
+    // List IPs
+    else if (ip_sw != -1) {
+      for (int i = 0; i < ipList->size(); i++) {
+        Serial.println("[" + (String)i + "] " + ipList->get(i).toString());
+      }
+    }
     // List SSIDs
     else if (ss_sw != -1) {
       for (int i = 0; i < ssids->size(); i++) {
@@ -1241,6 +1305,28 @@ void CommandLine::runCommand(String input) {
       wifi_scan_obj.RunInfo();
     }
   }
+  else if (cmd_args.get(0) == JOIN_CMD) {
+    int ap_sw = this->argSearch(&cmd_args, "-a");
+    int pw_sw = this->argSearch(&cmd_args, "-p");
+
+    if ((ap_sw != -1) && (pw_sw != -1)) {
+      int index = cmd_args.get(ap_sw + 1).toInt();
+      String password = cmd_args.get(pw_sw + 1);
+      Serial.println("Using SSID: " + (String)access_points->get(index).essid + " Password: " + (String)password);
+      //wifi_scan_obj.currentScanMode = LV_JOIN_WIFI;
+      //wifi_scan_obj.StartScan(LV_JOIN_WIFI, TFT_YELLOW); 
+      wifi_scan_obj.joinWiFi(access_points->get(index).essid, password, false);
+      #ifdef HAS_SCREEN
+        #ifdef HAS_MINI_KB
+          menu_function_obj.changeMenu(menu_function_obj.current_menu);
+        #endif
+      #endif
+    }
+    else {
+      Serial.println("You did not provide the proper args");
+      return;
+    }
+  }
   // Select access points or stations
   else if (cmd_args.get(0) == SEL_CMD) {
     // Get switches

esp32_marauder/CommandLine.h

@@ -34,6 +34,7 @@ extern LinkedList<AccessPoint>* access_points;
 extern LinkedList<AirTag>* airtags;
 extern LinkedList<ssid>* ssids;
 extern LinkedList<Station>* stations;
+extern LinkedList<IPAddress>* ipList;
 extern const String PROGMEM version_number;
 extern const String PROGMEM board_target;
 
@@ -70,6 +71,8 @@ const char PROGMEM SNIFF_DEAUTH_CMD[] = "sniffdeauth";
 const char PROGMEM SNIFF_PMKID_CMD[] = "sniffpmkid";
 const char PROGMEM STOPSCAN_CMD[] = "stopscan";
 const char PROGMEM WARDRIVE_CMD[] = "wardrive";
+const char PROGMEM PING_CMD[] = "pingscan";
+const char PROGMEM PORT_SCAN_CMD[] = "portscan";
 
 // WiFi attack
 const char PROGMEM ATTACK_CMD[] = "attack";
@@ -85,6 +88,7 @@ const char PROGMEM SEL_CMD[] = "select";
 const char PROGMEM SSID_CMD[] = "ssid";
 const char PROGMEM SAVE_CMD[] = "save";
 const char PROGMEM LOAD_CMD[] = "load";
+const char PROGMEM JOIN_CMD[] = "join";
 
 // Bluetooth sniff/scan
 const char PROGMEM BT_SPAM_CMD[] = "blespam";
@@ -128,8 +132,10 @@ const char PROGMEM HELP_SNIFF_MULTISSID_CMD[] = "sniffmultissid";
 const char PROGMEM HELP_SNIFF_ESP_CMD[] = "sniffesp";
 const char PROGMEM HELP_SNIFF_DEAUTH_CMD[] = "sniffdeauth";
 const char PROGMEM HELP_SNIFF_PMKID_CMD[] = "sniffpmkid [-c <channel>][-d][-l]";
-const char PROGMEM HELP_STOPSCAN_CMD[] = "stopscan";
+const char PROGMEM HELP_STOPSCAN_CMD[] = "stopscan [-f]";
 const char PROGMEM HELP_WARDRIVE_CMD[] = "wardrive [-s]";
+const char PROGMEM HELP_PING_CMD[] = "pingscan";
+const char PROGMEM HELP_PORT_SCAN_CMD[] = "portscan [-a] -t <ip index>";
 
 // WiFi attack
 const char PROGMEM HELP_ATTACK_CMD[] = "attack -t <beacon [-l/-r/-a]/deauth [-c]/[-s <src mac>] [-d <dst mac>]/probe/rickroll>";
@@ -139,12 +145,14 @@ const char PROGMEM HELP_LIST_AP_CMD_A[] = "list -s";
 const char PROGMEM HELP_LIST_AP_CMD_B[] = "list -a";
 const char PROGMEM HELP_LIST_AP_CMD_C[] = "list -c";
 const char PROGMEM HELP_LIST_AP_CMD_D[] = "list -t";
+const char PROGMEM HELP_LIST_AP_CMD_E[] = "list -i";
 const char PROGMEM HELP_INFO_CMD[] = "info [-a <index>]";
 const char PROGMEM HELP_SEL_CMD_A[] = "select -a/-s/-c <index (comma separated)>/-f \"equals <String> or contains <String>\"";
 const char PROGMEM HELP_SSID_CMD_A[] = "ssid -a [-g <count>/-n <name>]";
 const char PROGMEM HELP_SSID_CMD_B[] = "ssid -r <index>";
 const char PROGMEM HELP_SAVE_CMD[] = "save -a/-s";
 const char PROGMEM HELP_LOAD_CMD[] = "load -a/-s";
+const char PROGMEM HELP_JOIN_CMD[] = "join -a <index> -p <password>";
 
 // Bluetooth sniff/scan
 const char PROGMEM HELP_BT_SNIFF_CMD[] = "sniffbt [-t] <airtag/flipper>";

esp32_marauder/Display.cpp

@@ -11,7 +11,7 @@ Display::Display()
 {
 }
 
-int8_t Display::menuButton(uint16_t *x, uint16_t *y, bool pressed) {
+int8_t Display::menuButton(uint16_t *x, uint16_t *y, bool pressed, bool check_hold) {
   #ifdef HAS_ILI9341
     for (uint8_t b = BUTTON_ARRAY_LEN; b < BUTTON_ARRAY_LEN + 3; b++) {
       if (pressed && this->key[b].contains(*x, *y)) {
@@ -22,8 +22,15 @@ int8_t Display::menuButton(uint16_t *x, uint16_t *y, bool pressed) {
     }
 
     for (uint8_t b = BUTTON_ARRAY_LEN; b < BUTTON_ARRAY_LEN + 3; b++) {
-      if ((this->key[b].justReleased()) && (!pressed)) {
-        return b - BUTTON_ARRAY_LEN;
+      if (!check_hold) {
+        if ((this->key[b].justReleased()) && (!pressed)) {
+          return b - BUTTON_ARRAY_LEN;
+        }
+      }
+      else {
+        if ((this->key[b].isPressed())) {
+          return b - BUTTON_ARRAY_LEN;
+        }
       }
     }
 
@@ -80,6 +87,28 @@ uint8_t Display::updateTouch(uint16_t *x, uint16_t *y, uint16_t threshold) {
   return 0;
 }
 
+bool Display::isTouchHeld(uint16_t threshold) {
+  static unsigned long touchStartTime = 0;
+  static bool touchHeld = false;
+  uint16_t x, y;
+
+  if (this->updateTouch(&x, &y, threshold)) {
+    // Touch detected
+    if (touchStartTime == 0) {
+      touchStartTime = millis();  // First touch timestamp
+    } else if (!touchHeld && millis() - touchStartTime >= 1000) {
+      touchHeld = true;  // Held for at least 1000ms
+      return true;
+    }
+  } else {
+    // Touch released
+    touchStartTime = 0;
+    touchHeld = false;
+  }
+
+  return false;
+}
+
 // Function to prepare the display and the menus
 void Display::RunSetup()
 {

esp32_marauder/Display.h

@@ -118,8 +118,9 @@ class Display
     // We can speed up scrolling of short text lines by just blanking the character we drew
     int blank[19]; // We keep all the strings pixel lengths to optimise the speed of the top line blanking
 
-    int8_t menuButton(uint16_t *x, uint16_t *y, bool pressed);
+    int8_t menuButton(uint16_t *x, uint16_t *y, bool pressed, bool check_hold = false);
     uint8_t updateTouch(uint16_t *x, uint16_t *y, uint16_t threshold = 600);
+    bool isTouchHeld(uint16_t threshold = 600);
     void tftDrawRedOnOffButton();
     void tftDrawGreenOnOffButton();
     void tftDrawGraphObjects(byte x_scale);

esp32_marauder/EvilPortal.cpp

@@ -72,6 +72,30 @@ void EvilPortal::setupServer() {
     });
   #endif
 
+  const char* captiveEndpoints[] = {
+    "/hotspot-detect.html",
+    "/library/test/success.html",
+    "/success.txt",
+    "/generate_204",
+    "/gen_204",
+    "/ncsi.txt",
+    "/connecttest.txt",
+    "/redirect"
+  };
+
+  for (int i = 0; i < sizeof(captiveEndpoints) / sizeof(captiveEndpoints[0]); i++) {
+    
+    #ifndef HAS_PSRAM
+      server.on(captiveEndpoints[i], HTTP_GET, [this](AsyncWebServerRequest *request){
+        request->send_P(200, "text/html", index_html);
+      });
+    #else
+      server.on(captiveEndpoints[i], HTTP_GET, [this](AsyncWebServerRequest *request){
+        request->send(200, "text/html", index_html);
+      });
+    #endif
+  }
+
   server.on("/get-ap-name", HTTP_GET, [this](AsyncWebServerRequest *request) {
     request->send(200, "text/plain", WiFi.softAPSSID());
   });

esp32_marauder/MenuFunctions.h

@@ -76,6 +76,8 @@ extern Settings settings_obj;
 #define BLANK 36
 #define PINESCAN_SNIFF 37 // Use blanks icon
 #define MULTISSID_SNIFF 37 // Use blanks icon
+#define JOINED 38
+#define FORCE 39
 
 PROGMEM void my_disp_flush(lv_disp_drv_t *disp, const lv_area_t *area, lv_color_t *color_p);
 PROGMEM bool my_touchpad_read(lv_indev_drv_t * indev_driver, lv_indev_data_t * data);
@@ -84,6 +86,7 @@ PROGMEM static lv_disp_buf_t disp_buf;
 PROGMEM static lv_color_t buf[LV_HOR_RES_MAX * 10];
 
 PROGMEM static void ta_event_cb(lv_obj_t * ta, lv_event_t event);
+PROGMEM static void join_wifi_keyboard_event_cb(lv_obj_t * keyboard, lv_event_t event);
 PROGMEM static void add_ssid_keyboard_event_cb(lv_obj_t * keyboard, lv_event_t event);
 PROGMEM static void html_list_cb(lv_obj_t * btn, lv_event_t event);
 PROGMEM static void ap_list_cb(lv_obj_t * btn, lv_event_t event);
@@ -163,12 +166,14 @@ class MenuFunctions
 
     // WiFi menu stuff
     Menu wifiSnifferMenu;
+    Menu wifiScannerMenu;
     Menu wifiAttackMenu;
     #ifdef HAS_GPS
       Menu wardrivingMenu;
     #endif
     Menu wifiGeneralMenu;
     Menu wifiAPMenu;
+    Menu wifiIPMenu;
     #ifdef HAS_BT
       Menu airtagMenu;
     #endif
@@ -183,6 +188,7 @@ class MenuFunctions
     Menu genAPMacMenu;
     Menu cloneAPMacMenu;
     Menu setMacMenu;
+    Menu selectProbeSSIDsMenu;
 
     // Bluetooth menu stuff
     Menu bluetoothSnifferMenu;
@@ -213,9 +219,9 @@ class MenuFunctions
     void displaySetting(String key, Menu* menu, int index);
     void buttonSelected(int b, int x = -1);
     void buttonNotSelected(int b, int x = -1);
-    #if (!defined(HAS_ILI9341) && defined(HAS_BUTTONS))
-      void miniKeyboard(Menu * targetMenu);
-    #endif
+    //#if (!defined(HAS_ILI9341) && defined(HAS_BUTTONS))
+      String miniKeyboard(Menu * targetMenu, bool do_pass = false);
+    //#endif
 
   public:
     MenuFunctions();
@@ -249,6 +255,7 @@ class MenuFunctions
 
     String loaded_file = "";
 
+    void joinWiFiGFX(String essid);
     void setGraphScale(float scale);
     void initLVGL();
     void deinitLVGL();

esp32_marauder/WiFiScan.cpp

@@ -15,6 +15,8 @@ LinkedList<AccessPoint>* access_points;
 LinkedList<Station>* stations;
 LinkedList<AirTag>* airtags;
 LinkedList<Flipper>* flippers;
+LinkedList<IPAddress>* ipList;
+LinkedList<ProbeReqSsid>* probe_req_ssids;
 
 extern "C" int ieee80211_raw_frame_sanity_check(int32_t arg, int32_t arg2, int32_t arg3){
     if (arg == 31337)
@@ -546,6 +548,8 @@ void WiFiScan::RunSetup() {
   stations = new LinkedList<Station>();
   airtags = new LinkedList<AirTag>();
   flippers = new LinkedList<Flipper>();
+  ipList = new LinkedList<IPAddress>();
+  probe_req_ssids = new LinkedList<ProbeReqSsid>;
   // for Pinescan
   pinescan_trackers = new LinkedList<PineScanTracker>();
   confirmed_pinescan = new LinkedList<ConfirmedPineScan>();
@@ -610,6 +614,13 @@ void WiFiScan::RunSetup() {
   this->initWiFi(1);
 }
 
+bool WiFiScan::isHostAlive(IPAddress ip) {
+  if (ip != IPAddress(0, 0, 0, 0))
+    return Ping.ping(ip, 1);  // 1 try, returns true if reply received
+  else
+    return false;
+}
+
 int WiFiScan::clearStations() {
   int num_cleared = stations->size();
   stations->clear();
@@ -637,6 +648,14 @@ int WiFiScan::clearAPs() {
   return num_cleared;
 }
 
+int WiFiScan::clearIPs() {
+  int num_cleared = ipList->size();
+  while (ipList->size() > 0)
+    ipList->remove(0);
+  Serial.println("ipList: " + (String)ipList->size());
+  return num_cleared;
+}
+
 int WiFiScan::clearAirtags() {
   int num_cleared = airtags->size();
   while (airtags->size() > 0)
@@ -691,69 +710,140 @@ int WiFiScan::generateSSIDs(int count) {
   return num_gen;
 }
 
-/*void WiFiScan::joinWiFi(String ssid, String password)
+bool WiFiScan::joinWiFi(String ssid, String password, bool gui)
 {
   static const char * btns[] ={text16, ""};
   int count = 0;
   
   if ((WiFi.status() == WL_CONNECTED) && (ssid == connected_network) && (ssid != "")) {
-    #ifdef HAS_SCREEN
-      lv_obj_t * mbox1 = lv_msgbox_create(lv_scr_act(), NULL);
-      lv_msgbox_set_text(mbox1, text_table4[2]);
-      lv_msgbox_add_btns(mbox1, btns);
-      lv_obj_set_width(mbox1, 200);
-      lv_obj_align(mbox1, NULL, LV_ALIGN_CENTER, 0, 0); //Align to the corner
+    #ifdef HAS_TOUCH
+      if (gui) {
+        lv_obj_t * mbox1 = lv_msgbox_create(lv_scr_act(), NULL);
+        lv_msgbox_set_text(mbox1, text_table4[2]);
+        lv_msgbox_add_btns(mbox1, btns);
+        lv_obj_set_width(mbox1, 200);
+        lv_obj_align(mbox1, NULL, LV_ALIGN_CENTER, 0, 0); //Align to the corner
+      }
     #endif
     this->wifi_initialized = true;
-    return;
+    this->currentScanMode = WIFI_CONNECTED;
+    return true;
   }
   else if (WiFi.status() == WL_CONNECTED) {
     Serial.println("Already connected. Disconnecting...");
     WiFi.disconnect();
   }
 
-  esp_wifi_init(&cfg);
-  esp_wifi_set_storage(WIFI_STORAGE_RAM);
-  esp_wifi_set_mode(WIFI_MODE_NULL);
-  esp_wifi_start();
+  WiFi.disconnect(true);
+  delay(100);
+  WiFi.mode(WIFI_MODE_STA);
+
+  //esp_wifi_set_mode(WIFI_IF_STA);
+
+  this->setMac();
     
   WiFi.begin(ssid.c_str(), password.c_str());
 
+  #ifdef HAS_SCREEN
+    #ifdef HAS_MINI_KB
+      if (gui) {
+        display_obj.clearScreen();
+        display_obj.tft.setCursor(0, TFT_HEIGHT / 2);
+        display_obj.tft.setTextSize(1);
+        display_obj.tft.print("Connecting");
+        display_obj.tft.setTextWrap(true, false);
+      }
+    #endif
+  #endif
+
   Serial.print("Connecting to WiFi");
   while (WiFi.status() != WL_CONNECTED) {
     delay(500);
     Serial.print(".");
+    #ifdef HAS_SCREEN
+      #ifdef HAS_MINI_KB
+        if (gui) {
+          display_obj.tft.print(".");
+        }
+      #endif
+    #endif
     count++;
-    if (count == 10)
+    if (count == 20)
     {
       Serial.println("\nCould not connect to WiFi network");
       #ifdef HAS_SCREEN
-        lv_obj_t * mbox1 = lv_msgbox_create(lv_scr_act(), NULL);
-        lv_msgbox_set_text(mbox1, text_table4[3]);
-        lv_msgbox_add_btns(mbox1, btns);
-        lv_obj_set_width(mbox1, 200);
-        //lv_obj_set_event_cb(mbox1, event_handler);
-        lv_obj_align(mbox1, NULL, LV_ALIGN_CENTER, 0, 0); //Align to the corner
+        #ifdef HAS_MINI_KB
+          if (gui) {
+            display_obj.tft.println("\nFailed to connect");
+            delay(1000);
+          }
+        #endif
       #endif
-      WiFi.mode(WIFI_OFF);
-      return;
+      #ifdef HAS_TOUCH
+        if (gui) {
+          lv_obj_t * mbox1 = lv_msgbox_create(lv_scr_act(), NULL);
+          lv_msgbox_set_text(mbox1, text_table4[3]);
+          lv_msgbox_add_btns(mbox1, btns);
+          lv_obj_set_width(mbox1, 200);
+          //lv_obj_set_event_cb(mbox1, event_handler);
+          lv_obj_align(mbox1, NULL, LV_ALIGN_CENTER, 0, 0); //Align to the corner
+        }
+      #endif
+      this->wifi_initialized = true;
+      this->StartScan(WIFI_SCAN_OFF, TFT_BLACK);
+      #ifdef HAS_SCREEN
+        display_obj.tft.setTextWrap(false, false);
+      #endif
+      return false;
     }
   }
   
-  #ifdef HAS_SCREEN
+  #ifdef HAS_TOUCH
     lv_obj_t * mbox1 = lv_msgbox_create(lv_scr_act(), NULL);
     lv_msgbox_set_text(mbox1, text_table4[4]);
     lv_msgbox_add_btns(mbox1, btns);
     lv_obj_set_width(mbox1, 200);
     lv_obj_align(mbox1, NULL, LV_ALIGN_CENTER, 0, 0); //Align to the corner
   #endif
-  connected_network = ssid;
+  this->connected_network = ssid;
+  this->ip_addr = WiFi.localIP();
+  this->gateway = WiFi.gatewayIP();
+  this->subnet = WiFi.subnetMask();
   
   Serial.println("\nConnected to the WiFi network");
   Serial.print("IP address: ");
-  Serial.println(WiFi.localIP());
+  Serial.println(this->ip_addr);
+  Serial.print("Gateway: ");
+  Serial.println(this->gateway);
+  Serial.print("Netmask: ");
+  Serial.println(this->subnet);
+  Serial.print("MAC: ");
+  Serial.println(WiFi.macAddress());
+
+  #ifdef HAS_SCREEN
+    #ifdef HAS_MINI_KB
+      display_obj.tft.println("\nConnected!");
+      display_obj.tft.print("IP address: ");
+      display_obj.tft.println(this->ip_addr);
+      display_obj.tft.print("Gateway: ");
+      display_obj.tft.println(this->gateway);
+      display_obj.tft.print("Netmask: ");
+      display_obj.tft.println(this->subnet);
+      display_obj.tft.print("MAC: ");
+      display_obj.tft.println(WiFi.macAddress());
+      display_obj.tft.println("Returning...");
+      delay(2000);
+    #endif
+  #endif
   this->wifi_initialized = true;
-}*/
+  #ifndef HAS_TOUCH
+    this->currentScanMode = WIFI_CONNECTED;
+    #ifdef HAS_SCREEN
+      display_obj.tft.setTextWrap(false, false);
+    #endif
+  #endif
+  return true;
+}
 
 // Apply WiFi settings
 void WiFiScan::initWiFi(uint8_t scan_mode) {
@@ -881,13 +971,22 @@ void WiFiScan::StartScan(uint8_t scan_mode, uint16_t color)
       RunLvJoinWiFi(scan_mode, color);
     #endif
   }
+  else if (scan_mode == LV_JOIN_WIFI) {
+    #ifdef HAS_SCREEN
+      RunLvJoinWiFi(scan_mode, color);
+    #endif
+  }
   else if (scan_mode == WIFI_SCAN_GPS_NMEA){
     #ifdef HAS_GPS
       gps_obj.enable_queue();
     #endif
   }
+  else if (scan_mode == WIFI_PING_SCAN)
+    RunPingScan(scan_mode, color);
+  else if (scan_mode == WIFI_PORT_SCAN_ALL)
+    RunPortScanAll(scan_mode, color);
 
-  WiFiScan::currentScanMode = scan_mode;
+  this->currentScanMode = scan_mode;
 }
 
 void WiFiScan::startWiFiAttacks(uint8_t scan_mode, uint16_t color, String title_string) {
@@ -950,17 +1049,19 @@ void WiFiScan::startWiFiAttacks(uint8_t scan_mode, uint16_t color, String title_
 
 bool WiFiScan::shutdownWiFi() {
   if (this->wifi_initialized) {
-    esp_wifi_set_promiscuous(false);
-    WiFi.disconnect();
-    WiFi.mode(WIFI_OFF);
+    if (!this->wifi_connected) {
+      esp_wifi_set_promiscuous(false);
+      WiFi.disconnect();
+      WiFi.mode(WIFI_OFF);
 
-    dst_mac = "ff:ff:ff:ff:ff:ff";
-  
-    esp_wifi_set_mode(WIFI_MODE_NULL);
-    esp_wifi_stop();
-    esp_wifi_restore();
-    esp_wifi_deinit();
-    esp_netif_deinit(); 
+      dst_mac = "ff:ff:ff:ff:ff:ff";
+    
+      esp_wifi_set_mode(WIFI_MODE_NULL);
+      esp_wifi_stop();
+      esp_wifi_restore();
+      esp_wifi_deinit();
+      esp_netif_deinit(); 
+    }
 
     #ifdef HAS_FLIPPER_LED
       flipper_led.offLED();
@@ -974,7 +1075,9 @@ bool WiFiScan::shutdownWiFi() {
 
     this->_analyzer_value = 0;
   
-    this->wifi_initialized = false;
+    if (!this->wifi_connected)
+      this->wifi_initialized = false;
+
     return true;
   }
   else {
@@ -1047,6 +1150,8 @@ void WiFiScan::StopScan(uint8_t scan_mode)
   (currentScanMode == WIFI_SCAN_TARGET_AP) ||
   (currentScanMode == WIFI_SCAN_TARGET_AP_FULL) ||
   (currentScanMode == WIFI_SCAN_AP_STA) ||
+  (currentScanMode == WIFI_PING_SCAN) ||
+  (currentScanMode == WIFI_PORT_SCAN_ALL) ||
   (currentScanMode == WIFI_SCAN_PWN) ||
   (currentScanMode == WIFI_SCAN_PINESCAN) ||
   (currentScanMode == WIFI_SCAN_MULTISSID) ||
@@ -1066,10 +1171,19 @@ void WiFiScan::StopScan(uint8_t scan_mode)
   (currentScanMode == WIFI_PACKET_MONITOR) ||
   (currentScanMode == WIFI_SCAN_CHAN_ANALYZER) ||
   (currentScanMode == WIFI_SCAN_PACKET_RATE) ||
-  (currentScanMode == LV_JOIN_WIFI))
+  (currentScanMode == WIFI_CONNECTED) ||
+  (currentScanMode == LV_JOIN_WIFI) ||
+  (this->wifi_initialized))
   {
     this->shutdownWiFi();
 
+    if (!this->wifi_connected) {
+      this->connected_network = "";
+      this->ip_addr = IPAddress(0, 0, 0, 0);
+      this->gateway = IPAddress(0, 0, 0, 0);
+      this->subnet = IPAddress(0, 0, 0, 0);
+    }
+
     #ifdef HAS_SCREEN
       for (int i = 0; i < TFT_WIDTH; i++) {
         this->_analyzer_values[i] = 0;
@@ -1314,6 +1428,127 @@ void WiFiScan::parseBSSID(const char* bssidStr, uint8_t* bssid) {
          &bssid[3], &bssid[4], &bssid[5]);
 }
 
+void WiFiScan::RunPingScan(uint8_t scan_mode, uint16_t color)
+{
+  startLog("pingscan");
+
+  #ifdef HAS_FLIPPER_LED
+    flipper_led.sniffLED();
+  #elif defined(XIAO_ESP32_S3)
+    xiao_led.sniffLED();
+  #elif defined(MARAUDER_M5STICKC)
+    stickc_led.sniffLED();
+  #else
+    led_obj.setMode(MODE_SNIFF);
+  #endif
+  
+  #ifdef HAS_SCREEN
+    display_obj.TOP_FIXED_AREA_2 = 48;
+    display_obj.tteBar = true;
+    display_obj.print_delay_1 = 15;
+    display_obj.print_delay_2 = 10;
+    display_obj.initScrollValues(true);
+    display_obj.tft.setTextWrap(false);
+    display_obj.tft.setTextColor(TFT_BLACK, color);
+    #ifdef HAS_FULL_SCREEN
+      display_obj.tft.fillRect(0,16,240,16, color);
+      display_obj.tft.drawCentreString("Ping Scan",120,16,2);
+    #endif
+    #ifdef HAS_ILI9341
+      display_obj.touchToExit();
+    #endif
+    display_obj.tft.setTextColor(TFT_RED, TFT_BLACK);
+    display_obj.setupScrollArea(display_obj.TOP_FIXED_AREA_2, BOT_FIXED_AREA);
+  #endif
+  this->current_scan_ip = this->gateway;
+  Serial.println("Cleared IPs: " + (String)this->clearIPs());
+  Serial.println("Starting Ping Scan with...");
+  Serial.print("IP address: ");
+  Serial.println(this->ip_addr);
+  Serial.print("Gateway: ");
+  Serial.println(this->gateway);
+  Serial.print("Netmask: ");
+  Serial.println(this->subnet);
+  Serial.print("MAC: ");
+  Serial.println(WiFi.macAddress());
+
+  buffer_obj.append("Starting Ping Scan with...");
+  buffer_obj.append("\nSSID: " + (String)this->connected_network);
+  buffer_obj.append("\nIP address: ");
+  buffer_obj.append(this->ip_addr.toString());
+  buffer_obj.append("\nGateway: ");
+  buffer_obj.append(this->gateway.toString());
+  buffer_obj.append("\nNetmask: ");
+  buffer_obj.append(this->subnet.toString());
+  buffer_obj.append("\nMAC: ");
+  buffer_obj.append((String)WiFi.macAddress());
+  buffer_obj.append("\n");
+
+  this->scan_complete = false;
+  initTime = millis();
+}
+
+void WiFiScan::RunPortScanAll(uint8_t scan_mode, uint16_t color)
+{
+  startLog("portscan");
+
+  #ifdef HAS_FLIPPER_LED
+    flipper_led.sniffLED();
+  #elif defined(XIAO_ESP32_S3)
+    xiao_led.sniffLED();
+  #elif defined(MARAUDER_M5STICKC)
+    stickc_led.sniffLED();
+  #else
+    led_obj.setMode(MODE_SNIFF);
+  #endif
+  
+  #ifdef HAS_SCREEN
+    display_obj.TOP_FIXED_AREA_2 = 48;
+    display_obj.tteBar = true;
+    display_obj.print_delay_1 = 15;
+    display_obj.print_delay_2 = 10;
+    display_obj.initScrollValues(true);
+    display_obj.tft.setTextWrap(false);
+    display_obj.tft.setTextColor(TFT_BLACK, color);
+    #ifdef HAS_FULL_SCREEN
+      display_obj.tft.fillRect(0,16,240,16, color);
+      display_obj.tft.drawCentreString("Port Scan All",120,16,2);
+    #endif
+    #ifdef HAS_ILI9341
+      display_obj.touchToExit();
+    #endif
+    display_obj.tft.setTextColor(TFT_RED, TFT_BLACK);
+    display_obj.setupScrollArea(display_obj.TOP_FIXED_AREA_2, BOT_FIXED_AREA);
+  #endif
+
+  this->current_scan_port = 0;
+
+  Serial.println("Starting Port Scan with...");
+  Serial.print("IP address: ");
+  Serial.println(this->ip_addr);
+  Serial.print("Gateway: ");
+  Serial.println(this->gateway);
+  Serial.print("Netmask: ");
+  Serial.println(this->subnet);
+  Serial.print("MAC: ");
+  Serial.println(WiFi.macAddress());
+
+  buffer_obj.append("Starting Port Scan with...");
+  buffer_obj.append("\nSSID: " + (String)this->connected_network);
+  buffer_obj.append("\nIP address: ");
+  buffer_obj.append(this->ip_addr.toString());
+  buffer_obj.append("\nGateway: ");
+  buffer_obj.append(this->gateway.toString());
+  buffer_obj.append("\nNetmask: ");
+  buffer_obj.append(this->subnet.toString());
+  buffer_obj.append("\nMAC: ");
+  buffer_obj.append((String)WiFi.macAddress());
+  buffer_obj.append("\n");
+
+  this->scan_complete = false;
+  initTime = millis();
+}
+
 void WiFiScan::RunLoadATList() {
   #ifdef HAS_SD
     // Prepare to access the file
@@ -1725,8 +1960,10 @@ void WiFiScan::RunAPScan(uint8_t scan_mode, uint16_t color)
 #ifdef HAS_SCREEN
   void WiFiScan::RunLvJoinWiFi(uint8_t scan_mode, uint16_t color) {
   
-    display_obj.tft.init();
-    display_obj.tft.setRotation(1);
+    #ifdef HAS_TOUCH
+      display_obj.tft.init();
+      display_obj.tft.setRotation(1);
+    #endif
     
     #ifndef HAS_CYD_TOUCH
       #ifdef TFT_SHIELD
@@ -1734,7 +1971,7 @@ void WiFiScan::RunAPScan(uint8_t scan_mode, uint16_t color)
         Serial.println("Using TFT Shield");
       #else if defined(TFT_DIY)
         uint16_t calData[5] = { 213, 3469, 320, 3446, 1 }; // Landscape TFT DIY
-        Serial.println("Using TFT DIY");
+        Serial.println("Using TFT DIY (join wifi)");
       #endif
       #ifdef HAS_ILI9341
         display_obj.tft.setTouch(calData);
@@ -1743,9 +1980,10 @@ void WiFiScan::RunAPScan(uint8_t scan_mode, uint16_t color)
       //display_obj.touchscreen.setRotation(1);
     #endif
     
-  
-    lv_obj_t * scr = lv_cont_create(NULL, NULL);
-    lv_disp_load_scr(scr);
+    #ifdef HAS_TOUCH
+      lv_obj_t * scr = lv_cont_create(NULL, NULL);
+      lv_disp_load_scr(scr);
+    #endif
   
   }
 #endif
@@ -3115,6 +3353,8 @@ void WiFiScan::RunDeauthScan(uint8_t scan_mode, uint16_t color)
 // Function for running probe request scan
 void WiFiScan::RunProbeScan(uint8_t scan_mode, uint16_t color)
 {
+  probe_req_ssids->clear();
+
   if (scan_mode == WIFI_SCAN_PROBE)
     startPcap("probe");
   else if (scan_mode == WIFI_SCAN_STATION_WAR_DRIVE) {
@@ -3198,8 +3438,6 @@ void WiFiScan::RunSourApple(uint8_t scan_mode, uint16_t color) {
       display_obj.tft.setTextColor(TFT_GREEN, TFT_BLACK);
     #endif
 
-    this->ble_initialized;
-
     #ifdef HAS_FLIPPER_LED
       flipper_led.sniffLED();
     #elif defined(XIAO_ESP32_S3)
@@ -3244,7 +3482,6 @@ void WiFiScan::RunSwiftpairSpam(uint8_t scan_mode, uint16_t color) {
       display_obj.tft.setTextColor(TFT_GREEN, TFT_BLACK);
     #endif
 
-    this->ble_initialized;
 
     #ifdef HAS_FLIPPER_LED
       flipper_led.attackLED();
@@ -5537,6 +5774,8 @@ void WiFiScan::probeSnifferCallback(void* buf, wifi_promiscuous_pkt_type_t type)
     if ((snifferPacket->payload[0] == 0x40) && (buf == 0))
     {
       if (wifi_scan_obj.currentScanMode == WIFI_SCAN_PROBE) {
+        String probe_req_essid;
+
         delay(random(0, 10));
         Serial.print("RSSI: ");
         Serial.print(snifferPacket->rx_ctrl.rssi);
@@ -5552,9 +5791,30 @@ void WiFiScan::probeSnifferCallback(void* buf, wifi_promiscuous_pkt_type_t type)
         for (int i = 0; i < snifferPacket->payload[25]; i++)
         {
           Serial.print((char)snifferPacket->payload[26 + i]);
-          display_string.concat((char)snifferPacket->payload[26 + i]);
+          probe_req_essid.concat((char)snifferPacket->payload[26 + i]);
         }
 
+        display_string.concat(probe_req_essid);
+
+        if (probe_req_essid.length() > 0) {
+            bool essidExist = false;
+            for (int i = 0; i < probe_req_ssids->size(); i++) {
+                ProbeReqSsid cur_probe_ssid = probe_req_ssids->get(i);
+                if (cur_probe_ssid.essid == probe_req_essid) {
+                    cur_probe_ssid.requests++;
+	      	    probe_req_ssids->set(i, cur_probe_ssid);
+                    essidExist = true;
+                    break;
+                }
+            }
+            if (!essidExist) {
+				      ProbeReqSsid probeReqSsid;
+				      probeReqSsid.essid = probe_req_essid;
+              probeReqSsid.requests = 1;
+				      probeReqSsid.selected = false;
+              probe_req_ssids->add(probeReqSsid);
+            }
+        }
         // Print spaces because of the rotating lines of the hardware scroll.
         // The same characters print from previous lines so I just overwrite them
         // with spaces.
@@ -7096,6 +7356,91 @@ void WiFiScan::packetRateLoop(uint32_t tick) {
   #endif
 }
 
+bool WiFiScan::checkHostPort(IPAddress ip, uint16_t port, uint16_t timeout) {
+  WiFiClient client;
+
+  client.setTimeout(timeout);
+
+  if (client.connect(ip, port)) {
+    client.stop();
+    return true;
+  }
+
+  client.stop();
+  return false;
+}
+
+void WiFiScan::pingScan() {
+  String display_string = "";
+  String output_line = "";
+  if (this->current_scan_ip != IPAddress(0, 0, 0, 0)) {
+    this->current_scan_ip = getNextIP(this->current_scan_ip, this->subnet);
+    
+    // Check if IP is alive
+    if (this->isHostAlive(this->current_scan_ip)) {
+      output_line = this->current_scan_ip.toString();
+      display_string.concat(output_line);
+      uint8_t temp_len = display_string.length();
+      for (uint8_t i = 0; i < 40 - temp_len; i++)
+      {
+        display_string.concat(" ");
+      }
+      ipList->add(this->current_scan_ip);
+      #ifdef HAS_SCREEN
+        display_obj.display_buffer->add(display_string);
+      #endif
+      buffer_obj.append(output_line + "\n");
+      Serial.println(output_line);
+    }
+  }
+  else {
+    if (!this->scan_complete) {
+      this->scan_complete = true;
+      #ifdef HAS_SCREEN
+        display_obj.display_buffer->add("Scan complete");
+      #endif
+    }
+  }
+}
+
+void WiFiScan::portScan(uint8_t scan_mode) {
+  String display_string = "";
+  if (scan_mode == WIFI_PORT_SCAN_ALL) {
+    if (this->current_scan_port < MAX_PORT) {
+      this->current_scan_port = getNextPort(this->current_scan_port);
+      if (this->current_scan_port % 1000 == 0) {
+        Serial.print("Checking IP: ");
+        Serial.print(this->current_scan_ip);
+        Serial.print(" Port: ");
+        Serial.println(this->current_scan_port);
+      }
+      if (this->checkHostPort(this->current_scan_ip, this->current_scan_port, 100)) {
+        String output_line = this->current_scan_ip.toString() + ": " + (String)this->current_scan_port;
+        display_string.concat(output_line);
+        uint8_t temp_len = display_string.length();
+        for (uint8_t i = 0; i < 40 - temp_len; i++)
+        {
+          display_string.concat(" ");
+        }
+        #ifdef HAS_SCREEN
+          display_obj.display_buffer->add(display_string);
+        #endif
+        Serial.println(output_line);
+        buffer_obj.append(output_line + "\n");
+      }
+    }
+    else {
+      if (!this->scan_complete) {
+        this->scan_complete = true;
+        #ifdef HAS_SCREEN
+          display_obj.display_buffer->add("Scan complete");
+        #endif
+      }
+    }
+  }
+
+}
+
 
 // Function for updating scan status
 void WiFiScan::main(uint32_t currentTime)
@@ -7119,6 +7464,12 @@ void WiFiScan::main(uint32_t currentTime)
       channelHop();
     }
   }
+  else if (currentScanMode == WIFI_PING_SCAN) {
+    this->pingScan();
+  }
+  else if (currentScanMode == WIFI_PORT_SCAN_ALL) {
+    this->portScan(WIFI_PORT_SCAN_ALL);
+  }
   else if (currentScanMode == WIFI_SCAN_SIG_STREN) {
     #ifdef HAS_ILI9341
       this->signalAnalyzerLoop(currentTime);
@@ -7468,4 +7819,12 @@ void WiFiScan::main(uint32_t currentTime)
       if(gps_obj.queue_enabled())
         gps_obj.disable_queue();
   #endif
+
+  if (WiFi.status() == WL_CONNECTED) {
+    this->wifi_connected = true;
+    this->wifi_initialized = true;
+  }
+  else {
+    this->wifi_connected = false;
+  }
 }

esp32_marauder/WiFiScan.h

@@ -11,10 +11,11 @@
 #include <vector>
 
 #ifdef HAS_BT
-  #include <NimBLEDevice.h>
+  #include <NimBLEDevice.h> // 1.3.8
 #endif
 
 #include <WiFi.h>
+#include <ESP32Ping.h>
 #include "EvilPortal.h"
 #include <math.h>
 #include "esp_wifi.h"
@@ -104,6 +105,9 @@
 #define WIFI_SCAN_AP_STA 49
 #define WIFI_SCAN_PINESCAN 50
 #define WIFI_SCAN_MULTISSID 51
+#define WIFI_CONNECTED 52
+#define WIFI_PING_SCAN 53
+#define WIFI_PORT_SCAN_ALL 54
 
 #define BASE_MULTIPLIER 4
 
@@ -118,6 +122,8 @@
 
 #define MAX_CHANNEL     14
 
+#define MAX_PORT 65535
+
 #define WIFI_SECURITY_OPEN   0
 #define WIFI_SECURITY_WEP    1
 #define WIFI_SECURITY_WPA    2
@@ -228,9 +234,6 @@ class WiFiScan
     // Settings
     uint mac_history_cursor = 0;
     uint8_t channel_hop_delay = 1;
-    bool force_pmkid = false;
-    bool force_probe = false;
-    bool save_pcap = false;
   
     int x_pos; //position along the graph x axis
     float y_pos_x; //current graph y axis position of X value
@@ -247,6 +250,8 @@ class WiFiScan
 
     bool wsl_bypass_enabled = false;
 
+    bool scan_complete = false;
+
     //int num_beacon = 0; // GREEN
     //int num_probe = 0; // BLUE
     //int num_deauth = 0; // RED
@@ -422,6 +427,10 @@ class WiFiScan
       NimBLEAdvertisementData GetUniversalAdvertisementData(EBLEPayloadType type);
     #endif
 
+    void pingScan();
+    void portScan(uint8_t scan_mode = WIFI_PORT_SCAN_ALL);
+    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[]);
     bool beaconHasWPS(const uint8_t* payload, int len);
@@ -480,6 +489,8 @@ class WiFiScan
     void RunSwiftpairSpam(uint8_t scan_mode, uint16_t color);
     void RunLvJoinWiFi(uint8_t scan_mode, uint16_t color);
     void RunEvilPortal(uint8_t scan_mode, uint16_t color);
+    void RunPingScan(uint8_t scan_mode, uint16_t color);
+    void RunPortScanAll(uint8_t scan_mode, uint16_t color);
     bool checkMem();
     void parseBSSID(const char* bssidStr, uint8_t* bssid);
 
@@ -502,6 +513,10 @@ class WiFiScan
     int8_t min_rssi = 0;
     int8_t max_rssi = -128;
 
+    bool force_pmkid = false;
+    bool force_probe = false;
+    bool save_pcap = false;
+
     String analyzer_name_string = "";
     
     uint8_t analyzer_frames_recvd = 0;
@@ -517,11 +532,20 @@ class WiFiScan
     bool orient_display = false;
     bool wifi_initialized = false;
     bool ble_initialized = false;
+    bool wifi_connected = false;
 
     String free_ram = "";
     String old_free_ram = "";
     String connected_network = "";
 
+    IPAddress ip_addr;
+    IPAddress gateway;
+    IPAddress subnet;
+
+    IPAddress current_scan_ip;
+
+    uint16_t current_scan_port = 1;
+
     String dst_mac = "ff:ff:ff:ff:ff:ff";
     byte src_mac[6] = {};
 
@@ -576,6 +600,7 @@ class WiFiScan
     void RunSetup();
     int clearSSIDs();
     int clearAPs();
+    int clearIPs();
     int clearAirtags();
     int clearFlippers();
     int clearStations();
@@ -586,7 +611,7 @@ class WiFiScan
     bool shutdownWiFi();
     bool shutdownBLE();
     bool scanning();
-    //void joinWiFi(String ssid, String password);
+    bool joinWiFi(String ssid, String password, bool gui = true);
     String getStaMAC();
     String getApMAC();
     String freeRAM();

esp32_marauder/configs.h

@@ -18,6 +18,7 @@
   //#define MARAUDER_KIT
   //#define GENERIC_ESP32
   //#define MARAUDER_FLIPPER
+  //#define MARAUDER_MULTIBOARD_S3
   //#define ESP32_LDDB
   //#define MARAUDER_DEV_BOARD_PRO
   //#define XIAO_ESP32_S3
@@ -27,7 +28,7 @@
   //#define MARAUDER_CYD_GUITION // ESP32-2432S024 GUITION
   //// END BOARD TARGETS
 
-  #define MARAUDER_VERSION "v1.6.2"
+  #define MARAUDER_VERSION "v1.7.2"
 
   #define GRAPH_REFRESH   100
 
@@ -60,6 +61,8 @@
     #define HARDWARE_NAME "Marauder Kit"
   #elif defined(MARAUDER_FLIPPER)
     #define HARDWARE_NAME "Flipper Zero Dev Board"
+  #elif defined(MARAUDER_MULTIBOARD_S3)
+    #define HARDWARE_NAME "Flipper Zero Multi Board S3"
   #elif defined(ESP32_LDDB)
     #define HARDWARE_NAME "ESP32 LDDB"
   #elif defined(MARAUDER_DEV_BOARD_PRO)
@@ -75,6 +78,7 @@
  //// BOARD FEATURES
   #if defined(MARAUDER_M5STICKC) || defined(MARAUDER_M5STICKCP2)
     //#define FLIPPER_ZERO_HAT
+    #define HAS_MINI_KB
     #define HAS_BATTERY
     #define HAS_BT
     #define HAS_BUTTONS
@@ -91,6 +95,7 @@
   #ifdef MARAUDER_MINI
     //#define FLIPPER_ZERO_HAT
     //#define HAS_BATTERY
+    #define HAS_MINI_KB
     #define HAS_BT
     #define HAS_BUTTONS
     #define HAS_NEOPIXEL_LED
@@ -105,6 +110,7 @@
 
   #ifdef MARAUDER_V7
     //#define FLIPPER_ZERO_HAT
+    #define HAS_MINI_KB
     #define HAS_BATTERY
     #define HAS_BT
     #define HAS_BT_REMOTE
@@ -121,6 +127,7 @@
 
   #ifdef MARAUDER_V7_1
     //#define FLIPPER_ZERO_HAT
+    #define HAS_MINI_KB
     #define HAS_BATTERY
     #define HAS_BT
     #define HAS_BT_REMOTE
@@ -140,6 +147,7 @@
     //#define FLIPPER_ZERO_HAT
     //#define HAS_BATTERY
     //#define HAS_BT
+    #define HAS_MINI_KB
     #define HAS_BUTTONS
     #define HAS_NEOPIXEL_LED
     //#define HAS_PWR_MGMT
@@ -152,6 +160,7 @@
   #endif
 
   #ifdef MARAUDER_V4
+    #define HAS_TOUCH
     //#define FLIPPER_ZERO_HAT
     #define HAS_BATTERY
     #define HAS_BT
@@ -167,6 +176,7 @@
   #endif
 
   #if defined(MARAUDER_V6) || defined(MARAUDER_V6_1)
+    #define HAS_TOUCH
     //#define FLIPPER_ZERO_HAT
     #define HAS_BATTERY
     #define HAS_BT
@@ -183,9 +193,10 @@
   #endif
 
   #ifdef MARAUDER_CYD_MICRO
+    #define HAS_TOUCH
     #define HAS_FLIPPER_LED
     //#define FLIPPER_ZERO_HAT
-    //#define HAS_BATTERY
+    #define HAS_BATTERY
     #define HAS_BT
     #define HAS_BT_REMOTE
     #define HAS_BUTTONS
@@ -201,9 +212,10 @@
   #endif
 
   #ifdef MARAUDER_CYD_2USB
+    #define HAS_TOUCH
     #define HAS_FLIPPER_LED
     //#define FLIPPER_ZERO_HAT
-    //#define HAS_BATTERY
+    #define HAS_BATTERY
     #define HAS_BT
     #define HAS_BT_REMOTE
     #define HAS_BUTTONS
@@ -220,6 +232,7 @@
   #endif
 
   #ifdef MARAUDER_CYD_GUITION
+    #define HAS_TOUCH
     #define HAS_FLIPPER_LED
     //#define FLIPPER_ZERO_HAT
     //#define HAS_BATTERY
@@ -238,6 +251,7 @@
   #endif
 
   #ifdef MARAUDER_KIT
+    #define HAS_TOUCH
     //#define FLIPPER_ZERO_HAT
     #define HAS_BATTERY
     #define HAS_BT
@@ -281,6 +295,22 @@
     //#define HAS_TEMP_SENSOR
   #endif
 
+  #ifdef MARAUDER_MULTIBOARD_S3
+    #define HAS_FLIPPER_LED
+    //#define FLIPPER_ZERO_HAT
+    //#define HAS_BATTERY
+    #define HAS_BT
+    //#define HAS_BUTTONS
+    //#define HAS_NEOPIXEL_LED
+    //#define HAS_PWR_MGMT
+    //#define HAS_SCREEN
+    #define HAS_GPS
+    #define HAS_SD
+    #define USE_SD
+    //#define HAS_PSRAM
+    //#define HAS_TEMP_SENSOR
+  #endif
+
   #ifdef ESP32_LDDB
     //#define FLIPPER_ZERO_HAT
     //#define HAS_BATTERY
@@ -1655,6 +1685,10 @@
       #define SD_CS 10
     #endif
 
+    #ifdef MARAUDER_MULTIBOARD_S3
+      #define SD_CS 10
+    #endif
+
     #ifdef ESP32_LDDB
       #define SD_CS 4
     #endif
@@ -1698,6 +1732,7 @@
 
     #define BANNER_TIME GRAPH_REFRESH
 
+    #define TFT_BLACK 0
     #define TFT_WHITE 0
     #define TFT_CYAN 0
     #define TFT_BLUE 0
@@ -1749,6 +1784,8 @@
     #define MEM_LOWER_LIM 10000
   #elif defined(MARAUDER_FLIPPER)
     #define MEM_LOWER_LIM 10000
+  #elif defined(MARAUDER_MULTIBOARD_S3)
+    #define MEM_LOWER_LIM 10000
   #elif defined(ESP32_LDDB)
     #define MEM_LOWER_LIM 10000
   #elif defined(MARAUDER_DEV_BOARD_PRO)
@@ -1802,12 +1839,12 @@
       #define GPS_RX 13
     #elif defined(MARAUDER_CYD_MICRO)
       #define GPS_SERIAL_INDEX 2
-      #define GPS_TX 27 // Fits the extended I/O
-      #define GPS_RX 22
+      #define GPS_TX 1 // Community pinout matching old forks and even bruce firmware allowing for hardware standardization
+      #define GPS_RX 3
     #elif defined(MARAUDER_CYD_2USB)
       #define GPS_SERIAL_INDEX 2
-      #define GPS_TX 27 // Fits the extended I/O
-      #define GPS_RX 22
+      #define GPS_TX 1 // Community pinout matching old forks and even bruce firmware allowing for hardware standardization
+      #define GPS_RX 3
     #elif defined(MARAUDER_CYD_GUITION)
       #define GPS_SERIAL_INDEX 2
       #define GPS_TX 21 // Fits the extended I/O
@@ -1840,6 +1877,10 @@
       #define GPS_SERIAL_INDEX 1
       #define GPS_TX 9
       #define GPS_RX 21
+    #elif defined(MARAUDER_MULTIBOARD_S3)
+      #define GPS_SERIAL_INDEX 1
+      #define GPS_TX 9
+      #define GPS_RX 21
     #elif defined(MARAUDER_M5STICKC)
       #define GPS_SERIAL_INDEX 1
       #define GPS_TX 33
@@ -1897,6 +1938,16 @@
       #define I2C_SCL 27
     #endif
 
+    #ifdef MARAUDER_CYD_MICRO
+      #define I2C_SDA 22
+      #define I2C_SCL 27
+    #endif
+
+    #ifdef MARAUDER_CYD_2USB
+      #define I2C_SDA 22
+      #define I2C_SCL 27
+    #endif
+
   #endif
 
   //// MARAUDER TITLE STUFF
@@ -1977,6 +2028,12 @@
       #define R_PIN 6
     #endif
 
+    #ifdef MARAUDER_MULTIBOARD_S3
+      #define B_PIN 4
+      #define G_PIN 5
+      #define R_PIN 6
+    #endif
+
     #ifdef MARAUDER_CYD_MICRO
       #define B_PIN 17
       #define G_PIN 16

esp32_marauder/lang_var.h

@@ -105,6 +105,7 @@ PROGMEM const char text1_61[] = "Select Stations";
 PROGMEM const char text1_62[] = "Deauth Targeted";
 PROGMEM const char text1_63[] = "Detect Pineapple";
 PROGMEM const char text1_64[] = "Detect MultiSSID";
+PROGMEM const char text1_65[] = "Select probe SSIDs";
 
 //SDInterface.cpp texts
 PROGMEM const char text2_0[] = "Error, could not find update.bin";
@@ -185,7 +186,7 @@ PROGMEM const char text4_49[] = " Detect MultiSSID ";
 
 //Making tables
 PROGMEM const char *text_table0[] = {text0_0,text0_1, text0_2, text0_3, text0_4, text0_5, text0_6, text0_7, text0_8};
-PROGMEM const char *text_table1[] = {text1_0,text1_1,text1_2,text1_3,text1_4,text1_5,text1_6,text1_7,text1_8,text1_9,text1_10,text1_11,text1_12,text1_13,text1_14,text1_15,text1_16,text1_17,text1_18,text1_19,text1_20,text1_21,text1_22,text1_23,text1_24,text1_25,text1_26,text1_27,text1_28,text1_29,text1_30,text1_31,text1_32,text1_33,text1_34,text1_35,text1_36,text1_37,text1_38,text1_39,text1_40,text1_41,text1_42,text1_43,text1_44,text1_45,text1_46,text1_47,text1_48,text1_49,text1_50,text1_51,text1_52,text1_53,text1_54,text1_55,text1_56,text1_57,text1_58,text1_59,text1_60,text1_61,text1_62,text1_63,text1_64};
+PROGMEM const char *text_table1[] = {text1_0,text1_1,text1_2,text1_3,text1_4,text1_5,text1_6,text1_7,text1_8,text1_9,text1_10,text1_11,text1_12,text1_13,text1_14,text1_15,text1_16,text1_17,text1_18,text1_19,text1_20,text1_21,text1_22,text1_23,text1_24,text1_25,text1_26,text1_27,text1_28,text1_29,text1_30,text1_31,text1_32,text1_33,text1_34,text1_35,text1_36,text1_37,text1_38,text1_39,text1_40,text1_41,text1_42,text1_43,text1_44,text1_45,text1_46,text1_47,text1_48,text1_49,text1_50,text1_51,text1_52,text1_53,text1_54,text1_55,text1_56,text1_57,text1_58,text1_59,text1_60,text1_61,text1_62,text1_63,text1_64, text1_65};
 PROGMEM const char *text_table2[] = {text2_0,text2_1,text2_2,text2_3,text2_4,text2_5,text2_6,text2_7,text2_8,text2_9,text2_10,text2_11,text2_12,text2_13,text2_14};
 PROGMEM const char *text_table3[] = {text3_0,text3_1,text3_2,text3_3,text3_4,text3_5};
 PROGMEM const char *text_table4[] = {text4_0,text4_1,text4_2,text4_3,text4_4,text4_5,text4_6,text4_7,text1_54,text4_9,text4_10,text4_11,text4_12,text4_13,text4_14,text4_15,text4_16,text4_17,text4_18,text4_19,text4_20,text4_21,text4_22,text4_23,text4_24,text4_25,text4_26,text4_27,text4_28,text4_29,text4_30,text4_31,text4_32,text4_33,text4_34,text4_35,text4_36,text4_37,text4_38,text4_39,text4_40,text4_41,text4_42,text4_43,text4_44,text4_45,text4_46,text4_47,text4_48,text4_49};

esp32_marauder/utils.h

@@ -4,6 +4,7 @@
 
 #include <Arduino.h>
 #include <vector>
+#include <WiFi.h>
 
 #include "configs.h"
 
@@ -20,6 +21,12 @@ struct Station {
   uint16_t ap;
 };
 
+struct ProbeReqSsid {
+    String essid;
+    bool selected;
+    uint8_t requests;
+};
+
 const char apple_ouis[][9] PROGMEM = {
   "00:17:F2", "00:1E:C2", "00:26:08", "F8:1E:DF", "BC:92:6B", 
   "28:E0:2C", "3C:07:54", "7C:D1:C3", "DC:A9:04", "F0:D1:A9",
@@ -350,4 +357,33 @@ String replaceOUIWithManufacturer(const char *sta_addr) {
   return String(manufacturer) + mac_suffix;
 }
 
+IPAddress getNextIP(IPAddress currentIP, IPAddress subnetMask) {
+  // Convert IPAddress to uint32_t
+  uint32_t ipInt = (currentIP[0] << 24) | (currentIP[1] << 16) | (currentIP[2] << 8) | currentIP[3];
+  uint32_t maskInt = (subnetMask[0] << 24) | (subnetMask[1] << 16) | (subnetMask[2] << 8) | subnetMask[3];
+
+  uint32_t networkBase = ipInt & maskInt;
+  uint32_t broadcast = networkBase | ~maskInt;
+
+  uint32_t nextIP = ipInt + 1;
+
+  if (nextIP <= networkBase) {
+    nextIP = networkBase + 1;
+  }
+  if (nextIP >= broadcast) {
+    return IPAddress(0, 0, 0, 0); // no more IPs
+  }
+
+  return IPAddress(
+    (nextIP >> 24) & 0xFF,
+    (nextIP >> 16) & 0xFF,
+    (nextIP >> 8) & 0xFF,
+    nextIP & 0xFF
+  );
+}
+
+uint16_t getNextPort(uint16_t port) {
+  return port + 1;
+}
+
 #endif

pictures/xbm/force_16.xbm

@@ -0,0 +1,6 @@
+#define 3f9b97ac7933453c85ec3a8adb49feeejQ9bt0wTgiC65w8g_width 16
+#define 3f9b97ac7933453c85ec3a8adb49feeejQ9bt0wTgiC65w8g_height 16
+static char 3f9b97ac7933453c85ec3a8adb49feeejQ9bt0wTgiC65w8g_bits[] = {
+  0xFF, 0xFF, 0x1F, 0xF8, 0x0F, 0xF0, 0x07, 0xE0, 0x07, 0xE0, 0x07, 0xE0, 
+  0x67, 0xE6, 0x77, 0xEE, 0x87, 0xE0, 0x8F, 0xF1, 0x0F, 0xF0, 0x4F, 0xF5, 
+  0x1F, 0xF8, 0x3F, 0xFC, 0xFF, 0xFF, 0xFF, 0xFF, };

pictures/xbm/joined_16.xbm

@@ -0,0 +1,6 @@
+#define 67ae760eaaa64924c492c46151d37f46mewyG1NBArKDOITT_width 16
+#define 67ae760eaaa64924c492c46151d37f46mewyG1NBArKDOITT_height 16
+static char 67ae760eaaa64924c492c46151d37f46mewyG1NBArKDOITT_bits[] = {
+  0xFF, 0xFF, 0xFF, 0xFF, 0x07, 0xFF, 0xFF, 0xFC, 0xFF, 0xF3, 0x87, 0xF7, 
+  0x7F, 0xEE, 0xFF, 0xED, 0xC7, 0xDD, 0xBF, 0xDB, 0x7F, 0xDB, 0x67, 0xDB, 
+  0x67, 0xDB, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, };