From 9f089746da9c7a5e06698b60174fb5cb4d19232f Mon Sep 17 00:00:00 2001
From: Ben Meadors <benmmeadors@gmail.com>
Date: Tue, 9 Jul 2024 08:31:16 -0500
Subject: [PATCH] Collect hex files and specifically wm1110 sdk

---
 .github/workflows/main_matrix.yml |  3 ++-
 bin/build-nrf52.sh                | 20 +++++++++++---------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/main_matrix.yml b/.github/workflows/main_matrix.yml
index 25a0fbad2..14c8a9d10 100644
--- a/.github/workflows/main_matrix.yml
+++ b/.github/workflows/main_matrix.yml
@@ -136,7 +136,7 @@ jobs:
         build-rpi2040,
         package-raspbian,
         package-raspbian-armv7l,
-        package-native
+        package-native,
       ]
     steps:
       - name: Checkout code
@@ -168,6 +168,7 @@ jobs:
           path: |
             ./firmware-*.bin
             ./firmware-*.uf2
+            ./firmware-*.hex
             ./firmware-*-ota.zip
             ./device-*.sh
             ./device-*.bat
diff --git a/bin/build-nrf52.sh b/bin/build-nrf52.sh
index fa6eacd23..97b7cd456 100755
--- a/bin/build-nrf52.sh
+++ b/bin/build-nrf52.sh
@@ -33,13 +33,15 @@ SRCHEX=.pio/build/$1/firmware.hex
 # if WM1110 target, merge hex with softdevice 7.3.0
 if (echo $1 | grep -q "wio-sdk-wm1110"); then
 	echo "Merging with softdevice"
-    sudo chmod +x ./bin/mergehex
-	bin/mergehex -m bin/s140_nrf52_7.3.0_softdevice.hex $SRCHEX -o .pio/build/$1/merged_fimware.hex
-	SRCHEX=.pio/build/$1/merged_fimware.hex
+	sudo chmod +x ./bin/mergehex
+	bin/mergehex -m bin/s140_nrf52_7.3.0_softdevice.hex $SRCHEX -o .pio/build/$1/$basename.hex
+	SRCHEX=.pio/build/$1/$basename.hex
+	bin/uf2conv.py $SRCHEX -c -o $OUTDIR/$basename.uf2 -f 0xADA52840
+	cp $SRCHEX $OUTDIR
+	cp bin/*.uf2 $OUTDIR
+else
+	bin/uf2conv.py $SRCHEX -c -o $OUTDIR/$basename.uf2 -f 0xADA52840
+	cp bin/device-install.* $OUTDIR
+	cp bin/device-update.* $OUTDIR
+	cp bin/*.uf2 $OUTDIR
 fi
-
-bin/uf2conv.py $SRCHEX -c -o $OUTDIR/$basename.uf2 -f 0xADA52840
-
-cp bin/device-install.* $OUTDIR
-cp bin/device-update.* $OUTDIR
-cp bin/*.uf2 $OUTDIR