From 6def3dcb5e9c447a81870b54f9fa0b8b602c3c81 Mon Sep 17 00:00:00 2001 From: MariMakes <40423138+MariMakes@users.noreply.github.com> Date: Wed, 4 Jan 2023 10:15:27 +0100 Subject: [PATCH 1/3] Change Only_List_USB Apply Sovengers so more Macusers can print over USB as mentioned in https://community.ultimaker.com/topic/42417-fix-for-connecting-creality-ender-3-neo-to-mac-via-usb/ --- plugins/USBPrinting/USBPrinterOutputDeviceManager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/USBPrinting/USBPrinterOutputDeviceManager.py b/plugins/USBPrinting/USBPrinterOutputDeviceManager.py index 02e3cc137d..2e9fa52a73 100644 --- a/plugins/USBPrinting/USBPrinterOutputDeviceManager.py +++ b/plugins/USBPrinting/USBPrinterOutputDeviceManager.py @@ -83,7 +83,7 @@ class USBPrinterOutputDeviceManager(QObject, OutputDevicePlugin): if container_stack.getMetaDataEntry("supports_usb_connection"): machine_file_formats = [file_type.strip() for file_type in container_stack.getMetaDataEntry("file_formats").split(";")] if "text/x-gcode" in machine_file_formats: - port_list = self.getSerialPortList(only_list_usb=True) + port_list = self.getSerialPortList(only_list_usb=False) self._addRemovePorts(port_list) time.sleep(5) From 1bc764f019a63cb32f5bbf41dbe4555b470eca51 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Mon, 16 Jan 2023 11:07:55 +0100 Subject: [PATCH 2/3] Only search for non usb device printers when using Linux or MacOS CURA-10118 --- plugins/USBPrinting/USBPrinterOutputDeviceManager.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plugins/USBPrinting/USBPrinterOutputDeviceManager.py b/plugins/USBPrinting/USBPrinterOutputDeviceManager.py index 2e9fa52a73..6055b42d63 100644 --- a/plugins/USBPrinting/USBPrinterOutputDeviceManager.py +++ b/plugins/USBPrinting/USBPrinterOutputDeviceManager.py @@ -9,6 +9,7 @@ from re import search from PyQt6.QtCore import QObject, pyqtSignal +from UM.Platform import Platform from UM.Signal import Signal, signalemitter from UM.OutputDevice.OutputDevicePlugin import OutputDevicePlugin from UM.i18n import i18nCatalog @@ -83,7 +84,9 @@ class USBPrinterOutputDeviceManager(QObject, OutputDevicePlugin): if container_stack.getMetaDataEntry("supports_usb_connection"): machine_file_formats = [file_type.strip() for file_type in container_stack.getMetaDataEntry("file_formats").split(";")] if "text/x-gcode" in machine_file_formats: - port_list = self.getSerialPortList(only_list_usb=False) + # This is a fix for connecting tty/cu printers on MacOS and Linux + only_list_usb = False if Platform.isOSX() or Platform.isLinux() else True + port_list = self.getSerialPortList(only_list_usb) self._addRemovePorts(port_list) time.sleep(5) From 6054473036e6086b1614d8efc423ccb21e1a3cae Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Tue, 17 Jan 2023 15:38:23 +0100 Subject: [PATCH 3/3] Remove unused environment variable --- plugins/USBPrinting/USBPrinterOutputDeviceManager.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/plugins/USBPrinting/USBPrinterOutputDeviceManager.py b/plugins/USBPrinting/USBPrinterOutputDeviceManager.py index 6055b42d63..4eeeb7970b 100644 --- a/plugins/USBPrinting/USBPrinterOutputDeviceManager.py +++ b/plugins/USBPrinting/USBPrinterOutputDeviceManager.py @@ -84,9 +84,8 @@ class USBPrinterOutputDeviceManager(QObject, OutputDevicePlugin): if container_stack.getMetaDataEntry("supports_usb_connection"): machine_file_formats = [file_type.strip() for file_type in container_stack.getMetaDataEntry("file_formats").split(";")] if "text/x-gcode" in machine_file_formats: - # This is a fix for connecting tty/cu printers on MacOS and Linux - only_list_usb = False if Platform.isOSX() or Platform.isLinux() else True - port_list = self.getSerialPortList(only_list_usb) + # 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) time.sleep(5)