From e350ea501e4544df2eb4cc15d559b869d1054ed0 Mon Sep 17 00:00:00 2001 From: terjeio Date: Tue, 2 Dec 2025 07:35:07 +0700 Subject: [PATCH] Fix for copy paste error introduced in build 20251130 causing alarms to be ignored. Increased $680, stepper enable delay limit to 500ms. --- README.md | 2 +- changelog.md | 14 ++++++++++++++ grbl.h | 2 +- settings.c | 2 +- system.c | 1 + utf8.c | 6 +++--- 6 files changed, 21 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 1d25f7a..fb098fa 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ## grblHAL ## -Latest build date is 20251130, see the [changelog](changelog.md) for details. +Latest build date is 20251202, 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 d56216c..b985e22 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,19 @@ ## grblHAL changelog +Build 20251202 + +Core: + +* Fix for copy paste error introduced in build 20251130 causing alarms to be ignored. + +* Increased `$680`, stepper enable delay limit to 500ms. + +Drivers: + +* STM32F3xx: fixed typo in generic board, ref. issue [#5](https://github.com/grblHAL/STM32F3xx/issues/5). + +--- + Build 20251130 Core: diff --git a/grbl.h b/grbl.h index 23ab839..e6e4442 100644 --- a/grbl.h +++ b/grbl.h @@ -42,7 +42,7 @@ #else #define GRBL_VERSION "1.1f" #endif -#define GRBL_BUILD 20251130 +#define GRBL_BUILD 20251202 #define GRBL_URL "https://github.com/grblHAL" diff --git a/settings.c b/settings.c index c7f0821..0328f22 100644 --- a/settings.c +++ b/settings.c @@ -2188,7 +2188,7 @@ PROGMEM static const setting_detail_t setting_detail[] = { { Setting_MotorFaultsEnable, Group_Stepper, "Motor fault inputs enable", NULL, Format_AxisMask, NULL, NULL, NULL, Setting_IsExtended, &settings.motor_fault_enable, NULL, is_setting_available }, { Setting_MotorFaultsInvert, Group_Stepper, "Invert motor fault inputs", NULL, Format_AxisMask, NULL, NULL, NULL, Setting_IsExtended, &settings.motor_fault_invert, NULL, is_setting_available }, { Setting_ResetActions, Group_General, "Reset actions", NULL, Format_Bitfield, "Clear homed status if position was lost,Clear offsets (except G92),Clear rapids override,Clear feed override", NULL, NULL, Setting_IsExtendedFn, set_reset_actions, get_int, NULL }, - { Setting_StepperEnableDelay, Group_Stepper, "Stepper enable delay", "ms", Format_Int16, "##0", NULL, "250", Setting_IsExtended, &settings.stepper_enable_delay, NULL, NULL }, + { Setting_StepperEnableDelay, Group_Stepper, "Stepper enable delay", "ms", Format_Int16, "##0", NULL, "500", Setting_IsExtended, &settings.stepper_enable_delay, NULL, NULL }, }; PROGMEM static const setting_descr_t setting_descr[] = { diff --git a/system.c b/system.c index e986ef7..830c7ff 100644 --- a/system.c +++ b/system.c @@ -1256,6 +1256,7 @@ void system_raise_alarm (alarm_code_t alarm) else if(sys.alarm != alarm) { sys.alarm = alarm; sys.blocking_event = alarm_is_critical(sys.alarm); + state_set(alarm == Alarm_EStop ? STATE_ESTOP : STATE_ALARM); if(sys.driver_started || sys.alarm == Alarm_SelftestFailed) grbl.report.alarm_message(alarm); } diff --git a/utf8.c b/utf8.c index f6d509a..804bba8 100644 --- a/utf8.c +++ b/utf8.c @@ -118,10 +118,10 @@ uint16_t utf32_to_utf8 (uint8_t *buffer, uint32_t code_point) // assert(code_point <= 0x10FFFF); // assert(code_point < 0xD800 || code_point > 0xDFFF); - if(code_point > 0x10FFFF) - return 0; + if(code_point > 0x10FFFF) + return 0; - uint16_t idx, length = 1; + uint16_t idx, length = 1; uint32_t first_byte = code_point, mask; if(code_point <= 0x7F) {