fix double retractions
This commit is contained in:
parent
1a284a622a
commit
a82c62b73a
1 changed files with 7 additions and 1 deletions
|
|
@ -188,6 +188,11 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
function retract(zhop) {
|
function retract(zhop) {
|
||||||
|
if (retracted) {
|
||||||
|
// console.log({double_retract: zhop});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
// console.log({retract:zhop});
|
||||||
retracted = retDist;
|
retracted = retDist;
|
||||||
moveTo({e:-retracted}, retSpeed, `e-retract ${retDist}`);
|
moveTo({e:-retracted}, retSpeed, `e-retract ${retDist}`);
|
||||||
if (zhop) moveTo({z:zpos + zhop}, seekMMM, "z-hop start");
|
if (zhop) moveTo({z:zpos + zhop}, seekMMM, "z-hop start");
|
||||||
|
|
@ -383,6 +388,7 @@
|
||||||
|
|
||||||
// re-engage post-retraction before new extrusion
|
// re-engage post-retraction before new extrusion
|
||||||
if (out.emit && retracted) {
|
if (out.emit && retracted) {
|
||||||
|
// console.log({engage:zhop});
|
||||||
// when enabled, resume previous Z
|
// when enabled, resume previous Z
|
||||||
if (zhop && pos.z != zpos) moveTo({z:zpos}, seekMMM, "z-hop end");
|
if (zhop && pos.z != zpos) moveTo({z:zpos}, seekMMM, "z-hop end");
|
||||||
// re-engage retracted filament
|
// re-engage retracted filament
|
||||||
|
|
@ -407,7 +413,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
// retract filament if point retract flag set
|
// retract filament if point retract flag set
|
||||||
if (!retracted && out.retract) {
|
if (out.retract) {
|
||||||
retract(zhop);
|
retract(zhop);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue