From 798fb3bbb7391f6001e62cee0ffa8959d8046081 Mon Sep 17 00:00:00 2001 From: Just Call Me Koko Date: Tue, 29 Apr 2025 14:29:34 -0400 Subject: [PATCH] Port to CYD 2432S024 GUITION --- .github/workflows/build_parallel.yml | 29 +-- User_Setup_Select.h | 1 + User_Setup_cyd_guition.h | 316 +++++++++++++++++++++++++++ esp32_marauder/MenuFunctions.cpp | 2 +- esp32_marauder/WiFiScan.cpp | 32 +-- esp32_marauder/WiFiScan.h | 4 +- esp32_marauder/configs.h | 171 ++++++++++++++- esp32_marauder/esp32_marauder.ino | 8 +- esp32_marauder/flipperLED.h | 4 - 9 files changed, 522 insertions(+), 45 deletions(-) create mode 100644 User_Setup_cyd_guition.h diff --git a/.github/workflows/build_parallel.yml b/.github/workflows/build_parallel.yml index 18d7401..23bbaab 100644 --- a/.github/workflows/build_parallel.yml +++ b/.github/workflows/build_parallel.yml @@ -17,20 +17,21 @@ 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: "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" } steps: - name: Checkout Code diff --git a/User_Setup_Select.h b/User_Setup_Select.h index 4d3a2a5..d0595fd 100644 --- a/User_Setup_Select.h +++ b/User_Setup_Select.h @@ -31,6 +31,7 @@ //#include //#include //#include +//#include //#include // Setup file configured for my ILI9341 //#include // Setup file configured for my ST7735 diff --git a/User_Setup_cyd_guition.h b/User_Setup_cyd_guition.h new file mode 100644 index 0000000..78b2e4f --- /dev/null +++ b/User_Setup_cyd_guition.h @@ -0,0 +1,316 @@ +// 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 +/* +#define TFT_CS 17 // Chip select control pin D8 +#define TFT_DC 16 // Data Command control pin +#define TFT_RST 5 // Reset pin (could connect to NodeMCU RST, see next line) +//#define TFT_MISO 19 +//#define TFT_MOSI 23 +//#define TFT_SCLK 18 +//#define TFT_BL 32 +*/ + +// ESP32 Marauder +#define TFT_MISO 12 +#define TFT_MOSI 13 +#define TFT_SCLK 14 +#define TFT_CS 15 // Chip select control pin +#define TFT_DC 2 // Data Command control pin +#define TFT_RST -1 // 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 27 // LED back-light (only for ST7789 with backlight control pin) + +#define TOUCH_CS 33 // 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 diff --git a/esp32_marauder/MenuFunctions.cpp b/esp32_marauder/MenuFunctions.cpp index adf68eb..3c0fa50 100644 --- a/esp32_marauder/MenuFunctions.cpp +++ b/esp32_marauder/MenuFunctions.cpp @@ -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) || diff --git a/esp32_marauder/WiFiScan.cpp b/esp32_marauder/WiFiScan.cpp index c239967..ac10179 100644 --- a/esp32_marauder/WiFiScan.cpp +++ b/esp32_marauder/WiFiScan.cpp @@ -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(); diff --git a/esp32_marauder/WiFiScan.h b/esp32_marauder/WiFiScan.h index e4c470c..f276f56 100644 --- a/esp32_marauder/WiFiScan.h +++ b/esp32_marauder/WiFiScan.h @@ -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; diff --git a/esp32_marauder/configs.h b/esp32_marauder/configs.h index 75b8cb1..e5875a8 100644 --- a/esp32_marauder/configs.h +++ b/esp32_marauder/configs.h @@ -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 diff --git a/esp32_marauder/esp32_marauder.ino b/esp32_marauder/esp32_marauder.ino index 920fd4a..965a557 100644 --- a/esp32_marauder/esp32_marauder.ino +++ b/esp32_marauder/esp32_marauder.ino @@ -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(); diff --git a/esp32_marauder/flipperLED.h b/esp32_marauder/flipperLED.h index e6efe27..746a6fa 100644 --- a/esp32_marauder/flipperLED.h +++ b/esp32_marauder/flipperLED.h @@ -8,10 +8,6 @@ #include -#define B_PIN 4 -#define G_PIN 5 -#define R_PIN 6 - extern Settings settings_obj; class flipperLED {