From 6ee4eeda10007178fe6b79e0dedbebefa250790c Mon Sep 17 00:00:00 2001 From: Thomas Nixon Date: Sun, 24 Nov 2024 15:28:30 +0000 Subject: [PATCH] GRBL1: account for Hold sub-states in wait condition This fixes a problem in toolChange, where %wait continues too soon after a command which transitions through an idle state. --- bCNC/controllers/GRBL1.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bCNC/controllers/GRBL1.py b/bCNC/controllers/GRBL1.py index 76b063259..bddef321f 100644 --- a/bCNC/controllers/GRBL1.py +++ b/bCNC/controllers/GRBL1.py @@ -216,10 +216,11 @@ def parseBracketAngle(self, line, cline): break # Machine is Idle buffer is empty stop waiting and go on + main_state = fields[0].split(":")[0] if ( self.master.sio_wait and not cline - and fields[0] not in ("Run", "Jog", "Hold") + and main_state not in ("Run", "Jog", "Hold") ): self.master.sio_wait = False self.master._gcount += 1