Преглед изворни кода

Merge pull request #2062 from Wurstnase/z_probe_bit_fix

add missing endstop-bits
(Travis don't see that part of code)
Wurstnase пре 10 година
родитељ
комит
fd873c00c6
1 измењених фајлова са 4 додато и 4 уклоњено
  1. 4
    4
      Marlin/stepper.cpp

+ 4
- 4
Marlin/stepper.cpp Прегледај датотеку

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

Loading…
Откажи
Сачувај