GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 14:39:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16144 from Ultimaker/usb_printing_debug_improvements

Browse Source 
Usb printing debug improvements
This commit is contained in:
Jelle Spijker 2023-07-14 11:50:14 +02:00 committed by GitHub
commit e51a4d0d22
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/USBPrinting/AutoDetectBaudJob.py
View File

@ -21,7 +21,7 @@ class AutoDetectBaudJob(Job):
self._all_baud_rates = [115200, 250000, 500000, 230400, 76800, 57600, 38400, 19200, 9600] self._all_baud_rates = [115200, 250000, 500000, 230400, 76800, 57600, 38400, 19200, 9600]
def run(self) -> None: def run(self) -> None:
Logger.log("d", "Auto detect baud rate started.") Logger.debug(f"Auto detect baud rate started for {self._serial_port}")
wait_response_timeouts = [3, 15, 30] wait_response_timeouts = [3, 15, 30]
wait_bootloader_times = [1.5, 5, 15] wait_bootloader_times = [1.5, 5, 15]
write_timeout = 3 write_timeout = 3
@ -46,8 +46,7 @@ class AutoDetectBaudJob(Job):
wait_bootloader = wait_bootloader_times[retry] wait_bootloader = wait_bootloader_times[retry]
else: else:
wait_bootloader = wait_bootloader_times[-1] wait_bootloader = wait_bootloader_times[-1]
Logger.log("d", "Checking {serial} if baud rate {baud_rate} works. Retry nr: {retry}. Wait timeout: {timeout}".format( Logger.debug(f"Checking {self._serial_port} if baud rate {baud_rate} works. Retry nr: {retry}. Wait timeout: {wait_response_timeout}")
serial = self._serial_port, baud_rate = baud_rate, retry = retry, timeout = wait_response_timeout))
if serial is None: if serial is None:
try: try:
@ -61,7 +60,9 @@ class AutoDetectBaudJob(Job):
serial.baudrate = baud_rate serial.baudrate = baud_rate
except ValueError: except ValueError:
continue continue
sleep(wait_bootloader) # Ensure that we are not talking to the boot loader. 1.5 seconds seems to be the magic number
# Ensure that we are not talking to the boot loader. 1.5 seconds seems to be the magic number
sleep(wait_bootloader)
serial.write(b"\n") # Ensure we clear out previous responses serial.write(b"\n") # Ensure we clear out previous responses
serial.write(b"M105\n") serial.write(b"M105\n")
@ -83,4 +84,5 @@ class AutoDetectBaudJob(Job):
serial.write(b"M105\n") serial.write(b"M105\n")
sleep(15) # Give the printer some time to init and try again. sleep(15) # Give the printer some time to init and try again.
Logger.debug(f"Unable to find a working baudrate for {serial}")
self.setResult(None) # Unable to detect the correct baudrate. self.setResult(None) # Unable to detect the correct baudrate.