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
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jonas Leder
marlin-anet-a8
Commits
2e33c3bd
Unverified
Commit
2e33c3bd
authored
7 years ago
by
Scott Lahteine
Committed by
GitHub
7 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #8270 from studiodyne/studiodyne-fw
fwretract bug/mistake + suggestion
parents
7de8a667
d295f984
Branches
Branches containing commit
Tags
Tags containing commit
Loading
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
Marlin/src/feature/fwretract.cpp
+1
-1
1 addition, 1 deletion
Marlin/src/feature/fwretract.cpp
with
1 addition
and
1 deletion
Marlin/src/feature/fwretract.cpp
+
1
−
1
View file @
2e33c3bd
...
@@ -153,7 +153,7 @@ void FWRetract::retract(const bool retracting
...
@@ -153,7 +153,7 @@ void FWRetract::retract(const bool retracting
else
{
else
{
// If a hop was done and Z hasn't changed, undo the Z hop
// If a hop was done and Z hasn't changed, undo the Z hop
if
(
hop_amount
)
{
if
(
hop_amount
)
{
current_position
[
Z_AXIS
]
-
=
retract_zlift
;
// Pretend current pos is lower. Next move raises Z.
current_position
[
Z_AXIS
]
+
=
retract_zlift
;
// Pretend current pos is lower. Next move raises Z.
SYNC_PLAN_POSITION_KINEMATIC
();
// Set the planner to the new position
SYNC_PLAN_POSITION_KINEMATIC
();
// Set the planner to the new position
feedrate_mm_s
=
planner
.
max_feedrate_mm_s
[
Z_AXIS
];
// Z feedrate to max
feedrate_mm_s
=
planner
.
max_feedrate_mm_s
[
Z_AXIS
];
// Z feedrate to max
prepare_move_to_destination
();
// Raise up to the old current pos
prepare_move_to_destination
();
// Raise up to the old current pos
...
...
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