Merge branch 'master' into dxf

Charlres1961 · Feb 5, 2017 · affdbf1 · affdbf1
2 parents 112543e + 5f16bbf
commit affdbf1
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/Sender.py b/Sender.py
@@ -1139,12 +1139,11 @@ def serialIO(self):
 					self._gcount += 1
 					if cline: del cline[0]
 					if sline: del sline[0]
-					#print "gcount OK=",self._gcount
 					#print "SLINE:",sline
-					if  self._alarm and not self.running:
-						# turn off alarm for connected status once
-						# a valid gcode event occurs
-						self._alarm = False
+#					if  self._alarm and not self.running:
+#						# turn off alarm for connected status once
+#						# a valid gcode event occurs
+#						self._alarm = False
 
 				elif line[0] == "$":
 					self.log.put((Sender.MSG_RECEIVE, line))