0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Easier to disable homing validation (#11458)

Browse source
This commit is contained in:
Scott Lahteine 2018-08-06 23:11:37 -05:00 committed by GitHub
parent 131d216afa
commit 79835590e3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Marlin/src/module/endstops.cpp
View file

@ -256,11 +256,13 @@ void Endstops::not_homing() {
#endif #endif
} }
// If the last move failed to trigger an endstop, call kill #if ENABLED(VALIDATE_HOMING_ENDSTOPS)
void Endstops::validate_homing_move() { // If the last move failed to trigger an endstop, call kill
void Endstops::validate_homing_move() {
if (trigger_state()) hit_on_purpose(); if (trigger_state()) hit_on_purpose();
else kill(PSTR(MSG_ERR_HOMING_FAILED)); else kill(PSTR(MSG_ERR_HOMING_FAILED));
} }
#endif
// Enable / disable endstop z-probe checking // Enable / disable endstop z-probe checking
#if HAS_BED_PROBE #if HAS_BED_PROBE

6
Marlin/src/module/endstops.h
View file

@ -30,6 +30,8 @@
#include "../inc/MarlinConfig.h" #include "../inc/MarlinConfig.h"
#include <stdint.h> #include <stdint.h>
#define VALIDATE_HOMING_ENDSTOPS
enum EndstopEnum : char { enum EndstopEnum : char {
X_MIN, X_MIN,
Y_MIN, Y_MIN,
@ -144,8 +146,12 @@ class Endstops {
// Disable / Enable endstops based on ENSTOPS_ONLY_FOR_HOMING and global enable // Disable / Enable endstops based on ENSTOPS_ONLY_FOR_HOMING and global enable
static void not_homing(); static void not_homing();
#if ENABLED(VALIDATE_HOMING_ENDSTOPS)
// If the last move failed to trigger an endstop, call kill // If the last move failed to trigger an endstop, call kill
static void validate_homing_move(); 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 // Clear endstops (i.e., they were hit intentionally) to suppress the report
FORCE_INLINE static void hit_on_purpose() { hit_state = 0; } FORCE_INLINE static void hit_on_purpose() { hit_state = 0; }