Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't include MIN_ISR_LOOP_CYCLES in calculation for ISR_SHAPING_LOOP… #25335

Merged
merged 3 commits into from
Mar 3, 2023
Merged

Don't include MIN_ISR_LOOP_CYCLES in calculation for ISR_SHAPING_LOOP… #25335

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ff0948c
Don't include MIN_ISR_LOOP_CYCLES in calculation for ISR_SHAPING_LOOP…
tombrazier Feb 3, 2023
0d555dd
MIN_ISR_LOOP_CYCLES already includes ISR_[XY]_STEPPER_CYCLES and more…
tombrazier Feb 8, 2023
fd59860
put (R) * in front
thinkyhead Mar 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Marlin/src/module/stepper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@
#define ISR_LOOP_CYCLES(R) ((ISR_LOOP_BASE_CYCLES + MIN_ISR_LOOP_CYCLES + MIN_STEPPER_PULSE_CYCLES) * (R - 1) + _MAX(MIN_ISR_LOOP_CYCLES, MIN_STEPPER_PULSE_CYCLES))

// Model input shaping as an extra loop call
#define ISR_SHAPING_LOOP_CYCLES(R) ((TERN0(HAS_SHAPING, ISR_LOOP_BASE_CYCLES) + TERN0(INPUT_SHAPING_X, ISR_X_STEPPER_CYCLES) + TERN0(INPUT_SHAPING_Y, ISR_Y_STEPPER_CYCLES)) * (R) + (MIN_ISR_LOOP_CYCLES) * (R - 1))
#define ISR_SHAPING_LOOP_CYCLES(R) TERN0(HAS_SHAPING, (R) * ((ISR_LOOP_BASE_CYCLES) + TERN0(INPUT_SHAPING_X, ISR_X_STEPPER_CYCLES) + TERN0(INPUT_SHAPING_Y, ISR_Y_STEPPER_CYCLES)))

// If linear advance is enabled, then it is handled separately
#if ENABLED(LIN_ADVANCE)
Expand Down