Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
MarlinKimbra
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
machinery
MarlinKimbra
Commits
56529752
Commit
56529752
authored
Jun 04, 2016
by
MagoKimbra
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'refs/remotes/origin/dev'
parents
2244eb2c
0a03e4e3
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
2 deletions
+1
-2
MK_Main.cpp
MK/module/MK_Main.cpp
+1
-2
No files found.
MK/module/MK_Main.cpp
View file @
56529752
...
@@ -3881,11 +3881,10 @@ inline void gcode_G28() {
...
@@ -3881,11 +3881,10 @@ inline void gcode_G28() {
*/
*/
destination
[
X_AXIS
]
=
round
(
Z_SAFE_HOMING_X_POINT
-
(
X_PROBE_OFFSET_FROM_EXTRUDER
));
destination
[
X_AXIS
]
=
round
(
Z_SAFE_HOMING_X_POINT
-
(
X_PROBE_OFFSET_FROM_EXTRUDER
));
destination
[
Y_AXIS
]
=
round
(
Z_SAFE_HOMING_Y_POINT
-
(
Y_PROBE_OFFSET_FROM_EXTRUDER
));
destination
[
Y_AXIS
]
=
round
(
Z_SAFE_HOMING_Y_POINT
-
(
Y_PROBE_OFFSET_FROM_EXTRUDER
));
destination
[
Z_AXIS
]
=
-
(
Z_RAISE_BEFORE_HOMING
)
*
home_dir
(
Z_AXIS
);
// Set destination away from bed
destination
[
Z_AXIS
]
=
current_position
[
Z_AXIS
];
//z is already at the right height
feedrate
=
xy_travel_speed
;
feedrate
=
xy_travel_speed
;
if
(
DEBUGGING
(
INFO
))
{
if
(
DEBUGGING
(
INFO
))
{
ECHO_LMV
(
INFO
,
"Raise Z (before homing) by "
,
(
float
)
Z_RAISE_BEFORE_HOMING
);
DEBUG_POS
(
"> Z_SAFE_HOMING > home_all_axis"
,
current_position
);
DEBUG_POS
(
"> Z_SAFE_HOMING > home_all_axis"
,
current_position
);
DEBUG_POS
(
"> Z_SAFE_HOMING > home_all_axis"
,
destination
);
DEBUG_POS
(
"> Z_SAFE_HOMING > home_all_axis"
,
destination
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment