Skip to content

Commit

Permalink
Rename QUIET_PROBING
Browse files Browse the repository at this point in the history
  • Loading branch information
thinkyhead authored and zillarob committed Feb 25, 2021
1 parent fa15505 commit 5edeb6b
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion Marlin/src/inc/Conditionals_post.h
Original file line number Diff line number Diff line change
Expand Up @@ -2290,7 +2290,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
Expand Down
4 changes: 2 additions & 2 deletions Marlin/src/lcd/menu/menu_bed_corners.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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();
Expand Down
4 changes: 2 additions & 2 deletions Marlin/src/module/motion.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1298,7 +1298,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

Expand Down Expand Up @@ -1337,7 +1337,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

Expand Down
10 changes: 5 additions & 5 deletions Marlin/src/module/probe.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
#include "../feature/tmc_util.h"
#endif

#if QUIET_PROBING
#if HAS_QUIET_PROBING
#include "stepper/indirection.h"
#endif

Expand Down Expand Up @@ -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));
Expand All @@ -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
Expand Down Expand Up @@ -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);
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/module/probe.h
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ class Probe {
static void servo_probe_init();
#endif

#if QUIET_PROBING
#if HAS_QUIET_PROBING
static void set_probing_paused(const bool p);
#endif

Expand Down

0 comments on commit 5edeb6b

Please sign in to comment.