Browse Source

MIN_PROBE_EDGE replaces DELTA_PROBEABLE_RADIUS

Scott Lahteine 6 years ago
parent
commit
1d22609473
50 changed files with 52 additions and 331 deletions
  1. 1
    8
      Marlin/Configuration_adv.h
  2. 0
    6
      Marlin/src/config/default/Configuration_adv.h
  3. 0
    6
      Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h
  4. 0
    6
      Marlin/src/config/examples/Anet/A6/Configuration_adv.h
  5. 0
    6
      Marlin/src/config/examples/Anet/A8/Configuration_adv.h
  6. 0
    6
      Marlin/src/config/examples/Azteeg/X5GT/Configuration_adv.h
  7. 1
    1
      Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration.h
  8. 0
    6
      Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h
  9. 0
    6
      Marlin/src/config/examples/BIBO/TouchX/default/Configuration_adv.h
  10. 0
    6
      Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h
  11. 0
    6
      Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h
  12. 0
    6
      Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h
  13. 0
    6
      Marlin/src/config/examples/Cartesio/Configuration_adv.h
  14. 0
    6
      Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h
  15. 0
    6
      Marlin/src/config/examples/Creality/CR-10S/Configuration_adv.h
  16. 0
    6
      Marlin/src/config/examples/Creality/CR-10mini/Configuration_adv.h
  17. 0
    6
      Marlin/src/config/examples/Creality/Ender-2/Configuration_adv.h
  18. 0
    6
      Marlin/src/config/examples/Creality/Ender-4/Configuration_adv.h
  19. 0
    6
      Marlin/src/config/examples/Felix/Configuration_adv.h
  20. 0
    6
      Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h
  21. 0
    11
      Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h
  22. 0
    6
      Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h
  23. 0
    6
      Marlin/src/config/examples/MakerParts/Configuration_adv.h
  24. 0
    6
      Marlin/src/config/examples/Malyan/M150/Configuration_adv.h
  25. 1
    7
      Marlin/src/config/examples/Malyan/M200/Configuration_adv.h
  26. 0
    6
      Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h
  27. 0
    6
      Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h
  28. 0
    6
      Marlin/src/config/examples/RigidBot/Configuration_adv.h
  29. 0
    6
      Marlin/src/config/examples/SCARA/Configuration_adv.h
  30. 0
    6
      Marlin/src/config/examples/Sanguinololu/Configuration_adv.h
  31. 0
    6
      Marlin/src/config/examples/TheBorg/Configuration_adv.h
  32. 0
    6
      Marlin/src/config/examples/TinyBoy2/Configuration_adv.h
  33. 0
    6
      Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h
  34. 0
    6
      Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h
  35. 0
    6
      Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h
  36. 0
    6
      Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration_adv.h
  37. 1
    7
      Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h
  38. 0
    6
      Marlin/src/config/examples/delta/FLSUN/kossel/Configuration_adv.h
  39. 0
    6
      Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h
  40. 0
    6
      Marlin/src/config/examples/delta/generic/Configuration_adv.h
  41. 0
    6
      Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h
  42. 0
    6
      Marlin/src/config/examples/delta/kossel_pro/Configuration_adv.h
  43. 0
    6
      Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h
  44. 0
    6
      Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h
  45. 0
    6
      Marlin/src/config/examples/makibox/Configuration_adv.h
  46. 0
    6
      Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h
  47. 0
    6
      Marlin/src/config/examples/wt150/Configuration_adv.h
  48. 2
    4
      Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
  49. 44
    41
      Marlin/src/inc/Conditionals_post.h
  50. 2
    0
      Marlin/src/inc/SanityCheck.h

+ 1
- 8
Marlin/Configuration_adv.h View File

@@ -737,12 +737,6 @@
737 737
 
738 738
 // @section leveling
739 739
 
740
-#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
741
-  #define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
742
-#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
743
-  #define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
744
-#endif
745
-
746 740
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
747 741
   // Override the mesh area if the automatic (max) area is too large
748 742
   //#define MESH_MIN_X MESH_INSET
@@ -865,8 +859,7 @@
865 859
  * With auto-retract enabled, all G1 E moves within the set range
866 860
  * will be converted to firmware-based retract/recover moves.
867 861
  *
868
- * Note: Be sure to turn off auto-retract during filament change.
869
- * Note: Current Zlift reset by G28 or G28 Z.
862
+ * Be sure to turn off auto-retract during filament change.
870 863
  *
871 864
  * Note that M207 / M208 / M209 settings are saved to EEPROM.
872 865
  *

+ 0
- 6
Marlin/src/config/default/Configuration_adv.h View File

@@ -737,12 +737,6 @@
737 737
 
738 738
 // @section leveling
739 739
 
