andreil/katapult
1
0
Fork 0
mirror of https://github.com/andreili/katapult.git synced 2025-08-23 19:34:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

flashtool: improve bootloader wait method

Browse Source 
Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Eric Callahan 2025-03-05 12:27:43 -05:00
parent e171665710
commit 28b873de75
1 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
scripts/flashtool.py
View File

@ -773,10 +773,19 @@ class CanSocket(BaseSocket):
output(".") output(".")
usb_info = get_usb_info(self._can_bridge_path) usb_info = get_usb_info(self._can_bridge_path)
mfr = usb_info.get("manufacturer") mfr = usb_info.get("manufacturer")
if mfr == "katapult": usb_id = usb_info.get("usb_id", "")
product = usb_info.get("product")
if usb_id and usb_id != GS_CAN_USB_ID:
await asyncio.sleep(.5) await asyncio.sleep(.5)
serial_path = self.usb_serial_path output_line("done")
output_line(f"Katapult detected at serial port {serial_path}") output_line(f"Detected new USB Device: {usb_id} {mfr} {product}")
if mfr == "katapult" or usb_id == KATAPULT_USB_ID:
serial_path = self.usb_serial_path
output_line(f"Katapult detected at serial port {serial_path}")
else:
# Device is not Katapult, force exit
self._args.request_bootloader = True
output_line("Device is not Katapult, exiting...")
break break
else: else:
output_line("timed out") output_line("timed out")
@ -938,6 +947,8 @@ class SerialSocket(BaseSocket):
output_line(f"Device path {device} is not a usb device") output_line(f"Device path {device} is not a usb device")
return device return device
stable_path = get_stable_usb_symlink(device) stable_path = get_stable_usb_symlink(device)
usb_info = get_usb_info(usb_dev_path)
start_usb_id = usb_info["usb_id"]
fd: Optional[int] = None fd: Optional[int] = None
with contextlib.suppress(OSError): with contextlib.suppress(OSError):
fd = os.open(str(device), os.O_RDWR) fd = os.open(str(device), os.O_RDWR)
@ -958,9 +969,26 @@ class SerialSocket(BaseSocket):
output(".") output(".")
usb_info = get_usb_info(usb_dev_path) usb_info = get_usb_info(usb_dev_path)
mfr = usb_info.get("manufacturer") mfr = usb_info.get("manufacturer")
if mfr == "katapult": product = usb_info.get("product")
output_line("Katapult detected") usb_id = usb_info.get("usb_id", "")
await asyncio.sleep(1.0) if usb_id and usb_id != start_usb_id:
await asyncio.sleep(.5)
output_line("done")
output_line(f"Detected new USB Device: {usb_id} {mfr} {product}")
if mfr == "katapult" or usb_id == KATAPULT_USB_ID:
# prefer path resolved from sysfs usb path
path_match = list(
usb_dev_path.glob(f"{usb_dev_path.name}:*/tty/tty*")
)
if len(path_match) == 1:
det_path = pathlib.Path(f"/dev/{path_match[0].name}")
if det_path.exists():
stable_path = det_path
output_line(f"Katapult detected on {stable_path}")
else:
# Device is not Katapult, force exit
self._args.request_bootloader = True
output_line("Device is not Katapult, exiting...")
break break
else: else:
output_line("timed out") output_line("timed out")