From ae24cfa655b7d4d082dce4d8232b7af1c11f4f19 Mon Sep 17 00:00:00 2001 From: InsanityAutomation Date: Sat, 5 Dec 2020 17:29:04 -0500 Subject: [PATCH] Fix borked search / replace --- Marlin/src/module/endstops.cpp | 2 +- Marlin/src/module/motion.cpp | 2 +- Marlin/src/module/probe.cpp | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Marlin/src/module/endstops.cpp b/Marlin/src/module/endstops.cpp index a82c357863..e895289e0c 100644 --- a/Marlin/src/module/endstops.cpp +++ b/Marlin/src/module/endstops.cpp @@ -284,7 +284,7 @@ void Endstops::init() { SET_INPUT(PROBE_ENABLE_PIN) #endif - #if ENABLED(PROBE_CAN_TARE + #if ENABLED(PROBE_CAN_TARE) probe.tare_z_probe(); #endif diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp index 3bbff515a9..1d0f71d051 100644 --- a/Marlin/src/module/motion.cpp +++ b/Marlin/src/module/motion.cpp @@ -1603,7 +1603,7 @@ void homeaxis(const AxisEnum axis) { if (axis == Z_AXIS && bltouch.deploy()) return; // The initial DEPLOY #endif - #if ENABLED(PROBE_CAN_TARE + #if ENABLED(PROBE_CAN_TARE) if(axis == Z_AXIS) if (probe.tare_z_probe()) return; #endif diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp index a505398f75..d1ab96d11d 100644 --- a/Marlin/src/module/probe.cpp +++ b/Marlin/src/module/probe.cpp @@ -479,7 +479,7 @@ bool Probe::probe_down_to_z(const float z, const feedRate_t fr_mm_s) { return !probe_triggered; } -#if ENABLED(PROBE_CAN_TARE +#if ENABLED(PROBE_CAN_TARE) bool Probe::tare_z_probe() { #if ENABLED(PROBE_TARE_WHILE_INACTIVEACTIVE) if ((READ(PROBE_ENABLE_PIN) == PROBE_ENABLED_INPUTT_STATE)) { @@ -513,7 +513,7 @@ float Probe::run_z_probe(const bool sanity_check/*=true*/) { auto try_to_probe = [&](PGM_P const plbl, const float &z_probe_low_point, const feedRate_t fr_mm_s, const bool scheck, const float clearance) { // Do a first probe at the fast speed - #if ENABLED(PROBE_CAN_TARE + #if ENABLED(PROBE_CAN_TARE) if(tare_z_probe()) return NAN; #endif @@ -541,7 +541,7 @@ float Probe::run_z_probe(const bool sanity_check/*=true*/) { #if TOTAL_PROBING == 2 // Do a first probe at the fast speed - #if ENABLED(PROBE_CAN_TARE + #if ENABLED(PROBE_CAN_TARE) if(tare_z_probe()) return NAN; #endif @@ -583,7 +583,7 @@ float Probe::run_z_probe(const bool sanity_check/*=true*/) { #endif { // Probe downward slowly to find the bed - #if ENABLED(PROBE_CAN_TARE + #if ENABLED(PROBE_CAN_TARE) if(tare_z_probe()) return true; #endif if (try_to_probe(PSTR("SLOW"), z_probe_low_point, MMM_TO_MMS(Z_PROBE_SPEED_SLOW),