This commit is contained in:
Scott Lahteine
2020-12-05 22:45:04 -06:00
parent 48b61b7cbd
commit e8e4a742b0
2 changed files with 8 additions and 8 deletions
+7 -7
View File
@@ -1599,14 +1599,14 @@ void homeaxis(const AxisEnum axis) {
// Fast move towards endstop until triggered
if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("Home 1 Fast:");
#if BOTH(HOMING_Z_WITH_PROBE, BLTOUCH)
if (axis == Z_AXIS && bltouch.deploy()) return; // The initial DEPLOY
#endif
#if ENABLED(PROBE_CAN_TARE)
if(axis == Z_AXIS)
if (axis == Z_AXIS) {
#if BOTH(HOMING_Z_WITH_PROBE, BLTOUCH)
if (bltouch.deploy()) return; // The initial DEPLOY
#endif
#if ENABLED(PROBE_CAN_TARE)
if (probe.tare_z_probe()) return;
#endif
#endif
}
#if DISABLED(DELTA) && defined(SENSORLESS_BACKOFF_MM)
const xy_float_t backoff = SENSORLESS_BACKOFF_MM;
+1 -1
View File
@@ -481,7 +481,7 @@ bool Probe::probe_down_to_z(const float z, const feedRate_t fr_mm_s) {
#if ENABLED(PROBE_CAN_TARE)
bool Probe::tare_z_probe() {
#if ENABLED(PROBE_TARE_WHILE_INACTIVEACTIVE)
#if ENABLED(PROBE_TARE_WHILE_INACTIVE)
if ((READ(PROBE_ENABLE_PIN) == PROBE_ENABLED_INPUT_STATE)) {
SERIAL_ECHOLN("Cannot tare probe, already Enabled");
return true;