3D-printing/Marlin
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2026-01-06 06:37:43 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

🩹 Fix FTM without FTM_POLYS build (#28209)

Browse source
This commit is contained in:
Harald Wagener 2025-12-06 20:42:52 +01:00 • committed by GitHub
parent d14b8e4435
commit d56fbe21fc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Marlin/src/module/ft_motion.cpp
View file

@ -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;
}
}

2
Marlin/src/module/ft_motion.h
View file

@ -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

3
buildroot/tests/STM32F103RC_btt
View file

@ -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"