sporq/qmk-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CLI flashers should allow files outside qmk_firmware folder (#19454)

Browse Source
This commit is contained in:
Joel Challis 2023-01-01 00:43:30 +00:00 committed by GitHub
parent c7c44de32f
commit 61696fda83
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/python/qmk/flashers.py
View File

@ -178,25 +178,25 @@ def flasher(mcu, file):
# Add a small sleep to avoid race conditions # Add a small sleep to avoid race conditions
time.sleep(1) time.sleep(1)
if bl == 'atmel-dfu': if bl == 'atmel-dfu':
_flash_atmel_dfu(details, file.name) _flash_atmel_dfu(details, file)
elif bl == 'caterina': elif bl == 'caterina':
if _flash_caterina(details, file.name): if _flash_caterina(details, file):
return (True, "The Caterina bootloader was found but is not writable. Check 'qmk doctor' output for advice.") return (True, "The Caterina bootloader was found but is not writable. Check 'qmk doctor' output for advice.")
elif bl == 'hid-bootloader': elif bl == 'hid-bootloader':
if mcu: if mcu:
if _flash_hid_bootloader(mcu, details, file.name): if _flash_hid_bootloader(mcu, details, file):
return (True, "Please make sure 'teensy_loader_cli' or 'hid_bootloader_cli' is available on your system.") return (True, "Please make sure 'teensy_loader_cli' or 'hid_bootloader_cli' is available on your system.")
else: else:
return (True, "Specifying the MCU with '-m' is necessary for HalfKay/HID bootloaders!") return (True, "Specifying the MCU with '-m' is necessary for HalfKay/HID bootloaders!")
elif bl == 'stm32-dfu' or bl == 'apm32-dfu' or bl == 'gd32v-dfu' or bl == 'kiibohd': elif bl == 'stm32-dfu' or bl == 'apm32-dfu' or bl == 'gd32v-dfu' or bl == 'kiibohd':
_flash_dfu_util(details, file.name) _flash_dfu_util(details, file)
elif bl == 'usbasploader' or bl == 'usbtinyisp': elif bl == 'usbasploader' or bl == 'usbtinyisp':
if mcu: if mcu:
_flash_isp(mcu, bl, file.name) _flash_isp(mcu, bl, file)
else: else:
return (True, "Specifying the MCU with '-m' is necessary for ISP flashing!") return (True, "Specifying the MCU with '-m' is necessary for ISP flashing!")
elif bl == 'md-boot': elif bl == 'md-boot':
_flash_mdloader(file.name) _flash_mdloader(file)
else: else:
return (True, "Known bootloader found but flashing not currently supported!") return (True, "Known bootloader found but flashing not currently supported!")