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

🩹 Fix FT_MOTION + DISTINCT_E_FACTORS (#28106)

Browse source 
Fixes #28105
This commit is contained in:
narno2202 2025-11-03 04:16:44 +01:00 • committed by GitHub
parent 79bd65be35
commit 0c4beea9be
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -78,11 +78,14 @@ XYZEval<int64_t> 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.

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

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

6
buildroot/tests/LPC1768
View file

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