Mirrors_Framework/grblHAL
1
0
Fork 0
mirror of https://github.com/grblHAL/core.git synced 2026-08-17 08:31:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed tool change and spindle stop on reset/stop commands regressions.

Browse Source
This commit is contained in:
Terje Io
2022-01-31 17:38:03 +01:00
parent 1c2dc4bfc5
commit d80c095936
7 changed files with 40 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stream.c
+10 -5
View File
@@ -121,6 +121,8 @@ ISR_CODE static bool ISR_FUNC(await_toolchange_ack)(char c)
hal.stream.read = stream.read; // restore normal input
hal.stream.set_enqueue_rt_handler(stream.enqueue_realtime_command);
stream.enqueue_realtime_command = NULL;
if(grbl.on_toolchange_ack)
grbl.on_toolchange_ack();
} else
return stream.enqueue_realtime_command(c);
@@ -130,11 +132,13 @@ ISR_CODE static bool ISR_FUNC(await_toolchange_ack)(char c)
bool stream_rx_suspend (stream_rx_buffer_t *rxbuffer, bool suspend)
{
if(suspend) {
stream.rxbuffer = rxbuffer;
stream.read = hal.stream.read;
stream.enqueue_realtime_command = hal.stream.set_enqueue_rt_handler(await_toolchange_ack);
hal.stream.read = stream_get_null;
} else {
if(stream.rxbuffer == NULL) {
stream.rxbuffer = rxbuffer;
stream.read = hal.stream.read;
stream.enqueue_realtime_command = hal.stream.set_enqueue_rt_handler(await_toolchange_ack);
hal.stream.read = stream_get_null;
}
} else if(stream.rxbuffer) {
if(rxbuffer->backup)
memcpy(rxbuffer, &rxbackup, sizeof(stream_rx_buffer_t));
if(stream.enqueue_realtime_command) {
@@ -142,6 +146,7 @@ bool stream_rx_suspend (stream_rx_buffer_t *rxbuffer, bool suspend)
hal.stream.set_enqueue_rt_handler(stream.enqueue_realtime_command);
stream.enqueue_realtime_command = NULL;
}
stream.rxbuffer = NULL;
}
return rxbuffer->tail != rxbuffer->head;