From 05e459a64cbace81b81b92dc802c65707b8a7bb9 Mon Sep 17 00:00:00 2001
From: Djuri Baars <dsbaars@users.noreply.github.com>
Date: Tue, 29 Aug 2023 17:03:05 +0200
Subject: [PATCH] Add esptool to workflow

---
 .github/workflows/workflow.yml | 10 +++++++++-
 .gitignore                     |  4 +++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index 77f4164..cefa272 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -32,17 +32,25 @@ jobs:
 
       - name: Build BTClock filesystem
         run: pio run -e esp32wemos-s3-mini_BW --target buildfs
+
+      - name: Install esptools.py
+        run: pip install --upgrade esptool
+
+      - name: Create merged firmware binary
+        run: esptool.py --chip esp32s3 merge_bin -o full-firmware.bin --flash_mode dio 0x0000 .pio/build/esp32wemos-s3-mini_BW/bootloader.bin 0x8000 .pio/build/esp32wemos-s3-mini_BW/partitions.bin 0xe000 ~/.platformio/packages/framework-arduinoespressif32/tools/partitions/boot_app0.bin 0x10000 .pio/build/esp32wemos-s3-mini_BW/firmware.bin 0x330000 .pio/build/esp32wemos-s3-mini_BW/spiffs.bin
+
       - name: Upload artifacts
         uses: actions/upload-artifact@v3
         with:
           path: |
             .pio/build/esp32wemos-s3-mini_BW/*.bin
+            full-firmware.bin
 
       - name: Create release
         uses: ncipollo/release-action@v1
         with:
           tag: main
           commit: main
-          artifacts: ".pio/build/esp32wemos-s3-mini_BW/*.bin"
+          artifacts: "full-firmware.bin,.pio/build/esp32wemos-s3-mini_BW/*.bin"
           allowUpdates: true
           removeArtifacts: true
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index e0aa9fd..0ff8860 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,6 @@ data/build
 data/.yarn
 data/node_modules
 .vscode/c_cpp_properties.json
-node_modules
\ No newline at end of file
+node_modules
+.DS_Store
+*.bin
\ No newline at end of file