fix: bogen in de GRBL-wachtrij houden
Elke boog wachtte tot de buffer leeg was, waardoor de machine in de bocht tot stilstand remde. Rechte lijnen zaten al in de wachtrij.
@@ -595,8 +595,12 @@ class Machine:
595
595
self.message = "Gestopt"
596
596
597
597
def _run_job(self, lines: list[str]) -> None:
598
# GRBL antwoordt ok als een regel in de planner staat, niet als de beweging klaar is.
599
# Rechte lijnen én bogen blijven daarom in de 128-byte ontvangstbuffer (we houden
600
# 110 vrij). Per boog wachten leegt de vooruitblik, en dan remt de machine tot stilstand.
601
# Alleen $ moet wachten tot Idle, anders komt error 8.
598
602
used = 0
599
pending: list[int] = []
603
pending: list[tuple[int, str]] = []
600
604
sent = 0
601
605
try:
602
606
if not self._stop.is_set():
@@ -607,37 +611,34 @@ class Machine:
607
611
time.sleep(0.05)
608
612
if self._stop.is_set():
609
613
break
610
if line.startswith("$") or line.startswith(("G2 ", "G3 ")):
614
if line.startswith("$"):
611
615
while pending and not self._stop.is_set():
612
ack = self._wait_ack(60)
613
used -= pending.pop(0)
616
used -= pending[0][0]
617
ack = self._accept_ack(pending.pop(0)[1])
614
618
if ack.startswith("error"):
615
619
raise RuntimeError(ack)
616
if line.startswith("$"):
617
self._wait_until_idle(60)
620
self._wait_until_idle(60)
618
621
if self._stop.is_set():
619
622
break
620
self._job_line(line, 30 if line.startswith(("G2 ", "G3 ")) else 5)
623
self._job_line(line, 5)
621
624
sent += 1
622
625
self.progress = sent / len(lines)
623
626
continue
624
627
size = len(line) + 1
625
while used + size > 110 and not self._stop.is_set():
626
ack = self._wait_ack(30)
627
if pending:
628
used -= pending.pop(0)
628
while used + size > 110 and pending and not self._stop.is_set():
629
used -= pending[0][0]
630
ack = self._accept_ack(pending.pop(0)[1])
629
631
if ack.startswith("error"):
630
632
raise RuntimeError(ack)
631
633
if self._stop.is_set():
632
634
break
633
635
self._write_raw((line + "\n").encode())
634
pending.append(size)
636
pending.append((size, line))
635
637
used += size
636
638
sent += 1
637
639
self.progress = sent / len(lines)
638
640
while pending and not self._stop.is_set():
639
ack = self._wait_ack(60)
640
pending.pop(0)
641
ack = self._accept_ack(pending.pop(0)[1])
641
642
if ack.startswith("error"):
642
643
raise RuntimeError(ack)
643
644
if not self._stop.is_set():
@@ -658,6 +659,19 @@ class Machine:
658
659
self.job_paused = False
659
660
self._query()
660
661
662
def _accept_ack(self, line: str) -> str:
663
"""Antwoord op een regel die al in de buffer staat. Een afgekeurde boog wordt een lijn."""
664
ack = self._wait_ack(60)
665
if grbl_error_code(ack) == "33" and line.startswith(("G2 ", "G3 ")):
666
self._arc_fallbacks += 1
667
self._write_raw((chord_for_arc(line) + "\n").encode())
668
ack = self._wait_ack(60)
669
if not ack.startswith("error"):
670
with self._state_lock:
671
if grbl_error_code(self.error) == "33":
672
self.error = ""
673
return ack
674
661
675
def _job_line(self, line: str, timeout: float) -> None:
662
676
while self._pause.is_set() and not self._stop.is_set():
663
677
time.sleep(0.05)
@@ -595,8 +595,12 @@ class Machine:595
self.message = "Gestopt"595
self.message = "Gestopt"596
596
597
def _run_job(self, lines: list[str]) -> None:597
def _run_job(self, lines: list[str]) -> None:598
# GRBL antwoordt ok als een regel in de planner staat, niet als de beweging klaar is.599
# Rechte lijnen én bogen blijven daarom in de 128-byte ontvangstbuffer (we houden600
# 110 vrij). Per boog wachten leegt de vooruitblik, en dan remt de machine tot stilstand.601
# Alleen $ moet wachten tot Idle, anders komt error 8.598
used = 0602
used = 0599
pending: list[int] = []603
pending: list[tuple[int, str]] = []600
sent = 0604
sent = 0601
try:605
try:602
if not self._stop.is_set():606
if not self._stop.is_set():@@ -607,37 +611,34 @@ class Machine:607
time.sleep(0.05)611
time.sleep(0.05)608
if self._stop.is_set():612
if self._stop.is_set():609
break613
break610
if line.startswith("$") or line.startswith(("G2 ", "G3 ")):614
if line.startswith("$"):611
while pending and not self._stop.is_set():615
while pending and not self._stop.is_set():612
ack = self._wait_ack(60)616
used -= pending[0][0]613
used -= pending.pop(0)617
ack = self._accept_ack(pending.pop(0)[1])614
if ack.startswith("error"):618
if ack.startswith("error"):615
raise RuntimeError(ack)619
raise RuntimeError(ack)616
if line.startswith("$"):620
self._wait_until_idle(60)617
self._wait_until_idle(60)618
if self._stop.is_set():621
if self._stop.is_set():619
break622
break620
self._job_line(line, 30 if line.startswith(("G2 ", "G3 ")) else 5)623
self._job_line(line, 5)621
sent += 1624
sent += 1622
self.progress = sent / len(lines)625
self.progress = sent / len(lines)623
continue626
continue624
size = len(line) + 1627
size = len(line) + 1625
while used + size > 110 and not self._stop.is_set():628
while used + size > 110 and pending and not self._stop.is_set():626
ack = self._wait_ack(30)629
used -= pending[0][0]627
if pending:630
ack = self._accept_ack(pending.pop(0)[1])628
used -= pending.pop(0)629
if ack.startswith("error"):631
if ack.startswith("error"):630
raise RuntimeError(ack)632
raise RuntimeError(ack)631
if self._stop.is_set():633
if self._stop.is_set():632
break634
break633
self._write_raw((line + "\n").encode())635
self._write_raw((line + "\n").encode())634
pending.append(size)636
pending.append((size, line))635
used += size637
used += size636
sent += 1638
sent += 1637
self.progress = sent / len(lines)639
self.progress = sent / len(lines)638
while pending and not self._stop.is_set():640
while pending and not self._stop.is_set():639
ack = self._wait_ack(60)641
ack = self._accept_ack(pending.pop(0)[1])640
pending.pop(0)641
if ack.startswith("error"):642
if ack.startswith("error"):642
raise RuntimeError(ack)643
raise RuntimeError(ack)643
if not self._stop.is_set():644
if not self._stop.is_set():@@ -658,6 +659,19 @@ class Machine:658
self.job_paused = False659
self.job_paused = False659
self._query()660
self._query()660
661
662
def _accept_ack(self, line: str) -> str:663
"""Antwoord op een regel die al in de buffer staat. Een afgekeurde boog wordt een lijn."""664
ack = self._wait_ack(60)665
if grbl_error_code(ack) == "33" and line.startswith(("G2 ", "G3 ")):666
self._arc_fallbacks += 1667
self._write_raw((chord_for_arc(line) + "\n").encode())668
ack = self._wait_ack(60)669
if not ack.startswith("error"):670
with self._state_lock:671
if grbl_error_code(self.error) == "33":672
self.error = ""673
return ack674
661
def _job_line(self, line: str, timeout: float) -> None:675
def _job_line(self, line: str, timeout: float) -> None:662
while self._pause.is_set() and not self._stop.is_set():676
while self._pause.is_set() and not self._stop.is_set():663
time.sleep(0.05)677
time.sleep(0.05)@@ -320,6 +320,31 @@ def test_virtual_machine() -> None:
320
320
finally:
321
321
machine.disconnect()
322
322
323
machine, grbl = connect(0, 0)
324
try:
325
grbl.defer_motion = True
326
machine.start_job("\n".join([
327
"G21",
328
"G90",
329
"G1 X10.000 Y-10.000 F3000",
330
"G2 X20.000 Y-20.000 I10.000 J0.000",
331
"G1 X30.000 Y-20.000",
332
]) + "\n")
333
deadline = time.time() + 8
334
while time.time() < deadline and "G1 X30.000 Y-20.000" not in grbl.commands:
335
time.sleep(0.02)
336
queued = [line for line in grbl.commands if line.startswith(("G1 X", "G2 ", "G3 "))]
337
check(
338
"boog staat in de wachtrij voor het antwoord",
339
"G2 X20.000 Y-20.000 I10.000 J0.000" in queued and "G1 X30.000 Y-20.000" in queued,
340
" | ".join(queued),
341
)
342
grbl.release_held()
343
machine._job.join(15)
344
check("wachtrij loopt af", not machine.job_active and machine.error == "", machine.message or machine.error)
345
finally:
346
machine.disconnect()
347
323
348
324
349
if __name__ == "__main__":
325
350
test_arc()
@@ -320,6 +320,31 @@ def test_virtual_machine() -> None:320
finally:320
finally:321
machine.disconnect()321
machine.disconnect()322
322
323
machine, grbl = connect(0, 0)324
try:325
grbl.defer_motion = True326
machine.start_job("\n".join([327
"G21",328
"G90",329
"G1 X10.000 Y-10.000 F3000",330
"G2 X20.000 Y-20.000 I10.000 J0.000",331
"G1 X30.000 Y-20.000",332
]) + "\n")333
deadline = time.time() + 8334
while time.time() < deadline and "G1 X30.000 Y-20.000" not in grbl.commands:335
time.sleep(0.02)336
queued = [line for line in grbl.commands if line.startswith(("G1 X", "G2 ", "G3 "))]337
check(338
"boog staat in de wachtrij voor het antwoord",339
"G2 X20.000 Y-20.000 I10.000 J0.000" in queued and "G1 X30.000 Y-20.000" in queued,340
" | ".join(queued),341
)342
grbl.release_held()343
machine._job.join(15)344
check("wachtrij loopt af", not machine.job_active and machine.error == "", machine.message or machine.error)345
finally:346
machine.disconnect()347
323
348
324
if __name__ == "__main__":349
if __name__ == "__main__":325
test_arc()350
test_arc()@@ -15,6 +15,13 @@ HOME_MPOS = (5.0, -3.0, 0.0)
15
15
_WORD = re.compile(r"([A-Za-z])\s*([+-]?(?:\d+(?:\.\d*)?|\.\d+))")
16
16
17
17
18
def _defer(line: str) -> bool:
19
"""XY-bewegingen en bogen: hun ok mag blijven liggen tot de test ze vrijgeeft."""
20
if line.startswith(("G2 ", "G3 ")):
21
return True
22
return line.startswith("G1 ") and "X" in line and "Y" in line
23
24
18
25
def _words(line: str) -> list[tuple[str, float]]:
19
26
return [(match.group(1).upper(), float(match.group(2))) for match in _WORD.finditer(line)]
20
27
@@ -32,6 +39,9 @@ class VirtualGrbl:
32
39
self.drawn: list[tuple[float, float]] = []
33
40
self.commands: list[str] = []
34
41
self.reject_dollar = 0
42
self.defer_motion = False
43
self.held_replies: list[str] = []
44
self.port: VirtualPort | None = None
35
45
self._polls = 0
36
46
self._line = ""
37
47
@@ -100,6 +110,29 @@ class VirtualGrbl:
100
110
101
111
def _command(self, line: str) -> list[str]:
102
112
self.commands.append(line)
113
replies = self._dispatch(line)
114
if self.defer_motion and _defer(line):
115
kept: list[str] = []
116
for reply in replies:
117
if reply == "ok" or reply.startswith("error:"):
118
self.held_replies.append(reply)
119
else:
120
kept.append(reply)
121
return kept
122
return replies
123
124
def release_held(self) -> None:
125
"""Geef vastgehouden ok-antwoorden vrij, in de volgorde waarin de regels binnenkwamen."""
126
self.defer_motion = False
127
held = self.held_replies
128
self.held_replies = []
129
port = self.port
130
if port is None:
131
return
132
for reply in held:
133
port.inject(reply)
134
135
def _dispatch(self, line: str) -> list[str]:
103
136
if line.startswith("$J="):
104
137
return self._jog(line[3:])
105
138
if line.startswith("$H"):
@@ -193,6 +226,7 @@ class VirtualGrbl:
193
226
class VirtualPort:
194
227
def __init__(self, grbl: VirtualGrbl) -> None:
195
228
self.grbl = grbl
229
self.grbl.port = self
196
230
self.timeout = 0.2
197
231
self._out: queue.Queue[bytes] = queue.Queue()
198
232
self._closed = False
@@ -15,6 +15,13 @@ HOME_MPOS = (5.0, -3.0, 0.0)15
_WORD = re.compile(r"([A-Za-z])\s*([+-]?(?:\d+(?:\.\d*)?|\.\d+))")15
_WORD = re.compile(r"([A-Za-z])\s*([+-]?(?:\d+(?:\.\d*)?|\.\d+))")16
16
17
17
18
def _defer(line: str) -> bool:19
"""XY-bewegingen en bogen: hun ok mag blijven liggen tot de test ze vrijgeeft."""20
if line.startswith(("G2 ", "G3 ")):21
return True22
return line.startswith("G1 ") and "X" in line and "Y" in line23
24
18
def _words(line: str) -> list[tuple[str, float]]:25
def _words(line: str) -> list[tuple[str, float]]:19
return [(match.group(1).upper(), float(match.group(2))) for match in _WORD.finditer(line)]26
return [(match.group(1).upper(), float(match.group(2))) for match in _WORD.finditer(line)]20
27
@@ -32,6 +39,9 @@ class VirtualGrbl:32
self.drawn: list[tuple[float, float]] = []39
self.drawn: list[tuple[float, float]] = []33
self.commands: list[str] = []40
self.commands: list[str] = []34
self.reject_dollar = 041
self.reject_dollar = 042
self.defer_motion = False43
self.held_replies: list[str] = []44
self.port: VirtualPort | None = None35
self._polls = 045
self._polls = 036
self._line = ""46
self._line = ""37
47
@@ -100,6 +110,29 @@ class VirtualGrbl:100
110
101
def _command(self, line: str) -> list[str]:111
def _command(self, line: str) -> list[str]:102
self.commands.append(line)112
self.commands.append(line)113
replies = self._dispatch(line)114
if self.defer_motion and _defer(line):115
kept: list[str] = []116
for reply in replies:117
if reply == "ok" or reply.startswith("error:"):118
self.held_replies.append(reply)119
else:120
kept.append(reply)121
return kept122
return replies123
124
def release_held(self) -> None:125
"""Geef vastgehouden ok-antwoorden vrij, in de volgorde waarin de regels binnenkwamen."""126
self.defer_motion = False127
held = self.held_replies128
self.held_replies = []129
port = self.port130
if port is None:131
return132
for reply in held:133
port.inject(reply)134
135
def _dispatch(self, line: str) -> list[str]:103
if line.startswith("$J="):136
if line.startswith("$J="):104
return self._jog(line[3:])137
return self._jog(line[3:])105
if line.startswith("$H"):138
if line.startswith("$H"):@@ -193,6 +226,7 @@ class VirtualGrbl:193
class VirtualPort:226
class VirtualPort:194
def __init__(self, grbl: VirtualGrbl) -> None:227
def __init__(self, grbl: VirtualGrbl) -> None:195
self.grbl = grbl228
self.grbl = grbl229
self.grbl.port = self196
self.timeout = 0.2230
self.timeout = 0.2197
self._out: queue.Queue[bytes] = queue.Queue()231
self._out: queue.Queue[bytes] = queue.Queue()198
self._closed = False232
self._closed = False