Skip to content

Commit 25b1266

Browse files
author
D.R.racer
committed
Experimental: disengage to intermediate
1 parent 0eeef4c commit 25b1266

File tree

3 files changed

+13
-11
lines changed

3 files changed

+13
-11
lines changed

src/logic/feed_to_bondtech.cpp

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -86,18 +86,19 @@ bool FeedToBondtech::Step() {
8686
if (mi::idler.PartiallyDisengaged()) {
8787
mm::motion.AbortPlannedMoves(mm::Pulley);
8888
mpu::pulley.Disable();
89-
mi::idler.Disengage(); // disengage fully while Pulley is already stopped
90-
state = DisengagingIdler;
91-
}
92-
return false;
93-
case DisengagingIdler:
94-
if (mi::idler.Disengaged()) {
95-
dbg_logic_P(PSTR("Feed to Bondtech --> Idler disengaged"));
96-
dbg_logic_fP(PSTR("Pulley end steps %u"), mpu::pulley.CurrentPosition_mm());
97-
state = OK;
89+
//mi::idler.Disengage(); // disengage fully while Pulley is already stopped
9890
ml::leds.SetMode(mg::globals.ActiveSlot(), ml::green, ml::on);
91+
state = OK;
9992
}
10093
return false;
94+
// case DisengagingIdler:
95+
// if (mi::idler.Disengaged()) {
96+
// dbg_logic_P(PSTR("Feed to Bondtech --> Idler disengaged"));
97+
// dbg_logic_fP(PSTR("Pulley end steps %u"), mpu::pulley.CurrentPosition_mm());
98+
// state = OK;
99+
// ml::leds.SetMode(mg::globals.ActiveSlot(), ml::green, ml::on);
100+
// }
101+
// return false;
101102
case OK:
102103
dbg_logic_P(PSTR("Feed to Bondtech OK"));
103104
return true;

src/logic/tool_change.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,7 @@ ProgressCode ToolChange::State() const {
186186
return ProgressCode::FeedingToFSensor;
187187
case FeedToBondtech::PushingFilamentIntoNozzle:
188188
return ProgressCode::FeedingToNozzle;
189+
case FeedToBondtech::PartiallyDisengagingIdler:
189190
case FeedToBondtech::DisengagingIdler:
190191
return ProgressCode::DisengagingIdler;
191192
}

src/logic/unload_filament.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,12 @@ bool UnloadFilament::StepInner() {
7777
GoToErrDisengagingIdler(ErrorCode::FINDA_DIDNT_SWITCH_OFF); // signal unloading error
7878
} else {
7979
state = ProgressCode::DisengagingIdler;
80-
mi::idler.Disengage();
80+
mi::idler.PartiallyDisengage(mg::globals.ActiveSlot());
8181
}
8282
}
8383
return false;
8484
case ProgressCode::DisengagingIdler:
85-
if (mi::idler.Disengaged() && ms::selector.State() == ms::Selector::Ready) {
85+
if (mi::idler.PartiallyDisengaged() && ms::selector.State() == ms::Selector::Ready) {
8686
UnloadFinishedCorrectly();
8787
}
8888
return false;

0 commit comments

Comments
 (0)