740
-#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
741
-  #define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
742
-#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
743
-  #define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
744
-#endif
745
-
746 740
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
747 741
   // Override the mesh area if the automatic (max) area is too large
748 742
   //#define MESH_MIN_X MESH_INSET

+ 0
- 6
Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h View File

@@ -737,12 +737,6 @@
737 737
 
738 738
 // @section leveling
739 739
 
740
-#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
741
-  #define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
742
-#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
743
-  #define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
744
-#endif
745
-
746 740
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
747 741
   // Override the mesh area if the automatic (max) area is too large
748 742
   //#define MESH_MIN_X MESH_INSET

+ 0
- 6
Marlin/src/config/examples/Anet/A6/Configuration_adv.h View File

@@ -737,12 +737,6 @@
737 737
 
738 738
 // @section leveling
739 739
 
740
-#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
741
-  #define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
742
-#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
743
-  #define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
744
-#endif
745
-
746 740
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
747 741
   // Override the mesh area if the automatic (max) area is too large
748 742
   //#define MESH_MIN_X MESH_INSET

+ 0
- 6
Marlin/src/config/examples/Anet/A8/Configuration_adv.h View File

@@ -737,12 +737,6 @@
737 737
 
738 738
 // @section leveling
739 739
 
740
-#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
741
-  #define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
742
-#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
743
-  #define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
744
-#endif
745
-
746 740
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
747 741
   // Override the mesh area if the automatic (max) area is too large
748 742
   //#define MESH_MIN_X MESH_INSET

+ 0
- 6
Marlin/src/config/examples/Azteeg/X5GT/Configuration_adv.h View File

@@ -737,12 +737,6 @@
737 737
 
738 738
 // @section leveling
739 739
 
740
-#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
741
-  #define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
742
-#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
743
-  #define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
744
-#endif
745
-
746 740
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
747 741
   // Override the mesh area if the automatic (max) area is too large
748 742
   //#define MESH_MIN_X MESH_INSET

+ 1
- 1
Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration.h View File

@@ -565,7 +565,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
565 565
  * Override with M92
566 566
  *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
567 567
  */
568
-#define DEFAULT_AXIS_STEPS_PER_UNIT   { 100, 100, 400, 400 }
568
+#define DEFAULT_AXIS_STEPS_PER_UNIT   { 100, 100, 400, 400}
569 569
 
