Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
M
marlin-anet-a8
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jonas Leder
marlin-anet-a8
Commits
9c288a68
Commit
9c288a68
authored
Sep 25, 2019
by
Robby Candra
Committed by
Scott Lahteine
Sep 25, 2019
Browse files
Options
Downloads
Patches
Plain Diff
Followup to probe_at_point change (#15342)
parent
149e9b73
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
Marlin/src/feature/bedlevel/ubl/ubl.cpp
+2
-2
2 additions, 2 deletions
Marlin/src/feature/bedlevel/ubl/ubl.cpp
Marlin/src/gcode/calibrate/G34_M422.cpp
+1
-1
1 addition, 1 deletion
Marlin/src/gcode/calibrate/G34_M422.cpp
Marlin/src/module/probe.cpp
+3
-3
3 additions, 3 deletions
Marlin/src/module/probe.cpp
with
6 additions
and
6 deletions
Marlin/src/feature/bedlevel/ubl/ubl.cpp
+
2
−
2
View file @
9c288a68
...
...
@@ -177,8 +177,8 @@
serialprintPGM
(
csv
?
PSTR
(
"CSV:
\n
"
)
:
PSTR
(
"LCD:
\n
"
));
}
// Add XY probe offset from extruder because probe_
p
t() subtracts them when
// moving to the
xy
position to be measured. This ensures better agreement between
// Add XY probe offset from extruder because probe_
at_poin
t() subtracts them when
// moving to the
XY
position to be measured. This ensures better agreement between
// the current Z position after G28 and the mesh values.
const
float
current_xi
=
find_closest_x_index
(
current_position
[
X_AXIS
]
+
probe_offset
[
X_AXIS
]),
current_yi
=
find_closest_y_index
(
current_position
[
Y_AXIS
]
+
probe_offset
[
Y_AXIS
]);
...
...
...
...
This diff is collapsed.
Click to expand it.
Marlin/src/gcode/calibrate/G34_M422.cpp
+
1
−
1
View file @
9c288a68
...
...
@@ -277,7 +277,7 @@ void GcodeSuite::G34() {
// After this operation the z position needs correction
set_axis_is_not_at_home
(
Z_AXIS
);
// Stow the probe, as the last call to probe_
p
t(...) left
// Stow the probe, as the last call to probe_
at_poin
t(...) left
// the probe deployed if it was successful.
STOW_PROBE
();
...
...
...
...
This diff is collapsed.
Click to expand it.
Marlin/src/module/probe.cpp
+
3
−
3
View file @
9c288a68
...
...
@@ -532,7 +532,7 @@ static bool do_probe_move(const float z, const float fr_mm_s) {
/**
* @brief Probe at the current XY (possibly more than once) to find the bed Z.
*
* @details Used by probe_
p
t to get the bed Z height at the current XY.
* @details Used by probe_
at_poin
t to get the bed Z height at the current XY.
* Leaves current_position[Z_AXIS] at the height where the probe triggered.
*
* @return The Z position of the bed at the current XY or NAN on error.
...
...
@@ -686,7 +686,7 @@ static float run_z_probe() {
float
probe_at_point
(
const
float
&
rx
,
const
float
&
ry
,
const
ProbePtRaise
raise_after
/*=PROBE_PT_NONE*/
,
const
uint8_t
verbose_level
/*=0*/
,
const
bool
probe_relative
/*=true*/
)
{
if
(
DEBUGGING
(
LEVELING
))
{
DEBUG_ECHOLNPAIR
(
">>> probe_
p
t("
,
LOGICAL_X_POSITION
(
rx
),
", "
,
LOGICAL_Y_POSITION
(
ry
),
">>> probe_
at_poin
t("
,
LOGICAL_X_POSITION
(
rx
),
", "
,
LOGICAL_Y_POSITION
(
ry
),
", "
,
raise_after
==
PROBE_PT_RAISE
?
"raise"
:
raise_after
==
PROBE_PT_STOW
?
"stow"
:
"none"
,
", "
,
int
(
verbose_level
),
", "
,
probe_relative
?
"probe"
:
"nozzle"
,
"_relative)"
...
...
@@ -743,7 +743,7 @@ float probe_at_point(const float &rx, const float &ry, const ProbePtRaise raise_
SERIAL_ERROR_MSG
(
MSG_ERR_PROBING_FAILED
);
}
if
(
DEBUGGING
(
LEVELING
))
DEBUG_ECHOLNPGM
(
"<<< probe_
p
t"
);
if
(
DEBUGGING
(
LEVELING
))
DEBUG_ECHOLNPGM
(
"<<< probe_
at_poin
t"
);
return
measured_z
;
}
...
...
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment