From 5804825dc3f085f071e2879a7d675f3be033cbcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= <osd@foosel.net>
Date: Wed, 15 Apr 2015 09:14:36 +0200
Subject: [PATCH] Fix: Made initial connection to printer a bit more responsive

Having to wait for the first serial timeout before sending the first M105 even when not waiting for seeing a "start" caused unnecessary wait times for reaching the "Operational" state.
---
 src/octoprint/util/comm.py | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/octoprint/util/comm.py b/src/octoprint/util/comm.py
index 2e7c3733..218f6b06 100644
--- a/src/octoprint/util/comm.py
+++ b/src/octoprint/util/comm.py
@@ -787,6 +787,11 @@ class MachineCom(object):
 		startSeen = not settings().getBoolean(["feature", "waitForStartOnConnect"])
 		supportRepetierTargetTemp = settings().getBoolean(["feature", "repetierTargetTemp"])
 
+		# enqueue an M105 first thing
+		self._sendCommand("M105")
+		if startSeen:
+			self._clear_to_send.set()
+
 		while self._monitoring_active:
 			try:
 				line = self._readline()
@@ -1007,6 +1012,7 @@ class MachineCom(object):
 							self._serial.write('\n')
 							self._log("Baudrate test retry: %d" % (self._baudrateDetectRetry))
 							self._sendCommand("M105")
+							self._clear_to_send.set()
 							self._testingBaudrate = True
 						else:
 							baudrate = self._baudrateDetectList.pop(0)
@@ -1019,6 +1025,7 @@ class MachineCom(object):
 								self._timeout = get_new_timeout("communication")
 								self._serial.write('\n')
 								self._sendCommand("M105")
+								self._clear_to_send.set()
 								self._testingBaudrate = True
 							except:
 								self._log("Unexpected error while setting baudrate: %d %s" % (baudrate, get_exception_string()))
@@ -1036,10 +1043,9 @@ class MachineCom(object):
 
 				### Connection attempt
 				elif self._state == self.STATE_CONNECTING:
-					if (line == "" or "wait" in line) and startSeen:
-						self._sendCommand("M105")
-					elif "start" in line:
+					if "start" in line and not startSeen:
 						startSeen = True
+						self._clear_to_send.set()
 					elif "ok" in line and startSeen:
 						self._onConnected()
 					elif time.time() > self._timeout:
@@ -1216,7 +1222,6 @@ class MachineCom(object):
 				self._changeState(self.STATE_ERROR)
 				eventManager().fire(Events.ERROR, {"error": self.getErrorString()})
 				return False
-		self._clear_to_send.set()
 		return True
 
 	def _handleErrors(self, line):
@@ -1464,6 +1469,8 @@ class MachineCom(object):
 		sending (through received ``ok`` responses from the printer's firmware.
 		"""
 
+		self._clear_to_send.wait()
+
 		while self._send_queue_active:
 			try:
 				# wait until we have something in the queue