Kaynağa Gözat

Merge pull request #2062 from Wurstnase/z_probe_bit_fix

add missing endstop-bits
(Travis don't see that part of code)
Wurstnase 10 yıl önce
ebeveyn
işleme
fd873c00c6
1 değiştirilmiş dosya ile 4 ekleme ve 4 silme
  1. 4
    4
      Marlin/stepper.cpp

+ 4
- 4
Marlin/stepper.cpp Dosyayı Görüntüle

@@ -558,7 +558,7 @@ ISR(TIMER1_COMPA_vect) {
558 558
                 z2_min_both = z2_min_endstop && old_z2_min_endstop;
559 559
             if ((z_min_both || z2_min_both) && current_block->steps[Z_AXIS] > 0) {
560 560
               endstops_trigsteps[Z_AXIS] = count_position[Z_AXIS];
561
-              endstop_z_hit = true;
561
+              endstop_hit_bits |= BIT(Z_MIN);
562 562
               if (!performing_homing || (performing_homing && z_min_both && z2_min_both)) //if not performing home or if both endstops were trigged during homing...
563 563
                 step_events_completed = current_block->step_event_count;
564 564
             }
@@ -579,7 +579,7 @@ ISR(TIMER1_COMPA_vect) {
579 579
           if(z_probe_endstop && old_z_probe_endstop)
580 580
           {
581 581
             endstops_trigsteps[Z_AXIS] = count_position[Z_AXIS];
582
-            endstop_z_probe_hit=true;
582
+            endstop_hit_bits |= BIT(Z_PROBE);
583 583
 
584 584
 //            if (z_probe_endstop && old_z_probe_endstop) SERIAL_ECHOLN("z_probe_endstop = true");
585 585
           }
@@ -613,7 +613,7 @@ ISR(TIMER1_COMPA_vect) {
613 613
                 z2_max_both = z2_max_endstop && old_z2_max_endstop;
614 614
             if ((z_max_both || z2_max_both) && current_block->steps[Z_AXIS] > 0) {
615 615
               endstops_trigsteps[Z_AXIS] = count_position[Z_AXIS];
616
-              endstop_z_hit = true;
616
+              endstop_hit_bits |= BIT(Z_MIN);
617 617
 
618 618
              // if (z_max_both) SERIAL_ECHOLN("z_max_endstop = true");
619 619
              // if (z2_max_both) SERIAL_ECHOLN("z2_max_endstop = true");
@@ -638,7 +638,7 @@ ISR(TIMER1_COMPA_vect) {
638 638
           if(z_probe_endstop && old_z_probe_endstop)
639 639
           {
640 640
             endstops_trigsteps[Z_AXIS] = count_position[Z_AXIS];
641
-            endstop_z_probe_hit=true;
641
+            endstop_hit_bits |= BIT(Z_PROBE);
642 642
 //            if (z_probe_endstop && old_z_probe_endstop) SERIAL_ECHOLN("z_probe_endstop = true");
643 643
           }
644 644
           old_z_probe_endstop = z_probe_endstop;

Loading…
İptal
Kaydet