Merge branch 'main' into dev

# Conflicts: # variants/heltec_vision_master_e290/platformio.ini
2025-09-28 19:21:48 +10:00
parent e5de6e6600 0767fc49e5
commit 3335b49d9f
5 changed files with 152 additions and 63 deletions
--- a/build.sh
+++ b/build.sh
@@ -71,7 +71,7 @@ build_firmware() {

  # build .uf2 for nrf52 boards
  if [[ -f .pio/build/$1/firmware.zip && -f .pio/build/$1/firmware.hex ]]; then
-    python bin/uf2conv/uf2conv.py .pio/build/$1/firmware.hex -c -o .pio/build/$1/firmware.uf2 -f 0xADA52840
+    python3 bin/uf2conv/uf2conv.py .pio/build/$1/firmware.hex -c -o .pio/build/$1/firmware.uf2 -f 0xADA52840
  fi

  # copy .bin, .uf2, and .zip to out folder