Skip to content

Commit b0316f2

Browse files
sjasonsmithDarred
authored andcommitted
⚡️ Simplify PROBING_STEPPERS_OFF (MarlinFirmware#22581)
1 parent fb3e8da commit b0316f2

File tree

2 files changed

+10
-16
lines changed

2 files changed

+10
-16
lines changed

Marlin/src/inc/Conditionals_post.h

+3-4
Original file line numberDiff line numberDiff line change
@@ -3274,10 +3274,9 @@
32743274
#endif
32753275
#if !BOTH(HAS_BED_PROBE, HAS_EXTRUDERS)
32763276
#undef PROBING_ESTEPPERS_OFF
3277-
#endif
3278-
#if BOTH(PROBING_STEPPERS_OFF, PROBING_ESTEPPERS_OFF)
3279-
#undef PROBING_ESTEPPERS_OFF
3280-
#warning "PROBING_STEPPERS_OFF includes PROBING_ESTEPPERS_OFF. Disabling PROBING_ESTEPPERS_OFF."
3277+
#elif ENABLED(PROBING_STEPPERS_OFF)
3278+
// PROBING_STEPPERS_OFF implies PROBING_ESTEPPERS_OFF, make sure it is defined
3279+
#define PROBING_ESTEPPERS_OFF
32813280
#endif
32823281
#if EITHER(ADVANCED_PAUSE_FEATURE, PROBING_HEATERS_OFF)
32833282
#define HEATER_IDLE_HANDLER 1

Marlin/src/module/probe.cpp

+7-12
Original file line numberDiff line numberDiff line change
@@ -250,21 +250,16 @@ xyz_pos_t Probe::offset; // Initialized by settings.load()
250250
TERN_(PROBING_HEATERS_OFF, thermalManager.pause_heaters(dopause));
251251
TERN_(PROBING_FANS_OFF, thermalManager.set_fans_paused(dopause));
252252
TERN_(PROBING_ESTEPPERS_OFF, if (dopause) disable_e_steppers());
253-
#if ENABLED(PROBING_STEPPERS_OFF)
254-
IF_DISABLED(DELTA, static uint8_t old_trusted);
253+
#if ENABLED(PROBING_STEPPERS_OFF) && DISABLED(DELTA)
254+
static uint8_t old_trusted;
255255
if (dopause) {
256-
#if DISABLED(DELTA)
257-
old_trusted = axis_trusted;
258-
DISABLE_AXIS_X();
259-
DISABLE_AXIS_Y();
260-
#endif
261-
IF_DISABLED(PROBING_ESTEPPERS_OFF, disable_e_steppers());
256+
old_trusted = axis_trusted;
257+
DISABLE_AXIS_X();
258+
DISABLE_AXIS_Y();
262259
}
263260
else {
264-
#if DISABLED(DELTA)
265-
if (TEST(old_trusted, X_AXIS)) ENABLE_AXIS_X();
266-
if (TEST(old_trusted, Y_AXIS)) ENABLE_AXIS_Y();
267-
#endif
261+
if (TEST(old_trusted, X_AXIS)) ENABLE_AXIS_X();
262+
if (TEST(old_trusted, Y_AXIS)) ENABLE_AXIS_Y();
268263
axis_trusted = old_trusted;
269264
}
270265
#endif

0 commit comments

Comments
 (0)