570 570
 /**
571 571
  * Default Max Feed Rate (mm/s)

+ 0
- 6
Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h View File

@@ -737,12 +737,6 @@
737 737
 
738 738
 // @section leveling
739 739
 
740
-#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
741
-  #define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
742
-#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
743
-  #define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
744
-#endif
745
-
746 740
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
747 741
   // Override the mesh area if the automatic (max) area is too large
748 742
   //#define MESH_MIN_X MESH_INSET

+ 0
- 6
Marlin/src/config/examples/BIBO/TouchX/default/Configuration_adv.h View File

@@ -737,12 +737,6 @@
737 737
 
738 738
 // @section leveling
739 739
 
740
-#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
741
-  #define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
742
-#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
743
-  #define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
744
-#endif
745
-
746 740
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
747 741
   // Override the mesh area if the automatic (max) area is too large
748 742
   //#define MESH_MIN_X MESH_INSET

+ 0
- 6
Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h View File

@@ -737,12 +737,6 @@
737 737
 
738 738
 // @section leveling
739 739
 
740
-#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
741
-  #define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
742
-#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
743
-  #define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
744
-#endif
745
-
746 740
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
747 741
   // Override the mesh area if the automatic (max) area is too large
748 742
   //#define MESH_MIN_X MESH_INSET

+ 0
- 6
Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h View File

@@ -737,12 +737,6 @@
737 737
 
738 738
 // @section leveling
739 739
 
740
-#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
741
-  #define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
742
-#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
743
-  #define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
744
-#endif
745
-
746 740
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
747 741
   // Override the mesh area if the automatic (max) area is too large
748 742
   //#define MESH_MIN_X MESH_INSET

+ 0
- 6
Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h View File

@@ -737,12 +737,6 @@
737 737
 
738 738
 // @section leveling
739 739
 
740
-#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
741
-  #define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
742
-#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
743
-  #define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
744
-#endif
745
-
746 740
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
747 741
   // Override the mesh area if the automatic (max) area is too large
748 742
   //#define MESH_MIN_X MESH_INSET

+ 0
- 6
Marlin/src/config/examples/Cartesio/Configuration_adv.h View File

@@ -737,12 +737,6 @@
737 737
 
738 738
 // @section leveling
739 739
 
740
-#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
741
-  #define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
742
-#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
743
-  #define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
744
-#endif
745
-
746 740
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
747 741
   // Override the mesh area if the automatic (max) area is too large
748 742
   //#define MESH_MIN_X MESH_INSET

+ 0
- 6
Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h View File

@@ -737,12 +737,6 @@
737 737
 
738 738
 // @section leveling
739 739
 
740
-#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
741
-  #define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
742
-#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
743
-  #define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
744
-#endif
745
-
746 740
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
747 741
   // Override the mesh area if the automatic (max) area is too large
748 742
   //#define MESH_MIN_X MESH_INSET

+ 0
- 6
Marlin/src/config/examples/Creality/CR-10S/Configuration_adv.h View File

@@ -737,12 +737,6 @@
737 737
 
738 738
 // @section leveling
739 739
 
740
-#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
741
-  #define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
742
-#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
743
-  #define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
744
-#endif
745
-
746 740
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
747 741
   // Override the mesh area if the automatic (max) area is too large
748 742
   //#define MESH_MIN_X MESH_INSET

+ 0
- 6
Marlin/src/config/examples/Creality/CR-10mini/Configuration_adv.h View File

@@ -737,12 +737,6 @@
737 737
 
738 738
 // @section leveling
739 739
 
740
-#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
741
-  #define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
742
-#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
743
-  #define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
744
-#endif
745
-
746 740
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
747 741
   // Override the mesh area if the automatic (max) area is too large
748 742
   //#define MESH_MIN_X MESH_INSET

+ 0
- 6
Marlin/src/config/examples/Creality/Ender-2/Configuration_adv.h View File

@@ -737,12 +737,6 @@
737 737
 
738 738
 // @section leveling
739 739
 
740
-#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
741
-  #define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
742
-#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
743
-  #define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
744
-#endif
745
-
746 740
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
747 741
   // Override the mesh area if the automatic (max) area is too large
748 742
   //#define MESH_MIN_X MESH_INSET

+ 0
- 6
Marlin/src/config/examples/Creality/Ender-4/Configuration_adv.h View File

@@ -737,12 +737,6 @@
737 737
 
738 738
 // @section leveling
739 739
 
740
-#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
741
-  #define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
742
-#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
743
-  #define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
744
-#endif
745
-
746 740
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
747 741
   // Override the mesh area if the automatic (max) area is too large
748 742
   //#define MESH_MIN_X MESH_INSET

+ 0
- 6
Marlin/src/config/examples/Felix/Configuration_adv.h View File

@@ -737,12 +737,6 @@
737 737
 
738 738
 // @section leveling
739 739
 
740
-#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
741
-  #define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
742
-#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
743
-  #define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
744
-#endif
745
-
746 740
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
747 741
   // Override the mesh area if the automatic (max) area is too large
748 742
   //#define MESH_MIN_X MESH_INSET

+ 0
- 6
Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h View File

@@ -737,12 +737,6 @@
737 737
 
738 738
 // @section leveling
739 739
 
740
-#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
741
-  #define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
742
-#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
743
-  #define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
744
-#endif
745
-
746 740
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
747 741
   // Override the mesh area if the automatic (max) area is too large
748 742
   //#define MESH_MIN_X MESH_INSET

+ 0
- 11
Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h View File

@@ -737,12 +737,6 @@
737 737
 
738 738
 // @section leveling
739 739
 
740
-#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
741
-  #define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
742
-#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
743
-  #define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
744
-#endif
745
-
746 740
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
747 741
   // Override the mesh area if the automatic (max) area is too large
748 742
   //#define MESH_MIN_X MESH_INSET
@@ -1413,11 +1407,6 @@
1413 1407
  */
1414 1408
 //#define AUTO_REPORT_TEMPERATURES
1415 1409
 
1416
-
1417
-/**
1418
- * Auto-report SdCard status with M27 S<seconds>
1419
- */
1420
-//#define AUTO_REPORT_SD_STATUS
1421 1410
 /**
1422 1411
  * Include capabilities in M115 output
1423 1412
  */

+ 0
- 6
Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h View File

@@ -737,12 +737,6 @@
737 737
 
738 738
 // @section leveling
739 739
 
740
-#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
741
-  #define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
742
-#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
743
-  #define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
744
-#endif
745
-
746 740
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
747 741
   // Override the mesh area if the automatic (max) area is too large
748 742
   //#define MESH_MIN_X MESH_INSET

+ 0
- 6
Marlin/src/config/examples/MakerParts/Configuration_adv.h View File

@@ -737,12 +737,6 @@
737 737
 
738 738
 // @section leveling
739 739
 
740
-#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
741
-  #define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
742
-#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
743
-  #define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
744
-#endif
745
-
746 740
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
747 741
   // Override the mesh area if the automatic (max) area is too large
748 742
   //#define MESH_MIN_X MESH_INSET

+ 0
- 6
Marlin/src/config/examples/Malyan/M150/Configuration_adv.h View File

@@ -737,12 +737,6 @@
737 737
 
