diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index a47a52460..17a0526e4 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -150,6 +150,20 @@ jobs: ref: 8.1.0 path: CustomEspSoftwareSerial + - name: Install Adafruit_BusIO + uses: actions/checkout@v2 + with: + repository: adafruit/Adafruit_BusIO + ref: 1.15.0 + path: CustomAdafruit_BusIO + + - name: Install Adafruit_MAX1704X + uses: actions/checkout@v2 + with: + repository: adafruit/Adafruit_MAX1704X + ref: 1.0.2 + path: CustomAdafruit_MAX1704X + #- name: Search for SD lib in arduino-esp32 v2.0.4 # run: | # find /home/runner/work/ESP32Marauder/ESP32Marauder/2.0.4arduino-esp32 -name "SD" @@ -162,6 +176,7 @@ jobs: cp User_Setup_og_marauder.h CustomTFT_eSPI/ cp User_Setup_marauder_m5stickc.h CustomTFT_eSPI/ cp User_Setup_marauder_rev_feather.h CustomTFT_eSPI/ + cp User_Setup_dual_nrf24.h CustomTFT_eSPI/ pwd ls -la ls -la CustomTFT_eSPI @@ -211,6 +226,7 @@ jobs: sed -i 's/^ #define MARAUDER_V4/ \/\/#define MARAUDER_V4/' esp32_marauder/configs.h sed -i 's/^ #define MARAUDER_V6/ \/\/#define MARAUDER_V6/' esp32_marauder/configs.h sed -i 's/^ #define MARAUDER_V6_1/ \/\/#define MARAUDER_V6_1/' esp32_marauder/configs.h + sed -i 's/^ #define MARAUDER_V7/ \/\/#define MARAUDER_V7/' esp32_marauder/configs.h sed -i 's/^ #define MARAUDER_KIT/ \/\/#define MARAUDER_KIT/' esp32_marauder/configs.h sed -i 's/^ #define GENERIC_ESP32/ \/\/#define GENERIC_ESP32/' esp32_marauder/configs.h sed -i 's/^ \/\/#define MARAUDER_FLIPPER/ #define MARAUDER_FLIPPER/' esp32_marauder/configs.h @@ -255,6 +271,7 @@ jobs: sed -i 's/^ \/\/#define MARAUDER_V4/ #define MARAUDER_V4/' esp32_marauder/configs.h sed -i 's/^ #define MARAUDER_V6/ \/\/#define MARAUDER_V6/' esp32_marauder/configs.h sed -i 's/^ #define MARAUDER_V6_1/ \/\/#define MARAUDER_V6_1/' esp32_marauder/configs.h + sed -i 's/^ #define MARAUDER_V7/ \/\/#define MARAUDER_V7/' esp32_marauder/configs.h sed -i 's/^ #define MARAUDER_KIT/ \/\/#define MARAUDER_KIT/' esp32_marauder/configs.h sed -i 's/^ #define GENERIC_ESP32/ \/\/#define GENERIC_ESP32/' esp32_marauder/configs.h sed -i 's/^ #define MARAUDER_FLIPPER/ \/\/#define MARAUDER_FLIPPER/' esp32_marauder/configs.h @@ -284,6 +301,7 @@ jobs: sed -i 's/^ #define MARAUDER_V4/ \/\/#define MARAUDER_V4/' esp32_marauder/configs.h sed -i 's/^ \/\/#define MARAUDER_V6/ #define MARAUDER_V6/' esp32_marauder/configs.h sed -i 's/^ #define MARAUDER_V6_1/ \/\/#define MARAUDER_V6_1/' esp32_marauder/configs.h + sed -i 's/^ #define MARAUDER_V7/ \/\/#define MARAUDER_V7/' esp32_marauder/configs.h sed -i 's/^ #define MARAUDER_KIT/ \/\/#define MARAUDER_KIT/' esp32_marauder/configs.h sed -i 's/^ #define GENERIC_ESP32/ \/\/#define GENERIC_ESP32/' esp32_marauder/configs.h sed -i 's/^ #define MARAUDER_FLIPPER/ \/\/#define MARAUDER_FLIPPER/' esp32_marauder/configs.h @@ -327,6 +345,7 @@ jobs: sed -i 's/^ #define MARAUDER_V4/ \/\/#define MARAUDER_V4/' esp32_marauder/configs.h sed -i 's/^ #define MARAUDER_V6/ \/\/#define MARAUDER_V6/' esp32_marauder/configs.h sed -i 's/^ \/\/#define MARAUDER_V6_1/ #define MARAUDER_V6_1/' esp32_marauder/configs.h + sed -i 's/^ #define MARAUDER_V7/ \/\/#define MARAUDER_V7/' esp32_marauder/configs.h sed -i 's/^ #define MARAUDER_KIT/ \/\/#define MARAUDER_KIT/' esp32_marauder/configs.h sed -i 's/^ #define GENERIC_ESP32/ \/\/#define GENERIC_ESP32/' esp32_marauder/configs.h sed -i 's/^ #define MARAUDER_FLIPPER/ \/\/#define MARAUDER_FLIPPER/' esp32_marauder/configs.h @@ -355,6 +374,7 @@ jobs: sed -i 's/^ #define MARAUDER_V4/ \/\/#define MARAUDER_V4/' esp32_marauder/configs.h sed -i 's/^ #define MARAUDER_V6/ \/\/#define MARAUDER_V6/' esp32_marauder/configs.h sed -i 's/^ #define MARAUDER_V6_1/ \/\/#define MARAUDER_V6_1/' esp32_marauder/configs.h + sed -i 's/^ #define MARAUDER_V7/ \/\/#define MARAUDER_V7/' esp32_marauder/configs.h sed -i 's/^ \/\/#define MARAUDER_KIT/ #define MARAUDER_KIT/' esp32_marauder/configs.h sed -i 's/^ #define GENERIC_ESP32/ \/\/#define GENERIC_ESP32/' esp32_marauder/configs.h sed -i 's/^ #define MARAUDER_FLIPPER/ \/\/#define MARAUDER_FLIPPER/' esp32_marauder/configs.h @@ -383,6 +403,7 @@ jobs: sed -i 's/^ #define MARAUDER_V4/ \/\/#define MARAUDER_V4/' esp32_marauder/configs.h sed -i 's/^ #define MARAUDER_V6/ \/\/#define MARAUDER_V6/' esp32_marauder/configs.h sed -i 's/^ #define MARAUDER_V6_1/ \/\/#define MARAUDER_V6_1/' esp32_marauder/configs.h + sed -i 's/^ #define MARAUDER_V7/ \/\/#define MARAUDER_V7/' esp32_marauder/configs.h sed -i 's/^ #define MARAUDER_KIT/ \/\/#define MARAUDER_KIT/' esp32_marauder/configs.h sed -i 's/^ #define GENERIC_ESP32/ \/\/#define GENERIC_ESP32/' esp32_marauder/configs.h sed -i 's/^ #define MARAUDER_FLIPPER/ \/\/#define MARAUDER_FLIPPER/' esp32_marauder/configs.h @@ -409,6 +430,7 @@ jobs: sed -i 's/^ #define MARAUDER_V4/ \/\/#define MARAUDER_V4/' esp32_marauder/configs.h sed -i 's/^ #define MARAUDER_V6/ \/\/#define MARAUDER_V6/' esp32_marauder/configs.h sed -i 's/^ #define MARAUDER_V6_1/ \/\/#define MARAUDER_V6_1/' esp32_marauder/configs.h + sed -i 's/^ #define MARAUDER_V7/ \/\/#define MARAUDER_V7/' esp32_marauder/configs.h sed -i 's/^ #define MARAUDER_KIT/ \/\/#define MARAUDER_KIT/' esp32_marauder/configs.h sed -i 's/^ #define GENERIC_ESP32/ \/\/#define GENERIC_ESP32/' esp32_marauder/configs.h sed -i 's/^ #define MARAUDER_FLIPPER/ \/\/#define MARAUDER_FLIPPER/' esp32_marauder/configs.h @@ -435,6 +457,7 @@ jobs: sed -i 's/^ #define MARAUDER_V4/ \/\/#define MARAUDER_V4/' esp32_marauder/configs.h sed -i 's/^ #define MARAUDER_V6/ \/\/#define MARAUDER_V6/' esp32_marauder/configs.h sed -i 's/^ #define MARAUDER_V6_1/ \/\/#define MARAUDER_V6_1/' esp32_marauder/configs.h + sed -i 's/^ #define MARAUDER_V7/ \/\/#define MARAUDER_V7/' esp32_marauder/configs.h sed -i 's/^ #define MARAUDER_KIT/ \/\/#define MARAUDER_KIT/' esp32_marauder/configs.h sed -i 's/^ #define GENERIC_ESP32/ \/\/#define GENERIC_ESP32/' esp32_marauder/configs.h sed -i 's/^ #define MARAUDER_FLIPPER/ \/\/#define MARAUDER_FLIPPER/' esp32_marauder/configs.h @@ -465,6 +488,7 @@ jobs: sed -i 's/^ #define MARAUDER_V4/ \/\/#define MARAUDER_V4/' esp32_marauder/configs.h sed -i 's/^ #define MARAUDER_V6/ \/\/#define MARAUDER_V6/' esp32_marauder/configs.h sed -i 's/^ #define MARAUDER_V6_1/ \/\/#define MARAUDER_V6_1/' esp32_marauder/configs.h + sed -i 's/^ #define MARAUDER_V7/ \/\/#define MARAUDER_V7/' esp32_marauder/configs.h sed -i 's/^ #define MARAUDER_KIT/ \/\/#define MARAUDER_KIT/' esp32_marauder/configs.h sed -i 's/^ #define GENERIC_ESP32/ \/\/#define GENERIC_ESP32/' esp32_marauder/configs.h sed -i 's/^ #define MARAUDER_FLIPPER/ \/\/#define MARAUDER_FLIPPER/' esp32_marauder/configs.h @@ -497,6 +521,7 @@ jobs: sed -i 's/^ #define MARAUDER_V4/ \/\/#define MARAUDER_V4/' esp32_marauder/configs.h sed -i 's/^ #define MARAUDER_V6/ \/\/#define MARAUDER_V6/' esp32_marauder/configs.h sed -i 's/^ #define MARAUDER_V6_1/ \/\/#define MARAUDER_V6_1/' esp32_marauder/configs.h + sed -i 's/^ #define MARAUDER_V7/ \/\/#define MARAUDER_V7/' esp32_marauder/configs.h sed -i 's/^ #define MARAUDER_KIT/ \/\/#define MARAUDER_KIT/' esp32_marauder/configs.h sed -i 's/^ #define GENERIC_ESP32/ \/\/#define GENERIC_ESP32/' esp32_marauder/configs.h sed -i 's/^ #define MARAUDER_FLIPPER/ \/\/#define MARAUDER_FLIPPER/' esp32_marauder/configs.h @@ -516,6 +541,39 @@ jobs: - name: Rename Marauder Marauder Rev Feather run: | mv ./esp32_marauder/build/esp32.esp32.esp32s2/esp32_marauder.ino.bin ./esp32_marauder/build/esp32.esp32.esp32s2/esp32_marauder.rev_feather.bin + + - name: Configure TFT_eSPI and configs.h for Marauder v7 + run: | + pwd + find /home/runner/ -name "*TFT_eSPI*" + sed -i 's/^\/\/#include /#include /' /home/runner/Arduino/libraries/CustomTFT_eSPI/User_Setup_Select.h + sed -i 's/^#include /\/\/#include /' /home/runner/Arduino/libraries/CustomTFT_eSPI/User_Setup_Select.h + sed -i 's/^#include /\/\/#include /' /home/runner/Arduino/libraries/CustomTFT_eSPI/User_Setup_Select.h + sed -i 's/^ #define MARAUDER_REV_FEATHER/ \/\/#define MARAUDER_REV_FEATHER/' esp32_marauder/configs.h + sed -i 's/^ #define MARAUDER_MINI/ \/\/#define MARAUDER_MINI/' esp32_marauder/configs.h + sed -i 's/^ #define MARAUDER_V4/ \/\/#define MARAUDER_V4/' esp32_marauder/configs.h + sed -i 's/^ #define MARAUDER_V6/ \/\/#define MARAUDER_V6/' esp32_marauder/configs.h + sed -i 's/^ #define MARAUDER_V6_1/ \/\/#define MARAUDER_V6_1/' esp32_marauder/configs.h + sed -i 's/^ \/\/#define MARAUDER_V7/ #define MARAUDER_V7/' esp32_marauder/configs.h + sed -i 's/^ #define MARAUDER_KIT/ \/\/#define MARAUDER_KIT/' esp32_marauder/configs.h + sed -i 's/^ #define GENERIC_ESP32/ \/\/#define GENERIC_ESP32/' esp32_marauder/configs.h + sed -i 's/^ #define MARAUDER_FLIPPER/ \/\/#define MARAUDER_FLIPPER/' esp32_marauder/configs.h + sed -i 's/^ #define ESP32_LDDB/ \/\/#define ESP32_LDDB/' esp32_marauder/configs.h + sed -i 's/^ #define MARAUDER_DEV_BOARD_PRO/ \/\/#define MARAUDER_DEV_BOARD_PRO/' esp32_marauder/configs.h + sed -i 's/^ #define MARAUDER_M5STICKC/ \/\/#define MARAUDER_M5STICKC/' esp32_marauder/configs.h + + - name: Build Marauder for Marauder v7 + uses: ArminJo/arduino-test-compile@v3.2.1 + with: + sketch-names: esp32_marauder.ino + arduino-board-fqbn: esp32:esp32:d32:PartitionScheme=min_spiffs + extra-arduino-cli-args: "--warnings none" + arduino-platform: esp32:esp32@2.0.11 + platform-url: https://github.com/espressif/arduino-esp32/releases/download/2.0.11/package_esp32_dev_index.json + + - name: Rename Marauder Marauder v7 + run: | + mv ./esp32_marauder/build/esp32.esp32.d32/esp32_marauder.ino.bin ./esp32_marauder/build/esp32.esp32.d32/esp32_marauder.marauder_v7.bin - name: Display finished bins run: | @@ -598,6 +656,13 @@ jobs: path: ./esp32_marauder/build/esp32.esp32.esp32s2/esp32_marauder.rev_feather.bin retention-days: 5 + - name: 'Upload Marauder v7 Artifact' + uses: actions/upload-artifact@v3 + with: + name: esp32_marauder.marauder_v7.bin + path: ./esp32_marauder/build/esp32.esp32.d32/esp32_marauder.marauder_v7.bin + retention-days: 5 + - name: Create Release id: create_release uses: actions/create-release@v1 @@ -741,3 +806,15 @@ jobs: asset_name: esp32_marauder.rev_feather.bin asset_content_type: application/bin if: github.event_name != 'pull_request' + + - name: Upload Marauder v7 Asset + id: upload-marauder-v7-release-asset + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} + asset_path: ./esp32_marauder/build/esp32.esp32.d32/esp32_marauder.marauder_v7.bin + asset_name: esp32_marauder.marauder_v7.bin + asset_content_type: application/bin + if: github.event_name != 'pull_request' diff --git a/README.md b/README.md index 3c087d063..249254c64 100644 --- a/README.md +++ b/README.md @@ -15,9 +15,6 @@ Twitter Instagram

