Browse Source

Merge branch 'hotfix/simplify-baud-job-plugin' of https://github.com/aerotog/Cura into aerotog-hotfix/simplify-baud-job-plugin

Ghostkeeper 4 years ago
parent
commit
abe2a56a03
1 changed files with 5 additions and 8 deletions
  1. 5 8
      plugins/USBPrinting/AutoDetectBaudJob.py

+ 5 - 8
plugins/USBPrinting/AutoDetectBaudJob.py

@@ -62,7 +62,6 @@ class AutoDetectBaudJob(Job):
                     except ValueError:
                         continue
                 sleep(wait_bootloader)  # Ensure that we are not talking to the boot loader. 1.5 seconds seems to be the magic number
-                successful_responses = 0
 
                 serial.write(b"\n")  # Ensure we clear out previous responses
                 serial.write(b"M105\n")
@@ -73,13 +72,11 @@ class AutoDetectBaudJob(Job):
                 while timeout_time > time():
                     line = serial.readline()
                     if b"ok" in line and b"T:" in line:
-                        successful_responses += 1
-                        if successful_responses >= 1:
-                            self.setResult(baud_rate)
-                            Logger.log("d", "Detected baud rate {baud_rate} on serial {serial} on retry {retry} with after {time_elapsed:0.2f} seconds.".format(
-                                serial = self._serial_port, baud_rate = baud_rate, retry = retry, time_elapsed = time() - start_timeout_time))
-                            serial.close() # close serial port so it can be opened by the USBPrinterOutputDevice
-                            return
+                        self.setResult(baud_rate)
+                        Logger.log("d", "Detected baud rate {baud_rate} on serial {serial} on retry {retry} with after {time_elapsed:0.2f} seconds.".format(
+                            serial = self._serial_port, baud_rate = baud_rate, retry = retry, time_elapsed = time() - start_timeout_time))
+                        serial.close() # close serial port so it can be opened by the USBPrinterOutputDevice
+                        return
 
                     serial.write(b"M105\n")
             sleep(15)  # Give the printer some time to init and try again.