From d56fbe21fcedf8c14f359568f8f9e746938e80dd Mon Sep 17 00:00:00 2001 From: Harald Wagener Date: Sat, 6 Dec 2025 20:42:52 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20FTM=20without=20FTM=5FPOLY?= =?UTF-8?q?S=20build=20(#28209)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Marlin/src/module/ft_motion.cpp | 6 ++---- Marlin/src/module/ft_motion.h | 2 +- buildroot/tests/STM32F103RC_btt | 3 ++- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Marlin/src/module/ft_motion.cpp b/Marlin/src/module/ft_motion.cpp index d402439c04..a2e0b8be70 100644 --- a/Marlin/src/module/ft_motion.cpp +++ b/Marlin/src/module/ft_motion.cpp @@ -302,10 +302,8 @@ void FTMotion::init() { switch (type) { default: case TrajectoryType::TRAPEZOIDAL: currentGenerator = &trapezoidalGenerator; break; - #if ENABLED(FTM_POLYS) - case TrajectoryType::POLY5: currentGenerator = &poly5Generator; break; - case TrajectoryType::POLY6: currentGenerator = &poly6Generator; break; - #endif + case TrajectoryType::POLY5: currentGenerator = &poly5Generator; break; + case TrajectoryType::POLY6: currentGenerator = &poly6Generator; break; } } diff --git a/Marlin/src/module/ft_motion.h b/Marlin/src/module/ft_motion.h index 497c04e474..a149057547 100644 --- a/Marlin/src/module/ft_motion.h +++ b/Marlin/src/module/ft_motion.h @@ -238,7 +238,7 @@ class FTMotion { static TrajectoryType trajectoryType; static TrajectoryGenerator* currentGenerator; #else - static constexpr TrajectoryGenerator *currentGenerator = trapezoidalGenerator; + static constexpr TrajectoryGenerator *currentGenerator = &trapezoidalGenerator; #endif #if FTM_HAS_LIN_ADVANCE diff --git a/buildroot/tests/STM32F103RC_btt b/buildroot/tests/STM32F103RC_btt index 369fa80978..7a03dd64fa 100755 --- a/buildroot/tests/STM32F103RC_btt +++ b/buildroot/tests/STM32F103RC_btt @@ -17,4 +17,5 @@ opt_enable CR10_STOCKDISPLAY PINS_DEBUGGING Z_IDLE_HEIGHT EDITABLE_HOMING_CURREN INPUT_SHAPING_X INPUT_SHAPING_Y FT_MOTION FT_MOTION_MENU FTM_RESONANCE_TEST EMERGENCY_PARSER \ BIQU_MICROPROBE_V1 PROBE_ENABLE_DISABLE Z_SAFE_HOMING AUTO_BED_LEVELING_BILINEAR \ ADAPTIVE_STEP_SMOOTHING LIN_ADVANCE SMOOTH_LIN_ADVANCE NONLINEAR_EXTRUSION -exec_test $1 $2 "BigTreeTech SKR Mini E3 1.0 - TMC2209 HW Serial, FT_MOTION" "$3" +opt_disable FTM_POLYS +exec_test $1 $2 "BigTreeTech SKR Mini E3 1.0 - TMC2209 HW Serial, FT_MOTION w/out FTM_POLYS" "$3"