738 738
 // @section leveling
739 739
 
740
-#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
741
-  #define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
742
-#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
743
-  #define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
744
-#endif
745
-
746 740
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
747 741
   // Override the mesh area if the automatic (max) area is too large
748 742
   //#define MESH_MIN_X MESH_INSET

+ 1
- 7
Marlin/src/config/examples/Malyan/M200/Configuration_adv.h View File

@@ -737,12 +737,6 @@
737 737
 
738 738
 // @section leveling
739 739
 
740
-#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
741
-  #define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
742
-#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
743
-  #define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
744
-#endif
745
-
746 740
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
747 741
   // Override the mesh area if the automatic (max) area is too large
748 742
   //#define MESH_MIN_X MESH_INSET
@@ -780,7 +774,7 @@
780 774
 // The minimum pulse width (in µs) for stepping a stepper.
781 775
 // Set this if you find stepping unreliable, or if using a very fast CPU.
782 776
 // 0 is OK for AVR, 0 is OK for A4989 drivers, 2 is needed for DRV8825 drivers
783
-#define MINIMUM_STEPPER_PULSE 1 // (µs)
777
+#define MINIMUM_STEPPER_PULSE 2 // (µs)   DRV8825 on 32bit CPUs
784 778
 
785 779
 // @section temperature
786 780
 

+ 0
- 6
Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h View File

@@ -737,12 +737,6 @@
737 737
 
738 738
 // @section leveling
739 739
 
740
-#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
741
-  #define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
742
-#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
743
-  #define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
744
-#endif
745
-
746 740
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
747 741
   // Override the mesh area if the automatic (max) area is too large
748 742
   //#define MESH_MIN_X MESH_INSET

+ 0
- 6
Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h View File

@@ -745,12 +745,6 @@
745 745
 
746 746
 // @section leveling
747 747
 
748
-#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
749
-  #define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
750
-#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
751
-  #define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
752
-#endif
753
-
754 748
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
755 749
   // Override the mesh area if the automatic (max) area is too large
756 750
   //#define MESH_MIN_X MESH_INSET

+ 0
- 6
Marlin/src/config/examples/RigidBot/Configuration_adv.h View File

@@ -737,12 +737,6 @@
737 737
 
738 738
 // @section leveling
739 739
 
740
-#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
741
-  #define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
742
-#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
743
-  #define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
744
-#endif
745
-
746 740
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
747 741
   // Override the mesh area if the automatic (max) area is too large
748 742
   //#define MESH_MIN_X MESH_INSET

+ 0
- 6
Marlin/src/config/examples/SCARA/Configuration_adv.h View File

@@ -737,12 +737,6 @@
737 737
 
738 738
 // @section leveling
739 739
 
740
-#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
741
-  #define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
742
-#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
743
-  #define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
744
-#endif
745
-
746 740
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
747 741
   // Override the mesh area if the automatic (max) area is too large
748 742
   //#define MESH_MIN_X MESH_INSET

+ 0
- 6
Marlin/src/config/examples/Sanguinololu/Configuration_adv.h View File

@@ -737,12 +737,6 @@
737 737
 
738 738
 // @section leveling
739 739
 
740
-#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
741
-  #define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
742
-#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
743
-  #define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
744
-#endif
745
-
746 740
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
747 741
   // Override the mesh area if the automatic (max) area is too large
748 742
   //#define MESH_MIN_X MESH_INSET

+ 0
- 6
Marlin/src/config/examples/TheBorg/Configuration_adv.h View File

@@ -737,12 +737,6 @@
737 737
 
738 738
 // @section leveling
739 739
 
740
-#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
741
-  #define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
742
-#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
743
-  #define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
744
-#endif
745
-
746 740
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
747 741
   // Override the mesh area if the automatic (max) area is too large
748 742
   //#define MESH_MIN_X MESH_INSET

+ 0
- 6
Marlin/src/config/examples/TinyBoy2/Configuration_adv.h View File

@@ -737,12 +737,6 @@
737 737
 
738 738
 // @section leveling
739 739
 
740
-#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
741
-  #define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
742
-#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
743
-  #define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
744
-#endif
745
-
746 740
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
747 741
   // Override the mesh area if the automatic (max) area is too large
748 742
   //#define MESH_MIN_X MESH_INSET

+ 0
- 6
Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h View File

@@ -737,12 +737,6 @@
737 737
 
738 738
 // @section leveling
739 739
 
740
-#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
741
-  #define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
742
-#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
743
-  #define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
744
-#endif
745
-
746 740
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
747 741
   // Override the mesh area if the automatic (max) area is too large
748 742
   //#define MESH_MIN_X MESH_INSET

+ 0
- 6
Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h View File

@@ -750,12 +750,6 @@
750 750
 
