Browse Source

Fix endstops enable behavior during probing

Fix a bug introduced in #9582
Scott Lahteine 5 years ago
parent
commit
5182eaf661
2 changed files with 3 additions and 4 deletions
  1. 3
    3
      Marlin/src/module/probe.cpp
  2. 0
    1
      Marlin/src/module/stepper.cpp

+ 3
- 3
Marlin/src/module/probe.cpp View File

543
       tmc_stallguard(stepperY);
543
       tmc_stallguard(stepperY);
544
     #endif
544
     #endif
545
     tmc_stallguard(stepperZ);
545
     tmc_stallguard(stepperZ);
546
+    endstops.enable(true);
546
   #endif
547
   #endif
547
 
548
 
548
   #if QUIET_PROBING
549
   #if QUIET_PROBING
549
     probing_pause(true);
550
     probing_pause(true);
550
   #endif
551
   #endif
551
 
552
 
552
-  endstops.enable(true);
553
-
554
-  // Move down until probe triggered
553
+  // Move down until the probe is triggered
555
   do_blocking_move_to_z(z, fr_mm_s);
554
   do_blocking_move_to_z(z, fr_mm_s);
556
 
555
 
557
   // Check to see if the probe was triggered
556
   // Check to see if the probe was triggered
575
 
574
 
576
   // Re-enable stealthChop if used. Disable diag1 pin on driver.
575
   // Re-enable stealthChop if used. Disable diag1 pin on driver.
577
   #if ENABLED(SENSORLESS_PROBING)
576
   #if ENABLED(SENSORLESS_PROBING)
577
+    endstops.not_homing();
578
     #if ENABLED(DELTA)
578
     #if ENABLED(DELTA)
579
       tmc_stallguard(stepperX, false);
579
       tmc_stallguard(stepperX, false);
580
       tmc_stallguard(stepperY, false);
580
       tmc_stallguard(stepperY, false);

+ 0
- 1
Marlin/src/module/stepper.cpp View File

2098
 
2098
 
2099
   ENABLE_STEPPER_DRIVER_INTERRUPT();
2099
   ENABLE_STEPPER_DRIVER_INTERRUPT();
2100
 
2100
 
2101
-  endstops.enable(true); // Start with endstops active. After homing they can be disabled
2102
   sei();
2101
   sei();
2103
   set_directions(); // Init directions to last_direction_bits = 0  Keeps Z from being reversed
2102
   set_directions(); // Init directions to last_direction_bits = 0  Keeps Z from being reversed
2104
 }
2103
 }

Loading…
Cancel
Save