From ccd75df8b176712107c278c0ea09f7662e55b6dc Mon Sep 17 00:00:00 2001 From: narno2202 <130909513+narno2202@users.noreply.github.com> Date: Sat, 24 Aug 2024 14:41:32 +0200 Subject: [PATCH 1/2] Update ft_motion.cpp Compilation fix --- Marlin/src/module/ft_motion.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Marlin/src/module/ft_motion.cpp b/Marlin/src/module/ft_motion.cpp index d63ca9f25df2..d6eab94016f1 100644 --- a/Marlin/src/module/ft_motion.cpp +++ b/Marlin/src/module/ft_motion.cpp @@ -93,10 +93,9 @@ uint32_t FTMotion::interpIdx = 0; // Index of current data point b #if HAS_FTM_SHAPING FTMotion::shaping_t FTMotion::shaping = { 0, - #if HAS_X_AXIS x:{ false, { 0.0f }, { 0.0f }, { 0 }, 0 } // ena, d_zi[], Ai[], Ni[], max_i - #endif #if HAS_Y_AXIS + , y:{ false, { 0.0f }, { 0.0f }, { 0 }, 0 } // ena, d_zi[], Ai[], Ni[], max_i #endif }; From 9265e72e1cd8d51c4f5da46b9ec134d678e54e72 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 24 Aug 2024 13:49:53 -0500 Subject: [PATCH 2/2] prettier --- Marlin/src/module/ft_motion.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Marlin/src/module/ft_motion.cpp b/Marlin/src/module/ft_motion.cpp index d6eab94016f1..b999dec7cb12 100644 --- a/Marlin/src/module/ft_motion.cpp +++ b/Marlin/src/module/ft_motion.cpp @@ -92,11 +92,12 @@ uint32_t FTMotion::interpIdx = 0; // Index of current data point b // Shaping variables. #if HAS_FTM_SHAPING FTMotion::shaping_t FTMotion::shaping = { - 0, - x:{ false, { 0.0f }, { 0.0f }, { 0 }, 0 } // ena, d_zi[], Ai[], Ni[], max_i + 0 + #if HAS_X_AXIS + , x:{ false, { 0.0f }, { 0.0f }, { 0 }, 0 } // ena, d_zi[], Ai[], Ni[], max_i + #endif #if HAS_Y_AXIS - , - y:{ false, { 0.0f }, { 0.0f }, { 0 }, 0 } // ena, d_zi[], Ai[], Ni[], max_i + , y:{ false, { 0.0f }, { 0.0f }, { 0 }, 0 } // ena, d_zi[], Ai[], Ni[], max_i #endif }; #endif