Skip to content

Commit 6826b33

Browse files
cr20-123ptoal
cr20-123
authored andcommitted
✨ Update/extend Quiet Probing (MarlinFirmware#22205)
1 parent 3e79b12 commit 6826b33

File tree

4 files changed

+20
-9
lines changed

4 files changed

+20
-9
lines changed

Marlin/Configuration.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -1252,7 +1252,8 @@
12521252
//#define WAIT_FOR_HOTEND // Wait for hotend to heat back up between probes (to improve accuracy & prevent cold extrude)
12531253
#endif
12541254
//#define PROBING_FANS_OFF // Turn fans off when probing
1255-
//#define PROBING_STEPPERS_OFF // Turn steppers off (unless needed to hold position) when probing
1255+
//#define PROBING_ESTEPPERS_OFF // Turn all extruder steppers off when probing
1256+
//#define PROBING_STEPPERS_OFF // Turn all steppers off (unless needed to hold position) when probing (including extruders)
12561257
//#define DELAY_BEFORE_PROBING 200 // (ms) To prevent vibrations from triggering piezo sensors
12571258

12581259
// Require minimum nozzle and/or bed temperature for probing

Marlin/src/inc/Conditionals_post.h

+14-5
Original file line numberDiff line numberDiff line change
@@ -3099,6 +3099,7 @@
30993099
#endif
31003100
#else
31013101
#undef NOZZLE_TO_PROBE_OFFSET
3102+
#undef PROBING_STEPPERS_OFF
31023103
#endif
31033104

31043105
/**
@@ -3141,18 +3142,26 @@
31413142
/**
31423143
* Heater, Fan, and Probe interactions
31433144
*/
3144-
#if FAN_COUNT == 0
3145-
#undef PROBING_FANS_OFF
3145+
#if !HAS_FAN
31463146
#undef ADAPTIVE_FAN_SLOWING
31473147
#undef NO_FAN_SLOWING_IN_PID_TUNING
31483148
#endif
3149-
3150-
#if HAS_BED_PROBE && (EITHER(PROBING_HEATERS_OFF, PROBING_FANS_OFF) || DELAY_BEFORE_PROBING > 0)
3151-
#define HAS_QUIET_PROBING 1
3149+
#if !BOTH(HAS_BED_PROBE, HAS_FAN)
3150+
#undef PROBING_FANS_OFF
3151+
#endif
3152+
#if !BOTH(HAS_BED_PROBE, HAS_EXTRUDERS)
3153+
#undef PROBING_ESTEPPERS_OFF
3154+
#endif
3155+
#if BOTH(PROBING_STEPPERS_OFF, PROBING_ESTEPPERS_OFF)
3156+
#undef PROBING_ESTEPPERS_OFF
3157+
#warning "PROBING_STEPPERS_OFF includes PROBING_ESTEPPERS_OFF. Disabling PROBING_ESTEPPERS_OFF."
31523158
#endif
31533159
#if EITHER(ADVANCED_PAUSE_FEATURE, PROBING_HEATERS_OFF)
31543160
#define HEATER_IDLE_HANDLER 1
31553161
#endif
3162+
#if HAS_BED_PROBE && (ANY(PROBING_HEATERS_OFF, PROBING_STEPPERS_OFF, PROBING_ESTEPPERS_OFF, PROBING_FANS_OFF) || DELAY_BEFORE_PROBING > 0)
3163+
#define HAS_QUIET_PROBING 1
3164+
#endif
31563165

31573166
/**
31583167
* Advanced Pause - Filament Change

Marlin/src/module/probe.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,7 @@ xyz_pos_t Probe::offset; // Initialized by settings.load()
245245
void Probe::set_probing_paused(const bool dopause) {
246246
TERN_(PROBING_HEATERS_OFF, thermalManager.pause_heaters(dopause));
247247
TERN_(PROBING_FANS_OFF, thermalManager.set_fans_paused(dopause));
248+
TERN_(PROBING_ESTEPPERS_OFF, if (dopause) disable_e_steppers());
248249
#if ENABLED(PROBING_STEPPERS_OFF)
249250
IF_DISABLED(DELTA, static uint8_t old_trusted);
250251
if (dopause) {
@@ -253,7 +254,7 @@ xyz_pos_t Probe::offset; // Initialized by settings.load()
253254
DISABLE_AXIS_X();
254255
DISABLE_AXIS_Y();
255256
#endif
256-
disable_e_steppers();
257+
IF_DISABLED(PROBING_ESTEPPERS_OFF, disable_e_steppers());
257258
}
258259
else {
259260
#if DISABLED(DELTA)

buildroot/tests/rambo

+2-2
Original file line numberDiff line numberDiff line change
@@ -115,10 +115,10 @@ opt_set MOTHERBOARD BOARD_RAMBO \
115115
FAN_MIN_PWM 50 FAN_KICKSTART_TIME 100 \
116116
XY_FREQUENCY_LIMIT 15
117117
opt_enable COREYX USE_XMAX_PLUG MIXING_EXTRUDER GRADIENT_MIX \
118-
BABYSTEPPING BABYSTEP_DISPLAY_TOTAL FILAMENT_LCD_DISPLAY \
118+
BABYSTEPPING BABYSTEP_DISPLAY_TOTAL FILAMENT_LCD_DISPLAY FILAMENT_WIDTH_SENSOR \
119119
REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER MENU_ADDAUTOSTART SDSUPPORT SDCARD_SORT_ALPHA \
120120
ENDSTOP_NOISE_THRESHOLD FAN_SOFT_PWM \
121-
FIX_MOUNTED_PROBE AUTO_BED_LEVELING_LINEAR DEBUG_LEVELING_FEATURE FILAMENT_WIDTH_SENSOR PROBE_OFFSET_WIZARD \
121+
FIX_MOUNTED_PROBE PROBING_ESTEPPERS_OFF AUTO_BED_LEVELING_LINEAR DEBUG_LEVELING_FEATURE PROBE_OFFSET_WIZARD \
122122
Z_SAFE_HOMING SHOW_TEMP_ADC_VALUES HOME_Y_BEFORE_X EMERGENCY_PARSER \
123123
SD_ABORT_ON_ENDSTOP_HIT HOST_ACTION_COMMANDS HOST_PROMPT_SUPPORT ADVANCED_OK M114_DETAIL \
124124
VOLUMETRIC_DEFAULT_ON NO_WORKSPACE_OFFSETS EXTRA_FAN_SPEED FWRETRACT \

0 commit comments

Comments
 (0)