Merge remote-tracking branch 'origin/develop' into xap

qmk · Jan 10, 2025 · ffc2d57 · ffc2d57
2 parents 33aef45 + f9430e5
commit ffc2d57
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/lib/python/qmk/flashers.py b/lib/python/qmk/flashers.py
@@ -202,6 +202,10 @@ def _flash_mdloader(file):
 
 
 def _flash_uf2(file):
+    output = cli.run(['util/uf2conv.py', '--info', file]).stdout
+    if 'UF2 File' not in output:
+        return True
+
     cli.run(['util/uf2conv.py', '--deploy', file], capture_output=False)
 
 
@@ -235,7 +239,8 @@ def flasher(mcu, file):
     elif bl == 'md-boot':
         _flash_mdloader(file)
     elif bl == '_uf2_compatible_':
-        _flash_uf2(file)
+        if _flash_uf2(file):
+            return (True, "Flashing only supports uf2 format files.")
     else:
         return (True, "Known bootloader found but flashing not currently supported!")