751 751
 // @section leveling
752 752
 
753
-#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
754
-  #define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
755
-#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
756
-  #define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
757
-#endif
758
-
759 753
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
760 754
   // Override the mesh area if the automatic (max) area is too large
761 755
   //#define MESH_MIN_X MESH_INSET

+ 0
- 6
Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h View File

@@ -737,12 +737,6 @@
737 737
 
738 738
 // @section leveling
739 739
 
740
-#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
741
-  #define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
742
-#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
743
-  #define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
744
-#endif
745
-
746 740
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
747 741
   // Override the mesh area if the automatic (max) area is too large
748 742
   //#define MESH_MIN_X MESH_INSET

+ 0
- 6
Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration_adv.h View File

@@ -739,12 +739,6 @@
739 739
 
740 740
 // @section leveling
741 741
 
742
-#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
743
-  #define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
744
-#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
745
-  #define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
746
-#endif
747
-
748 742
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
749 743
   // Override the mesh area if the automatic (max) area is too large
750 744
   //#define MESH_MIN_X MESH_INSET

+ 1
- 7
Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h View File

@@ -705,7 +705,7 @@
705 705
 #if ENABLED(BABYSTEPPING)
706 706
   //#define BABYSTEP_XY              // Also enable X/Y Babystepping. Not supported on DELTA!
707 707
   #define BABYSTEP_INVERT_Z false    // Change if Z babysteps should go the other way
708
-  #define BABYSTEP_MULTIPLICATOR 1   // Babysteps are very small. Increase for faster motion.
708
+  #define BABYSTEP_MULTIPLICATOR   1 // Babysteps are very small. Increase for faster motion.
709 709
   //#define BABYSTEP_ZPROBE_OFFSET   // Enable to combine M851 and Babystepping
710 710
   //#define DOUBLECLICK_FOR_Z_BABYSTEPPING // Double-click on the Status Screen for Z Babystepping.
711 711
   #define DOUBLECLICK_MAX_INTERVAL 1250 // Maximum interval between clicks, in milliseconds.
@@ -739,12 +739,6 @@
739 739
 
740 740
 // @section leveling
741 741
 
742
-#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
743
-  #define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
744
-#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
745
-  #define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
746
-#endif
747
-
748 742
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
749 743
   // Override the mesh area if the automatic (max) area is too large
750 744
   //#define MESH_MIN_X MESH_INSET

+ 0
- 6
Marlin/src/config/examples/delta/FLSUN/kossel/Configuration_adv.h View File

@@ -739,12 +739,6 @@
739 739
 
740 740
 // @section leveling
741 741
 
742
-#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
743
-  #define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
744
-#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
745
-  #define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
746
-#endif
747
-
748 742
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
749 743
   // Override the mesh area if the automatic (max) area is too large
750 744
   //#define MESH_MIN_X MESH_INSET

+ 0
- 6
Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h View File

@@ -739,12 +739,6 @@
739 739
 
740 740
 // @section leveling
741 741
 
742
-#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
743
-  #define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
744
-#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
745
-  #define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
746
-#endif
747
-
748 742
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
749 743
   // Override the mesh area if the automatic (max) area is too large
750 744
   //#define MESH_MIN_X MESH_INSET

+ 0
- 6
Marlin/src/config/examples/delta/generic/Configuration_adv.h View File

@@ -739,12 +739,6 @@
739 739
 
740 740
 // @section leveling
741 741
 
742
-#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
743
-  #define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
744
-#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
745
-  #define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
746
-#endif
747
-
748 742
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
749 743
   // Override the mesh area if the automatic (max) area is too large
750 744
   //#define MESH_MIN_X MESH_INSET

+ 0
- 6
Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h View File

@@ -739,12 +739,6 @@
739 739
 
740 740
 // @section leveling
741 741
 
742
-#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
743
-  #define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
744
-#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
745
-  #define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
746
-#endif
747
-
748 742
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
749 743
   // Override the mesh area if the automatic (max) area is too large
750 744
   //#define MESH_MIN_X MESH_INSET

+ 0
- 6
Marlin/src/config/examples/delta/kossel_pro/Configuration_adv.h View File

@@ -744,12 +744,6 @@
744 744
 
745 745
 // @section leveling
746 746
 
747
-#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
748
-  #define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
749
-#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
750
-  #define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
751
-#endif
752
-
753 747
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
754 748
   // Override the mesh area if the automatic (max) area is too large
755 749
   //#define MESH_MIN_X MESH_INSET

+ 0
- 6
Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h View File

@@ -739,12 +739,6 @@
739 739
 
740 740
 // @section leveling
741 741
 
742
-#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
743
-  #define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
744
-#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
745
-  #define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
746
-#endif
747
-
748 742
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
749 743
   // Override the mesh area if the automatic (max) area is too large
