From 367bcedea73d42c7227081546098570f389437b0 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 31 Oct 2025 16:41:13 -0500 Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20Reuse=20FTM?= =?UTF-8?q?=20smoothing=20edit=20item=20macro?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Marlin/src/lcd/menu/menu_motion.cpp | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/Marlin/src/lcd/menu/menu_motion.cpp b/Marlin/src/lcd/menu/menu_motion.cpp index 9e956711cf..305b77688c 100644 --- a/Marlin/src/lcd/menu/menu_motion.cpp +++ b/Marlin/src/lcd/menu/menu_motion.cpp @@ -411,6 +411,13 @@ void menu_move() { #define CACHE_FOR_SPEED 1 #endif + #if ENABLED(FTM_SMOOTHING) + #define _SMOO_MENU_ITEM(A) do{ \ + editable.decimal = c.smoothingTime.A; \ + EDIT_ITEM_FAST_N(float43, _AXIS(A), MSG_FTM_SMOOTH_TIME_N, &editable.decimal, 0.0f, FTM_MAX_SMOOTHING_TIME, []{ ftMotion.set_smoothing_time(_AXIS(A), editable.decimal); }); \ + }while(0); + #endif + void menu_ft_motion() { // Define stuff ahead of the menu loop ft_config_t &c = ftMotion.cfg; @@ -499,23 +506,9 @@ void menu_move() { #endif EDIT_ITEM(bool, MSG_FTM_AXIS_SYNC, &c.axis_sync_enabled); + #if ENABLED(FTM_SMOOTHING) - #if HAS_X_AXIS - editable.decimal = c.smoothingTime.X; - EDIT_ITEM_FAST_N(float43, X_AXIS, MSG_FTM_SMOOTH_TIME_N, &editable.decimal, 0.0f, FTM_MAX_SMOOTHING_TIME, []{ ftMotion.set_smoothing_time(X_AXIS, editable.decimal); }); - #endif - #if HAS_Y_AXIS - editable.decimal = c.smoothingTime.Y; - EDIT_ITEM_FAST_N(float43, Y_AXIS, MSG_FTM_SMOOTH_TIME_N, &editable.decimal, 0.0f, FTM_MAX_SMOOTHING_TIME, []{ ftMotion.set_smoothing_time(Y_AXIS, editable.decimal); }); - #endif - #if HAS_Z_AXIS - editable.decimal = c.smoothingTime.Z; - EDIT_ITEM_FAST_N(float43, Z_AXIS, MSG_FTM_SMOOTH_TIME_N, &editable.decimal, 0.0f, FTM_MAX_SMOOTHING_TIME, []{ ftMotion.set_smoothing_time(Z_AXIS, editable.decimal); }); - #endif - #if HAS_EXTRUDERS - editable.decimal = c.smoothingTime.E; - EDIT_ITEM_FAST_N(float43, E_AXIS, MSG_FTM_SMOOTH_TIME_N, &editable.decimal, 0.0f, FTM_MAX_SMOOTHING_TIME, []{ ftMotion.set_smoothing_time(E_AXIS, editable.decimal); }); - #endif + CARTES_MAP(_SMOO_MENU_ITEM); #endif } END_MENU(); @@ -592,10 +585,6 @@ void menu_move() { #endif #if ENABLED(FTM_SMOOTHING) - #define _SMOO_MENU_ITEM(A) do{ \ - editable.decimal = c.smoothingTime.A; \ - EDIT_ITEM_FAST_N(float43, _AXIS(A), MSG_FTM_SMOOTH_TIME_N, &editable.decimal, 0.0f, FTM_MAX_SMOOTHING_TIME, []{ ftMotion.set_smoothing_time(_AXIS(A), editable.decimal); }); \ - }while(0); CARTES_MAP(_SMOO_MENU_ITEM); #endif