MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Trust XY after Quiet Probing short sleep (#21237)

Browse Source
This commit is contained in:
Scott Lahteine 2021-03-01 19:39:43 -06:00
parent be8b547261
commit 92da7659f4
1 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Marlin/src/module/probe.cpp
View File

@ -238,20 +238,32 @@ xyz_pos_t Probe::offset; // Initialized by settings.load()
#if HAS_QUIET_PROBING #if HAS_QUIET_PROBING
void Probe::set_probing_paused(const bool p) { #ifndef DELAY_BEFORE_PROBING
TERN_(PROBING_HEATERS_OFF, thermalManager.pause(p)); #define DELAY_BEFORE_PROBING 25
TERN_(PROBING_FANS_OFF, thermalManager.set_fans_paused(p)); #endif
void Probe::set_probing_paused(const bool dopause) {
TERN_(PROBING_HEATERS_OFF, thermalManager.pause(dopause));
TERN_(PROBING_FANS_OFF, thermalManager.set_fans_paused(dopause));
#if ENABLED(PROBING_STEPPERS_OFF) #if ENABLED(PROBING_STEPPERS_OFF)
disable_e_steppers(); IF_DISABLED(DELTA, static uint8_t old_trusted);
#if NONE(DELTA, HOME_AFTER_DEACTIVATE) if (dopause) {
DISABLE_AXIS_X(); DISABLE_AXIS_Y(); #if DISABLED(DELTA)
#endif old_trusted = axis_trusted;
DISABLE_AXIS_X();
DISABLE_AXIS_Y();
#endif
disable_e_steppers();
}
else {
#if DISABLED(DELTA)
if (TEST(old_trusted, X_AXIS)) ENABLE_AXIS_X();
if (TEST(old_trusted, Y_AXIS)) ENABLE_AXIS_Y();
#endif
axis_trusted = old_trusted;
}
#endif #endif
if (p) safe_delay(25 if (dopause) safe_delay(_MAX(DELAY_BEFORE_PROBING, 25));
#if DELAY_BEFORE_PROBING > 25
- 25 + DELAY_BEFORE_PROBING
#endif
);
} }
#endif // HAS_QUIET_PROBING #endif // HAS_QUIET_PROBING