Browse Source

Revert changes made to z dual endstop test

#3631 broke z dual endstops. Solved by @Nocturnal42 in https://github.com/MarlinFirmware/Marlin/issues/5078#issuecomment-256572248
Scott Lahteine 8 years ago
parent
commit
c07cc9e3f1
1 changed files with 1 additions and 2 deletions
  1. 1
    2
      Marlin/endstops.cpp

+ 1
- 2
Marlin/endstops.cpp View File

220
   // Pass the result of the endstop test
220
   // Pass the result of the endstop test
221
   void Endstops::test_dual_z_endstops(EndstopEnum es1, EndstopEnum es2) {
221
   void Endstops::test_dual_z_endstops(EndstopEnum es1, EndstopEnum es2) {
222
     byte z_test = TEST_ENDSTOP(es1) | (TEST_ENDSTOP(es2) << 1); // bit 0 for Z, bit 1 for Z2
222
     byte z_test = TEST_ENDSTOP(es1) | (TEST_ENDSTOP(es2) << 1); // bit 0 for Z, bit 1 for Z2
223
-    if (stepper.current_block->steps[Z_AXIS] > 0) {
224
-      stepper.endstop_triggered(Z_AXIS);
223
+    if (z_test && stepper.current_block->steps[Z_AXIS] > 0) {
225
       SBI(endstop_hit_bits, Z_MIN);
224
       SBI(endstop_hit_bits, Z_MIN);
226
       if (!stepper.performing_homing || (z_test == 0x3))  //if not performing home or if both endstops were trigged during homing...
225
       if (!stepper.performing_homing || (z_test == 0x3))  //if not performing home or if both endstops were trigged during homing...
227
         stepper.kill_current_block();
226
         stepper.kill_current_block();

Loading…
Cancel
Save