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

Fix for copy paste error introduced in build 20251130 causing alarms to be ignored.

Browse Source 
Increased $680, stepper enable delay limit to 500ms.
This commit is contained in:
terjeio
2025-12-02 07:35:07 +07:00
parent 13145a4a46
commit e350ea501e
6 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -1,6 +1,6 @@
## grblHAL ## ## 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] > [!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.

14
changelog.md
View File

@@ -1,5 +1,19 @@
## grblHAL changelog ## grblHAL changelog
<a name="20251202">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).
---
<a name="20251130">Build 20251130 <a name="20251130">Build 20251130
Core: Core:

2
grbl.h
View File

@@ -42,7 +42,7 @@
#else #else
#define GRBL_VERSION "1.1f" #define GRBL_VERSION "1.1f"
#endif #endif
#define GRBL_BUILD 20251130 #define GRBL_BUILD 20251202
#define GRBL_URL "https://github.com/grblHAL" #define GRBL_URL "https://github.com/grblHAL"

2
settings.c
View File

@@ -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_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_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_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[] = { PROGMEM static const setting_descr_t setting_descr[] = {

1
system.c
View File

@@ -1256,6 +1256,7 @@ void system_raise_alarm (alarm_code_t alarm)
else if(sys.alarm != alarm) { else if(sys.alarm != alarm) {
sys.alarm = alarm; sys.alarm = alarm;
sys.blocking_event = alarm_is_critical(sys.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) if(sys.driver_started || sys.alarm == Alarm_SelftestFailed)
grbl.report.alarm_message(alarm); grbl.report.alarm_message(alarm);
} }

6
utf8.c
View File

@@ -118,10 +118,10 @@ uint16_t utf32_to_utf8 (uint8_t *buffer, uint32_t code_point)
// assert(code_point <= 0x10FFFF); // assert(code_point <= 0x10FFFF);
// assert(code_point < 0xD800 || code_point > 0xDFFF); // assert(code_point < 0xD800 || code_point > 0xDFFF);
if(code_point > 0x10FFFF) if(code_point > 0x10FFFF)
return 0; return 0;
uint16_t idx, length = 1; uint16_t idx, length = 1;
uint32_t first_byte = code_point, mask; uint32_t first_byte = code_point, mask;
if(code_point <= 0x7F) { if(code_point <= 0x7F) {