|
@@ -567,10 +567,8 @@ static_assert(1 >= 0
|
567
|
567
|
#error "You probably want to use Max Endstops for DELTA!"
|
568
|
568
|
#elif ENABLED(ENABLE_LEVELING_FADE_HEIGHT) && DISABLED(AUTO_BED_LEVELING_BILINEAR) && !UBL_DELTA
|
569
|
569
|
#error "ENABLE_LEVELING_FADE_HEIGHT on DELTA requires AUTO_BED_LEVELING_BILINEAR or AUTO_BED_LEVELING_UBL."
|
570
|
|
- #elif ENABLED(DELTA_AUTO_CALIBRATION) && !PROBE_SELECTED
|
571
|
|
- #error "DELTA_AUTO_CALIBRATION requires a probe: PROBE_MANUALLY, FIX_MOUNTED_PROBE, BLTOUCH, SOLENOID_PROBE, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, Z Servo."
|
572
|
|
- #elif ENABLED(DELTA_AUTO_CALIBRATION) && ENABLED(PROBE_MANUALLY) && DISABLED(ULTIPANEL)
|
573
|
|
- #error "DELTA_AUTO_CALIBRATION requires an LCD controller with PROBE_MANUALLY."
|
|
570
|
+ #elif ENABLED(DELTA_AUTO_CALIBRATION) && !(HAS_BED_PROBE || ENABLED(ULTIPANEL))
|
|
571
|
+ #error "DELTA_AUTO_CALIBRATION requires either a probe or an LCD Controller."
|
574
|
572
|
#elif ABL_GRID
|
575
|
573
|
#if (GRID_MAX_POINTS_X & 1) == 0 || (GRID_MAX_POINTS_Y & 1) == 0
|
576
|
574
|
#error "DELTA requires GRID_MAX_POINTS_X and GRID_MAX_POINTS_Y to be odd numbers."
|
|
@@ -612,7 +610,7 @@ static_assert(1 >= 0
|
612
|
610
|
, "Please enable only one probe option: PROBE_MANUALLY, FIX_MOUNTED_PROBE, BLTOUCH, SOLENOID_PROBE, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, or Z Servo."
|
613
|
611
|
);
|
614
|
612
|
|
615
|
|
-#if PROBE_SELECTED
|
|
613
|
+#if HAS_BED_PROBE
|
616
|
614
|
|
617
|
615
|
/**
|
618
|
616
|
* Z_PROBE_SLED is incompatible with DELTA
|
|
@@ -660,14 +658,14 @@ static_assert(1 >= 0
|
660
|
658
|
#if !HAS_Z_MIN_PROBE_PIN
|
661
|
659
|
#error "Z_MIN_PROBE_ENDSTOP requires the Z_MIN_PROBE_PIN to be defined."
|
662
|
660
|
#endif
|
663
|
|
- #elif DISABLED(PROBE_MANUALLY)
|
|
661
|
+ #else
|
664
|
662
|
#error "You must enable either Z_MIN_PROBE_ENDSTOP or Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN to use a probe."
|
665
|
663
|
#endif
|
666
|
664
|
|
667
|
665
|
/**
|
668
|
666
|
* Make sure Z raise values are set
|
669
|
667
|
*/
|
670
|
|
- #if !defined(Z_CLEARANCE_DEPLOY_PROBE)
|
|
668
|
+ #ifndef Z_CLEARANCE_DEPLOY_PROBE
|
671
|
669
|
#error "You must define Z_CLEARANCE_DEPLOY_PROBE in your configuration."
|
672
|
670
|
#elif !defined(Z_CLEARANCE_BETWEEN_PROBES)
|
673
|
671
|
#error "You must define Z_CLEARANCE_BETWEEN_PROBES in your configuration."
|
|
@@ -682,14 +680,14 @@ static_assert(1 >= 0
|
682
|
680
|
/**
|
683
|
681
|
* Require some kind of probe for bed leveling and probe testing
|
684
|
682
|
*/
|
685
|
|
- #if OLDSCHOOL_ABL
|
|
683
|
+ #if OLDSCHOOL_ABL && !PROBE_SELECTED
|
686
|
684
|
#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."
|
687
|
685
|
#endif
|
688
|
686
|
|
689
|
|
-#endif
|
|
687
|
+ #if ENABLED(Z_MIN_PROBE_REPEATABILITY_TEST)
|
|
688
|
+ #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."
|
|
689
|
+ #endif
|
690
|
690
|
|
691
|
|
-#if ENABLED(Z_MIN_PROBE_REPEATABILITY_TEST) && !HAS_BED_PROBE
|
692
|
|
- #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."
|
693
|
691
|
#endif
|
694
|
692
|
|
695
|
693
|
/**
|
|
@@ -724,6 +722,9 @@ static_assert(1 >= 0
|
724
|
722
|
* Unified Bed Leveling
|
725
|
723
|
*/
|
726
|
724
|
|
|
725
|
+ // Hide PROBE_MANUALLY from the rest of the code
|
|
726
|
+ #undef PROBE_MANUALLY
|
|
727
|
+
|
727
|
728
|
#if IS_SCARA
|
728
|
729
|
#error "AUTO_BED_LEVELING_UBL does not yet support SCARA printers."
|
729
|
730
|
#elif DISABLED(EEPROM_SETTINGS)
|
|
@@ -739,7 +740,7 @@ static_assert(1 >= 0
|
739
|
740
|
static_assert(WITHIN(UBL_PROBE_PT_3_Y, MIN_PROBE_Y, MAX_PROBE_Y), "UBL_PROBE_PT_3_Y can't be reached by the Z probe.");
|
740
|
741
|
#endif
|
741
|
742
|
|
742
|
|
-#elif HAS_ABL
|
|
743
|
+#elif OLDSCHOOL_ABL
|
743
|
744
|
|
744
|
745
|
/**
|
745
|
746
|
* Auto Bed Leveling
|
|
@@ -788,6 +789,9 @@ static_assert(1 >= 0
|
788
|
789
|
|
789
|
790
|
#elif ENABLED(MESH_BED_LEVELING)
|
790
|
791
|
|
|
792
|
+ // Hide PROBE_MANUALLY from the rest of the code
|
|
793
|
+ #undef PROBE_MANUALLY
|
|
794
|
+
|
791
|
795
|
/**
|
792
|
796
|
* Mesh Bed Leveling
|
793
|
797
|
*/
|
|
@@ -806,8 +810,8 @@ static_assert(1 >= 0
|
806
|
810
|
#if ENABLED(LCD_BED_LEVELING)
|
807
|
811
|
#if DISABLED(ULTIPANEL)
|
808
|
812
|
#error "LCD_BED_LEVELING requires an LCD controller."
|
809
|
|
- #elif DISABLED(MESH_BED_LEVELING) && !(HAS_ABL && ENABLED(PROBE_MANUALLY))
|
810
|
|
- #error "LCD_BED_LEVELING requires MESH_BED_LEVELING or PROBE_MANUALLY with auto bed leveling enabled."
|
|
813
|
+ #elif !(ENABLED(MESH_BED_LEVELING) || (OLDSCHOOL_ABL && ENABLED(PROBE_MANUALLY)))
|
|
814
|
+ #error "LCD_BED_LEVELING requires MESH_BED_LEVELING or ABL with PROBE_MANUALLY."
|
811
|
815
|
#endif
|
812
|
816
|
#endif
|
813
|
817
|
|