- I sell on Tindie -
- Twitch WillStunForFood

[![Build and Push](https://github.com/justcallmekoko/ESP32Marauder/actions/workflows/build_push.yml/badge.svg)](https://github.com/justcallmekoko/ESP32Marauder/actions/workflows/build_push.yml) diff --git a/User_Setup_Select.h b/User_Setup_Select.h index 82c61d38a..74c42f937 100644 --- a/User_Setup_Select.h +++ b/User_Setup_Select.h @@ -21,10 +21,14 @@ //#include // Default setup is root library folder -#include +//#include +//#include //#include -//#include //#include +//#include +//#include +#include +//#include //#include // Setup file configured for my ILI9341 //#include // Setup file configured for my ST7735 @@ -51,7 +55,8 @@ //#include // Setup file for ESP8266 and ILI9488 SPI bus TFT //#include // Setup file for ESP32 and ILI9488 SPI bus TFT -//#include // Setup file for ESP32 and TTGO T4 (BTC) ILI9341 SPI bus TFT +//#include // Setup file for ESP32 and TTGO T4 version 1.2 +//#include // Setup file for ESP32 and TTGO T4 version 1.3 //#include // Setup file for ESP32 and TTGO TM ST7789 SPI bus TFT //#include // Setup file configured for ST7789 240 x 240 //#include // Setup file for ESP32 and TTGO T-Display ST7789V SPI bus TFT @@ -63,9 +68,20 @@ //#include // Setup for Nucleo board //#include // Setup for Nucleo board and parallel display //#include // Setup for Nucleo board and parallel display -//#include // Setup for "Blue Pill" +//#include // Setup for "Blue/Black Pill" + +//#include // Setup for Nucleo board + +//#include // Setup for Nucleo board and parallel display +//#include // Setup for STM32 port A parallel display + +//#include // Setup file configured for ESP32 and RPi TFT with touch //#include // Setup file configured for my ST7735S 80x160 +//#include // Setup file for ESP32 and TTGO T-CameraPlus ST7789 SPI bus TFT 240x240 +//#include // Setup file for ESP32 and TTGO T-Watch ST7789 SPI bus TFT 240x240 + +//#include // Setup file for ESP32 and SSD1963 TFT display //#include // Setup file for ESP8266 and ST7789 135 x 240 TFT @@ -149,8 +165,20 @@ #elif defined (RM68140_DRIVER) #include "TFT_Drivers/RM68140_Defines.h" #define TFT_DRIVER 0x6814 +#elif defined (SSD1963_480_DRIVER) + #include "TFT_Drivers/SSD1963_Defines.h" + #define TFT_DRIVER 0x1963 +#elif defined (SSD1963_800_DRIVER) + #include "TFT_Drivers/SSD1963_Defines.h" + #define TFT_DRIVER 0x1963 +#elif defined (SSD1963_800ALT_DRIVER) + #include "TFT_Drivers/SSD1963_Defines.h" + #define TFT_DRIVER 0x1963 +#elif defined (SSD1963_800BD_DRIVER) + #include "TFT_Drivers/SSD1963_Defines.h" + #define TFT_DRIVER 0x1963 // <<<<<<<<<<<<<<<<<<<<<<<< ADD NEW DRIVER HERE - // XYZZY_init.h and XYZZY_rotation.h must also be added in TFT_eSPI.c + // XYZZY_init.h and XYZZY_rotation.h must also be added in TFT_eSPI.cpp #elif defined (XYZZY_DRIVER) #include "TFT_Drivers/XYZZY_Defines.h" #define TFT_DRIVER 0x0000 diff --git a/User_Setup_dual_nrf24.h b/User_Setup_dual_nrf24.h new file mode 100644 index 000000000..91045f9ab --- /dev/null +++ b/User_Setup_dual_nrf24.h @@ -0,0 +1,315 @@ +// 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_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 + +//#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 diff --git a/esp32_marauder/BatteryInterface.cpp b/esp32_marauder/BatteryInterface.cpp index f27988626..d6b566544 100644 --- a/esp32_marauder/BatteryInterface.cpp +++ b/esp32_marauder/BatteryInterface.cpp @@ -14,30 +14,102 @@ void BatteryInterface::main(uint32_t currentTime) { if (this->battery_level != new_level) { Serial.println(text00 + (String)new_level); this->battery_level = new_level; + Serial.println("Battery Level: " + (String)this->battery_level); } } } } void BatteryInterface::RunSetup() { - Wire.begin(I2C_SDA, I2C_SCL); - this->initTime = millis(); + byte error; + byte addr; + + #ifdef HAS_BATTERY + + Wire.begin(I2C_SDA, I2C_SCL); + + Serial.println("Checking for battery monitors..."); + + Wire.beginTransmission(IP5306_ADDR); + error = Wire.endTransmission(); + + if (error == 0) { + Serial.println("Detected IP5306"); + this->has_ip5306 = true; + this->i2c_supported = true; + } + + Wire.beginTransmission(MAX17048_ADDR); + error = Wire.endTransmission(); + + if (error == 0) { + if (maxlipo.begin()) { + Serial.println("Detected MAX17048"); + this->has_max17048 = true; + this->i2c_supported = true; + } + } + + /*for(addr = 1; addr < 127; addr++ ) { + Wire.beginTransmission(addr); + error = Wire.endTransmission(); + + if (error == 0) + { + Serial.print("I2C device found at address 0x"); + + if (addr<16) + Serial.print("0"); + + Serial.println(addr,HEX); + + if (addr == IP5306_ADDR) { + this->has_ip5306 = true; + this->i2c_supported = true; + } + + if (addr == MAX17048_ADDR) { + if (maxlipo.begin()) { + Serial.println("Detected MAX17048"); + this->has_max17048 = true; + this->i2c_supported = true; + } + } + } + }*/ + + /*if (this->maxlipo.begin()) { + Serial.println("Detected MAX17048"); + this->has_max17048 = true; + this->i2c_supported = true; + }*/ + + this->initTime = millis(); + #endif } int8_t BatteryInterface::getBatteryLevel() { - Wire.beginTransmission(IP5306_ADDR); - Wire.write(0x78); - if (Wire.endTransmission(false) == 0 && - Wire.requestFrom(0x75, 1)) { - this->i2c_supported = true; - switch (Wire.read() & 0xF0) { - case 0xE0: return 25; - case 0xC0: return 50; - case 0x80: return 75; - case 0x00: return 100; - default: return 0; + + if (this->has_ip5306) { + Wire.beginTransmission(IP5306_ADDR); + Wire.write(0x78); + if (Wire.endTransmission(false) == 0 && + Wire.requestFrom(IP5306_ADDR, 1)) { + this->i2c_supported = true; + switch (Wire.read() & 0xF0) { + case 0xE0: return 25; + case 0xC0: return 50; + case 0x80: return 75; + case 0x00: return 100; + default: return 0; + } } + this->i2c_supported = false; + return -1; + } + + + if (this->has_max17048) { + return this->maxlipo.cellPercent(); } - this->i2c_supported = false; - return -1; } diff --git a/esp32_marauder/BatteryInterface.h b/esp32_marauder/BatteryInterface.h index 078c12081..bd0d2c478 100644 --- a/esp32_marauder/BatteryInterface.h +++ b/esp32_marauder/BatteryInterface.h @@ -6,21 +6,24 @@ #include #include "configs.h" +#include "Adafruit_MAX1704X.h" #include -#define I2C_SDA 33 -#define I2C_SCL 22 #define IP5306_ADDR 0x75 +#define MAX17048_ADDR 0x36 class BatteryInterface { private: uint32_t initTime = 0; + Adafruit_MAX17048 maxlipo; public: int8_t battery_level = 0; int8_t old_level = 0; bool i2c_supported = false; + bool has_max17048 = false; + bool has_ip5306 = false; BatteryInterface(); diff --git a/esp32_marauder/MenuFunctions.cpp b/esp32_marauder/MenuFunctions.cpp index fbc8aad69..7e5bc7d4f 100644 --- a/esp32_marauder/MenuFunctions.cpp +++ b/esp32_marauder/MenuFunctions.cpp @@ -565,15 +565,51 @@ MenuFunctions::MenuFunctions() void MenuFunctions::buttonNotSelected(uint8_t b, int8_t x) { if (x == -1) x = b; - display_obj.tft.setFreeFont(NULL); - display_obj.key[b].drawButton(false, current_menu->list->get(x).name); + + #ifdef HAS_MINI_SCREEN + display_obj.tft.setFreeFont(NULL); + display_obj.key[b].drawButton(false, current_menu->list->get(x).name); + #endif + + #ifdef HAS_FULL_SCREEN + display_obj.tft.setFreeFont(MENU_FONT); + display_obj.key[b].drawButton(false, current_menu->list->get(x).name); + if (current_menu->list->get(x).name != text09) + display_obj.tft.drawXBitmap(0, + KEY_Y + x * (KEY_H + KEY_SPACING_Y) - (ICON_H / 2), + menu_icons[current_menu->list->get(x).icon], + ICON_W, + ICON_H, + TFT_BLACK, + current_menu->list->get(x).color); + display_obj.tft.setFreeFont(NULL); + #endif } void MenuFunctions::buttonSelected(uint8_t b, int8_t x) { - if (x == -1) - x = b; - display_obj.tft.setFreeFont(NULL); - display_obj.key[b].drawButton(true, current_menu->list->get(x).name); + #ifndef HAS_ILI9341 + if (x == -1) + x = b; + + #ifdef HAS_MINI_SCREEN + display_obj.tft.setFreeFont(NULL); + display_obj.key[b].drawButton(true, current_menu->list->get(x).name); + #endif + + #ifdef HAS_FULL_SCREEN + display_obj.tft.setFreeFont(MENU_FONT); + display_obj.key[b].drawButton(true, current_menu->list->get(x).name); + if (current_menu->list->get(x).name != text09) + display_obj.tft.drawXBitmap(0, + KEY_Y + x * (KEY_H + KEY_SPACING_Y) - (ICON_H / 2), + menu_icons[current_menu->list->get(x).icon], + ICON_W, + ICON_H, + TFT_BLACK, + current_menu->list->get(x).color); + display_obj.tft.setFreeFont(NULL); + #endif + #endif } // Function to check menu input @@ -1002,7 +1038,10 @@ void MenuFunctions::battery(bool initial) if ((battery_obj.battery_level != battery_obj.old_level) || (initial)) { battery_obj.old_level = battery_obj.battery_level; display_obj.tft.fillRect(204, 0, SCREEN_WIDTH, STATUS_BAR_WIDTH, STATUSBAR_COLOR); - display_obj.tft.setCursor(0, 1); + } + + display_obj.tft.setCursor(0, 1); + /*if (!this->disable_touch) { display_obj.tft.drawXBitmap(186, 0, menu_icons[STATUS_BAT], @@ -1010,8 +1049,8 @@ void MenuFunctions::battery(bool initial) 16, STATUSBAR_COLOR, the_color); - display_obj.tft.drawString((String)battery_obj.battery_level + "%", 204, 0, 2); - } + }*/ + display_obj.tft.drawString((String)battery_obj.battery_level + "%", 204, 0, 2); } #endif } @@ -1047,7 +1086,7 @@ void MenuFunctions::updateStatusBar() else the_color = TFT_RED; - #ifdef HAS_ILI9341 + #ifdef HAS_FULL_SCREEN display_obj.tft.drawXBitmap(4, 0, menu_icons[STATUS_GPS], @@ -1075,11 +1114,11 @@ void MenuFunctions::updateStatusBar() #else display_obj.tft.fillRect(50, 0, TFT_WIDTH * 0.21, STATUS_BAR_WIDTH, STATUSBAR_COLOR); #endif - #ifdef HAS_ILI9341 + #ifdef HAS_FULL_SCREEN display_obj.tft.drawString("CH: " + (String)wifi_scan_obj.set_channel, 50, 0, 2); #endif - #if defined(MARAUDER_MINI) || defined(MARAUDER_M5STICKC) || defined(MARAUDER_REV_FEATHER) + #ifdef HAS_MINI_SCREEN display_obj.tft.drawString("CH: " + (String)wifi_scan_obj.set_channel, TFT_WIDTH/4, 0, 1); #endif } @@ -1089,24 +1128,25 @@ void MenuFunctions::updateStatusBar() if ((wifi_scan_obj.free_ram != wifi_scan_obj.old_free_ram) || (status_changed)) { wifi_scan_obj.old_free_ram = wifi_scan_obj.free_ram; display_obj.tft.fillRect(100, 0, 60, STATUS_BAR_WIDTH, STATUSBAR_COLOR); - #ifdef HAS_ILI9341 + #ifdef HAS_FULL_SCREEN display_obj.tft.drawString((String)wifi_scan_obj.free_ram + "B", 100, 0, 2); #endif - #if defined(MARAUDER_MINI) || defined(MARAUDER_M5STICKC) || defined(MARAUDER_REV_FEATHER) + #ifdef HAS_MINI_SCREEN display_obj.tft.drawString((String)wifi_scan_obj.free_ram + "B", TFT_WIDTH/1.75, 0, 1); #endif } // Draw battery info - //MenuFunctions::battery(false); - display_obj.tft.fillRect(190, 0, SCREEN_WIDTH, STATUS_BAR_WIDTH, STATUSBAR_COLOR); + MenuFunctions::battery(false); + display_obj.tft.fillRect(186, 0, 16, STATUS_BAR_WIDTH, STATUSBAR_COLOR); + #ifdef HAS_ILI9341 #ifdef HAS_BUTTONS if (this->disable_touch) { display_obj.tft.setCursor(0, 1); - display_obj.tft.drawXBitmap(190, + display_obj.tft.drawXBitmap(186, 0, menu_icons[DISABLE_TOUCH], 16, @@ -1125,7 +1165,7 @@ void MenuFunctions::updateStatusBar() else the_color = TFT_RED; - #ifdef HAS_ILI9341 + #ifdef HAS_FULL_SCREEN display_obj.tft.drawXBitmap(170, 0, menu_icons[STATUS_SD], @@ -1136,7 +1176,7 @@ void MenuFunctions::updateStatusBar() #endif #endif - #if defined(MARAUDER_MINI) || defined(MARAUDER_M5STICKC) || defined(MARAUDER_REV_FEATHER) + #ifdef HAS_MINI_SCREEN display_obj.tft.setTextColor(the_color, STATUSBAR_COLOR); display_obj.tft.drawString("SD", TFT_WIDTH - 12, 0, 1); #endif @@ -1145,7 +1185,7 @@ void MenuFunctions::updateStatusBar() void MenuFunctions::drawStatusBar() { display_obj.tft.setTextSize(1); - #if defined(MARAUDER_MINI) || defined(MARAUDER_M5STICKC) || defined(MARAUDER_REV_FEATHER) + #ifdef HAS_MINI_SCREEN display_obj.tft.setFreeFont(NULL); #endif display_obj.tft.fillRect(0, 0, 240, STATUS_BAR_WIDTH, STATUSBAR_COLOR); @@ -1161,7 +1201,7 @@ void MenuFunctions::drawStatusBar() else the_color = TFT_RED; - #ifdef HAS_ILI9341 + #ifdef HAS_FULL_SCREEN display_obj.tft.drawXBitmap(4, 0, menu_icons[STATUS_GPS], @@ -1181,16 +1221,16 @@ void MenuFunctions::drawStatusBar() // WiFi Channel Stuff wifi_scan_obj.old_channel = wifi_scan_obj.set_channel; - #if defined(MARAUDER_MINI) || defined(MARAUDER_M5STICKC) || defined(MARAUDER_REV_FEATHER) + #ifdef HAS_MINI_SCREEN display_obj.tft.fillRect(43, 0, TFT_WIDTH * 0.21, STATUS_BAR_WIDTH, STATUSBAR_COLOR); #else display_obj.tft.fillRect(50, 0, TFT_WIDTH * 0.21, STATUS_BAR_WIDTH, STATUSBAR_COLOR); #endif - #ifdef HAS_ILI9341 + #ifdef HAS_FULL_SCREEN display_obj.tft.drawString("CH: " + (String)wifi_scan_obj.set_channel, 50, 0, 2); #endif - #if defined(MARAUDER_MINI) || defined(MARAUDER_M5STICKC) || defined(MARAUDER_REV_FEATHER) + #ifdef HAS_MINI_SCREEN display_obj.tft.drawString("CH: " + (String)wifi_scan_obj.set_channel, TFT_WIDTH/4, 0, 1); #endif @@ -1198,23 +1238,24 @@ void MenuFunctions::drawStatusBar() wifi_scan_obj.freeRAM(); wifi_scan_obj.old_free_ram = wifi_scan_obj.free_ram; display_obj.tft.fillRect(100, 0, 60, STATUS_BAR_WIDTH, STATUSBAR_COLOR); - #ifdef HAS_ILI9341 + #ifdef HAS_FULL_SCREEN display_obj.tft.drawString((String)wifi_scan_obj.free_ram + "B", 100, 0, 2); #endif - #if defined(MARAUDER_MINI) || defined(MARAUDER_M5STICKC) || defined(MARAUDER_REV_FEATHER) + #ifdef HAS_MINI_SCREEN display_obj.tft.drawString((String)wifi_scan_obj.free_ram + "B", TFT_WIDTH/1.75, 0, 1); #endif - //MenuFunctions::battery2(true); - display_obj.tft.fillRect(190, 0, SCREEN_WIDTH, STATUS_BAR_WIDTH, STATUSBAR_COLOR); + MenuFunctions::battery(true); + display_obj.tft.fillRect(186, 0, 16, STATUS_BAR_WIDTH, STATUSBAR_COLOR); + #ifdef HAS_ILI9341 #ifdef HAS_BUTTONS if (this->disable_touch) { display_obj.tft.setCursor(0, 1); - display_obj.tft.drawXBitmap(190, + display_obj.tft.drawXBitmap(186, 0, menu_icons[DISABLE_TOUCH], 16, @@ -1233,7 +1274,7 @@ void MenuFunctions::drawStatusBar() the_color = TFT_RED; - #ifdef HAS_ILI9341 + #ifdef HAS_FULL_SCREEN display_obj.tft.drawXBitmap(170, 0, menu_icons[STATUS_SD], @@ -1244,7 +1285,7 @@ void MenuFunctions::drawStatusBar() #endif #endif - #if defined(MARAUDER_MINI) || defined(MARAUDER_M5STICKC) || defined(MARAUDER_REV_FEATHER) + #ifdef HAS_MINI_SCREEN display_obj.tft.setTextColor(the_color, STATUSBAR_COLOR); display_obj.tft.drawString("SD", TFT_WIDTH - 12, 0, 1); #endif @@ -1393,6 +1434,8 @@ void MenuFunctions::RunSetup() loadSSIDsMenu.list = new LinkedList(); saveAPsMenu.list = new LinkedList(); loadAPsMenu.list = new LinkedList(); + saveATsMenu.list = new LinkedList(); + loadATsMenu.list = new LinkedList(); // Work menu names mainMenu.name = text_table1[6]; @@ -1414,6 +1457,9 @@ void MenuFunctions::RunSetup() loadSSIDsMenu.name = "Load SSIDs"; saveAPsMenu.name = "Save APs"; loadAPsMenu.name = "Load APs"; + saveATsMenu.name = "Save Airtags"; + loadATsMenu.name = "Load Airtags"; + bluetoothSnifferMenu.name = text_table1[23]; bluetoothAttackMenu.name = "Bluetooth Attacks"; generateSSIDsMenu.name = text_table1[27]; @@ -1621,9 +1667,6 @@ void MenuFunctions::RunSetup() this->changeMenu(&generateSSIDsMenu); wifi_scan_obj.RunGenerateSSIDs(); }); - this->addNodes(&wifiGeneralMenu, "Save/Load Files", TFT_CYAN, NULL, SD_UPDATE, [this]() { - this->changeMenu(&saveFileMenu); - }); #ifdef HAS_ILI9341 this->addNodes(&wifiGeneralMenu, text_table1[1], TFT_NAVY, NULL, KEYBOARD_ICO, [this](){ display_obj.clearScreen(); @@ -1890,48 +1933,6 @@ void MenuFunctions::RunSetup() this->changeMenu(clearAPsMenu.parentMenu); }); - saveSSIDsMenu.parentMenu = &saveFileMenu; - this->addNodes(&saveSSIDsMenu, text09, TFT_LIGHTGREY, NULL, 0, [this]() { - this->changeMenu(saveSSIDsMenu.parentMenu); - }); - - loadSSIDsMenu.parentMenu = &saveFileMenu; - this->addNodes(&loadSSIDsMenu, text09, TFT_LIGHTGREY, NULL, 0, [this]() { - this->changeMenu(loadSSIDsMenu.parentMenu); - }); - - saveAPsMenu.parentMenu = &saveFileMenu; - this->addNodes(&saveAPsMenu, text09, TFT_LIGHTGREY, NULL, 0, [this]() { - this->changeMenu(saveAPsMenu.parentMenu); - }); - - loadAPsMenu.parentMenu = &saveFileMenu; - this->addNodes(&loadAPsMenu, text09, TFT_LIGHTGREY, NULL, 0, [this]() { - this->changeMenu(loadAPsMenu.parentMenu); - }); - - // Save Files Menu - saveFileMenu.parentMenu = &wifiGeneralMenu; - this->addNodes(&saveFileMenu, text09, TFT_LIGHTGREY, NULL, 0, [this]() { - this->changeMenu(saveFileMenu.parentMenu); - }); - this->addNodes(&saveFileMenu, "Save SSIDs", TFT_CYAN, NULL, SD_UPDATE, [this]() { - this->changeMenu(&saveSSIDsMenu); - wifi_scan_obj.RunSaveSSIDList(true); - }); - this->addNodes(&saveFileMenu, "Load SSIDs", TFT_SKYBLUE, NULL, SD_UPDATE, [this]() { - this->changeMenu(&loadSSIDsMenu); - wifi_scan_obj.RunLoadSSIDList(); - }); - this->addNodes(&saveFileMenu, "Save APs", TFT_NAVY, NULL, SD_UPDATE, [this]() { - this->changeMenu(&saveAPsMenu); - wifi_scan_obj.RunSaveAPList(); - }); - this->addNodes(&saveFileMenu, "Load APs", TFT_BLUE, NULL, SD_UPDATE, [this]() { - this->changeMenu(&loadAPsMenu); - wifi_scan_obj.RunLoadAPList(); - }); - // Build Bluetooth Menu bluetoothMenu.parentMenu = &mainMenu; // Second Menu is third menu parent this->addNodes(&bluetoothMenu, text09, TFT_LIGHTGREY, NULL, 0, [this]() { @@ -2092,6 +2093,10 @@ void MenuFunctions::RunSetup() this->changeMenu(&whichUpdateMenu); }); + this->addNodes(&deviceMenu, "Save/Load Files", TFT_CYAN, NULL, SD_UPDATE, [this]() { + this->changeMenu(&saveFileMenu); + }); + this->addNodes(&deviceMenu, text_table1[16], TFT_GREEN, NULL, LANGUAGE, [this]() { wifi_scan_obj.currentScanMode = SHOW_INFO; @@ -2197,6 +2202,66 @@ void MenuFunctions::RunSetup() #endif #endif + // Save Files Menu + saveFileMenu.parentMenu = &deviceMenu; + this->addNodes(&saveFileMenu, text09, TFT_LIGHTGREY, NULL, 0, [this]() { + this->changeMenu(saveFileMenu.parentMenu); + }); + this->addNodes(&saveFileMenu, "Save SSIDs", TFT_CYAN, NULL, SD_UPDATE, [this]() { + this->changeMenu(&saveSSIDsMenu); + wifi_scan_obj.RunSaveSSIDList(true); + }); + this->addNodes(&saveFileMenu, "Load SSIDs", TFT_SKYBLUE, NULL, SD_UPDATE, [this]() { + this->changeMenu(&loadSSIDsMenu); + wifi_scan_obj.RunLoadSSIDList(); + }); + this->addNodes(&saveFileMenu, "Save APs", TFT_NAVY, NULL, SD_UPDATE, [this]() { + this->changeMenu(&saveAPsMenu); + wifi_scan_obj.RunSaveAPList(); + }); + this->addNodes(&saveFileMenu, "Load APs", TFT_BLUE, NULL, SD_UPDATE, [this]() { + this->changeMenu(&loadAPsMenu); + wifi_scan_obj.RunLoadAPList(); + }); + this->addNodes(&saveFileMenu, "Save Airtags", TFT_WHITE, NULL, SD_UPDATE, [this]() { + this->changeMenu(&saveAPsMenu); + wifi_scan_obj.RunSaveATList(); + }); + this->addNodes(&saveFileMenu, "Load Airtags", TFT_WHITE, NULL, SD_UPDATE, [this]() { + this->changeMenu(&loadAPsMenu); + wifi_scan_obj.RunLoadATList(); + }); + + saveSSIDsMenu.parentMenu = &saveFileMenu; + this->addNodes(&saveSSIDsMenu, text09, TFT_LIGHTGREY, NULL, 0, [this]() { + this->changeMenu(saveSSIDsMenu.parentMenu); + }); + + loadSSIDsMenu.parentMenu = &saveFileMenu; + this->addNodes(&loadSSIDsMenu, text09, TFT_LIGHTGREY, NULL, 0, [this]() { + this->changeMenu(loadSSIDsMenu.parentMenu); + }); + + saveAPsMenu.parentMenu = &saveFileMenu; + this->addNodes(&saveAPsMenu, text09, TFT_LIGHTGREY, NULL, 0, [this]() { + this->changeMenu(saveAPsMenu.parentMenu); + }); + + loadAPsMenu.parentMenu = &saveFileMenu; + this->addNodes(&loadAPsMenu, text09, TFT_LIGHTGREY, NULL, 0, [this]() { + this->changeMenu(loadAPsMenu.parentMenu); + }); + + saveATsMenu.parentMenu = &saveFileMenu; + this->addNodes(&saveATsMenu, text09, TFT_LIGHTGREY, NULL, 0, [this]() { + this->changeMenu(saveATsMenu.parentMenu); + }); + + loadATsMenu.parentMenu = &saveFileMenu; + this->addNodes(&loadATsMenu, text09, TFT_LIGHTGREY, NULL, 0, [this]() { + this->changeMenu(loadATsMenu.parentMenu); + }); + // GPS Menu #ifdef HAS_GPS if (gps_obj.getGpsModuleStatus()) { @@ -2552,21 +2617,27 @@ void MenuFunctions::displayCurrentMenu(uint8_t start_index) if (current_menu->list != NULL) { - #ifdef HAS_ILI9341 + #ifdef HAS_FULL_SCREEN display_obj.tft.setFreeFont(MENU_FONT); #endif - #if defined(MARAUDER_MINI) || defined(MARAUDER_M5STICKC) || defined(MARAUDER_REV_FEATHER) + #ifdef HAS_MINI_SCREEN display_obj.tft.setFreeFont(NULL); display_obj.tft.setTextSize(1); #endif for (uint8_t i = start_index; i < current_menu->list->size(); i++) { - #ifdef HAS_ILI9341 - if (!current_menu->list->get(i).selected) - display_obj.key[i].drawButton(false, current_menu->list->get(i).name); - else - display_obj.key[i].drawButton(true, current_menu->list->get(i).name); + #ifdef HAS_FULL_SCREEN + #ifndef HAS_ILI9341 + if ((current_menu->list->get(i).selected) || (current_menu->selected == i)) { + display_obj.key[i].drawButton(true, current_menu->list->get(i).name); + } + else { + display_obj.key[i].drawButton(false, current_menu->list->get(i).name); + } + #else + display_obj.key[i].drawButton(false, current_menu->list->get(i).name); + #endif if (current_menu->list->get(i).name != text09) display_obj.tft.drawXBitmap(0, @@ -2579,7 +2650,7 @@ void MenuFunctions::displayCurrentMenu(uint8_t start_index) #endif - #if defined(MARAUDER_MINI) || defined(MARAUDER_M5STICKC) || defined(MARAUDER_REV_FEATHER) + #ifdef HAS_MINI_SCREEN if ((current_menu->selected == i) || (current_menu->list->get(i).selected)) display_obj.key[i - start_index].drawButton(true, current_menu->list->get(i).name); else diff --git a/esp32_marauder/MenuFunctions.h b/esp32_marauder/MenuFunctions.h index 9599e20a0..c6ed5bff2 100644 --- a/esp32_marauder/MenuFunctions.h +++ b/esp32_marauder/MenuFunctions.h @@ -205,6 +205,8 @@ class MenuFunctions Menu loadSSIDsMenu; Menu saveAPsMenu; Menu loadAPsMenu; + Menu saveATsMenu; + Menu loadATsMenu; #ifdef HAS_GPS // GPS Menu diff --git a/esp32_marauder/WiFiScan.cpp b/esp32_marauder/WiFiScan.cpp index cdd2add74..5365da2c5 100644 --- a/esp32_marauder/WiFiScan.cpp +++ b/esp32_marauder/WiFiScan.cpp @@ -831,9 +831,11 @@ void WiFiScan::startWiFiAttacks(uint8_t scan_mode, uint16_t color, String title_ display_obj.initScrollValues(true); display_obj.tft.setTextWrap(false); display_obj.tft.setTextColor(TFT_BLACK, color); - #ifdef HAS_ILI9341 + #ifdef HAS_FULL_SCREEN display_obj.tft.fillRect(0,16,TFT_WIDTH,16, color); display_obj.tft.drawCentreString((String)title_string,TFT_WIDTH / 2,16,2); + #endif + #ifdef HAS_ILI9341 display_obj.touchToExit(); #endif display_obj.tft.setTextColor(TFT_GREEN, TFT_BLACK); @@ -1184,6 +1186,111 @@ void WiFiScan::parseBSSID(const char* bssidStr, uint8_t* bssid) { &bssid[3], &bssid[4], &bssid[5]); } +void WiFiScan::RunLoadATList() { + #ifdef HAS_SD + // Prepare to access the file + File file = sd_obj.getFile("/Airtags_0.log"); + if (!file) { + Serial.println("Could not open /Airtags_0.log"); + #ifdef HAS_SCREEN + display_obj.tft.setTextWrap(false); + display_obj.tft.setFreeFont(NULL); + display_obj.tft.setCursor(0, 100); + display_obj.tft.setTextSize(1); + display_obj.tft.setTextColor(TFT_CYAN); + + display_obj.tft.println("Could not open /Airtags_0.log"); + #endif + return; + } + + // Prepare JSON + DynamicJsonDocument doc(10048); + DeserializationError error = deserializeJson(doc, file); + if (error) { + Serial.print("JSON deserialize error: "); + Serial.println(error.c_str()); + file.close(); + #ifdef HAS_SCREEN + display_obj.tft.setTextWrap(false); + display_obj.tft.setFreeFont(NULL); + display_obj.tft.setCursor(0, 100); + display_obj.tft.setTextSize(1); + display_obj.tft.setTextColor(TFT_CYAN); + + display_obj.tft.println("Could not deserialize JSON"); + display_obj.tft.println(error.c_str()); + #endif + return; + } + + JsonArray array = doc.as(); + for (JsonObject obj : array) { + AirTag at; + at.mac = obj["mac"].as(); + at.payloadSize = obj["payload_size"]; + at.payload = hexStringToByteArray(obj["payload"].as()); + at.selected = false; + airtags->add(at); + } + + file.close(); + + //doc.clear(); + + #ifdef HAS_SCREEN + display_obj.tft.setTextWrap(false); + display_obj.tft.setFreeFont(NULL); + display_obj.tft.setCursor(0, 100); + display_obj.tft.setTextSize(1); + display_obj.tft.setTextColor(TFT_CYAN); + + display_obj.tft.print("Loaded Airtags: "); + display_obj.tft.println((String)airtags->size()); + #endif + Serial.print("Loaded Airtags:"); + Serial.println((String)airtags->size()); + #endif +} + +void WiFiScan::RunSaveATList(bool save_as) { + if (save_as) { + sd_obj.removeFile("/Airtags_0.log"); + + this->startLog("Airtags"); + + DynamicJsonDocument jsonDocument(2048); + + JsonArray jsonArray = jsonDocument.to(); + + for (int i = 0; i < airtags->size(); i++) { + const AirTag& at = airtags->get(i); + JsonObject jsonAt = jsonArray.createNestedObject(); + jsonAt["mac"] = at.mac; + jsonAt["payload"] = byteArrayToHexString(at.payload); + jsonAt["payload_size"] = at.payloadSize; + } + + String jsonString; + serializeJson(jsonArray, jsonString); + + buffer_obj.append(jsonString); + + #ifdef HAS_SCREEN + display_obj.tft.setTextWrap(false); + display_obj.tft.setFreeFont(NULL); + display_obj.tft.setCursor(0, 100); + display_obj.tft.setTextSize(1); + display_obj.tft.setTextColor(TFT_CYAN); + + display_obj.tft.print("Saved Airtags: "); + display_obj.tft.println((String)airtags->size()); + #endif + Serial.print("Saved Airtags:"); + Serial.println((String)airtags->size()); + } +} + void WiFiScan::RunLoadAPList() { #ifdef HAS_SD File file = sd_obj.getFile("/APs_0.log"); @@ -1382,9 +1489,11 @@ void WiFiScan::RunEvilPortal(uint8_t scan_mode, uint16_t color) display_obj.initScrollValues(true); display_obj.tft.setTextWrap(false); display_obj.tft.setTextColor(TFT_WHITE, color); - #ifdef HAS_ILI9341 + #ifdef HAS_FULL_SCREEN display_obj.tft.fillRect(0,16,240,16, color); display_obj.tft.drawCentreString(" Evil Portal ",120,16,2); + #endif + #ifdef HAS_ILI9341 display_obj.touchToExit(); #endif display_obj.tft.setTextColor(TFT_MAGENTA, TFT_BLACK); @@ -1426,9 +1535,11 @@ void WiFiScan::RunAPScan(uint8_t scan_mode, uint16_t color) display_obj.initScrollValues(true); display_obj.tft.setTextWrap(false); display_obj.tft.setTextColor(TFT_WHITE, color); - #ifdef HAS_ILI9341 + #ifdef HAS_FULL_SCREEN display_obj.tft.fillRect(0,16,240,16, color); display_obj.tft.drawCentreString(text_table4[44],120,16,2); + #endif + #ifdef HAS_ILI9341 display_obj.touchToExit(); #endif display_obj.tft.setTextColor(TFT_GREEN, TFT_BLACK); @@ -1886,9 +1997,11 @@ void WiFiScan::RunPacketMonitor(uint8_t scan_mode, uint16_t color) display_obj.initScrollValues(true); display_obj.tft.setTextWrap(false); display_obj.tft.setTextColor(TFT_WHITE, color); - #ifdef HAS_ILI9341 + #ifdef HAS_FULL_SCREEN display_obj.tft.fillRect(0,16,240,16, color); display_obj.tft.drawCentreString(text_table4[38],120,16,2); + #endif + #ifdef HAS_ILI9341 display_obj.touchToExit(); #endif display_obj.tft.setTextColor(TFT_GREEN, TFT_BLACK); @@ -1965,9 +2078,11 @@ void WiFiScan::RunEapolScan(uint8_t scan_mode, uint16_t color) display_obj.initScrollValues(true); display_obj.tft.setTextWrap(false); display_obj.tft.setTextColor(TFT_WHITE, color); - #ifdef HAS_ILI9341 + #ifdef HAS_FULL_SCREEN display_obj.tft.fillRect(0,16,240,16, color); display_obj.tft.drawCentreString(text_table4[38],120,16,2); + #endif + #ifdef HAS_ILI9341 display_obj.touchToExit(); #endif display_obj.tft.setTextColor(TFT_GREEN, TFT_BLACK); @@ -2028,9 +2143,11 @@ void WiFiScan::RunMimicFlood(uint8_t scan_mode, uint16_t color) { display_obj.initScrollValues(true); display_obj.tft.setTextWrap(false); display_obj.tft.setTextColor(TFT_BLACK, color); - #ifdef HAS_ILI9341 + #ifdef HAS_FULL_SCREEN display_obj.tft.fillRect(0,16,240,16, color); display_obj.tft.drawCentreString(" Mimic Flood ",120,16,2); + #endif + #ifdef HAS_ILI9341 display_obj.touchToExit(); #endif display_obj.tft.setTextColor(TFT_GREEN, TFT_BLACK); @@ -2070,9 +2187,11 @@ void WiFiScan::RunPwnScan(uint8_t scan_mode, uint16_t color) display_obj.initScrollValues(true); display_obj.tft.setTextWrap(false); display_obj.tft.setTextColor(TFT_WHITE, color); - #ifdef HAS_ILI9341 + #ifdef HAS_FULL_SCREEN display_obj.tft.fillRect(0,16,240,16, color); display_obj.tft.drawCentreString(text_table4[37],120,16,2); + #endif + #ifdef HAS_ILI9341 display_obj.touchToExit(); #endif display_obj.tft.setTextColor(TFT_GREEN, TFT_BLACK); @@ -2328,7 +2447,7 @@ void WiFiScan::RunBeaconScan(uint8_t scan_mode, uint16_t color) display_obj.initScrollValues(true); display_obj.tft.setTextWrap(false); display_obj.tft.setTextColor(TFT_WHITE, color); - #ifdef HAS_ILI9341 + #ifdef HAS_FULL_SCREEN display_obj.tft.fillRect(0,16,240,16, color); if (scan_mode == WIFI_SCAN_AP) display_obj.tft.drawCentreString(text_table4[38],120,16,2); @@ -2336,7 +2455,9 @@ void WiFiScan::RunBeaconScan(uint8_t scan_mode, uint16_t color) this->clearMacHistory(); display_obj.tft.drawCentreString("Wardrive", 120, 16, 2); } - display_obj.touchToExit(); + #ifdef HAS_ILI9341 + display_obj.touchToExit(); + #endif #endif display_obj.tft.setTextColor(TFT_GREEN, TFT_BLACK); display_obj.setupScrollArea(display_obj.TOP_FIXED_AREA_2, BOT_FIXED_AREA); @@ -2387,9 +2508,11 @@ void WiFiScan::RunStationScan(uint8_t scan_mode, uint16_t color) display_obj.initScrollValues(true); display_obj.tft.setTextWrap(false); display_obj.tft.setTextColor(TFT_WHITE, color); - #ifdef HAS_ILI9341 + #ifdef HAS_FULL_SCREEN display_obj.tft.fillRect(0,16,240,16, color); display_obj.tft.drawCentreString(text_table1[59],120,16,2); + #endif + #ifdef HAS_ILI9341 display_obj.touchToExit(); #endif display_obj.tft.setTextColor(TFT_GREEN, TFT_BLACK); @@ -2431,13 +2554,15 @@ void WiFiScan::RunRawScan(uint8_t scan_mode, uint16_t color) display_obj.initScrollValues(true); display_obj.tft.setTextWrap(false); display_obj.tft.setTextColor(TFT_WHITE, color); - #ifdef HAS_ILI9341 + #ifdef HAS_FULL_SCREEN display_obj.tft.fillRect(0,16,240,16, color); if (scan_mode != WIFI_SCAN_SIG_STREN) display_obj.tft.drawCentreString(text_table1[58],120,16,2); else display_obj.tft.drawCentreString("Signal Monitor", 120, 16, 2); - display_obj.touchToExit(); + #ifdef HAS_ILI9341 + display_obj.touchToExit(); + #endif #endif display_obj.tft.setTextColor(TFT_GREEN, TFT_BLACK); display_obj.setupScrollArea(display_obj.TOP_FIXED_AREA_2, BOT_FIXED_AREA); @@ -2477,9 +2602,11 @@ void WiFiScan::RunDeauthScan(uint8_t scan_mode, uint16_t color) display_obj.initScrollValues(true); display_obj.tft.setTextWrap(false); display_obj.tft.setTextColor(TFT_BLACK, color); - #ifdef HAS_ILI9341 + #ifdef HAS_FULL_SCREEN display_obj.tft.fillRect(0,16,240,16, color); display_obj.tft.drawCentreString(text_table4[39],120,16,2); + #endif + #ifdef HAS_ILI9341 display_obj.touchToExit(); #endif display_obj.tft.setTextColor(TFT_RED, TFT_BLACK); @@ -2536,9 +2663,11 @@ void WiFiScan::RunProbeScan(uint8_t scan_mode, uint16_t color) display_obj.initScrollValues(true); display_obj.tft.setTextWrap(false); display_obj.tft.setTextColor(TFT_BLACK, color); - #ifdef HAS_ILI9341 + #ifdef HAS_FULL_SCREEN display_obj.tft.fillRect(0,16,240,16, color); display_obj.tft.drawCentreString(text_table4[40],120,16,2); + #endif + #ifdef HAS_ILI9341 display_obj.touchToExit(); #endif display_obj.tft.setTextColor(TFT_GREEN, TFT_BLACK); @@ -2572,9 +2701,11 @@ void WiFiScan::RunSourApple(uint8_t scan_mode, uint16_t color) { display_obj.initScrollValues(true); display_obj.tft.setTextWrap(false); display_obj.tft.setTextColor(TFT_BLACK, color); - #ifdef HAS_ILI9341 + #ifdef HAS_FULL_SCREEN display_obj.tft.fillRect(0,16,240,16, color); display_obj.tft.drawCentreString("Sour Apple",120,16,2); + #endif + #ifdef HAS_ILI9341 display_obj.touchToExit(); #endif display_obj.tft.setTextColor(TFT_GREEN, TFT_BLACK); @@ -2594,7 +2725,7 @@ void WiFiScan::RunSwiftpairSpam(uint8_t scan_mode, uint16_t color) { display_obj.initScrollValues(true); display_obj.tft.setTextWrap(false); display_obj.tft.setTextColor(TFT_BLACK, color); - #ifdef HAS_ILI9341 + #ifdef HAS_FULL_SCREEN display_obj.tft.fillRect(0,16,240,16, color); if (scan_mode == BT_ATTACK_SWIFTPAIR_SPAM) display_obj.tft.drawCentreString("Swiftpair Spam",120,16,2); @@ -2608,7 +2739,9 @@ void WiFiScan::RunSwiftpairSpam(uint8_t scan_mode, uint16_t color) { display_obj.tft.drawCentreString("BLE Spam Flipper", 120, 16, 2); else if (scan_mode == BT_SPOOF_AIRTAG) display_obj.tft.drawCentreString("BLE Spoof Airtag", 120, 16, 2); - display_obj.touchToExit(); + #ifdef HAS_ILI9341 + display_obj.touchToExit(); + #endif #endif display_obj.tft.setTextColor(TFT_GREEN, TFT_BLACK); #endif @@ -2640,7 +2773,7 @@ void WiFiScan::RunBluetoothScan(uint8_t scan_mode, uint16_t color) display_obj.initScrollValues(true); display_obj.tft.setTextWrap(false); display_obj.tft.setTextColor(TFT_BLACK, color); - #ifdef HAS_ILI9341 + #ifdef HAS_FULL_SCREEN display_obj.tft.fillRect(0,16,240,16, color); if (scan_mode == BT_SCAN_ALL) display_obj.tft.drawCentreString(text_table4[41],120,16,2); @@ -2648,7 +2781,9 @@ void WiFiScan::RunBluetoothScan(uint8_t scan_mode, uint16_t color) display_obj.tft.drawCentreString("Airtag Sniff",120,16,2); else if (scan_mode == BT_SCAN_FLIPPER) display_obj.tft.drawCentreString("Flipper Sniff", 120, 16, 2); - display_obj.touchToExit(); + #ifdef HAS_ILI9341 + display_obj.touchToExit(); + #endif #endif display_obj.tft.setTextColor(TFT_CYAN, TFT_BLACK); display_obj.setupScrollArea(display_obj.TOP_FIXED_AREA_2, BOT_FIXED_AREA); @@ -2687,13 +2822,15 @@ void WiFiScan::RunBluetoothScan(uint8_t scan_mode, uint16_t color) display_obj.initScrollValues(true); display_obj.tft.setTextWrap(false); display_obj.tft.setTextColor(TFT_BLACK, color); - #ifdef HAS_ILI9341 + #ifdef HAS_FULL_SCREEN display_obj.tft.fillRect(0,16,240,16, color); if (scan_mode == BT_SCAN_WAR_DRIVE) display_obj.tft.drawCentreString("BT Wardrive",120,16,2); else if (scan_mode == BT_SCAN_WAR_DRIVE_CONT) display_obj.tft.drawCentreString("BT Wardrive Continuous",120,16,2); - display_obj.touchToExit(); + #ifdef HAS_ILI9341 + display_obj.touchToExit(); + #endif #endif display_obj.tft.setTextColor(TFT_CYAN, TFT_BLACK); display_obj.setupScrollArea(display_obj.TOP_FIXED_AREA_2, BOT_FIXED_AREA); @@ -2919,6 +3056,13 @@ void WiFiScan::apSnifferCallbackFull(void* buf, wifi_promiscuous_pkt_type_t type // display_string.concat((char)snifferPacket->payload[i + 38]); // essid.concat((char)snifferPacket->payload[i + 38]); //} + #ifdef HAS_FULL_SCREEN + display_string.concat(snifferPacket->rx_ctrl.rssi); + display_string.concat(" "); + display_string.concat(snifferPacket->rx_ctrl.channel); + display_string.concat(" "); + #endif + Serial.print(" ESSID: "); if (snifferPacket->payload[37] <= 0) display_string.concat(addr); @@ -3324,6 +3468,12 @@ void WiFiScan::beaconSnifferCallback(void* buf, wifi_promiscuous_pkt_type_t type Serial.print(addr); Serial.print(" ESSID Len: " + (String)snifferPacket->payload[37]); Serial.print(" ESSID: "); + #ifdef HAS_FULL_SCREEN + display_string.concat(snifferPacket->rx_ctrl.rssi); + display_string.concat(" "); + display_string.concat(snifferPacket->rx_ctrl.channel); + display_string.concat(" "); + #endif if (snifferPacket->payload[37] <= 0) display_string.concat(addr); else { diff --git a/esp32_marauder/WiFiScan.h b/esp32_marauder/WiFiScan.h index 3cf52fa61..c72907c8c 100644 --- a/esp32_marauder/WiFiScan.h +++ b/esp32_marauder/WiFiScan.h @@ -415,6 +415,8 @@ class WiFiScan void RunLoadSSIDList(); void RunSaveAPList(bool save_as = true); void RunLoadAPList(); + void RunSaveATList(bool save_as = true); + void RunLoadATList(); void channelHop(); uint8_t currentScanMode = 0; void main(uint32_t currentTime); diff --git a/esp32_marauder/configs.h b/esp32_marauder/configs.h index d63472129..a6ade7365 100644 --- a/esp32_marauder/configs.h +++ b/esp32_marauder/configs.h @@ -11,7 +11,8 @@ //#define MARAUDER_MINI //#define MARAUDER_V4 //#define MARAUDER_V6 - #define MARAUDER_V6_1 + //#define MARAUDER_V6_1 + #define MARAUDER_V7 //#define MARAUDER_KIT //#define GENERIC_ESP32 //#define MARAUDER_FLIPPER @@ -21,13 +22,15 @@ //#define MARAUDER_REV_FEATHER //// END BOARD TARGETS - #define MARAUDER_VERSION "v1.1.0" + #define MARAUDER_VERSION "v1.2.0" //// HARDWARE NAMES #ifdef MARAUDER_M5STICKC #define HARDWARE_NAME "M5Stick-C Plus" #elif defined(MARAUDER_MINI) #define HARDWARE_NAME "Marauder Mini" + #elif defined(MARAUDER_V7) + #define HARDWARE_NAME "Marauder v7" #elif defined(MARAUDER_REV_FEATHER) #define HARDWARE_NAME "Adafruit Feather ESP32-S2 Reverse TFT" #elif defined(MARAUDER_V4) @@ -61,6 +64,7 @@ //#define HAS_NEOPIXEL_LED #define HAS_PWR_MGMT #define HAS_SCREEN + #define HAS_MINI_SCREEN #define HAS_SD #define USE_SD #define HAS_TEMP_SENSOR @@ -75,6 +79,23 @@ #define HAS_NEOPIXEL_LED //#define HAS_PWR_MGMT #define HAS_SCREEN + #define HAS_MINI_SCREEN + #define HAS_SD + #define USE_SD + #define HAS_TEMP_SENSOR + #define HAS_GPS + #endif + + #ifdef MARAUDER_V7 + //#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 @@ -89,6 +110,7 @@ #define HAS_NEOPIXEL_LED //#define HAS_PWR_MGMT #define HAS_SCREEN + #define HAS_MINI_SCREEN #define HAS_SD #define USE_SD #define HAS_TEMP_SENSOR @@ -103,6 +125,7 @@ #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 @@ -118,6 +141,7 @@ #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 @@ -132,6 +156,7 @@ #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 @@ -258,6 +283,26 @@ #define D_PULL true #endif + #ifdef MARAUDER_V7 + #define L_BTN 13 + #define C_BTN 34 + #define U_BTN 36 + #define R_BTN 39 + #define D_BTN 35 + + #define HAS_L + #define HAS_R + #define HAS_U + #define HAS_D + #define HAS_C + + #define L_PULL true + #define C_PULL true + #define U_PULL true + #define R_PULL true + #define D_PULL true + #endif + #ifdef MARAUDER_M5STICKC #define L_BTN -1 #define C_BTN 37 @@ -507,6 +552,69 @@ #define KIT_LED_BUILTIN 13 #endif + #ifdef MARAUDER_V7 + #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 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 100 + #define STATUS_BAR_WIDTH 16 + #define LVGL_TICK_PERIOD 6 + + #define FRAME_X 100 + #define FRAME_Y 64 + #define FRAME_W 120 + #define FRAME_H 50 + + // Red zone size + #define REDBUTTON_X FRAME_X + #define REDBUTTON_Y FRAME_Y + #define REDBUTTON_W (FRAME_W/2) + #define REDBUTTON_H FRAME_H + + // Green zone size + #define GREENBUTTON_X (REDBUTTON_X + REDBUTTON_W) + #define GREENBUTTON_Y FRAME_Y + #define GREENBUTTON_W (FRAME_W/2) + #define GREENBUTTON_H FRAME_H + + #define STATUSBAR_COLOR 0x4A49 + + #define KIT_LED_BUILTIN 13 + #endif + #ifdef MARAUDER_KIT #define SCREEN_CHAR_WIDTH 40 #define HAS_ILI9341 @@ -742,6 +850,25 @@ //#define BUTTON_ARRAY_LEN 5 #endif + #ifdef MARAUDER_V7 + #define BANNER_TIME 100 + + #define COMMAND_PREFIX "!" + + // Keypad start position, key sizes and spacing + #define KEY_X 120 // Centre of key + #define KEY_Y 50 + #define KEY_W 240 // Width and height + #define KEY_H 22 + #define KEY_SPACING_X 0 // X and Y gap + #define KEY_SPACING_Y 1 + #define KEY_TEXTSIZE 1 // Font size multiplier + #define ICON_W 22 + #define ICON_H 22 + #define BUTTON_PADDING 22 + //#define BUTTON_ARRAY_LEN 5 + #endif + #ifdef MARAUDER_KIT #define BANNER_TIME 100 @@ -839,6 +966,10 @@ #define SD_CS 4 #endif + #ifdef MARAUDER_V7 + #define SD_CS 4 + #endif + #ifdef MARAUDER_REV_FEATHER #define SD_CS 5 #endif @@ -898,6 +1029,8 @@ #define MEM_LOWER_LIM 20000 #elif defined(MARAUDER_MINI) #define MEM_LOWER_LIM 20000 + #elif defined(MARAUDER_V7) + #define MEM_LOWER_LIM 20000 #elif defined(MARAUDER_REV_FEATHER) #define MEM_LOWER_LIM 20000 #elif defined(MARAUDER_V4) @@ -940,6 +1073,8 @@ #define MAX_HTML_SIZE 11400 #elif defined(MARAUDER_MINI) #define MAX_HTML_SIZE 11400 + #elif defined(MARAUDER_V7) + #define MAX_HTML_SIZE 11400 #elif defined(MARAUDER_REV_FEATHER) #define MAX_HTML_SIZE 11400 #elif defined(MARAUDER_V4) @@ -990,6 +1125,11 @@ #define GPS_TX 21 #define GPS_RX 22 #define mac_history_len 512 + #elif defined(MARAUDER_V7) + #define GPS_SERIAL_INDEX 2 + #define GPS_TX 21 + #define GPS_RX 22 + #define mac_history_len 512 #elif defined(MARAUDER_FLIPPER) #define GPS_SERIAL_INDEX 1 #define GPS_TX 9 @@ -1011,6 +1151,46 @@ #endif //// END GPS STUFF + //// BATTERY STUFF + #ifdef HAS_BATTERY + + #ifdef MARAUDER_V4 + #define I2C_SDA 33 + #define I2C_SCL 22 + #endif + + #ifdef MARAUDER_V6 + #define I2C_SDA 33 + #define I2C_SCL 22 + #endif + + #ifdef MARAUDER_V6_1 + #define I2C_SDA 33 + #define I2C_SCL 22 + #endif + + #ifdef MARAUDER_M5STICKC + #define I2C_SDA 33 + #define I2C_SCL 22 + #endif + + #ifdef MARAUDER_KIT + #define I2C_SDA 33 + #define I2C_SCL 22 + #endif + + #ifdef MARAUDER_MINI + #define I2C_SDA 33 + #define I2C_SCL 26 + #endif + + #ifdef MARAUDER_V7 + #define I2C_SDA 33 + #define I2C_SCL 16 + #endif + + #endif + //// MARAUDER TITLE STUFF #ifdef MARAUDER_V4 #define MARAUDER_TITLE_BYTES 13578 @@ -1020,6 +1200,8 @@ #define MARAUDER_TITLE_BYTES 13578 #elif defined(MARAUDER_MINI) #define MARAUDER_TITLE_BYTES 13578 + #elif defined(MARAUDER_V7) + #define MARAUDER_TITLE_BYTES 13578 #elif defined(MARAUDER_REV_FEATHER) #define MARAUDER_TITLE_BYTES 13578 #else diff --git a/esp32_marauder/esp32_marauder.ino b/esp32_marauder/esp32_marauder.ino index 64cc7b4a3..5cb5aee2f 100644 --- a/esp32_marauder/esp32_marauder.ino +++ b/esp32_marauder/esp32_marauder.ino @@ -182,6 +182,9 @@ void setup() Serial.begin(115200); + while(!Serial) + delay(10); + Serial.println("ESP-IDF version is: " + String(esp_get_idf_version())); #ifdef HAS_SCREEN @@ -324,6 +327,8 @@ void setup() #ifdef HAS_SCREEN menu_function_obj.RunSetup(); #endif + + wifi_scan_obj.StartScan(WIFI_SCAN_OFF); Serial.println(F("CLI Ready")); cli_obj.RunSetup(); diff --git a/esp32_marauder/utils.h b/esp32_marauder/utils.h index a9e6ad69e..d7e683a65 100644 --- a/esp32_marauder/utils.h +++ b/esp32_marauder/utils.h @@ -3,6 +3,7 @@ #define utils_h #include +#include struct mac_addr { unsigned char bytes[6]; @@ -13,6 +14,56 @@ struct Station { bool selected; }; +String byteArrayToHexString(const std::vector& byteArray) { + String result; + + for (size_t i = 0; i < byteArray.size(); i++) { + // Append the byte in "0xXX" format + result += "0x"; + if (byteArray[i] < 0x10) { + result += "0"; // Add leading zero for single-digit hex values + } + result += String(byteArray[i], HEX); + + // Add a space between bytes, but not at the end + if (i < byteArray.size() - 1) { + result += " "; + } + } + + return result; +} + +std::vector hexStringToByteArray(const String& hexString) { + std::vector byteArray; + + // Split the input string by spaces + int startIndex = 0; + while (startIndex < hexString.length()) { + // Find the next space or end of string + int spaceIndex = hexString.indexOf(' ', startIndex); + + // If no space is found, process the last token + if (spaceIndex == -1) { + spaceIndex = hexString.length(); + } + + // Extract the "0xXX" part + String byteString = hexString.substring(startIndex, spaceIndex); + + // Convert "0xXX" to an integer and store it in the vector + if (byteString.startsWith("0x") || byteString.startsWith("0X")) { + uint8_t byte = strtol(byteString.c_str() + 2, nullptr, 16); + byteArray.push_back(byte); + } + + // Move the start index to the next byte + startIndex = spaceIndex + 1; + } + + return byteArray; +} + void generateRandomName(char *name, size_t length) { static const char alphabet[] = "abcdefghijklmnopqrstuvwxyz"; diff --git a/mechanical/V7/Back.stl b/mechanical/V7/Back.stl new file mode 100644 index 000000000..ec26bf617 Binary files /dev/null and b/mechanical/V7/Back.stl differ diff --git a/mechanical/V7/Battery Cover.stl b/mechanical/V7/Battery Cover.stl new file mode 100644 index 000000000..a932d7257 Binary files /dev/null and b/mechanical/V7/Battery Cover.stl differ diff --git a/mechanical/V7/Front.stl b/mechanical/V7/Front.stl new file mode 100644 index 000000000..73f23485f Binary files /dev/null and b/mechanical/V7/Front.stl differ diff --git a/mechanical/V7/Joystick.stl b/mechanical/V7/Joystick.stl new file mode 100644 index 000000000..b357327f4 Binary files /dev/null and b/mechanical/V7/Joystick.stl differ diff --git a/mechanical/V7/Power Switch.stl b/mechanical/V7/Power Switch.stl new file mode 100644 index 000000000..3fa3900d0 Binary files /dev/null and b/mechanical/V7/Power Switch.stl differ diff --git a/pictures/jcmk_square_sticker_500px.png b/pictures/jcmk_square_sticker_500px.png new file mode 100644 index 000000000..f509d43bf Binary files /dev/null and b/pictures/jcmk_square_sticker_500px.png differ