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

Merge branch 'main' into PP-350_Corrections-on-the-anycolor-profiles

Browse Source
This commit is contained in:
Saumya Jain 2023-09-20 10:40:49 +02:00 committed by GitHub
commit 04cd94e5d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cura/BackendPlugin.py
View File

@ -65,10 +65,15 @@ class BackendPlugin(AdditionalSettingDefinitionsAppender, PluginObject):
# STDIN needs to be None because we provide no input, but communicate via a local socket instead. # STDIN needs to be None because we provide no input, but communicate via a local socket instead.
# The NUL device sometimes doesn't exist on some computers. # The NUL device sometimes doesn't exist on some computers.
Logger.info(f"Starting backend_plugin [{self._plugin_id}] with command: {self._validatePluginCommand()}") Logger.info(f"Starting backend_plugin [{self._plugin_id}] with command: {self._validatePluginCommand()}")
popen_kwargs = {"stdin": None} popen_kwargs = {"stdin": None, "stdout": subprocess.PIPE, "stderr": subprocess.PIPE}
if Platform.isWindows(): if Platform.isWindows():
popen_kwargs["creationflags"] = subprocess.CREATE_NO_WINDOW popen_kwargs["creationflags"] = subprocess.CREATE_NO_WINDOW
self._process = subprocess.Popen(self._validatePluginCommand(), **popen_kwargs) self._process = subprocess.Popen(self._validatePluginCommand(), **popen_kwargs)
stdout_data, stderr_data = self._process.communicate()
if stderr_data:
Logger.warning(f"Info on error-stream when starting backend_plugin [{self._plugin_id}] stderr: {str(stderr_data)}")
Logger.info(
f"Started backend_plugin [{self._plugin_id}] with PID: {self._process.pid}, stdout: {str(stdout_data)}")
self._is_running = True self._is_running = True
return True return True
except PermissionError: except PermissionError:

7
plugins/USBPrinting/AutoDetectBaudJob.py
View File

@ -27,14 +27,7 @@ class AutoDetectBaudJob(Job):
write_timeout = 3 write_timeout = 3
read_timeout = 3 read_timeout = 3
tries = 2 tries = 2
programmer = Stk500v2()
serial = None serial = None
try:
programmer.connect(self._serial_port)
serial = programmer.leaveISP()
except ispBase.IspError:
programmer.close()
for retry in range(tries): for retry in range(tries):
for baud_rate in self._all_baud_rates: for baud_rate in self._all_baud_rates: