From e70071f6c113412bae5294982c1c3366647548f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= <osd@foosel.net>
Date: Mon, 1 Apr 2013 17:31:02 +0200
Subject: [PATCH] Removed waitForWait again (that didn't make much sense to
 begin with...)

---
 octoprint/server.py               | 2 --
 octoprint/static/js/ui.js         | 3 ---
 octoprint/templates/settings.html | 7 -------
 octoprint/util/comm.py            | 7 ++-----
 4 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/octoprint/server.py b/octoprint/server.py
index a625261..f620266 100644
--- a/octoprint/server.py
+++ b/octoprint/server.py
@@ -363,7 +363,6 @@ def getSettings():
 		"feature": {
 			"gcodeViewer": s.getBoolean(["feature", "gCodeVisualizer"]),
 			"waitForStart": s.getBoolean(["feature", "waitForStartOnConnect"]),
-			"waitForWaitAfterStart": s.getBoolean(["feature", "waitForWaitAfterStartOnConnect"]),
 			"alwaysSendChecksum": s.getBoolean(["feature", "alwaysSendChecksum"]),
 			"resetLineNumbersWithPrefixedN": s.getBoolean(["feature", "resetLineNumbersWithPrefixedN"])
 		},
@@ -407,7 +406,6 @@ def setSettings():
 		if "feature" in data.keys():
 			if "gcodeViewer" in data["feature"].keys(): s.setBoolean(["feature", "gCodeVisualizer"], data["feature"]["gcodeViewer"])
 			if "waitForStart" in data["feature"].keys(): s.setBoolean(["feature", "waitForStartOnConnect"], data["feature"]["waitForStart"])
-			if "waitForWait" in data["feature"].keys(): s.setBoolean(["feature", "waitForWaitOnConnect"], data["feature"]["waitForWait"]),
 			if "alwaysSendChecksum" in data["feature"].keys(): s.setBoolean(["feature", "alwaysSendChecksum"], data["feature"]["alwaysSendChecksum"])
 			if "resetLineNumbersWithPrefixedN" in data["feature"].keys(): s.setBoolean(["feature", "resetLineNumbersWithPrefixedN"], data["feature"]["resetLineNumbersWithPrefixedN"])
 
diff --git a/octoprint/static/js/ui.js b/octoprint/static/js/ui.js
index 240dfe3..222df2b 100644
--- a/octoprint/static/js/ui.js
+++ b/octoprint/static/js/ui.js
@@ -994,7 +994,6 @@ function SettingsViewModel() {
 
     self.feature_gcodeViewer = ko.observable(undefined);
     self.feature_waitForStart = ko.observable(undefined);
-    self.feature_waitForWait = ko.observable(undefined);
     self.feature_alwaysSendChecksum = ko.observable(undefined);
     self.feature_resetLineNumbersWithPrefixedN = ko.observable(undefined);
 
@@ -1041,7 +1040,6 @@ function SettingsViewModel() {
 
         self.feature_gcodeViewer(response.feature.gcodeViewer);
         self.feature_waitForStart(response.feature.waitForStart);
-        self.feature_waitForWait(response.feature.waitForWait);
         self.feature_alwaysSendChecksum(response.feature.alwaysSendChecksum);
         self.feature_resetLineNumbersWithPrefixedN(response.feature.resetLineNumbersWithPrefixedN);
 
@@ -1077,7 +1075,6 @@ function SettingsViewModel() {
             "feature": {
                 "gcodeViewer": self.feature_gcodeViewer(),
                 "waitForStart": self.feature_waitForStart(),
-                "waitForWait": self.feature_waitForWait(),
                 "alwaysSendChecksum": self.feature_alwaysSendChecksum(),
                 "resetLineNumbersWithPrefixedN": self.feature_resetLineNumbersWithPrefixedN()
             },
diff --git a/octoprint/templates/settings.html b/octoprint/templates/settings.html
index 6d8af47..f9bc048 100644
--- a/octoprint/templates/settings.html
+++ b/octoprint/templates/settings.html
@@ -106,13 +106,6 @@
                                 </label>
                             </div>
                         </div>
-                        <div class="control-group">
-                            <div class="controls">
-                                <label class="checkbox">
-                                    <input type="checkbox" data-bind="checked: feature_waitForWait" id="settings-featureWaitForWait"> Wait for <code>wait</code> on connect <span class="label">Repetier</span>
-                                </label>
-                            </div>
-                        </div>
                         <div class="control-group">
                             <div class="controls">
                                 <label class="checkbox">
diff --git a/octoprint/util/comm.py b/octoprint/util/comm.py
index c6b8a0a..a51aff7 100644
--- a/octoprint/util/comm.py
+++ b/octoprint/util/comm.py
@@ -347,7 +347,6 @@ class MachineCom(object):
 		timeout = time.time() + 5
 		tempRequestTimeout = timeout
 		startSeen = not settings().getBoolean(["feature", "waitForStartOnConnect"])
-		waitSeen = not settings().getBoolean(["feature", "waitForWaitOnConnect"])
 		while True:
 			line = self._readline()
 			if line == None:
@@ -439,13 +438,11 @@ class MachineCom(object):
 
 			### Connection attempt
 			elif self._state == self.STATE_CONNECTING:
-				if line == "" and startSeen and waitSeen:
+				if (line == "" or "wait" in line) and startSeen:
 					self._sendCommand("M105")
 				elif "start" in line:
 					startSeen = True
-				elif "wait" in line:
-					waitSeen = True
-				elif "ok" in line and startSeen and waitSeen:
+				elif "ok" in line and startSeen:
 					self._changeState(self.STATE_OPERATIONAL)
 				elif time.time() > timeout:
 					self.close()