From 167169e1bfab43e3c6279d491c829d7e2237a4dd Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sun, 2 Jul 2017 02:26:35 -0500 Subject: [PATCH 1/2] Sanity check for a real probe with M48 --- Marlin/SanityCheck.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Marlin/SanityCheck.h b/Marlin/SanityCheck.h index 27022e6fb..1b9671486 100644 --- a/Marlin/SanityCheck.h +++ b/Marlin/SanityCheck.h @@ -599,12 +599,14 @@ static_assert(1 >= 0 #else #error "Auto Bed Leveling requires one of these: PROBE_MANUALLY, FIX_MOUNTED_PROBE, BLTOUCH, SOLENOID_PROBE, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, or a Z Servo." #endif - #elif ENABLED(Z_MIN_PROBE_REPEATABILITY_TEST) - #error "Z_MIN_PROBE_REPEATABILITY_TEST requires a probe: FIX_MOUNTED_PROBE, BLTOUCH, SOLENOID_PROBE, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, or Z Servo." #endif #endif +#if ENABLED(Z_MIN_PROBE_REPEATABILITY_TEST) && !HAS_BED_PROBE + #error "Z_MIN_PROBE_REPEATABILITY_TEST requires a probe: FIX_MOUNTED_PROBE, BLTOUCH, SOLENOID_PROBE, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, or Z Servo." +#endif + /** * Allow only one bed leveling option to be defined */ From d609489b22443bac1d253e7480d8d5d7d8af733f Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sun, 2 Jul 2017 02:26:49 -0500 Subject: [PATCH 2/2] Drop setup_homepin --- Marlin/Marlin_main.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index c280c1002..81fdda804 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -906,12 +906,6 @@ void setup_killpin() { #endif -void setup_homepin(void) { - #if HAS_HOME - SET_INPUT_PULLUP(HOME_PIN); - #endif -} - void setup_powerhold() { #if HAS_SUICIDE OUT_WRITE(SUICIDE_PIN, HIGH); @@ -13008,7 +13002,9 @@ void setup() { OUT_WRITE(SOL1_PIN, LOW); // turn it off #endif - setup_homepin(); + #if HAS_HOME + SET_INPUT_PULLUP(HOME_PIN); + #endif #if PIN_EXISTS(STAT_LED_RED) OUT_WRITE(STAT_LED_RED_PIN, LOW); // turn it off