From 8e9e0396726c5b0d2a1b34e71e4383fcfaa72241 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 5 Nov 2025 19:18:59 -0600 Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20Rename=20Tr?= =?UTF-8?q?ajectory=20Gen?= 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 | 7 +++---- .../{poly5_trajectory_generator.h => trajectory_poly5.h} | 0 ...poly6_trajectory_generator.cpp => trajectory_poly6.cpp} | 2 +- .../{poly6_trajectory_generator.h => trajectory_poly6.h} | 0 ...dal_trajectory_generator.h => trajectory_trapezoidal.h} | 0 6 files changed, 7 insertions(+), 8 deletions(-) rename Marlin/src/module/ft_motion/{poly5_trajectory_generator.h => trajectory_poly5.h} (100%) rename Marlin/src/module/ft_motion/{poly6_trajectory_generator.cpp => trajectory_poly6.cpp} (99%) rename Marlin/src/module/ft_motion/{poly6_trajectory_generator.h => trajectory_poly6.h} (100%) rename Marlin/src/module/ft_motion/{trapezoidal_trajectory_generator.h => trajectory_trapezoidal.h} (100%) diff --git a/Marlin/src/module/ft_motion.cpp b/Marlin/src/module/ft_motion.cpp index 6f79f566fc..238c6737df 100644 --- a/Marlin/src/module/ft_motion.cpp +++ b/Marlin/src/module/ft_motion.cpp @@ -32,9 +32,9 @@ #if ENABLED(FT_MOTION) #include "ft_motion.h" -#include "ft_motion/trapezoidal_trajectory_generator.h" -#include "ft_motion/poly5_trajectory_generator.h" -#include "ft_motion/poly6_trajectory_generator.h" +#include "ft_motion/trajectory_trapezoidal.h" +#include "ft_motion/trajectory_poly5.h" +#include "ft_motion/trajectory_poly6.h" #include "stepper.h" // Access stepper block queue function and abort status. #include "endstops.h" diff --git a/Marlin/src/module/ft_motion.h b/Marlin/src/module/ft_motion.h index 94a8f61a3e..420b0fb2aa 100644 --- a/Marlin/src/module/ft_motion.h +++ b/Marlin/src/module/ft_motion.h @@ -25,10 +25,9 @@ #include "planner.h" // Access block type from planner. #include "stepper.h" // For stepper motion and direction -#include "ft_motion/trajectory_generator.h" -#include "ft_motion/trapezoidal_trajectory_generator.h" -#include "ft_motion/poly5_trajectory_generator.h" -#include "ft_motion/poly6_trajectory_generator.h" +#include "ft_motion/trajectory_trapezoidal.h" +#include "ft_motion/trajectory_poly5.h" +#include "ft_motion/trajectory_poly6.h" #if HAS_FTM_SHAPING #include "ft_motion/shaping.h" diff --git a/Marlin/src/module/ft_motion/poly5_trajectory_generator.h b/Marlin/src/module/ft_motion/trajectory_poly5.h similarity index 100% rename from Marlin/src/module/ft_motion/poly5_trajectory_generator.h rename to Marlin/src/module/ft_motion/trajectory_poly5.h diff --git a/Marlin/src/module/ft_motion/poly6_trajectory_generator.cpp b/Marlin/src/module/ft_motion/trajectory_poly6.cpp similarity index 99% rename from Marlin/src/module/ft_motion/poly6_trajectory_generator.cpp rename to Marlin/src/module/ft_motion/trajectory_poly6.cpp index 6d01eb96bb..a16f344217 100644 --- a/Marlin/src/module/ft_motion/poly6_trajectory_generator.cpp +++ b/Marlin/src/module/ft_motion/trajectory_poly6.cpp @@ -24,7 +24,7 @@ #if ENABLED(FT_MOTION) -#include "poly6_trajectory_generator.h" +#include "trajectory_poly6.h" #include #include "../ft_motion.h" diff --git a/Marlin/src/module/ft_motion/poly6_trajectory_generator.h b/Marlin/src/module/ft_motion/trajectory_poly6.h similarity index 100% rename from Marlin/src/module/ft_motion/poly6_trajectory_generator.h rename to Marlin/src/module/ft_motion/trajectory_poly6.h diff --git a/Marlin/src/module/ft_motion/trapezoidal_trajectory_generator.h b/Marlin/src/module/ft_motion/trajectory_trapezoidal.h similarity index 100% rename from Marlin/src/module/ft_motion/trapezoidal_trajectory_generator.h rename to Marlin/src/module/ft_motion/trajectory_trapezoidal.h