From 7ffff598b1fb917652d2167c1f97cfd57e8793b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Belo?= Date: Fri, 17 Nov 2023 17:05:30 +0000 Subject: [PATCH 01/42] only s3 --- .github/workflows/build_push.yml | 573 ++++--------------------------- 1 file changed, 66 insertions(+), 507 deletions(-) diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index 7d4098001..6f5842cdf 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -6,7 +6,6 @@ on: types: [opened, reopened] jobs: - # This workflow contains a single job called "build" build: name: Build Marauder Binaries @@ -57,13 +56,6 @@ jobs: repository: bigbrodude6119/ESPAsyncWebServer ref: master path: CustomESPAsyncWebServer - - #- name: Install TFT_eSPI - # uses: actions/checkout@v2 - # with: - # repository: justcallmekoko/TFT_eSPI - # ref: master - # path: CustomTFT_eSPI - name: Install TFT_eSPI uses: actions/checkout@v2 @@ -128,10 +120,6 @@ jobs: ref: 8.1.0 path: CustomEspSoftwareSerial - #- 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 @@ -143,30 +131,6 @@ jobs: 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: | echo "Chicken" @@ -183,49 +147,22 @@ jobs: - name: Configure configs.h for Flipper Zero WiFi Dev Board run: | - 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 - - - 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" - - - 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: Configure SD Serial for Flipper Zero SD Serial - run: | - pwd - sed -i 's/^ \/\/#define WRITE_PACKETS_SERIAL/ #define WRITE_PACKETS_SERIAL/' esp32_marauder/configs.h - - - name: Build Marauder SD Serial 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" - - - name: Rename Marauder Flipper SD Serial bin - run: | - mv ./esp32_marauder/build/esp32.esp32.esp32s2/esp32_marauder.ino.bin ./esp32_marauder/build/esp32.esp32.esp32s2/esp32_marauder.flipper_sd_serial.bin - - - name: Remove SD Serial - run: | - pwd - sed -i 's/^ #define WRITE_PACKETS_SERIAL/ \/\/#define WRITE_PACKETS_SERIAL/' esp32_marauder/configs.h - + sed -i 's/^ #define MARAUDER_M5STICKC/ \/\/MARAUDER_M5STICKC/' esp32_marauder/configs.h + sed -i 's/^ #define MARAUDER_MINI/ \/\/MARAUDER_MINI/' esp32_marauder/configs.h + sed -i 's/^ #define MARAUDER_V4/ \/\/MARAUDER_V4/' esp32_marauder/configs.h + sed -i 's/^ #define MARAUDER_V6/ \/\/MARAUDER_V6/' esp32_marauder/configs.h + sed -i 's/^ #define MARAUDER_V6_1/ \/\/MARAUDER_V6_1/' esp32_marauder/configs.h + sed -i 's/^ #define MARAUDER_KIT/ \/\/MARAUDER_KIT/' esp32_marauder/configs.h + sed -i 's/^ #define GENERIC_ESP32/ \/\/GENERIC_ESP32/' esp32_marauder/configs.h + sed -i 's/^ #define \/\/MARAUDER_FLIPPER/ MARAUDER_FLIPPER/' esp32_marauder/configs.h + sed -i 's/^ #define ESP32_LDDB/ \/\/ESP32_LDDB/' esp32_marauder/configs.h + sed -i 's/^ #define MARAUDER_DEV_BOARD_PRO/ \/\/MARAUDER_DEV_BOARD_PRO/' esp32_marauder/configs.h + sed -i 's/^ #define XIAO_ESP32_S3/ \/\/XIAO_ESP32_S3/' esp32_marauder/configs.h + + + + # ------------- BUILD ------------- + - name: Build Marauder for Flipper Zero Multi Board uses: ArminJo/arduino-test-compile@v3.2.1 with: @@ -237,443 +174,65 @@ jobs: 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/^ #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 - - - 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" - - - 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/^ #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 - - #- 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" - - - 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_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 - - - 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" - - - 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/^ #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 - - - 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" - - - 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/^ \/\/#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 - - - 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" - - - 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_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 - - - 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" - - - 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_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 - - - 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" - - - 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_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_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" - - - 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: Display finished bins run: | find ./esp32_marauder/build -name "*.bin" - - - name: 'Upload Flipper Artifact' - uses: actions/upload-artifact@v3 - with: - name: esp32_marauder.flipper.bin - path: ./esp32_marauder/build/esp32.esp32.esp32s2/esp32_marauder.flipper.bin - retention-days: 5 - - - name: 'Upload Flipper SD Serial Artifact' - uses: actions/upload-artifact@v3 - with: - name: esp32_marauder.flipper_sd_serial.bin - path: ./esp32_marauder/build/esp32.esp32.esp32s2/esp32_marauder.flipper_sd_serial.bin - retention-days: 5 - + + + + + + # ------------- UPLOAD ARTIFACTS ------------- + - name: 'Upload MultiboardS3 Artifact' uses: actions/upload-artifact@v3 with: name: esp32_marauder.multiboardS3.bin path: ./esp32_marauder/build/esp32.esp32.esp32s3/esp32_marauder.multiboardS3.bin retention-days: 5 + + + + + + + # # ------------- RELEASE ------------- + + # - 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 OG Artifact' - uses: actions/upload-artifact@v3 - 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@v3 - 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@v3 - 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@v3 - 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@v3 - 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@v3 - with: - name: esp32_marauder.mini.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@v3 - 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@v3 - with: - name: esp32_marauder.m5stickc_plus.bin - path: ./esp32_marauder/build/esp32.esp32.m5stick-c/esp32_marauder.m5stickc_plus.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 Flipper SD Serial Asset - id: upload-flipper-sd-serial-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_sd_serial.bin - asset_name: esp32_marauder.flipper_sd_serial.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' + + + + + # # ------------- UPLOAD ASSET ------------- + + # - 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' + \ No newline at end of file From d13da51498276a24a34ae2a78c1e9d41a05fbad8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Belo?= Date: Fri, 17 Nov 2023 17:11:52 +0000 Subject: [PATCH 02/42] fix typo --- .github/workflows/build_push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index 6f5842cdf..db7d2579b 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -154,7 +154,7 @@ jobs: sed -i 's/^ #define MARAUDER_V6_1/ \/\/MARAUDER_V6_1/' esp32_marauder/configs.h sed -i 's/^ #define MARAUDER_KIT/ \/\/MARAUDER_KIT/' esp32_marauder/configs.h sed -i 's/^ #define GENERIC_ESP32/ \/\/GENERIC_ESP32/' esp32_marauder/configs.h - sed -i 's/^ #define \/\/MARAUDER_FLIPPER/ MARAUDER_FLIPPER/' esp32_marauder/configs.h + sed -i 's/^ \/\/#define MARAUDER_FLIPPER/ MARAUDER_FLIPPER/' esp32_marauder/configs.h sed -i 's/^ #define ESP32_LDDB/ \/\/ESP32_LDDB/' esp32_marauder/configs.h sed -i 's/^ #define MARAUDER_DEV_BOARD_PRO/ \/\/MARAUDER_DEV_BOARD_PRO/' esp32_marauder/configs.h sed -i 's/^ #define XIAO_ESP32_S3/ \/\/XIAO_ESP32_S3/' esp32_marauder/configs.h From efd846463812df4cc9ff616c233f43131076e3ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Belo?= Date: Fri, 17 Nov 2023 17:44:58 +0000 Subject: [PATCH 03/42] fix defines pipeline --- .github/workflows/build_push.yml | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index db7d2579b..add80b7e1 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -147,19 +147,20 @@ jobs: - name: Configure configs.h for Flipper Zero WiFi Dev Board run: | - sed -i 's/^ #define MARAUDER_M5STICKC/ \/\/MARAUDER_M5STICKC/' esp32_marauder/configs.h - sed -i 's/^ #define MARAUDER_MINI/ \/\/MARAUDER_MINI/' esp32_marauder/configs.h - sed -i 's/^ #define MARAUDER_V4/ \/\/MARAUDER_V4/' esp32_marauder/configs.h - sed -i 's/^ #define MARAUDER_V6/ \/\/MARAUDER_V6/' esp32_marauder/configs.h - sed -i 's/^ #define MARAUDER_V6_1/ \/\/MARAUDER_V6_1/' esp32_marauder/configs.h - sed -i 's/^ #define MARAUDER_KIT/ \/\/MARAUDER_KIT/' esp32_marauder/configs.h - sed -i 's/^ #define GENERIC_ESP32/ \/\/GENERIC_ESP32/' esp32_marauder/configs.h - sed -i 's/^ \/\/#define MARAUDER_FLIPPER/ MARAUDER_FLIPPER/' esp32_marauder/configs.h - sed -i 's/^ #define ESP32_LDDB/ \/\/ESP32_LDDB/' esp32_marauder/configs.h - sed -i 's/^ #define MARAUDER_DEV_BOARD_PRO/ \/\/MARAUDER_DEV_BOARD_PRO/' esp32_marauder/configs.h - sed -i 's/^ #define XIAO_ESP32_S3/ \/\/XIAO_ESP32_S3/' 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 XIAO_ESP32_S3/ \/\/#define XIAO_ESP32_S3/' esp32_marauder/configs.h + # ------------- BUILD ------------- From d6ed25e7acb13021de1db1e98a130adf8f5219a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Belo?= Date: Fri, 17 Nov 2023 17:47:15 +0000 Subject: [PATCH 04/42] fix pipeline auto --- .github/workflows/build_push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index add80b7e1..77c089050 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -3,7 +3,7 @@ name: Build and Push on: workflow_dispatch: pull_request: - types: [opened, reopened] + types: [opened, reopened, edited] jobs: build: From 80b6e69f4c0ef800f479002c27bb69e69d6bb499 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Belo?= Date: Fri, 17 Nov 2023 17:50:24 +0000 Subject: [PATCH 05/42] fix auto build --- .github/workflows/build_push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index 77c089050..15729894d 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -3,7 +3,7 @@ name: Build and Push on: workflow_dispatch: pull_request: - types: [opened, reopened, edited] + types: [opened, reopened, synchronize] jobs: build: From 28ccb4578007dad74fb3ca5d5d53b5439a9a1ded Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Belo?= Date: Fri, 17 Nov 2023 17:58:08 +0000 Subject: [PATCH 06/42] fix config --- .github/workflows/build_push.yml | 37 ++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index 15729894d..3dca505b5 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -56,6 +56,13 @@ jobs: repository: bigbrodude6119/ESPAsyncWebServer ref: master path: CustomESPAsyncWebServer + + #- name: Install TFT_eSPI + # uses: actions/checkout@v2 + # with: + # repository: justcallmekoko/TFT_eSPI + # ref: master + # path: CustomTFT_eSPI - name: Install TFT_eSPI uses: actions/checkout@v2 @@ -120,6 +127,10 @@ jobs: ref: 8.1.0 path: CustomEspSoftwareSerial + #- 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 @@ -131,6 +142,30 @@ jobs: 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: | echo "Chicken" @@ -158,8 +193,6 @@ 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 XIAO_ESP32_S3/ \/\/#define XIAO_ESP32_S3/' esp32_marauder/configs.h - - # ------------- BUILD ------------- From f6b9139a1ea7521fbe7880f63b190232f026c46d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Belo?= Date: Fri, 17 Nov 2023 18:14:48 +0000 Subject: [PATCH 07/42] fix pipeline conf --- .github/workflows/build_push.yml | 94 +++++++++----------------------- esp32_marauder/configs.h | 4 +- 2 files changed, 27 insertions(+), 71 deletions(-) diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index 3dca505b5..7dc1607a0 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -6,6 +6,7 @@ on: types: [opened, reopened, synchronize] jobs: + # This workflow contains a single job called "build" build: name: Build Marauder Binaries @@ -180,23 +181,6 @@ jobs: 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_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 XIAO_ESP32_S3/ \/\/#define XIAO_ESP32_S3/' esp32_marauder/configs.h - - - # ------------- BUILD ------------- - - name: Build Marauder for Flipper Zero Multi Board uses: ArminJo/arduino-test-compile@v3.2.1 with: @@ -207,66 +191,38 @@ jobs: - 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: Display finished bins run: | find ./esp32_marauder/build -name "*.bin" - - - - - - # ------------- UPLOAD ARTIFACTS ------------- - + - name: 'Upload MultiboardS3 Artifact' uses: actions/upload-artifact@v3 with: name: esp32_marauder.multiboardS3.bin path: ./esp32_marauder/build/esp32.esp32.esp32s3/esp32_marauder.multiboardS3.bin retention-days: 5 - - - - - - - # # ------------- RELEASE ------------- - - # - 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' - - - - - # # ------------- UPLOAD ASSET ------------- - - # - 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' - \ No newline at end of file + - 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 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' \ No newline at end of file diff --git a/esp32_marauder/configs.h b/esp32_marauder/configs.h index 103c511bd..3f50eab7d 100644 --- a/esp32_marauder/configs.h +++ b/esp32_marauder/configs.h @@ -12,11 +12,11 @@ //#define MARAUDER_M5STICKC //#define MARAUDER_MINI //#define MARAUDER_V4 - #define MARAUDER_V6 + //#define MARAUDER_V6 //#define MARAUDER_V6_1 //#define MARAUDER_KIT //#define GENERIC_ESP32 - //#define MARAUDER_FLIPPER + #define MARAUDER_FLIPPER //#define ESP32_LDDB //#define MARAUDER_DEV_BOARD_PRO //#define XIAO_ESP32_S3 From fa970f068fb0b7210196494f1ac434f57cb93c65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Belo?= Date: Fri, 17 Nov 2023 18:19:40 +0000 Subject: [PATCH 08/42] remove comments --- .github/workflows/build_push.yml | 36 -------------------------------- 1 file changed, 36 deletions(-) diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index 7dc1607a0..0b3cc0334 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -6,7 +6,6 @@ on: types: [opened, reopened, synchronize] jobs: - # This workflow contains a single job called "build" build: name: Build Marauder Binaries @@ -58,13 +57,6 @@ jobs: ref: master path: CustomESPAsyncWebServer - #- name: Install TFT_eSPI - # uses: actions/checkout@v2 - # with: - # repository: justcallmekoko/TFT_eSPI - # ref: master - # path: CustomTFT_eSPI - - name: Install TFT_eSPI uses: actions/checkout@v2 with: @@ -128,10 +120,6 @@ jobs: ref: 8.1.0 path: CustomEspSoftwareSerial - #- 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 @@ -143,30 +131,6 @@ jobs: 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: | echo "Chicken" From c3b837dbb8f410b07026c6ba80c0e9745c904a0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Belo?= Date: Fri, 17 Nov 2023 18:46:28 +0000 Subject: [PATCH 09/42] copy to stamp --- esp32_marauder/configs.h | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/esp32_marauder/configs.h b/esp32_marauder/configs.h index 3f50eab7d..d0bea4a28 100644 --- a/esp32_marauder/configs.h +++ b/esp32_marauder/configs.h @@ -9,6 +9,7 @@ //#define WRITE_PACKETS_SERIAL //// BOARD TARGETS + #define MARAUDER_M5STAMP_S3 //#define MARAUDER_M5STICKC //#define MARAUDER_MINI //#define MARAUDER_V4 @@ -16,7 +17,7 @@ //#define MARAUDER_V6_1 //#define MARAUDER_KIT //#define GENERIC_ESP32 - #define MARAUDER_FLIPPER + //#define MARAUDER_FLIPPER //#define ESP32_LDDB //#define MARAUDER_DEV_BOARD_PRO //#define XIAO_ESP32_S3 @@ -25,6 +26,22 @@ #define MARAUDER_VERSION "v0.13.4" //// BOARD FEATURES + #ifdef MARAUDER_M5STAMP_S3 + #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_GPS + // #ifndef WRITE_PACKETS_SERIAL + // #define HAS_SD + // #define USE_SD + // #endif + //#define HAS_TEMP_SENSOR + #endif + #ifdef MARAUDER_M5STICKC //#define FLIPPER_ZERO_HAT #define HAS_BATTERY From 76c92c57ea082a8841c736e662ede13320921035 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Belo?= Date: Fri, 17 Nov 2023 18:52:45 +0000 Subject: [PATCH 10/42] dupes marauder flipper ifs --- esp32_marauder/configs.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/esp32_marauder/configs.h b/esp32_marauder/configs.h index d0bea4a28..8e7c442e3 100644 --- a/esp32_marauder/configs.h +++ b/esp32_marauder/configs.h @@ -748,6 +748,8 @@ #define MEM_LOWER_LIM 20000 #elif defined(MARAUDER_FLIPPER) #define MEM_LOWER_LIM 20000 + #elif defined(MARAUDER_M5STAMP_S3) + #define MEM_LOWER_LIM 20000 #elif defined(ESP32_LDDB) #define MEM_LOWER_LIM 20000 #elif defined(MARAUDER_DEV_BOARD_PRO) @@ -795,6 +797,8 @@ #define MAX_HTML_SIZE 20000 #elif defined(MARAUDER_FLIPPER) #define MAX_HTML_SIZE 20000 + #elif defined(MARAUDER_M5STAMP_S3) + #define MAX_HTML_SIZE 20000 #elif defined(ESP32_LDDB) #define MAX_HTML_SIZE 20000 #elif defined(MARAUDER_DEV_BOARD_PRO) @@ -842,6 +846,15 @@ #define GPS_TX 9 #define GPS_RX 21 #define mac_history_len 512 + #elif defined(MARAUDER_M5STAMP_S3) + #ifdef WRITE_PACKETS_SERIAL + #define GPS_SOFTWARE_SERIAL + #else + #define GPS_SERIAL_INDEX 1 + #endif + #define GPS_TX 9 + #define GPS_RX 21 + #define mac_history_len 512 #elif defined(MARAUDER_M5STICKC) #define GPS_SERIAL_INDEX 1 #define GPS_TX 33 From 9a7b3ed78e132857878e06f924bc6cdeb8ad5fb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Belo?= Date: Fri, 17 Nov 2023 19:02:29 +0000 Subject: [PATCH 11/42] updates LED stuff --- esp32_marauder/esp32_marauder.ino | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/esp32_marauder/esp32_marauder.ino b/esp32_marauder/esp32_marauder.ino index 83a664162..287565b20 100644 --- a/esp32_marauder/esp32_marauder.ino +++ b/esp32_marauder/esp32_marauder.ino @@ -35,7 +35,9 @@ https://www.online-utility.org/image/convert/to/XBM #endif #include "Buffer.h" -#ifdef MARAUDER_FLIPPER +#ifdef MARAUDER_M5STAMP_S3 + #include "flipperLED.h" +#elif defined(MARAUDER_FLIPPER) #include "flipperLED.h" #elif defined(XIAO_ESP32_S3) #include "xiaoLED.h" @@ -119,7 +121,9 @@ CommandLine cli_obj; AXP192 axp192_obj; #endif -#ifdef MARAUDER_FLIPPER +#ifdef MARAUDER_M5STAMP_S3 + flipperLED flipper_led; +#elif defined(MARAUDER_FLIPPER) flipperLED flipper_led; #elif defined(XIAO_ESP32_S3) xiaoLED xiao_led; @@ -339,7 +343,9 @@ void setup() #endif // Do some LED stuff - #ifdef MARAUDER_FLIPPER + #ifdef MARAUDER_M5STAMP_S3 + flipper_led.RunSetup(); + #elif defined(MARAUDER_FLIPPER) flipper_led.RunSetup(); #elif defined(XIAO_ESP32_S3) xiao_led.RunSetup(); @@ -437,7 +443,9 @@ void loop() #endif //cli_obj.main(currentTime); } - #ifdef MARAUDER_FLIPPER + #ifdef MARAUDER_M5STAMP_S3 + flipper_led.main(); + #elif defined(MARAUDER_FLIPPER) flipper_led.main(); #elif defined(XIAO_ESP32_S3) xiao_led.main(); From e5fc94496fb7dc0fa5811a9e0c956474e1064a20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Belo?= Date: Fri, 17 Nov 2023 19:16:04 +0000 Subject: [PATCH 12/42] stamp s3 on wifi stuff --- esp32_marauder/WiFiScan.cpp | 52 +++++++++++++++++++++++++++---------- esp32_marauder/WiFiScan.h | 8 ++++-- 2 files changed, 45 insertions(+), 15 deletions(-) diff --git a/esp32_marauder/WiFiScan.cpp b/esp32_marauder/WiFiScan.cpp index abbb234ad..a016e4b17 100644 --- a/esp32_marauder/WiFiScan.cpp +++ b/esp32_marauder/WiFiScan.cpp @@ -552,7 +552,9 @@ void WiFiScan::startWiFiAttacks(uint8_t scan_mode, uint16_t color, String title_ esp_wifi_set_promiscuous(true); esp_wifi_set_max_tx_power(82); this->wifi_initialized = true; - #ifdef MARAUDER_FLIPPER + #ifdef MARAUDER_M5STAMP_S3 + flipper_led.attackLED(); + #elif defined(MARAUDER_FLIPPER) flipper_led.attackLED(); #elif defined(XIAO_ESP32_S3) xiao_led.attackLED(); @@ -577,7 +579,9 @@ bool WiFiScan::shutdownWiFi() { esp_wifi_restore(); esp_wifi_deinit(); - #ifdef MARAUDER_FLIPPER + #ifdef MARAUDER_M5STAMP_S3 + flipper_led.offLED(); + #elif defined(MARAUDER_FLIPPER) flipper_led.offLED(); #elif defined(XIAO_ESP32_S3) xiao_led.offLED(); @@ -604,7 +608,9 @@ bool WiFiScan::shutdownBLE() { pBLEScan->clearResults(); NimBLEDevice::deinit(); - #ifdef MARAUDER_FLIPPER + #ifdef MARAUDER_M5STAMP_S3 + flipper_led.offLED(); + #elif defined(MARAUDER_FLIPPER) flipper_led.offLED(); #elif defined(XIAO_ESP32_S3) xiao_led.offLED(); @@ -843,7 +849,9 @@ void WiFiScan::RunEvilPortal(uint8_t scan_mode, uint16_t color) return; #endif - #ifdef MARAUDER_FLIPPER + #ifdef MARAUDER_M5STAMP_S3 + flipper_led.sniffLED(); + #elif defined(MARAUDER_FLIPPER) flipper_led.sniffLED(); #elif defined(XIAO_ESP32_S3) xiao_led.sniffLED(); @@ -892,7 +900,9 @@ void WiFiScan::RunAPScan(uint8_t scan_mode, uint16_t color) return; #endif - #ifdef MARAUDER_FLIPPER + #ifdef MARAUDER_M5STAMP_S3 + flipper_led.sniffLED(); + #elif defined(MARAUDER_FLIPPER) flipper_led.sniffLED(); #elif defined(XIAO_ESP32_S3) xiao_led.sniffLED(); @@ -1177,7 +1187,9 @@ void WiFiScan::RunInfo() void WiFiScan::RunPacketMonitor(uint8_t scan_mode, uint16_t color) { - #ifdef MARAUDER_FLIPPER + #ifdef MARAUDER_M5STAMP_S3 + flipper_led.sniffLED(); + #elif defined(MARAUDER_FLIPPER) flipper_led.sniffLED(); #elif defined(XIAO_ESP32_S3) xiao_led.sniffLED(); @@ -1262,7 +1274,9 @@ void WiFiScan::RunPacketMonitor(uint8_t scan_mode, uint16_t color) void WiFiScan::RunEapolScan(uint8_t scan_mode, uint16_t color) { - #ifdef MARAUDER_FLIPPER + #ifdef MARAUDER_M5STAMP_S3 + flipper_led.sniffLED(); + #elif defined(MARAUDER_FLIPPER) flipper_led.sniffLED(); #elif defined(XIAO_ESP32_S3) xiao_led.sniffLED(); @@ -1419,7 +1433,9 @@ void WiFiScan::RunPwnScan(uint8_t scan_mode, uint16_t color) return; #endif - #ifdef MARAUDER_FLIPPER + #ifdef MARAUDER_M5STAMP_S3 + flipper_led.sniffLED(); + #elif defined(MARAUDER_FLIPPER) flipper_led.sniffLED(); #elif defined(XIAO_ESP32_S3) xiao_led.sniffLED(); @@ -1610,7 +1626,9 @@ void WiFiScan::RunBeaconScan(uint8_t scan_mode, uint16_t color) return; #endif - #ifdef MARAUDER_FLIPPER + #ifdef MARAUDER_M5STAMP_S3 + flipper_led.sniffLED(); + #elif defined(MARAUDER_FLIPPER) flipper_led.sniffLED(); #elif defined(XIAO_ESP32_S3) xiao_led.sniffLED(); @@ -1675,7 +1693,9 @@ void WiFiScan::RunStationScan(uint8_t scan_mode, uint16_t color) return; #endif - #ifdef MARAUDER_FLIPPER + #ifdef MARAUDER_M5STAMP_S3 + flipper_led.sniffLED(); + #elif defined(MARAUDER_FLIPPER) flipper_led.sniffLED(); #elif defined(XIAO_ESP32_S3) xiao_led.sniffLED(); @@ -1725,7 +1745,9 @@ void WiFiScan::RunRawScan(uint8_t scan_mode, uint16_t color) return; #endif - #ifdef MARAUDER_FLIPPER + #ifdef MARAUDER_M5STAMP_S3 + flipper_led.sniffLED(); + #elif defined(MARAUDER_FLIPPER) flipper_led.sniffLED(); #elif defined(XIAO_ESP32_S3) xiao_led.sniffLED(); @@ -1777,7 +1799,9 @@ void WiFiScan::RunDeauthScan(uint8_t scan_mode, uint16_t color) return; #endif - #ifdef MARAUDER_FLIPPER + #ifdef MARAUDER_M5STAMP_S3 + flipper_led.sniffLED(); + #elif defined(MARAUDER_FLIPPER) flipper_led.sniffLED(); #elif defined(XIAO_ESP32_S3) xiao_led.sniffLED(); @@ -1838,7 +1862,9 @@ void WiFiScan::RunProbeScan(uint8_t scan_mode, uint16_t color) return; #endif - #ifdef MARAUDER_FLIPPER + #ifdef MARAUDER_M5STAMP_S3 + flipper_led.sniffLED(); + #elif defined(MARAUDER_FLIPPER) flipper_led.sniffLED(); #elif defined(XIAO_ESP32_S3) xiao_led.sniffLED(); diff --git a/esp32_marauder/WiFiScan.h b/esp32_marauder/WiFiScan.h index 46f076ac2..9e3a2eafa 100644 --- a/esp32_marauder/WiFiScan.h +++ b/esp32_marauder/WiFiScan.h @@ -32,7 +32,9 @@ #endif #include "settings.h" #include "Assets.h" -#ifdef MARAUDER_FLIPPER +#ifdef MARAUDER_M5STAMP_S3 + #include "flipperLED.h" +#elif defined(MARAUDER_FLIPPER) #include "flipperLED.h" #elif defined(XIAO_ESP32_S3) #include "xiaoLED.h" @@ -107,7 +109,9 @@ extern Buffer buffer_obj; extern BatteryInterface battery_obj; #endif extern Settings settings_obj; -#ifdef MARAUDER_FLIPPER +#ifdef MARAUDER_M5STAMP_S3 + extern flipperLED flipper_led; +#elif defined(MARAUDER_FLIPPER) extern flipperLED flipper_led; #elif defined(XIAO_ESP32_S3) extern xiaoLED xiao_led; From 4770b6ed2317f1443fe9a72f6c21baad0d46a9b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Belo?= Date: Fri, 17 Nov 2023 19:27:13 +0000 Subject: [PATCH 13/42] adds stamps3 led --- esp32_marauder/WiFiScan.cpp | 26 +++++++-------- esp32_marauder/WiFiScan.h | 4 +-- esp32_marauder/stampS3LED.cpp | 61 +++++++++++++++++++++++++++++++++++ esp32_marauder/stampS3LED.h | 25 ++++++++++++++ 4 files changed, 101 insertions(+), 15 deletions(-) create mode 100644 esp32_marauder/stampS3LED.cpp create mode 100644 esp32_marauder/stampS3LED.h diff --git a/esp32_marauder/WiFiScan.cpp b/esp32_marauder/WiFiScan.cpp index a016e4b17..c782ca01b 100644 --- a/esp32_marauder/WiFiScan.cpp +++ b/esp32_marauder/WiFiScan.cpp @@ -553,7 +553,7 @@ void WiFiScan::startWiFiAttacks(uint8_t scan_mode, uint16_t color, String title_ esp_wifi_set_max_tx_power(82); this->wifi_initialized = true; #ifdef MARAUDER_M5STAMP_S3 - flipper_led.attackLED(); + stamps3_led.attackLED(); #elif defined(MARAUDER_FLIPPER) flipper_led.attackLED(); #elif defined(XIAO_ESP32_S3) @@ -580,7 +580,7 @@ bool WiFiScan::shutdownWiFi() { esp_wifi_deinit(); #ifdef MARAUDER_M5STAMP_S3 - flipper_led.offLED(); + stamps3_led.offLED(); #elif defined(MARAUDER_FLIPPER) flipper_led.offLED(); #elif defined(XIAO_ESP32_S3) @@ -609,7 +609,7 @@ bool WiFiScan::shutdownBLE() { NimBLEDevice::deinit(); #ifdef MARAUDER_M5STAMP_S3 - flipper_led.offLED(); + stamps3_led.offLED(); #elif defined(MARAUDER_FLIPPER) flipper_led.offLED(); #elif defined(XIAO_ESP32_S3) @@ -850,7 +850,7 @@ void WiFiScan::RunEvilPortal(uint8_t scan_mode, uint16_t color) #endif #ifdef MARAUDER_M5STAMP_S3 - flipper_led.sniffLED(); + stamps3_led.sniffLED(); #elif defined(MARAUDER_FLIPPER) flipper_led.sniffLED(); #elif defined(XIAO_ESP32_S3) @@ -901,7 +901,7 @@ void WiFiScan::RunAPScan(uint8_t scan_mode, uint16_t color) #endif #ifdef MARAUDER_M5STAMP_S3 - flipper_led.sniffLED(); + stamps3_led.sniffLED(); #elif defined(MARAUDER_FLIPPER) flipper_led.sniffLED(); #elif defined(XIAO_ESP32_S3) @@ -1188,7 +1188,7 @@ void WiFiScan::RunInfo() void WiFiScan::RunPacketMonitor(uint8_t scan_mode, uint16_t color) { #ifdef MARAUDER_M5STAMP_S3 - flipper_led.sniffLED(); + stamps3_led.sniffLED(); #elif defined(MARAUDER_FLIPPER) flipper_led.sniffLED(); #elif defined(XIAO_ESP32_S3) @@ -1275,7 +1275,7 @@ void WiFiScan::RunPacketMonitor(uint8_t scan_mode, uint16_t color) void WiFiScan::RunEapolScan(uint8_t scan_mode, uint16_t color) { #ifdef MARAUDER_M5STAMP_S3 - flipper_led.sniffLED(); + stamps3_led.sniffLED(); #elif defined(MARAUDER_FLIPPER) flipper_led.sniffLED(); #elif defined(XIAO_ESP32_S3) @@ -1434,7 +1434,7 @@ void WiFiScan::RunPwnScan(uint8_t scan_mode, uint16_t color) #endif #ifdef MARAUDER_M5STAMP_S3 - flipper_led.sniffLED(); + stamps3_led.sniffLED(); #elif defined(MARAUDER_FLIPPER) flipper_led.sniffLED(); #elif defined(XIAO_ESP32_S3) @@ -1627,7 +1627,7 @@ void WiFiScan::RunBeaconScan(uint8_t scan_mode, uint16_t color) #endif #ifdef MARAUDER_M5STAMP_S3 - flipper_led.sniffLED(); + stamps3_led.sniffLED(); #elif defined(MARAUDER_FLIPPER) flipper_led.sniffLED(); #elif defined(XIAO_ESP32_S3) @@ -1694,7 +1694,7 @@ void WiFiScan::RunStationScan(uint8_t scan_mode, uint16_t color) #endif #ifdef MARAUDER_M5STAMP_S3 - flipper_led.sniffLED(); + stamps3_led.sniffLED(); #elif defined(MARAUDER_FLIPPER) flipper_led.sniffLED(); #elif defined(XIAO_ESP32_S3) @@ -1746,7 +1746,7 @@ void WiFiScan::RunRawScan(uint8_t scan_mode, uint16_t color) #endif #ifdef MARAUDER_M5STAMP_S3 - flipper_led.sniffLED(); + stamps3_led.sniffLED(); #elif defined(MARAUDER_FLIPPER) flipper_led.sniffLED(); #elif defined(XIAO_ESP32_S3) @@ -1800,7 +1800,7 @@ void WiFiScan::RunDeauthScan(uint8_t scan_mode, uint16_t color) #endif #ifdef MARAUDER_M5STAMP_S3 - flipper_led.sniffLED(); + stamps3_led.sniffLED(); #elif defined(MARAUDER_FLIPPER) flipper_led.sniffLED(); #elif defined(XIAO_ESP32_S3) @@ -1863,7 +1863,7 @@ void WiFiScan::RunProbeScan(uint8_t scan_mode, uint16_t color) #endif #ifdef MARAUDER_M5STAMP_S3 - flipper_led.sniffLED(); + stamps3_led.sniffLED(); #elif defined(MARAUDER_FLIPPER) flipper_led.sniffLED(); #elif defined(XIAO_ESP32_S3) diff --git a/esp32_marauder/WiFiScan.h b/esp32_marauder/WiFiScan.h index 9e3a2eafa..cc27eb863 100644 --- a/esp32_marauder/WiFiScan.h +++ b/esp32_marauder/WiFiScan.h @@ -33,7 +33,7 @@ #include "settings.h" #include "Assets.h" #ifdef MARAUDER_M5STAMP_S3 - #include "flipperLED.h" + #include "stampS3LED.h" #elif defined(MARAUDER_FLIPPER) #include "flipperLED.h" #elif defined(XIAO_ESP32_S3) @@ -110,7 +110,7 @@ extern Buffer buffer_obj; #endif extern Settings settings_obj; #ifdef MARAUDER_M5STAMP_S3 - extern flipperLED flipper_led; + extern stampS3LED stamps3_led; #elif defined(MARAUDER_FLIPPER) extern flipperLED flipper_led; #elif defined(XIAO_ESP32_S3) diff --git a/esp32_marauder/stampS3LED.cpp b/esp32_marauder/stampS3LED.cpp new file mode 100644 index 000000000..309ddebfd --- /dev/null +++ b/esp32_marauder/stampS3LED.cpp @@ -0,0 +1,61 @@ +#include "stampS3LED.h" + +void stampS3LED::RunSetup() { + pinMode(B_PIN, OUTPUT); + pinMode(G_PIN, OUTPUT); + pinMode(R_PIN, OUTPUT); + + if (!settings_obj.loadSetting("EnableLED")) { + digitalWrite(B_PIN, HIGH); + digitalWrite(G_PIN, HIGH); + digitalWrite(R_PIN, HIGH); + return; + } + + delay(50); + + digitalWrite(B_PIN, LOW); + delay(500); + digitalWrite(B_PIN, HIGH); + digitalWrite(G_PIN, LOW); + delay(500); + digitalWrite(G_PIN, HIGH); + digitalWrite(R_PIN, LOW); + delay(500); + digitalWrite(R_PIN, HIGH); +} + +void stampS3LED::attackLED() { + if (!settings_obj.loadSetting("EnableLED")) + return; + + digitalWrite(B_PIN, HIGH); + digitalWrite(G_PIN, HIGH); + digitalWrite(R_PIN, HIGH); + delay(10); + digitalWrite(R_PIN, LOW); +} + +void stampS3LED::sniffLED() { + if (!settings_obj.loadSetting("EnableLED")) + return; + + digitalWrite(B_PIN, HIGH); + digitalWrite(G_PIN, HIGH); + digitalWrite(R_PIN, HIGH); + delay(10); + digitalWrite(B_PIN, LOW); +} + +void stampS3LED::offLED() { + if (!settings_obj.loadSetting("EnableLED")) + return; + + digitalWrite(B_PIN, HIGH); + digitalWrite(G_PIN, HIGH); + digitalWrite(R_PIN, HIGH); +} + +void stampS3LED::main() { + // do nothing +} \ No newline at end of file diff --git a/esp32_marauder/stampS3LED.h b/esp32_marauder/stampS3LED.h new file mode 100644 index 000000000..caab34188 --- /dev/null +++ b/esp32_marauder/stampS3LED.h @@ -0,0 +1,25 @@ +#ifndef stampS3LED_h +#define stampS3LED_h + +#include "configs.h" +#include "settings.h" + +#include + +#define B_PIN 4 +#define G_PIN 5 +#define R_PIN 6 + +extern Settings settings_obj; + +class stampS3LED { + + public: + void RunSetup(); + void main(); + void attackLED(); + void sniffLED(); + void offLED(); +}; + +#endif From 4f38d86f88a5909d19b57c598d51a5eb0538a778 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Belo?= Date: Fri, 17 Nov 2023 19:44:00 +0000 Subject: [PATCH 14/42] fix led import --- esp32_marauder/esp32_marauder.ino | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/esp32_marauder/esp32_marauder.ino b/esp32_marauder/esp32_marauder.ino index 287565b20..72cfbbdab 100644 --- a/esp32_marauder/esp32_marauder.ino +++ b/esp32_marauder/esp32_marauder.ino @@ -36,7 +36,7 @@ https://www.online-utility.org/image/convert/to/XBM #include "Buffer.h" #ifdef MARAUDER_M5STAMP_S3 - #include "flipperLED.h" + #include "stampS3LED.h" #elif defined(MARAUDER_FLIPPER) #include "flipperLED.h" #elif defined(XIAO_ESP32_S3) @@ -122,7 +122,7 @@ CommandLine cli_obj; #endif #ifdef MARAUDER_M5STAMP_S3 - flipperLED flipper_led; + stampS3LED stamps3_led; #elif defined(MARAUDER_FLIPPER) flipperLED flipper_led; #elif defined(XIAO_ESP32_S3) From 7f8578ba0e32d867742f7c3fdce16549a16f3431 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Belo?= Date: Fri, 17 Nov 2023 19:57:37 +0000 Subject: [PATCH 15/42] use stamps3_fed --- esp32_marauder/esp32_marauder.ino | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/esp32_marauder/esp32_marauder.ino b/esp32_marauder/esp32_marauder.ino index 72cfbbdab..4ffd929fc 100644 --- a/esp32_marauder/esp32_marauder.ino +++ b/esp32_marauder/esp32_marauder.ino @@ -344,7 +344,7 @@ void setup() // Do some LED stuff #ifdef MARAUDER_M5STAMP_S3 - flipper_led.RunSetup(); + stamps3_led.RunSetup(); #elif defined(MARAUDER_FLIPPER) flipper_led.RunSetup(); #elif defined(XIAO_ESP32_S3) @@ -444,7 +444,7 @@ void loop() //cli_obj.main(currentTime); } #ifdef MARAUDER_M5STAMP_S3 - flipper_led.main(); + stamps3_led.main(); #elif defined(MARAUDER_FLIPPER) flipper_led.main(); #elif defined(XIAO_ESP32_S3) From ede2b7f5b757a0688a5fe354079a77e3badbc19b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Belo?= Date: Fri, 17 Nov 2023 20:10:43 +0000 Subject: [PATCH 16/42] try multis3 --- esp32_marauder/configs.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/esp32_marauder/configs.h b/esp32_marauder/configs.h index 8e7c442e3..afbc407b7 100644 --- a/esp32_marauder/configs.h +++ b/esp32_marauder/configs.h @@ -9,7 +9,7 @@ //#define WRITE_PACKETS_SERIAL //// BOARD TARGETS - #define MARAUDER_M5STAMP_S3 + //#define MARAUDER_M5STAMP_S3 //#define MARAUDER_M5STICKC //#define MARAUDER_MINI //#define MARAUDER_V4 @@ -17,7 +17,7 @@ //#define MARAUDER_V6_1 //#define MARAUDER_KIT //#define GENERIC_ESP32 - //#define MARAUDER_FLIPPER + #define MARAUDER_FLIPPER //#define ESP32_LDDB //#define MARAUDER_DEV_BOARD_PRO //#define XIAO_ESP32_S3 From b6ea8751d9f57604599cf98c97594f31f2fbc38c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Belo?= Date: Fri, 17 Nov 2023 20:20:43 +0000 Subject: [PATCH 17/42] try flipper naked --- esp32_marauder/configs.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/esp32_marauder/configs.h b/esp32_marauder/configs.h index afbc407b7..0212ef1b6 100644 --- a/esp32_marauder/configs.h +++ b/esp32_marauder/configs.h @@ -134,11 +134,11 @@ //#define HAS_NEOPIXEL_LED //#define HAS_PWR_MGMT //#define HAS_SCREEN - #define HAS_GPS - #ifndef WRITE_PACKETS_SERIAL - #define HAS_SD - #define USE_SD - #endif + // #define HAS_GPS + // #ifndef WRITE_PACKETS_SERIAL + // #define HAS_SD + // #define USE_SD + // #endif //#define HAS_TEMP_SENSOR #endif From 5803388d14fea46afc761e304ec491702855d0ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Belo?= Date: Fri, 17 Nov 2023 20:29:31 +0000 Subject: [PATCH 18/42] try with packetes serl --- esp32_marauder/configs.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/esp32_marauder/configs.h b/esp32_marauder/configs.h index 0212ef1b6..3d3491606 100644 --- a/esp32_marauder/configs.h +++ b/esp32_marauder/configs.h @@ -9,7 +9,7 @@ //#define WRITE_PACKETS_SERIAL //// BOARD TARGETS - //#define MARAUDER_M5STAMP_S3 + #define MARAUDER_M5STAMP_S3 //#define MARAUDER_M5STICKC //#define MARAUDER_MINI //#define MARAUDER_V4 @@ -17,7 +17,7 @@ //#define MARAUDER_V6_1 //#define MARAUDER_KIT //#define GENERIC_ESP32 - #define MARAUDER_FLIPPER + //#define MARAUDER_FLIPPER //#define ESP32_LDDB //#define MARAUDER_DEV_BOARD_PRO //#define XIAO_ESP32_S3 @@ -34,11 +34,11 @@ //#define HAS_NEOPIXEL_LED //#define HAS_PWR_MGMT //#define HAS_SCREEN - // #define HAS_GPS - // #ifndef WRITE_PACKETS_SERIAL - // #define HAS_SD - // #define USE_SD - // #endif + #define HAS_GPS + #ifndef WRITE_PACKETS_SERIAL + #define HAS_SD + #define USE_SD + #endif //#define HAS_TEMP_SENSOR #endif @@ -134,11 +134,11 @@ //#define HAS_NEOPIXEL_LED //#define HAS_PWR_MGMT //#define HAS_SCREEN - // #define HAS_GPS - // #ifndef WRITE_PACKETS_SERIAL - // #define HAS_SD - // #define USE_SD - // #endif + #define HAS_GPS + #ifndef WRITE_PACKETS_SERIAL + #define HAS_SD + #define USE_SD + #endif //#define HAS_TEMP_SENSOR #endif From 84361ce492690048f74d3dfc14f481b55a3becb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Belo?= Date: Fri, 17 Nov 2023 21:12:35 +0000 Subject: [PATCH 19/42] enable packets --- esp32_marauder/configs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esp32_marauder/configs.h b/esp32_marauder/configs.h index 3d3491606..0c0d23c9c 100644 --- a/esp32_marauder/configs.h +++ b/esp32_marauder/configs.h @@ -6,7 +6,7 @@ //Indicates that it must redirect the stream with the captured packets to serial (1) //If not defined, will write packages to SD card if supported - //#define WRITE_PACKETS_SERIAL + #define WRITE_PACKETS_SERIAL //// BOARD TARGETS #define MARAUDER_M5STAMP_S3 From 6eb04fb966d0a0cdcf51becd538e7c94709dcfbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Belo?= Date: Fri, 17 Nov 2023 21:28:24 +0000 Subject: [PATCH 20/42] sei la --- .github/workflows/build_push.yml | 20 ++++++++++---------- esp32_marauder/configs.h | 14 +++++++------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index 0b3cc0334..ad518504f 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -145,26 +145,26 @@ jobs: cat "$i" | grep compiler.c.elf.libs.esp32 done - - name: Build Marauder for Flipper Zero Multi Board + - name: Build Marauder for StampS3 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" - - name: Rename Marauder Multi Board bin + - name: Rename Marauder StampS3 bin run: | - mv ./esp32_marauder/build/esp32.esp32.esp32s3/esp32_marauder.ino.bin ./esp32_marauder/build/esp32.esp32.esp32s3/esp32_marauder.multiboardS3.bin + mv ./esp32_marauder/build/esp32.esp32.esp32s3/esp32_marauder.ino.bin ./esp32_marauder/build/esp32.esp32.esp32s3/esp32_marauder.stampS3.bin - name: Display finished bins run: | find ./esp32_marauder/build -name "*.bin" - - name: 'Upload MultiboardS3 Artifact' + - name: 'Upload StampS3 Artifact' uses: actions/upload-artifact@v3 with: - name: esp32_marauder.multiboardS3.bin - path: ./esp32_marauder/build/esp32.esp32.esp32s3/esp32_marauder.multiboardS3.bin + name: esp32_marauder.stampS3.bin + path: ./esp32_marauder/build/esp32.esp32.esp32s3/esp32_marauder.stampS3.bin retention-days: 5 - name: Create Release @@ -179,14 +179,14 @@ jobs: prerelease: false if: github.event_name != 'pull_request' - - name: Upload MultiboardS3 Asset - id: upload-multiboardS3-release-asset + - name: Upload StampS3 Asset + id: upload-stampS3-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_path: ./esp32_marauder/build/esp32.esp32.esp32s3/esp32_marauder.stampS3.bin + asset_name: esp32_marauder.stampS3.bin asset_content_type: application/bin if: github.event_name != 'pull_request' \ No newline at end of file diff --git a/esp32_marauder/configs.h b/esp32_marauder/configs.h index 0c0d23c9c..6d275dab9 100644 --- a/esp32_marauder/configs.h +++ b/esp32_marauder/configs.h @@ -6,7 +6,7 @@ //Indicates that it must redirect the stream with the captured packets to serial (1) //If not defined, will write packages to SD card if supported - #define WRITE_PACKETS_SERIAL + //#define WRITE_PACKETS_SERIAL //// BOARD TARGETS #define MARAUDER_M5STAMP_S3 @@ -27,18 +27,18 @@ //// BOARD FEATURES #ifdef MARAUDER_M5STAMP_S3 - #define FLIPPER_ZERO_HAT + //#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_GPS - #ifndef WRITE_PACKETS_SERIAL - #define HAS_SD - #define USE_SD - #endif + // #define HAS_GPS + // #ifndef WRITE_PACKETS_SERIAL + // #define HAS_SD + // #define USE_SD + // #endif //#define HAS_TEMP_SENSOR #endif From 8423fcea0550ac66f01b24dca083addc03a7ba27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Belo?= Date: Fri, 17 Nov 2023 21:36:15 +0000 Subject: [PATCH 21/42] try with gps and sd --- esp32_marauder/configs.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/esp32_marauder/configs.h b/esp32_marauder/configs.h index 6d275dab9..e304e2b7a 100644 --- a/esp32_marauder/configs.h +++ b/esp32_marauder/configs.h @@ -34,11 +34,11 @@ //#define HAS_NEOPIXEL_LED //#define HAS_PWR_MGMT //#define HAS_SCREEN - // #define HAS_GPS - // #ifndef WRITE_PACKETS_SERIAL - // #define HAS_SD - // #define USE_SD - // #endif + #define HAS_GPS + #ifndef WRITE_PACKETS_SERIAL + #define HAS_SD + #define USE_SD + #endif //#define HAS_TEMP_SENSOR #endif From f5c88f59a50346332508ab3d25b6dca4507351b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Belo?= Date: Fri, 17 Nov 2023 21:41:44 +0000 Subject: [PATCH 22/42] adds sd pin --- esp32_marauder/configs.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/esp32_marauder/configs.h b/esp32_marauder/configs.h index e304e2b7a..946453988 100644 --- a/esp32_marauder/configs.h +++ b/esp32_marauder/configs.h @@ -687,6 +687,10 @@ #define SD_CS -1 #endif + #ifdef MARAUDER_M5STAMP_S3 + #define SD_CS 10 + #endif + #ifdef MARAUDER_FLIPPER #define SD_CS 10 #endif From 3d8441ddc2a34658a8e06605542786a219d53386 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Belo?= Date: Fri, 17 Nov 2023 21:50:38 +0000 Subject: [PATCH 23/42] try LED --- esp32_marauder/stampS3LED.cpp | 85 +++++++++++++++++++---------------- esp32_marauder/stampS3LED.h | 1 + 2 files changed, 48 insertions(+), 38 deletions(-) diff --git a/esp32_marauder/stampS3LED.cpp b/esp32_marauder/stampS3LED.cpp index 309ddebfd..b24efeb65 100644 --- a/esp32_marauder/stampS3LED.cpp +++ b/esp32_marauder/stampS3LED.cpp @@ -1,59 +1,68 @@ #include "stampS3LED.h" void stampS3LED::RunSetup() { - pinMode(B_PIN, OUTPUT); - pinMode(G_PIN, OUTPUT); - pinMode(R_PIN, OUTPUT); - - if (!settings_obj.loadSetting("EnableLED")) { - digitalWrite(B_PIN, HIGH); - digitalWrite(G_PIN, HIGH); - digitalWrite(R_PIN, HIGH); - return; - } - - delay(50); - - digitalWrite(B_PIN, LOW); + // pinMode(B_PIN, OUTPUT); + // pinMode(G_PIN, OUTPUT); + // pinMode(R_PIN, OUTPUT); + pinMode(LED_PIN, OUTPUT); + + digitalWrite(LED_PIN, LOW); delay(500); - digitalWrite(B_PIN, HIGH); - digitalWrite(G_PIN, LOW); + digitalWrite(LED_PIN, HIGH); delay(500); - digitalWrite(G_PIN, HIGH); - digitalWrite(R_PIN, LOW); + digitalWrite(LED_PIN, LOW); delay(500); - digitalWrite(R_PIN, HIGH); + digitalWrite(LED_PIN, HIGH); + + // if (!settings_obj.loadSetting("EnableLED")) { + // digitalWrite(B_PIN, HIGH); + // digitalWrite(G_PIN, HIGH); + // digitalWrite(R_PIN, HIGH); + // return; + // } + + // delay(50); + + // digitalWrite(B_PIN, LOW); + // delay(500); + // digitalWrite(B_PIN, HIGH); + // digitalWrite(G_PIN, LOW); + // delay(500); + // digitalWrite(G_PIN, HIGH); + // digitalWrite(R_PIN, LOW); + // delay(500); + // digitalWrite(R_PIN, HIGH); } void stampS3LED::attackLED() { - if (!settings_obj.loadSetting("EnableLED")) - return; + // if (!settings_obj.loadSetting("EnableLED")) + // return; - digitalWrite(B_PIN, HIGH); - digitalWrite(G_PIN, HIGH); - digitalWrite(R_PIN, HIGH); - delay(10); - digitalWrite(R_PIN, LOW); + // digitalWrite(B_PIN, HIGH); + // digitalWrite(G_PIN, HIGH); + // digitalWrite(R_PIN, HIGH); + // delay(10); + // digitalWrite(R_PIN, LOW); } void stampS3LED::sniffLED() { - if (!settings_obj.loadSetting("EnableLED")) - return; + // if (!settings_obj.loadSetting("EnableLED")) + // return; - digitalWrite(B_PIN, HIGH); - digitalWrite(G_PIN, HIGH); - digitalWrite(R_PIN, HIGH); - delay(10); - digitalWrite(B_PIN, LOW); + // digitalWrite(B_PIN, HIGH); + // digitalWrite(G_PIN, HIGH); + // digitalWrite(R_PIN, HIGH); + // delay(10); + // digitalWrite(B_PIN, LOW); } void stampS3LED::offLED() { - if (!settings_obj.loadSetting("EnableLED")) - return; + // if (!settings_obj.loadSetting("EnableLED")) + // return; - digitalWrite(B_PIN, HIGH); - digitalWrite(G_PIN, HIGH); - digitalWrite(R_PIN, HIGH); + // digitalWrite(B_PIN, HIGH); + // digitalWrite(G_PIN, HIGH); + // digitalWrite(R_PIN, HIGH); } void stampS3LED::main() { diff --git a/esp32_marauder/stampS3LED.h b/esp32_marauder/stampS3LED.h index caab34188..b16c8eb63 100644 --- a/esp32_marauder/stampS3LED.h +++ b/esp32_marauder/stampS3LED.h @@ -9,6 +9,7 @@ #define B_PIN 4 #define G_PIN 5 #define R_PIN 6 +#define LED_PIN 21 extern Settings settings_obj; From a09c86a58f51cbc0c684e0d57967c356df2d6d0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Belo?= Date: Fri, 17 Nov 2023 22:02:59 +0000 Subject: [PATCH 24/42] try led on main --- esp32_marauder/esp32_marauder.ino | 20 +++++++++++++++----- esp32_marauder/stampS3LED.cpp | 9 --------- esp32_marauder/stampS3LED.h | 2 +- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/esp32_marauder/esp32_marauder.ino b/esp32_marauder/esp32_marauder.ino index 4ffd929fc..5bb77a4e3 100644 --- a/esp32_marauder/esp32_marauder.ino +++ b/esp32_marauder/esp32_marauder.ino @@ -6,7 +6,7 @@ https://www.online-utility.org/image/convert/to/XBM */ #include "configs.h" - +#define LED_PIN 21 #ifndef HAS_SCREEN #define MenuFunctions_h #define Display_h @@ -169,6 +169,16 @@ void backlightOff() { void setup() { + pinMode(LED_PIN, OUTPUT); + + digitalWrite(LED_PIN, LOW); + delay(500); + digitalWrite(LED_PIN, HIGH); + delay(500); + digitalWrite(LED_PIN, LOW); + delay(500); + digitalWrite(LED_PIN, HIGH); + #ifdef MARAUDER_M5STICKC axp192_obj.begin(); #endif @@ -180,10 +190,10 @@ void setup() #endif backlightOff(); -#if BATTERY_ANALOG_ON == 1 - pinMode(BATTERY_PIN, OUTPUT); - pinMode(CHARGING_PIN, INPUT); -#endif + #if BATTERY_ANALOG_ON == 1 + pinMode(BATTERY_PIN, OUTPUT); + pinMode(CHARGING_PIN, INPUT); + #endif // Preset SPI CS pins to avoid bus conflicts #ifdef HAS_SCREEN diff --git a/esp32_marauder/stampS3LED.cpp b/esp32_marauder/stampS3LED.cpp index b24efeb65..b58f8ef1a 100644 --- a/esp32_marauder/stampS3LED.cpp +++ b/esp32_marauder/stampS3LED.cpp @@ -4,15 +4,6 @@ void stampS3LED::RunSetup() { // pinMode(B_PIN, OUTPUT); // pinMode(G_PIN, OUTPUT); // pinMode(R_PIN, OUTPUT); - pinMode(LED_PIN, OUTPUT); - - digitalWrite(LED_PIN, LOW); - delay(500); - digitalWrite(LED_PIN, HIGH); - delay(500); - digitalWrite(LED_PIN, LOW); - delay(500); - digitalWrite(LED_PIN, HIGH); // if (!settings_obj.loadSetting("EnableLED")) { // digitalWrite(B_PIN, HIGH); diff --git a/esp32_marauder/stampS3LED.h b/esp32_marauder/stampS3LED.h index b16c8eb63..0e0fb39e6 100644 --- a/esp32_marauder/stampS3LED.h +++ b/esp32_marauder/stampS3LED.h @@ -9,7 +9,7 @@ #define B_PIN 4 #define G_PIN 5 #define R_PIN 6 -#define LED_PIN 21 + extern Settings settings_obj; From b4da92ae2a9854981dbc1d9e06ee5996932afbc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Belo?= Date: Fri, 17 Nov 2023 22:21:12 +0000 Subject: [PATCH 25/42] try fastLED --- .github/workflows/build_push.yml | 7 +++++++ esp32_marauder/esp32_marauder.ino | 11 ----------- esp32_marauder/stampS3LED.cpp | 14 ++++++++++++++ esp32_marauder/stampS3LED.h | 9 ++++++--- 4 files changed, 27 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index ad518504f..f89ca53d5 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -120,6 +120,13 @@ jobs: ref: 8.1.0 path: CustomEspSoftwareSerial + - name: Install FastLED + uses: actions/checkout@v2 + with: + repository: FastLED/FastLED + ref: 3.6.0 + path: FastLED + - name: Configure TFT_eSPI run: | rm -f CustomTFT_eSPI/User_Setup_Select.h diff --git a/esp32_marauder/esp32_marauder.ino b/esp32_marauder/esp32_marauder.ino index 5bb77a4e3..44af5e34b 100644 --- a/esp32_marauder/esp32_marauder.ino +++ b/esp32_marauder/esp32_marauder.ino @@ -6,7 +6,6 @@ https://www.online-utility.org/image/convert/to/XBM */ #include "configs.h" -#define LED_PIN 21 #ifndef HAS_SCREEN #define MenuFunctions_h #define Display_h @@ -169,16 +168,6 @@ void backlightOff() { void setup() { - pinMode(LED_PIN, OUTPUT); - - digitalWrite(LED_PIN, LOW); - delay(500); - digitalWrite(LED_PIN, HIGH); - delay(500); - digitalWrite(LED_PIN, LOW); - delay(500); - digitalWrite(LED_PIN, HIGH); - #ifdef MARAUDER_M5STICKC axp192_obj.begin(); #endif diff --git a/esp32_marauder/stampS3LED.cpp b/esp32_marauder/stampS3LED.cpp index b58f8ef1a..7eb497319 100644 --- a/esp32_marauder/stampS3LED.cpp +++ b/esp32_marauder/stampS3LED.cpp @@ -1,6 +1,20 @@ #include "stampS3LED.h" +#include void stampS3LED::RunSetup() { + FastLED.addLeds(leds, NUM_LEDS); + + leds[0] = CHSV(0, 255, 255); + FastLED.show(); + delay(500); + + leds[0] = CHSV(0, 0, 255); + FastLED.show(); + delay(500); + + leds[0] = CHSV(255, 0, 255); + FastLED.show(); + // pinMode(B_PIN, OUTPUT); // pinMode(G_PIN, OUTPUT); // pinMode(R_PIN, OUTPUT); diff --git a/esp32_marauder/stampS3LED.h b/esp32_marauder/stampS3LED.h index 0e0fb39e6..d4264921e 100644 --- a/esp32_marauder/stampS3LED.h +++ b/esp32_marauder/stampS3LED.h @@ -6,10 +6,13 @@ #include -#define B_PIN 4 -#define G_PIN 5 -#define R_PIN 6 +// #define B_PIN 4 +// #define G_PIN 5 +// #define R_PIN 6 +#define STAMP_S3_LED_PIN 21 +#define NUM_LEDS 1 +CRGB leds[NUM_LEDS]; extern Settings settings_obj; From 018253b07894bcf45a08b22a9bcf4eb09c78b352 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Belo?= Date: Fri, 17 Nov 2023 22:25:31 +0000 Subject: [PATCH 26/42] commnet fastLED --- esp32_marauder/stampS3LED.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/esp32_marauder/stampS3LED.cpp b/esp32_marauder/stampS3LED.cpp index 7eb497319..0e26da3ea 100644 --- a/esp32_marauder/stampS3LED.cpp +++ b/esp32_marauder/stampS3LED.cpp @@ -1,19 +1,19 @@ #include "stampS3LED.h" -#include +// #include void stampS3LED::RunSetup() { - FastLED.addLeds(leds, NUM_LEDS); + // FastLED.addLeds(leds, NUM_LEDS); - leds[0] = CHSV(0, 255, 255); - FastLED.show(); - delay(500); + // leds[0] = CHSV(0, 255, 255); + // FastLED.show(); + // delay(500); - leds[0] = CHSV(0, 0, 255); - FastLED.show(); - delay(500); + // leds[0] = CHSV(0, 0, 255); + // FastLED.show(); + // delay(500); - leds[0] = CHSV(255, 0, 255); - FastLED.show(); + // leds[0] = CHSV(255, 0, 255); + // FastLED.show(); // pinMode(B_PIN, OUTPUT); // pinMode(G_PIN, OUTPUT); From 3a6d90fc97715643a35d19b48d833d95ca720119 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Belo?= Date: Fri, 17 Nov 2023 22:29:44 +0000 Subject: [PATCH 27/42] ffs duh --- esp32_marauder/stampS3LED.cpp | 25 +++++++++++++++---------- esp32_marauder/stampS3LED.h | 4 ---- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/esp32_marauder/stampS3LED.cpp b/esp32_marauder/stampS3LED.cpp index 0e26da3ea..c656594df 100644 --- a/esp32_marauder/stampS3LED.cpp +++ b/esp32_marauder/stampS3LED.cpp @@ -1,19 +1,24 @@ #include "stampS3LED.h" -// #include +#include + +#define STAMP_S3_LED_PIN 21 +#define NUM_LEDS 1 + +CRGB leds[NUM_LEDS]; void stampS3LED::RunSetup() { - // FastLED.addLeds(leds, NUM_LEDS); + FastLED.addLeds(leds, NUM_LEDS); - // leds[0] = CHSV(0, 255, 255); - // FastLED.show(); - // delay(500); + leds[0] = CHSV(0, 255, 255); + FastLED.show(); + delay(500); - // leds[0] = CHSV(0, 0, 255); - // FastLED.show(); - // delay(500); + leds[0] = CHSV(0, 0, 255); + FastLED.show(); + delay(500); - // leds[0] = CHSV(255, 0, 255); - // FastLED.show(); + leds[0] = CHSV(255, 0, 255); + FastLED.show(); // pinMode(B_PIN, OUTPUT); // pinMode(G_PIN, OUTPUT); diff --git a/esp32_marauder/stampS3LED.h b/esp32_marauder/stampS3LED.h index d4264921e..1505eda8f 100644 --- a/esp32_marauder/stampS3LED.h +++ b/esp32_marauder/stampS3LED.h @@ -9,10 +9,6 @@ // #define B_PIN 4 // #define G_PIN 5 // #define R_PIN 6 -#define STAMP_S3_LED_PIN 21 -#define NUM_LEDS 1 - -CRGB leds[NUM_LEDS]; extern Settings settings_obj; From 63d838bc11691714c5885401af97d2515b1a5cef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Belo?= Date: Fri, 17 Nov 2023 22:36:01 +0000 Subject: [PATCH 28/42] move defs to H --- esp32_marauder/stampS3LED.cpp | 6 ------ esp32_marauder/stampS3LED.h | 5 +++++ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/esp32_marauder/stampS3LED.cpp b/esp32_marauder/stampS3LED.cpp index c656594df..e1d30557f 100644 --- a/esp32_marauder/stampS3LED.cpp +++ b/esp32_marauder/stampS3LED.cpp @@ -1,10 +1,4 @@ #include "stampS3LED.h" -#include - -#define STAMP_S3_LED_PIN 21 -#define NUM_LEDS 1 - -CRGB leds[NUM_LEDS]; void stampS3LED::RunSetup() { FastLED.addLeds(leds, NUM_LEDS); diff --git a/esp32_marauder/stampS3LED.h b/esp32_marauder/stampS3LED.h index 1505eda8f..25f26840c 100644 --- a/esp32_marauder/stampS3LED.h +++ b/esp32_marauder/stampS3LED.h @@ -5,7 +5,12 @@ #include "settings.h" #include +#include +#define STAMP_S3_LED_PIN 21 +#define NUM_LEDS 1 + +CRGB leds[NUM_LEDS]; // #define B_PIN 4 // #define G_PIN 5 // #define R_PIN 6 From 3656349a6058e29a3c6062f4341e05ad37073e6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Belo?= Date: Fri, 17 Nov 2023 22:39:33 +0000 Subject: [PATCH 29/42] comment fastLED stuff --- esp32_marauder/stampS3LED.cpp | 20 +++++++++++--------- esp32_marauder/stampS3LED.h | 11 ++++------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/esp32_marauder/stampS3LED.cpp b/esp32_marauder/stampS3LED.cpp index e1d30557f..76b85a7d7 100644 --- a/esp32_marauder/stampS3LED.cpp +++ b/esp32_marauder/stampS3LED.cpp @@ -1,18 +1,20 @@ #include "stampS3LED.h" void stampS3LED::RunSetup() { - FastLED.addLeds(leds, NUM_LEDS); + // FastLED.addLeds(leds, NUM_LEDS); - leds[0] = CHSV(0, 255, 255); - FastLED.show(); - delay(500); + // leds[0] = CHSV(0, 255, 255); + // FastLED.show(); + // delay(500); + + // leds[0] = CHSV(0, 0, 255); + // FastLED.show(); + // delay(500); + + // leds[0] = CHSV(255, 0, 255); + // FastLED.show(); - leds[0] = CHSV(0, 0, 255); - FastLED.show(); - delay(500); - leds[0] = CHSV(255, 0, 255); - FastLED.show(); // pinMode(B_PIN, OUTPUT); // pinMode(G_PIN, OUTPUT); diff --git a/esp32_marauder/stampS3LED.h b/esp32_marauder/stampS3LED.h index 25f26840c..479947bf9 100644 --- a/esp32_marauder/stampS3LED.h +++ b/esp32_marauder/stampS3LED.h @@ -5,15 +5,12 @@ #include "settings.h" #include -#include +// #include -#define STAMP_S3_LED_PIN 21 -#define NUM_LEDS 1 +// #define STAMP_S3_LED_PIN 21 +// #define NUM_LEDS 1 -CRGB leds[NUM_LEDS]; -// #define B_PIN 4 -// #define G_PIN 5 -// #define R_PIN 6 +// CRGB leds[NUM_LEDS]; extern Settings settings_obj; From cdd2fa58f54c1334009a8e9a357a0d87cd775793 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Belo?= Date: Fri, 17 Nov 2023 22:45:22 +0000 Subject: [PATCH 30/42] enable fastled package import --- esp32_marauder/stampS3LED.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/esp32_marauder/stampS3LED.h b/esp32_marauder/stampS3LED.h index 479947bf9..d935b9042 100644 --- a/esp32_marauder/stampS3LED.h +++ b/esp32_marauder/stampS3LED.h @@ -5,10 +5,10 @@ #include "settings.h" #include -// #include +#include -// #define STAMP_S3_LED_PIN 21 -// #define NUM_LEDS 1 +#define STAMP_S3_LED_PIN 21 +#define NUM_LEDS 1 // CRGB leds[NUM_LEDS]; From 720de8d5aa9961923438eccea6c0b600871cef90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Belo?= Date: Fri, 17 Nov 2023 22:50:23 +0000 Subject: [PATCH 31/42] inly the import --- esp32_marauder/stampS3LED.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/esp32_marauder/stampS3LED.h b/esp32_marauder/stampS3LED.h index d935b9042..57191c696 100644 --- a/esp32_marauder/stampS3LED.h +++ b/esp32_marauder/stampS3LED.h @@ -7,8 +7,8 @@ #include #include -#define STAMP_S3_LED_PIN 21 -#define NUM_LEDS 1 +// #define STAMP_S3_LED_PIN 21 +// #define NUM_LEDS 1 // CRGB leds[NUM_LEDS]; From 36d1f201cde16f6072303352f9c456c9da168234 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Belo?= Date: Fri, 17 Nov 2023 23:01:45 +0000 Subject: [PATCH 32/42] move fast LED import to main --- esp32_marauder/esp32_marauder.ino | 1 + esp32_marauder/stampS3LED.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/esp32_marauder/esp32_marauder.ino b/esp32_marauder/esp32_marauder.ino index 44af5e34b..f257542a7 100644 --- a/esp32_marauder/esp32_marauder.ino +++ b/esp32_marauder/esp32_marauder.ino @@ -22,6 +22,7 @@ https://www.online-utility.org/image/convert/to/XBM #include "freertos/task.h" #include "esp_system.h" #include +#include #ifdef HAS_GPS #include "GpsInterface.h" diff --git a/esp32_marauder/stampS3LED.h b/esp32_marauder/stampS3LED.h index 57191c696..479947bf9 100644 --- a/esp32_marauder/stampS3LED.h +++ b/esp32_marauder/stampS3LED.h @@ -5,7 +5,7 @@ #include "settings.h" #include -#include +// #include // #define STAMP_S3_LED_PIN 21 // #define NUM_LEDS 1 From 17e0c70ddbb9f79a87b9fcf284937776e5189951 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Belo?= Date: Fri, 17 Nov 2023 23:05:24 +0000 Subject: [PATCH 33/42] removes fast led import --- esp32_marauder/esp32_marauder.ino | 1 - 1 file changed, 1 deletion(-) diff --git a/esp32_marauder/esp32_marauder.ino b/esp32_marauder/esp32_marauder.ino index f257542a7..44af5e34b 100644 --- a/esp32_marauder/esp32_marauder.ino +++ b/esp32_marauder/esp32_marauder.ino @@ -22,7 +22,6 @@ https://www.online-utility.org/image/convert/to/XBM #include "freertos/task.h" #include "esp_system.h" #include -#include #ifdef HAS_GPS #include "GpsInterface.h" From 0c72bcbb3e477f75fb64b612330539505e3da983 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Belo?= Date: Sat, 18 Nov 2023 00:01:07 +0000 Subject: [PATCH 34/42] adds WS2812FX --- .github/workflows/build_push.yml | 8 ++++---- esp32_marauder/stampS3LED.h | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index f89ca53d5..89fb8c033 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -120,12 +120,12 @@ jobs: ref: 8.1.0 path: CustomEspSoftwareSerial - - name: Install FastLED + - name: Install WS2812FX uses: actions/checkout@v2 with: - repository: FastLED/FastLED - ref: 3.6.0 - path: FastLED + repository: kitesurfer1404/WS2812FX + ref: v1.4.2 + path: WS2812FX - name: Configure TFT_eSPI run: | diff --git a/esp32_marauder/stampS3LED.h b/esp32_marauder/stampS3LED.h index 479947bf9..6de82a2cf 100644 --- a/esp32_marauder/stampS3LED.h +++ b/esp32_marauder/stampS3LED.h @@ -5,6 +5,7 @@ #include "settings.h" #include +#include // #include // #define STAMP_S3_LED_PIN 21 From 2e8ff9796756034ba4313708f2547086312692a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Belo?= Date: Sat, 18 Nov 2023 00:15:53 +0000 Subject: [PATCH 35/42] use neopixel instead --- .github/workflows/build_push.yml | 12 ++++++------ esp32_marauder/configs.h | 6 ++++-- esp32_marauder/stampS3LED.h | 1 - 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index 89fb8c033..643cc872a 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -120,12 +120,12 @@ jobs: ref: 8.1.0 path: CustomEspSoftwareSerial - - name: Install WS2812FX - uses: actions/checkout@v2 - with: - repository: kitesurfer1404/WS2812FX - ref: v1.4.2 - path: WS2812FX + # - name: Install FastLED + # uses: actions/checkout@v2 + # with: + # repository: FastLED/FastLED + # ref: 3.6.0 + # path: FastLED - name: Configure TFT_eSPI run: | diff --git a/esp32_marauder/configs.h b/esp32_marauder/configs.h index 946453988..447fd2531 100644 --- a/esp32_marauder/configs.h +++ b/esp32_marauder/configs.h @@ -31,7 +31,7 @@ //#define HAS_BATTERY //#define HAS_BT //#define HAS_BUTTONS - //#define HAS_NEOPIXEL_LED + #define HAS_NEOPIXEL_LED //#define HAS_PWR_MGMT //#define HAS_SCREEN #define HAS_GPS @@ -766,7 +766,9 @@ //// NEOPIXEL STUFF #ifdef HAS_NEOPIXEL_LED - #if defined(ESP32_LDDB) + #if defined(MARAUDER_M5STAMP_S3) + #define PIN 21 + #elif defined(ESP32_LDDB) #define PIN 17 #elif defined(MARAUDER_DEV_BOARD_PRO) #define PIN 16 diff --git a/esp32_marauder/stampS3LED.h b/esp32_marauder/stampS3LED.h index 6de82a2cf..479947bf9 100644 --- a/esp32_marauder/stampS3LED.h +++ b/esp32_marauder/stampS3LED.h @@ -5,7 +5,6 @@ #include "settings.h" #include -#include // #include // #define STAMP_S3_LED_PIN 21 From 3467468a7ce12fae6ccb388e2d49b3099455914e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Belo?= Date: Sat, 18 Nov 2023 00:21:40 +0000 Subject: [PATCH 36/42] adds neo pxl to wifi --- esp32_marauder/WiFiScan.cpp | 13 +++++++++++++ esp32_marauder/esp32_marauder.ino | 4 ++++ 2 files changed, 17 insertions(+) diff --git a/esp32_marauder/WiFiScan.cpp b/esp32_marauder/WiFiScan.cpp index c782ca01b..d719dbc28 100644 --- a/esp32_marauder/WiFiScan.cpp +++ b/esp32_marauder/WiFiScan.cpp @@ -554,6 +554,7 @@ void WiFiScan::startWiFiAttacks(uint8_t scan_mode, uint16_t color, String title_ this->wifi_initialized = true; #ifdef MARAUDER_M5STAMP_S3 stamps3_led.attackLED(); + led_obj.setMode(MODE_ATTACK); #elif defined(MARAUDER_FLIPPER) flipper_led.attackLED(); #elif defined(XIAO_ESP32_S3) @@ -581,6 +582,7 @@ bool WiFiScan::shutdownWiFi() { #ifdef MARAUDER_M5STAMP_S3 stamps3_led.offLED(); + led_obj.setMode(MODE_OFF); #elif defined(MARAUDER_FLIPPER) flipper_led.offLED(); #elif defined(XIAO_ESP32_S3) @@ -610,6 +612,7 @@ bool WiFiScan::shutdownBLE() { #ifdef MARAUDER_M5STAMP_S3 stamps3_led.offLED(); + led_obj.setMode(MODE_OFF); #elif defined(MARAUDER_FLIPPER) flipper_led.offLED(); #elif defined(XIAO_ESP32_S3) @@ -851,6 +854,7 @@ void WiFiScan::RunEvilPortal(uint8_t scan_mode, uint16_t color) #ifdef MARAUDER_M5STAMP_S3 stamps3_led.sniffLED(); + led_obj.setMode(MODE_SNIFF); #elif defined(MARAUDER_FLIPPER) flipper_led.sniffLED(); #elif defined(XIAO_ESP32_S3) @@ -902,6 +906,7 @@ void WiFiScan::RunAPScan(uint8_t scan_mode, uint16_t color) #ifdef MARAUDER_M5STAMP_S3 stamps3_led.sniffLED(); + led_obj.setMode(MODE_SNIFF); #elif defined(MARAUDER_FLIPPER) flipper_led.sniffLED(); #elif defined(XIAO_ESP32_S3) @@ -1189,6 +1194,7 @@ void WiFiScan::RunPacketMonitor(uint8_t scan_mode, uint16_t color) { #ifdef MARAUDER_M5STAMP_S3 stamps3_led.sniffLED(); + led_obj.setMode(MODE_SNIFF); #elif defined(MARAUDER_FLIPPER) flipper_led.sniffLED(); #elif defined(XIAO_ESP32_S3) @@ -1276,6 +1282,7 @@ void WiFiScan::RunEapolScan(uint8_t scan_mode, uint16_t color) { #ifdef MARAUDER_M5STAMP_S3 stamps3_led.sniffLED(); + led_obj.setMode(MODE_SNIFF); #elif defined(MARAUDER_FLIPPER) flipper_led.sniffLED(); #elif defined(XIAO_ESP32_S3) @@ -1435,6 +1442,7 @@ void WiFiScan::RunPwnScan(uint8_t scan_mode, uint16_t color) #ifdef MARAUDER_M5STAMP_S3 stamps3_led.sniffLED(); + led_obj.setMode(MODE_SNIFF); #elif defined(MARAUDER_FLIPPER) flipper_led.sniffLED(); #elif defined(XIAO_ESP32_S3) @@ -1628,6 +1636,7 @@ void WiFiScan::RunBeaconScan(uint8_t scan_mode, uint16_t color) #ifdef MARAUDER_M5STAMP_S3 stamps3_led.sniffLED(); + led_obj.setMode(MODE_SNIFF); #elif defined(MARAUDER_FLIPPER) flipper_led.sniffLED(); #elif defined(XIAO_ESP32_S3) @@ -1695,6 +1704,7 @@ void WiFiScan::RunStationScan(uint8_t scan_mode, uint16_t color) #ifdef MARAUDER_M5STAMP_S3 stamps3_led.sniffLED(); + led_obj.setMode(MODE_SNIFF); #elif defined(MARAUDER_FLIPPER) flipper_led.sniffLED(); #elif defined(XIAO_ESP32_S3) @@ -1747,6 +1757,7 @@ void WiFiScan::RunRawScan(uint8_t scan_mode, uint16_t color) #ifdef MARAUDER_M5STAMP_S3 stamps3_led.sniffLED(); + led_obj.setMode(MODE_SNIFF); #elif defined(MARAUDER_FLIPPER) flipper_led.sniffLED(); #elif defined(XIAO_ESP32_S3) @@ -1801,6 +1812,7 @@ void WiFiScan::RunDeauthScan(uint8_t scan_mode, uint16_t color) #ifdef MARAUDER_M5STAMP_S3 stamps3_led.sniffLED(); + led_obj.setMode(MODE_SNIFF); #elif defined(MARAUDER_FLIPPER) flipper_led.sniffLED(); #elif defined(XIAO_ESP32_S3) @@ -1864,6 +1876,7 @@ void WiFiScan::RunProbeScan(uint8_t scan_mode, uint16_t color) #ifdef MARAUDER_M5STAMP_S3 stamps3_led.sniffLED(); + led_obj.setMode(MODE_SNIFF); #elif defined(MARAUDER_FLIPPER) flipper_led.sniffLED(); #elif defined(XIAO_ESP32_S3) diff --git a/esp32_marauder/esp32_marauder.ino b/esp32_marauder/esp32_marauder.ino index 44af5e34b..22b755e13 100644 --- a/esp32_marauder/esp32_marauder.ino +++ b/esp32_marauder/esp32_marauder.ino @@ -36,6 +36,7 @@ https://www.online-utility.org/image/convert/to/XBM #ifdef MARAUDER_M5STAMP_S3 #include "stampS3LED.h" + #include "LedInterface.h" #elif defined(MARAUDER_FLIPPER) #include "flipperLED.h" #elif defined(XIAO_ESP32_S3) @@ -122,6 +123,7 @@ CommandLine cli_obj; #ifdef MARAUDER_M5STAMP_S3 stampS3LED stamps3_led; + LedInterface led_obj; #elif defined(MARAUDER_FLIPPER) flipperLED flipper_led; #elif defined(XIAO_ESP32_S3) @@ -344,6 +346,7 @@ void setup() // Do some LED stuff #ifdef MARAUDER_M5STAMP_S3 stamps3_led.RunSetup(); + led_obj.RunSetup(); #elif defined(MARAUDER_FLIPPER) flipper_led.RunSetup(); #elif defined(XIAO_ESP32_S3) @@ -444,6 +447,7 @@ void loop() } #ifdef MARAUDER_M5STAMP_S3 stamps3_led.main(); + led_obj.main(currentTime); #elif defined(MARAUDER_FLIPPER) flipper_led.main(); #elif defined(XIAO_ESP32_S3) From 74111df2e40d85bf08939ae4321ba54dbaf2bee7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Belo?= Date: Sat, 18 Nov 2023 00:46:05 +0000 Subject: [PATCH 37/42] moves back --- .github/workflows/build_push.yml | 7 ------- esp32_marauder/WiFiScan.cpp | 13 ------------- esp32_marauder/configs.h | 3 ++- esp32_marauder/esp32_marauder.ino | 4 ---- 4 files changed, 2 insertions(+), 25 deletions(-) diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index 643cc872a..ad518504f 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -120,13 +120,6 @@ jobs: ref: 8.1.0 path: CustomEspSoftwareSerial - # - name: Install FastLED - # uses: actions/checkout@v2 - # with: - # repository: FastLED/FastLED - # ref: 3.6.0 - # path: FastLED - - name: Configure TFT_eSPI run: | rm -f CustomTFT_eSPI/User_Setup_Select.h diff --git a/esp32_marauder/WiFiScan.cpp b/esp32_marauder/WiFiScan.cpp index d719dbc28..c782ca01b 100644 --- a/esp32_marauder/WiFiScan.cpp +++ b/esp32_marauder/WiFiScan.cpp @@ -554,7 +554,6 @@ void WiFiScan::startWiFiAttacks(uint8_t scan_mode, uint16_t color, String title_ this->wifi_initialized = true; #ifdef MARAUDER_M5STAMP_S3 stamps3_led.attackLED(); - led_obj.setMode(MODE_ATTACK); #elif defined(MARAUDER_FLIPPER) flipper_led.attackLED(); #elif defined(XIAO_ESP32_S3) @@ -582,7 +581,6 @@ bool WiFiScan::shutdownWiFi() { #ifdef MARAUDER_M5STAMP_S3 stamps3_led.offLED(); - led_obj.setMode(MODE_OFF); #elif defined(MARAUDER_FLIPPER) flipper_led.offLED(); #elif defined(XIAO_ESP32_S3) @@ -612,7 +610,6 @@ bool WiFiScan::shutdownBLE() { #ifdef MARAUDER_M5STAMP_S3 stamps3_led.offLED(); - led_obj.setMode(MODE_OFF); #elif defined(MARAUDER_FLIPPER) flipper_led.offLED(); #elif defined(XIAO_ESP32_S3) @@ -854,7 +851,6 @@ void WiFiScan::RunEvilPortal(uint8_t scan_mode, uint16_t color) #ifdef MARAUDER_M5STAMP_S3 stamps3_led.sniffLED(); - led_obj.setMode(MODE_SNIFF); #elif defined(MARAUDER_FLIPPER) flipper_led.sniffLED(); #elif defined(XIAO_ESP32_S3) @@ -906,7 +902,6 @@ void WiFiScan::RunAPScan(uint8_t scan_mode, uint16_t color) #ifdef MARAUDER_M5STAMP_S3 stamps3_led.sniffLED(); - led_obj.setMode(MODE_SNIFF); #elif defined(MARAUDER_FLIPPER) flipper_led.sniffLED(); #elif defined(XIAO_ESP32_S3) @@ -1194,7 +1189,6 @@ void WiFiScan::RunPacketMonitor(uint8_t scan_mode, uint16_t color) { #ifdef MARAUDER_M5STAMP_S3 stamps3_led.sniffLED(); - led_obj.setMode(MODE_SNIFF); #elif defined(MARAUDER_FLIPPER) flipper_led.sniffLED(); #elif defined(XIAO_ESP32_S3) @@ -1282,7 +1276,6 @@ void WiFiScan::RunEapolScan(uint8_t scan_mode, uint16_t color) { #ifdef MARAUDER_M5STAMP_S3 stamps3_led.sniffLED(); - led_obj.setMode(MODE_SNIFF); #elif defined(MARAUDER_FLIPPER) flipper_led.sniffLED(); #elif defined(XIAO_ESP32_S3) @@ -1442,7 +1435,6 @@ void WiFiScan::RunPwnScan(uint8_t scan_mode, uint16_t color) #ifdef MARAUDER_M5STAMP_S3 stamps3_led.sniffLED(); - led_obj.setMode(MODE_SNIFF); #elif defined(MARAUDER_FLIPPER) flipper_led.sniffLED(); #elif defined(XIAO_ESP32_S3) @@ -1636,7 +1628,6 @@ void WiFiScan::RunBeaconScan(uint8_t scan_mode, uint16_t color) #ifdef MARAUDER_M5STAMP_S3 stamps3_led.sniffLED(); - led_obj.setMode(MODE_SNIFF); #elif defined(MARAUDER_FLIPPER) flipper_led.sniffLED(); #elif defined(XIAO_ESP32_S3) @@ -1704,7 +1695,6 @@ void WiFiScan::RunStationScan(uint8_t scan_mode, uint16_t color) #ifdef MARAUDER_M5STAMP_S3 stamps3_led.sniffLED(); - led_obj.setMode(MODE_SNIFF); #elif defined(MARAUDER_FLIPPER) flipper_led.sniffLED(); #elif defined(XIAO_ESP32_S3) @@ -1757,7 +1747,6 @@ void WiFiScan::RunRawScan(uint8_t scan_mode, uint16_t color) #ifdef MARAUDER_M5STAMP_S3 stamps3_led.sniffLED(); - led_obj.setMode(MODE_SNIFF); #elif defined(MARAUDER_FLIPPER) flipper_led.sniffLED(); #elif defined(XIAO_ESP32_S3) @@ -1812,7 +1801,6 @@ void WiFiScan::RunDeauthScan(uint8_t scan_mode, uint16_t color) #ifdef MARAUDER_M5STAMP_S3 stamps3_led.sniffLED(); - led_obj.setMode(MODE_SNIFF); #elif defined(MARAUDER_FLIPPER) flipper_led.sniffLED(); #elif defined(XIAO_ESP32_S3) @@ -1876,7 +1864,6 @@ void WiFiScan::RunProbeScan(uint8_t scan_mode, uint16_t color) #ifdef MARAUDER_M5STAMP_S3 stamps3_led.sniffLED(); - led_obj.setMode(MODE_SNIFF); #elif defined(MARAUDER_FLIPPER) flipper_led.sniffLED(); #elif defined(XIAO_ESP32_S3) diff --git a/esp32_marauder/configs.h b/esp32_marauder/configs.h index 447fd2531..a079e26b0 100644 --- a/esp32_marauder/configs.h +++ b/esp32_marauder/configs.h @@ -31,7 +31,8 @@ //#define HAS_BATTERY //#define HAS_BT //#define HAS_BUTTONS - #define HAS_NEOPIXEL_LED + //#define HAS_NEOPIXEL_LED + #define PIN 21 //#define HAS_PWR_MGMT //#define HAS_SCREEN #define HAS_GPS diff --git a/esp32_marauder/esp32_marauder.ino b/esp32_marauder/esp32_marauder.ino index 22b755e13..44af5e34b 100644 --- a/esp32_marauder/esp32_marauder.ino +++ b/esp32_marauder/esp32_marauder.ino @@ -36,7 +36,6 @@ https://www.online-utility.org/image/convert/to/XBM #ifdef MARAUDER_M5STAMP_S3 #include "stampS3LED.h" - #include "LedInterface.h" #elif defined(MARAUDER_FLIPPER) #include "flipperLED.h" #elif defined(XIAO_ESP32_S3) @@ -123,7 +122,6 @@ CommandLine cli_obj; #ifdef MARAUDER_M5STAMP_S3 stampS3LED stamps3_led; - LedInterface led_obj; #elif defined(MARAUDER_FLIPPER) flipperLED flipper_led; #elif defined(XIAO_ESP32_S3) @@ -346,7 +344,6 @@ void setup() // Do some LED stuff #ifdef MARAUDER_M5STAMP_S3 stamps3_led.RunSetup(); - led_obj.RunSetup(); #elif defined(MARAUDER_FLIPPER) flipper_led.RunSetup(); #elif defined(XIAO_ESP32_S3) @@ -447,7 +444,6 @@ void loop() } #ifdef MARAUDER_M5STAMP_S3 stamps3_led.main(); - led_obj.main(currentTime); #elif defined(MARAUDER_FLIPPER) flipper_led.main(); #elif defined(XIAO_ESP32_S3) From eab7d16751c5454966f7aaff1db64175ad40b257 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Belo?= Date: Sat, 18 Nov 2023 01:27:57 +0000 Subject: [PATCH 38/42] use neopxl --- esp32_marauder/WiFiScan.cpp | 54 ++++++++++--------------------------- esp32_marauder/WiFiScan.h | 10 +++---- esp32_marauder/configs.h | 3 +-- 3 files changed, 18 insertions(+), 49 deletions(-) diff --git a/esp32_marauder/WiFiScan.cpp b/esp32_marauder/WiFiScan.cpp index c782ca01b..5439cf185 100644 --- a/esp32_marauder/WiFiScan.cpp +++ b/esp32_marauder/WiFiScan.cpp @@ -552,9 +552,7 @@ void WiFiScan::startWiFiAttacks(uint8_t scan_mode, uint16_t color, String title_ esp_wifi_set_promiscuous(true); esp_wifi_set_max_tx_power(82); this->wifi_initialized = true; - #ifdef MARAUDER_M5STAMP_S3 - stamps3_led.attackLED(); - #elif defined(MARAUDER_FLIPPER) + #ifdef MARAUDER_FLIPPER flipper_led.attackLED(); #elif defined(XIAO_ESP32_S3) xiao_led.attackLED(); @@ -579,9 +577,7 @@ bool WiFiScan::shutdownWiFi() { esp_wifi_restore(); esp_wifi_deinit(); - #ifdef MARAUDER_M5STAMP_S3 - stamps3_led.offLED(); - #elif defined(MARAUDER_FLIPPER) + #ifdef MARAUDER_FLIPPER flipper_led.offLED(); #elif defined(XIAO_ESP32_S3) xiao_led.offLED(); @@ -608,9 +604,7 @@ bool WiFiScan::shutdownBLE() { pBLEScan->clearResults(); NimBLEDevice::deinit(); - #ifdef MARAUDER_M5STAMP_S3 - stamps3_led.offLED(); - #elif defined(MARAUDER_FLIPPER) + #ifdef MARAUDER_FLIPPER flipper_led.offLED(); #elif defined(XIAO_ESP32_S3) xiao_led.offLED(); @@ -849,9 +843,7 @@ void WiFiScan::RunEvilPortal(uint8_t scan_mode, uint16_t color) return; #endif - #ifdef MARAUDER_M5STAMP_S3 - stamps3_led.sniffLED(); - #elif defined(MARAUDER_FLIPPER) + #ifdef MARAUDER_FLIPPER flipper_led.sniffLED(); #elif defined(XIAO_ESP32_S3) xiao_led.sniffLED(); @@ -900,9 +892,7 @@ void WiFiScan::RunAPScan(uint8_t scan_mode, uint16_t color) return; #endif - #ifdef MARAUDER_M5STAMP_S3 - stamps3_led.sniffLED(); - #elif defined(MARAUDER_FLIPPER) + #ifdef MARAUDER_FLIPPER flipper_led.sniffLED(); #elif defined(XIAO_ESP32_S3) xiao_led.sniffLED(); @@ -1187,9 +1177,7 @@ void WiFiScan::RunInfo() void WiFiScan::RunPacketMonitor(uint8_t scan_mode, uint16_t color) { - #ifdef MARAUDER_M5STAMP_S3 - stamps3_led.sniffLED(); - #elif defined(MARAUDER_FLIPPER) + #ifdef MARAUDER_FLIPPER flipper_led.sniffLED(); #elif defined(XIAO_ESP32_S3) xiao_led.sniffLED(); @@ -1274,9 +1262,7 @@ void WiFiScan::RunPacketMonitor(uint8_t scan_mode, uint16_t color) void WiFiScan::RunEapolScan(uint8_t scan_mode, uint16_t color) { - #ifdef MARAUDER_M5STAMP_S3 - stamps3_led.sniffLED(); - #elif defined(MARAUDER_FLIPPER) + #ifdef MARAUDER_FLIPPER flipper_led.sniffLED(); #elif defined(XIAO_ESP32_S3) xiao_led.sniffLED(); @@ -1433,9 +1419,7 @@ void WiFiScan::RunPwnScan(uint8_t scan_mode, uint16_t color) return; #endif - #ifdef MARAUDER_M5STAMP_S3 - stamps3_led.sniffLED(); - #elif defined(MARAUDER_FLIPPER) + #ifdef MARAUDER_FLIPPER flipper_led.sniffLED(); #elif defined(XIAO_ESP32_S3) xiao_led.sniffLED(); @@ -1626,9 +1610,7 @@ void WiFiScan::RunBeaconScan(uint8_t scan_mode, uint16_t color) return; #endif - #ifdef MARAUDER_M5STAMP_S3 - stamps3_led.sniffLED(); - #elif defined(MARAUDER_FLIPPER) + #ifdef MARAUDER_FLIPPER flipper_led.sniffLED(); #elif defined(XIAO_ESP32_S3) xiao_led.sniffLED(); @@ -1693,9 +1675,7 @@ void WiFiScan::RunStationScan(uint8_t scan_mode, uint16_t color) return; #endif - #ifdef MARAUDER_M5STAMP_S3 - stamps3_led.sniffLED(); - #elif defined(MARAUDER_FLIPPER) + #ifdef MARAUDER_FLIPPER flipper_led.sniffLED(); #elif defined(XIAO_ESP32_S3) xiao_led.sniffLED(); @@ -1745,9 +1725,7 @@ void WiFiScan::RunRawScan(uint8_t scan_mode, uint16_t color) return; #endif - #ifdef MARAUDER_M5STAMP_S3 - stamps3_led.sniffLED(); - #elif defined(MARAUDER_FLIPPER) + #ifdef MARAUDER_FLIPPER flipper_led.sniffLED(); #elif defined(XIAO_ESP32_S3) xiao_led.sniffLED(); @@ -1799,9 +1777,7 @@ void WiFiScan::RunDeauthScan(uint8_t scan_mode, uint16_t color) return; #endif - #ifdef MARAUDER_M5STAMP_S3 - stamps3_led.sniffLED(); - #elif defined(MARAUDER_FLIPPER) + #ifdef MARAUDER_FLIPPER flipper_led.sniffLED(); #elif defined(XIAO_ESP32_S3) xiao_led.sniffLED(); @@ -1862,9 +1838,7 @@ void WiFiScan::RunProbeScan(uint8_t scan_mode, uint16_t color) return; #endif - #ifdef MARAUDER_M5STAMP_S3 - stamps3_led.sniffLED(); - #elif defined(MARAUDER_FLIPPER) + #ifdef MARAUDER_FLIPPER flipper_led.sniffLED(); #elif defined(XIAO_ESP32_S3) xiao_led.sniffLED(); @@ -4588,4 +4562,4 @@ void WiFiScan::main(uint32_t currentTime) packets_sent = 0; } } -} +} \ No newline at end of file diff --git a/esp32_marauder/WiFiScan.h b/esp32_marauder/WiFiScan.h index cc27eb863..ac1aa9247 100644 --- a/esp32_marauder/WiFiScan.h +++ b/esp32_marauder/WiFiScan.h @@ -32,9 +32,7 @@ #endif #include "settings.h" #include "Assets.h" -#ifdef MARAUDER_M5STAMP_S3 - #include "stampS3LED.h" -#elif defined(MARAUDER_FLIPPER) +#ifdef MARAUDER_FLIPPER #include "flipperLED.h" #elif defined(XIAO_ESP32_S3) #include "xiaoLED.h" @@ -109,9 +107,7 @@ extern Buffer buffer_obj; extern BatteryInterface battery_obj; #endif extern Settings settings_obj; -#ifdef MARAUDER_M5STAMP_S3 - extern stampS3LED stamps3_led; -#elif defined(MARAUDER_FLIPPER) +#ifdef MARAUDER_FLIPPER extern flipperLED flipper_led; #elif defined(XIAO_ESP32_S3) extern xiaoLED xiao_led; @@ -377,4 +373,4 @@ class WiFiScan static void wifiSnifferCallback(void* buf, wifi_promiscuous_pkt_type_t type); static void addPacket(wifi_promiscuous_pkt_t *snifferPacket, int len); }; -#endif +#endif \ No newline at end of file diff --git a/esp32_marauder/configs.h b/esp32_marauder/configs.h index a079e26b0..447fd2531 100644 --- a/esp32_marauder/configs.h +++ b/esp32_marauder/configs.h @@ -31,8 +31,7 @@ //#define HAS_BATTERY //#define HAS_BT //#define HAS_BUTTONS - //#define HAS_NEOPIXEL_LED - #define PIN 21 + #define HAS_NEOPIXEL_LED //#define HAS_PWR_MGMT //#define HAS_SCREEN #define HAS_GPS From b1b00cf4d8c7e5db7f3ac8b446297025bdd9945e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Belo?= Date: Sat, 18 Nov 2023 01:37:24 +0000 Subject: [PATCH 39/42] fix imiport --- esp32_marauder/esp32_marauder.ino | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/esp32_marauder/esp32_marauder.ino b/esp32_marauder/esp32_marauder.ino index 44af5e34b..77be190cb 100644 --- a/esp32_marauder/esp32_marauder.ino +++ b/esp32_marauder/esp32_marauder.ino @@ -34,9 +34,7 @@ https://www.online-utility.org/image/convert/to/XBM #endif #include "Buffer.h" -#ifdef MARAUDER_M5STAMP_S3 - #include "stampS3LED.h" -#elif defined(MARAUDER_FLIPPER) +#ifdef MARAUDER_FLIPPER #include "flipperLED.h" #elif defined(XIAO_ESP32_S3) #include "xiaoLED.h" From 5f1eadc9ed6fa9caf83a005f25c18ad6ba6c2685 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Belo?= Date: Sat, 18 Nov 2023 01:42:51 +0000 Subject: [PATCH 40/42] fix main exceptions --- esp32_marauder/esp32_marauder.ino | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/esp32_marauder/esp32_marauder.ino b/esp32_marauder/esp32_marauder.ino index 77be190cb..ec9dea78a 100644 --- a/esp32_marauder/esp32_marauder.ino +++ b/esp32_marauder/esp32_marauder.ino @@ -118,9 +118,7 @@ CommandLine cli_obj; AXP192 axp192_obj; #endif -#ifdef MARAUDER_M5STAMP_S3 - stampS3LED stamps3_led; -#elif defined(MARAUDER_FLIPPER) +#ifdef MARAUDER_FLIPPER flipperLED flipper_led; #elif defined(XIAO_ESP32_S3) xiaoLED xiao_led; @@ -340,9 +338,7 @@ void setup() #endif // Do some LED stuff - #ifdef MARAUDER_M5STAMP_S3 - stamps3_led.RunSetup(); - #elif defined(MARAUDER_FLIPPER) + #ifdef MARAUDER_FLIPPER flipper_led.RunSetup(); #elif defined(XIAO_ESP32_S3) xiao_led.RunSetup(); @@ -440,9 +436,7 @@ void loop() #endif //cli_obj.main(currentTime); } - #ifdef MARAUDER_M5STAMP_S3 - stamps3_led.main(); - #elif defined(MARAUDER_FLIPPER) + #ifdef MARAUDER_FLIPPER flipper_led.main(); #elif defined(XIAO_ESP32_S3) xiao_led.main(); From 526b86de4d7c39e8e02551544c8d6e8fe256a97e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Belo?= Date: Sat, 18 Nov 2023 01:57:41 +0000 Subject: [PATCH 41/42] cleanup --- .github/workflows/build_push.yml | 544 ++++++++++++++++++++++++++++++- esp32_marauder/configs.h | 4 +- 2 files changed, 544 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index ad518504f..4aa52b0a3 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -3,9 +3,10 @@ name: Build and Push on: workflow_dispatch: pull_request: - types: [opened, reopened, synchronize] + types: [opened, reopened] jobs: + # This workflow contains a single job called "build" build: name: Build Marauder Binaries @@ -57,6 +58,13 @@ jobs: ref: master path: CustomESPAsyncWebServer + #- name: Install TFT_eSPI + # uses: actions/checkout@v2 + # with: + # repository: justcallmekoko/TFT_eSPI + # ref: master + # path: CustomTFT_eSPI + - name: Install TFT_eSPI uses: actions/checkout@v2 with: @@ -120,6 +128,10 @@ jobs: ref: 8.1.0 path: CustomEspSoftwareSerial + #- 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 @@ -131,6 +143,30 @@ jobs: 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: | echo "Chicken" @@ -145,6 +181,77 @@ jobs: 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_M5STAMP_S3/ \/\/#define MARAUDER_M5STAMP_S3/' 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 + + - 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" + + - 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: Configure SD Serial for Flipper Zero SD Serial + run: | + pwd + sed -i 's/^ \/\/#define WRITE_PACKETS_SERIAL/ #define WRITE_PACKETS_SERIAL/' esp32_marauder/configs.h + + - name: Build Marauder SD Serial 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" + + - name: Rename Marauder Flipper SD Serial bin + run: | + mv ./esp32_marauder/build/esp32.esp32.esp32s2/esp32_marauder.ino.bin ./esp32_marauder/build/esp32.esp32.esp32s2/esp32_marauder.flipper_sd_serial.bin + + - name: Remove SD Serial + run: | + pwd + sed -i 's/^ #define WRITE_PACKETS_SERIAL/ \/\/#define WRITE_PACKETS_SERIAL/' esp32_marauder/configs.h + + - 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" + + - 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 configs.h for M5 Stamp S3 Dev Board + run: | + 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_M5STAMP_S3/ #define MARAUDER_M5STAMP_S3/' esp32_marauder/configs.h + - name: Build Marauder for StampS3 Board uses: ArminJo/arduino-test-compile@v3.2.1 with: @@ -156,11 +263,312 @@ jobs: run: | mv ./esp32_marauder/build/esp32.esp32.esp32s3/esp32_marauder.ino.bin ./esp32_marauder/build/esp32.esp32.esp32s3/esp32_marauder.stampS3.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/^ #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_M5STAMP_S3/ \/\/#define MARAUDER_M5STAMP_S3/' 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" + + - 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/^ #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_M5STAMP_S3/ \/\/#define MARAUDER_M5STAMP_S3/' 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" + + - 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_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_M5STAMP_S3/ \/\/#define MARAUDER_M5STAMP_S3/' 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" + + - 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/^ #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_M5STAMP_S3/ \/\/#define MARAUDER_M5STAMP_S3/' 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" + + - 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/^ \/\/#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_M5STAMP_S3/ \/\/#define MARAUDER_M5STAMP_S3/' 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" + + - 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_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_M5STAMP_S3/ \/\/#define MARAUDER_M5STAMP_S3/' 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" + + - 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_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_M5STAMP_S3/ \/\/#define MARAUDER_M5STAMP_S3/' 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" + + - 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_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_M5STICKC/ #define MARAUDER_M5STICKC/' esp32_marauder/configs.h + sed -i 's/^ #define MARAUDER_M5STAMP_S3/ \/\/#define MARAUDER_M5STAMP_S3/' 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" + + - 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: Display finished bins run: | find ./esp32_marauder/build -name "*.bin" - - name: 'Upload StampS3 Artifact' + - name: 'Upload Flipper Artifact' + uses: actions/upload-artifact@v3 + with: + name: esp32_marauder.flipper.bin + path: ./esp32_marauder/build/esp32.esp32.esp32s2/esp32_marauder.flipper.bin + retention-days: 5 + + - name: 'Upload Flipper SD Serial Artifact' + uses: actions/upload-artifact@v3 + with: + name: esp32_marauder.flipper_sd_serial.bin + path: ./esp32_marauder/build/esp32.esp32.esp32s2/esp32_marauder.flipper_sd_serial.bin + retention-days: 5 + + - name: 'Upload MultiboardS3 Artifact' + uses: actions/upload-artifact@v3 + 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@v3 + 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@v3 + 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@v3 + 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@v3 + 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@v3 + 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@v3 + with: + name: esp32_marauder.mini.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@v3 + 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@v3 + 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 StampS3 Artifact' uses: actions/upload-artifact@v3 with: name: esp32_marauder.stampS3.bin @@ -178,6 +586,138 @@ jobs: 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 Flipper SD Serial Asset + id: upload-flipper-sd-serial-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_sd_serial.bin + asset_name: esp32_marauder.flipper_sd_serial.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 StampS3 Asset id: upload-stampS3-release-asset diff --git a/esp32_marauder/configs.h b/esp32_marauder/configs.h index 447fd2531..09e6a28f1 100644 --- a/esp32_marauder/configs.h +++ b/esp32_marauder/configs.h @@ -9,11 +9,11 @@ //#define WRITE_PACKETS_SERIAL //// BOARD TARGETS - #define MARAUDER_M5STAMP_S3 + //#define MARAUDER_M5STAMP_S3 //#define MARAUDER_M5STICKC //#define MARAUDER_MINI //#define MARAUDER_V4 - //#define MARAUDER_V6 + #define MARAUDER_V6 //#define MARAUDER_V6_1 //#define MARAUDER_KIT //#define GENERIC_ESP32 From e25064142dfe42060556b63c36d077621d47aebc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Belo?= Date: Sat, 18 Nov 2023 02:01:49 +0000 Subject: [PATCH 42/42] clean up --- esp32_marauder/esp32_marauder.ino | 1 + esp32_marauder/stampS3LED.cpp | 76 ------------------------------- esp32_marauder/stampS3LED.h | 27 ----------- 3 files changed, 1 insertion(+), 103 deletions(-) delete mode 100644 esp32_marauder/stampS3LED.cpp delete mode 100644 esp32_marauder/stampS3LED.h diff --git a/esp32_marauder/esp32_marauder.ino b/esp32_marauder/esp32_marauder.ino index ec9dea78a..3ba7becf3 100644 --- a/esp32_marauder/esp32_marauder.ino +++ b/esp32_marauder/esp32_marauder.ino @@ -6,6 +6,7 @@ https://www.online-utility.org/image/convert/to/XBM */ #include "configs.h" + #ifndef HAS_SCREEN #define MenuFunctions_h #define Display_h diff --git a/esp32_marauder/stampS3LED.cpp b/esp32_marauder/stampS3LED.cpp deleted file mode 100644 index 76b85a7d7..000000000 --- a/esp32_marauder/stampS3LED.cpp +++ /dev/null @@ -1,76 +0,0 @@ -#include "stampS3LED.h" - -void stampS3LED::RunSetup() { - // FastLED.addLeds(leds, NUM_LEDS); - - // leds[0] = CHSV(0, 255, 255); - // FastLED.show(); - // delay(500); - - // leds[0] = CHSV(0, 0, 255); - // FastLED.show(); - // delay(500); - - // leds[0] = CHSV(255, 0, 255); - // FastLED.show(); - - - - // pinMode(B_PIN, OUTPUT); - // pinMode(G_PIN, OUTPUT); - // pinMode(R_PIN, OUTPUT); - - // if (!settings_obj.loadSetting("EnableLED")) { - // digitalWrite(B_PIN, HIGH); - // digitalWrite(G_PIN, HIGH); - // digitalWrite(R_PIN, HIGH); - // return; - // } - - // delay(50); - - // digitalWrite(B_PIN, LOW); - // delay(500); - // digitalWrite(B_PIN, HIGH); - // digitalWrite(G_PIN, LOW); - // delay(500); - // digitalWrite(G_PIN, HIGH); - // digitalWrite(R_PIN, LOW); - // delay(500); - // digitalWrite(R_PIN, HIGH); -} - -void stampS3LED::attackLED() { - // if (!settings_obj.loadSetting("EnableLED")) - // return; - - // digitalWrite(B_PIN, HIGH); - // digitalWrite(G_PIN, HIGH); - // digitalWrite(R_PIN, HIGH); - // delay(10); - // digitalWrite(R_PIN, LOW); -} - -void stampS3LED::sniffLED() { - // if (!settings_obj.loadSetting("EnableLED")) - // return; - - // digitalWrite(B_PIN, HIGH); - // digitalWrite(G_PIN, HIGH); - // digitalWrite(R_PIN, HIGH); - // delay(10); - // digitalWrite(B_PIN, LOW); -} - -void stampS3LED::offLED() { - // if (!settings_obj.loadSetting("EnableLED")) - // return; - - // digitalWrite(B_PIN, HIGH); - // digitalWrite(G_PIN, HIGH); - // digitalWrite(R_PIN, HIGH); -} - -void stampS3LED::main() { - // do nothing -} \ No newline at end of file diff --git a/esp32_marauder/stampS3LED.h b/esp32_marauder/stampS3LED.h deleted file mode 100644 index 479947bf9..000000000 --- a/esp32_marauder/stampS3LED.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef stampS3LED_h -#define stampS3LED_h - -#include "configs.h" -#include "settings.h" - -#include -// #include - -// #define STAMP_S3_LED_PIN 21 -// #define NUM_LEDS 1 - -// CRGB leds[NUM_LEDS]; - -extern Settings settings_obj; - -class stampS3LED { - - public: - void RunSetup(); - void main(); - void attackLED(); - void sniffLED(); - void offLED(); -}; - -#endif