pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-06-17 10:32:07 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Merge branch 'tft-gui-work' of https://github.com/meshtastic/firmware into tft-gui-work

Browse Source
This commit is contained in:
mverch67 2024-07-05 12:32:31 +02:00
commit 6f6b627eae
3 changed files with 9738 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bin/build-nrf52.sh
View File

@ -2,8 +2,8 @@
set -e set -e
VERSION=`bin/buildinfo.py long` VERSION=$(bin/buildinfo.py long)
SHORT_VERSION=`bin/buildinfo.py short` SHORT_VERSION=$(bin/buildinfo.py short)
OUTDIR=release/ OUTDIR=release/
@ -29,6 +29,15 @@ cp $DFUPKG $OUTDIR/$basename-ota.zip
echo "Generating NRF52 uf2 file" echo "Generating NRF52 uf2 file"
SRCHEX=.pio/build/$1/firmware.hex 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
fi
bin/uf2conv.py $SRCHEX -c -o $OUTDIR/$basename.uf2 -f 0xADA52840 bin/uf2conv.py $SRCHEX -c -o $OUTDIR/$basename.uf2 -f 0xADA52840
cp bin/device-install.* $OUTDIR cp bin/device-install.* $OUTDIR

BIN
bin/mergehex Normal file
View File

Binary file not shown.

9726
bin/s140_nrf52_7.3.0_softdevice.hex Normal file
View File

File diff suppressed because it is too large Load Diff