add build-merged-firmware

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

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/build-release.yaml b/.github/workflows/build-release.yaml
@@ -43,7 +43,6 @@ jobs:
         if: startsWith(github.ref, 'refs/tags/m5dial-simple-pointer')
         with:
           files: |
-            m5dial-simple-pointer.elf
             m5dial-simple-pointer.bin
           body: |
             ```

diff --git a/m5dial-pimoroni-trackball-compatible/build-merged-firmware.sh b/m5dial-pimoroni-trackball-compatible/build-merged-firmware.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
-esptool.py --chip esp32s3 merge_bin \
-  -o m5dial-simple-pointer-merged.bin \
+pio pkg exec -p tool-esptoolpy esptool.py -- --chip esp32s3 merge_bin \
+  -o m5dial-pimoroni-trackball-compatible.bin \
   --flash_mode dio \
   --flash_freq 40m \
   --flash_size 4MB \

diff --git a/m5dial-simple-pointer/build-merged-firmware.sh b/m5dial-simple-pointer/build-merged-firmware.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
-~/.platformio/penv/bin/python ~/.platformio/packages/tool-esptoolpy/esptool.py --chip esp32s3 merge_bin \
+set -xe
+pio pkg exec -p tool-esptoolpy esptool.py -- --chip esp32s3 merge_bin \
   -o m5dial-simple-pointer.bin \
   --flash_mode dio \
   --flash_freq 80m \

diff --git a/m5stackcore2-simple-pointer/build-merged-firmware.sh b/m5stackcore2-simple-pointer/build-merged-firmware.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
-esptool.py --chip esp32s3 merge_bin \
-  -o m5stackcore2-simple-pointer-merged.bin \
+pio pkg exec -p tool-esptoolpy esptool.py -- --chip esp32s3 merge_bin \
+  -o m5stackcore2-simple-pointer.bin \
   --flash_mode dio \
   --flash_freq 40m \
   --flash_size 16MB \