750 744
   //#define MESH_MIN_X MESH_INSET

+ 0
- 6
Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h View File

@@ -737,12 +737,6 @@
737 737
 
738 738
 // @section leveling
739 739
 
740
-#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
741
-  #define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
742
-#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
743
-  #define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
744
-#endif
745
-
746 740
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
747 741
   // Override the mesh area if the automatic (max) area is too large
748 742
   //#define MESH_MIN_X MESH_INSET

+ 0
- 6
Marlin/src/config/examples/makibox/Configuration_adv.h View File

@@ -737,12 +737,6 @@
737 737
 
738 738
 // @section leveling
739 739
 
740
-#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
741
-  #define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
742
-#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
743
-  #define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
744
-#endif
745
-
746 740
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
747 741
   // Override the mesh area if the automatic (max) area is too large
748 742
   //#define MESH_MIN_X MESH_INSET

+ 0
- 6
Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h View File

@@ -737,12 +737,6 @@
737 737
 
738 738
 // @section leveling
739 739
 
740
-#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
741
-  #define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
742
-#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
743
-  #define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
744
-#endif
745
-
746 740
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
747 741
   // Override the mesh area if the automatic (max) area is too large
748 742
   //#define MESH_MIN_X MESH_INSET

+ 0
- 6
Marlin/src/config/examples/wt150/Configuration_adv.h View File

@@ -738,12 +738,6 @@
738 738
 
739 739
 // @section leveling
740 740
 
741
-#if ENABLED(DELTA) && !defined(DELTA_PROBEABLE_RADIUS)
742
-  #define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
743
-#elif IS_SCARA && !defined(SCARA_PRINTABLE_RADIUS)
744
-  #define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
745
-#endif
746
-
747 741
 #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
748 742
   // Override the mesh area if the automatic (max) area is too large
749 743
   //#define MESH_MIN_X MESH_INSET

+ 2
- 4
Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp View File

@@ -146,10 +146,8 @@
146 146
    *                    a subsequent G or T leveling operation for backward compatibility.
147 147
    *
148 148
    *   P1    Phase 1    Invalidate entire Mesh and continue with automatic generation of the Mesh data using
149
-   *                    the Z-Probe. Usually the probe can't reach all areas that the nozzle can reach. On
150
-   *                    Cartesian printers, points within the X_PROBE_OFFSET_FROM_EXTRUDER and Y_PROBE_OFFSET_FROM_EXTRUDER
151
-   *                    area cannot be automatically probed. For Delta printers the area in which DELTA_PROBEABLE_RADIUS
152
-   *                    and DELTA_PRINTABLE_RADIUS do not overlap will not be automatically probed.
149
+   *                    the Z-Probe. Usually the probe can't reach all areas that the nozzle can reach. For delta
150
+   *                    printers only the areas where the probe and nozzle can both reach will be automatically probed.
153 151
    *
154 152
    *                    Unreachable points will be handled in Phase 2 and Phase 3.
155 153
    *

+ 44
- 41
Marlin/src/inc/Conditionals_post.h View File

@@ -985,6 +985,20 @@
985 985
 #endif // SKEW_CORRECTION
986 986
 
987 987
 /**
988
+ * Set granular options based on the specific type of leveling
989
+ */
990
+#define UBL_SEGMENTED  (ENABLED(AUTO_BED_LEVELING_UBL) && (ENABLED(DELTA)))
991
+#define ABL_PLANAR     (ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_3POINT))
992
+#define ABL_GRID       (ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR))
993
+#define OLDSCHOOL_ABL  (ABL_PLANAR || ABL_GRID)
994
+#define HAS_ABL        (OLDSCHOOL_ABL || ENABLED(AUTO_BED_LEVELING_UBL))
995
+#define HAS_LEVELING   (HAS_ABL || ENABLED(MESH_BED_LEVELING))
996
+#define HAS_AUTOLEVEL  (HAS_ABL && DISABLED(PROBE_MANUALLY))
997
+#define HAS_MESH       (ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL) || ENABLED(MESH_BED_LEVELING))
998
+#define PLANNER_LEVELING      (OLDSCHOOL_ABL || ENABLED(MESH_BED_LEVELING) || UBL_SEGMENTED || ENABLED(SKEW_CORRECTION))
999
+#define HAS_PROBING_PROCEDURE (HAS_ABL || ENABLED(Z_MIN_PROBE_REPEATABILITY_TEST))
1000
+
1001
+/**
988 1002
  * Heater & Fan Pausing
989 1003
  */
990 1004
 #if FAN_COUNT == 0
@@ -1004,11 +1018,25 @@
1004 1018
 #endif
1005 1019
 
