diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index d9d6fdd35..83820a706 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -86,7 +86,7 @@ jobs: uses: actions/checkout@v2 with: repository: h2zero/NimBLE-Arduino - ref: 1.2.0 + ref: 1.4.1 path: CustomNimBLE-Arduino - name: Install Adafruit_NeoPixel @@ -134,6 +134,7 @@ jobs: cp User_Setup_Select.h CustomTFT_eSPI/ cp User_Setup_marauder_mini.h CustomTFT_eSPI/ cp User_Setup_og_marauder.h CustomTFT_eSPI/ + cp User_Setup_marauder_m5cardputer.h CustomTFT_eSPI/ cp User_Setup_marauder_m5stickc.h CustomTFT_eSPI/ cp User_Setup_marauder_rev_feather.h CustomTFT_eSPI/ pwd @@ -190,6 +191,8 @@ jobs: 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_M5CARDPUTER/ \/\/#define MARAUDER_M5CARDPUTER/' esp32_marauder/configs.h + sed -i 's/^ #define MARAUDER_M5STICKC/ \/\/#define MARAUDER_M5STICKC/' esp32_marauder/configs.h - name: Build Marauder for Flipper Zero WiFi Dev Board uses: ArminJo/arduino-test-compile@v3.2.1 @@ -217,6 +220,8 @@ jobs: 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/^#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 @@ -230,6 +235,8 @@ jobs: 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_M5CARDPUTER/ \/\/#define MARAUDER_M5CARDPUTER/' esp32_marauder/configs.h + sed -i 's/^ #define MARAUDER_M5STICKC/ \/\/#define MARAUDER_M5STICKC/' esp32_marauder/configs.h - name: Build Marauder for OG Marauder uses: ArminJo/arduino-test-compile@v3.2.1 @@ -244,6 +251,8 @@ jobs: - name: Configure TFT_eSPI and configs.h for Marauder v6 run: | + 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/^#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 @@ -257,6 +266,8 @@ jobs: 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_M5CARDPUTER/ \/\/#define MARAUDER_M5CARDPUTER/' esp32_marauder/configs.h + sed -i 's/^ #define MARAUDER_M5STICKC/ \/\/#define MARAUDER_M5STICKC/' esp32_marauder/configs.h #- name: Build Marauder for v6 Marauder with arduino/compile-sketches # uses: arduino/compile-sketches@v1 @@ -298,6 +309,8 @@ jobs: 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_M5CARDPUTER/ \/\/#define MARAUDER_M5CARDPUTER/' esp32_marauder/configs.h + sed -i 's/^ #define MARAUDER_M5STICKC/ \/\/#define MARAUDER_M5STICKC/' esp32_marauder/configs.h - name: Build Marauder for v6.1 Marauder uses: ArminJo/arduino-test-compile@v3.2.1 @@ -312,7 +325,10 @@ jobs: - name: Configure TFT_eSPI and configs.h for Marauder Kit run: | + 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/^#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 @@ -324,6 +340,8 @@ jobs: 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_M5CARDPUTER/ \/\/#define MARAUDER_M5CARDPUTER/' esp32_marauder/configs.h + sed -i 's/^ #define MARAUDER_M5STICKC/ \/\/#define MARAUDER_M5STICKC/' esp32_marauder/configs.h - name: Build Marauder for Marauder Kit uses: ArminJo/arduino-test-compile@v3.2.1 @@ -338,8 +356,11 @@ jobs: - name: Configure TFT_eSPI and configs.h for Marauder Mini run: | - 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/^#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 @@ -350,6 +371,8 @@ jobs: 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_M5CARDPUTER/ \/\/#define MARAUDER_M5CARDPUTER/' esp32_marauder/configs.h + sed -i 's/^ #define MARAUDER_M5STICKC/ \/\/#define MARAUDER_M5STICKC/' esp32_marauder/configs.h - name: Build Marauder for Marauder Mini uses: ArminJo/arduino-test-compile@v3.2.1 @@ -374,6 +397,8 @@ jobs: 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_M5CARDPUTER/ \/\/#define MARAUDER_M5CARDPUTER/' esp32_marauder/configs.h + sed -i 's/^ #define MARAUDER_M5STICKC/ \/\/#define MARAUDER_M5STICKC/' esp32_marauder/configs.h - name: Build Marauder for ESP32 LDDB uses: ArminJo/arduino-test-compile@v3.2.1 @@ -398,6 +423,8 @@ jobs: 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_M5CARDPUTER/ \/\/#define MARAUDER_M5CARDPUTER/' esp32_marauder/configs.h + sed -i 's/^ #define MARAUDER_M5STICKC/ \/\/#define MARAUDER_M5STICKC/' esp32_marauder/configs.h - name: Build Marauder for Marauder Dev Board Pro uses: ArminJo/arduino-test-compile@v3.2.1 @@ -414,6 +441,9 @@ jobs: 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/^#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 @@ -427,6 +457,7 @@ jobs: 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 + sed -i 's/^ #define MARAUDER_M5CARDPUTER/ \/\/#define MARAUDER_M5CARDPUTER/' esp32_marauder/configs.h - name: Build Marauder for Marauder M5StickC uses: ArminJo/arduino-test-compile@v3.2.1 @@ -438,7 +469,39 @@ jobs: - name: Rename Marauder M5StickC bin run: | mv ./esp32_marauder/build/esp32.esp32.m5stick-c/esp32_marauder.ino.bin ./esp32_marauder/build/esp32.esp32.m5stick-c/esp32_marauder.m5stickc_plus.bin - + + - name: Configure configs.h for M5Cardputer + run: | + 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/^#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_M5STICKC/ \/\/#define MARAUDER_M5STICKC/' 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_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_M5CARDPUTER/ #define MARAUDER_M5CARDPUTER/' esp32_marauder/configs.h + sed -i 's/^ #define MARAUDER_M5STICKC/ \/\/#define MARAUDER_M5STICKC/' esp32_marauder/configs.h + + - name: Build Marauder for M5Cardputer + uses: ArminJo/arduino-test-compile@v3.2.1 + with: + sketch-names: esp32_marauder.ino + arduino-board-fqbn: esp32:esp32:esp32s3:PartitionScheme=min_spiffs,FlashSize=8M,PSRAM=disabled + extra-arduino-cli-args: "--warnings none" + + - name: Rename Marauder M5Cardputer bin + run: | + mv ./esp32_marauder/build/esp32.esp32.esp32s3/esp32_marauder.ino.bin ./esp32_marauder/build/esp32.esp32.esp32s3/esp32_marauder.m5cardputer.bin + - name: Configure TFT_eSPI and configs.h for Marauder Rev Feather run: | pwd @@ -457,6 +520,7 @@ jobs: 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 + sed -i 's/^ #define MARAUDER_M5CARDPUTER/ \/\/#define MARAUDER_M5CARDPUTER/' esp32_marauder/configs.h - name: Build Marauder for Marauder Rev Feather uses: ArminJo/arduino-test-compile@v3.2.1 @@ -542,6 +606,13 @@ jobs: name: esp32_marauder.m5stickc_plus.bin path: ./esp32_marauder/build/esp32.esp32.m5stick-c/esp32_marauder.m5stickc_plus.bin retention-days: 5 + + - name: 'Upload Marauder M5Cardputer Artifact' + uses: actions/upload-artifact@v3 + with: + name: esp32_marauder.m5cardputer.bin + path: ./esp32_marauder/build/esp32.esp32.esp32s3/esp32_marauder.m5cardputer.bin + retention-days: 5 - name: 'Upload Rev Feather Artifact' uses: actions/upload-artifact@v3 @@ -682,6 +753,18 @@ jobs: asset_content_type: application/bin if: github.event_name != 'pull_request' + - name: Upload Marauder M5Cardputer Asset + id: upload-m5cardputer-plus-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.esp32s3/esp32_marauder.m5cardputer.bin + asset_name: esp32_marauder.m5cardputer.bin + asset_content_type: application/bin + if: github.event_name != 'pull_request' + - name: Upload Rev Feather Asset id: upload-rev-feather-release-asset uses: actions/upload-release-asset@v1 diff --git a/.gitmodules b/.gitmodules index 729d62826..65fbeb5b7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -6,7 +6,7 @@ url = https://github.com/ivanseidel/LinkedList.git [submodule "esp32_marauder/libraries/TFT_eSPI"] path = esp32_marauder/libraries/TFT_eSPI - url = https://github.com/justcallmekoko/TFT_eSPI.git + url = https://github.com/Bodmer/TFT_eSPI.git [submodule "esp32_marauder/libraries/JPEGDecoder"] path = esp32_marauder/libraries/JPEGDecoder url = https://github.com/Bodmer/JPEGDecoder.git diff --git a/User_Setup_Select.h b/User_Setup_Select.h index 82c61d38a..b5dce1d69 100644 --- a/User_Setup_Select.h +++ b/User_Setup_Select.h @@ -24,8 +24,8 @@ #include //#include //#include +//#include //#include - //#include // Setup file configured for my ILI9341 //#include // Setup file configured for my ST7735 //#include // Setup file configured for my ILI9163 diff --git a/User_Setup_marauder_m5cardputer.h b/User_Setup_marauder_m5cardputer.h new file mode 100644 index 000000000..8e6068458 --- /dev/null +++ b/User_Setup_marauder_m5cardputer.h @@ -0,0 +1,328 @@ +// 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 + +#define CGRAM_OFFSET + +// 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 135 // Marauder Mini +// #define TFT_WIDTH 240 // ST7789 240 x 240 and 240 x 320 +// #define TFT_HEIGHT 160 + #define TFT_HEIGHT 240 // 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 HIGH // 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 + +// M5 Cardputer +#define TFT_BL 38 +#define TFT_RST 33 // Reset pin (could connect to NodeMCU RST, see next line) +#define TFT_DC 34 // Data Command control pin +#define TFT_MOSI 35 +#define TFT_SCLK 36 +#define TFT_CS 37 // Chip select control pin D8 +#define TOUCH_CS -1 +// #define TFT_MISO -1 + +// 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 + +/* +// ESP32 Marauder +#define TFT_MISO 19 +#define TFT_MOSI 23 +#define TFT_SCLK 18 +#define TFT_CS 17 // Chip select control pin +#define TFT_DC 16 // Data Command control pin +#define TFT_RST 5 // Reset pin (could connect to RST pin) +//#define TFT_RST -1 // Set TFT_RST to -1 if display RESET is connected to ESP32 board RST + +#define TFT_BL 32 // LED back-light (only for ST7789 with backlight control pin) + +#define TOUCH_CS 21 // Chip select pin (T_CS) of touch screen +*/ +///////////////////////////// + +// ESP32 Centauri +/* +#define TFT_MISO 19 +#define TFT_MOSI 23 +#define TFT_SCLK 18 +#define TFT_CS 27 // Chip select control pin +#define TFT_DC 26 // Data Command control pin +#define TFT_RST 5 // Reset pin (could connect to RST pin) +//#define TFT_RST -1 // Set TFT_RST to -1 if display RESET is connected to ESP32 board RST + +#define TFT_BL 32 // LED back-light (only for ST7789 with backlight control pin) + +#define TOUCH_CS 21 // Chip select pin (T_CS) of touch screen +*/ +///////////////////////////// + +//#define TFT_WR 22 // Write strobe for modified Raspberry Pi TFT only + +// For the M5Stack module use these #define lines +//#define TFT_MISO 19 +//#define TFT_MOSI 23 +//#define TFT_SCLK 18 +//#define TFT_CS 14 // Chip select control pin +//#define TFT_DC 27 // Data Command control pin +//#define TFT_RST 33 // Reset pin (could connect to Arduino RESET pin) +//#define TFT_BL 32 // LED back-light (required for M5Stack) + +// ###### EDIT THE PINs BELOW TO SUIT YOUR ESP32 PARALLEL TFT SETUP ###### + +// The library supports 8 bit parallel TFTs with the ESP32, the pin +// selection below is compatible with ESP32 boards in UNO format. +// Wemos D32 boards need to be modified, see diagram in Tools folder. +// Only ILI9481 and ILI9341 based displays have been tested! + +// Parallel bus is only supported on ESP32 +// Uncomment line below to use ESP32 Parallel interface instead of SPI + +//#define ESP32_PARALLEL + +// The ESP32 and TFT the pins used for testing are: +//#define TFT_CS 33 // Chip select control pin (library pulls permanently low +//#define TFT_DC 15 // Data Command control pin - must use a pin in the range 0-31 +//#define TFT_RST 32 // Reset pin, toggles on startup + +//#define TFT_WR 4 // Write strobe control pin - must use a pin in the range 0-31 +//#define TFT_RD 2 // Read strobe control pin + +//#define TFT_D0 12 // Must use pins in the range 0-31 for the data bus +//#define TFT_D1 13 // so a single register write sets/clears all bits. +//#define TFT_D2 26 // Pins can be randomly assigned, this does not affect +//#define TFT_D3 25 // TFT screen update performance. +//#define TFT_D4 17 +//#define TFT_D5 16 +//#define TFT_D6 27 +//#define TFT_D7 14 + + +// ################################################################################## +// +// Section 3. Define the fonts that are to be used here +// +// ################################################################################## + +// Comment out the #defines below with // to stop that font being loaded +// The ESP8366 and ESP32 have plenty of memory so commenting out fonts is not +// normally necessary. If all fonts are loaded the extra FLASH space required is +// about 17Kbytes. To save FLASH space only enable the fonts you need! + +#define LOAD_GLCD // Font 1. Original Adafruit 8 pixel font needs ~1820 bytes in FLASH +#define LOAD_FONT2 // Font 2. Small 16 pixel high font, needs ~3534 bytes in FLASH, 96 characters +#define LOAD_FONT4 // Font 4. Medium 26 pixel high font, needs ~5848 bytes in FLASH, 96 characters +#define LOAD_FONT6 // Font 6. Large 48 pixel font, needs ~2666 bytes in FLASH, only characters 1234567890:-.apm +#define LOAD_FONT7 // Font 7. 7 segment 48 pixel font, needs ~2438 bytes in FLASH, only characters 1234567890:-. +#define LOAD_FONT8 // Font 8. Large 75 pixel font needs ~3256 bytes in FLASH, only characters 1234567890:-. +//#define LOAD_FONT8N // Font 8. Alternative to Font 8 above, slightly narrower, so 3 digits fit a 160 pixel TFT +#define LOAD_GFXFF // FreeFonts. Include access to the 48 Adafruit_GFX free fonts FF1 to FF48 and custom fonts + +// Comment out the #define below to stop the SPIFFS filing system and smooth font code being loaded +// this will save ~20kbytes of FLASH +#define SMOOTH_FONT + + +// ################################################################################## +// +// Section 4. Other options +// +// ################################################################################## + +// Define the SPI clock frequency, this affects the graphics rendering speed. Too +// fast and the TFT driver will not keep up and display corruption appears. +// With an ILI9341 display 40MHz works OK, 80MHz sometimes fails +// With a ST7735 display more than 27MHz may not work (spurious pixels and lines) +// With an ILI9163 display 27 MHz works OK. + +// #define SPI_FREQUENCY 1000000 +//#define SPI_FREQUENCY 5000000 +// #define SPI_FREQUENCY 10000000 + #define SPI_FREQUENCY 20000000 +//#define SPI_FREQUENCY 27000000 // Marauder // Actually sets it to 26.67MHz = 80/3 +// #define SPI_FREQUENCY 40000000 +// #define SPI_FREQUENCY 80000000 + +// Optional reduced SPI frequency for reading TFT +#define SPI_READ_FREQUENCY 20000000 + +// The XPT2046 requires a lower SPI clock rate of 2.5MHz so we define that here: +#define SPI_TOUCH_FREQUENCY 2500000 + +// The ESP32 has 2 free SPI ports i.e. VSPI and HSPI, the VSPI is the default. +// If the VSPI port is in use and pins are not accessible (e.g. TTGO T-Beam) +// then uncomment the following line: +//#define USE_HSPI_PORT + +// Comment out the following #define if "SPI Transactions" do not need to be +// supported. When commented out the code size will be smaller and sketches will +// run slightly faster, so leave it commented out unless you need it! + +// Transaction support is needed to work with SD library but not needed with TFT_SdFat +// Transaction support is required if other SPI devices are connected. + +// Transactions are automatically enabled by the library for an ESP32 (to use HAL mutex) +// so changing it here has no effect + +// #define SUPPORT_TRANSACTIONS diff --git a/esp32_marauder/Buffer.h b/esp32_marauder/Buffer.h index b88badaa4..9396735c0 100644 --- a/esp32_marauder/Buffer.h +++ b/esp32_marauder/Buffer.h @@ -7,6 +7,7 @@ #include "FS.h" #include "settings.h" #include "esp_wifi_types.h" +#include "configs.h" #define BUF_SIZE 3 * 1024 // Had to reduce buffer size to save RAM. GG @spacehuhn #define SNAP_LEN 2324 // max len of each recieved packet diff --git a/esp32_marauder/CommandLine.cpp b/esp32_marauder/CommandLine.cpp index 74355e5d8..ca976bcf2 100644 --- a/esp32_marauder/CommandLine.cpp +++ b/esp32_marauder/CommandLine.cpp @@ -388,7 +388,7 @@ void CommandLine::runCommand(String input) { else if (cmd_args.get(0) == LED_CMD) { int hex_arg = this->argSearch(&cmd_args, "-s"); int pat_arg = this->argSearch(&cmd_args, "-p"); - #ifdef PIN + #if defined(PIN) && defined(HAS_NEOPIXEL_LED) if (hex_arg != -1) { String hexstring = cmd_args.get(hex_arg + 1); int number = (int)strtol(&hexstring[1], NULL, 16); diff --git a/esp32_marauder/CommandLine.h b/esp32_marauder/CommandLine.h index c6be7e0fe..660db8a43 100644 --- a/esp32_marauder/CommandLine.h +++ b/esp32_marauder/CommandLine.h @@ -16,7 +16,11 @@ #include "SDInterface.h" #endif #include "settings.h" -#include "LedInterface.h" + +#ifdef HAS_NEOPIXEL_LED + #include "LedInterface.h" + extern LedInterface led_obj; +#endif #ifdef HAS_SCREEN extern MenuFunctions menu_function_obj; @@ -29,7 +33,6 @@ extern WiFiScan wifi_scan_obj; extern SDInterface sd_obj; #endif extern Settings settings_obj; -extern LedInterface led_obj; extern LinkedList* access_points; extern LinkedList* ssids; extern LinkedList* stations; diff --git a/esp32_marauder/Display.cpp b/esp32_marauder/Display.cpp index d23776ac3..0d4a01011 100644 --- a/esp32_marauder/Display.cpp +++ b/esp32_marauder/Display.cpp @@ -20,12 +20,11 @@ void Display::RunSetup() #endif tft.init(); - #ifndef MARAUDER_M5STICKC - tft.setRotation(0); // Portrait - #endif - #ifdef MARAUDER_M5STICKC + #if defined(MARAUDER_M5STICKC) || defined(MARAUDER_M5CARDPUTER) tft.setRotation(1); + #else + tft.setRotation(0); // Portrait #endif #ifdef MARAUDER_REV_FEATHER diff --git a/esp32_marauder/Keyboard.cpp b/esp32_marauder/Keyboard.cpp new file mode 100644 index 000000000..de89f9d20 --- /dev/null +++ b/esp32_marauder/Keyboard.cpp @@ -0,0 +1,258 @@ +#include "Keyboard.h" + +#ifdef MARAUDER_M5CARDPUTER +#include +#include + +#define digitalWrite(pin, level) gpio_set_level((gpio_num_t)pin, level) +#define digitalRead(pin) gpio_get_level((gpio_num_t)pin) + +void Keyboard_Class::_set_output(const std::vector &pinList, + uint8_t output) +{ + output = output & 0B00000111; + + digitalWrite(pinList[0], (output & 0B00000001)); + digitalWrite(pinList[1], (output & 0B00000010)); + digitalWrite(pinList[2], (output & 0B00000100)); +} + +uint8_t Keyboard_Class::_get_input(const std::vector &pinList) +{ + uint8_t buffer = 0x00; + uint8_t pin_value = 0x00; + + for (int i = 0; i < 7; i++) + { + pin_value = (digitalRead(pinList[i]) == 1) ? 0x00 : 0x01; + pin_value = pin_value << i; + buffer = buffer | pin_value; + } + + return buffer; +} + +void Keyboard_Class::begin() +{ + for (auto i : output_list) + { + gpio_reset_pin((gpio_num_t)i); + gpio_set_direction((gpio_num_t)i, GPIO_MODE_OUTPUT); + gpio_set_pull_mode((gpio_num_t)i, GPIO_PULLUP_PULLDOWN); + digitalWrite(i, 0); + } + + for (auto i : input_list) + { + gpio_reset_pin((gpio_num_t)i); + gpio_set_direction((gpio_num_t)i, GPIO_MODE_INPUT); + gpio_set_pull_mode((gpio_num_t)i, GPIO_PULLUP_ONLY); + } + + _set_output(output_list, 0); +} + +uint8_t Keyboard_Class::getKey(Point2D_t keyCoor) +{ + uint8_t ret = 0; + + if ((keyCoor.x < 0) || (keyCoor.y < 0)) + { + return 0; + } + if (_keys_state_buffer.ctrl || _keys_state_buffer.shift || + _is_caps_locked) + { + ret = _key_value_map[keyCoor.y][keyCoor.x].value_second; + } + else + { + ret = _key_value_map[keyCoor.y][keyCoor.x].value_first; + } + return ret; +} + +void Keyboard_Class::updateKeyList() +{ + _key_list_buffer.clear(); + Point2D_t coor; + uint8_t input_value = 0; + + for (int i = 0; i < 8; i++) + { + _set_output(output_list, i); + input_value = _get_input(input_list); + /* If key pressed */ + + if (input_value) + { + /* Get X */ + for (int j = 0; j < 7; j++) + { + if (input_value & (0x01 << j)) + { + coor.x = (i > 3) ? X_map_chart[j].x_1 : X_map_chart[j].x_2; + + /* Get Y */ + coor.y = (i > 3) ? (i - 4) : i; + // printf("%d,%d\t", coor.x, coor.y); + + /* Keep the same as picture */ + coor.y = -coor.y; + coor.y = coor.y + 3; + + _key_list_buffer.push_back(coor); + } + } + } + } +} + +uint8_t Keyboard_Class::isPressed() +{ + return _key_list_buffer.size(); +} + +bool Keyboard_Class::isChange() +{ + if (_last_key_size != _key_list_buffer.size()) + { + _last_key_size = _key_list_buffer.size(); + return true; + } + else + { + return false; + } +} + +bool Keyboard_Class::isKeyPressed(char c) +{ + if (_key_list_buffer.size()) + { + for (const auto &i : _key_list_buffer) + { + if (getKey(i) == c) + return true; + } + } + return false; +} + +#include + +void Keyboard_Class::updateKeysState() +{ + _keys_state_buffer.reset(); + _key_pos_print_keys.clear(); + _key_pos_hid_keys.clear(); + _key_pos_modifier_keys.clear(); + + // Get special keys + for (auto &i : _key_list_buffer) + { + // modifier + if (getKeyValue(i).value_first == KEY_FN) + { + _keys_state_buffer.fn = true; + continue; + } + if (getKeyValue(i).value_first == KEY_OPT) + { + _keys_state_buffer.opt = true; + continue; + } + + if (getKeyValue(i).value_first == KEY_LEFT_CTRL) + { + _keys_state_buffer.ctrl = true; + _key_pos_modifier_keys.push_back(i); + continue; + } + + if (getKeyValue(i).value_first == KEY_LEFT_SHIFT) + { + _keys_state_buffer.shift = true; + _key_pos_modifier_keys.push_back(i); + continue; + } + + if (getKeyValue(i).value_first == KEY_LEFT_ALT) + { + _keys_state_buffer.alt = true; + _key_pos_modifier_keys.push_back(i); + continue; + } + + // function + if (getKeyValue(i).value_first == KEY_TAB) + { + _keys_state_buffer.tab = true; + _key_pos_hid_keys.push_back(i); + continue; + } + + if (getKeyValue(i).value_first == KEY_BACKSPACE) + { + _keys_state_buffer.del = true; + _key_pos_hid_keys.push_back(i); + continue; + } + + if (getKeyValue(i).value_first == KEY_ENTER) + { + _keys_state_buffer.enter = true; + _key_pos_hid_keys.push_back(i); + continue; + } + + if (getKeyValue(i).value_first == ' ') + { + _keys_state_buffer.space = true; + } + _key_pos_hid_keys.push_back(i); + _key_pos_print_keys.push_back(i); + } + + for (auto &i : _key_pos_modifier_keys) + { + uint8_t key = getKeyValue(i).value_first; + _keys_state_buffer.modifier_keys.push_back(key); + } + + for (auto &k : _keys_state_buffer.modifier_keys) + { + _keys_state_buffer.modifiers |= (1 << (k - 0x80)); + } + + for (auto &i : _key_pos_hid_keys) + { + uint8_t k = getKeyValue(i).value_first; + if (k == KEY_TAB || k == KEY_BACKSPACE || k == KEY_ENTER) + { + _keys_state_buffer.hid_keys.push_back(k); + continue; + } + uint8_t key = _kb_asciimap[k]; + if (key) + { + _keys_state_buffer.hid_keys.push_back(key); + } + } + + // Deal what left + for (auto &i : _key_pos_print_keys) + { + if (_keys_state_buffer.ctrl || _keys_state_buffer.shift || + _is_caps_locked) + { + _keys_state_buffer.word.push_back(getKeyValue(i).value_second); + } + else + { + _keys_state_buffer.word.push_back(getKeyValue(i).value_first); + } + } +} + +#endif diff --git a/esp32_marauder/Keyboard.h b/esp32_marauder/Keyboard.h new file mode 100644 index 000000000..60573f988 --- /dev/null +++ b/esp32_marauder/Keyboard.h @@ -0,0 +1,198 @@ +#pragma once + +#ifndef Keyboard_h +#define Keyboard_h + +#include "configs.h" + +#ifdef MARAUDER_M5CARDPUTER + +/** + * @file keyboard.h + * @author Forairaaaaa + * @brief + * @version 0.1 + * @date 2023-09-22 + * + * @copyright Copyright (c) 2023 + * + */ +#include +#include +#include "Arduino.h" +#include "Keyboard_def.h" +#include "configs.h" + +struct Chart_t +{ + uint8_t value; + uint8_t x_1; + uint8_t x_2; +}; + +struct Point2D_t +{ + int x; + int y; +}; + +const std::vector output_list = {8, 9, 11}; +const std::vector input_list = {13, 15, 3, 4, 5, 6, 7}; + +const Chart_t X_map_chart[7] = {{1, 0, 1}, {2, 2, 3}, {4, 4, 5}, {8, 6, 7}, {16, 8, 9}, {32, 10, 11}, {64, 12, 13}}; + +struct KeyValue_t +{ + const char value_first; + const char value_second; +}; + +const KeyValue_t _key_value_map[4][14] = {{{'`', '~'}, + {'1', '!'}, + {'2', '@'}, + {'3', '#'}, + {'4', '$'}, + {'5', '%'}, + {'6', '^'}, + {'7', '&'}, + {'8', '*'}, + {'9', '('}, + {'0', ')'}, + {'-', '_'}, + {'=', '+'}, + {KEY_BACKSPACE, KEY_BACKSPACE}}, + {{KEY_TAB, KEY_TAB}, + {'q', 'Q'}, + {'w', 'W'}, + {'e', 'E'}, + {'r', 'R'}, + {'t', 'T'}, + {'y', 'Y'}, + {'u', 'U'}, + {'i', 'I'}, + {'o', 'O'}, + {'p', 'P'}, + {'[', '{'}, + {']', '}'}, + {'\\', '|'}}, + {{KEY_FN, KEY_FN}, + {KEY_LEFT_SHIFT, KEY_LEFT_SHIFT}, + {'a', 'A'}, + {'s', 'S'}, + {'d', 'D'}, + {'f', 'F'}, + {'g', 'G'}, + {'h', 'H'}, + {'j', 'J'}, + {'k', 'K'}, + {'l', 'L'}, + {';', ':'}, + {'\'', '\"'}, + {KEY_ENTER, KEY_ENTER}}, + {{KEY_LEFT_CTRL, KEY_LEFT_CTRL}, + {KEY_OPT, KEY_OPT}, + {KEY_LEFT_ALT, KEY_LEFT_ALT}, + {'z', 'Z'}, + {'x', 'X'}, + {'c', 'C'}, + {'v', 'V'}, + {'b', 'B'}, + {'n', 'N'}, + {'m', 'M'}, + {',', '<'}, + {'.', '>'}, + {'/', '?'}, + {' ', ' '}}}; + +class Keyboard_Class +{ +public: + struct KeysState + { + bool tab = false; + bool fn = false; + bool shift = false; + bool ctrl = false; + bool opt = false; + bool alt = false; + bool del = false; + bool enter = false; + bool space = false; + uint8_t modifiers = 0; + + std::vector word; + std::vector hid_keys; + std::vector modifier_keys; + + void reset() + { + tab = false; + fn = false; + shift = false; + ctrl = false; + opt = false; + alt = false; + del = false; + enter = false; + space = false; + modifiers = 0; + word.clear(); + hid_keys.clear(); + modifier_keys.clear(); + } + }; + +private: + std::vector _key_list_buffer; + std::vector _key_pos_print_keys; // only text: eg A,B,C + std::vector _key_pos_hid_keys; // print key + space, enter, del + std::vector + _key_pos_modifier_keys; // modifier key: eg shift, ctrl, alt + KeysState _keys_state_buffer; + bool _is_caps_locked; + uint8_t _last_key_size; + + void _set_output(const std::vector &pinList, uint8_t output); + uint8_t _get_input(const std::vector &pinList); + +public: + Keyboard_Class() : _is_caps_locked(false) + { + } + + void begin(); + uint8_t getKey(Point2D_t keyCoor); + + void updateKeyList(); + inline std::vector &keyList() + { + return _key_list_buffer; + } + + inline KeyValue_t getKeyValue(const Point2D_t &keyCoor) + { + return _key_value_map[keyCoor.y][keyCoor.x]; + } + + uint8_t isPressed(); + bool isChange(); + bool isKeyPressed(char c); + + void updateKeysState(); + inline KeysState &keysState() + { + return _keys_state_buffer; + } + + inline bool capslocked(void) + { + return _is_caps_locked; + } + inline void setCapsLocked(bool isLocked) + { + _is_caps_locked = isLocked; + } +}; +#endif + +#endif diff --git a/esp32_marauder/Keyboard_def.h b/esp32_marauder/Keyboard_def.h new file mode 100644 index 000000000..91c1e83f9 --- /dev/null +++ b/esp32_marauder/Keyboard_def.h @@ -0,0 +1,155 @@ +#ifndef M5CARDPUTER_KB_KEYS_DEF_H +#define M5CARDPUTER_KB_KEYS_DEF_H + +#include "configs.h" + +#ifdef MARAUDER_M5CARDPUTER + +#define SHIFT 0x80 + +#define KEY_LEFT_CTRL 0x80 +#define KEY_LEFT_SHIFT 0x81 +#define KEY_LEFT_ALT 0x82 + +#define KEY_FN 0xff +#define KEY_OPT 0x00 + +#define KEY_BACKSPACE 0x2a +#define KEY_TAB 0x2b +#define KEY_ENTER 0x28 + +const uint8_t _kb_asciimap[128] = { + 0x00, // NUL + 0x00, // SOH + 0x00, // STX + 0x00, // ETX + 0x00, // EOT + 0x00, // ENQ + 0x00, // ACK + 0x00, // BEL + KEY_BACKSPACE, // BS Backspace + KEY_TAB, // TAB Tab + KEY_ENTER, // LF Enter + 0x00, // VT + 0x00, // FF + 0x00, // CR + 0x00, // SO + 0x00, // SI + 0x00, // DEL + 0x00, // DC1 + 0x00, // DC2 + 0x00, // DC3 + 0x00, // DC4 + 0x00, // NAK + 0x00, // SYN + 0x00, // ETB + 0x00, // CAN + 0x00, // EM + 0x00, // SUB + 0x00, // ESC + 0x00, // FS + 0x00, // GS + 0x00, // RS + 0x00, // US + + 0x2c, // ' ' + 0x1e | SHIFT, // ! + 0x34 | SHIFT, // " + 0x20 | SHIFT, // # + 0x21 | SHIFT, // $ + 0x22 | SHIFT, // % + 0x24 | SHIFT, // & + 0x34, // ' + 0x26 | SHIFT, // ( + 0x27 | SHIFT, // ) + 0x25 | SHIFT, // * + 0x2e | SHIFT, // + + 0x36, // , + 0x2d, // - + 0x37, // . + 0x38, // / + 0x27, // 0 + 0x1e, // 1 + 0x1f, // 2 + 0x20, // 3 + 0x21, // 4 + 0x22, // 5 + 0x23, // 6 + 0x24, // 7 + 0x25, // 8 + 0x26, // 9 + 0x33 | SHIFT, // : + 0x33, // ; + 0x36 | SHIFT, // < + 0x2e, // = + 0x37 | SHIFT, // > + 0x38 | SHIFT, // ? + 0x1f | SHIFT, // @ + 0x04 | SHIFT, // A + 0x05 | SHIFT, // B + 0x06 | SHIFT, // C + 0x07 | SHIFT, // D + 0x08 | SHIFT, // E + 0x09 | SHIFT, // F + 0x0a | SHIFT, // G + 0x0b | SHIFT, // H + 0x0c | SHIFT, // I + 0x0d | SHIFT, // J + 0x0e | SHIFT, // K + 0x0f | SHIFT, // L + 0x10 | SHIFT, // M + 0x11 | SHIFT, // N + 0x12 | SHIFT, // O + 0x13 | SHIFT, // P + 0x14 | SHIFT, // Q + 0x15 | SHIFT, // R + 0x16 | SHIFT, // S + 0x17 | SHIFT, // T + 0x18 | SHIFT, // U + 0x19 | SHIFT, // V + 0x1a | SHIFT, // W + 0x1b | SHIFT, // X + 0x1c | SHIFT, // Y + 0x1d | SHIFT, // Z + 0x2f, // [ + 0x31, // bslash + 0x30, // ] + 0x23 | SHIFT, // ^ + 0x2d | SHIFT, // _ + 0x35, // ` + 0x04, // a + 0x05, // b + 0x06, // c + 0x07, // d + 0x08, // e + 0x09, // f + 0x0a, // g + 0x0b, // h + 0x0c, // i + 0x0d, // j + 0x0e, // k + 0x0f, // l + 0x10, // m + 0x11, // n + 0x12, // o + 0x13, // p + 0x14, // q + 0x15, // r + 0x16, // s + 0x17, // t + 0x18, // u + 0x19, // v + 0x1a, // w + 0x1b, // x + 0x1c, // y + 0x1d, // z + 0x2f | SHIFT, // { + 0x31 | SHIFT, // | + 0x30 | SHIFT, // } + 0x35 | SHIFT, // ~ + 0 // DEL +}; + +#endif + +#endif diff --git a/esp32_marauder/MenuFunctions.cpp b/esp32_marauder/MenuFunctions.cpp index ba4b8b91b..27dc378bd 100644 --- a/esp32_marauder/MenuFunctions.cpp +++ b/esp32_marauder/MenuFunctions.cpp @@ -476,21 +476,25 @@ MenuFunctions::MenuFunctions() void MenuFunctions::buttonNotSelected(uint8_t b, int8_t x) { if (x == -1) x = b; + #ifndef MARAUDER_M5CARDPUTER display_obj.tft.setFreeFont(NULL); + #endif display_obj.key[b].drawButton(false, current_menu->list->get(x).name); } void MenuFunctions::buttonSelected(uint8_t b, int8_t x) { if (x == -1) x = b; + #ifndef MARAUDER_M5CARDPUTER display_obj.tft.setFreeFont(NULL); + #endif display_obj.key[b].drawButton(true, current_menu->list->get(x).name); } // Function to check menu input void MenuFunctions::main(uint32_t currentTime) { - // Some function exited and we need to go back to normal + // Some function exited and we need to go back to normal if (display_obj.exit_draw) { wifi_scan_obj.currentScanMode = WIFI_SCAN_OFF; display_obj.exit_draw = false; @@ -611,9 +615,10 @@ void MenuFunctions::main(uint32_t currentTime) #endif #ifdef HAS_BUTTONS - + #if (C_BTN >= 0) bool c_btn_press = c_btn.justPressed(); - + #endif + #ifndef HAS_ILI9341 if ((c_btn_press) && @@ -745,8 +750,12 @@ void MenuFunctions::main(uint32_t currentTime) #ifdef HAS_BUTTONS #if !(defined(MARAUDER_V6) || defined(MARAUDER_V6_1)) - #ifndef MARAUDER_M5STICKC + #if (U_BTN >= 0 || defined(MARAUDER_M5CARDPUTER)) + #if (U_BTN >= 0) if (u_btn.justPressed()){ + #elif defined(MARAUDER_M5CARDPUTER) + if (this->isKeyPressed(';')){ + #endif if ((wifi_scan_obj.currentScanMode == WIFI_SCAN_OFF) || (wifi_scan_obj.currentScanMode == OTA_UPDATE)) { if (current_menu->selected > 0) { @@ -781,7 +790,13 @@ void MenuFunctions::main(uint32_t currentTime) } } #endif + + #if (D_BTN >= 0 || defined(MARAUDER_M5CARDPUTER)) + #if (D_BTN >= 0) if (d_btn.justPressed()){ + #elif defined(MARAUDER_M5CARDPUTER) + if (this->isKeyPressed('.')){ + #endif if ((wifi_scan_obj.currentScanMode == WIFI_SCAN_OFF) || (wifi_scan_obj.currentScanMode == OTA_UPDATE)) { if (current_menu->selected < current_menu->list->size() - 1) { @@ -815,9 +830,13 @@ void MenuFunctions::main(uint32_t currentTime) wifi_scan_obj.changeChannel(14); } } + #endif + + #if (C_BTN >= 0) if(c_btn_press){ current_menu->list->get(current_menu->selected).callable(); } + #endif #endif #endif } @@ -936,14 +955,14 @@ void MenuFunctions::updateStatusBar() uint16_t the_color; - if (this->old_gps_sat_count != gps_obj.getNumSats()) { - this->old_gps_sat_count = gps_obj.getNumSats(); - display_obj.tft.fillRect(0, 0, 240, STATUS_BAR_WIDTH, STATUSBAR_COLOR); - status_changed = true; - } - // GPS Stuff #ifdef HAS_GPS + if (this->old_gps_sat_count != gps_obj.getNumSats()) { + this->old_gps_sat_count = gps_obj.getNumSats(); + display_obj.tft.fillRect(0, 0, 240, STATUS_BAR_WIDTH, STATUSBAR_COLOR); + status_changed = true; + } + if (gps_obj.getGpsModuleStatus()) { if (gps_obj.getFixStatus()) the_color = TFT_GREEN; @@ -982,7 +1001,7 @@ void MenuFunctions::updateStatusBar() 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) + #if defined(MARAUDER_MINI) || defined(MARAUDER_M5STICKC) || defined(MARAUDER_M5CARDPUTER) || defined(MARAUDER_REV_FEATHER) display_obj.tft.drawString("CH: " + (String)wifi_scan_obj.set_channel, TFT_WIDTH/4, 0, 1); #endif } @@ -996,7 +1015,7 @@ void MenuFunctions::updateStatusBar() 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) + #if defined(MARAUDER_MINI) || defined(MARAUDER_M5STICKC) || defined(MARAUDER_M5CARDPUTER) || defined(MARAUDER_REV_FEATHER) display_obj.tft.drawString((String)wifi_scan_obj.free_ram + "B", TFT_WIDTH/1.75, 0, 1); #endif } @@ -1039,7 +1058,7 @@ void MenuFunctions::updateStatusBar() #endif #endif - #if defined(MARAUDER_MINI) || defined(MARAUDER_M5STICKC) || defined(MARAUDER_REV_FEATHER) + #if defined(MARAUDER_MINI) || defined(MARAUDER_M5STICKC) || defined(MARAUDER_M5CARDPUTER) || defined(MARAUDER_REV_FEATHER) display_obj.tft.setTextColor(the_color, STATUSBAR_COLOR); display_obj.tft.drawString("SD", TFT_WIDTH - 12, 0, 1); #endif @@ -1048,7 +1067,7 @@ void MenuFunctions::updateStatusBar() void MenuFunctions::drawStatusBar() { display_obj.tft.setTextSize(1); - #if defined(MARAUDER_MINI) || defined(MARAUDER_M5STICKC) || defined(MARAUDER_REV_FEATHER) + #if defined(MARAUDER_MINI) || defined(MARAUDER_M5STICKC) || defined(MARAUDER_M5CARDPUTER) || defined(MARAUDER_REV_FEATHER) display_obj.tft.setFreeFont(NULL); #endif display_obj.tft.fillRect(0, 0, 240, STATUS_BAR_WIDTH, STATUSBAR_COLOR); @@ -1093,7 +1112,7 @@ void MenuFunctions::drawStatusBar() 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) + #if defined(MARAUDER_MINI) || defined(MARAUDER_M5STICKC) || defined(MARAUDER_M5CARDPUTER) || defined(MARAUDER_REV_FEATHER) display_obj.tft.drawString("CH: " + (String)wifi_scan_obj.set_channel, TFT_WIDTH/4, 0, 1); #endif @@ -1105,7 +1124,7 @@ void MenuFunctions::drawStatusBar() 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) + #if defined(MARAUDER_MINI) || defined(MARAUDER_M5STICKC) || defined(MARAUDER_M5CARDPUTER) || defined(MARAUDER_REV_FEATHER) display_obj.tft.drawString((String)wifi_scan_obj.free_ram + "B", TFT_WIDTH/1.75, 0, 1); #endif @@ -1147,7 +1166,7 @@ void MenuFunctions::drawStatusBar() #endif #endif - #if defined(MARAUDER_MINI) || defined(MARAUDER_M5STICKC) || defined(MARAUDER_REV_FEATHER) + #if defined(MARAUDER_MINI) || defined(MARAUDER_M5STICKC) || defined(MARAUDER_M5CARDPUTER) || defined(MARAUDER_REV_FEATHER) display_obj.tft.setTextColor(the_color, STATUSBAR_COLOR); display_obj.tft.drawString("SD", TFT_WIDTH - 12, 0, 1); #endif @@ -1157,7 +1176,11 @@ void MenuFunctions::orientDisplay() { display_obj.tft.init(); + #if defined(MARAUDER_M5STICKC) || defined(MARAUDER_M5CARDPUTER) + display_obj.tft.setRotation(1); + #else display_obj.tft.setRotation(0); // Portrait + #endif display_obj.tft.setCursor(0, 0); @@ -1197,7 +1220,11 @@ void MenuFunctions::displaySetting(String key, Menu* menu, int index) { MenuNode node = menu->list->get(index); display_obj.tft.setTextWrap(false); + + #ifndef MARAUDER_M5CARDPUTER display_obj.tft.setFreeFont(NULL); + #endif + display_obj.tft.setCursor(0, 100); display_obj.tft.setTextSize(1); @@ -1229,6 +1256,10 @@ void MenuFunctions::RunSetup() #ifdef HAS_ILI9341 this->initLVGL(); #endif + + #ifdef MARAUDER_M5CARDPUTER + M5CardputerKeyboard.begin(); + #endif // root menu stuff mainMenu.list = new LinkedList(); // Get list in first menu ready @@ -1560,7 +1591,12 @@ void MenuFunctions::RunSetup() #if (defined(HAS_BUTTONS) && defined(HAS_SD)) #if !(defined(MARAUDER_V6) || defined(MARAUDER_V6_1)) while(true) { - if (d_btn.justPressed()) { + #if (D_BTN >= 0 || defined(MARAUDER_M5CARDPUTER)) + #if (D_BTN >= 0) + if (d_btn.justPressed()){ + #elif defined(MARAUDER_M5CARDPUTER) + if (this->isKeyPressed('.')){ + #endif if (evil_portal_obj.selected_html_index > 0) evil_portal_obj.selected_html_index--; else @@ -1570,8 +1606,14 @@ void MenuFunctions::RunSetup() this->buildButtons(&htmlMenu); this->displayCurrentMenu(); } - #ifndef MARAUDER_M5STICKC - if (u_btn.justPressed()) { + #endif + + #if (U_BTN >= 0 || defined(MARAUDER_M5CARDPUTER)) + #if (U_BTN >= 0) + if (u_btn.justPressed()){ + #elif defined(MARAUDER_M5CARDPUTER) + if (this->isKeyPressed(';')){ + #endif if (evil_portal_obj.selected_html_index < evil_portal_obj.html_files->size() - 1) evil_portal_obj.selected_html_index++; else @@ -1582,6 +1624,8 @@ void MenuFunctions::RunSetup() this->displayCurrentMenu(); } #endif + + #if (C_BTN >= 0) if (c_btn.justPressed()) { if (evil_portal_obj.html_files->get(evil_portal_obj.selected_html_index) != "Back") { evil_portal_obj.target_html_name = evil_portal_obj.html_files->get(evil_portal_obj.selected_html_index); @@ -1591,6 +1635,7 @@ void MenuFunctions::RunSetup() this->changeMenu(htmlMenu.parentMenu); break; } + #endif } #endif #endif @@ -1945,8 +1990,12 @@ void MenuFunctions::RunSetup() // Start button loop while(true) { - #ifndef MARAUDER_M5STICKC - if (u_btn.justPressed()) { + #if (U_BTN >= 0 || defined(MARAUDER_M5CARDPUTER)) + #if (U_BTN >= 0) + if (u_btn.justPressed()){ + #elif defined(MARAUDER_M5CARDPUTER) + if (this->isKeyPressed(';')){ + #endif if (sd_file_index > 0) sd_file_index--; else @@ -1957,7 +2006,13 @@ void MenuFunctions::RunSetup() this->displayCurrentMenu(); } #endif - if (d_btn.justPressed()) { + + #if (D_BTN >= 0 || defined(MARAUDER_M5CARDPUTER)) + #if (D_BTN >= 0) + if (d_btn.justPressed()){ + #elif defined(MARAUDER_M5CARDPUTER) + if (this->isKeyPressed('.')){ + #endif if (sd_file_index < sd_obj.sd_files->size() - 1) sd_file_index++; else @@ -1967,6 +2022,9 @@ void MenuFunctions::RunSetup() this->buildButtons(&sdDeleteMenu, 0, sd_obj.sd_files->get(sd_file_index)); this->displayCurrentMenu(); } + #endif + + #if (C_BTN >= 0) if (c_btn.justPressed()) { if (sd_obj.sd_files->get(sd_file_index) != "Back") { if (sd_obj.removeFile("/" + sd_obj.sd_files->get(sd_file_index))) @@ -1982,6 +2040,7 @@ void MenuFunctions::RunSetup() } break; } + #endif } } #endif @@ -2364,6 +2423,8 @@ void MenuFunctions::displayCurrentMenu(uint8_t start_index) #if defined(MARAUDER_MINI) || defined(MARAUDER_M5STICKC) || defined(MARAUDER_REV_FEATHER) display_obj.tft.setFreeFont(NULL); display_obj.tft.setTextSize(1); + #elif defined(MARAUDER_M5CARDPUTER) + display_obj.tft.setTextSize(1); #endif for (uint8_t i = start_index; i < current_menu->list->size(); i++) { @@ -2384,15 +2445,32 @@ void MenuFunctions::displayCurrentMenu(uint8_t start_index) #endif - #if defined(MARAUDER_MINI) || defined(MARAUDER_M5STICKC) || defined(MARAUDER_REV_FEATHER) + #if defined(MARAUDER_MINI) || defined(MARAUDER_M5STICKC) || defined(MARAUDER_M5CARDPUTER) || defined(MARAUDER_REV_FEATHER) 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 display_obj.key[i - start_index].drawButton(false, current_menu->list->get(i).name); #endif } + + #ifndef MARAUDER_M5CARDPUTER display_obj.tft.setFreeFont(NULL); + #endif } } +#ifdef MARAUDER_M5CARDPUTER +bool MenuFunctions::isKeyPressed(char c) +{ + M5CardputerKeyboard.updateKeyList(); + M5CardputerKeyboard.updateKeysState(); + bool pressed = M5CardputerKeyboard.isKeyPressed(c); + + if (pressed) + delay(200); + + return pressed; +} +#endif + #endif diff --git a/esp32_marauder/MenuFunctions.h b/esp32_marauder/MenuFunctions.h index a41a7395b..189789fa3 100644 --- a/esp32_marauder/MenuFunctions.h +++ b/esp32_marauder/MenuFunctions.h @@ -5,6 +5,10 @@ #include "configs.h" +#ifdef MARAUDER_M5CARDPUTER +#include "Keyboard.h" +#endif + #ifdef HAS_SCREEN #define BATTERY_ANALOG_ON 0 @@ -16,11 +20,23 @@ #ifdef HAS_BUTTONS #include "Switches.h" - extern Switches u_btn; - extern Switches d_btn; - extern Switches l_btn; - extern Switches r_btn; - extern Switches c_btn; + + #if (U_BTN >= 0) + extern Switches u_btn; + #endif + #if (D_BTN >= 0) + extern Switches d_btn; + #endif + #if (L_BTN >= 0) + extern Switches l_btn; + #endif + #if (R_BTN >= 0) + extern Switches r_btn; + #endif + #if (C_BTN >= 0) + extern Switches c_btn; + #endif + #endif extern WiFiScan wifi_scan_obj; @@ -185,6 +201,11 @@ class MenuFunctions uint8_t updateTouch(uint16_t *x, uint16_t *y, uint16_t threshold = 600); +#ifdef MARAUDER_M5CARDPUTER + Keyboard_Class M5CardputerKeyboard = Keyboard_Class(); + bool isKeyPressed(char c); +#endif + public: MenuFunctions(); diff --git a/esp32_marauder/SDInterface.cpp b/esp32_marauder/SDInterface.cpp index c5a769eb0..4763530cf 100644 --- a/esp32_marauder/SDInterface.cpp +++ b/esp32_marauder/SDInterface.cpp @@ -21,23 +21,19 @@ bool SDInterface::initSD() { pinMode(SD_CS, OUTPUT); delay(10); - #if defined(MARAUDER_M5STICKC) - /* Set up SPI SD Card using external pin header - StickCPlus Header - SPI SD Card Reader - 3v3 - 3v3 - GND - GND - G0 - CLK - G36/G25 - MISO - G26 - MOSI - - CS (jumper to SD Card GND Pin) - */ - enum { SPI_SCK = 0, SPI_MISO = 36, SPI_MOSI = 26 }; + + #if defined(MARAUDER_M5STICKC) || defined(MARAUDER_M5CARDPUTER) + #ifdef MARAUDER_M5STICKC this->spiExt = new SPIClass(); - this->spiExt->begin(SPI_SCK, SPI_MISO, SPI_MOSI, SD_CS); + #else + this->spiExt = new SPIClass(FSPI); + #endif + spiExt->begin(SD_SCK, SD_MISO, SD_MOSI, SD_CS); if (!SD.begin(SD_CS, *(this->spiExt))) { #else if (!SD.begin(SD_CS)) { #endif + Serial.println(F("Failed to mount SD Card")); this->supported = false; return false; diff --git a/esp32_marauder/SDInterface.h b/esp32_marauder/SDInterface.h index eda62bafc..d528cde70 100644 --- a/esp32_marauder/SDInterface.h +++ b/esp32_marauder/SDInterface.h @@ -26,9 +26,10 @@ extern Settings settings_obj; class SDInterface { private: -#if defined(MARAUDER_M5STICKC) +#if defined(MARAUDER_M5STICKC) || defined(MARAUDER_M5CARDPUTER) SPIClass *spiExt; #endif + bool checkDetectPin(); public: diff --git a/esp32_marauder/WiFiScan.cpp b/esp32_marauder/WiFiScan.cpp index 148ccf73e..d82318963 100644 --- a/esp32_marauder/WiFiScan.cpp +++ b/esp32_marauder/WiFiScan.cpp @@ -657,7 +657,7 @@ void WiFiScan::startWiFiAttacks(uint8_t scan_mode, uint16_t color, String title_ xiao_led.attackLED(); #elif defined(MARAUDER_M5STICKC) stickc_led.attackLED(); - #else + #elif defined(HAS_NEOPIXEL_LED) led_obj.setMode(MODE_ATTACK); #endif initTime = millis(); @@ -682,7 +682,7 @@ bool WiFiScan::shutdownWiFi() { xiao_led.offLED(); #elif defined(MARAUDER_M5STICKC) stickc_led.offLED(); - #else + #elif defined(HAS_NEOPIXEL_LED) led_obj.setMode(MODE_OFF); #endif @@ -709,7 +709,7 @@ bool WiFiScan::shutdownBLE() { xiao_led.offLED(); #elif defined(MARAUDER_M5STICKC) stickc_led.offLED(); - #else + #elif defined(HAS_NEOPIXEL_LED) led_obj.setMode(MODE_OFF); #endif @@ -1152,7 +1152,7 @@ void WiFiScan::RunEvilPortal(uint8_t scan_mode, uint16_t color) xiao_led.sniffLED(); #elif defined(MARAUDER_M5STICKC) stickc_led.sniffLED(); - #else + #elif defined(HAS_NEOPIXEL_LED) led_obj.setMode(MODE_SNIFF); #endif @@ -1195,7 +1195,7 @@ void WiFiScan::RunAPScan(uint8_t scan_mode, uint16_t color) xiao_led.sniffLED(); #elif defined(MARAUDER_M5STICKC) stickc_led.sniffLED(); - #else + #elif defined(HAS_NEOPIXEL_LED) led_obj.setMode(MODE_SNIFF); #endif @@ -1620,7 +1620,7 @@ void WiFiScan::RunPacketMonitor(uint8_t scan_mode, uint16_t color) xiao_led.sniffLED(); #elif defined(MARAUDER_M5STICKC) stickc_led.sniffLED(); - #else + #elif defined(HAS_NEOPIXEL_LED) led_obj.setMode(MODE_SNIFF); #endif @@ -1699,7 +1699,7 @@ void WiFiScan::RunEapolScan(uint8_t scan_mode, uint16_t color) xiao_led.sniffLED(); #elif defined(MARAUDER_M5STICKC) stickc_led.sniffLED(); - #else + #elif defined(HAS_NEOPIXEL_LED) led_obj.setMode(MODE_SNIFF); #endif @@ -1840,7 +1840,7 @@ void WiFiScan::RunPwnScan(uint8_t scan_mode, uint16_t color) xiao_led.sniffLED(); #elif defined(MARAUDER_M5STICKC) stickc_led.sniffLED(); - #else + #elif defined(HAS_NEOPIXEL_LED) led_obj.setMode(MODE_SNIFF); #endif @@ -2033,7 +2033,7 @@ void WiFiScan::RunBeaconScan(uint8_t scan_mode, uint16_t color) xiao_led.sniffLED(); #elif defined(MARAUDER_M5STICKC) stickc_led.sniffLED(); - #else + #elif defined(HAS_NEOPIXEL_LED) led_obj.setMode(MODE_SNIFF); #endif @@ -2092,7 +2092,7 @@ void WiFiScan::RunStationScan(uint8_t scan_mode, uint16_t color) xiao_led.sniffLED(); #elif defined(MARAUDER_M5STICKC) stickc_led.sniffLED(); - #else + #elif defined(HAS_NEOPIXEL_LED) led_obj.setMode(MODE_SNIFF); #endif @@ -2136,7 +2136,7 @@ void WiFiScan::RunRawScan(uint8_t scan_mode, uint16_t color) xiao_led.sniffLED(); #elif defined(MARAUDER_M5STICKC) stickc_led.sniffLED(); - #else + #elif defined(HAS_NEOPIXEL_LED) led_obj.setMode(MODE_SNIFF); #endif @@ -2182,7 +2182,7 @@ void WiFiScan::RunDeauthScan(uint8_t scan_mode, uint16_t color) xiao_led.sniffLED(); #elif defined(MARAUDER_M5STICKC) stickc_led.sniffLED(); - #else + #elif defined(HAS_NEOPIXEL_LED) led_obj.setMode(MODE_SNIFF); #endif @@ -2241,7 +2241,7 @@ void WiFiScan::RunProbeScan(uint8_t scan_mode, uint16_t color) xiao_led.sniffLED(); #elif defined(MARAUDER_M5STICKC) stickc_led.sniffLED(); - #else + #elif defined(HAS_NEOPIXEL_LED) led_obj.setMode(MODE_SNIFF); #endif diff --git a/esp32_marauder/WiFiScan.h b/esp32_marauder/WiFiScan.h index 5b5ec6074..6423b7e4f 100644 --- a/esp32_marauder/WiFiScan.h +++ b/esp32_marauder/WiFiScan.h @@ -41,7 +41,7 @@ #include "xiaoLED.h" #elif defined(MARAUDER_M5STICKC) #include "stickcLED.h" -#else +#elif defined(HAS_NEOPIXEL_LED) #include "LedInterface.h" #endif @@ -119,7 +119,7 @@ extern Settings settings_obj; extern xiaoLED xiao_led; #elif defined(MARAUDER_M5STICKC) extern stickcLED stickc_led; -#else +#elif defined(HAS_NEOPIXEL_LED) extern LedInterface led_obj; #endif diff --git a/esp32_marauder/configs.h b/esp32_marauder/configs.h index 0949eedd5..5f68a8cc1 100644 --- a/esp32_marauder/configs.h +++ b/esp32_marauder/configs.h @@ -8,6 +8,7 @@ //// BOARD TARGETS //#define MARAUDER_M5STICKC + //#define MARAUDER_M5CARDPUTER //#define MARAUDER_MINI //#define MARAUDER_V4 //#define MARAUDER_V6 @@ -26,6 +27,8 @@ //// HARDWARE NAMES #ifdef MARAUDER_M5STICKC #define HARDWARE_NAME "M5Stick-C Plus" + #elif defined(MARAUDER_M5CARDPUTER) + #define HARDWARE_NAME "M5Cardputer" #elif defined(MARAUDER_MINI) #define HARDWARE_NAME "Marauder Mini" #elif defined(MARAUDER_REV_FEATHER) @@ -64,6 +67,21 @@ #define HAS_SD #define USE_SD #define HAS_TEMP_SENSOR + //#define HAS_GPS + //#define HAS_SOFTWARE_SERIAL + #endif + + #ifdef MARAUDER_M5CARDPUTER + // #define FLIPPER_ZERO_HAT + // #define HAS_BATTERY + #define HAS_BT + #define HAS_BUTTONS + // #define HAS_NEOPIXEL_LED + // #define HAS_PWR_MGMT + #define HAS_SCREEN + #define HAS_SD + #define USE_SD + #define HAS_TEMP_SENSOR #define HAS_GPS #endif @@ -278,6 +296,26 @@ #define D_PULL true #endif + #ifdef MARAUDER_M5CARDPUTER + #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 + #ifdef MARAUDER_V6 #define L_BTN -1 #define C_BTN 0 @@ -392,6 +430,140 @@ #endif + #ifdef MARAUDER_M5CARDPUTER + #define SCREEN_CHAR_WIDTH 40 + //#define TFT_MISO -1 + #define TFT_MOSI 35 + #define TFT_SCLK 36 + #define TFT_CS 37 + #define TFT_DC 34 + #define TFT_RST 33 + #define TFT_BL 38 + // #define TOUCH_CS -1 + + #define SCREEN_BUFFER + + #define MAX_SCREEN_BUFFER 9 + + #define BANNER_TEXT_SIZE 1 + + #ifndef TFT_WIDTH + #define TFT_WIDTH 135 + #endif + + #ifndef TFT_HEIGHT + #define TFT_HEIGHT 240 + #endif + + #define CHAR_WIDTH 6 + #define SCREEN_WIDTH TFT_HEIGHT // Originally 240 + #define SCREEN_HEIGHT TFT_WIDTH // Originally 320 + #define HEIGHT_1 TFT_WIDTH + #define WIDTH_1 TFT_WIDTH + #define STANDARD_FONT_CHAR_LIMIT (TFT_WIDTH/6) // number of characters on a single line with normal font + #define TEXT_HEIGHT (TFT_HEIGHT/10) // 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 TFT_HEIGHT // 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 6 + #define BUTTON_ARRAY_LEN 100 + #define STATUS_BAR_WIDTH (TFT_HEIGHT/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 + + #endif + + #ifdef MARAUDER_M5CARDPUTER + #define SCREEN_CHAR_WIDTH 40 + //#define TFT_MISO -1 + #define TFT_MOSI 35 + #define TFT_SCLK 36 + #define TFT_CS 37 + #define TFT_DC 34 + #define TFT_RST 33 + #define TFT_BL 38 + // #define TOUCH_CS -1 + + #define SCREEN_BUFFER + + #define MAX_SCREEN_BUFFER 9 + + #define BANNER_TEXT_SIZE 1 + + #ifndef TFT_WIDTH + #define TFT_WIDTH 135 + #endif + + #ifndef TFT_HEIGHT + #define TFT_HEIGHT 240 + #endif + + #define CHAR_WIDTH 6 + #define SCREEN_WIDTH TFT_HEIGHT // Originally 240 + #define SCREEN_HEIGHT TFT_WIDTH // Originally 320 + #define HEIGHT_1 TFT_WIDTH + #define WIDTH_1 TFT_WIDTH + #define STANDARD_FONT_CHAR_LIMIT (TFT_WIDTH/6) // number of characters on a single line with normal font + #define TEXT_HEIGHT (TFT_HEIGHT/10) // 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 TFT_HEIGHT // 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 6 + #define BUTTON_ARRAY_LEN 13 + #define STATUS_BAR_WIDTH (TFT_HEIGHT/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 + + #endif + #ifdef MARAUDER_V4 #define SCREEN_CHAR_WIDTH 40 #define HAS_ILI9341 @@ -814,6 +986,24 @@ #define ICON_H 22 #define BUTTON_PADDING 60 #endif + + #ifdef MARAUDER_M5CARDPUTER + #define BANNER_TIME 50 + + #define COMMAND_PREFIX "!" + + // Keypad start position, key sizes and spacing + #define KEY_X (TFT_WIDTH/2) // Centre of key + #define KEY_Y (TFT_HEIGHT/5) + #define KEY_W TFT_HEIGHT // Width and height + #define KEY_H (TFT_HEIGHT/17) + #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 60 + #endif //// END MENU DEFINITIONS //// SD DEFINITIONS @@ -844,7 +1034,27 @@ #endif #ifdef MARAUDER_M5STICKC + /* Set up SPI SD Card using external pin header + StickCPlus Header - SPI SD Card Reader + 3v3 - 3v3 + GND - GND + G0 - CLK + G36/G25 - MISO + G26 - MOSI + - CS (jumper to SD Card GND Pin) + */ + #define SD_CS -1 + #define SD_SCK 0 + #define SD_MISO 36 + #define SD_MOSI 26 + #endif + + #ifdef MARAUDER_M5CARDPUTER + #define SD_CS 12 + #define SD_SCK 40 + #define SD_MISO 39 + #define SD_MOSI 14 #endif #ifdef MARAUDER_FLIPPER @@ -896,6 +1106,8 @@ // These values are in bytes #ifdef MARAUDER_M5STICKC #define MEM_LOWER_LIM 20000 + #elif defined(MARAUDER_M5CARDPUTER) + #define MEM_LOWER_LIM 20000 #elif defined(MARAUDER_MINI) #define MEM_LOWER_LIM 20000 #elif defined(MARAUDER_REV_FEATHER) @@ -938,6 +1150,8 @@ //// EVIL PORTAL STUFF #ifdef MARAUDER_M5STICKC #define MAX_HTML_SIZE 11400 + #elif defined(MARAUDER_M5CARDPUTER) + #define MAX_HTML_SIZE 11400 #elif defined(MARAUDER_MINI) #define MAX_HTML_SIZE 11400 #elif defined(MARAUDER_REV_FEATHER) @@ -1000,6 +1214,11 @@ #define GPS_TX 33 #define GPS_RX 32 #define mac_history_len 512 + #elif defined(MARAUDER_M5CARDPUTER) + #define GPS_SERIAL_INDEX 1 + #define GPS_TX 1 + #define GPS_RX 2 + #define mac_history_len 512 #elif defined(MARAUDER_REV_FEATHER) #define GPS_SERIAL_INDEX 1 #define GPS_TX 6 @@ -1027,4 +1246,21 @@ #endif //// END MARAUDER TITLE STUFF + //// SOFTWARE SERIAL + #ifdef HAS_SOFTWARE_SERIAL + + #include + extern EspSoftwareSerial::UART softwareSerial; + #define Serial softwareSerial + + #if defined(MARAUDER_M5STICKC) + #define SOFTWARE_SERIAL_RX 36 + #define SOFTWARE_SERIAL_TX 26 + #elif defined(MARAUDER_M5CARDPUTER) + #define SOFTWARE_SERIAL_RX 1 + #define SOFTWARE_SERIAL_TX 2 + #endif + + #endif + #endif diff --git a/esp32_marauder/data/marauder240_135.jpg b/esp32_marauder/data/marauder240_135.jpg new file mode 100644 index 000000000..7b285e0d3 Binary files /dev/null and b/esp32_marauder/data/marauder240_135.jpg differ diff --git a/esp32_marauder/esp32_marauder.ino b/esp32_marauder/esp32_marauder.ino index ac6ae818a..1709118b0 100644 --- a/esp32_marauder/esp32_marauder.ino +++ b/esp32_marauder/esp32_marauder.ino @@ -40,6 +40,7 @@ https://www.online-utility.org/image/convert/to/XBM #include "xiaoLED.h" #elif defined(MARAUDER_M5STICKC) #include "stickcLED.h" +#elif defined(HAS_NEOPIXEL_LED) #elif defined(HAS_NEOPIXEL_LED) #include "LedInterface.h" #endif @@ -101,9 +102,11 @@ CommandLine cli_obj; SDInterface sd_obj; #endif +#ifdef HAS_PWR_MGMT #ifdef MARAUDER_M5STICKC AXP192 axp192_obj; #endif +#endif #ifdef MARAUDER_FLIPPER flipperLED flipper_led; @@ -111,10 +114,14 @@ CommandLine cli_obj; xiaoLED xiao_led; #elif defined(MARAUDER_M5STICKC) stickcLED stickc_led; -#else +#elif defined(HAS_NEOPIXEL_LED) LedInterface led_obj; #endif +#ifdef HAS_SOFTWARE_SERIAL +EspSoftwareSerial::UART softwareSerial; +#endif + const String PROGMEM version_number = MARAUDER_VERSION; #ifdef HAS_NEOPIXEL_LED @@ -123,7 +130,6 @@ const String PROGMEM version_number = MARAUDER_VERSION; uint32_t currentTime = 0; - void backlightOn() { #ifdef HAS_SCREEN #ifdef MARAUDER_MINI @@ -151,9 +157,11 @@ void backlightOff() { void setup() { + #ifdef HAS_PWR_MGMT #ifdef MARAUDER_M5STICKC axp192_obj.begin(); #endif + #endif #ifdef HAS_SCREEN pinMode(TFT_BL, OUTPUT); @@ -182,6 +190,12 @@ void setup() Serial.begin(115200); + #ifdef HAS_SOFTWARE_SERIAL + + softwareSerial.begin(115200, EspSoftwareSerial::SWSERIAL_8N1, SOFTWARE_SERIAL_RX, SOFTWARE_SERIAL_TX, false); + + #endif + Serial.println("ESP-IDF version is: " + String(esp_get_idf_version())); #ifdef HAS_SCREEN @@ -194,10 +208,10 @@ void setup() // Draw the title screen /* #ifdef HAS_SCREEN - #ifndef MARAUDER_MINI - display_obj.drawJpeg("/marauder3L.jpg", 0 , 0); // 240 x 320 image + #if defined(MARAUDER_M5STICKC) || defined(MARAUDER_M5CARDPUTER) + display_obj.drawJpeg("/marauder240_135.jpg", 0 , -90); // 240 x 135 image #else - display_obj.drawJpeg("/marauder3L.jpg", 0, 0); + display_obj.drawJpeg("/marauder3L.jpg", 0, 0); // 240 x 320 image #endif #endif */ @@ -216,6 +230,7 @@ void setup() // Do some stealth mode stuff #ifdef HAS_BUTTONS + #if (C_BTN >= 0) if (c_btn.justPressed()) { display_obj.headless_mode = true; @@ -224,6 +239,7 @@ void setup() Serial.println("Headless Mode enabled"); } #endif + #endif display_obj.clearScreen(); @@ -242,14 +258,19 @@ void setup() wifi_scan_obj.RunSetup(); + String freeRAM = wifi_scan_obj.freeRAM(); + + Serial.println(freeRAM); + #ifdef HAS_SCREEN - display_obj.tft.println(F(text_table0[2])); + display_obj.tft.println(String(F(text_table0[2])) + " - " + freeRAM); #endif buffer_obj = Buffer(); #if defined(HAS_SD) // Do some SD stuff if(sd_obj.initSD()) { + Serial.println(F("Initialized SD Card")); #ifdef HAS_SCREEN display_obj.tft.println(F(text_table0[3])); #endif @@ -268,14 +289,10 @@ void setup() #ifdef HAS_BATTERY battery_obj.RunSetup(); #endif - #ifdef HAS_SCREEN display_obj.tft.println(F(text_table0[5])); #endif - #ifdef HAS_SCREEN - display_obj.tft.println(F(text_table0[6])); - #endif #ifdef HAS_BATTERY battery_obj.battery_level = battery_obj.getBatteryLevel(); @@ -288,7 +305,7 @@ void setup() xiao_led.RunSetup(); #elif defined(MARAUDER_M5STICKC) stickc_led.RunSetup(); - #else + #elif defined(HAS_NEOPIXEL_LED) led_obj.RunSetup(); #endif @@ -396,7 +413,7 @@ void loop() xiao_led.main(); #elif defined(MARAUDER_M5STICKC) stickc_led.main(); - #else + #elif defined(HAS_NEOPIXEL_LED) led_obj.main(currentTime); #endif diff --git a/esp32_marauder/libraries/TFT_eSPI b/esp32_marauder/libraries/TFT_eSPI index ddabd86dc..7c27c966c 160000 --- a/esp32_marauder/libraries/TFT_eSPI +++ b/esp32_marauder/libraries/TFT_eSPI @@ -1 +1 @@ -Subproject commit ddabd86dc81fc51e0e9dbef19ada77584f09ee40 +Subproject commit 7c27c966c7d479403908bbcb1d2d121c037a3ae3