From f40d5db74a8711e9559bd3671897e90441d867af Mon Sep 17 00:00:00 2001 From: Terje Io Date: Fri, 30 May 2025 08:53:48 +0200 Subject: [PATCH] Changed backlash feed rate to be the same as the current motion. Ref. issue #751. Minor fix for probe availability report in $I output. --- README.md | 4 ++-- changelog.md | 14 ++++++++++++++ grbl.h | 2 +- motion_control.c | 5 +++-- report.c | 2 +- 5 files changed, 21 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 3fec15b..45cd1be 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ## grblHAL ## -Latest build date is 20250514, see the [changelog](changelog.md) for details. +Latest build date is 20250530, 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. --- -20250425 +20250430 diff --git a/changelog.md b/changelog.md index 63a8473..e9c1f09 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,19 @@ ## grblHAL changelog +Build 20250530 + +Core: + +* Changed backlash feed rate to be the same as the current motion. Ref. issue [#751](https://github.com/grblHAL/core/issues/751). + +* Minor fix for probe availability report in `$I` output. + +Drivers: + +* iMXRT1062, LPC176x, SAM3X8E and MSP432P401R: Harmonized serial port definitions with other drivers. Fixes issue [#97](https://github.com/grblHAL/iMXRT1062/issues/97). + +--- + Build 20250526 Core: diff --git a/grbl.h b/grbl.h index 54486b5..9015e15 100644 --- a/grbl.h +++ b/grbl.h @@ -42,7 +42,7 @@ #else #define GRBL_VERSION "1.1f" #endif -#define GRBL_BUILD 20250526 +#define GRBL_BUILD 20250530 #define GRBL_URL "https://github.com/grblHAL" diff --git a/motion_control.c b/motion_control.c index 4c58ad7..8ef5bc5 100644 --- a/motion_control.c +++ b/motion_control.c @@ -143,10 +143,11 @@ bool mc_line (float *target, plan_line_data_t *pl_data) plan_line_data_t pl_backlash; plan_data_init(&pl_backlash); - pl_backlash.condition.rapid_motion = On; - pl_backlash.condition.backlash_motion = On; + pl_backlash.feed_rate = pl_data->feed_rate; pl_backlash.line_number = pl_data->line_number; pl_backlash.spindle.rpm = pl_data->spindle.rpm; + pl_backlash.condition.backlash_motion = On; + pl_backlash.condition.rapid_motion = pl_data->condition.rapid_motion; // If the buffer is full: good! That means we are well ahead of the robot. // Remain in this loop until there is room in the buffer. diff --git a/report.c b/report.c index a953dd0..ba79c49 100644 --- a/report.c +++ b/report.c @@ -960,7 +960,7 @@ void report_build_info (char *line, bool extended) else { if(hal.probe.select) { strcat(buf, "PROBES="); - strcat(buf, uitoa(0b001 | (hal.driver_cap.toolsetter << 1) | (hal.driver_cap.probe2 << 2))); + strcat(buf, uitoa(hal.driver_cap.probe | (hal.driver_cap.toolsetter << 1) | (hal.driver_cap.probe2 << 2))); strcat(buf, ","); } if(hal.signals_cap.probe_disconnected)