Commit b0316f2 1 parent fb3e8da commit b0316f2 Copy full SHA for b0316f2
File tree 2 files changed +10
-16
lines changed
2 files changed +10
-16
lines changed Original file line number Diff line number Diff line change 3274
3274
#endif
3275
3275
#if !BOTH (HAS_BED_PROBE , HAS_EXTRUDERS )
3276
3276
#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
3281
3280
#endif
3282
3281
#if EITHER (ADVANCED_PAUSE_FEATURE , PROBING_HEATERS_OFF )
3283
3282
#define HEATER_IDLE_HANDLER 1
Original file line number Diff line number Diff line change @@ -250,21 +250,16 @@ xyz_pos_t Probe::offset; // Initialized by settings.load()
250
250
TERN_ (PROBING_HEATERS_OFF, thermalManager.pause_heaters (dopause));
251
251
TERN_ (PROBING_FANS_OFF, thermalManager.set_fans_paused (dopause));
252
252
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;
255
255
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 ();
262
259
}
263
260
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 ();
268
263
axis_trusted = old_trusted;
269
264
}
270
265
#endif
You can’t perform that action at this time.
0 commit comments