-
-
Notifications
You must be signed in to change notification settings - Fork 19.3k
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.
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
Unify run_z_probe #4356
Unify run_z_probe #4356
Conversation
678c44a
to
1e32c00
Compare
const int homing_bump_divisor[] = HOMING_BUMP_DIVISOR; | ||
int hbd = homing_bump_divisor[axis]; | ||
if (hbd < 1) { | ||
hbd = 10; | ||
SERIAL_ECHO_START; | ||
SERIAL_ECHOLNPGM("Warning: Homing Bump Divisor < 1"); | ||
} | ||
feedrate_mm_m = homing_feedrate_mm_m[axis] / hbd; | ||
return feedrate_mm_m; | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
return homing_feedrate_mm_m[axis] / hbd;
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks! Also it's now…
#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
c7297a0
to
3a1e80d
Compare
Unify run_z_probe Add double touch for DELTAs. Introduce Z_PROBE_SPEED_FAST and Z_PROBE_SPEED_SLOW defaulting to homing_feedrate_mm_m[Z_AXIS] and homing_feedrate_mm_m[Z_AXIS]/2
3a1e80d
to
4a6ed5e
Compare
Is this move from [0, 0, 317.05] to [30, -34, -48] diagonal, or is there a first horizontal and a second downward? |
First horizontal, and a second downward. |
endstops.hit_on_purpose(); // clear endstop hit flags | ||
// Get the current stepper position after bumping an endstop | ||
current_position[Z_AXIS] = stepper.get_axis_position_mm(Z_AXIS); | ||
SYNC_PLAN_POSITION_KINEMATIC(); // tell the planner where we are feedrate_mm_m = homing_feedrate_mm_m[Z_AXIS]; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
By the way, is this intented?
feedrate_mm_m = homing_feedrate_mm_m[Z_AXIS];
is being commented out factitiously a bit.
@esenapaj |
Is this math correct?
|
When doing a probe (endstop) move that gets interrupted, both // Bed compensation must be disabled to get correct Z
stepper.synchronize();
current_position[Z_AXIS] = stepper.get_axis_position_mm(Z_AXIS);
SYNC_PLAN_POSITION_KINEMATIC(); |
We touch exactly two times per probe |
Pimped up debuggung for the first touch
Config standard minikossel with fixmount-probe and ABL.
|
The old code used the difference between the old Difference between old and new |
Not that beautiful but the simulator log says it works:
A bit uneven my virtual bed:
|
Beginning to make more sense! Now then, does this also depend on |
And here is the error:
Test was based on pure RCBugFiX wihout the altered move. I have seen this diagonal moves in the video and wanted to make sure they can't occure. When they are diagonal they are subdivided - even with triggered endstop/probe 1 step per subdivision. |
Today two alternate tries for a fix. I compared both of the methods in the https://github.com/AnHardt/Marlin/tree/compare_dif-forward branch with close to identical results. (0.00001 < position difference of an axis < 0.0001mm for the tested cases) |
I'd prefer AnHardt#60. |
So thrilled to have forward kinematics! I presume we need something similar for SCARA now too? |
Merged AnHardt#59 as #4368 I also prefer AnHardt#60 in the long run, but I wanted to get the simplest fix in first. |
Are you looking for https://github.com/MarlinFirmware/Marlin/blob/RC/Marlin/Marlin_main.cpp#L7614 |
Looking over the SCARA code, it appears slightly incomplete because it's not adding/subtracting |
lang/mmu: Translate MMU menu strings within caller
Rebase and modification of #4343.
Simplify probing by using movement helper functions.
run_z_probe
so it uses the same functions for Delta as for others.DELTA
.Z_PROBE_FACTOR_FAST
,Z_PROBE_FACTOR_SLOW
with defaults100
,50
.