Browse Source

clean up double endstops

wurstnase 9 years ago
parent
commit
0f3f7d6835
1 changed files with 3 additions and 3 deletions
  1. 3
    3
      Marlin/stepper.cpp

+ 3
- 3
Marlin/stepper.cpp View File

@@ -566,7 +566,7 @@ ISR(TIMER1_COMPA_vect) {
566 566
             if (z_test && current_block->steps[Z_AXIS] > 0) { // z_test = Z_MIN || Z2_MIN
567 567
               endstops_trigsteps[Z_AXIS] = count_position[Z_AXIS];
568 568
               endstop_hit_bits |= BIT(Z_MIN);
569
-              if (!performing_homing || (performing_homing && z_test == & 0x3)))  //if not performing home or if both endstops were trigged during homing...
569
+              if (!performing_homing || (z_test == 0x3))  //if not performing home or if both endstops were trigged during homing...
570 570
                 step_events_completed = current_block->step_event_count;
571 571
             }
572 572
           #else // !Z_DUAL_ENDSTOPS
@@ -602,7 +602,7 @@ ISR(TIMER1_COMPA_vect) {
602 602
             if (z_test && current_block->steps[Z_AXIS] > 0) {  // t_test = Z_MAX || Z2_MAX
603 603
               endstops_trigsteps[Z_AXIS] = count_position[Z_AXIS];
604 604
               endstop_hit_bits |= BIT(Z_MIN);
605
-              if (!performing_homing || (performing_homing && z_test == 0x3)))  //if not performing home or if both endstops were trigged during homing...
605
+              if (!performing_homing || (z_test == 0x3))  //if not performing home or if both endstops were trigged during homing...
606 606
                 step_events_completed = current_block->step_event_count;
607 607
             }
608 608
 
@@ -615,7 +615,7 @@ ISR(TIMER1_COMPA_vect) {
615 615
         
616 616
         #ifdef Z_PROBE_ENDSTOP
617 617
           UPDATE_ENDSTOP(Z, PROBE);
618
-          SET_ENDSTOP_BIT(Z, PROBE);
618
+          
619 619
           if (TEST_ENDSTOP(Z_PROBE))
620 620
           {
621 621
             endstops_trigsteps[Z_AXIS] = count_position[Z_AXIS];

Loading…
Cancel
Save