Scott Lahteine
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
15 additions and
7 deletions
-
Marlin/src/module/endstops.cpp
-
Marlin/src/module/endstops.h
|
|
@ -256,11 +256,13 @@ void Endstops::not_homing() { |
|
|
|
#endif |
|
|
|
} |
|
|
|
|
|
|
|
// If the last move failed to trigger an endstop, call kill
|
|
|
|
void Endstops::validate_homing_move() { |
|
|
|
if (trigger_state()) hit_on_purpose(); |
|
|
|
else kill(PSTR(MSG_ERR_HOMING_FAILED)); |
|
|
|
} |
|
|
|
#if ENABLED(VALIDATE_HOMING_ENDSTOPS) |
|
|
|
// If the last move failed to trigger an endstop, call kill
|
|
|
|
void Endstops::validate_homing_move() { |
|
|
|
if (trigger_state()) hit_on_purpose(); |
|
|
|
else kill(PSTR(MSG_ERR_HOMING_FAILED)); |
|
|
|
} |
|
|
|
#endif |
|
|
|
|
|
|
|
// Enable / disable endstop z-probe checking
|
|
|
|
#if HAS_BED_PROBE |
|
|
|
|
|
@ -30,6 +30,8 @@ |
|
|
|
#include "../inc/MarlinConfig.h" |
|
|
|
#include <stdint.h> |
|
|
|
|
|
|
|
#define VALIDATE_HOMING_ENDSTOPS |
|
|
|
|
|
|
|
enum EndstopEnum : char { |
|
|
|
X_MIN, |
|
|
|
Y_MIN, |
|
|
@ -144,8 +146,12 @@ class Endstops { |
|
|
|
// Disable / Enable endstops based on ENSTOPS_ONLY_FOR_HOMING and global enable
|
|
|
|
static void not_homing(); |
|
|
|
|
|
|
|
// If the last move failed to trigger an endstop, call kill
|
|
|
|
static void validate_homing_move(); |
|
|
|
#if ENABLED(VALIDATE_HOMING_ENDSTOPS) |
|
|
|
// If the last move failed to trigger an endstop, call kill
|
|
|
|
static void validate_homing_move(); |
|
|
|
#else |
|
|
|
FORCE_INLINE static void validate_homing_move() { hit_on_purpose(); } |
|
|
|
#endif |
|
|
|
|
|
|
|
// Clear endstops (i.e., they were hit intentionally) to suppress the report
|
|
|
|
FORCE_INLINE static void hit_on_purpose() { hit_state = 0; } |
|
|
|