Pārlūkot izejas kodu

Merge pull request #7212 from thinkyhead/bf_m48_real_probe

M48 needs a real probe
Scott Lahteine 8 gadus atpakaļ
vecāks
revīzija
015839fc50
2 mainītis faili ar 7 papildinājumiem un 9 dzēšanām
  1. 3
    7
      Marlin/Marlin_main.cpp
  2. 4
    2
      Marlin/SanityCheck.h

+ 3
- 7
Marlin/Marlin_main.cpp Parādīt failu

@@ -906,12 +906,6 @@ void setup_killpin() {
906 906
 
907 907
 #endif
908 908
 
909
-void setup_homepin(void) {
910
-  #if HAS_HOME
911
-    SET_INPUT_PULLUP(HOME_PIN);
912
-  #endif
913
-}
914
-
915 909
 void setup_powerhold() {
916 910
   #if HAS_SUICIDE
917 911
     OUT_WRITE(SUICIDE_PIN, HIGH);
@@ -13008,7 +13002,9 @@ void setup() {
13008 13002
     OUT_WRITE(SOL1_PIN, LOW); // turn it off
13009 13003
   #endif
13010 13004
 
13011
-  setup_homepin();
13005
+  #if HAS_HOME
13006
+    SET_INPUT_PULLUP(HOME_PIN);
13007
+  #endif
13012 13008
 
13013 13009
   #if PIN_EXISTS(STAT_LED_RED)
13014 13010
     OUT_WRITE(STAT_LED_RED_PIN, LOW); // turn it off

+ 4
- 2
Marlin/SanityCheck.h Parādīt failu

@@ -599,12 +599,14 @@ static_assert(1 >= 0
599 599
     #else
600 600
       #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."
601 601
     #endif
602
-  #elif ENABLED(Z_MIN_PROBE_REPEATABILITY_TEST)
603
-    #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."
604 602
   #endif
605 603
 
606 604
 #endif
607 605
 
606
+#if ENABLED(Z_MIN_PROBE_REPEATABILITY_TEST) && !HAS_BED_PROBE
607
+  #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."
608
+#endif
609
+
608 610
 /**
609 611
  * Allow only one bed leveling option to be defined
610 612
  */

Notiek ielāde…
Atcelt
Saglabāt