From 68aa11923a093e266f2e23729d8e63e339662357 Mon Sep 17 00:00:00 2001 From: Terje Io Date: Tue, 25 Feb 2025 21:28:04 +0100 Subject: [PATCH] Fixed bug introduced in PR #673. --- grbl.h | 2 +- settings.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/grbl.h b/grbl.h index e28d97a..3ca0208 100644 --- a/grbl.h +++ b/grbl.h @@ -42,7 +42,7 @@ #else #define GRBL_VERSION "1.1f" #endif -#define GRBL_BUILD 20250223 +#define GRBL_BUILD 20250225 #define GRBL_URL "https://github.com/grblHAL" diff --git a/settings.c b/settings.c index fe2fb74..f91e989 100644 --- a/settings.c +++ b/settings.c @@ -1019,7 +1019,7 @@ static status_code_t set_tool_change_mode (setting_id_t id, uint_fast16_t int_va { if(!hal.driver_cap.atc && hal.stream.suspend_read && int_value <= ToolChange_Ignore) { #if COMPATIBILITY_LEVEL > 1 - if((toolchange_mode_t)int_value == ToolChange_Manual_G59_3 || (toolchange_mode_t)int_value == ToolChange_SemiAutomatic) || (toolchange_mode_t)int_value == FastToolChange_SemiAutomatic) + if((toolchange_mode_t)int_value == ToolChange_Manual_G59_3 || (toolchange_mode_t)int_value == ToolChange_SemiAutomatic || (toolchange_mode_t)int_value == ToolChange_FastSemiAutomatic) return Status_InvalidStatement; #endif settings.tool_change.mode = (toolchange_mode_t)int_value; @@ -2303,7 +2303,7 @@ PROGMEM static const setting_descr_t setting_descr[] = { "Manual touch off: retracts tool axis to home position for tool change, use jogging or $TPW for touch off.\\n\\n" "Manual touch off @ G59.3: retracts tool axis to home position then to G59.3 position for tool change, use jogging or $TPW for touch off.\\n\\n" "Automatic touch off @ G59.3: retracts tool axis to home position for tool change, then to G59.3 position for automatic touch off.\\n\\n" - "Fast Automatic touch off @ G59.3: Same as automatic mode, except that it uses G38.4 style probing for faster touch off." + "Fast Automatic touch off @ G59.3: Same as automatic mode, except that it uses G38.4 style probing for faster touch off.\\n\\n" "All modes except \"Normal\" and \"Ignore M6\" returns the tool (controlled point) to original position after touch off." }, { Setting_ToolChangeProbingDistance, "Maximum probing distance for automatic or $TPW touch off." },