Henry-Hiles/qmk_userspace
1
0
Fork 0
forked from mirrors/qmk_userspace
Code Pull requests Activity

WSL qmk flash firmware.bin workaround (#19434)

Browse source
This commit is contained in:
Joel Challis 2023-01-01 00:44:33 +00:00 • committed by GitHub
commit b8e12eed80
Failed to generate hash of commit
1 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

21
lib/python/qmk/flashers.py
View file

@ -1,3 +1,4 @@
import platform
import shutil import shutil
import time import time
import os import os
@ -56,6 +57,20 @@ def _check_dfu_programmer_version():
return False return False
def _find_usb_device(vid_hex, pid_hex):
# WSL doesnt have access to USB - use powershell instead...?
if 'microsoft' in platform.uname().release.lower():
ret = cli.run(['powershell.exe', '-command', 'Get-PnpDevice -PresentOnly | Select-Object -Property InstanceId'])
if f'USB\\VID_{vid_hex:04X}&PID_{pid_hex:04X}' in ret.stdout:
return (vid_hex, pid_hex)
else:
with DelayedKeyboardInterrupt():
# PyUSB does not like to be interrupted by Ctrl-C
# therefore we catch the interrupt with a custom handler
# and only process it once pyusb finished
return usb.core.find(idVendor=vid_hex, idProduct=pid_hex)
def _find_bootloader(): def _find_bootloader():
# To avoid running forever in the background, only look for bootloaders for 10min # To avoid running forever in the background, only look for bootloaders for 10min
start_time = time.time() start_time = time.time()
@ -64,11 +79,7 @@ def _find_bootloader():
for vid, pid in BOOTLOADER_VIDS_PIDS[bl]: for vid, pid in BOOTLOADER_VIDS_PIDS[bl]:
vid_hex = int(f'0x{vid}', 0) vid_hex = int(f'0x{vid}', 0)
pid_hex = int(f'0x{pid}', 0) pid_hex = int(f'0x{pid}', 0)
with DelayedKeyboardInterrupt(): dev = _find_usb_device(vid_hex, pid_hex)
# PyUSB does not like to be interrupted by Ctrl-C
# therefore we catch the interrupt with a custom handler
# and only process it once pyusb finished
dev = usb.core.find(idVendor=vid_hex, idProduct=pid_hex)
if dev: if dev:
if bl == 'atmel-dfu': if bl == 'atmel-dfu':
details = _PID_TO_MCU[pid] details = _PID_TO_MCU[pid]