GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-09-13 15:33:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3855 from jorgegarciadev/master

Browse Source 
Fix for detecting USB connection to Malyan M200 and Monoprice Mini
This commit is contained in:
Lipu Fei 2018-07-24 17:00:43 +02:00 committed by GitHub
commit 006c778d3e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/USBPrinting/AutoDetectBaudJob.py
View File

@ -72,7 +72,7 @@ class AutoDetectBaudJob(Job):
while timeout_time > time():
line = serial.readline()
if b"ok T:" in line:
if b"ok " in line and b"T:" in line:
successful_responses += 1
if successful_responses >= 3:
self.setResult(baud_rate)

2
plugins/USBPrinting/USBPrinterOutputDevice.py
View File

@ -323,7 +323,7 @@ class USBPrinterOutputDevice(PrinterOutputDevice):
if self._firmware_name is None:
self.sendCommand("M115")
if b"ok T:" in line or line.startswith(b"T:") or b"ok B:" in line or line.startswith(b"B:"): # Temperature message. 'T:' for extruder and 'B:' for bed
if (b"ok " in line and b"T:" in line) or b"ok T:" in line or line.startswith(b"T:") or b"ok B:" in line or line.startswith(b"B:"): # Temperature message. 'T:' for extruder and 'B:' for bed
extruder_temperature_matches = re.findall(b"T(\d*): ?([\d\.]+) ?\/?([\d\.]+)?", line)
# Update all temperature values
matched_extruder_nrs = []