From df12e68e7d6098bdb5d6f251a661a49e505fb468 Mon Sep 17 00:00:00 2001 From: Wurstnase Date: Tue, 12 May 2015 09:33:24 +0200 Subject: [PATCH 1/2] add missing Z_PROBE-bit --- Marlin/stepper.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Marlin/stepper.cpp b/Marlin/stepper.cpp index 4bc2de84c0..508eb3f5f4 100644 --- a/Marlin/stepper.cpp +++ b/Marlin/stepper.cpp @@ -579,7 +579,7 @@ ISR(TIMER1_COMPA_vect) { if(z_probe_endstop && old_z_probe_endstop) { endstops_trigsteps[Z_AXIS] = count_position[Z_AXIS]; - endstop_z_probe_hit=true; + endstop_hit_bits |= BIT(Z_PROBE); // if (z_probe_endstop && old_z_probe_endstop) SERIAL_ECHOLN("z_probe_endstop = true"); } @@ -638,7 +638,7 @@ ISR(TIMER1_COMPA_vect) { if(z_probe_endstop && old_z_probe_endstop) { endstops_trigsteps[Z_AXIS] = count_position[Z_AXIS]; - endstop_z_probe_hit=true; + endstop_hit_bits |= BIT(Z_PROBE); // if (z_probe_endstop && old_z_probe_endstop) SERIAL_ECHOLN("z_probe_endstop = true"); } old_z_probe_endstop = z_probe_endstop; From 1d5677cc3b1c7fa3e0b1b9ee6f980f417d99b646 Mon Sep 17 00:00:00 2001 From: Wurstnase Date: Tue, 12 May 2015 09:36:19 +0200 Subject: [PATCH 2/2] add missing Z-bits --- Marlin/stepper.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Marlin/stepper.cpp b/Marlin/stepper.cpp index 508eb3f5f4..29d77048c9 100644 --- a/Marlin/stepper.cpp +++ b/Marlin/stepper.cpp @@ -558,7 +558,7 @@ ISR(TIMER1_COMPA_vect) { z2_min_both = z2_min_endstop && old_z2_min_endstop; if ((z_min_both || z2_min_both) && current_block->steps[Z_AXIS] > 0) { endstops_trigsteps[Z_AXIS] = count_position[Z_AXIS]; - endstop_z_hit = true; + endstop_hit_bits |= BIT(Z_MIN); if (!performing_homing || (performing_homing && z_min_both && z2_min_both)) //if not performing home or if both endstops were trigged during homing... step_events_completed = current_block->step_event_count; } @@ -613,7 +613,7 @@ ISR(TIMER1_COMPA_vect) { z2_max_both = z2_max_endstop && old_z2_max_endstop; if ((z_max_both || z2_max_both) && current_block->steps[Z_AXIS] > 0) { endstops_trigsteps[Z_AXIS] = count_position[Z_AXIS]; - endstop_z_hit = true; + endstop_hit_bits |= BIT(Z_MIN); // if (z_max_both) SERIAL_ECHOLN("z_max_endstop = true"); // if (z2_max_both) SERIAL_ECHOLN("z2_max_endstop = true");