Skip to content

Commit 4446d48

Browse files
committed
Added call to new core event.
1 parent 955a68a commit 4446d48

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

driver.c

+7-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
66
Part of grblHAL
77
8-
Copyright (c) 2016-2021 Terje Io
8+
Copyright (c) 2016-2022 Terje Io
99
Copyright (c) 2011-2015 Sungeun K. Jeon
1010
Copyright (c) 2009-2011 Simen Svale Skogsrud
1111
@@ -32,6 +32,7 @@
3232
#include "grbl/grbl.h"
3333
#include "grbl/limits.h"
3434
#include "grbl/nuts_bolts.h"
35+
#include "grbl/state_machine.h"
3536

3637
#ifdef EEPROM_ENABLE
3738
#include "i2c.h"
@@ -55,8 +56,10 @@ static void driver_delay_ms (uint32_t ms, void (*callback)(void))
5556
if((delay.ms = ms > 0)) {
5657
SYSTICK_TIMER_CCR0 = ms;
5758
SYSTICK_TIMER_CTL |= TACLR|MC0;
58-
if(!(delay.callback = callback))
59-
while(delay.ms);
59+
if(!(delay.callback = callback)) {
60+
while(delay.ms)
61+
grbl.on_execute_delay(state_get());
62+
}
6063
} else if(callback)
6164
callback();
6265
}
@@ -678,7 +681,7 @@ bool driver_init (void)
678681
SYSTICK_TIMER_CCTL0 |= CCIE;
679682

680683
hal.info = "MSP430F5529";
681-
hal.driver_version = "211126";
684+
hal.driver_version = "220111";
682685
hal.driver_setup = driver_setup;
683686
hal.f_step_timer = 24000000;
684687
hal.rx_buffer_size = RX_BUFFER_SIZE;

0 commit comments

Comments
 (0)