fix esp32s3 build

74th · Feb 12, 2024 · b17c9df · b17c9df
1 parent 1256342
commit b17c9df
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 22 deletions.
diff --git a/.github/workflows/build-release.yaml b/.github/workflows/build-release.yaml
@@ -4,9 +4,9 @@ on:
     branches:
       - main
     tags:
-      - 'm5dial-simple-pointer/*'
-      - 'm5stackcore2-simple-pointer/*'
-      - 'm5dial-pimoroni-trackball-compatible/*'
+      - "m5dial-simple-pointer/*"
+      - "m5stackcore2-simple-pointer/*"
+      - "m5dial-pimoroni-trackball-compatible/*"
   pull_request:
 
 permissions:
@@ -26,7 +26,7 @@ jobs:
 
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.9'
+          python-version: "3.9"
 
       - name: Install PlatformIO Core
         run: pip install --upgrade platformio
@@ -62,7 +62,7 @@ jobs:
 
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.9'
+          python-version: "3.9"
 
       - name: Install PlatformIO Core
         run: pip install --upgrade platformio
@@ -71,20 +71,18 @@ jobs:
         run: |
           cd m5stackcore2-simple-pointer
           pio run
-
-      - name: Rename Firmware
-        if: startsWith(github.ref, 'refs/tags/m5stackcore2-simple-pointer')
-        run: |
-          cp m5stackcore2-simple-pointer/.pio/build/m5stack-core2/firmware.elf ./m5stackcore2-simple-pointer.elf
-          cp m5stackcore2-simple-pointer/.pio/build/m5stack-core2/firmware.bin ./m5stackcore2-simple-pointer.bin
+          ./build-merged-firmware.sh
 
       - name: Release
         uses: softprops/action-gh-release@v1
         if: startsWith(github.ref, 'refs/tags/m5stackcore2-simple-pointer')
         with:
           files: |
-            m5stackcore2-simple-pointer.elf
             m5stackcore2-simple-pointer.bin
+          body: |
+            ```
+            esptool.py --chip esp32 write_flash -z 0 m5stackcore2-simple-pointer.bin
+            ```
 
   build-m5dial-pimoroni-trackball-compatible:
     runs-on: ubuntu-latest
@@ -99,7 +97,7 @@ jobs:
 
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.9'
+          python-version: "3.9"
 
       - name: Install PlatformIO Core
         run: pip install --upgrade platformio
@@ -108,16 +106,15 @@ jobs:
         run: |
           cd m5dial-pimoroni-trackball-compatible
           pio run
-
-      - name: Rename Firmware
-        if: startsWith(github.ref, 'refs/tags/m5dial-pimoroni-trackball-compatible')
-        run: |
-          cp m5dial-pimoroni-trackball-compatible/.pio/build/m5dial/firmware.elf ./m5dial-pimoroni-trackball-compatible.elf
-          cp m5dial-pimoroni-trackball-compatible/.pio/build/m5dial/firmware.bin ./m5dial-pimoroni-trackball-compatible.bin
+          ./build-merged-firmware.sh
 
       - name: Release
         uses: softprops/action-gh-release@v1
         if: startsWith(github.ref, 'refs/tags/m5dial-pimoroni-trackball-compatible')
         with:
           files: |
-            m5dial-pimoroni-trackball-compatible.elf m5dial-pimoroni-trackball-compatible.bin
+            m5dial-pimoroni-trackball-compatible.bin
+          body: |
+            ```
+            esptool.py --chip esp32s3 write_flash -z 0 m5dial-pimoroni-trackball-compatible.bin
+            ```
diff --git a/m5dial-pimoroni-trackball-compatible/build-merged-firmware.sh b/m5dial-pimoroni-trackball-compatible/build-merged-firmware.sh
@@ -4,7 +4,7 @@ pio pkg exec -p tool-esptoolpy esptool.py -- --chip esp32s3 merge_bin \
   --flash_mode dio \
   --flash_freq 40m \
   --flash_size 4MB \
-  0x1000 .pio/build/m5dial/bootloader.bin \
+  0x0000 .pio/build/m5dial/bootloader.bin \
   0x8000 .pio/build/m5dial/partitions.bin \
   0xe000 ~/.platformio/packages/framework-arduinoespressif32/tools/partitions/boot_app0.bin \
   0x10000 .pio/build/m5dial/firmware.bin
diff --git a/m5dial-simple-pointer/build-merged-firmware.sh b/m5dial-simple-pointer/build-merged-firmware.sh
@@ -5,7 +5,7 @@ pio pkg exec -p tool-esptoolpy esptool.py -- --chip esp32s3 merge_bin \
   --flash_mode dio \
   --flash_freq 80m \
   --flash_size 8MB \
-  0x1000 .pio/build/m5dial/bootloader.bin \
+  0x0000 .pio/build/m5dial/bootloader.bin \
   0x8000 .pio/build/m5dial/partitions.bin \
   0xe000 ~/.platformio/packages/framework-arduinoespressif32/tools/partitions/boot_app0.bin \
   0x10000 .pio/build/m5dial/firmware.bin