Better display of GRBL Alarm states vlachoudis#1428

bCNC/controllers/GRBL1.py

@@ -103,7 +103,8 @@ def parseBracketAngle(self, line, cline):
 		if CNC.vars["state"] != fields[0] or self.master.runningPrev != self.master.running:
 			self.master.controllerStateChange(fields[0])
 		self.master.runningPrev = self.master.running
-		CNC.vars["state"] = fields[0]
+
+		self.displayState(fields[0])
 
 		for field in fields[1:]:
 			word = SPLITPAT.split(field)

bCNC/controllers/_GenericController.py

@@ -185,6 +185,21 @@ def purgeController(self):
 		self.viewState()
 
 
+	#----------------------------------------------------------------------
+	def displayState(self, state):
+		state = state.strip()
+
+		#Do not show g-code errors, when machine is already in alarm state
+		if (CNC.vars["state"].startswith("ALARM:") and state.startswith("error:")):
+			return
+
+		# Do not show alarm without number when we already display alarm with number
+		if (state == "Alarm" and CNC.vars["state"].startswith("ALARM:")):
+			return
+
+		CNC.vars["state"] = state
+
+
 	#----------------------------------------------------------------------
 	def parseLine(self, line, cline, sline):
 		if not line:
@@ -208,7 +223,7 @@ def parseLine(self, line, cline, sline):
 			if sline: CNC.vars["errline"] = sline.pop(0)
 			if not self.master._alarm: self.master._posUpdate = True
 			self.master._alarm = True
-			CNC.vars["state"] = line
+			self.displayState(line)
 			if self.master.running:
 				self.master._stop = True