diff --git a/.github/workflows/build_parallel.yml b/.github/workflows/build_parallel.yml new file mode 100644 index 000000000..e5c4b32af --- /dev/null +++ b/.github/workflows/build_parallel.yml @@ -0,0 +1,235 @@ +name: Build and Push + +on: + workflow_dispatch: + push: + branches: + - master + tags: + - "*" + pull_request: + +jobs: + compile_sketch: + name: build ${{ matrix.board.name }} + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + board: + - { name: "Flipper Zero WiFi Dev Board", flag: "MARAUDER_FLIPPER", fbqn: "esp32:esp32:esp32s2:PartitionScheme=min_spiffs,FlashSize=4M,PSRAM=enabled", file_name: "flipper", tft: false, tft_file: "", build_dir: "esp32s2", addr: "0x1000" } + - { name: "Flipper Zero Multi Board", flag: "MARAUDER_FLIPPER", fbqn: "esp32:esp32:esp32s3:PartitionScheme=min_spiffs,FlashSize=8M,PSRAM=enabled", file_name: "multiboardS3", tft: false, tft_file: "", build_dir: "esp32s3", addr: "0x0" } + - { name: "OG Marauder", flag: "MARAUDER_V4", fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs", file_name: "og", tft: true, tft_file: "User_Setup_og_marauder.h", build_dir: "d32", addr: "0x1000" } + - { name: "Marauder v6", flag: "MARAUDER_V6", fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs", file_name: "v6", tft: true, tft_file: "User_Setup_og_marauder.h", build_dir: "d32", addr: "0x1000" } + - { name: "Marauder v6.1", flag: "MARAUDER_V6_1", fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs", file_name: "v6_1", tft: true, tft_file: "User_Setup_og_marauder.h", build_dir: "d32", addr: "0x1000" } + - { name: "Marauder Kit", flag: "MARAUDER_KIT", fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs", file_name: "kit", tft: true, tft_file: "User_Setup_og_marauder.h", build_dir: "d32", addr: "0x1000" } + - { name: "Marauder Mini", flag: "MARAUDER_MINI", fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs", file_name: "mini", tft: true, tft_file: "User_Setup_marauder_mini.h", build_dir: "d32", addr: "0x1000" } + - { name: "ESP32 LDDB", flag: "ESP32_LDDB", fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs", file_name: "esp32_lddb", tft: false, tft_file: "", build_dir: "d32", addr: "0x1000" } + - { name: "Marauder Dev Board Pro", flag: "MARAUDER_DEV_BOARD_PRO", fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs", file_name: "marauder_dev_board_pro", tft: false, tft_file: "", build_dir: "d32", addr: "0x1000" } + - { name: "M5StickCPlus", flag: "MARAUDER_M5STICKC", fbqn: "esp32:esp32:m5stick-c:PartitionScheme=min_spiffs", file_name: "m5stickc_plus", tft: true, tft_file: "User_Setup_marauder_m5stickc.h", build_dir: "m5stick-c", addr: "0x1000" } + - { name: "M5StickCPlus 2", flag: "MARAUDER_M5STICKCP2", fbqn: "esp32:esp32:m5stick-c:PartitionScheme=min_spiffs", file_name: "m5stickc_plus2", tft: true, tft_file: "User_Setup_marauder_m5stickcp2.h", build_dir: "m5stick-c", addr: "0x1000" } + - { name: "Rev Feather", flag: "MARAUDER_REV_FEATHER", fbqn: "esp32:esp32:esp32s2:PartitionScheme=min_spiffs,FlashSize=4M,PSRAM=enabled", file_name: "rev_feather", tft: true, tft_file: "User_Setup_marauder_rev_feather.h", build_dir: "esp32s2", addr: "0x1000" } + - { name: "Marauder v7", flag: "MARAUDER_V7", fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs", file_name: "marauder_v7", tft: true, tft_file: "User_Setup_dual_nrf24.h", build_dir: "d32", addr: "0x1000" } + + steps: + - name: Checkout Code + uses: actions/checkout@v3 + + - name: Install Arduino CLI + run: | + curl -fsSL https://raw.githubusercontent.com/arduino/arduino-cli/master/install.sh | sh + echo "/home/runner/work/ESP32Marauder/ESP32Marauder/bin" >> $GITHUB_PATH + export PATH=$PATH:/home/runner/work/ESP32Marauder/ESP32Marauder/bin + arduino-cli version + + - name: Install Arduino-ESP32 Core v2.0.11 + run: | + arduino-cli core update-index + arduino-cli core install esp32:esp32@2.0.11 + + - name: Verify Installed Cores + run: arduino-cli core list + + - name: Build TestFile with ESP32 v2.0.11 + uses: ArminJo/arduino-test-compile@v3.2.1 + with: + sketch-names: TestFile.ino + arduino-board-fqbn: esp32:esp32:esp32s2 + 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: Verify Installed Cores Again + run: arduino-cli core list + + - name: Show Arduino dir structure + run: | + find /home/runner/.arduino15/packages/esp32/hardware/ + + - name: Install AsyncTCP + uses: actions/checkout@v2 + with: + repository: me-no-dev/AsyncTCP + ref: master + path: CustomAsyncTCP + + - name: Install MicroNMEA + uses: actions/checkout@v2 + with: + repository: stevemarple/MicroNMEA + ref: v2.0.6 + path: CustomMicroNMEA + + - name: Install ESPAsyncWebServer + uses: actions/checkout@v2 + with: + repository: bigbrodude6119/ESPAsyncWebServer + ref: master + path: CustomESPAsyncWebServer + + - name: Install TFT_eSPI + uses: actions/checkout@v2 + with: + repository: Bodmer/TFT_eSPI + ref: V2.5.34 + path: CustomTFT_eSPI + + - name: Install lv_arduino + uses: actions/checkout@v2 + with: + repository: lvgl/lv_arduino + ref: 3.0.0 + path: Customlv_arduino + + - name: Install JPEGDecoder + uses: actions/checkout@v2 + with: + repository: Bodmer/JPEGDecoder + ref: 1.8.0 + path: CustomJPEGDecoder + + - name: Install NimBLE-Arduino + uses: actions/checkout@v2 + with: + repository: h2zero/NimBLE-Arduino + ref: 1.3.5 + path: CustomNimBLE-Arduino + + - name: Install Adafruit_NeoPixel + uses: actions/checkout@v2 + with: + repository: adafruit/Adafruit_NeoPixel + ref: 1.10.7 + path: CustomAdafruit_NeoPixel + + - name: Install ArduinoJson + uses: actions/checkout@v2 + with: + repository: bblanchon/ArduinoJson + ref: v6.18.2 + path: CustomArduinoJson + + - name: Install LinkedList + uses: actions/checkout@v2 + with: + repository: ivanseidel/LinkedList + ref: v1.3.3 + path: CustomLinkedList + + - name: Install EspSoftwareSerial + uses: actions/checkout@v2 + with: + repository: plerup/espsoftwareserial + 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: Configure TFT_eSPI + run: | + rm -f CustomTFT_eSPI/User_Setup_Select.h + cp User*.h CustomTFT_eSPI/ + pwd + ls -la + ls -la CustomTFT_eSPI + + - name: Install Esptool + run: | + pip install esptool + + - name: Modify platform.txt + run: | + for i in $(find /home/runner/.arduino15/packages/esp32/hardware/esp32/ -name "platform.txt"); do + sed -i 's/compiler.c.elf.libs.esp32c3=/compiler.c.elf.libs.esp32c3=-zmuldefs /' "$i" + sed -i 's/compiler.c.elf.libs.esp32s3=/compiler.c.elf.libs.esp32s3=-zmuldefs /' "$i" + sed -i 's/compiler.c.elf.libs.esp32s2=/compiler.c.elf.libs.esp32s2=-zmuldefs /' "$i" + sed -i 's/compiler.c.elf.libs.esp32=/compiler.c.elf.libs.esp32=-zmuldefs /' "$i" + cat "$i" | grep compiler.c.elf.libs.esp32c3 + cat "$i" | grep compiler.c.elf.libs.esp32s3 + cat "$i" | grep compiler.c.elf.libs.esp32s2 + cat "$i" | grep compiler.c.elf.libs.esp32 + done + + - name: Configure TFT_eSPI (if needed) + run: | + pwd + if [[ ${{ matrix.board.tft }} == true ]]; then + find /home/runner/ -name "*TFT_eSPI*" + sed -i 's/^\/\/#include <${{ matrix.board.tft_file }}>/#include <${{ matrix.board.tft_file }}>/' /home/runner/work/ESP32Marauder/ESP32Marauder/CustomTFT_eSPI/User_Setup_Select.h + fi + + - name: Build Marauder for ${{ matrix.board.name }} + uses: ArminJo/arduino-test-compile@v3.2.1 + with: + sketch-names: esp32_marauder.ino + arduino-board-fqbn: ${{ matrix.board.fbqn }} + extra-arduino-cli-args: "--warnings none --build-property compiler.cpp.extra_flags='-D${{ matrix.board.flag }}'" + 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 ${{ matrix.board.name }} bin + run: | + mv ./esp32_marauder/build/esp32.esp32.${{ matrix.board.build_dir }}/esp32_marauder.ino.bin ./esp32_marauder/build/esp32.esp32.${{ matrix.board.build_dir }}/esp32_marauder.${{ matrix.board.file_name }}.bin + + # ls -la ./esp32_marauder/build/esp32.esp32.${{ matrix.board.build_dir }}/ + # esptool.py --chip esp32s3 merge_bin -o ./esp32_marauder/build/esp32.esp32.${{ matrix.board.build_dir }}/esp32_marauder.${{ matrix.board.file_name }}.bin \ + # ${{ matrix.board.addr }} ./esp32_marauder/build/esp32.esp32.${{ matrix.board.build_dir }}/esp32_marauder.ino.bootloader.bin \ + # 0x8000 ./esp32_marauder/build/esp32.esp32.${{ matrix.board.build_dir }}/esp32_marauder.ino.partitions.bin \ + # 0x10000 ./esp32_marauder/build/esp32.esp32.${{ matrix.board.build_dir }}/esp32_marauder.ino.bin + + - name: Upload ${{ matrix.board.name }} Artifact + uses: actions/upload-artifact@v4 + with: + name: esp32_marauder.${{ matrix.board.file_name }}.bin + path: ./esp32_marauder/build/esp32.esp32.${{ matrix.board.build_dir }}/esp32_marauder.${{ matrix.board.file_name }}.bin + retention-days: 5 + + post_compile_steps: + name: Create Release + runs-on: ubuntu-latest + needs: [compile_sketch] + if: ${{ github.ref_type == 'tag' }} + steps: + - uses: actions/checkout@v4 + - uses: actions/download-artifact@v4 + with: + merge-multiple: true + - name: Create Release + uses: softprops/action-gh-release@v1 + with: + name: "Marauder Release ${{ github.ref_name }}" + tag_name: ${{ github.ref_name }} + generate_release_notes: true + files: | + esp32_marauder.*.bin diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index 93183e924..ffb0d00e9 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -175,6 +175,7 @@ jobs: cp User_Setup_marauder_mini.h CustomTFT_eSPI/ cp User_Setup_og_marauder.h CustomTFT_eSPI/ cp User_Setup_marauder_m5stickc.h CustomTFT_eSPI/ + cp User_Setup_marauder_m5stickcp2.h CustomTFT_eSPI/ cp User_Setup_marauder_rev_feather.h CustomTFT_eSPI/ cp User_Setup_dual_nrf24.h CustomTFT_eSPI/ pwd @@ -502,7 +503,7 @@ 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_M5STICKC/ #define MARAUDER_M5STICKC/' esp32_marauder/configs.h + sed -i 's/^ \/\/#define MARAUDER_M5STICKC / #define MARAUDER_M5STICKC /' esp32_marauder/configs.h - name: Build Marauder for Marauder M5StickC uses: ArminJo/arduino-test-compile@v3.2.1 @@ -516,7 +517,41 @@ 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 TFT_eSPI and configs.h for Marauder M5StickCP2 + 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 + sed -i 's/^ \/\/#define MARAUDER_M5STICKCP2/ #define MARAUDER_M5STICKCP2/' esp32_marauder/configs.h + + - name: Build Marauder for Marauder M5StickCP2 + uses: ArminJo/arduino-test-compile@v3.2.1 + with: + sketch-names: esp32_marauder.ino + arduino-board-fqbn: esp32:esp32:m5stick-c: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 M5StickCP2 bin + run: | + mv ./esp32_marauder/build/esp32.esp32.m5stick-c/esp32_marauder.ino.bin ./esp32_marauder/build/esp32.esp32.m5stick-c/esp32_marauder.m5stickc_plus2.bin + - name: Configure TFT_eSPI and configs.h for Marauder Rev Feather run: | pwd @@ -524,6 +559,7 @@ jobs: 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 @@ -535,7 +571,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_M5STICKC/ \/\/#define MARAUDER_M5STICKC/' esp32_marauder/configs.h + sed -i 's/^ #define MARAUDER_M5STICKC / \/\/#define MARAUDER_M5STICKC /' esp32_marauder/configs.h + sed -i 's/^ #define MARAUDER_M5STICKCP2/ \/\/#define MARAUDER_M5STICKCP2/' esp32_marauder/configs.h - name: Build Marauder for Marauder Rev Feather uses: ArminJo/arduino-test-compile@v3.2.1 @@ -570,6 +607,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_M5STICKCP2/ \/\/#define MARAUDER_M5STICKCP2/' esp32_marauder/configs.h - name: Build Marauder for Marauder v7 uses: ArminJo/arduino-test-compile@v3.2.1 @@ -657,6 +695,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 M5StickC Plus 2 Artifact' + uses: actions/upload-artifact@v4 + with: + name: esp32_marauder.m5stickc_plus2.bin + path: ./esp32_marauder/build/esp32.esp32.m5stick-c/esp32_marauder.m5stickc_plus2.bin + retention-days: 5 - name: 'Upload Rev Feather Artifact' uses: actions/upload-artifact@v4 @@ -803,7 +848,19 @@ jobs: asset_name: esp32_marauder.m5stickc_plus.bin asset_content_type: application/bin if: github.event_name != 'pull_request' - + + - name: Upload Marauder M5StickC Plus 2 Asset + id: upload-m5stickc-plus2-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.m5stick-c/esp32_marauder.m5stickc_plus2.bin + asset_name: esp32_marauder.m5stickc_plus2.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/User_Setup_Select.h b/User_Setup_Select.h index 74c42f937..adfbe30ce 100644 --- a/User_Setup_Select.h +++ b/User_Setup_Select.h @@ -26,8 +26,9 @@ //#include //#include //#include +//#include //#include -#include +//#include //#include //#include // Setup file configured for my ILI9341 diff --git a/User_Setup_marauder_m5stickcp2.h b/User_Setup_marauder_m5stickcp2.h new file mode 100644 index 000000000..e7ee11667 --- /dev/null +++ b/User_Setup_marauder_m5stickcp2.h @@ -0,0 +1,391 @@ +// 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 + +// User defined information reported by "Read_User_Setup" test & diagnostics example +#define USER_SETUP_INFO "User_Setup" + +// Define to disable all #warnings in library (can be put in User_Setup_Select.h) +//#define DISABLE_ALL_LIBRARY_WARNINGS + +#define CGRAM_OFFSET + +// ################################################################################## +// +// Section 1. Call up the right driver file and any options for it +// +// ################################################################################## + +// Define STM32 to invoke optimised processor support (only for STM32) +//#define STM32 + +// Defining the STM32 board allows the library to optimise the performance +// for UNO compatible "MCUfriend" style shields +//#define NUCLEO_64_TFT +//#define NUCLEO_144_TFT + +// STM32 8 bit parallel only: +// If STN32 Port A or B pins 0-7 are used for 8 bit parallel data bus bits 0-7 +// then this will improve rendering performance by a factor of ~8x +//#define STM_PORTA_DATA_BUS +//#define STM_PORTB_DATA_BUS + +// Tell the library to use parallel mode (otherwise SPI is assumed) +//#define TFT_PARALLEL_8_BIT +//#defined TFT_PARALLEL_16_BIT // **** 16 bit parallel ONLY for RP2040 processor **** + +// Display type - only define if RPi display +//#define RPI_DISPLAY_TYPE // 20MHz maximum SPI + +// Only define one driver, the other ones must be commented out +//#define ILI9341_DRIVER // Generic driver for common displays +//#define ILI9341_2_DRIVER // Alternative ILI9341 driver, see https://github.com/Bodmer/TFT_eSPI/issues/1172 +//#define ST7735_DRIVER // 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 +//#define SSD1351_DRIVER +//#define SSD1963_480_DRIVER +//#define SSD1963_800_DRIVER +//#define SSD1963_800ALT_DRIVER +//#define ILI9225_DRIVER +//#define GC9A01_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 and GC9A01 display only + +// For ST7735, 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, ILI9163 and GC9A01 ONLY, define the pixel width and height in portrait orientation +// #define TFT_WIDTH 80 + #define TFT_WIDTH 135 +// #define TFT_WIDTH 172 // ST7789 172 x 320 +// #define TFT_WIDTH 170 // ST7789 170 x 320 +// #define TFT_WIDTH 240 // ST7789 240 x 240 and 240 x 320 +// #define TFT_HEIGHT 160 +// #define TFT_HEIGHT 128 + #define TFT_HEIGHT 240 // ST7789 240 x 240 +// #define TFT_HEIGHT 320 // ST7789 240 x 320 +// #define TFT_HEIGHT 240 // GC9A01 240 x 240 + +// 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 stray 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_ROBOTLCD // For some RobotLCD arduino shields (128x160, BGR, https://docs.arduino.cc/retired/getting-started-guides/TFT) +// #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 + + +// ################################################################################## +// +// Section 2. Define the pins that are used to interface with the display here +// +// ################################################################################## + +// 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_BL 32 // LED back-light control pin +// #define TFT_BACKLIGHT_ON HIGH // Level to turn ON back-light (HIGH or LOW) + + + +// 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 labelled 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_MISO PIN_D6 // Automatically assigned with ESP8266 if not defined +//#define TFT_MOSI PIN_D7 // Automatically assigned with ESP8266 if not defined +//#define TFT_SCLK PIN_D5 // Automatically assigned with ESP8266 if not defined + +//#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 when chip select is high! +// Note: Only one SPI device can share the FLASH SPI lines, so a SPI touch controller +// cannot be connected as well to the same SPI signals. +// 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 + +//#define TFT_MISO 19 +//#define TFT_MOSI 23 +//#define TFT_SCLK 18 +//#define TFT_CS 15 // Chip select control pin +//#define TFT_DC 2 // Data Command control pin +//#define TFT_RST 4 // 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 + +// For ESP32 Dev board (only tested with GC9A01 display) +// The hardware SPI can be mapped to any pins + +//#define TFT_MOSI 15 // In some display driver board, it might be written as "SDA" and so on. +//#define TFT_SCLK 14 +//#define TFT_CS 5 // 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 22 // LED back-light + +#define TOUCH_CS -1 // 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 15 +#define TFT_SCLK 13 +#define TFT_CS 5 // Chip select control pin +#define TFT_DC 14 // Data Command control pin +#define TFT_RST 12 // Reset pin (could connect to Arduino RESET pin) +#define TFT_BL 27 // 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 for the STM32 and ESP32 +// Example below is for ESP32 Parallel interface with UNO displays + +// Tell the library to use 8 bit parallel mode (otherwise SPI is assumed) +//#define TFT_PARALLEL_8_BIT + +// 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 + +// ###### EDIT THE PINs BELOW TO SUIT YOUR STM32 SPI TFT SETUP ###### + +// The TFT can be connected to SPI port 1 or 2 +//#define TFT_SPI_PORT 1 // SPI port 1 maximum clock rate is 55MHz +//#define TFT_MOSI PA7 +//#define TFT_MISO PA6 +//#define TFT_SCLK PA5 + +//#define TFT_SPI_PORT 2 // SPI port 2 maximum clock rate is 27MHz +//#define TFT_MOSI PB15 +//#define TFT_MISO PB14 +//#define TFT_SCLK PB13 + +// Can use Ardiuno pin references, arbitrary allocation, TFT_eSPI controls chip select +//#define TFT_CS D5 // Chip select control pin to TFT CS +//#define TFT_DC D6 // Data Command control pin to TFT DC (may be labelled RS = Register Select) +//#define TFT_RST D7 // Reset pin to TFT RST (or RESET) +// OR alternatively, we can use STM32 port reference names PXnn +//#define TFT_CS PE11 // Nucleo-F767ZI equivalent of D5 +//#define TFT_DC PE9 // Nucleo-F767ZI equivalent of D6 +//#define TFT_RST PF13 // Nucleo-F767ZI equivalent of D7 + +//#define TFT_RST -1 // Set TFT_RST to -1 if the display RESET is connected to processor reset + // Use an Arduino pin for initial testing as connecting to processor reset + // may not work (pulse too short at power up?) + +// ################################################################################## +// +// 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 +// +// ################################################################################## + +// For RP2040 processor and SPI displays, uncomment the following line to use the PIO interface. +//#define RP2040_PIO_SPI // Leave commented out to use standard RP2040 SPI port interface + +// For RP2040 processor and 8 or 16 bit parallel displays: +// The parallel interface write cycle period is derived from a division of the CPU clock +// speed so scales with the processor clock. This means that the divider ratio may need +// to be increased when overclocking. It may also need to be adjusted dependant on the +// display controller type (ILI94341, HX8357C etc). If RP2040_PIO_CLK_DIV is not defined +// the library will set default values which may not suit your display. +// The display controller data sheet will specify the minimum write cycle period. The +// controllers often work reliably for shorter periods, however if the period is too short +// the display may not initialise or graphics will become corrupted. +// PIO write cycle frequency = (CPU clock/(4 * RP2040_PIO_CLK_DIV)) +//#define RP2040_PIO_CLK_DIV 1 // 32ns write cycle at 125MHz CPU clock +//#define RP2040_PIO_CLK_DIV 2 // 64ns write cycle at 125MHz CPU clock +//#define RP2040_PIO_CLK_DIV 3 // 96ns write cycle at 125MHz CPU clock + +// For the RP2040 processor define the SPI port channel used (default 0 if undefined) +//#define TFT_SPI_PORT 1 // Set to 0 if SPI0 pins are used, or 1 if spi1 pins used + +// For the STM32 processor define the SPI port channel used (default 1 if undefined) +//#define TFT_SPI_PORT 2 // Set to 1 for SPI port 1, or 2 for SPI port 2 + +// 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 + #define SPI_FREQUENCY 40000000 +// #define SPI_FREQUENCY 55000000 // STM32 SPI1 only (SPI2 maximum is 27MHz) +// #define SPI_FREQUENCY 80000000 + +// Optional reduced SPI frequency for reading TFT +#define SPI_READ_FREQUENCY 20000000 + +// The XPT2046 requires a lower SPI clock rate of 2.5MHz so we define that here: +#define SPI_TOUCH_FREQUENCY 2500000 + +// The ESP32 has 2 free SPI ports i.e. VSPI and HSPI, the VSPI is the default. +// If the VSPI port is in use and pins are not accessible (e.g. TTGO T-Beam) +// then uncomment the following line: +//#define USE_HSPI_PORT + +// Comment out the following #define if "SPI Transactions" do not need to be +// supported. When commented out the code size will be smaller and sketches will +// run slightly faster, so leave it commented out unless you need it! + +// Transaction support is needed to work with SD library but not needed with TFT_SdFat +// Transaction support is required if other SPI devices are connected. + +// Transactions are automatically enabled by the library for an ESP32 (to use HAL mutex) +// so changing it here has no effect + + //#define SUPPORT_TRANSACTIONS diff --git a/esp32_marauder/MenuFunctions.cpp b/esp32_marauder/MenuFunctions.cpp index 12c036a9d..fef6bfa35 100644 --- a/esp32_marauder/MenuFunctions.cpp +++ b/esp32_marauder/MenuFunctions.cpp @@ -878,7 +878,7 @@ void MenuFunctions::main(uint32_t currentTime) #ifdef HAS_BUTTONS #if !(defined(MARAUDER_V6) || defined(MARAUDER_V6_1)) - #ifndef MARAUDER_M5STICKC + #if !defined(MARAUDER_M5STICKC) || defined(MARAUDER_M5STICKCP2) if (u_btn.justPressed()){ if ((wifi_scan_obj.currentScanMode == WIFI_SCAN_OFF) || (wifi_scan_obj.currentScanMode == OTA_UPDATE)) { @@ -1730,7 +1730,7 @@ void MenuFunctions::RunSetup() this->buildButtons(&htmlMenu); this->displayCurrentMenu(); } - #ifndef MARAUDER_M5STICKC + #if !defined(MARAUDER_M5STICKC) || defined(MARAUDER_M5STICKCP2) if (u_btn.justPressed()) { if (evil_portal_obj.selected_html_index < evil_portal_obj.html_files->size() - 1) evil_portal_obj.selected_html_index++; @@ -2151,7 +2151,7 @@ void MenuFunctions::RunSetup() // Start button loop while(true) { - #ifndef MARAUDER_M5STICKC + #if !defined(MARAUDER_M5STICKC) || defined(MARAUDER_M5STICKCP2) if (u_btn.justPressed()) { if (sd_file_index > 0) sd_file_index--; diff --git a/esp32_marauder/configs.h b/esp32_marauder/configs.h index 911f816be..a19a1e28a 100644 --- a/esp32_marauder/configs.h +++ b/esp32_marauder/configs.h @@ -7,12 +7,13 @@ #define POLISH_POTATO //// BOARD TARGETS - //#define MARAUDER_M5STICKC + //#define MARAUDER_M5STICKC + //#define MARAUDER_M5STICKCP2 //#define MARAUDER_MINI //#define MARAUDER_V4 //#define MARAUDER_V6 //#define MARAUDER_V6_1 - #define MARAUDER_V7 + //#define MARAUDER_V7 //#define MARAUDER_KIT //#define GENERIC_ESP32 //#define MARAUDER_FLIPPER @@ -27,6 +28,8 @@ //// HARDWARE NAMES #ifdef MARAUDER_M5STICKC #define HARDWARE_NAME "M5Stick-C Plus" + #elif defined(MARAUDER_M5STICKCP2) + #define HARDWARE_NAME "M5Stick-C Plus2" #elif defined(MARAUDER_MINI) #define HARDWARE_NAME "Marauder Mini" #elif defined(MARAUDER_V7) @@ -56,7 +59,7 @@ //// END HARDWARE NAMES //// BOARD FEATURES - #ifdef MARAUDER_M5STICKC + #if defined(MARAUDER_M5STICKC) || defined(MARAUDER_M5STICKCP2) //#define FLIPPER_ZERO_HAT #define HAS_BATTERY #define HAS_BT @@ -234,9 +237,14 @@ //// POWER MANAGEMENT #ifdef HAS_PWR_MGMT - #ifdef MARAUDER_M5STICKC + #if defined(MARAUDER_M5STICKC) || defined(MARAUDER_M5STICKCP2) #include "AXP192.h" #endif + + #ifdef MARAUDER_M5STICKCP2 + // Prevent StickCP2 from turning off when disconnect USB cable + #define POWER_HOLD_PIN 4 + #endif #endif //// END POWER MANAGEMENT @@ -303,16 +311,22 @@ #define D_PULL true #endif - #ifdef MARAUDER_M5STICKC + #if defined(MARAUDER_M5STICKC) || defined(MARAUDER_M5STICKCP2) #define L_BTN -1 #define C_BTN 37 - #define U_BTN -1 + #if defined(MARAUDER_M5STICKCP2) + #define U_BTN 35 + #else + #define U_BTN -1 + #endif #define R_BTN -1 #define D_BTN 39 //#define HAS_L //#define HAS_R - //#define HAS_U + #if defined(MARAUDER_M5STICKCP2) + #define HAS_U + #endif #define HAS_D #define HAS_C @@ -437,6 +451,75 @@ #endif +#if defined(MARAUDER_M5STICKCP2) + #define MARAUDER_M5STICKC // From now on, everything is the same, except for one check in esp32_marauder.ino amd stickc_led.cpp/h + + #define SCREEN_CHAR_WIDTH 40 + #define TFT_MOSI 15 + #define TFT_SCLK 13 + #define TFT_CS 5 + #define TFT_DC 14 + #define TFT_RST 12 + #define TFT_BL 27 + #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 diff --git a/esp32_marauder/esp32_marauder.ino b/esp32_marauder/esp32_marauder.ino index 5cb5aee2f..cd5cbd464 100644 --- a/esp32_marauder/esp32_marauder.ino +++ b/esp32_marauder/esp32_marauder.ino @@ -38,7 +38,7 @@ https://www.online-utility.org/image/convert/to/XBM #include "flipperLED.h" #elif defined(XIAO_ESP32_S3) #include "xiaoLED.h" -#elif defined(MARAUDER_M5STICKC) +#elif defined(MARAUDER_M5STICKC) || defined(MARAUDER_M5STICKCP2) #include "stickcLED.h" #elif defined(HAS_NEOPIXEL_LED) #include "LedInterface.h" @@ -109,7 +109,7 @@ CommandLine cli_obj; flipperLED flipper_led; #elif defined(XIAO_ESP32_S3) xiaoLED xiao_led; -#elif defined(MARAUDER_M5STICKC) +#elif defined(MARAUDER_M5STICKC) || defined(MARAUDER_M5STICKCP2) stickcLED stickc_led; #else LedInterface led_obj; @@ -151,9 +151,14 @@ void backlightOff() { void setup() { - #ifdef MARAUDER_M5STICKC + #ifdef defined(MARAUDER_M5STICKC) && !defined(MARAUDER_M5STICKCP2) axp192_obj.begin(); #endif + + #if defined(MARAUDER_M5STICKCP2) // Prevent StickCP2 from turning off when disconnect USB cable + pinMode(POWER_HOLD_PIN, OUTPUT); + digitalWrite(POWER_HOLD_PIN, HIGH); + #endif #ifdef HAS_SCREEN pinMode(TFT_BL, OUTPUT); diff --git a/esp32_marauder/stickcLED.cpp b/esp32_marauder/stickcLED.cpp index e561f2679..3e41aff68 100644 --- a/esp32_marauder/stickcLED.cpp +++ b/esp32_marauder/stickcLED.cpp @@ -1,53 +1,64 @@ #include "stickcLED.h" // NB M5Stick C Plus LED is active low, so digitalWrite() calls are inverted + +#ifdef MARAUDER_M5STICKCP2 + #define M5LED_ON HIGH + #define M5LED_OFF LOW + #define STICKC_LED_PIN 19 +#else + #define M5LED_ON LOW + #define M5LED_OFF HIGH + #define STICKC_LED_PIN 10 +#endif + void stickcLED::RunSetup() { pinMode(STICKC_LED_PIN, OUTPUT); if (!settings_obj.loadSetting("EnableLED")) { - digitalWrite(STICKC_LED_PIN, HIGH); + digitalWrite(STICKC_LED_PIN, M5LED_OFF); return; } delay(50); - digitalWrite(STICKC_LED_PIN, LOW); + digitalWrite(STICKC_LED_PIN, M5LED_ON); delay(500); - digitalWrite(STICKC_LED_PIN, HIGH); + digitalWrite(STICKC_LED_PIN, M5LED_OFF); delay(250); - digitalWrite(STICKC_LED_PIN, LOW); + digitalWrite(STICKC_LED_PIN, M5LED_ON); delay(500); - digitalWrite(STICKC_LED_PIN, HIGH); + digitalWrite(STICKC_LED_PIN, M5LED_OFF); delay(250); - digitalWrite(STICKC_LED_PIN, LOW); + digitalWrite(STICKC_LED_PIN, M5LED_ON); delay(500); - digitalWrite(STICKC_LED_PIN, HIGH); + digitalWrite(STICKC_LED_PIN, M5LED_OFF); } void stickcLED::attackLED() { if (!settings_obj.loadSetting("EnableLED")) return; - digitalWrite(STICKC_LED_PIN, LOW); + digitalWrite(STICKC_LED_PIN, M5LED_ON); delay(300); - digitalWrite(STICKC_LED_PIN, HIGH); + digitalWrite(STICKC_LED_PIN, M5LED_OFF); } void stickcLED::sniffLED() { if (!settings_obj.loadSetting("EnableLED")) return; - digitalWrite(STICKC_LED_PIN, LOW); + digitalWrite(STICKC_LED_PIN, M5LED_ON); delay(300); - digitalWrite(STICKC_LED_PIN, HIGH); + digitalWrite(STICKC_LED_PIN, M5LED_OFF); } void stickcLED::offLED() { if (!settings_obj.loadSetting("EnableLED")) return; - digitalWrite(STICKC_LED_PIN, HIGH); + digitalWrite(STICKC_LED_PIN, M5LED_OFF); } void stickcLED::main() { // do nothing -} +} \ No newline at end of file diff --git a/esp32_marauder/stickcLED.h b/esp32_marauder/stickcLED.h index 289c58f10..1fa23128a 100644 --- a/esp32_marauder/stickcLED.h +++ b/esp32_marauder/stickcLED.h @@ -8,7 +8,6 @@ #include -#define STICKC_LED_PIN 10 extern Settings settings_obj;