diff --git a/README.md b/README.md index 27eb15d..edf5a09 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ## grblHAL ## -Latest build date is 20260202, see the [changelog](changelog.md) for details. +Latest build date is 20260204, 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. @@ -89,4 +89,4 @@ G/M-codes not supported by [legacy Grbl](https://github.com/gnea/grbl/wiki) are Some [plugins](https://github.com/grblHAL/plugins) implements additional M-codes. --- -20260202 +20260204 diff --git a/changelog.md b/changelog.md index 9d7a033..1cd9c4f 100644 --- a/changelog.md +++ b/changelog.md @@ -1,6 +1,22 @@ ## grblHAL changelog -20260203 +Build 20260204 + +Core: + +* Reinstated settings definition that somehow was deleted in the 20260202 commit. + +Drivers: + +* RP2040: Removed deleted file from build. Ref. [#172](https://github.com/grblHAL/RP2040/issues/172). + +Plugins: + +* Keypad: updated for previous core change. + +--- + +Build 20260203 Core: @@ -18,7 +34,7 @@ position etc. is converted to imperial when $13=1. Ref. PR [#20](https://github. --- -20260202 +Build 20260202 Core: diff --git a/grbl.h b/grbl.h index 5463652..bb64e30 100644 --- a/grbl.h +++ b/grbl.h @@ -42,7 +42,7 @@ #else #define GRBL_VERSION "1.1f" #endif -#define GRBL_BUILD 20260203 +#define GRBL_BUILD 20260204 #define GRBL_URL "https://github.com/grblHAL" diff --git a/report.c b/report.c index 5281f6a..5358428 100644 --- a/report.c +++ b/report.c @@ -2938,6 +2938,11 @@ ISR_CODE void report_add_realtime (report_tracking_t report) return; break; + case Report_CycleStart: + if(!settings.status_report.pin_state) + return; + return; + default: break; } diff --git a/settings.h b/settings.h index aa91ca7..d375210 100644 --- a/settings.h +++ b/settings.h @@ -435,6 +435,7 @@ typedef enum { Setting_Stepper4 = 654, Setting_Stepper5 = 655, Setting_Stepper6 = 656, + Setting_Stepper7 = 657, Setting_Stepper8 = 658, Setting_Stepper9 = 659, Setting_Stepper10 = 660, diff --git a/stream.c b/stream.c index 85e48f5..b2c337e 100644 --- a/stream.c +++ b/stream.c @@ -202,7 +202,7 @@ ISR_CODE bool ISR_FUNC(stream_enqueue_realtime_command)(uint8_t c) { bool drop = hal.stream.enqueue_rt_command ? hal.stream.enqueue_rt_command(c) : protocol_enqueue_realtime_command(c); - if(drop && (c == CMD_CYCLE_START || c == CMD_CYCLE_START_LEGACY) && settings.status_report.pin_state) + if(drop && (c == CMD_CYCLE_START || c == CMD_CYCLE_START_LEGACY) && state_get() == STATE_IDLE) report_add_realtime(Report_CycleStart); return drop; @@ -594,7 +594,7 @@ ISR_CODE bool ISR_FUNC(stream_mpg_check_enable)(uint8_t c) default: protocol_enqueue_realtime_command(c); - if((c == CMD_CYCLE_START || c == CMD_CYCLE_START_LEGACY) && settings.status_report.pin_state && state_get() == STATE_IDLE) + if((c == CMD_CYCLE_START || c == CMD_CYCLE_START_LEGACY) && state_get() == STATE_IDLE) report_add_realtime(Report_CycleStart); break; } diff --git a/system.c b/system.c index 5b91e27..d7dc9c6 100644 --- a/system.c +++ b/system.c @@ -147,8 +147,7 @@ ISR_CODE void ISR_FUNC(control_interrupt_handler)(control_signals_t signals) if(event_signals.cycle_start) { system_set_exec_state_flag(EXEC_CYCLE_START); - if(settings.status_report.pin_state) - report_add_realtime(Report_CycleStart); + report_add_realtime(Report_CycleStart); gc_state.tool_change = false; if(grbl.on_cycle_start) grbl.on_cycle_start();