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

Jump to bottom

Fix coils alignment #18528

Merged
merged 11 commits into from
Jul 6, 2020
Merged

Fix coils alignment #18528

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
253151a
M122 report current TMC microstep count
Fabi0San Jan 17, 2020
0e24f15
M122 reports TMC PWM auto params
Fabi0San Jan 17, 2020
fa98d37
Fix coils alignment
GMagician Jul 3, 2020
7ea3d64
Update motion.cpp
thinkyhead Jul 3, 2020
6c95c38
Merge branch 'dev/M122' into Fix-coils-alignment
Fabi0San Jul 4, 2020
7013f77
Cleanup and comments
Fabi0San Jul 5, 2020
36121b0
Reorder multiplication for perf
Fabi0San Jul 5, 2020
b538379
Fix relationship between direction pin and axis coordinate increase.
Fabi0San Jul 5, 2020
60552a5
Issue warning even when not degbugging.
Fabi0San Jul 5, 2020
4e1205b
Tweaks to get rebuild
thinkyhead Jul 6, 2020
3f40b4e
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into pr/18528
thinkyhead Jul 6, 2020
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
8 changes: 4 additions & 4 deletions Marlin/src/module/motion.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1468,23 +1468,23 @@ void set_axis_not_trusted(const AxisEnum axis) {
phasePerUStep = 256 / (X_MICROSTEPS);
phaseCurrent = stepperX.get_microstep_counter();
effectorBackoutDir = -X_HOME_DIR;
stepperBackoutDir = INVERT_X_DIR ? -effectorBackoutDir : effectorBackoutDir;
stepperBackoutDir = INVERT_X_DIR ? effectorBackoutDir : -effectorBackoutDir;
break;
#endif
#ifdef Y_MICROSTEPS
case Y_AXIS:
phasePerUStep = 256 / (Y_MICROSTEPS);
phaseCurrent = stepperY.get_microstep_counter();
effectorBackoutDir = -Y_HOME_DIR;
stepperBackoutDir = INVERT_Y_DIR ? -effectorBackoutDir : effectorBackoutDir;
stepperBackoutDir = INVERT_Y_DIR ? effectorBackoutDir : -effectorBackoutDir;
break;
#endif
#ifdef Z_MICROSTEPS
case Z_AXIS:
phasePerUStep = 256 / (Z_MICROSTEPS);
phaseCurrent = stepperZ.get_microstep_counter();
effectorBackoutDir = -Z_HOME_DIR;
stepperBackoutDir = INVERT_Y_DIR ? -effectorBackoutDir : effectorBackoutDir;
stepperBackoutDir = INVERT_Z_DIR ? effectorBackoutDir : -effectorBackoutDir;
GMagician marked this conversation as resolved.
Show resolved Hide resolved
break;
#endif
default: return;
Expand All @@ -1502,7 +1502,7 @@ void set_axis_not_trusted(const AxisEnum axis) {
// Skip to next if target position is behind current. So it only moves away from endstop.
if (phaseDelta < 0) phaseDelta += 1024;

// Convert tmc µsteps(phase) to whole Marlin µsteps to effector to backout direction to mm
// Convert tmc µsteps(phase) to whole Marlin µsteps to effector backout direction to mm
const float mmDelta = int16_t(phaseDelta / phasePerUStep) * effectorBackoutDir * planner.steps_to_mm[axis];
GMagician marked this conversation as resolved.
Show resolved Hide resolved

// optional debug messages.
Expand Down