1006 1020
 /**
1007
- * Delta radius/rod trimmers/angle trimmers
1021
+ * Bed Probing rectangular bounds
1022
+ * These can be further constrained in code for Delta and SCARA
1008 1023
  */
1024
+
1025
+#ifndef MIN_PROBE_EDGE
1026
+  #define MIN_PROBE_EDGE 0
1027
+#endif
1028
+
1009 1029
 #if ENABLED(DELTA)
1030
+  /**
1031
+   * Delta radius/rod trimmers/angle trimmers
1032
+   */
1033
+  #define _PROBE_RADIUS (DELTA_PRINTABLE_RADIUS - (MIN_PROBE_EDGE))
1010 1034
   #ifndef DELTA_CALIBRATION_RADIUS
1011
-    #define DELTA_CALIBRATION_RADIUS DELTA_PRINTABLE_RADIUS - 10
1035
+    #ifdef X_PROBE_OFFSET_FROM_EXTRUDER
1036
+      #define DELTA_CALIBRATION_RADIUS (DELTA_PRINTABLE_RADIUS - MAX3(abs(X_PROBE_OFFSET_FROM_EXTRUDER), abs(Y_PROBE_OFFSET_FROM_EXTRUDER), abs(MIN_PROBE_EDGE)))
1037
+    #else
1038
+      #define DELTA_CALIBRATION_RADIUS _PROBE_RADIUS
1039
+    #endif
1012 1040
   #endif
1013 1041
   #ifndef DELTA_ENDSTOP_ADJ
1014 1042
     #define DELTA_ENDSTOP_ADJ { 0, 0, 0 }
@@ -1022,59 +1050,36 @@
1022 1050
   #ifndef DELTA_DIAGONAL_ROD_TRIM_TOWER
1023 1051
     #define DELTA_DIAGONAL_ROD_TRIM_TOWER {0, 0, 0}
1024 1052
   #endif
1025
-#endif
1026
-
1027
-/**
1028
- * Set granular options based on the specific type of leveling
1029
- */
1030
-#define UBL_SEGMENTED  (ENABLED(AUTO_BED_LEVELING_UBL) && (ENABLED(DELTA)))
1031
-#define ABL_PLANAR     (ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_3POINT))
1032
-#define ABL_GRID       (ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR))
1033
-#define OLDSCHOOL_ABL  (ABL_PLANAR || ABL_GRID)
1034
-#define HAS_ABL        (OLDSCHOOL_ABL || ENABLED(AUTO_BED_LEVELING_UBL))
1035
-#define HAS_LEVELING   (HAS_ABL || ENABLED(MESH_BED_LEVELING))
1036
-#define HAS_AUTOLEVEL  (HAS_ABL && DISABLED(PROBE_MANUALLY))
1037
-#define HAS_MESH       (ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL) || ENABLED(MESH_BED_LEVELING))
1038
-#define PLANNER_LEVELING      (OLDSCHOOL_ABL || ENABLED(MESH_BED_LEVELING) || UBL_SEGMENTED || ENABLED(SKEW_CORRECTION))
1039
-#define HAS_PROBING_PROCEDURE (HAS_ABL || ENABLED(Z_MIN_PROBE_REPEATABILITY_TEST))
1040
-#if HAS_PROBING_PROCEDURE
1041
-  #define PROBE_BED_WIDTH abs(RIGHT_PROBE_BED_POSITION - (LEFT_PROBE_BED_POSITION))
1042
-  #define PROBE_BED_HEIGHT abs(BACK_PROBE_BED_POSITION - (FRONT_PROBE_BED_POSITION))
1043
-#endif
1044
-
1045
-#if ENABLED(SEGMENT_LEVELED_MOVES) && !defined(LEVELED_SEGMENT_LENGTH)
1046
-  #define LEVELED_SEGMENT_LENGTH 5
1047
-#endif
1048
-
1049
-/**
1050
- * Bed Probing rectangular bounds
1051
- * These can be further constrained in code for Delta and SCARA
1052
- */
1053 1053
 
1054
-#ifndef MIN_PROBE_EDGE
1055
-  #define MIN_PROBE_EDGE 0
1056
-#endif
1057
-
1058
-#if ENABLED(DELTA)
1059 1054
   // Probing points may be verified at compile time within the radius
1060 1055
   // using static_assert(HYPOT2(X2-X1,Y2-Y1)<=sq(DELTA_PRINTABLE_RADIUS),"bad probe point!")
1061 1056
   // so that may be added to SanityCheck.h in the future.
