gitea-mirror/ESP32Marauder
1
0
Fork 0
mirror of https://github.com/justcallmekoko/ESP32Marauder.git synced 2025-12-12 15:50:36 -08:00
Code Issues Packages Projects Releases Wiki Activity

Add support for ESP32 S3

Browse Source
This commit is contained in:
Just Call Me Koko
2022-12-07 21:08:24 -05:00
parent e456f032a0
commit 157ae7a3c8
2 changed files with 40 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
.github/workflows/build_push.yml vendored
View File

@@ -96,20 +96,24 @@ jobs:
with: with:
sketch-names: MarauderOTA.ino sketch-names: MarauderOTA.ino
arduino-board-fqbn: esp32:esp32:esp32s2 arduino-board-fqbn: esp32:esp32:esp32s2
platform-url: https://github.com/espressif/arduino-esp32/releases/download/2.0.0-rc1/package_esp32_dev_index.json platform-url: https://github.com/espressif/arduino-esp32/releases/download/2.0.3/package_esp32_dev_index.json
- name: Replace SD lib - name: Replace SD lib
run: | run: |
rm -rf /home/runner/.arduino15/packages/esp32/hardware/esp32/2.0.0-rc1/libraries/SD rm -rf /home/runner/.arduino15/packages/esp32/hardware/esp32/2.0.3/libraries/SD
cp -R /home/runner/work/ESP32Marauder/ESP32Marauder/2.0.4arduino-esp32/libraries/SD /home/runner/.arduino15/packages/esp32/hardware/esp32/2.0.0-rc1/libraries/SD cp -R /home/runner/work/ESP32Marauder/ESP32Marauder/2.0.4arduino-esp32/libraries/SD /home/runner/.arduino15/packages/esp32/hardware/esp32/2.0.3/libraries/SD
ls -la /home/runner/.arduino15/packages/esp32/hardware/esp32/2.0.0-rc1/libraries/SD ls -la /home/runner/.arduino15/packages/esp32/hardware/esp32/2.0.3/libraries/SD
- name: Modify platform.txt - name: Modify platform.txt
run: | run: |
echo "Chicken" echo "Chicken"
for i in $(find /home/runner/.arduino15/packages/esp32/hardware/esp32/ -name "platform.txt"); do for i in $(find /home/runner/.arduino15/packages/esp32/hardware/esp32/ -name "platform.txt"); do
sed -i 's/compiler.c.elf.libs.esp32c3=/compiler.c.elf.libs.esp32c3=-zmuldefs /' "$i"
sed -i 's/compiler.c.elf.libs.esp32s3=/compiler.c.elf.libs.esp32s3=-zmuldefs /' "$i"
sed -i 's/compiler.c.elf.libs.esp32s2=/compiler.c.elf.libs.esp32s2=-zmuldefs /' "$i" sed -i 's/compiler.c.elf.libs.esp32s2=/compiler.c.elf.libs.esp32s2=-zmuldefs /' "$i"
sed -i 's/compiler.c.elf.libs.esp32=/compiler.c.elf.libs.esp32=-zmuldefs /' "$i" sed -i 's/compiler.c.elf.libs.esp32=/compiler.c.elf.libs.esp32=-zmuldefs /' "$i"
cat "$i" | grep compiler.c.elf.libs.esp32c3
cat "$i" | grep compiler.c.elf.libs.esp32s3
cat "$i" | grep compiler.c.elf.libs.esp32s2 cat "$i" | grep compiler.c.elf.libs.esp32s2
cat "$i" | grep compiler.c.elf.libs.esp32 cat "$i" | grep compiler.c.elf.libs.esp32
done done
@@ -118,15 +122,24 @@ jobs:
uses: ArminJo/arduino-test-compile@v3.2.0 uses: ArminJo/arduino-test-compile@v3.2.0
with: with:
sketch-names: esp32_marauder.ino sketch-names: esp32_marauder.ino
arduino-board-fqbn: esp32:esp32:esp32s2:PartitionScheme=min_spiffs,FlashSize=16M,PSRAM=enabled arduino-board-fqbn: esp32:esp32:esp32s2:PartitionScheme=min_spiffs,FlashSize=4M,PSRAM=enabled
#platform-url: https://github.com/espressif/arduino-esp32/releases/download/2.0.0-rc1/package_esp32_dev_index.json
extra-arduino-cli-args: "--warnings none" extra-arduino-cli-args: "--warnings none"
#extra-arduino-lib-install-args: "-zmuldefs"
- name: Rename Marauder Flipper bin - name: Rename Marauder Flipper bin
run: | run: |
mv ./esp32_marauder/build/esp32.esp32.esp32s2/esp32_marauder.ino.bin ./esp32_marauder/build/esp32.esp32.esp32s2/esp32_marauder.flipper.bin mv ./esp32_marauder/build/esp32.esp32.esp32s2/esp32_marauder.ino.bin ./esp32_marauder/build/esp32.esp32.esp32s2/esp32_marauder.flipper.bin
- name: Build Marauder for Flipper Zero Multi Board
uses: ArminJo/arduino-test-compile@v3.2.0
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.esp32s2/esp32_marauder.ino.bin ./esp32_marauder/build/esp32.esp32.esp32s2/esp32_marauder.multiboardS3.bin
- name: Configure TFT_eSPI and configs.h for OG Marauder - name: Configure TFT_eSPI and configs.h for OG Marauder
run: | run: |
pwd pwd
@@ -145,9 +158,7 @@ jobs:
with: with:
sketch-names: esp32_marauder.ino sketch-names: esp32_marauder.ino
arduino-board-fqbn: esp32:esp32:d32:PartitionScheme=min_spiffs arduino-board-fqbn: esp32:esp32:d32:PartitionScheme=min_spiffs
#platform-url: https://github.com/espressif/arduino-esp32/releases/download/2.0.0-rc1/package_esp32_dev_index.json
extra-arduino-cli-args: "--warnings none" extra-arduino-cli-args: "--warnings none"
#extra-arduino-lib-install-args: "-zmuldefs"
- name: Rename OG Marauder bin - name: Rename OG Marauder bin
run: | run: |
@@ -169,9 +180,7 @@ jobs:
with: with:
sketch-names: esp32_marauder.ino sketch-names: esp32_marauder.ino
arduino-board-fqbn: esp32:esp32:d32:PartitionScheme=min_spiffs arduino-board-fqbn: esp32:esp32:d32:PartitionScheme=min_spiffs
#platform-url: https://github.com/espressif/arduino-esp32/releases/download/2.0.0-rc1/package_esp32_dev_index.json
extra-arduino-cli-args: "--warnings none" extra-arduino-cli-args: "--warnings none"
#extra-arduino-lib-install-args: "-zmuldefs"
- name: Rename v6 Marauder bin - name: Rename v6 Marauder bin
run: | run: |
@@ -193,9 +202,7 @@ jobs:
with: with:
sketch-names: esp32_marauder.ino sketch-names: esp32_marauder.ino
arduino-board-fqbn: esp32:esp32:d32:PartitionScheme=min_spiffs arduino-board-fqbn: esp32:esp32:d32:PartitionScheme=min_spiffs
#platform-url: https://github.com/espressif/arduino-esp32/releases/download/2.0.0-rc1/package_esp32_dev_index.json
extra-arduino-cli-args: "--warnings none" extra-arduino-cli-args: "--warnings none"
#extra-arduino-lib-install-args: "-zmuldefs"
- name: Rename Marauder Kit bin - name: Rename Marauder Kit bin
run: | run: |
@@ -217,9 +224,7 @@ jobs:
with: with:
sketch-names: esp32_marauder.ino sketch-names: esp32_marauder.ino
arduino-board-fqbn: esp32:esp32:d32:PartitionScheme=min_spiffs arduino-board-fqbn: esp32:esp32:d32:PartitionScheme=min_spiffs
#platform-url: https://github.com/espressif/arduino-esp32/releases/download/2.0.0-rc1/package_esp32_dev_index.json
extra-arduino-cli-args: "--warnings none" extra-arduino-cli-args: "--warnings none"
#extra-arduino-lib-install-args: "-zmuldefs"
- name: Rename Marauder Mini bin - name: Rename Marauder Mini bin
run: | run: |
@@ -236,6 +241,13 @@ jobs:
path: ./esp32_marauder/build/esp32.esp32.esp32s2/esp32_marauder.flipper.bin path: ./esp32_marauder/build/esp32.esp32.esp32s2/esp32_marauder.flipper.bin
retention-days: 5 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' - name: 'Upload OG Artifact'
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
@@ -286,6 +298,17 @@ jobs:
asset_name: esp32_marauder.flipper.bin asset_name: esp32_marauder.flipper.bin
asset_content_type: application/bin asset_content_type: application/bin
- name: Upload MultiboardS3 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.esp32s3/esp32_marauder.mutliboardS3.bin
asset_name: esp32_marauder.mutliboardS3.bin
asset_content_type: application/bin
- name: Upload OG Asset - name: Upload OG Asset
id: upload-og-release-asset id: upload-og-release-asset
uses: actions/upload-release-asset@v1 uses: actions/upload-release-asset@v1

4
esp32_marauder/configs.h
View File

@@ -9,8 +9,8 @@
//#define MARAUDER_V6 //#define MARAUDER_V6
//#define MARAUDER_KIT //#define MARAUDER_KIT
//#define GENERIC_ESP32 //#define GENERIC_ESP32
//#define MARAUDER_FLIPPER #define MARAUDER_FLIPPER
#define ESP32_LDDB //#define ESP32_LDDB
#define MARAUDER_VERSION "v0.9.19" #define MARAUDER_VERSION "v0.9.19"