diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml deleted file mode 100644 index ffb0d00..0000000 --- a/.github/workflows/build_push.yml +++ /dev/null @@ -1,886 +0,0 @@ -name: Build and Push - -on: - workflow_dispatch: - pull_request: - -jobs: - # This workflow contains a single job called "build" - build: - name: Build Marauder Binaries - - runs-on: ubuntu-latest - - steps: - - name: Checkout Code - uses: actions/checkout@v3 - -# - name: Install ESP32 Boards and Compile TestFile -# uses: ArminJo/arduino-test-compile@v3.2.1 -# with: -# sketch-names: TestFile.ino -# arduino-board-fqbn: esp32:esp32:esp32s2 -# platform-url: https://github.com/espressif/arduino-esp32/releases/download/2.0.10/package_esp32_dev_index.json - - - 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: Pull arduino-esp32 v2.0.4 -# uses: actions/checkout@v2 -# with: -# repository: espressif/arduino-esp32 -# ref: 2.0.4 -# path: 2.0.4arduino-esp32 - -# - name: Pull arduino-esp32 v2.0.10 -# uses: actions/checkout@v2 -# with: -# repository: espressif/arduino-esp32 -# ref: 2.0.10 -# path: 2.0.10 - - - 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 SwitchLib - # uses: actions/checkout@v2 - # with: - # repository: justcallmekoko/SwitchLib - # ref: main - # path: CustomSwitchLib - - - 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: Search for SD lib in arduino-esp32 v2.0.4 - # run: | - # find /home/runner/work/ESP32Marauder/ESP32Marauder/2.0.4arduino-esp32 -name "SD" - - - name: Configure TFT_eSPI - run: | - rm -f CustomTFT_eSPI/User_Setup_Select.h - 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_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 - ls -la - ls -la CustomTFT_eSPI - - #- name: Place 2.0.10 for use - # run: | - # mkdir -p /home/runner/.arduino15/packages/esp32/hardware/esp32/ - # cp -R /home/runner/work/ESP32Marauder/ESP32Marauder/2.0.3 /home/runner/.arduino15/packages/esp32/hardware/esp32/2.0.3 - # ls -la /home/runner/.arduino15/packages/esp32/hardware/esp32/ - # echo Whoever made me have to do this can fuck off - - #- name: Replace arduino-esp32 v2.0.10 that was gloriously forced on us - # run: | - # rm -rf /home/runner/.arduino15/packages/esp32/hardware/esp32/2.0.10 - # cp -R /home/runner/work/ESP32Marauder/ESP32Marauder/2.0.3 /home/runner/.arduino15/packages/esp32/hardware/esp32/2.0.3 - # ls -la /home/runner/.arduino15/packages/esp32/hardware/esp32/ - # echo Whoever made me have to do this can fuck off - - #- name: Search for SD lib in arduino-esp32 - # run: | - # find /home/runner/ -name "SD" - - #- name: Replace SD lib - # run: | - # rm -rf /home/runner/.arduino15/packages/esp32/hardware/esp32/2.0.10/libraries/SD - # cp -R /home/runner/work/ESP32Marauder/ESP32Marauder/2.0.4arduino-esp32/libraries/SD /home/runner/.arduino15/packages/esp32/hardware/esp32/2.0.10/libraries/SD - # ls -la /home/runner/.arduino15/packages/esp32/hardware/esp32/2.0.10/libraries/SD - - - 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 configs.h for Flipper Zero WiFi Dev Board - run: | - 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_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 - - - name: Build Marauder for Flipper Zero WiFi Dev Board - uses: ArminJo/arduino-test-compile@v3.2.1 - with: - sketch-names: esp32_marauder.ino - arduino-board-fqbn: esp32:esp32:esp32s2:PartitionScheme=min_spiffs,FlashSize=4M,PSRAM=enabled - 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 Flipper bin - run: | - mv ./esp32_marauder/build/esp32.esp32.esp32s2/esp32_marauder.ino.bin ./esp32_marauder/build/esp32.esp32.esp32s2/esp32_marauder.flipper.bin - - - name: Build Marauder for Flipper Zero Multi Board - 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=enabled - 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 Multi Board bin - run: | - mv ./esp32_marauder/build/esp32.esp32.esp32s3/esp32_marauder.ino.bin ./esp32_marauder/build/esp32.esp32.esp32s3/esp32_marauder.multiboardS3.bin - - - name: Configure TFT_eSPI and configs.h for OG Marauder - 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 - 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 - - - name: Build Marauder for OG Marauder - uses: ArminJo/arduino-test-compile@v3.2.1 - with: - sketch-names: esp32_marauder.ino - arduino-board-fqbn: esp32:esp32:d32:PartitionScheme=min_spiffs - extra-arduino-cli-args: "--warnings none" - arduino-platform: esp32:esp32@2.0.11 - platform-url: https://github.com/espressif/arduino-esp32/releases/download/2.0.11/package_esp32_dev_index.json - - - name: Rename OG Marauder bin - run: | - mv ./esp32_marauder/build/esp32.esp32.d32/esp32_marauder.ino.bin ./esp32_marauder/build/esp32.esp32.d32/esp32_marauder.og.bin - - - 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 - 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 - - #- name: Build Marauder for v6 Marauder with arduino/compile-sketches - # uses: arduino/compile-sketches@v1 - # with: - # sketch-paths: esp32_marauder/esp32_marauder.ino - # cli-compile-flags: | - # - --warnings="none" - # - --export-binaries - # fqbn: esp32:esp32:d32:PartitionScheme=min_spiffs - - #- name: Show compiled arduino/compile-sketches v6 bin - # run: | - # find ~ -name "esp32_marauder.ino.bin" - - #- name: Rename v6_2 Marauder bin - # run: | - # mv ./esp32_marauder/build/esp32.esp32.d32/esp32_marauder.ino.bin ./esp32_marauder/build/esp32.esp32.d32/esp32_marauder.v6_2.bin - - - name: Build Marauder for v6 Marauder - uses: ArminJo/arduino-test-compile@v3.2.1 - with: - sketch-names: esp32_marauder.ino - arduino-board-fqbn: esp32:esp32:d32:PartitionScheme=min_spiffs - extra-arduino-cli-args: "--warnings none" - arduino-platform: esp32:esp32@2.0.11 - platform-url: https://github.com/espressif/arduino-esp32/releases/download/2.0.11/package_esp32_dev_index.json - - - name: Rename v6 Marauder bin - run: | - mv ./esp32_marauder/build/esp32.esp32.d32/esp32_marauder.ino.bin ./esp32_marauder/build/esp32.esp32.d32/esp32_marauder.v6.bin - - - name: Configure TFT_eSPI and configs.h for Marauder v6.1 - run: | - 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 - - - name: Build Marauder for v6.1 Marauder - uses: ArminJo/arduino-test-compile@v3.2.1 - with: - sketch-names: esp32_marauder.ino - arduino-board-fqbn: esp32:esp32:d32:PartitionScheme=min_spiffs - extra-arduino-cli-args: "--warnings none" - arduino-platform: esp32:esp32@2.0.11 - platform-url: https://github.com/espressif/arduino-esp32/releases/download/2.0.11/package_esp32_dev_index.json - - - name: Rename v6 Marauder bin - run: | - mv ./esp32_marauder/build/esp32.esp32.d32/esp32_marauder.ino.bin ./esp32_marauder/build/esp32.esp32.d32/esp32_marauder.v6_1.bin - - - 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/^ #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 - - - name: Build Marauder for Marauder Kit - uses: ArminJo/arduino-test-compile@v3.2.1 - with: - sketch-names: esp32_marauder.ino - arduino-board-fqbn: esp32:esp32:d32:PartitionScheme=min_spiffs - extra-arduino-cli-args: "--warnings none" - arduino-platform: esp32:esp32@2.0.11 - platform-url: https://github.com/espressif/arduino-esp32/releases/download/2.0.11/package_esp32_dev_index.json - - - name: Rename Marauder Kit bin - run: | - mv ./esp32_marauder/build/esp32.esp32.d32/esp32_marauder.ino.bin ./esp32_marauder/build/esp32.esp32.d32/esp32_marauder.kit.bin - - - 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/^ #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 - - - name: Build Marauder for Marauder Mini - uses: ArminJo/arduino-test-compile@v3.2.1 - with: - sketch-names: esp32_marauder.ino - arduino-board-fqbn: esp32:esp32:d32:PartitionScheme=min_spiffs - extra-arduino-cli-args: "--warnings none" - arduino-platform: esp32:esp32@2.0.11 - platform-url: https://github.com/espressif/arduino-esp32/releases/download/2.0.11/package_esp32_dev_index.json - - - name: Rename Marauder Mini bin - run: | - mv ./esp32_marauder/build/esp32.esp32.d32/esp32_marauder.ino.bin ./esp32_marauder/build/esp32.esp32.d32/esp32_marauder.mini.bin - - - name: Configure TFT_eSPI and configs.h for ESP32 LDDB - run: | - 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 - - - name: Build Marauder for ESP32 LDDB - uses: ArminJo/arduino-test-compile@v3.2.1 - with: - sketch-names: esp32_marauder.ino - arduino-board-fqbn: esp32:esp32:d32:PartitionScheme=min_spiffs - extra-arduino-cli-args: "--warnings none" - arduino-platform: esp32:esp32@2.0.11 - platform-url: https://github.com/espressif/arduino-esp32/releases/download/2.0.11/package_esp32_dev_index.json - - - name: Rename Marauder ESP32 LDDB bin - run: | - mv ./esp32_marauder/build/esp32.esp32.d32/esp32_marauder.ino.bin ./esp32_marauder/build/esp32.esp32.d32/esp32_marauder.esp32_lddb.bin - - - name: Configure TFT_eSPI and configs.h for Marauder Dev Board Pro - run: | - 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 - - - name: Build Marauder for Marauder Dev Board Pro - uses: ArminJo/arduino-test-compile@v3.2.1 - with: - sketch-names: esp32_marauder.ino - arduino-board-fqbn: esp32:esp32:d32:PartitionScheme=min_spiffs - extra-arduino-cli-args: "--warnings none" - arduino-platform: esp32:esp32@2.0.11 - platform-url: https://github.com/espressif/arduino-esp32/releases/download/2.0.11/package_esp32_dev_index.json - - - name: Rename Marauder for Marauder Dev Board Pro - run: | - mv ./esp32_marauder/build/esp32.esp32.d32/esp32_marauder.ino.bin ./esp32_marauder/build/esp32.esp32.d32/esp32_marauder.marauder_dev_board_pro.bin - - - name: Configure TFT_eSPI and configs.h for Marauder M5StickC - 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/^ #define MARAUDER_REV_FEATHER/ \/\/#define MARAUDER_REV_FEATHER/' esp32_marauder/configs.h - sed -i 's/^ #define MARAUDER_MINI/ \/\/#define MARAUDER_MINI/' esp32_marauder/configs.h - sed -i 's/^ #define MARAUDER_V4/ \/\/#define MARAUDER_V4/' esp32_marauder/configs.h - sed -i 's/^ #define MARAUDER_V6/ \/\/#define MARAUDER_V6/' esp32_marauder/configs.h - sed -i 's/^ #define MARAUDER_V6_1/ \/\/#define MARAUDER_V6_1/' esp32_marauder/configs.h - sed -i 's/^ #define MARAUDER_V7/ \/\/#define MARAUDER_V7/' esp32_marauder/configs.h - sed -i 's/^ #define MARAUDER_KIT/ \/\/#define MARAUDER_KIT/' esp32_marauder/configs.h - sed -i 's/^ #define GENERIC_ESP32/ \/\/#define GENERIC_ESP32/' esp32_marauder/configs.h - sed -i 's/^ #define MARAUDER_FLIPPER/ \/\/#define MARAUDER_FLIPPER/' esp32_marauder/configs.h - sed -i 's/^ #define ESP32_LDDB/ \/\/#define ESP32_LDDB/' esp32_marauder/configs.h - sed -i 's/^ #define MARAUDER_DEV_BOARD_PRO/ \/\/#define MARAUDER_DEV_BOARD_PRO/' esp32_marauder/configs.h - sed -i 's/^ \/\/#define MARAUDER_M5STICKC / #define MARAUDER_M5STICKC /' esp32_marauder/configs.h - - - name: Build Marauder for Marauder M5StickC - 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 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 - 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/^ \/\/#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 Rev Feather - uses: ArminJo/arduino-test-compile@v3.2.1 - with: - sketch-names: esp32_marauder.ino - arduino-board-fqbn: esp32:esp32:esp32s2:PartitionScheme=min_spiffs,FlashSize=4M,PSRAM=enabled - extra-arduino-cli-args: "--warnings none" - arduino-platform: esp32:esp32@2.0.11 - platform-url: https://github.com/espressif/arduino-esp32/releases/download/2.0.11/package_esp32_dev_index.json - - - name: Rename Marauder Marauder Rev Feather - run: | - mv ./esp32_marauder/build/esp32.esp32.esp32s2/esp32_marauder.ino.bin ./esp32_marauder/build/esp32.esp32.esp32s2/esp32_marauder.rev_feather.bin - - - name: Configure TFT_eSPI and configs.h for Marauder v7 - run: | - pwd - find /home/runner/ -name "*TFT_eSPI*" - sed -i 's/^#include /\/\/#include /' /home/runner/Arduino/libraries/CustomTFT_eSPI/User_Setup_Select.h - sed -i 's/^#include /\/\/#include /' /home/runner/Arduino/libraries/CustomTFT_eSPI/User_Setup_Select.h - sed -i 's/^#include /\/\/#include /' /home/runner/Arduino/libraries/CustomTFT_eSPI/User_Setup_Select.h - sed -i 's/^\/\/#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 v7 - uses: ArminJo/arduino-test-compile@v3.2.1 - with: - sketch-names: esp32_marauder.ino - arduino-board-fqbn: esp32:esp32:d32:PartitionScheme=min_spiffs - extra-arduino-cli-args: "--warnings none" - arduino-platform: esp32:esp32@2.0.11 - platform-url: https://github.com/espressif/arduino-esp32/releases/download/2.0.11/package_esp32_dev_index.json - - - name: Rename Marauder Marauder v7 - run: | - mv ./esp32_marauder/build/esp32.esp32.d32/esp32_marauder.ino.bin ./esp32_marauder/build/esp32.esp32.d32/esp32_marauder.marauder_v7.bin - - - name: Display finished bins - run: | - find ./esp32_marauder/build -name "*.bin" - - - name: 'Upload Flipper Artifact' - uses: actions/upload-artifact@v4 - with: - name: esp32_marauder.flipper.bin - path: ./esp32_marauder/build/esp32.esp32.esp32s2/esp32_marauder.flipper.bin - retention-days: 5 - - - name: 'Upload MultiboardS3 Artifact' - uses: actions/upload-artifact@v4 - with: - name: esp32_marauder.multiboardS3.bin - path: ./esp32_marauder/build/esp32.esp32.esp32s3/esp32_marauder.multiboardS3.bin - retention-days: 5 - - - name: 'Upload OG Artifact' - uses: actions/upload-artifact@v4 - with: - name: esp32_marauder.og.bin - path: ./esp32_marauder/build/esp32.esp32.d32/esp32_marauder.og.bin - retention-days: 5 - - - name: 'Upload v6 Artifact' - uses: actions/upload-artifact@v4 - with: - name: esp32_marauder.v6.bin - path: ./esp32_marauder/build/esp32.esp32.d32/esp32_marauder.v6.bin - retention-days: 5 - - - name: 'Upload v6_1 Artifact' - uses: actions/upload-artifact@v4 - with: - name: esp32_marauder.v6_1.bin - path: ./esp32_marauder/build/esp32.esp32.d32/esp32_marauder.v6_1.bin - retention-days: 5 - - - name: 'Upload Kit Artifact' - uses: actions/upload-artifact@v4 - with: - name: esp32_marauder.kit.bin - path: ./esp32_marauder/build/esp32.esp32.d32/esp32_marauder.kit.bin - retention-days: 5 - - - name: 'Upload Mini Artifact' - uses: actions/upload-artifact@v4 - with: - name: esp32_marauder.mini.bin - path: ./esp32_marauder/build/esp32.esp32.d32/esp32_marauder.mini.bin - retention-days: 5 - - - name: 'Upload ESP32 LDDB Artifact' - uses: actions/upload-artifact@v4 - with: - name: esp32_marauder.esp32_lddb.bin - path: ./esp32_marauder/build/esp32.esp32.d32/esp32_marauder.esp32_lddb.bin - retention-days: 5 - - - name: 'Upload Marauder Dev Board Pro Artifact' - uses: actions/upload-artifact@v4 - with: - name: esp32_marauder.marauder_dev_board_pro.bin - path: ./esp32_marauder/build/esp32.esp32.d32/esp32_marauder.marauder_dev_board_pro.bin - retention-days: 5 - - - name: 'Upload Marauder M5StickC Plus Artifact' - uses: actions/upload-artifact@v4 - with: - 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 - with: - name: esp32_marauder.rev_feather.bin - path: ./esp32_marauder/build/esp32.esp32.esp32s2/esp32_marauder.rev_feather.bin - retention-days: 5 - - - name: 'Upload Marauder v7 Artifact' - uses: actions/upload-artifact@v4 - with: - name: esp32_marauder.marauder_v7.bin - path: ./esp32_marauder/build/esp32.esp32.d32/esp32_marauder.marauder_v7.bin - retention-days: 5 - - - name: Create Release - id: create_release - uses: actions/create-release@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - tag_name: ${{ github.ref }} - release_name: Release ${{ github.ref }} - draft: true - prerelease: false - if: github.event_name != 'pull_request' - - - name: Upload Flipper Asset - id: upload-flipper-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.esp32s2/esp32_marauder.flipper.bin - asset_name: esp32_marauder.flipper.bin - asset_content_type: application/bin - if: github.event_name != 'pull_request' - - - name: Upload MultiboardS3 Asset - id: upload-multiboardS3-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.multiboardS3.bin - asset_name: esp32_marauder.multiboardS3.bin - asset_content_type: application/bin - if: github.event_name != 'pull_request' - - - name: Upload OG Asset - id: upload-og-release-asset - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ./esp32_marauder/build/esp32.esp32.d32/esp32_marauder.og.bin - asset_name: esp32_marauder.og.bin - asset_content_type: application/bin - if: github.event_name != 'pull_request' - - - name: Upload v6 Asset - id: upload-v6-release-asset - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ./esp32_marauder/build/esp32.esp32.d32/esp32_marauder.v6.bin - asset_name: esp32_marauder.v6.bin - asset_content_type: application/bin - if: github.event_name != 'pull_request' - - - name: Upload v6_1 Asset - id: upload-v6-1-release-asset - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ./esp32_marauder/build/esp32.esp32.d32/esp32_marauder.v6_1.bin - asset_name: esp32_marauder.v6_1.bin - asset_content_type: application/bin - if: github.event_name != 'pull_request' - - - name: Upload Kit Asset - id: upload-kit-release-asset - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ./esp32_marauder/build/esp32.esp32.d32/esp32_marauder.kit.bin - asset_name: esp32_marauder.kit.bin - asset_content_type: application/bin - if: github.event_name != 'pull_request' - - - name: Upload Mini Asset - id: upload-mini-release-asset - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ./esp32_marauder/build/esp32.esp32.d32/esp32_marauder.mini.bin - asset_name: esp32_marauder.mini.bin - asset_content_type: application/bin - if: github.event_name != 'pull_request' - - - name: Upload ESP32 LDDB Asset - id: upload-esp32-lddb-release-asset - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ./esp32_marauder/build/esp32.esp32.d32/esp32_marauder.esp32_lddb.bin - asset_name: esp32_marauder.esp32_lddb.bin - asset_content_type: application/bin - if: github.event_name != 'pull_request' - - - name: Upload Marauder Dev Board Pro Asset - id: upload-marauder-dev-board-pro-release-asset - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ./esp32_marauder/build/esp32.esp32.d32/esp32_marauder.marauder_dev_board_pro.bin - asset_name: esp32_marauder.marauder_dev_board_pro.bin - asset_content_type: application/bin - if: github.event_name != 'pull_request' - - - name: Upload Marauder M5StickC Plus Asset - id: upload-m5stickc-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.m5stick-c/esp32_marauder.m5stickc_plus.bin - 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 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ./esp32_marauder/build/esp32.esp32.esp32s2/esp32_marauder.rev_feather.bin - asset_name: esp32_marauder.rev_feather.bin - asset_content_type: application/bin - if: github.event_name != 'pull_request' - - - name: Upload Marauder v7 Asset - id: upload-marauder-v7-release-asset - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ./esp32_marauder/build/esp32.esp32.d32/esp32_marauder.marauder_v7.bin - asset_name: esp32_marauder.marauder_v7.bin - asset_content_type: application/bin - if: github.event_name != 'pull_request' diff --git a/esp32_marauder/configs.h b/esp32_marauder/configs.h index 4ec91e2..1810654 100644 --- a/esp32_marauder/configs.h +++ b/esp32_marauder/configs.h @@ -130,6 +130,7 @@ #define USE_SD #define HAS_TEMP_SENSOR #define HAS_GPS + #define HAS_PSRAM #endif #ifdef MARAUDER_REV_FEATHER @@ -254,6 +255,7 @@ #define HAS_GPS #define HAS_SD #define USE_SD + #define HAS_PSRAM //#define HAS_TEMP_SENSOR #endif @@ -1608,8 +1610,6 @@ #define PIN 33 #elif defined(MARAUDER_CYD_MICRO) #define PIN 4 - //#elif defined(MARAUDER_CYD_GUITION) - // #define PIN 4 #else #define PIN 25 #endif @@ -1618,103 +1618,71 @@ //// END NEOPIXEL STUFF //// EVIL PORTAL STUFF - #ifdef MARAUDER_M5STICKC - #define MAX_HTML_SIZE 11400 - #elif defined(MARAUDER_MINI) - #define MAX_HTML_SIZE 11400 - #elif defined(MARAUDER_V7) - #define MAX_HTML_SIZE 11400 - #elif defined(MARAUDER_V7_1) - #define MAX_HTML_SIZE 11400 - #elif defined(MARAUDER_REV_FEATHER) - #define MAX_HTML_SIZE 11400 - #elif defined(MARAUDER_V4) - #define MAX_HTML_SIZE 11400 - #elif defined(MARAUDER_V6) || defined(MARAUDER_V6_1) - #define MAX_HTML_SIZE 11400 - #elif defined(MARAUDER_CYD_MICRO) - #define MAX_HTML_SIZE 11400 - #elif defined(MARAUDER_CYD_GUITION) - #define MAX_HTML_SIZE 11400 - #elif defined(MARAUDER_KIT) - #define MAX_HTML_SIZE 11400 - #elif defined(GENERIC_ESP32) - #define MAX_HTML_SIZE 20000 - #elif defined(MARAUDER_FLIPPER) - #define MAX_HTML_SIZE 20000 - #elif defined(ESP32_LDDB) - #define MAX_HTML_SIZE 20000 - #elif defined(MARAUDER_DEV_BOARD_PRO) - #define MAX_HTML_SIZE 20000 - #elif defined(XIAO_ESP32_S3) - #define MAX_HTML_SIZE 20000 + + #ifdef HAS_PSRAM + #define MAX_HTML_SIZE 28000 #else - #define MAX_HTML_SIZE 20000 + #define MAX_HTML_SIZE 11400 #endif + //// END EVIL PORTAL STUFF //// GPS STUFF #ifdef HAS_GPS + #ifdef HAS_PSRAM + #define mac_history_len 1000 + #else + #define mac_history_len 100 + #endif + #if defined(MARAUDER_V6) || defined(MARAUDER_V6_1) #define GPS_SERIAL_INDEX 2 #define GPS_TX 4 #define GPS_RX 13 - #define mac_history_len 100 #elif defined(MARAUDER_CYD_MICRO) #define GPS_SERIAL_INDEX 2 #define GPS_TX 27 // Fits the extended I/O #define GPS_RX 22 - #define mac_history_len 100 #elif defined(MARAUDER_CYD_GUITION) #define GPS_SERIAL_INDEX 2 #define GPS_TX 21 // Fits the extended I/O #define GPS_RX 22 - #define mac_history_len 100 #elif defined(MARAUDER_V4) #define GPS_SERIAL_INDEX 2 #define GPS_TX 4 #define GPS_RX 13 - #define mac_history_len 100 #elif defined(MARAUDER_KIT) #define GPS_SERIAL_INDEX 2 #define GPS_TX 4 #define GPS_RX 13 - #define mac_history_len 100 #elif defined(MARAUDER_DEV_BOARD_PRO) #define GPS_SERIAL_INDEX 2 #define GPS_TX 21 #define GPS_RX 17 - #define mac_history_len 100 #elif defined(MARAUDER_MINI) #define GPS_SERIAL_INDEX 2 #define GPS_TX 21 #define GPS_RX 22 - #define mac_history_len 100 #elif defined(MARAUDER_V7) #define GPS_SERIAL_INDEX 2 #define GPS_TX 21 #define GPS_RX 22 - #define mac_history_len 100 #elif defined(MARAUDER_V7_1) #define GPS_SERIAL_INDEX 2 #define GPS_TX 21 #define GPS_RX 22 - #define mac_history_len 100 #elif defined(MARAUDER_FLIPPER) #define GPS_SERIAL_INDEX 1 #define GPS_TX 9 #define GPS_RX 21 - #define mac_history_len 100 #elif defined(MARAUDER_M5STICKC) #define GPS_SERIAL_INDEX 1 #define GPS_TX 33 #define GPS_RX 32 - #define mac_history_len 100 #elif defined(MARAUDER_REV_FEATHER) #define GPS_SERIAL_INDEX 1 #define GPS_TX 6 #define GPS_RX 9 - #define mac_history_len 100 #endif #else #define mac_history_len 100 @@ -1791,23 +1759,18 @@ //// END MARAUDER TITLE STUFF //// PCAP BUFFER STUFF - - #ifdef MARAUDER_V7 - #define BUF_SIZE 8 * 1024 // Had to reduce buffer size to save RAM. GG @spacehuhn - #define SNAP_LEN 4096 // max len of each recieved packet - #elif defined(MARAUDER_V7_1) - #define BUF_SIZE 8 * 1024 // Had to reduce buffer size to save RAM. GG @spacehuhn - #define SNAP_LEN 4096 // max len of each recieved packet - #elif defined(MARAUDER_MINI) - #define BUF_SIZE 8 * 1024 // Had to reduce buffer size to save RAM. GG @spacehuhn - #define SNAP_LEN 4096 // max len of each recieved packet - #elif defined(MARAUDER_REV_FEATHER) + + #ifdef HAS_PSRAM + #define BUF_SIZE 16 * 1024 // Had to reduce buffer size to save RAM. GG @spacehuhn + #define SNAP_LEN 2 * 4096 // max len of each recieved packet + #elif !defined(HAS_ILI9341) #define BUF_SIZE 8 * 1024 // Had to reduce buffer size to save RAM. GG @spacehuhn #define SNAP_LEN 4096 // max len of each recieved packet #else #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 #endif + //// PCAP BUFFER STUFF //// STUPID CYD STUFF