1062
-  #define _MIN_PROBE_X (X_CENTER - (DELTA_PRINTABLE_RADIUS) + MIN_PROBE_EDGE)
1063
-  #define _MIN_PROBE_Y (Y_CENTER - (DELTA_PRINTABLE_RADIUS) + MIN_PROBE_EDGE)
1064
-  #define _MAX_PROBE_X (X_CENTER + DELTA_PRINTABLE_RADIUS - (MIN_PROBE_EDGE))
1065
-  #define _MAX_PROBE_Y (Y_CENTER + DELTA_PRINTABLE_RADIUS - (MIN_PROBE_EDGE))
1057
+  #define _MIN_PROBE_X (X_CENTER - (_PROBE_RADIUS))
1058
+  #define _MIN_PROBE_Y (Y_CENTER - (_PROBE_RADIUS))
1059
+  #define _MAX_PROBE_X (X_CENTER + _PROBE_RADIUS)
1060
+  #define _MAX_PROBE_Y (Y_CENTER + _PROBE_RADIUS)
1061
+
1066 1062
 #elif IS_SCARA
1063
+
1067 1064
   #define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
1065
+  #define _PROBE_RADIUS (SCARA_PRINTABLE_RADIUS - (MIN_PROBE_EDGE))
1068 1066
   #define _MIN_PROBE_X (X_CENTER - (SCARA_PRINTABLE_RADIUS) + MIN_PROBE_EDGE)
1069 1067
   #define _MIN_PROBE_Y (Y_CENTER - (SCARA_PRINTABLE_RADIUS) + MIN_PROBE_EDGE)
1070 1068
   #define _MAX_PROBE_X (X_CENTER +  SCARA_PRINTABLE_RADIUS - (MIN_PROBE_EDGE))
1071 1069
   #define _MAX_PROBE_Y (Y_CENTER +  SCARA_PRINTABLE_RADIUS - (MIN_PROBE_EDGE))
1070
+
1072 1071
 #else
1072
+
1073 1073
   // Boundaries for Cartesian probing based on bed limits
1074 1074
   #define _MIN_PROBE_X (max(X_MIN_BED + MIN_PROBE_EDGE, X_MIN_POS + X_PROBE_OFFSET_FROM_EXTRUDER))
1075 1075
   #define _MIN_PROBE_Y (max(Y_MIN_BED + MIN_PROBE_EDGE, Y_MIN_POS + Y_PROBE_OFFSET_FROM_EXTRUDER))
1076 1076
   #define _MAX_PROBE_X (min(X_MAX_BED - (MIN_PROBE_EDGE), X_MAX_POS + X_PROBE_OFFSET_FROM_EXTRUDER))
1077 1077
   #define _MAX_PROBE_Y (min(Y_MAX_BED - (MIN_PROBE_EDGE), Y_MAX_POS + Y_PROBE_OFFSET_FROM_EXTRUDER))
1078
+
1079
+#endif
1080
+
1081
+#if ENABLED(SEGMENT_LEVELED_MOVES) && !defined(LEVELED_SEGMENT_LENGTH)
1082
+  #define LEVELED_SEGMENT_LENGTH 5
1078 1083
 #endif
1079 1084
 
1080 1085
 // These may be overridden in Configuration.h if a smaller area is desired
@@ -1116,10 +1121,8 @@
1116 1121
       #define _MESH_MAX_X (min(X_MAX_BED - (MESH_INSET), X_MAX_POS + X_PROBE_OFFSET_FROM_EXTRUDER))
1117 1122
       #define _MESH_MAX_Y (min(Y_MAX_BED - (MESH_INSET), Y_MAX_POS + Y_PROBE_OFFSET_FROM_EXTRUDER))
1118 1123
     #endif
1119
-
1120 1124
   #endif
1121 1125
 
1122
-
1123 1126
   // These may be overridden in Configuration.h if a smaller area is desired
1124 1127
   #ifndef MESH_MIN_X
1125 1128
     #define MESH_MIN_X _MESH_MIN_X

+ 2
- 0
Marlin/src/inc/SanityCheck.h View File

@@ -227,6 +227,8 @@
227 227
   #error "LIN_ADVANCE (1.5) no longer uses LIN_ADVANCE_E_D_RATIO. Check your configuration."
228 228
 #elif defined(NEOPIXEL_RGBW_LED)
229 229
   #error "NEOPIXEL_RGBW_LED is now NEOPIXEL_LED. Please update your configuration."
230
+#elif ENABLED(DELTA) && defined(DELTA_PROBEABLE_RADIUS)
231
+  #error "Remove DELTA_PROBEABLE_RADIUS and use MIN_PROBE_EDGE to inset the probe area instead."
230 232
 #elif defined(UBL_MESH_INSET)
231 233
   #error "UBL_MESH_INSET is now just MESH_INSET. Please update your configuration."
232 234
 #elif defined(UBL_MESH_MIN_X) || defined(UBL_MESH_MIN_Y) || defined(UBL_MESH_MAX_X)  || defined(UBL_MESH_MAX_Y)

Loading…
Cancel
Save