File tree 1 file changed +7
-4
lines changed
1 file changed +7
-4
lines changed Original file line number Diff line number Diff line change 5
5
6
6
Part of grblHAL
7
7
8
- Copyright (c) 2016-2021 Terje Io
8
+ Copyright (c) 2016-2022 Terje Io
9
9
Copyright (c) 2011-2015 Sungeun K. Jeon
10
10
Copyright (c) 2009-2011 Simen Svale Skogsrud
11
11
32
32
#include "grbl/grbl.h"
33
33
#include "grbl/limits.h"
34
34
#include "grbl/nuts_bolts.h"
35
+ #include "grbl/state_machine.h"
35
36
36
37
#ifdef EEPROM_ENABLE
37
38
#include "i2c.h"
@@ -55,8 +56,10 @@ static void driver_delay_ms (uint32_t ms, void (*callback)(void))
55
56
if ((delay .ms = ms > 0 )) {
56
57
SYSTICK_TIMER_CCR0 = ms ;
57
58
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
+ }
60
63
} else if (callback )
61
64
callback ();
62
65
}
@@ -678,7 +681,7 @@ bool driver_init (void)
678
681
SYSTICK_TIMER_CCTL0 |= CCIE ;
679
682
680
683
hal .info = "MSP430F5529" ;
681
- hal .driver_version = "211126 " ;
684
+ hal .driver_version = "220111 " ;
682
685
hal .driver_setup = driver_setup ;
683
686
hal .f_step_timer = 24000000 ;
684
687
hal .rx_buffer_size = RX_BUFFER_SIZE ;
You can’t perform that action at this time.
0 commit comments