Merge branch 'master' of https://github.com/victornpb/Cura into victornpb-master

This commit is contained in:
Ghostkeeper 2020-06-03 16:21:50 +02:00
commit 1e49438c03
No known key found for this signature in database
GPG Key ID: D2A8871EE34EC59A
2 changed files with 2 additions and 2 deletions

View File

@ -18,7 +18,7 @@ class AutoDetectBaudJob(Job):
def __init__(self, serial_port: int) -> None:
super().__init__()
self._serial_port = serial_port
self._all_baud_rates = [115200, 250000, 500000, 230400, 57600, 38400, 19200, 9600]
self._all_baud_rates = [115200, 250000, 500000, 230400, 76800, 57600, 38400, 19200, 9600]
def run(self) -> None:
Logger.log("d", "Auto detect baud rate started.")

View File

@ -58,7 +58,7 @@ class USBPrinterOutputDevice(PrinterOutputDevice):
self._baud_rate = baud_rate
self._all_baud_rates = [115200, 250000, 500000, 230400, 57600, 38400, 19200, 9600]
self._all_baud_rates = [115200, 250000, 500000, 230400, 76800, 57600, 38400, 19200, 9600]
# Instead of using a timer, we really need the update to be as a thread, as reading from serial can block.
self._update_thread = Thread(target = self._update, daemon = True, name = "USBPrinterUpdate")