Removed waitForWait again (that didn't make much sense to begin with...)
parent
9618407aed
commit
e70071f6c1
|
@ -363,7 +363,6 @@ def getSettings():
|
||||||
"feature": {
|
"feature": {
|
||||||
"gcodeViewer": s.getBoolean(["feature", "gCodeVisualizer"]),
|
"gcodeViewer": s.getBoolean(["feature", "gCodeVisualizer"]),
|
||||||
"waitForStart": s.getBoolean(["feature", "waitForStartOnConnect"]),
|
"waitForStart": s.getBoolean(["feature", "waitForStartOnConnect"]),
|
||||||
"waitForWaitAfterStart": s.getBoolean(["feature", "waitForWaitAfterStartOnConnect"]),
|
|
||||||
"alwaysSendChecksum": s.getBoolean(["feature", "alwaysSendChecksum"]),
|
"alwaysSendChecksum": s.getBoolean(["feature", "alwaysSendChecksum"]),
|
||||||
"resetLineNumbersWithPrefixedN": s.getBoolean(["feature", "resetLineNumbersWithPrefixedN"])
|
"resetLineNumbersWithPrefixedN": s.getBoolean(["feature", "resetLineNumbersWithPrefixedN"])
|
||||||
},
|
},
|
||||||
|
@ -407,7 +406,6 @@ def setSettings():
|
||||||
if "feature" in data.keys():
|
if "feature" in data.keys():
|
||||||
if "gcodeViewer" in data["feature"].keys(): s.setBoolean(["feature", "gCodeVisualizer"], data["feature"]["gcodeViewer"])
|
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 "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 "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"])
|
if "resetLineNumbersWithPrefixedN" in data["feature"].keys(): s.setBoolean(["feature", "resetLineNumbersWithPrefixedN"], data["feature"]["resetLineNumbersWithPrefixedN"])
|
||||||
|
|
||||||
|
|
|
@ -994,7 +994,6 @@ function SettingsViewModel() {
|
||||||
|
|
||||||
self.feature_gcodeViewer = ko.observable(undefined);
|
self.feature_gcodeViewer = ko.observable(undefined);
|
||||||
self.feature_waitForStart = ko.observable(undefined);
|
self.feature_waitForStart = ko.observable(undefined);
|
||||||
self.feature_waitForWait = ko.observable(undefined);
|
|
||||||
self.feature_alwaysSendChecksum = ko.observable(undefined);
|
self.feature_alwaysSendChecksum = ko.observable(undefined);
|
||||||
self.feature_resetLineNumbersWithPrefixedN = ko.observable(undefined);
|
self.feature_resetLineNumbersWithPrefixedN = ko.observable(undefined);
|
||||||
|
|
||||||
|
@ -1041,7 +1040,6 @@ function SettingsViewModel() {
|
||||||
|
|
||||||
self.feature_gcodeViewer(response.feature.gcodeViewer);
|
self.feature_gcodeViewer(response.feature.gcodeViewer);
|
||||||
self.feature_waitForStart(response.feature.waitForStart);
|
self.feature_waitForStart(response.feature.waitForStart);
|
||||||
self.feature_waitForWait(response.feature.waitForWait);
|
|
||||||
self.feature_alwaysSendChecksum(response.feature.alwaysSendChecksum);
|
self.feature_alwaysSendChecksum(response.feature.alwaysSendChecksum);
|
||||||
self.feature_resetLineNumbersWithPrefixedN(response.feature.resetLineNumbersWithPrefixedN);
|
self.feature_resetLineNumbersWithPrefixedN(response.feature.resetLineNumbersWithPrefixedN);
|
||||||
|
|
||||||
|
@ -1077,7 +1075,6 @@ function SettingsViewModel() {
|
||||||
"feature": {
|
"feature": {
|
||||||
"gcodeViewer": self.feature_gcodeViewer(),
|
"gcodeViewer": self.feature_gcodeViewer(),
|
||||||
"waitForStart": self.feature_waitForStart(),
|
"waitForStart": self.feature_waitForStart(),
|
||||||
"waitForWait": self.feature_waitForWait(),
|
|
||||||
"alwaysSendChecksum": self.feature_alwaysSendChecksum(),
|
"alwaysSendChecksum": self.feature_alwaysSendChecksum(),
|
||||||
"resetLineNumbersWithPrefixedN": self.feature_resetLineNumbersWithPrefixedN()
|
"resetLineNumbersWithPrefixedN": self.feature_resetLineNumbersWithPrefixedN()
|
||||||
},
|
},
|
||||||
|
|
|
@ -106,13 +106,6 @@
|
||||||
</label>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
</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="control-group">
|
||||||
<div class="controls">
|
<div class="controls">
|
||||||
<label class="checkbox">
|
<label class="checkbox">
|
||||||
|
|
|
@ -347,7 +347,6 @@ class MachineCom(object):
|
||||||
timeout = time.time() + 5
|
timeout = time.time() + 5
|
||||||
tempRequestTimeout = timeout
|
tempRequestTimeout = timeout
|
||||||
startSeen = not settings().getBoolean(["feature", "waitForStartOnConnect"])
|
startSeen = not settings().getBoolean(["feature", "waitForStartOnConnect"])
|
||||||
waitSeen = not settings().getBoolean(["feature", "waitForWaitOnConnect"])
|
|
||||||
while True:
|
while True:
|
||||||
line = self._readline()
|
line = self._readline()
|
||||||
if line == None:
|
if line == None:
|
||||||
|
@ -439,13 +438,11 @@ class MachineCom(object):
|
||||||
|
|
||||||
### Connection attempt
|
### Connection attempt
|
||||||
elif self._state == self.STATE_CONNECTING:
|
elif self._state == self.STATE_CONNECTING:
|
||||||
if line == "" and startSeen and waitSeen:
|
if (line == "" or "wait" in line) and startSeen:
|
||||||
self._sendCommand("M105")
|
self._sendCommand("M105")
|
||||||
elif "start" in line:
|
elif "start" in line:
|
||||||
startSeen = True
|
startSeen = True
|
||||||
elif "wait" in line:
|
elif "ok" in line and startSeen:
|
||||||
waitSeen = True
|
|
||||||
elif "ok" in line and startSeen and waitSeen:
|
|
||||||
self._changeState(self.STATE_OPERATIONAL)
|
self._changeState(self.STATE_OPERATIONAL)
|
||||||
elif time.time() > timeout:
|
elif time.time() > timeout:
|
||||||
self.close()
|
self.close()
|
||||||
|
|
Loading…
Reference in New Issue