3D-printing/Marlin
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2026-03-05 17:44:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

[PR3] Fix after rebase

Browse source
This commit is contained in:
David Buezas 2026-02-22 11:47:32 +01:00
parent 28ceec96b6
commit 31617d4981
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Marlin/Configuration_adv.h
View file

@ -1231,6 +1231,10 @@
#endif
#define FTM_CONSTANT_JERK // Enable constant-jerk (7-phase S-curve) trajectory
// Jerk here means the rate of change of acceleration, is not related
// to Marlin's "classic jerk"
// Acceleration will ramp up gradually, so max acceleration is limited
// by max speed and distance travelled
#if ENABLED(FTM_CONSTANT_JERK)
#define FTM_DEFAULT_JERK_MAX 500'000.0f // (mm/s³) Default maximum jerk for constant-jerk trajectory
// Higher prints faster at the cost of increased resonance and extruder stress

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

@ -686,8 +686,8 @@ void FTMotion::fill_stepper_plan_buffer() {
stepper.current_block = next_block;
if (!next_block->is_sync()) {
startPos = endPos_prevBlock;
endPos_prevBlock += next_block->dist_mm;
ratio = next_block->dist_mm / next_block->millimeters;
endPos_prevBlock += next_block->ext_distance_mm;
ratio = next_block->ext_distance_mm / next_block->millimeters;
cjPlanner.advanceBlock(next_block->millimeters);
TERN_(FTM_HAS_LIN_ADVANCE, use_advance_lead = next_block->use_advance_lead);
}