Mirrors_Framework/grblHAL
1
0
Fork 0
mirror of https://github.com/grblHAL/core.git synced 2026-09-23 20:55:24 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed some typos causing compilation failure in some configurations.

Browse Source 
No longer copies spindle on delay from door setting ($392) to the new general setting ($340) on update from pre 20250103 builds.
Fixed missed code change when general spindle on delay was implemented causing the delay to be inserted on a simple RPM change with the S word.
This commit is contained in:
Terje Io
2025-01-31 19:15:53 +01:00
parent fd3438da34
commit d25d2eaa42
5 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gcode.c
+3 -2
View File
@@ -573,7 +573,7 @@ bool gc_modal_state_restore (gc_modal_t *copy)
if((spindle = &gc_state.modal.spindle[--idx])->hal) {
spindle_copy = &copy->spindle[idx];
if(!memcmp(spindle_copy, spindle, offsetof(spindle_t, hal)))
spindle_restore(spindle->hal, spindle_copy->state, spindle_copy->rpm);
spindle_restore(spindle->hal, spindle_copy->state, spindle_copy->rpm, settings.spindle.on_delay);
}
} while(idx);
#else
@@ -3218,7 +3218,8 @@ status_code_t gc_execute_block (char *block)
if(sspindle->rpm != gc_block.values.s || gc_parser_flags.spindle_force_sync) {
if(sspindle->state.on && !gc_parser_flags.laser_is_motion) {
sspindle->hal->param->rpm = gc_block.values.s;
spindle_set_state_synced(sspindle->hal, sspindle->state, gc_parser_flags.laser_disable ? 0.0f : gc_block.values.s);
protocol_buffer_synchronize();
spindle_set_state(sspindle->hal, sspindle->state, gc_parser_flags.laser_disable ? 0.0f : gc_block.values.s);
}
sspindle->rpm = gc_block.values.s; // Update spindle speed state.
}