Mirrors_Framework/grblHAL
1
0
Fork 0
mirror of https://github.com/grblHAL/core.git synced 2026-03-27 02:36:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changed error code reported when file not found for G65 macro or named O-sub calls from 39 to 84.

Browse Source 
Removed IDLE state requirement for executing G65 macros, an error will no longer be returned and the macro will be run.
Added event handler for outputting welcome message on "native" USB connect for drivers that provides the linestate changed event.
This commit is contained in:
Terje Io
2025-01-05 08:18:52 +01:00
parent f9f3759095
commit b80cd2f3f8
11 changed files with 75 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
grbllib.c
View File

@@ -3,7 +3,7 @@
Part of grblHAL
Copyright (c) 2017-2024 Terje Io
Copyright (c) 2017-2025 Terje Io
Copyright (c) 2011-2015 Sungeun K. Jeon
Copyright (c) 2009-2011 Simen Svale Skogsrud
@@ -92,6 +92,7 @@ grbl_hal_t hal;
static driver_startup_t driver = { .ok = 0xFF };
static core_task_t task_pool[CORE_TASK_POOL_SIZE] = {0};
static core_task_t *next_task = NULL, *immediate_task = NULL, *systick_task = NULL, *last_freed = NULL;
static on_linestate_changed_ptr on_linestate_changed;
#ifdef KINEMATICS_API
kinematics_t kinematics;
@@ -166,6 +167,20 @@ ISR_CODE static home_signals_t ISR_FUNC(get_homing_status2)(void)
return home;
}
static void output_welcome_message (void *data)
{
grbl.report.init_message(hal.stream.write);
}
static void onLinestateChanged (serial_linestate_t state)
{
if(state.dtr)
task_add_delayed(output_welcome_message, NULL, 200);
if(on_linestate_changed)
on_linestate_changed(state);
}
// main entry point
int grbl_enter (void)
@@ -333,6 +348,11 @@ int grbl_enter (void)
setting_remove_elements(Setting_FSOptions, fs_options.mask);
}
if(hal.stream.state.linestate_event && !hal.stream.state.passthru) {
on_linestate_changed = hal.stream.on_linestate_changed;
hal.stream.on_linestate_changed = onLinestateChanged;
}
// Initialization loop upon power-up or a system abort. For the latter, all processes
// will return to this loop to be cleanly re-initialized.
while(looping) {
@@ -380,7 +400,7 @@ int grbl_enter (void)
tc_init();
// Print welcome message. Indicates an initialization has occurred at power-up or with a reset.
grbl.report.init_message();
grbl.report.init_message(hal.stream.write_all);
if(!settings.flags.no_unlock_after_estop && state_get() == STATE_ESTOP)
state_set(STATE_ALARM);