mirror of
https://github.com/grblHAL/core.git
synced 2026-09-27 19:13:58 +08:00
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.
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
## grblHAL ##
|
## 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]
|
> [!NOTE]
|
||||||
> A settings reset will be performed on an update of builds prior to 20241208. Backup and restore of settings is recommended.
|
> A settings reset will be performed on an update of builds prior to 20241208. Backup and restore of settings is recommended.
|
||||||
|
|||||||
+16
-2
@@ -1,5 +1,21 @@
|
|||||||
## grblHAL changelog
|
## grblHAL changelog
|
||||||
|
|
||||||
|
<a name="20250131">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.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
<a name="20250129">Build 20250129
|
<a name="20250129">Build 20250129
|
||||||
|
|
||||||
Core:
|
Core:
|
||||||
@@ -451,8 +467,6 @@ Plugins:
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## grblHAL changelog
|
|
||||||
|
|
||||||
<a name="20241217">Build 20241217
|
<a name="20241217">Build 20241217
|
||||||
|
|
||||||
Core:
|
Core:
|
||||||
|
|||||||
@@ -573,7 +573,7 @@ bool gc_modal_state_restore (gc_modal_t *copy)
|
|||||||
if((spindle = &gc_state.modal.spindle[--idx])->hal) {
|
if((spindle = &gc_state.modal.spindle[--idx])->hal) {
|
||||||
spindle_copy = ©->spindle[idx];
|
spindle_copy = ©->spindle[idx];
|
||||||
if(!memcmp(spindle_copy, spindle, offsetof(spindle_t, hal)))
|
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);
|
} while(idx);
|
||||||
#else
|
#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->rpm != gc_block.values.s || gc_parser_flags.spindle_force_sync) {
|
||||||
if(sspindle->state.on && !gc_parser_flags.laser_is_motion) {
|
if(sspindle->state.on && !gc_parser_flags.laser_is_motion) {
|
||||||
sspindle->hal->param->rpm = gc_block.values.s;
|
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.
|
sspindle->rpm = gc_block.values.s; // Update spindle speed state.
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -42,7 +42,7 @@
|
|||||||
#else
|
#else
|
||||||
#define GRBL_VERSION "1.1f"
|
#define GRBL_VERSION "1.1f"
|
||||||
#endif
|
#endif
|
||||||
#define GRBL_BUILD 20250129
|
#define GRBL_BUILD 20250131
|
||||||
|
|
||||||
#define GRBL_URL "https://github.com/grblHAL"
|
#define GRBL_URL "https://github.com/grblHAL"
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -3360,7 +3360,7 @@ void settings_init (void)
|
|||||||
if(!settings.flags.settings_downgrade && settings.version.build != (GRBL_BUILD - 20000000UL)) {
|
if(!settings.flags.settings_downgrade && settings.version.build != (GRBL_BUILD - 20000000UL)) {
|
||||||
|
|
||||||
if(settings.version.build <= 250102) {
|
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;
|
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)) {
|
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;
|
settings.spindle.at_speed_tolerance = settings.pwm_spindle.at_speed_tolerance;
|
||||||
|
|||||||
Reference in New Issue
Block a user