Skip to content

[2.0.x] fix home endstop bug #11900

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thinkyhead merged 7 commits into from
Sep 24, 2018
Merged

[2.0.x] fix home endstop bug #11900

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5c8e20a
[2.0.x] Squelch compiler warnings seen with -Wall (#11889)
marcio-ao Sep 22, 2018
01f95eb
[2.0.x] Fix endstop home bug
GMagician Sep 23, 2018
5578761
Real fix
GMagician Sep 23, 2018
9cd8a67
Merge branch 'bugfix-2.0.x' into 2.0.x-Fix-home-endstop-bug
GMagician Sep 24, 2018
294a373
Update endstops.cpp
thinkyhead Sep 24, 2018
6bba2f3
Update endstops.cpp
thinkyhead Sep 24, 2018
3bcac39
Update endstops.cpp
thinkyhead Sep 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions Marlin/src/module/endstops.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,10 +246,10 @@ void Endstops::poll() {
run_monitor(); // report changes in endstop status
#endif

#if ENABLED(ENDSTOP_INTERRUPTS_FEATURE) && ENABLED(ENDSTOP_NOISE_FILTER)
if (endstop_poll_count) update();
#elif DISABLED(ENDSTOP_INTERRUPTS_FEATURE) || ENABLED(ENDSTOP_NOISE_FILTER)
#if DISABLED(ENDSTOP_INTERRUPTS_FEATURE)
update();
#elif ENABLED(ENDSTOP_NOISE_FILTER)
if (endstop_poll_count) update();
#endif
}

Expand All @@ -275,7 +275,16 @@ void Endstops::not_homing() {
enabled = enabled_globally;

#if ENABLED(ENDSTOP_INTERRUPTS_FEATURE)
update();
// Still 'enabled'? Then endstops are always on and kept in sync.
// Otherwise reset 'live's variables to let axes move in both directions.
if (!enabled) {
#if ENABLED(ENDSTOP_NOISE_FILTER)
endstop_poll_count = validated_live_state = 0; // Stop filtering
#endif
live_state = 0;
}
//#else
// When in polling endstops are always kept in sync
#endif
}

Expand Down Expand Up @@ -666,7 +675,7 @@ void Endstops::update() {
if (triple_hit) { \
_ENDSTOP_HIT(AXIS1, MINMAX); \
/* if not performing home or if both endstops were trigged during homing... */ \
if (!stepper.separate_multi_axis || triple_hit == 0x7) \
if (!stepper.separate_multi_axis || triple_hit == 0b111) \
planner.endstop_triggered(_AXIS(AXIS1)); \
} \
}while(0)
Expand Down
3 changes: 1 addition & 2 deletions Marlin/src/module/endstops.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,6 @@ class Endstops {

public:

static bool enabled, enabled_globally;

#if ENABLED(X_DUAL_ENDSTOPS) || ENABLED(Y_DUAL_ENDSTOPS) || Z_MULTI_ENDSTOPS
typedef uint16_t esbits_t;
#if ENABLED(X_DUAL_ENDSTOPS)
Expand All @@ -75,6 +73,7 @@ class Endstops {
#endif

private:
static bool enabled, enabled_globally;
static esbits_t live_state;
static volatile uint8_t hit_state; // Use X_MIN, Y_MIN, Z_MIN and Z_MIN_PROBE as BIT index

Expand Down