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
cb5aff45
Commit
cb5aff45
authored
Apr 06, 2016
by
MagoKimbra
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'refs/remotes/origin/master' into dev
parents
245af238
4b0196bb
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
5 deletions
+8
-5
MK_Main.cpp
MK/module/MK_Main.cpp
+8
-5
No files found.
MK/module/MK_Main.cpp
View file @
cb5aff45
...
...
@@ -2819,15 +2819,18 @@ void gcode_get_destination() {
if
(
code_seen
(
axis_codes
[
E_AXIS
]))
IDLE_OOZING_retract
(
false
);
#endif
for
(
int
i
=
0
;
i
<
NUM
_AXIS
;
i
++
)
{
if
(
code_seen
(
axis_codes
[
i
]))
{
for
(
int
i
=
0
;
i
<
Z
_AXIS
;
i
++
)
{
if
(
code_seen
(
axis_codes
[
i
]))
destination
[
i
]
=
code_value
()
+
(
axis_relative_modes
[
i
]
||
relative_mode
?
current_position
[
i
]
:
-
hotend_offset
[
i
][
active_extruder
]);
}
else
{
else
destination
[
i
]
=
current_position
[
i
];
}
}
if
(
code_seen
(
axis_codes
[
E_AXIS
]))
destination
[
E_AXIS
]
=
code_value
()
+
(
axis_relative_modes
[
E_AXIS
]
||
relative_mode
?
current_position
[
E_AXIS
]
:
0
);
else
destination
[
E_AXIS
]
=
current_position
[
E_AXIS
];
if
(
code_seen
(
'F'
))
{
float
next_feedrate
=
code_value
();
if
(
next_feedrate
>
0.0
)
feedrate
=
next_feedrate
;
...
...
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