Merge pull request #14202 from Ultimaker/CURA-10118_Enable_all_USB_ports_for_Mac

[CURA-10118] Change Only_List_USB
This commit is contained in:
Jelle Spijker 2023-01-17 15:51:37 +01:00 committed by GitHub
commit 7ccb361b8f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -9,6 +9,7 @@ from re import search
from PyQt6.QtCore import QObject, pyqtSignal from PyQt6.QtCore import QObject, pyqtSignal
from UM.Platform import Platform
from UM.Signal import Signal, signalemitter from UM.Signal import Signal, signalemitter
from UM.OutputDevice.OutputDevicePlugin import OutputDevicePlugin from UM.OutputDevice.OutputDevicePlugin import OutputDevicePlugin
from UM.i18n import i18nCatalog from UM.i18n import i18nCatalog
@ -83,7 +84,8 @@ class USBPrinterOutputDeviceManager(QObject, OutputDevicePlugin):
if container_stack.getMetaDataEntry("supports_usb_connection"): if container_stack.getMetaDataEntry("supports_usb_connection"):
machine_file_formats = [file_type.strip() for file_type in container_stack.getMetaDataEntry("file_formats").split(";")] machine_file_formats = [file_type.strip() for file_type in container_stack.getMetaDataEntry("file_formats").split(";")]
if "text/x-gcode" in machine_file_formats: if "text/x-gcode" in machine_file_formats:
port_list = self.getSerialPortList(only_list_usb=True) # We only limit listing usb on windows is a fix for connecting tty/cu printers on MacOS and Linux
port_list = self.getSerialPortList(only_list_usb=Platform.isWindows())
self._addRemovePorts(port_list) self._addRemovePorts(port_list)
time.sleep(5) time.sleep(5)