gitea-mirror/ESP32Marauder
1
0
Fork 0
mirror of https://github.com/justcallmekoko/ESP32Marauder.git synced 2025-12-12 15:50:36 -08:00
Code Issues Packages Projects Releases Wiki Activity

Port to CYD 2432S024 GUITION

Browse Source
This commit is contained in:
Just Call Me Koko
2025-04-29 14:29:34 -04:00
parent cca589f749
commit 798fb3bbb7
9 changed files with 522 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
esp32_marauder/MenuFunctions.cpp
View File

@@ -932,7 +932,7 @@ void MenuFunctions::main(uint32_t currentTime)
// Menu navigation and paging
#ifdef HAS_BUTTONS
#if !(defined(MARAUDER_V6) || defined(MARAUDER_V6_1) || defined(MARAUDER_CYD_MICRO))
#if !(defined(MARAUDER_V6) || defined(MARAUDER_V6_1) || defined(MARAUDER_CYD_MICRO) || defined(MARAUDER_CYD_GUITION))
#if !defined(MARAUDER_M5STICKC) || defined(MARAUDER_M5STICKCP2)
if (u_btn.justPressed()){
if ((wifi_scan_obj.currentScanMode == WIFI_SCAN_OFF) ||

32
esp32_marauder/WiFiScan.cpp
View File

@@ -904,7 +904,7 @@ void WiFiScan::startWiFiAttacks(uint8_t scan_mode, uint16_t color, String title_
esp_wifi_set_promiscuous(true);
esp_wifi_set_max_tx_power(82);
this->wifi_initialized = true;
#ifdef MARAUDER_FLIPPER
#ifdef HAS_FLIPPER_LED
flipper_led.attackLED();
#elif defined(XIAO_ESP32_S3)
xiao_led.attackLED();
@@ -929,7 +929,7 @@ bool WiFiScan::shutdownWiFi() {
esp_wifi_restore();
esp_wifi_deinit();
#ifdef MARAUDER_FLIPPER
#ifdef HAS_FLIPPER_LED
flipper_led.offLED();
#elif defined(XIAO_ESP32_S3)
xiao_led.offLED();
@@ -967,7 +967,7 @@ bool WiFiScan::shutdownBLE() {
return false;
}
#ifdef MARAUDER_FLIPPER
#ifdef HAS_FLIPPER_LED
flipper_led.offLED();
#elif defined(XIAO_ESP32_S3)
xiao_led.offLED();
@@ -1564,7 +1564,7 @@ void WiFiScan::RunEvilPortal(uint8_t scan_mode, uint16_t color)
{
startLog("evil_portal");
#ifdef MARAUDER_FLIPPER
#ifdef HAS_FLIPPER_LED
flipper_led.sniffLED();
#elif defined(XIAO_ESP32_S3)
xiao_led.sniffLED();
@@ -1612,7 +1612,7 @@ void WiFiScan::RunAPScan(uint8_t scan_mode, uint16_t color)
else
startPcap("ap_sta");
#ifdef MARAUDER_FLIPPER
#ifdef HAS_FLIPPER_LED
flipper_led.sniffLED();
#elif defined(XIAO_ESP32_S3)
xiao_led.sniffLED();
@@ -2223,7 +2223,7 @@ void WiFiScan::RunInfo()
void WiFiScan::RunPacketMonitor(uint8_t scan_mode, uint16_t color)
{
#ifdef MARAUDER_FLIPPER
#ifdef HAS_FLIPPER_LED
flipper_led.sniffLED();
#elif defined(XIAO_ESP32_S3)
xiao_led.sniffLED();
@@ -2345,7 +2345,7 @@ void WiFiScan::RunPacketMonitor(uint8_t scan_mode, uint16_t color)
void WiFiScan::RunEapolScan(uint8_t scan_mode, uint16_t color)
{
#ifdef MARAUDER_FLIPPER
#ifdef HAS_FLIPPER_LED
flipper_led.sniffLED();
#elif defined(XIAO_ESP32_S3)
xiao_led.sniffLED();
@@ -2496,7 +2496,7 @@ void WiFiScan::RunPwnScan(uint8_t scan_mode, uint16_t color)
{
startPcap("pwnagotchi");
#ifdef MARAUDER_FLIPPER
#ifdef HAS_FLIPPER_LED
flipper_led.sniffLED();
#elif defined(XIAO_ESP32_S3)
xiao_led.sniffLED();
@@ -2723,7 +2723,7 @@ void WiFiScan::RunBeaconScan(uint8_t scan_mode, uint16_t color)
#endif
}
#ifdef MARAUDER_FLIPPER
#ifdef HAS_FLIPPER_LED
flipper_led.sniffLED();
#elif defined(XIAO_ESP32_S3)
xiao_led.sniffLED();
@@ -2785,7 +2785,7 @@ void WiFiScan::RunStationScan(uint8_t scan_mode, uint16_t color)
{
startPcap("station");
#ifdef MARAUDER_FLIPPER
#ifdef HAS_FLIPPER_LED
flipper_led.sniffLED();
#elif defined(XIAO_ESP32_S3)
xiao_led.sniffLED();
@@ -2833,7 +2833,7 @@ void WiFiScan::RunRawScan(uint8_t scan_mode, uint16_t color)
if (scan_mode != WIFI_SCAN_SIG_STREN)
startPcap("raw");
#ifdef MARAUDER_FLIPPER
#ifdef HAS_FLIPPER_LED
flipper_led.sniffLED();
#elif defined(XIAO_ESP32_S3)
xiao_led.sniffLED();
@@ -2899,7 +2899,7 @@ void WiFiScan::RunDeauthScan(uint8_t scan_mode, uint16_t color)
{
startPcap("deauth");
#ifdef MARAUDER_FLIPPER
#ifdef HAS_FLIPPER_LED
flipper_led.sniffLED();
#elif defined(XIAO_ESP32_S3)
xiao_led.sniffLED();
@@ -2961,7 +2961,7 @@ void WiFiScan::RunProbeScan(uint8_t scan_mode, uint16_t color)
#endif
}
#ifdef MARAUDER_FLIPPER
#ifdef HAS_FLIPPER_LED
flipper_led.sniffLED();
#elif defined(XIAO_ESP32_S3)
xiao_led.sniffLED();
@@ -3030,7 +3030,7 @@ void WiFiScan::RunSourApple(uint8_t scan_mode, uint16_t color) {
this->ble_initialized;
#ifdef MARAUDER_FLIPPER
#ifdef HAS_FLIPPER_LED
flipper_led.sniffLED();
#elif defined(XIAO_ESP32_S3)
xiao_led.sniffLED();
@@ -3076,7 +3076,7 @@ void WiFiScan::RunSwiftpairSpam(uint8_t scan_mode, uint16_t color) {
this->ble_initialized;
#ifdef MARAUDER_FLIPPER
#ifdef HAS_FLIPPER_LED
flipper_led.attackLED();
#elif defined(XIAO_ESP32_S3)
xiao_led.attackLED();
@@ -3227,7 +3227,7 @@ void WiFiScan::RunBluetoothScan(uint8_t scan_mode, uint16_t color)
Serial.println("Started BLE Scan");
this->ble_initialized = true;
#ifdef MARAUDER_FLIPPER
#ifdef HAS_FLIPPER_LED
flipper_led.sniffLED();
#elif defined(XIAO_ESP32_S3)
xiao_led.sniffLED();

4
esp32_marauder/WiFiScan.h
View File

@@ -37,7 +37,7 @@
#endif
#include "settings.h"
#include "Assets.h"
#ifdef MARAUDER_FLIPPER
#ifdef HAS_FLIPPER_LED
#include "flipperLED.h"
#elif defined(XIAO_ESP32_S3)
#include "xiaoLED.h"
@@ -150,7 +150,7 @@ extern Buffer buffer_obj;
extern BatteryInterface battery_obj;
#endif
extern Settings settings_obj;
#ifdef MARAUDER_FLIPPER
#ifdef HAS_FLIPPER_LED
extern flipperLED flipper_led;
#elif defined(XIAO_ESP32_S3)
extern xiaoLED xiao_led;

171
esp32_marauder/configs.h
View File

@@ -21,10 +21,11 @@
//#define MARAUDER_DEV_BOARD_PRO
//#define XIAO_ESP32_S3
//#define MARAUDER_REV_FEATHER
//#define MARAUDER_CYD_MICRO // 2431S028
//#define MARAUDER_CYD_MICRO // 2432S028
//#define MARAUDER_CYD_GUITION // ESP32-2432S024 GUITION
//// END BOARD TARGETS
#define MARAUDER_VERSION "v1.4.5"
#define MARAUDER_VERSION "v1.4.6"
#define GRAPH_REFRESH 100
@@ -47,6 +48,8 @@
#define HARDWARE_NAME "Marauder v6.1"
#elif defined(MARAUDER_CYD_MICRO)
#define HARDWARE_NAME "CYD 2432S028"
#elif defined(MARAUDER_CYD_GUITION)
#define HARDWARE_NAME "CYD 2432S024 GUITION"
#elif defined(MARAUDER_KIT)
#define HARDWARE_NAME "Marauder Kit"
#elif defined(MARAUDER_FLIPPER)
@@ -173,6 +176,24 @@
#define HAS_CYD_TOUCH
#endif
#ifdef MARAUDER_CYD_GUITION
#define HAS_FLIPPER_LED
//#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
//#define HAS_CYD_TOUCH
#endif
#ifdef MARAUDER_KIT
//#define FLIPPER_ZERO_HAT
#define HAS_BATTERY
@@ -202,6 +223,7 @@
#endif
#ifdef MARAUDER_FLIPPER
#define HAS_FLIPPER_LED
//#define FLIPPER_ZERO_HAT
//#define HAS_BATTERY
//#define HAS_BT
@@ -417,7 +439,27 @@
#define U_PULL true
#define R_PULL true
#define D_PULL true
#endif
#endif
#ifdef MARAUDER_CYD_GUITION
#define L_BTN -1
#define C_BTN 0
#define U_BTN -1
#define R_BTN -1
#define D_BTN -1
//#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
#endif
//// END BUTTON DEFINITIONS
@@ -764,7 +806,74 @@
#define STATUSBAR_COLOR 0x4A49
#define KIT_LED_BUILTIN 13
#endif
#endif
#if defined(MARAUDER_CYD_GUITION)
#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 TFT_DIY
#define GRAPH_VERT_LIM TFT_HEIGHT/2
#define EXT_BUTTON_WIDTH 20
#define SCREEN_BUFFER
#define MAX_SCREEN_BUFFER 22
#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_V7
#define SCREEN_CHAR_WIDTH 40
@@ -1100,6 +1209,25 @@
//#define BUTTON_ARRAY_LEN 5
#endif
#if defined(MARAUDER_CYD_GUITION)
#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_V7
#define BANNER_TIME 100
@@ -1212,6 +1340,10 @@
#define SD_CS 5
#endif
#ifdef MARAUDER_CYD_GUITION
#define SD_CS 5
#endif
#ifdef MARAUDER_KIT
#define SD_CS 12
#endif
@@ -1316,6 +1448,8 @@
#define MEM_LOWER_LIM 10000
#elif defined(MARAUDER_CYD_MICRO)
#define MEM_LOWER_LIM 10000
#elif defined(MARAUDER_CYD_GUITION)
#define MEM_LOWER_LIM 10000
#elif defined(MARAUDER_KIT)
#define MEM_LOWER_LIM 10000
#elif defined(GENERIC_ESP32)
@@ -1342,6 +1476,8 @@
#define PIN 33
#elif defined(MARAUDER_CYD_MICRO)
#define PIN 4
//#elif defined(MARAUDER_CYD_GUITION)
// #define PIN 4
#else
#define PIN 25
#endif
@@ -1364,6 +1500,8 @@
#define MAX_HTML_SIZE 11400
#elif defined(MARAUDER_CYD_MICRO)
#define MAX_HTML_SIZE 11400
#elif defined(MARAUDER_CYD_GUITION)
#define MAX_HTML_SIZE 11400
#elif defined(MARAUDER_KIT)
#define MAX_HTML_SIZE 11400
#elif defined(GENERIC_ESP32)
@@ -1393,6 +1531,11 @@
#define GPS_TX 27 // Fits the extended I/O
#define GPS_RX 22
#define mac_history_len 100
#elif defined(MARAUDER_CYD_GUITION)
#define GPS_SERIAL_INDEX 2
#define GPS_TX 21 // Fits the extended I/O
#define GPS_RX 22
#define mac_history_len 100
#elif defined(MARAUDER_V4)
#define GPS_SERIAL_INDEX 2
#define GPS_TX 4
@@ -1486,6 +1629,8 @@
#define MARAUDER_TITLE_BYTES 13578
#elif defined(MARAUDER_CYD_MICRO)
#define MARAUDER_TITLE_BYTES 13578
#elif defined(MARAUDER_CYD_GUITION)
#define MARAUDER_TITLE_BYTES 13578
#elif defined(MARAUDER_KIT)
#define MARAUDER_TITLE_BYTES 13578
#elif defined(MARAUDER_MINI)
@@ -1531,4 +1676,22 @@
#endif
#endif
//// END STUPID CYD STUFF
//// FUNNY FLIPPER LED STUFF
#ifdef HAS_FLIPPER_LED
#ifdef MARAUDER_FLIPPER
#define B_PIN 4
#define G_PIN 5
#define R_PIN 6
#endif
#ifdef MARAUDER_CYD_GUITION
#define B_PIN 17
#define G_PIN 16
#define R_PIN 4
#endif
#endif
//// END FUNNY FLIPPER LED STUFF
#endif

8
esp32_marauder/esp32_marauder.ino
View File

@@ -34,7 +34,7 @@ https://www.online-utility.org/image/convert/to/XBM
#endif
#include "Buffer.h"
#ifdef MARAUDER_FLIPPER
#ifdef HAS_FLIPPER_LED
#include "flipperLED.h"
#elif defined(XIAO_ESP32_S3)
#include "xiaoLED.h"
@@ -105,7 +105,7 @@ CommandLine cli_obj;
AXP192 axp192_obj;
#endif
#ifdef MARAUDER_FLIPPER
#ifdef HAS_FLIPPER_LED
flipperLED flipper_led;
#elif defined(XIAO_ESP32_S3)
xiaoLED xiao_led;
@@ -286,7 +286,7 @@ void setup()
#endif
// Do some LED stuff
#ifdef MARAUDER_FLIPPER
#ifdef HAS_FLIPPER_LED
flipper_led.RunSetup();
#elif defined(XIAO_ESP32_S3)
xiao_led.RunSetup();
@@ -387,7 +387,7 @@ void loop()
menu_function_obj.main(currentTime);
#endif
}
#ifdef MARAUDER_FLIPPER
#ifdef HAS_FLIPPER_LED
flipper_led.main();
#elif defined(XIAO_ESP32_S3)
xiao_led.main();

4
esp32_marauder/flipperLED.h
View File

@@ -8,10 +8,6 @@
#include <Arduino.h>
#define B_PIN 4
#define G_PIN 5
#define R_PIN 6
extern Settings settings_obj;
class flipperLED {