From d25d2eaa423d1850e8805f8d5dda06496897eec0 Mon Sep 17 00:00:00 2001 From: Terje Io Date: Fri, 31 Jan 2025 19:15:53 +0100 Subject: [PATCH] Fixed some typos causing compilation failure in some configurations. 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. --- README.md | 2 +- changelog.md | 18 ++++++++++++++++-- gcode.c | 5 +++-- grbl.h | 2 +- settings.c | 2 +- 5 files changed, 22 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 75016d0..832f325 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ## grblHAL ## -Latest build date is 20250128, see the [changelog](changelog.md) for details. +Latest build date is 20250131, see the [changelog](changelog.md) for details. > [!NOTE] > A settings reset will be performed on an update of builds prior to 20241208. Backup and restore of settings is recommended. diff --git a/changelog.md b/changelog.md index 3e946f6..7bf8e48 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,21 @@ ## grblHAL changelog +Build 20250131 + +Core: + +* Fixed some typos causing compilation failure in some configurations. + +* 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. + +Drivers: + +* STM32F4xx: Allow `$DFU` command if critical alarm is active. Fixed LongBoard32 map for incorrect motor -> axis mapping when four axes where configured. + +--- + Build 20250129 Core: @@ -451,8 +467,6 @@ Plugins: --- -## grblHAL changelog - Build 20241217 Core: diff --git a/gcode.c b/gcode.c index 722020a..8b3e96b 100644 --- a/gcode.c +++ b/gcode.c @@ -573,7 +573,7 @@ bool gc_modal_state_restore (gc_modal_t *copy) if((spindle = &gc_state.modal.spindle[--idx])->hal) { spindle_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. } diff --git a/grbl.h b/grbl.h index a5914a8..a867ac0 100644 --- a/grbl.h +++ b/grbl.h @@ -42,7 +42,7 @@ #else #define GRBL_VERSION "1.1f" #endif -#define GRBL_BUILD 20250129 +#define GRBL_BUILD 20250131 #define GRBL_URL "https://github.com/grblHAL" diff --git a/settings.c b/settings.c index 64f19ec..f0270cd 100644 --- a/settings.c +++ b/settings.c @@ -3360,7 +3360,7 @@ void settings_init (void) if(!settings.flags.settings_downgrade && settings.version.build != (GRBL_BUILD - 20000000UL)) { if(settings.version.build <= 250102) { - settings.spindle.on_delay = settings.safety_door.spindle_on_delay * 1000.0f; +// settings.spindle.on_delay = settings.safety_door.spindle_on_delay * 1000.0f; settings.coolant.on_delay = settings.safety_door.coolant_on_delay * 1000.0f; if((changed.spindle = settings.spindle.at_speed_tolerance != settings.pwm_spindle.at_speed_tolerance)) { settings.spindle.at_speed_tolerance = settings.pwm_spindle.at_speed_tolerance;