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
dc6fa04f
Commit
dc6fa04f
authored
Jul 22, 2019
by
InsanityAutomation
Committed by
Scott Lahteine
Jul 22, 2019
Browse files
Options
Downloads
Patches
Plain Diff
Fix single nozzle temp change, do slower extra prime (#14696)
parent
e5aa4532
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
Marlin/src/gcode/feature/advance/M900.cpp
+13
-13
13 additions, 13 deletions
Marlin/src/gcode/feature/advance/M900.cpp
Marlin/src/module/tool_change.cpp
+83
-79
83 additions, 79 deletions
Marlin/src/module/tool_change.cpp
with
96 additions
and
92 deletions
Marlin/src/gcode/feature/advance/M900.cpp
+
13
−
13
View file @
dc6fa04f
...
@@ -44,10 +44,10 @@
...
@@ -44,10 +44,10 @@
void
GcodeSuite
::
M900
()
{
void
GcodeSuite
::
M900
()
{
#if EXTRUDERS < 2
#if EXTRUDERS < 2
constexpr
uint8_t
t
mp_extru
de
r
=
0
;
constexpr
uint8_t
t
ool_in
de
x
=
0
;
#else
#else
const
uint8_t
t
mp_extru
de
r
=
parser
.
intval
(
'T'
,
active_extruder
);
const
uint8_t
t
ool_in
de
x
=
parser
.
intval
(
'T'
,
active_extruder
);
if
(
t
mp_extru
de
r
>=
EXTRUDERS
)
{
if
(
t
ool_in
de
x
>=
EXTRUDERS
)
{
SERIAL_ECHOLNPGM
(
"?T value out of range."
);
SERIAL_ECHOLNPGM
(
"?T value out of range."
);
return
;
return
;
}
}
...
@@ -55,17 +55,17 @@ void GcodeSuite::M900() {
...
@@ -55,17 +55,17 @@ void GcodeSuite::M900() {
#if ENABLED(EXTRA_LIN_ADVANCE_K)
#if ENABLED(EXTRA_LIN_ADVANCE_K)
bool
ext_slot
=
TEST
(
lin_adv_slot
,
t
mp_extru
de
r
);
bool
ext_slot
=
TEST
(
lin_adv_slot
,
t
ool_in
de
x
);
if
(
parser
.
seenval
(
'S'
))
{
if
(
parser
.
seenval
(
'S'
))
{
const
bool
slot
=
parser
.
value_bool
();
const
bool
slot
=
parser
.
value_bool
();
if
(
ext_slot
!=
slot
)
{
if
(
ext_slot
!=
slot
)
{
ext_slot
=
slot
;
ext_slot
=
slot
;
SET_BIT_TO
(
lin_adv_slot
,
t
mp_extru
de
r
,
slot
);
SET_BIT_TO
(
lin_adv_slot
,
t
ool_in
de
x
,
slot
);
planner
.
synchronize
();
planner
.
synchronize
();
const
float
temp
=
planner
.
extruder_advance_K
[
t
mp_extru
de
r
];
const
float
temp
=
planner
.
extruder_advance_K
[
t
ool_in
de
x
];
planner
.
extruder_advance_K
[
t
mp_extru
de
r
]
=
saved_extruder_advance_K
[
t
mp_extru
de
r
];
planner
.
extruder_advance_K
[
t
ool_in
de
x
]
=
saved_extruder_advance_K
[
t
ool_in
de
x
];
saved_extruder_advance_K
[
t
mp_extru
de
r
]
=
temp
;
saved_extruder_advance_K
[
t
ool_in
de
x
]
=
temp
;
}
}
}
}
...
@@ -73,10 +73,10 @@ void GcodeSuite::M900() {
...
@@ -73,10 +73,10 @@ void GcodeSuite::M900() {
const
float
newK
=
parser
.
value_float
();
const
float
newK
=
parser
.
value_float
();
if
(
WITHIN
(
newK
,
0
,
10
))
{
if
(
WITHIN
(
newK
,
0
,
10
))
{
if
(
ext_slot
)
if
(
ext_slot
)
saved_extruder_advance_K
[
t
mp_extru
de
r
]
=
newK
;
saved_extruder_advance_K
[
t
ool_in
de
x
]
=
newK
;
else
{
else
{
planner
.
synchronize
();
planner
.
synchronize
();
planner
.
extruder_advance_K
[
t
mp_extru
de
r
]
=
newK
;
planner
.
extruder_advance_K
[
t
ool_in
de
x
]
=
newK
;
}
}
}
}
else
else
...
@@ -87,10 +87,10 @@ void GcodeSuite::M900() {
...
@@ -87,10 +87,10 @@ void GcodeSuite::M900() {
const
float
newL
=
parser
.
value_float
();
const
float
newL
=
parser
.
value_float
();
if
(
WITHIN
(
newL
,
0
,
10
))
{
if
(
WITHIN
(
newL
,
0
,
10
))
{
if
(
!
ext_slot
)
if
(
!
ext_slot
)
saved_extruder_advance_K
[
t
mp_extru
de
r
]
=
newL
;
saved_extruder_advance_K
[
t
ool_in
de
x
]
=
newL
;
else
{
else
{
planner
.
synchronize
();
planner
.
synchronize
();
planner
.
extruder_advance_K
[
t
mp_extru
de
r
]
=
newL
;
planner
.
extruder_advance_K
[
t
ool_in
de
x
]
=
newL
;
}
}
}
}
else
else
...
@@ -117,7 +117,7 @@ void GcodeSuite::M900() {
...
@@ -117,7 +117,7 @@ void GcodeSuite::M900() {
const
float
newK
=
parser
.
value_float
();
const
float
newK
=
parser
.
value_float
();
if
(
WITHIN
(
newK
,
0
,
10
))
{
if
(
WITHIN
(
newK
,
0
,
10
))
{
planner
.
synchronize
();
planner
.
synchronize
();
planner
.
extruder_advance_K
[
t
mp_extru
de
r
]
=
newK
;
planner
.
extruder_advance_K
[
t
ool_in
de
x
]
=
newK
;
}
}
else
else
SERIAL_ECHOLNPGM
(
"?K value out of range (0-10)."
);
SERIAL_ECHOLNPGM
(
"?K value out of range (0-10)."
);
...
...
...
...
This diff is collapsed.
Click to expand it.
Marlin/src/module/tool_change.cpp
+
83
−
79
View file @
dc6fa04f
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