- Probe forgotten to set the feed on horizontal probes

- Variable error in _terminal
vlachoudis · Feb 9, 2016 · a5ac3f3 · a5ac3f3
1 parent 3767cf0
commit a5ac3f3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/ProbePage.py b/ProbePage.py
@@ -533,20 +533,25 @@ def probe(self, event=None):
 
 		cmd = str(CNC.vars["prbcmd"])
 		ok = False
+
 		v = self.probeXdir.get()
 		if v != "":
 			cmd += "X"+str(v)
 			ok = True
+
 		v = self.probeYdir.get()
 		if v != "":
 			cmd += "Y"+str(v)
 			ok = True
+
 		v = self.probeZdir.get()
 		if v != "":
 			cmd += "Z"+str(v)
 			ok = True
+
+		v = ProbeCommonFrame.probeFeed.get()
 		if v != "":
-			cmd += "F"+str(CNC.vars["prbfeed"])
+			cmd += "F"+str(v)
 
 		if ok:
 			self.sendGrbl(cmd+"\n")

diff --git a/bCNC.py b/bCNC.py
@@ -2095,7 +2095,7 @@ def _monitorSerial(self):
 				if self._terminalCount > 1000:
 					try:
 						self.terminal.delete("0.0","500.0")
-						self._terminalCount = int(self._terminal.index(END).split(".")[0])
+						self._terminalCount = int(self.terminal.index(END).split(".")[0])
 					except TclError:
 						pass
 			except Empty: