Merge pull request justcallmekoko#268 from justcallmekoko/develop

Develop

.github/workflows/build_push.yml

@@ -2,6 +2,8 @@ name: Build and Push
 
 on:
   workflow_dispatch:
+  pull_request:
+    types: [opened, reopened]
 
 jobs:
   # This workflow contains a single job called "build"
@@ -87,6 +89,7 @@ jobs:
           cp User_Setup_Select.h CustomTFT_eSPI/
           cp User_Setup_marauder_mini.h CustomTFT_eSPI/
           cp User_Setup_og_marauder.h CustomTFT_eSPI/
+          cp User_Setup_marauder_m5stickc.h CustomTFT_eSPI/
           pwd
           ls -la
           ls -la CustomTFT_eSPI
@@ -129,6 +132,27 @@ jobs:
         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/[email protected]
+        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/[email protected]
         with:
@@ -281,6 +305,33 @@ jobs:
       - 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 <User_Setup_marauder_mini.h>/\/\/#include <User_Setup_marauder_mini.h>/' /home/runner/Arduino/libraries/CustomTFT_eSPI/User_Setup_Select.h
+          sed -i 's/^\/\/#include <User_Setup_marauder_m5stickc.h>/#include <User_Setup_marauder_m5stickc.h>/' /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_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/[email protected]
+        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: |
@@ -293,6 +344,13 @@ jobs:
           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:
@@ -342,6 +400,13 @@ jobs:
           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
@@ -352,6 +417,7 @@ jobs:
           release_name: Release ${{ github.ref }}
           draft: true
           prerelease: false
+        if: github.event_name != 'pull_request'
 
       - name: Upload Flipper Asset
         id: upload-flipper-release-asset 
@@ -363,6 +429,19 @@ jobs:
           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-mutliboardS3-release-asset 
@@ -374,6 +453,7 @@ jobs:
           asset_path: ./esp32_marauder/build/esp32.esp32.esp32s3/esp32_marauder.multiboardS3.bin
           asset_name: esp32_marauder.mutliboardS3.bin
           asset_content_type: application/bin
+        if: github.event_name != 'pull_request'
 
       - name: Upload OG Asset
         id: upload-og-release-asset 
@@ -385,6 +465,7 @@ jobs:
           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 
@@ -396,6 +477,7 @@ jobs:
           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 Kit Asset
         id: upload-kit-release-asset 
@@ -407,6 +489,7 @@ jobs:
           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 
@@ -418,6 +501,7 @@ jobs:
           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 
@@ -429,6 +513,7 @@ jobs:
           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
@@ -440,3 +525,16 @@ jobs:
           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'

.gitignore

@@ -1,3 +1,4 @@
 
 .vscode/arduino.json
 .vscode/c_cpp_properties.json
+esp32_marauder/.vscode/settings.json