Browse Source

Fix endstops enable behavior during probing

Fix a bug introduced in #9582
pull/1/head
Scott Lahteine 6 years ago
parent
commit
5182eaf661
  1. 6
      Marlin/src/module/probe.cpp
  2. 1
      Marlin/src/module/stepper.cpp

6
Marlin/src/module/probe.cpp

@ -543,15 +543,14 @@ static bool do_probe_move(const float z, const float fr_mm_s) {
tmc_stallguard(stepperY); tmc_stallguard(stepperY);
#endif #endif
tmc_stallguard(stepperZ); tmc_stallguard(stepperZ);
endstops.enable(true);
#endif #endif
#if QUIET_PROBING #if QUIET_PROBING
probing_pause(true); probing_pause(true);
#endif #endif
endstops.enable(true); // Move down until the probe is triggered
// Move down until probe triggered
do_blocking_move_to_z(z, fr_mm_s); do_blocking_move_to_z(z, fr_mm_s);
// Check to see if the probe was triggered // Check to see if the probe was triggered
@ -575,6 +574,7 @@ static bool do_probe_move(const float z, const float fr_mm_s) {
// 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)
endstops.not_homing();
#if ENABLED(DELTA) #if ENABLED(DELTA)
tmc_stallguard(stepperX, false); tmc_stallguard(stepperX, false);
tmc_stallguard(stepperY, false); tmc_stallguard(stepperY, false);

1
Marlin/src/module/stepper.cpp

@ -2098,7 +2098,6 @@ void Stepper::init() {
ENABLE_STEPPER_DRIVER_INTERRUPT(); ENABLE_STEPPER_DRIVER_INTERRUPT();
endstops.enable(true); // Start with endstops active. After homing they can be disabled
sei(); sei();
set_directions(); // Init directions to last_direction_bits = 0 Keeps Z from being reversed set_directions(); // Init directions to last_direction_bits = 0 Keeps Z from being reversed
} }

Loading…
Cancel
Save