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

Rename QUIET_PROBING

Browse Source
This commit is contained in:
Scott Lahteine 2020-12-18 21:13:37 -06:00 committed by Scott Lahteine
parent f7f531e59d
commit e02fd232ba
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/inc/Conditionals_post.h
View File

@ -2373,7 +2373,7 @@
#endif #endif
#if HAS_BED_PROBE && (EITHER(PROBING_HEATERS_OFF, PROBING_FANS_OFF) || DELAY_BEFORE_PROBING > 0) #if HAS_BED_PROBE && (EITHER(PROBING_HEATERS_OFF, PROBING_FANS_OFF) || DELAY_BEFORE_PROBING > 0)
#define QUIET_PROBING 1 #define HAS_QUIET_PROBING 1
#endif #endif
#if EITHER(ADVANCED_PAUSE_FEATURE, PROBING_HEATERS_OFF) #if EITHER(ADVANCED_PAUSE_FEATURE, PROBING_HEATERS_OFF)
#define HEATER_IDLE_HANDLER 1 #define HEATER_IDLE_HANDLER 1

4
Marlin/src/lcd/menu/menu_bed_corners.cpp
View File

@ -104,7 +104,7 @@ static int8_t bed_corner;
#if ENABLED(BLTOUCH) && DISABLED(BLTOUCH_HS_MODE) #if ENABLED(BLTOUCH) && DISABLED(BLTOUCH_HS_MODE)
bltouch.deploy(); // DEPLOY in LOW SPEED MODE on every probe action bltouch.deploy(); // DEPLOY in LOW SPEED MODE on every probe action
#endif #endif
TERN_(QUIET_PROBING, probe.set_probing_paused(true)); TERN_(HAS_QUIET_PROBING, probe.set_probing_paused(true));
// Move down until the probe is triggered // Move down until the probe is triggered
do_blocking_move_to_z(last_z - (LEVEL_CORNERS_PROBE_TOLERANCE), manual_feedrate_mm_s.z); do_blocking_move_to_z(last_z - (LEVEL_CORNERS_PROBE_TOLERANCE), manual_feedrate_mm_s.z);
@ -141,7 +141,7 @@ static int8_t bed_corner;
TERN_(LEVEL_CORNERS_VERIFY_RAISED, verify_corner = true); TERN_(LEVEL_CORNERS_VERIFY_RAISED, verify_corner = true);
} }
TERN_(QUIET_PROBING, probe.set_probing_paused(false)); TERN_(HAS_QUIET_PROBING, probe.set_probing_paused(false));
#if ENABLED(BLTOUCH) && DISABLED(BLTOUCH_HS_MODE) #if ENABLED(BLTOUCH) && DISABLED(BLTOUCH_HS_MODE)
bltouch.stow(); bltouch.stow();

4
Marlin/src/module/motion.cpp
View File

@ -1321,7 +1321,7 @@ void do_homing_move(const AxisEnum axis, const float distance, const feedRate_t
if (is_home_dir) { if (is_home_dir) {
#if HOMING_Z_WITH_PROBE && QUIET_PROBING #if HOMING_Z_WITH_PROBE && HAS_QUIET_PROBING
if (axis == Z_AXIS) probe.set_probing_paused(true); if (axis == Z_AXIS) probe.set_probing_paused(true);
#endif #endif
@ -1360,7 +1360,7 @@ void do_homing_move(const AxisEnum axis, const float distance, const feedRate_t
if (is_home_dir) { if (is_home_dir) {
#if HOMING_Z_WITH_PROBE && QUIET_PROBING #if HOMING_Z_WITH_PROBE && HAS_QUIET_PROBING
if (axis == Z_AXIS) probe.set_probing_paused(false); if (axis == Z_AXIS) probe.set_probing_paused(false);
#endif #endif

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

@ -73,7 +73,7 @@
#include "../feature/tmc_util.h" #include "../feature/tmc_util.h"
#endif #endif
#if QUIET_PROBING #if HAS_QUIET_PROBING
#include "stepper/indirection.h" #include "stepper/indirection.h"
#endif #endif
@ -236,7 +236,7 @@ xyz_pos_t Probe::offset; // Initialized by settings.load()
#endif // Z_PROBE_ALLEN_KEY #endif // Z_PROBE_ALLEN_KEY
#if QUIET_PROBING #if HAS_QUIET_PROBING
void Probe::set_probing_paused(const bool p) { void Probe::set_probing_paused(const bool p) {
TERN_(PROBING_HEATERS_OFF, thermalManager.pause(p)); TERN_(PROBING_HEATERS_OFF, thermalManager.pause(p));
@ -254,7 +254,7 @@ xyz_pos_t Probe::offset; // Initialized by settings.load()
); );
} }
#endif // QUIET_PROBING #endif // HAS_QUIET_PROBING
/** /**
* Raise Z to a minimum height to make room for a probe to move * Raise Z to a minimum height to make room for a probe to move
@ -437,7 +437,7 @@ bool Probe::probe_down_to_z(const float z, const feedRate_t fr_mm_s) {
endstops.enable(true); endstops.enable(true);
#endif #endif
TERN_(QUIET_PROBING, set_probing_paused(true)); TERN_(HAS_QUIET_PROBING, set_probing_paused(true));
// Move down until the probe is triggered // Move down until the probe is triggered
do_blocking_move_to_z(z, fr_mm_s); do_blocking_move_to_z(z, fr_mm_s);
@ -451,7 +451,7 @@ bool Probe::probe_down_to_z(const float z, const feedRate_t fr_mm_s) {
#endif #endif
; ;
TERN_(QUIET_PROBING, set_probing_paused(false)); TERN_(HAS_QUIET_PROBING, set_probing_paused(false));
// Re-enable stealthChop if used. Disable diag1 pin on driver. // Re-enable stealthChop if used. Disable diag1 pin on driver.
#if ENABLED(SENSORLESS_PROBING) #if ENABLED(SENSORLESS_PROBING)

2
Marlin/src/module/probe.h
View File

@ -202,7 +202,7 @@ public:
static void servo_probe_init(); static void servo_probe_init();
#endif #endif
#if QUIET_PROBING #if HAS_QUIET_PROBING
static void set_probing_paused(const bool p); static void set_probing_paused(const bool p);
#endif #endif