From e02fd232ba6f6217f896ff82038ea6c2acfc77c2 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Fri, 18 Dec 2020 21:13:37 -0600
Subject: [PATCH] Rename QUIET_PROBING
---
Marlin/src/inc/Conditionals_post.h | 2 +-
Marlin/src/lcd/menu/menu_bed_corners.cpp | 4 ++--
Marlin/src/module/motion.cpp | 4 ++--
Marlin/src/module/probe.cpp | 10 +++++-----
Marlin/src/module/probe.h | 2 +-
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 3510cb21155..3ce7043f4fb 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -2373,7 +2373,7 @@
#endif
#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
#if EITHER(ADVANCED_PAUSE_FEATURE, PROBING_HEATERS_OFF)
#define HEATER_IDLE_HANDLER 1
diff --git a/Marlin/src/lcd/menu/menu_bed_corners.cpp b/Marlin/src/lcd/menu/menu_bed_corners.cpp
index ad91c404aa7..acd19d69e41 100644
--- a/Marlin/src/lcd/menu/menu_bed_corners.cpp
+++ b/Marlin/src/lcd/menu/menu_bed_corners.cpp
@@ -104,7 +104,7 @@ static int8_t bed_corner;
#if ENABLED(BLTOUCH) && DISABLED(BLTOUCH_HS_MODE)
bltouch.deploy(); // DEPLOY in LOW SPEED MODE on every probe action
#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
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_(QUIET_PROBING, probe.set_probing_paused(false));
+ TERN_(HAS_QUIET_PROBING, probe.set_probing_paused(false));
#if ENABLED(BLTOUCH) && DISABLED(BLTOUCH_HS_MODE)
bltouch.stow();
diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index 127ba80788d..45ec5131494 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -1321,7 +1321,7 @@ void do_homing_move(const AxisEnum axis, const float distance, const feedRate_t
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);
#endif
@@ -1360,7 +1360,7 @@ void do_homing_move(const AxisEnum axis, const float distance, const feedRate_t
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);
#endif
diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp
index 17949a44204..bcd3a03a9ae 100644
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@@ -73,7 +73,7 @@
#include "../feature/tmc_util.h"
#endif
-#if QUIET_PROBING
+#if HAS_QUIET_PROBING
#include "stepper/indirection.h"
#endif
@@ -236,7 +236,7 @@ xyz_pos_t Probe::offset; // Initialized by settings.load()
#endif // Z_PROBE_ALLEN_KEY
-#if QUIET_PROBING
+#if HAS_QUIET_PROBING
void Probe::set_probing_paused(const bool 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
@@ -437,7 +437,7 @@ bool Probe::probe_down_to_z(const float z, const feedRate_t fr_mm_s) {
endstops.enable(true);
#endif
- TERN_(QUIET_PROBING, set_probing_paused(true));
+ TERN_(HAS_QUIET_PROBING, set_probing_paused(true));
// Move down until the probe is triggered
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
;
- 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.
#if ENABLED(SENSORLESS_PROBING)
diff --git a/Marlin/src/module/probe.h b/Marlin/src/module/probe.h
index e5ad892e379..137d360175e 100644
--- a/Marlin/src/module/probe.h
+++ b/Marlin/src/module/probe.h
@@ -202,7 +202,7 @@ public:
static void servo_probe_init();
#endif
- #if QUIET_PROBING
+ #if HAS_QUIET_PROBING
static void set_probing_paused(const bool p);
#endif