diff --git a/Marlin/src/module/ft_motion.cpp b/Marlin/src/module/ft_motion.cpp index 0164abc862..029c620500 100644 --- a/Marlin/src/module/ft_motion.cpp +++ b/Marlin/src/module/ft_motion.cpp @@ -78,11 +78,14 @@ XYZEval FTMotion::curr_steps_q32_32 = {0}; uint32_t FTMotion::stepper_plan_tail = 0, // The index to consume from FTMotion::stepper_plan_head = 0; // The index to produce into +#if FTM_HAS_LIN_ADVANCE + bool FTMotion::use_advance_lead; +#endif + #if ENABLED(DISTINCT_E_FACTORS) uint8_t FTMotion::block_extruder_axis; // Cached E Axis from last-fetched block #elif HAS_EXTRUDERS constexpr uint8_t FTMotion::block_extruder_axis; - bool FTMotion::use_advance_lead; #endif // Shaping variables. diff --git a/Marlin/src/module/ft_motion.h b/Marlin/src/module/ft_motion.h index a06f71cab2..94a8f61a3e 100644 --- a/Marlin/src/module/ft_motion.h +++ b/Marlin/src/module/ft_motion.h @@ -215,11 +215,14 @@ class FTMotion { static TrajectoryGenerator* currentGenerator; static TrajectoryType trajectoryType; + #if FTM_HAS_LIN_ADVANCE + static bool use_advance_lead; + #endif + #if ENABLED(DISTINCT_E_FACTORS) static uint8_t block_extruder_axis; // Cached extruder axis index #elif HAS_EXTRUDERS static constexpr uint8_t block_extruder_axis = E_AXIS; - static bool use_advance_lead; #endif #if HAS_FTM_SHAPING diff --git a/buildroot/tests/LPC1768 b/buildroot/tests/LPC1768 index f00efb8341..386a146d0b 100755 --- a/buildroot/tests/LPC1768 +++ b/buildroot/tests/LPC1768 @@ -30,9 +30,9 @@ restore_configs opt_set MOTHERBOARD BOARD_MKS_SBASE \ EXTRUDERS 2 TEMP_SENSOR_1 1 \ NUM_SERVOS 2 SERVO_DELAY '{ 300, 300 }' SWITCHING_NOZZLE_SERVO_ANGLES '{ { 0, 90 }, { 90, 0 } }' -opt_enable SWITCHING_NOZZLE SWITCHING_NOZZLE_E1_SERVO_NR SWITCHING_NOZZLE_LIFT_TO_PROBE EDITABLE_SERVO_ANGLES SERVO_DETACH_GCODE \ - ULTIMAKERCONTROLLER REALTIME_REPORTING_COMMANDS FULL_REPORT_TO_HOST_FEATURE -exec_test $1 $2 "MKS SBASE with SWITCHING_NOZZLE, Grbl Realtime Report" "$3" +opt_enable DISTINCT_E_FACTORS SWITCHING_NOZZLE SWITCHING_NOZZLE_E1_SERVO_NR SWITCHING_NOZZLE_LIFT_TO_PROBE EDITABLE_SERVO_ANGLES SERVO_DETACH_GCODE \ + ULTIMAKERCONTROLLER REALTIME_REPORTING_COMMANDS FULL_REPORT_TO_HOST_FEATURE FT_MOTION FTM_SMOOTHING FTM_HOME_AND_PROBE +exec_test $1 $2 "MKS SBASE with SWITCHING_NOZZLE, FT Motion, Grbl Realtime Report" "$3" restore_configs opt_set MOTHERBOARD BOARD_RAMPS_14_RE_ARM_EEB \