Browse Source

[2.0.x] Make MIN_PROBE_EDGE a general option (for electronic probes) (#10069)

Some probes don't work near the edges of the bed. This change promotes MIN_PROBE_EDGE to a general setting that applies to all probing functions.
Scott Lahteine 6 years ago
parent
commit
14c03cb6f4
No account linked to committer's email address
69 changed files with 419 additions and 406 deletions
  1. 5
    4
      Marlin/Configuration.h
  2. 5
    4
      Marlin/src/config/default/Configuration.h
  3. 5
    4
      Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h
  4. 5
    4
      Marlin/src/config/examples/AliExpress/CL-260/Configuration.h
  5. 5
    4
      Marlin/src/config/examples/Anet/A6/Configuration.h
  6. 5
    4
      Marlin/src/config/examples/Anet/A8/Configuration.h
  7. 5
    4
      Marlin/src/config/examples/Azteeg/X5GT/Configuration.h
  8. 5
    4
      Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration.h
  9. 5
    4
      Marlin/src/config/examples/BIBO/TouchX/default/Configuration.h
  10. 5
    4
      Marlin/src/config/examples/BQ/Hephestos/Configuration.h
  11. 5
    4
      Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h
  12. 5
    4
      Marlin/src/config/examples/BQ/WITBOX/Configuration.h
  13. 5
    4
      Marlin/src/config/examples/Cartesio/Configuration.h
  14. 5
    4
      Marlin/src/config/examples/Creality/CR-10/Configuration.h
  15. 5
    4
      Marlin/src/config/examples/Creality/CR-10S/Configuration.h
  16. 5
    4
      Marlin/src/config/examples/Creality/CR-10mini/Configuration.h
  17. 5
    4
      Marlin/src/config/examples/Creality/Ender-2/Configuration.h
  18. 5
    4
      Marlin/src/config/examples/Creality/Ender-4/Configuration.h
  19. 5
    4
      Marlin/src/config/examples/Felix/Configuration.h
  20. 5
    4
      Marlin/src/config/examples/Felix/DUAL/Configuration.h
  21. 5
    4
      Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h
  22. 5
    4
      Marlin/src/config/examples/Geeetech/GT2560/Configuration.h
  23. 5
    5
      Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h
  24. 5
    4
      Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/bltouch/Configuration.h
  25. 5
    4
      Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/noprobe/Configuration.h
  26. 5
    4
      Marlin/src/config/examples/Infitary/i3-M508/Configuration.h
  27. 5
    4
      Marlin/src/config/examples/JGAurora/A5/Configuration.h
  28. 5
    4
      Marlin/src/config/examples/MakerParts/Configuration.h
  29. 5
    4
      Marlin/src/config/examples/Malyan/M150/Configuration.h
  30. 5
    4
      Marlin/src/config/examples/Malyan/M200/Configuration.h
  31. 5
    4
      Marlin/src/config/examples/Micromake/C1/basic/Configuration.h
  32. 5
    4
      Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h
  33. 5
    4
      Marlin/src/config/examples/Mks/Sbase/Configuration.h
  34. 5
    4
      Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h
  35. 5
    4
      Marlin/src/config/examples/RigidBot/Configuration.h
  36. 5
    4
      Marlin/src/config/examples/SCARA/Configuration.h
  37. 5
    4
      Marlin/src/config/examples/STM32F10/Configuration.h
  38. 5
    4
      Marlin/src/config/examples/Sanguinololu/Configuration.h
  39. 5
    4
      Marlin/src/config/examples/TheBorg/Configuration.h
  40. 5
    4
      Marlin/src/config/examples/TinyBoy2/Configuration.h
  41. 5
    4
      Marlin/src/config/examples/Tronxy/X1/Configuration.h
  42. 5
    4
      Marlin/src/config/examples/Tronxy/X5S/Configuration.h
  43. 5
    4
      Marlin/src/config/examples/Tronxy/XY100/Configuration.h
  44. 5
    4
      Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h
  45. 5
    4
      Marlin/src/config/examples/Velleman/K8200/Configuration.h
  46. 5
    4
      Marlin/src/config/examples/Velleman/K8400/Configuration.h
  47. 5
    4
      Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h
  48. 5
    4
      Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h
  49. 5
    4
      Marlin/src/config/examples/adafruit/ST7565/Configuration.h
  50. 5
    5
      Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h
  51. 5
    5
      Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h
  52. 5
    4
      Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h
  53. 5
    4
      Marlin/src/config/examples/delta/Hatchbox_Alpha/Configuration.h
  54. 5
    4
      Marlin/src/config/examples/delta/generic/Configuration.h
  55. 5
    4
      Marlin/src/config/examples/delta/kossel_mini/Configuration.h
  56. 5
    4
      Marlin/src/config/examples/delta/kossel_pro/Configuration.h
  57. 5
    4
      Marlin/src/config/examples/delta/kossel_xl/Configuration.h
  58. 5
    4
      Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h
  59. 5
    4
      Marlin/src/config/examples/makibox/Configuration.h
  60. 5
    4
      Marlin/src/config/examples/stm32f103ret6/Configuration.h
  61. 5
    4
      Marlin/src/config/examples/tvrrug/Round2/Configuration.h
  62. 5
    4
      Marlin/src/config/examples/wt150/Configuration.h
  63. 0
    8
      Marlin/src/feature/bedlevel/bedlevel.cpp
  64. 0
    4
      Marlin/src/feature/bedlevel/bedlevel.h
  65. 3
    26
      Marlin/src/gcode/bedlevel/abl/G29.cpp
  66. 6
    17
      Marlin/src/gcode/calibrate/M48.cpp
  67. 38
    36
      Marlin/src/inc/Conditionals_post.h
  68. 23
    34
      Marlin/src/inc/SanityCheck.h
  69. 39
    30
      Marlin/src/module/motion.h

+ 5
- 4
Marlin/Configuration.h View File

723
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 10  // Y offset: -front +behind [the nozzle]
723
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 10  // Y offset: -front +behind [the nozzle]
724
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
724
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
725
 
725
 
726
+// Certain types of probes need to stay away from edges
727
+#define MIN_PROBE_EDGE 10
728
+
726
 // X and Y axis travel speed (mm/m) between probes
729
 // X and Y axis travel speed (mm/m) between probes
727
 #define XY_PROBE_SPEED 8000
730
 #define XY_PROBE_SPEED 8000
728
 
731
 
960
   #define GRID_MAX_POINTS_X 3
963
   #define GRID_MAX_POINTS_X 3
961
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
964
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
962
 
965
 
963
-  // The Z probe minimum outer margin (to validate G29 parameters).
964
-  #define MIN_PROBE_EDGE 10
965
 
966
 
966
   // Set the boundaries for probing (where the probe can reach).
967
   // Set the boundaries for probing (where the probe can reach).
967
   #define LEFT_PROBE_BED_POSITION 15
968
   #define LEFT_PROBE_BED_POSITION 15
1009
 
1010
 
1010
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1011
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1011
 
1012
 
1012
-  #define MESH_INSET 1              // Mesh inset margin on print area
1013
+  #define MESH_INSET 1              // Set Mesh bounds as an inset region of the bed
1013
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1014
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1014
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1015
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1015
 
1016
 
1032
   //=================================== Mesh ==================================
1033
   //=================================== Mesh ==================================
1033
   //===========================================================================
1034
   //===========================================================================
1034
 
1035
 
1035
-  #define MESH_INSET 10          // Mesh inset margin on print area
1036
+  #define MESH_INSET 10          // Set Mesh bounds as an inset region of the bed
1036
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1037
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1037
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1038
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1038
 
1039
 

+ 5
- 4
Marlin/src/config/default/Configuration.h View File

723
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 10  // Y offset: -front +behind [the nozzle]
723
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 10  // Y offset: -front +behind [the nozzle]
724
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
724
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
725
 
725
 
726
+// Certain types of probes need to stay away from edges
727
+#define MIN_PROBE_EDGE 10
728
+
726
 // X and Y axis travel speed (mm/m) between probes
729
 // X and Y axis travel speed (mm/m) between probes
727
 #define XY_PROBE_SPEED 8000
730
 #define XY_PROBE_SPEED 8000
728
 
731
 
960
   #define GRID_MAX_POINTS_X 3
963
   #define GRID_MAX_POINTS_X 3
961
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
964
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
962
 
965
 
963
-  // The Z probe minimum outer margin (to validate G29 parameters).
964
-  #define MIN_PROBE_EDGE 10
965
 
966
 
966
   // Set the boundaries for probing (where the probe can reach).
967
   // Set the boundaries for probing (where the probe can reach).
967
   #define LEFT_PROBE_BED_POSITION 15
968
   #define LEFT_PROBE_BED_POSITION 15
1009
 
1010
 
1010
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1011
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1011
 
1012
 
1012
-  #define MESH_INSET 1              // Mesh inset margin on print area
1013
+  #define MESH_INSET 1              // Set Mesh bounds as an inset region of the bed
1013
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1014
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1014
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1015
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1015
 
1016
 
1032
   //=================================== Mesh ==================================
1033
   //=================================== Mesh ==================================
1033
   //===========================================================================
1034
   //===========================================================================
1034
 
1035
 
1035
-  #define MESH_INSET 10          // Mesh inset margin on print area
1036
+  #define MESH_INSET 10          // Set Mesh bounds as an inset region of the bed
1036
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1037
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1037
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1038
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1038
 
1039
 

+ 5
- 4
Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h View File

743
 #define Y_PROBE_OFFSET_FROM_EXTRUDER -29     // Y offset: -front +behind [the nozzle]
743
 #define Y_PROBE_OFFSET_FROM_EXTRUDER -29     // Y offset: -front +behind [the nozzle]
744
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35  // Z offset: -below +above  [the nozzle]
744
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35  // Z offset: -below +above  [the nozzle]
745
 
745
 
746
+// Certain types of probes need to stay away from edges
747
+#define MIN_PROBE_EDGE 10
748
+
746
 // X and Y axis travel speed (mm/m) between probes
749
 // X and Y axis travel speed (mm/m) between probes
747
 #define XY_PROBE_SPEED 8000
750
 #define XY_PROBE_SPEED 8000
748
 
751
 
980
   #define GRID_MAX_POINTS_X 3
983
   #define GRID_MAX_POINTS_X 3
981
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
984
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
982
 
985
 
983
-  // The Z probe minimum outer margin (to validate G29 parameters).
984
-  #define MIN_PROBE_EDGE 10
985
 
986
 
986
   // Set the boundaries for probing (where the probe can reach).
987
   // Set the boundaries for probing (where the probe can reach).
987
   #define LEFT_PROBE_BED_POSITION 15
988
   #define LEFT_PROBE_BED_POSITION 15
1029
 
1030
 
1030
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1031
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1031
 
1032
 
1032
-  #define MESH_INSET 1              // Mesh inset margin on print area
1033
+  #define MESH_INSET 1              // Set Mesh bounds as an inset region of the bed
1033
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1034
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1034
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1035
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1035
 
1036
 
1052
   //=================================== Mesh ==================================
1053
   //=================================== Mesh ==================================
1053
   //===========================================================================
1054
   //===========================================================================
1054
 
1055
 
1055
-  #define MESH_INSET 10          // Mesh inset margin on print area
1056
+  #define MESH_INSET 10          // Set Mesh bounds as an inset region of the bed
1056
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1057
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1057
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1058
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1058
 
1059
 

+ 5
- 4
Marlin/src/config/examples/AliExpress/CL-260/Configuration.h View File

723
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 10  // Y offset: -front +behind [the nozzle]
723
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 10  // Y offset: -front +behind [the nozzle]
724
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
724
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
725
 
725
 
726
+// Certain types of probes need to stay away from edges
727
+#define MIN_PROBE_EDGE 10
728
+
726
 // X and Y axis travel speed (mm/m) between probes
729
 // X and Y axis travel speed (mm/m) between probes
727
 #define XY_PROBE_SPEED 8000
730
 #define XY_PROBE_SPEED 8000
728
 
731
 
960
   #define GRID_MAX_POINTS_X 3
963
   #define GRID_MAX_POINTS_X 3
961
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
964
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
962
 
965
 
963
-  // The Z probe minimum outer margin (to validate G29 parameters).
964
-  #define MIN_PROBE_EDGE 10
965
 
966
 
966
   // Set the boundaries for probing (where the probe can reach).
967
   // Set the boundaries for probing (where the probe can reach).
967
   #define LEFT_PROBE_BED_POSITION 15
968
   #define LEFT_PROBE_BED_POSITION 15
1009
 
1010
 
1010
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1011
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1011
 
1012
 
1012
-  #define MESH_INSET 1              // Mesh inset margin on print area
1013
+  #define MESH_INSET 1              // Set Mesh bounds as an inset region of the bed
1013
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1014
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1014
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1015
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1015
 
1016
 
1032
   //=================================== Mesh ==================================
1033
   //=================================== Mesh ==================================
1033
   //===========================================================================
1034
   //===========================================================================
1034
 
1035
 
1035
-  #define MESH_INSET 10          // Mesh inset margin on print area
1036
+  #define MESH_INSET 10          // Set Mesh bounds as an inset region of the bed
1036
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1037
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1037
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1038
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1038
 
1039
 

+ 5
- 4
Marlin/src/config/examples/Anet/A6/Configuration.h View File

792
 //#define Y_PROBE_OFFSET_FROM_EXTRUDER  15 // Y offset: -front +behind [the nozzle]
792
 //#define Y_PROBE_OFFSET_FROM_EXTRUDER  15 // Y offset: -front +behind [the nozzle]
793
 //#define Z_PROBE_OFFSET_FROM_EXTRUDER 0.75   // Z offset: -below +above  [the nozzle]
793
 //#define Z_PROBE_OFFSET_FROM_EXTRUDER 0.75   // Z offset: -below +above  [the nozzle]
794
 
794
 
795
+// Certain types of probes need to stay away from edges
796
+#define MIN_PROBE_EDGE 10
797
+
795
 // X and Y axis travel speed (mm/m) between probes
798
 // X and Y axis travel speed (mm/m) between probes
796
 #define XY_PROBE_SPEED 8000
799
 #define XY_PROBE_SPEED 8000
797
 //#define XY_PROBE_SPEED 6000
800
 //#define XY_PROBE_SPEED 6000
1101
   //#define FRONT_PROBE_BED_POSITION 20
1104
   //#define FRONT_PROBE_BED_POSITION 20
1102
   //#define BACK_PROBE_BED_POSITION 194
1105
   //#define BACK_PROBE_BED_POSITION 194
1103
 
1106
 
1104
-  // The Z probe minimum outer margin (to validate G29 parameters).
1105
-  #define MIN_PROBE_EDGE 10
1106
 
1107
 
1107
   // Probe along the Y axis, advancing X after each column
1108
   // Probe along the Y axis, advancing X after each column
1108
   //#define PROBE_Y_FIRST
1109
   //#define PROBE_Y_FIRST
1144
 
1145
 
1145
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1146
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1146
 
1147
 
1147
-  #define MESH_INSET 1              // Mesh inset margin on print area
1148
+  #define MESH_INSET 1              // Set Mesh bounds as an inset region of the bed
1148
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1149
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1149
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1150
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1150
 
1151
 
1167
   //=================================== Mesh ==================================
1168
   //=================================== Mesh ==================================
1168
   //===========================================================================
1169
   //===========================================================================
1169
 
1170
 
1170
-  #define MESH_INSET 10          // Mesh inset margin on print area
1171
+  #define MESH_INSET 10          // Set Mesh bounds as an inset region of the bed
1171
   #define GRID_MAX_POINTS_X 5    // Don't use more than 7 points per axis, implementation limited.
1172
   #define GRID_MAX_POINTS_X 5    // Don't use more than 7 points per axis, implementation limited.
1172
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1173
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1173
 
1174
 

+ 5
- 4
Marlin/src/config/examples/Anet/A8/Configuration.h View File

730
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 0   // Y offset: -front +behind [the nozzle]
730
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 0   // Y offset: -front +behind [the nozzle]
731
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
731
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
732
 
732
 
733
+// Certain types of probes need to stay away from edges
734
+#define MIN_PROBE_EDGE 10
735
+
733
 // X and Y axis travel speed (mm/m) between probes
736
 // X and Y axis travel speed (mm/m) between probes
734
 #define XY_PROBE_SPEED 6000
737
 #define XY_PROBE_SPEED 6000
735
 
738
 
967
   #define GRID_MAX_POINTS_X 3
970
   #define GRID_MAX_POINTS_X 3
968
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
971
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
969
 
972
 
970
-  // The Z probe minimum outer margin (to validate G29 parameters).
971
-  #define MIN_PROBE_EDGE 10
972
 
973
 
973
   // Set the boundaries for probing (where the probe can reach).
974
   // Set the boundaries for probing (where the probe can reach).
974
   #define LEFT_PROBE_BED_POSITION 15
975
   #define LEFT_PROBE_BED_POSITION 15
1016
 
1017
 
1017
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1018
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1018
 
1019
 
1019
-  #define MESH_INSET 1              // Mesh inset margin on print area
1020
+  #define MESH_INSET 1              // Set Mesh bounds as an inset region of the bed
1020
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1021
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1021
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1022
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1022
 
1023
 
1039
   //=================================== Mesh ==================================
1040
   //=================================== Mesh ==================================
1040
   //===========================================================================
1041
   //===========================================================================
1041
 
1042
 
1042
-  #define MESH_INSET 10          // Mesh inset margin on print area
1043
+  #define MESH_INSET 10          // Set Mesh bounds as an inset region of the bed
1043
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1044
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1044
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1045
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1045
 
1046
 

+ 5
- 4
Marlin/src/config/examples/Azteeg/X5GT/Configuration.h View File

723
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 10  // Y offset: -front +behind [the nozzle]
723
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 10  // Y offset: -front +behind [the nozzle]
724
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
724
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
725
 
725
 
726
+// Certain types of probes need to stay away from edges
727
+#define MIN_PROBE_EDGE 10
728
+
726
 // X and Y axis travel speed (mm/m) between probes
729
 // X and Y axis travel speed (mm/m) between probes
727
 #define XY_PROBE_SPEED 8000
730
 #define XY_PROBE_SPEED 8000
728
 
731
 
960
   #define GRID_MAX_POINTS_X 3
963
   #define GRID_MAX_POINTS_X 3
961
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
964
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
962
 
965
 
963
-  // The Z probe minimum outer margin (to validate G29 parameters).
964
-  #define MIN_PROBE_EDGE 10
965
 
966
 
966
   // Set the boundaries for probing (where the probe can reach).
967
   // Set the boundaries for probing (where the probe can reach).
967
   #define LEFT_PROBE_BED_POSITION 15
968
   #define LEFT_PROBE_BED_POSITION 15
1009
 
1010
 
1010
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1011
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1011
 
1012
 
1012
-  #define MESH_INSET 1              // Mesh inset margin on print area
1013
+  #define MESH_INSET 1              // Set Mesh bounds as an inset region of the bed
1013
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1014
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1014
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1015
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1015
 
1016
 
1032
   //=================================== Mesh ==================================
1033
   //=================================== Mesh ==================================
1033
   //===========================================================================
1034
   //===========================================================================
1034
 
1035
 
1035
-  #define MESH_INSET 10          // Mesh inset margin on print area
1036
+  #define MESH_INSET 10          // Set Mesh bounds as an inset region of the bed
1036
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1037
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1037
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1038
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1038
 
1039
 

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

723
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 10  // Y offset: -front +behind [the nozzle]
723
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 10  // Y offset: -front +behind [the nozzle]
724
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
724
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
725
 
725
 
726
+// Certain types of probes need to stay away from edges
727
+#define MIN_PROBE_EDGE 10
728
+
726
 // X and Y axis travel speed (mm/m) between probes
729
 // X and Y axis travel speed (mm/m) between probes
727
 #define XY_PROBE_SPEED 8000
730
 #define XY_PROBE_SPEED 8000
728
 
731
 
960
   #define GRID_MAX_POINTS_X 3
963
   #define GRID_MAX_POINTS_X 3
961
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
964
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
962
 
965
 
963
-  // The Z probe minimum outer margin (to validate G29 parameters).
964
-  #define MIN_PROBE_EDGE 10
965
 
966
 
966
   // Set the boundaries for probing (where the probe can reach).
967
   // Set the boundaries for probing (where the probe can reach).
967
   #define LEFT_PROBE_BED_POSITION 15
968
   #define LEFT_PROBE_BED_POSITION 15
1009
 
1010
 
1010
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1011
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1011
 
1012
 
1012
-  #define MESH_INSET 1              // Mesh inset margin on print area
1013
+  #define MESH_INSET 1              // Set Mesh bounds as an inset region of the bed
1013
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1014
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1014
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1015
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1015
 
1016
 
1032
   //=================================== Mesh ==================================
1033
   //=================================== Mesh ==================================
1033
   //===========================================================================
1034
   //===========================================================================
1034
 
1035
 
1035
-  #define MESH_INSET 10          // Mesh inset margin on print area
1036
+  #define MESH_INSET 10          // Set Mesh bounds as an inset region of the bed
1036
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1037
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1037
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1038
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1038
 
1039
 

+ 5
- 4
Marlin/src/config/examples/BIBO/TouchX/default/Configuration.h View File

723
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 10  // Y offset: -front +behind [the nozzle]
723
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 10  // Y offset: -front +behind [the nozzle]
724
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
724
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
725
 
725
 
726
+// Certain types of probes need to stay away from edges
727
+#define MIN_PROBE_EDGE 10
728
+
726
 // X and Y axis travel speed (mm/m) between probes
729
 // X and Y axis travel speed (mm/m) between probes
727
 #define XY_PROBE_SPEED 8000
730
 #define XY_PROBE_SPEED 8000
728
 
731
 
960
   #define GRID_MAX_POINTS_X 3
963
   #define GRID_MAX_POINTS_X 3
961
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
964
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
962
 
965
 
963
-  // The Z probe minimum outer margin (to validate G29 parameters).
964
-  #define MIN_PROBE_EDGE 10
965
 
966
 
966
   // Set the boundaries for probing (where the probe can reach).
967
   // Set the boundaries for probing (where the probe can reach).
967
   #define LEFT_PROBE_BED_POSITION 15
968
   #define LEFT_PROBE_BED_POSITION 15
1009
 
1010
 
1010
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1011
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1011
 
1012
 
1012
-  #define MESH_INSET 1              // Mesh inset margin on print area
1013
+  #define MESH_INSET 1              // Set Mesh bounds as an inset region of the bed
1013
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1014
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1014
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1015
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1015
 
1016
 
1032
   //=================================== Mesh ==================================
1033
   //=================================== Mesh ==================================
1033
   //===========================================================================
1034
   //===========================================================================
1034
 
1035
 
1035
-  #define MESH_INSET 10          // Mesh inset margin on print area
1036
+  #define MESH_INSET 10          // Set Mesh bounds as an inset region of the bed
1036
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1037
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1037
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1038
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1038
 
1039
 

+ 5
- 4
Marlin/src/config/examples/BQ/Hephestos/Configuration.h View File

711
 #define Y_PROBE_OFFSET_FROM_EXTRUDER -29     // Y offset: -front +behind [the nozzle]
711
 #define Y_PROBE_OFFSET_FROM_EXTRUDER -29     // Y offset: -front +behind [the nozzle]
712
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35  // Z offset: -below +above  [the nozzle]
712
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35  // Z offset: -below +above  [the nozzle]
713
 
713
 
714
+// Certain types of probes need to stay away from edges
715
+#define MIN_PROBE_EDGE 10
716
+
714
 // X and Y axis travel speed (mm/m) between probes
717
 // X and Y axis travel speed (mm/m) between probes
715
 #define XY_PROBE_SPEED 8000
718
 #define XY_PROBE_SPEED 8000
716
 
719
 
948
   #define GRID_MAX_POINTS_X 3
951
   #define GRID_MAX_POINTS_X 3
949
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
952
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
950
 
953
 
951
-  // The Z probe minimum outer margin (to validate G29 parameters).
952
-  #define MIN_PROBE_EDGE 10
953
 
954
 
954
   // Set the boundaries for probing (where the probe can reach).
955
   // Set the boundaries for probing (where the probe can reach).
955
   #define LEFT_PROBE_BED_POSITION 15
956
   #define LEFT_PROBE_BED_POSITION 15
997
 
998
 
998
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
999
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
999
 
1000
 
1000
-  #define MESH_INSET 1              // Mesh inset margin on print area
1001
+  #define MESH_INSET 1              // Set Mesh bounds as an inset region of the bed
1001
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1002
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1002
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1003
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1003
 
1004
 
1020
   //=================================== Mesh ==================================
1021
   //=================================== Mesh ==================================
1021
   //===========================================================================
1022
   //===========================================================================
1022
 
1023
 
1023
-  #define MESH_INSET 10          // Mesh inset margin on print area
1024
+  #define MESH_INSET 10          // Set Mesh bounds as an inset region of the bed
1024
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1025
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1025
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1026
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1026
 
1027
 

+ 5
- 4
Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h View File

724
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 15  // Y offset: -front +behind [the nozzle]
724
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 15  // Y offset: -front +behind [the nozzle]
725
 #define Z_PROBE_OFFSET_FROM_EXTRUDER  0  // Z offset: -below +above  [the nozzle]
725
 #define Z_PROBE_OFFSET_FROM_EXTRUDER  0  // Z offset: -below +above  [the nozzle]
726
 
726
 
727
+// Certain types of probes need to stay away from edges
728
+#define MIN_PROBE_EDGE 10
729
+
727
 // X and Y axis travel speed (mm/m) between probes
730
 // X and Y axis travel speed (mm/m) between probes
728
 #define XY_PROBE_SPEED 8000
731
 #define XY_PROBE_SPEED 8000
729
 
732
 
967
   #define FRONT_PROBE_BED_POSITION Y_MIN_POS + (Y_PROBE_OFFSET_FROM_EXTRUDER)
970
   #define FRONT_PROBE_BED_POSITION Y_MIN_POS + (Y_PROBE_OFFSET_FROM_EXTRUDER)
968
   #define BACK_PROBE_BED_POSITION  Y_MAX_POS - (Y_PROBE_OFFSET_FROM_EXTRUDER)
971
   #define BACK_PROBE_BED_POSITION  Y_MAX_POS - (Y_PROBE_OFFSET_FROM_EXTRUDER)
969
 
972
 
970
-  // The Z probe minimum outer margin (to validate G29 parameters).
971
-  #define MIN_PROBE_EDGE 10
972
 
973
 
973
   // Probe along the Y axis, advancing X after each column
974
   // Probe along the Y axis, advancing X after each column
974
   //#define PROBE_Y_FIRST
975
   //#define PROBE_Y_FIRST
1010
 
1011
 
1011
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1012
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1012
 
1013
 
1013
-  #define MESH_INSET 1              // Mesh inset margin on print area
1014
+  #define MESH_INSET 1              // Set Mesh bounds as an inset region of the bed
1014
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1015
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1015
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1016
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1016
 
1017
 
1033
   //=================================== Mesh ==================================
1034
   //=================================== Mesh ==================================
1034
   //===========================================================================
1035
   //===========================================================================
1035
 
1036
 
1036
-  #define MESH_INSET 10          // Mesh inset margin on print area
1037
+  #define MESH_INSET 10          // Set Mesh bounds as an inset region of the bed
1037
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1038
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1038
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1039
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1039
 
1040
 

+ 5
- 4
Marlin/src/config/examples/BQ/WITBOX/Configuration.h View File

711
 #define Y_PROBE_OFFSET_FROM_EXTRUDER -29     // Y offset: -front +behind [the nozzle]
711
 #define Y_PROBE_OFFSET_FROM_EXTRUDER -29     // Y offset: -front +behind [the nozzle]
712
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35  // Z offset: -below +above  [the nozzle]
712
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35  // Z offset: -below +above  [the nozzle]
713
 
713
 
714
+// Certain types of probes need to stay away from edges
715
+#define MIN_PROBE_EDGE 10
716
+
714
 // X and Y axis travel speed (mm/m) between probes
717
 // X and Y axis travel speed (mm/m) between probes
715
 #define XY_PROBE_SPEED 8000
718
 #define XY_PROBE_SPEED 8000
716
 
719
 
948
   #define GRID_MAX_POINTS_X 3
951
   #define GRID_MAX_POINTS_X 3
949
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
952
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
950
 
953
 
951
-  // The Z probe minimum outer margin (to validate G29 parameters).
952
-  #define MIN_PROBE_EDGE 10
953
 
954
 
954
   // Set the boundaries for probing (where the probe can reach).
955
   // Set the boundaries for probing (where the probe can reach).
955
   #define LEFT_PROBE_BED_POSITION 15
956
   #define LEFT_PROBE_BED_POSITION 15
997
 
998
 
998
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
999
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
999
 
1000
 
1000
-  #define MESH_INSET 1              // Mesh inset margin on print area
1001
+  #define MESH_INSET 1              // Set Mesh bounds as an inset region of the bed
1001
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1002
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1002
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1003
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1003
 
1004
 
1020
   //=================================== Mesh ==================================
1021
   //=================================== Mesh ==================================
1021
   //===========================================================================
1022
   //===========================================================================
1022
 
1023
 
1023
-  #define MESH_INSET 10          // Mesh inset margin on print area
1024
+  #define MESH_INSET 10          // Set Mesh bounds as an inset region of the bed
1024
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1025
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1025
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1026
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1026
 
1027
 

+ 5
- 4
Marlin/src/config/examples/Cartesio/Configuration.h View File

722
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 10  // Y offset: -front +behind [the nozzle]
722
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 10  // Y offset: -front +behind [the nozzle]
723
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
723
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
724
 
724
 
725
+// Certain types of probes need to stay away from edges
726
+#define MIN_PROBE_EDGE 10
727
+
725
 // X and Y axis travel speed (mm/m) between probes
728
 // X and Y axis travel speed (mm/m) between probes
726
 #define XY_PROBE_SPEED 8000
729
 #define XY_PROBE_SPEED 8000
727
 
730
 
959
   #define GRID_MAX_POINTS_X 3
962
   #define GRID_MAX_POINTS_X 3
960
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
963
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
961
 
964
 
962
-  // The Z probe minimum outer margin (to validate G29 parameters).
963
-  #define MIN_PROBE_EDGE 10
964
 
965
 
965
   // Set the boundaries for probing (where the probe can reach).
966
   // Set the boundaries for probing (where the probe can reach).
966
   #define LEFT_PROBE_BED_POSITION 15
967
   #define LEFT_PROBE_BED_POSITION 15
1008
 
1009
 
1009
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1010
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1010
 
1011
 
1011
-  #define MESH_INSET 1              // Mesh inset margin on print area
1012
+  #define MESH_INSET 1              // Set Mesh bounds as an inset region of the bed
1012
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1013
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1013
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1014
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1014
 
1015
 
1031
   //=================================== Mesh ==================================
1032
   //=================================== Mesh ==================================
1032
   //===========================================================================
1033
   //===========================================================================
1033
 
1034
 
1034
-  #define MESH_INSET 10          // Mesh inset margin on print area
1035
+  #define MESH_INSET 10          // Set Mesh bounds as an inset region of the bed
1035
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1036
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1036
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1037
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1037
 
1038
 

+ 5
- 4
Marlin/src/config/examples/Creality/CR-10/Configuration.h View File

733
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 10  // Y offset: -front +behind [the nozzle]
733
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 10  // Y offset: -front +behind [the nozzle]
734
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
734
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
735
 
735
 
736
+// Certain types of probes need to stay away from edges
737
+#define MIN_PROBE_EDGE 10
738
+
736
 // X and Y axis travel speed (mm/m) between probes
739
 // X and Y axis travel speed (mm/m) between probes
737
 #define XY_PROBE_SPEED 8000
740
 #define XY_PROBE_SPEED 8000
738
 
741
 
970
   #define GRID_MAX_POINTS_X 3
973
   #define GRID_MAX_POINTS_X 3
971
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
974
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
972
 
975
 
973
-  // The Z probe minimum outer margin (to validate G29 parameters).
974
-  #define MIN_PROBE_EDGE 10
975
 
976
 
976
   // Set the boundaries for probing (where the probe can reach).
977
   // Set the boundaries for probing (where the probe can reach).
977
   #define LEFT_PROBE_BED_POSITION 15
978
   #define LEFT_PROBE_BED_POSITION 15
1019
 
1020
 
1020
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1021
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1021
 
1022
 
1022
-  #define MESH_INSET 1              // Mesh inset margin on print area
1023
+  #define MESH_INSET 1              // Set Mesh bounds as an inset region of the bed
1023
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1024
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1024
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1025
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1025
 
1026
 
1043
   //=================================== Mesh ==================================
1044
   //=================================== Mesh ==================================
1044
   //===========================================================================
1045
   //===========================================================================
1045
 
1046
 
1046
-  #define MESH_INSET 10          // Mesh inset margin on print area
1047
+  #define MESH_INSET 10          // Set Mesh bounds as an inset region of the bed
1047
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1048
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1048
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1049
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1049
 
1050
 

+ 5
- 4
Marlin/src/config/examples/Creality/CR-10S/Configuration.h View File

723
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 10  // Y offset: -front +behind [the nozzle]
723
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 10  // Y offset: -front +behind [the nozzle]
724
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
724
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
725
 
725
 
726
+// Certain types of probes need to stay away from edges
727
+#define MIN_PROBE_EDGE 10
728
+
726
 // X and Y axis travel speed (mm/m) between probes
729
 // X and Y axis travel speed (mm/m) between probes
727
 #define XY_PROBE_SPEED 8000
730
 #define XY_PROBE_SPEED 8000
728
 
731
 
961
   #define GRID_MAX_POINTS_X 3
964
   #define GRID_MAX_POINTS_X 3
962
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
965
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
963
 
966
 
964
-  // The Z probe minimum outer margin (to validate G29 parameters).
965
-  #define MIN_PROBE_EDGE 10
966
 
967
 
967
   // Set the boundaries for probing (where the probe can reach).
968
   // Set the boundaries for probing (where the probe can reach).
968
   #define LEFT_PROBE_BED_POSITION 15
969
   #define LEFT_PROBE_BED_POSITION 15
1010
 
1011
 
1011
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1012
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1012
 
1013
 
1013
-  #define MESH_INSET 1              // Mesh inset margin on print area
1014
+  #define MESH_INSET 1              // Set Mesh bounds as an inset region of the bed
1014
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1015
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1015
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1016
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1016
 
1017
 
1033
   //=================================== Mesh ==================================
1034
   //=================================== Mesh ==================================
1034
   //===========================================================================
1035
   //===========================================================================
1035
 
1036
 
1036
-  #define MESH_INSET 10          // Mesh inset margin on print area
1037
+  #define MESH_INSET 10          // Set Mesh bounds as an inset region of the bed
1037
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1038
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1038
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1039
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1039
 
1040
 

+ 5
- 4
Marlin/src/config/examples/Creality/CR-10mini/Configuration.h View File

742
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 10  // Y offset: -front +behind [the nozzle]
742
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 10  // Y offset: -front +behind [the nozzle]
743
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
743
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
744
 
744
 
745
+// Certain types of probes need to stay away from edges
746
+#define MIN_PROBE_EDGE 10
747
+
745
 // X and Y axis travel speed (mm/m) between probes
748
 // X and Y axis travel speed (mm/m) between probes
746
 #define XY_PROBE_SPEED 8000
749
 #define XY_PROBE_SPEED 8000
747
 
750
 
979
   #define GRID_MAX_POINTS_X 3
982
   #define GRID_MAX_POINTS_X 3
980
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
983
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
981
 
984
 
982
-  // The Z probe minimum outer margin (to validate G29 parameters).
983
-  #define MIN_PROBE_EDGE 10
984
 
985
 
985
   // Set the boundaries for probing (where the probe can reach).
986
   // Set the boundaries for probing (where the probe can reach).
986
   #define LEFT_PROBE_BED_POSITION 15
987
   #define LEFT_PROBE_BED_POSITION 15
1028
 
1029
 
1029
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1030
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1030
 
1031
 
1031
-  #define MESH_INSET 1              // Mesh inset margin on print area
1032
+  #define MESH_INSET 1              // Set Mesh bounds as an inset region of the bed
1032
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1033
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1033
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1034
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1034
 
1035
 
1051
   //=================================== Mesh ==================================
1052
   //=================================== Mesh ==================================
1052
   //===========================================================================
1053
   //===========================================================================
1053
 
1054
 
1054
-  #define MESH_INSET 10          // Mesh inset margin on print area
1055
+  #define MESH_INSET 10          // Set Mesh bounds as an inset region of the bed
1055
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1056
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1056
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1057
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1057
 
1058
 

+ 5
- 4
Marlin/src/config/examples/Creality/Ender-2/Configuration.h View File

727
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 10  // Y offset: -front +behind [the nozzle]
727
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 10  // Y offset: -front +behind [the nozzle]
728
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
728
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
729
 
729
 
730
+// Certain types of probes need to stay away from edges
731
+#define MIN_PROBE_EDGE 10
732
+
730
 // X and Y axis travel speed (mm/m) between probes
733
 // X and Y axis travel speed (mm/m) between probes
731
 #define XY_PROBE_SPEED 8000
734
 #define XY_PROBE_SPEED 8000
732
 
735
 
964
   #define GRID_MAX_POINTS_X 3
967
   #define GRID_MAX_POINTS_X 3
965
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
968
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
966
 
969
 
967
-  // The Z probe minimum outer margin (to validate G29 parameters).
968
-  #define MIN_PROBE_EDGE 10
969
 
970
 
970
   // Set the boundaries for probing (where the probe can reach).
971
   // Set the boundaries for probing (where the probe can reach).
971
   #define LEFT_PROBE_BED_POSITION 15
972
   #define LEFT_PROBE_BED_POSITION 15
1013
 
1014
 
1014
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1015
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1015
 
1016
 
1016
-  #define MESH_INSET 1              // Mesh inset margin on print area
1017
+  #define MESH_INSET 1              // Set Mesh bounds as an inset region of the bed
1017
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1018
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1018
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1019
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1019
 
1020
 
1036
   //=================================== Mesh ==================================
1037
   //=================================== Mesh ==================================
1037
   //===========================================================================
1038
   //===========================================================================
1038
 
1039
 
1039
-  #define MESH_INSET 10          // Mesh inset margin on print area
1040
+  #define MESH_INSET 10          // Set Mesh bounds as an inset region of the bed
1040
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1041
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1041
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1042
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1042
 
1043
 

+ 5
- 4
Marlin/src/config/examples/Creality/Ender-4/Configuration.h View File

733
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 10  // Y offset: -front +behind [the nozzle]
733
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 10  // Y offset: -front +behind [the nozzle]
734
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
734
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
735
 
735
 
736
+// Certain types of probes need to stay away from edges
737
+#define MIN_PROBE_EDGE 10
738
+
736
 // X and Y axis travel speed (mm/m) between probes
739
 // X and Y axis travel speed (mm/m) between probes
737
 #define XY_PROBE_SPEED 8000
740
 #define XY_PROBE_SPEED 8000
738
 
741
 
970
   #define GRID_MAX_POINTS_X 3
973
   #define GRID_MAX_POINTS_X 3
971
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
974
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
972
 
975
 
973
-  // The Z probe minimum outer margin (to validate G29 parameters).
974
-  #define MIN_PROBE_EDGE 10
975
 
976
 
976
   // Set the boundaries for probing (where the probe can reach).
977
   // Set the boundaries for probing (where the probe can reach).
977
   #define LEFT_PROBE_BED_POSITION 15
978
   #define LEFT_PROBE_BED_POSITION 15
1019
 
1020
 
1020
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1021
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1021
 
1022
 
1022
-  #define MESH_INSET 1              // Mesh inset margin on print area
1023
+  #define MESH_INSET 1              // Set Mesh bounds as an inset region of the bed
1023
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1024
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1024
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1025
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1025
 
1026
 
1042
   //=================================== Mesh ==================================
1043
   //=================================== Mesh ==================================
1043
   //===========================================================================
1044
   //===========================================================================
1044
 
1045
 
1045
-  #define MESH_INSET 10          // Mesh inset margin on print area
1046
+  #define MESH_INSET 10          // Set Mesh bounds as an inset region of the bed
1046
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1047
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1047
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1048
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1048
 
1049
 

+ 5
- 4
Marlin/src/config/examples/Felix/Configuration.h View File

705
 #define Y_PROBE_OFFSET_FROM_EXTRUDER -29     // Y offset: -front +behind [the nozzle]
705
 #define Y_PROBE_OFFSET_FROM_EXTRUDER -29     // Y offset: -front +behind [the nozzle]
706
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35  // Z offset: -below +above  [the nozzle]
706
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35  // Z offset: -below +above  [the nozzle]
707
 
707
 
708
+// Certain types of probes need to stay away from edges
709
+#define MIN_PROBE_EDGE 10
710
+
708
 // X and Y axis travel speed (mm/m) between probes
711
 // X and Y axis travel speed (mm/m) between probes
709
 #define XY_PROBE_SPEED 8000
712
 #define XY_PROBE_SPEED 8000
710
 
713
 
942
   #define GRID_MAX_POINTS_X 3
945
   #define GRID_MAX_POINTS_X 3
943
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
946
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
944
 
947
 
945
-  // The Z probe minimum outer margin (to validate G29 parameters).
946
-  #define MIN_PROBE_EDGE 10
947
 
948
 
948
   // Set the boundaries for probing (where the probe can reach).
949
   // Set the boundaries for probing (where the probe can reach).
949
   #define LEFT_PROBE_BED_POSITION 15
950
   #define LEFT_PROBE_BED_POSITION 15
991
 
992
 
992
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
993
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
993
 
994
 
994
-  #define MESH_INSET 1              // Mesh inset margin on print area
995
+  #define MESH_INSET 1              // Set Mesh bounds as an inset region of the bed
995
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
996
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
996
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
997
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
997
 
998
 
1014
   //=================================== Mesh ==================================
1015
   //=================================== Mesh ==================================
1015
   //===========================================================================
1016
   //===========================================================================
1016
 
1017
 
1017
-  #define MESH_INSET 10          // Mesh inset margin on print area
1018
+  #define MESH_INSET 10          // Set Mesh bounds as an inset region of the bed
1018
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1019
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1019
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1020
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1020
 
1021
 

+ 5
- 4
Marlin/src/config/examples/Felix/DUAL/Configuration.h View File

705
 #define Y_PROBE_OFFSET_FROM_EXTRUDER -29     // Y offset: -front +behind [the nozzle]
705
 #define Y_PROBE_OFFSET_FROM_EXTRUDER -29     // Y offset: -front +behind [the nozzle]
706
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35  // Z offset: -below +above  [the nozzle]
706
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35  // Z offset: -below +above  [the nozzle]
707
 
707
 
708
+// Certain types of probes need to stay away from edges
709
+#define MIN_PROBE_EDGE 10
710
+
708
 // X and Y axis travel speed (mm/m) between probes
711
 // X and Y axis travel speed (mm/m) between probes
709
 #define XY_PROBE_SPEED 8000
712
 #define XY_PROBE_SPEED 8000
710
 
713
 
942
   #define GRID_MAX_POINTS_X 3
945
   #define GRID_MAX_POINTS_X 3
943
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
946
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
944
 
947
 
945
-  // The Z probe minimum outer margin (to validate G29 parameters).
946
-  #define MIN_PROBE_EDGE 10
947
 
948
 
948
   // Set the boundaries for probing (where the probe can reach).
949
   // Set the boundaries for probing (where the probe can reach).
949
   #define LEFT_PROBE_BED_POSITION 15
950
   #define LEFT_PROBE_BED_POSITION 15
991
 
992
 
992
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
993
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
993
 
994
 
994
-  #define MESH_INSET 1              // Mesh inset margin on print area
995
+  #define MESH_INSET 1              // Set Mesh bounds as an inset region of the bed
995
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
996
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
996
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
997
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
997
 
998
 
1014
   //=================================== Mesh ==================================
1015
   //=================================== Mesh ==================================
1015
   //===========================================================================
1016
   //===========================================================================
1016
 
1017
 
1017
-  #define MESH_INSET 10          // Mesh inset margin on print area
1018
+  #define MESH_INSET 10          // Set Mesh bounds as an inset region of the bed
1018
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1019
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1019
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1020
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1020
 
1021
 

+ 5
- 4
Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h View File

730
 #define Y_PROBE_OFFSET_FROM_EXTRUDER -7     // Y offset: -front +behind [the nozzle]
730
 #define Y_PROBE_OFFSET_FROM_EXTRUDER -7     // Y offset: -front +behind [the nozzle]
731
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -10.35 // Z offset: -below +above  [the nozzle]
731
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -10.35 // Z offset: -below +above  [the nozzle]
732
 
732
 
733
+// Certain types of probes need to stay away from edges
734
+#define MIN_PROBE_EDGE 10
735
+
733
 // X and Y axis travel speed (mm/m) between probes
736
 // X and Y axis travel speed (mm/m) between probes
734
 #define XY_PROBE_SPEED 7500
737
 #define XY_PROBE_SPEED 7500
735
 
738
 
973
   #define FRONT_PROBE_BED_POSITION 10
976
   #define FRONT_PROBE_BED_POSITION 10
974
   #define BACK_PROBE_BED_POSITION 170
977
   #define BACK_PROBE_BED_POSITION 170
975
 
978
 
976
-  // The Z probe minimum outer margin (to validate G29 parameters).
977
-  #define MIN_PROBE_EDGE 10
978
 
979
 
979
   // Probe along the Y axis, advancing X after each column
980
   // Probe along the Y axis, advancing X after each column
980
   //#define PROBE_Y_FIRST
981
   //#define PROBE_Y_FIRST
1016
 
1017
 
1017
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1018
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1018
 
1019
 
1019
-  #define MESH_INSET 0              // Mesh inset margin on print area
1020
+  #define MESH_INSET 0              // Set Mesh bounds as an inset region of the bed
1020
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1021
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1021
   #define GRID_MAX_POINTS_Y 10
1022
   #define GRID_MAX_POINTS_Y 10
1022
 
1023
 
1039
   //=================================== Mesh ==================================
1040
   //=================================== Mesh ==================================
1040
   //===========================================================================
1041
   //===========================================================================
1041
 
1042
 
1042
-  #define MESH_INSET 10          // Mesh inset margin on print area
1043
+  #define MESH_INSET 10          // Set Mesh bounds as an inset region of the bed
1043
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1044
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1044
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1045
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1045
 
1046
 

+ 5
- 4
Marlin/src/config/examples/Geeetech/GT2560/Configuration.h View File

738
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 10  // Y offset: -front +behind [the nozzle]
738
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 10  // Y offset: -front +behind [the nozzle]
739
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
739
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
740
 
740
 
741
+// Certain types of probes need to stay away from edges
742
+#define MIN_PROBE_EDGE 10
743
+
741
 // X and Y axis travel speed (mm/m) between probes
744
 // X and Y axis travel speed (mm/m) between probes
742
 #define XY_PROBE_SPEED 8000
745
 #define XY_PROBE_SPEED 8000
743
 
746
 
975
   #define GRID_MAX_POINTS_X 3
978
   #define GRID_MAX_POINTS_X 3
976
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
979
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
977
 
980
 
978
-  // The Z probe minimum outer margin (to validate G29 parameters).
979
-  #define MIN_PROBE_EDGE 10
980
 
981
 
981
   // Set the boundaries for probing (where the probe can reach).
982
   // Set the boundaries for probing (where the probe can reach).
982
   #define LEFT_PROBE_BED_POSITION 15
983
   #define LEFT_PROBE_BED_POSITION 15
1024
 
1025
 
1025
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1026
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1026
 
1027
 
1027
-  #define MESH_INSET 1              // Mesh inset margin on print area
1028
+  #define MESH_INSET 1              // Set Mesh bounds as an inset region of the bed
1028
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1029
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1029
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1030
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1030
 
1031
 
1047
   //=================================== Mesh ==================================
1048
   //=================================== Mesh ==================================
1048
   //===========================================================================
1049
   //===========================================================================
1049
 
1050
 
1050
-  #define MESH_INSET 10          // Mesh inset margin on print area
1051
+  #define MESH_INSET 10          // Set Mesh bounds as an inset region of the bed
1051
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1052
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1052
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1053
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1053
 
1054
 

+ 5
- 5
Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h View File

723
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 10  // Y offset: -front +behind [the nozzle]
723
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 10  // Y offset: -front +behind [the nozzle]
724
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
724
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
725
 
725
 
726
+// Certain types of probes need to stay away from edges
727
+#define MIN_PROBE_EDGE  8
728
+
726
 // X and Y axis travel speed (mm/m) between probes
729
 // X and Y axis travel speed (mm/m) between probes
727
 #define XY_PROBE_SPEED 8000
730
 #define XY_PROBE_SPEED 8000
728
 
731
 
960
   #define GRID_MAX_POINTS_X 3
963
   #define GRID_MAX_POINTS_X 3
961
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
964
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
962
 
965
 
963
-  // The Z probe minimum outer margin (to validate G29 parameters).
964
-  #define MIN_PROBE_EDGE 8
965
-
966
   // Set the boundaries for probing (where the probe can reach).
966
   // Set the boundaries for probing (where the probe can reach).
967
   #define LEFT_PROBE_BED_POSITION 15
967
   #define LEFT_PROBE_BED_POSITION 15
968
   #define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
968
   #define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
1009
 
1009
 
1010
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1010
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1011
 
1011
 
1012
-  #define MESH_INSET 1              // Mesh inset margin on print area
1012
+  #define MESH_INSET 1              // Set Mesh bounds as an inset region of the bed
1013
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1013
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1014
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1014
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1015
 
1015
 
1032
   //=================================== Mesh ==================================
1032
   //=================================== Mesh ==================================
1033
   //===========================================================================
1033
   //===========================================================================
1034
 
1034
 
1035
-  #define MESH_INSET 10          // Mesh inset margin on print area
1035
+  #define MESH_INSET 10          // Set Mesh bounds as an inset region of the bed
1036
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1036
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1037
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1037
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1038
 
1038
 

+ 5
- 4
Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/bltouch/Configuration.h View File

739
 #define Y_PROBE_OFFSET_FROM_EXTRUDER -44   // Y offset: -front +behind [the nozzle]
739
 #define Y_PROBE_OFFSET_FROM_EXTRUDER -44   // Y offset: -front +behind [the nozzle]
740
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -1.4  // Z offset: -below +above  [the nozzle]
740
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -1.4  // Z offset: -below +above  [the nozzle]
741
 
741
 
742
+// Certain types of probes need to stay away from edges
743
+#define MIN_PROBE_EDGE 10
744
+
742
 // X and Y axis travel speed (mm/m) between probes
745
 // X and Y axis travel speed (mm/m) between probes
743
 #define XY_PROBE_SPEED 8000
746
 #define XY_PROBE_SPEED 8000
744
 
747
 
976
   #define GRID_MAX_POINTS_X 4
979
   #define GRID_MAX_POINTS_X 4
977
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
980
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
978
 
981
 
979
-  // The Z probe minimum outer margin (to validate G29 parameters).
980
-  #define MIN_PROBE_EDGE 10
981
 
982
 
982
   // Set the boundaries for probing (where the probe can reach).
983
   // Set the boundaries for probing (where the probe can reach).
983
   #define LEFT_PROBE_BED_POSITION 10
984
   #define LEFT_PROBE_BED_POSITION 10
1025
 
1026
 
1026
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1027
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1027
 
1028
 
1028
-  #define MESH_INSET 1              // Mesh inset margin on print area
1029
+  #define MESH_INSET 1              // Set Mesh bounds as an inset region of the bed
1029
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1030
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1030
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1031
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1031
 
1032
 
1048
   //=================================== Mesh ==================================
1049
   //=================================== Mesh ==================================
1049
   //===========================================================================
1050
   //===========================================================================
1050
 
1051
 
1051
-  #define MESH_INSET 10          // Mesh inset margin on print area
1052
+  #define MESH_INSET 10          // Set Mesh bounds as an inset region of the bed
1052
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1053
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1053
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1054
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1054
 
1055
 

+ 5
- 4
Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/noprobe/Configuration.h View File

738
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 10  // Y offset: -front +behind [the nozzle]
738
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 10  // Y offset: -front +behind [the nozzle]
739
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
739
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
740
 
740
 
741
+// Certain types of probes need to stay away from edges
742
+#define MIN_PROBE_EDGE 10
743
+
741
 // X and Y axis travel speed (mm/m) between probes
744
 // X and Y axis travel speed (mm/m) between probes
742
 #define XY_PROBE_SPEED 8000
745
 #define XY_PROBE_SPEED 8000
743
 
746
 
975
   #define GRID_MAX_POINTS_X 4
978
   #define GRID_MAX_POINTS_X 4
976
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
979
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
977
 
980
 
978
-  // The Z probe minimum outer margin (to validate G29 parameters).
979
-  #define MIN_PROBE_EDGE 10
980
 
981
 
981
   // Set the boundaries for probing (where the probe can reach).
982
   // Set the boundaries for probing (where the probe can reach).
982
   #define LEFT_PROBE_BED_POSITION 10
983
   #define LEFT_PROBE_BED_POSITION 10
1024
 
1025
 
1025
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1026
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1026
 
1027
 
1027
-  #define MESH_INSET 1              // Mesh inset margin on print area
1028
+  #define MESH_INSET 1              // Set Mesh bounds as an inset region of the bed
1028
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1029
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1029
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1030
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1030
 
1031
 
1047
   //=================================== Mesh ==================================
1048
   //=================================== Mesh ==================================
1048
   //===========================================================================
1049
   //===========================================================================
1049
 
1050
 
1050
-  #define MESH_INSET 10          // Mesh inset margin on print area
1051
+  #define MESH_INSET 10          // Set Mesh bounds as an inset region of the bed
1051
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1052
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1052
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1053
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1053
 
1054
 

+ 5
- 4
Marlin/src/config/examples/Infitary/i3-M508/Configuration.h View File

727
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 10  // Y offset: -front +behind [the nozzle]
727
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 10  // Y offset: -front +behind [the nozzle]
728
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
728
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
729
 
729
 
730
+// Certain types of probes need to stay away from edges
731
+#define MIN_PROBE_EDGE 10
732
+
730
 // X and Y axis travel speed (mm/m) between probes
733
 // X and Y axis travel speed (mm/m) between probes
731
 #define XY_PROBE_SPEED 8000
734
 #define XY_PROBE_SPEED 8000
732
 
735
 
964
   #define GRID_MAX_POINTS_X 3
967
   #define GRID_MAX_POINTS_X 3
965
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
968
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
966
 
969
 
967
-  // The Z probe minimum outer margin (to validate G29 parameters).
968
-  #define MIN_PROBE_EDGE 10
969
 
970
 
970
   // Set the boundaries for probing (where the probe can reach).
971
   // Set the boundaries for probing (where the probe can reach).
971
   #define LEFT_PROBE_BED_POSITION 15
972
   #define LEFT_PROBE_BED_POSITION 15
1013
 
1014
 
1014
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1015
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1015
 
1016
 
1016
-  #define MESH_INSET 1              // Mesh inset margin on print area
1017
+  #define MESH_INSET 1              // Set Mesh bounds as an inset region of the bed
1017
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1018
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1018
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1019
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1019
 
1020
 
1036
   //=================================== Mesh ==================================
1037
   //=================================== Mesh ==================================
1037
   //===========================================================================
1038
   //===========================================================================
1038
 
1039
 
1039
-  #define MESH_INSET 10          // Mesh inset margin on print area
1040
+  #define MESH_INSET 10          // Set Mesh bounds as an inset region of the bed
1040
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1041
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1041
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1042
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1042
 
1043
 

+ 5
- 4
Marlin/src/config/examples/JGAurora/A5/Configuration.h View File

735
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 10  // Y offset: -front +behind [the nozzle]
735
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 10  // Y offset: -front +behind [the nozzle]
736
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
736
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
737
 
737
 
738
+// Certain types of probes need to stay away from edges
739
+#define MIN_PROBE_EDGE 10
740
+
738
 // X and Y axis travel speed (mm/m) between probes
741
 // X and Y axis travel speed (mm/m) between probes
739
 #define XY_PROBE_SPEED 8000
742
 #define XY_PROBE_SPEED 8000
740
 
743
 
978
   #define FRONT_PROBE_BED_POSITION 20
981
   #define FRONT_PROBE_BED_POSITION 20
979
   #define BACK_PROBE_BED_POSITION 170
982
   #define BACK_PROBE_BED_POSITION 170
980
 
983
 
981
-  // The Z probe minimum outer margin (to validate G29 parameters).
982
-  #define MIN_PROBE_EDGE 10
983
 
984
 
984
   // Probe along the Y axis, advancing X after each column
985
   // Probe along the Y axis, advancing X after each column
985
   //#define PROBE_Y_FIRST
986
   //#define PROBE_Y_FIRST
1021
 
1022
 
1022
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1023
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1023
 
1024
 
1024
-  #define MESH_INSET 1              // Mesh inset margin on print area
1025
+  #define MESH_INSET 1              // Set Mesh bounds as an inset region of the bed
1025
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1026
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1026
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1027
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1027
 
1028
 
1044
   //=================================== Mesh ==================================
1045
   //=================================== Mesh ==================================
1045
   //===========================================================================
1046
   //===========================================================================
1046
 
1047
 
1047
-  #define MESH_INSET 10          // Mesh inset margin on print area
1048
+  #define MESH_INSET 10          // Set Mesh bounds as an inset region of the bed
1048
   #define GRID_MAX_POINTS_X 5    // As suggested by DaHai, https://www.youtube.com/watch?v=CBlADPgQqL0
1049
   #define GRID_MAX_POINTS_X 5    // As suggested by DaHai, https://www.youtube.com/watch?v=CBlADPgQqL0
1049
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1050
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1050
   #define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS
1051
   #define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS

+ 5
- 4
Marlin/src/config/examples/MakerParts/Configuration.h View File

743
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 10  // Y offset: -front +behind [the nozzle]
743
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 10  // Y offset: -front +behind [the nozzle]
744
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
744
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
745
 
745
 
746
+// Certain types of probes need to stay away from edges
747
+#define MIN_PROBE_EDGE 10
748
+
746
 // X and Y axis travel speed (mm/m) between probes
749
 // X and Y axis travel speed (mm/m) between probes
747
 #define XY_PROBE_SPEED 8000
750
 #define XY_PROBE_SPEED 8000
748
 
751
 
980
   #define GRID_MAX_POINTS_X 3
983
   #define GRID_MAX_POINTS_X 3
981
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
984
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
982
 
985
 
983
-  // The Z probe minimum outer margin (to validate G29 parameters).
984
-  #define MIN_PROBE_EDGE 10
985
 
986
 
986
   // Set the boundaries for probing (where the probe can reach).
987
   // Set the boundaries for probing (where the probe can reach).
987
   #define LEFT_PROBE_BED_POSITION 15
988
   #define LEFT_PROBE_BED_POSITION 15
1029
 
1030
 
1030
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1031
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1031
 
1032
 
1032
-  #define MESH_INSET 1              // Mesh inset margin on print area
1033
+  #define MESH_INSET 1              // Set Mesh bounds as an inset region of the bed
1033
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1034
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1034
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1035
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1035
 
1036
 
1052
   //=================================== Mesh ==================================
1053
   //=================================== Mesh ==================================
1053
   //===========================================================================
1054
   //===========================================================================
1054
 
1055
 
1055
-  #define MESH_INSET 10          // Mesh inset margin on print area
1056
+  #define MESH_INSET 10          // Set Mesh bounds as an inset region of the bed
1056
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1057
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1057
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1058
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1058
 
1059
 

+ 5
- 4
Marlin/src/config/examples/Malyan/M150/Configuration.h View File

747
 //#define Y_PROBE_OFFSET_FROM_EXTRUDER -50  // Y offset: -front +behind [the nozzle]
747
 //#define Y_PROBE_OFFSET_FROM_EXTRUDER -50  // Y offset: -front +behind [the nozzle]
748
 //#define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
748
 //#define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
749
 
749
 
750
+// Certain types of probes need to stay away from edges
751
+#define MIN_PROBE_EDGE 10
752
+
750
 // X and Y axis travel speed (mm/m) between probes
753
 // X and Y axis travel speed (mm/m) between probes
751
 //#define XY_PROBE_SPEED 8000
754
 //#define XY_PROBE_SPEED 8000
752
 
755
 
994
   #define FRONT_PROBE_BED_POSITION 50
997
   #define FRONT_PROBE_BED_POSITION 50
995
   #define BACK_PROBE_BED_POSITION 150
998
   #define BACK_PROBE_BED_POSITION 150
996
 
999
 
997
-  // The Z probe minimum outer margin (to validate G29 parameters).
998
-  #define MIN_PROBE_EDGE 10
999
 
1000
 
1000
   // Probe along the Y axis, advancing X after each column
1001
   // Probe along the Y axis, advancing X after each column
1001
   //#define PROBE_Y_FIRST
1002
   //#define PROBE_Y_FIRST
1037
 
1038
 
1038
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1039
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1039
 
1040
 
1040
-  #define MESH_INSET 1              // Mesh inset margin on print area
1041
+  #define MESH_INSET 1              // Set Mesh bounds as an inset region of the bed
1041
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1042
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1042
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1043
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1043
 
1044
 
1060
   //=================================== Mesh ==================================
1061
   //=================================== Mesh ==================================
1061
   //===========================================================================
1062
   //===========================================================================
1062
 
1063
 
1063
-  #define MESH_INSET 10          // Mesh inset margin on print area
1064
+  #define MESH_INSET 10          // Set Mesh bounds as an inset region of the bed
1064
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1065
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1065
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1066
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1066
 
1067
 

+ 5
- 4
Marlin/src/config/examples/Malyan/M200/Configuration.h View File

722
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 10  // Y offset: -front +behind [the nozzle]
722
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 10  // Y offset: -front +behind [the nozzle]
723
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
723
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
724
 
724
 
725
+// Certain types of probes need to stay away from edges
726
+#define MIN_PROBE_EDGE 10
727
+
725
 // X and Y axis travel speed (mm/m) between probes
728
 // X and Y axis travel speed (mm/m) between probes
726
 #define XY_PROBE_SPEED 8000
729
 #define XY_PROBE_SPEED 8000
727
 
730
 
959
   #define GRID_MAX_POINTS_X 3
962
   #define GRID_MAX_POINTS_X 3
960
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
963
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
961
 
964
 
962
-  // The Z probe minimum outer margin (to validate G29 parameters).
963
-  #define MIN_PROBE_EDGE 10
964
 
965
 
965
   // Set the boundaries for probing (where the probe can reach).
966
   // Set the boundaries for probing (where the probe can reach).
966
   #define LEFT_PROBE_BED_POSITION 15
967
   #define LEFT_PROBE_BED_POSITION 15
1008
 
1009
 
1009
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1010
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1010
 
1011
 
1011
-  #define MESH_INSET 1              // Mesh inset margin on print area
1012
+  #define MESH_INSET 1              // Set Mesh bounds as an inset region of the bed
1012
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1013
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1013
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1014
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1014
 
1015
 
1031
   //=================================== Mesh ==================================
1032
   //=================================== Mesh ==================================
1032
   //===========================================================================
1033
   //===========================================================================
1033
 
1034
 
1034
-  #define MESH_INSET 10          // Mesh inset margin on print area
1035
+  #define MESH_INSET 10          // Set Mesh bounds as an inset region of the bed
1035
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1036
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1036
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1037
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1037
 
1038
 

+ 5
- 4
Marlin/src/config/examples/Micromake/C1/basic/Configuration.h View File

727
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 0  // Y offset: -front +behind [the nozzle]
727
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 0  // Y offset: -front +behind [the nozzle]
728
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
728
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
729
 
729
 
730
+// Certain types of probes need to stay away from edges
731
+#define MIN_PROBE_EDGE 10
732
+
730
 // X and Y axis travel speed (mm/m) between probes
733
 // X and Y axis travel speed (mm/m) between probes
731
 #define XY_PROBE_SPEED 8000
734
 #define XY_PROBE_SPEED 8000
732
 
735
 
964
   #define GRID_MAX_POINTS_X 3
967
   #define GRID_MAX_POINTS_X 3
965
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
968
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
966
 
969
 
967
-  // The Z probe minimum outer margin (to validate G29 parameters).
968
-  #define MIN_PROBE_EDGE 10
969
 
970
 
970
   // Set the boundaries for probing (where the probe can reach).
971
   // Set the boundaries for probing (where the probe can reach).
971
   #define LEFT_PROBE_BED_POSITION 15
972
   #define LEFT_PROBE_BED_POSITION 15
1013
 
1014
 
1014
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1015
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1015
 
1016
 
1016
-  #define MESH_INSET 1              // Mesh inset margin on print area
1017
+  #define MESH_INSET 1              // Set Mesh bounds as an inset region of the bed
1017
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1018
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1018
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1019
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1019
 
1020
 
1036
   //=================================== Mesh ==================================
1037
   //=================================== Mesh ==================================
1037
   //===========================================================================
1038
   //===========================================================================
1038
 
1039
 
1039
-  #define MESH_INSET 10          // Mesh inset margin on print area
1040
+  #define MESH_INSET 10          // Set Mesh bounds as an inset region of the bed
1040
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1041
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1041
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1042
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1042
 
1043
 

+ 5
- 4
Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h View File

727
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 0  // Y offset: -front +behind [the nozzle]
727
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 0  // Y offset: -front +behind [the nozzle]
728
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
728
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
729
 
729
 
730
+// Certain types of probes need to stay away from edges
731
+#define MIN_PROBE_EDGE 10
732
+
730
 // X and Y axis travel speed (mm/m) between probes
733
 // X and Y axis travel speed (mm/m) between probes
731
 #define XY_PROBE_SPEED 8000
734
 #define XY_PROBE_SPEED 8000
732
 
735
 
964
   #define GRID_MAX_POINTS_X 3
967
   #define GRID_MAX_POINTS_X 3
965
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
968
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
966
 
969
 
967
-  // The Z probe minimum outer margin (to validate G29 parameters).
968
-  #define MIN_PROBE_EDGE 10
969
 
970
 
970
   // Set the boundaries for probing (where the probe can reach).
971
   // Set the boundaries for probing (where the probe can reach).
971
   #define LEFT_PROBE_BED_POSITION 15
972
   #define LEFT_PROBE_BED_POSITION 15
1013
 
1014
 
1014
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1015
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1015
 
1016
 
1016
-  #define MESH_INSET 1              // Mesh inset margin on print area
1017
+  #define MESH_INSET 1              // Set Mesh bounds as an inset region of the bed
1017
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1018
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1018
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1019
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1019
 
1020
 
1036
   //=================================== Mesh ==================================
1037
   //=================================== Mesh ==================================
1037
   //===========================================================================
1038
   //===========================================================================
1038
 
1039
 
1039
-  #define MESH_INSET 10          // Mesh inset margin on print area
1040
+  #define MESH_INSET 10          // Set Mesh bounds as an inset region of the bed
1040
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1041
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1041
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1042
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1042
 
1043
 

+ 5
- 4
Marlin/src/config/examples/Mks/Sbase/Configuration.h View File

723
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 5     // Y offset: -front +behind [the nozzle]
723
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 5     // Y offset: -front +behind [the nozzle]
724
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0     // Z offset: -below +above  [the nozzle]
724
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0     // Z offset: -below +above  [the nozzle]
725
 
725
 
726
+// Certain types of probes need to stay away from edges
727
+#define MIN_PROBE_EDGE 10
728
+
726
 // X and Y axis travel speed (mm/m) between probes
729
 // X and Y axis travel speed (mm/m) between probes
727
 #define XY_PROBE_SPEED 8000
730
 #define XY_PROBE_SPEED 8000
728
 
731
 
966
   #define FRONT_PROBE_BED_POSITION 20
969
   #define FRONT_PROBE_BED_POSITION 20
967
   #define BACK_PROBE_BED_POSITION 170
970
   #define BACK_PROBE_BED_POSITION 170
968
 
971
 
969
-  // The Z probe minimum outer margin (to validate G29 parameters).
970
-  #define MIN_PROBE_EDGE 10
971
 
972
 
972
   // Probe along the Y axis, advancing X after each column
973
   // Probe along the Y axis, advancing X after each column
973
   //#define PROBE_Y_FIRST
974
   //#define PROBE_Y_FIRST
1009
 
1010
 
1010
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1011
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1011
 
1012
 
1012
-  #define MESH_INSET 1              // Mesh inset margin on print area
1013
+  #define MESH_INSET 1              // Set Mesh bounds as an inset region of the bed
1013
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1014
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1014
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1015
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1015
 
1016
 
1032
   //=================================== Mesh ==================================
1033
   //=================================== Mesh ==================================
1033
   //===========================================================================
1034
   //===========================================================================
1034
 
1035
 
1035
-  #define MESH_INSET 10          // Mesh inset margin on print area
1036
+  #define MESH_INSET 10          // Set Mesh bounds as an inset region of the bed
1036
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1037
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1037
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1038
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1038
 
1039
 

+ 5
- 4
Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h View File

723
 #define Y_PROBE_OFFSET_FROM_EXTRUDER -29     // Y offset: -front +behind [the nozzle]
723
 #define Y_PROBE_OFFSET_FROM_EXTRUDER -29     // Y offset: -front +behind [the nozzle]
724
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35  // Z offset: -below +above  [the nozzle]
724
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35  // Z offset: -below +above  [the nozzle]
725
 
725
 
726
+// Certain types of probes need to stay away from edges
727
+#define MIN_PROBE_EDGE 10
728
+
726
 // X and Y axis travel speed (mm/m) between probes
729
 // X and Y axis travel speed (mm/m) between probes
727
 #define XY_PROBE_SPEED 8000
730
 #define XY_PROBE_SPEED 8000
728
 
731
 
960
   #define GRID_MAX_POINTS_X 3
963
   #define GRID_MAX_POINTS_X 3
961
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
964
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
962
 
965
 
963
-  // The Z probe minimum outer margin (to validate G29 parameters).
964
-  #define MIN_PROBE_EDGE 10
965
 
966
 
966
   // Set the boundaries for probing (where the probe can reach).
967
   // Set the boundaries for probing (where the probe can reach).
967
   #define LEFT_PROBE_BED_POSITION 15
968
   #define LEFT_PROBE_BED_POSITION 15
1009
 
1010
 
1010
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1011
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1011
 
1012
 
1012
-  #define MESH_INSET 1              // Mesh inset margin on print area
1013
+  #define MESH_INSET 1              // Set Mesh bounds as an inset region of the bed
1013
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1014
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1014
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1015
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1015
 
1016
 
1032
   //=================================== Mesh ==================================
1033
   //=================================== Mesh ==================================
1033
   //===========================================================================
1034
   //===========================================================================
1034
 
1035
 
1035
-  #define MESH_INSET 10          // Mesh inset margin on print area
1036
+  #define MESH_INSET 10          // Set Mesh bounds as an inset region of the bed
1036
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1037
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1037
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1038
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1038
 
1039
 

+ 5
- 4
Marlin/src/config/examples/RigidBot/Configuration.h View File

721
 #define Y_PROBE_OFFSET_FROM_EXTRUDER -29     // Y offset: -front +behind [the nozzle]
721
 #define Y_PROBE_OFFSET_FROM_EXTRUDER -29     // Y offset: -front +behind [the nozzle]
722
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35  // Z offset: -below +above  [the nozzle]
722
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35  // Z offset: -below +above  [the nozzle]
723
 
723
 
724
+// Certain types of probes need to stay away from edges
725
+#define MIN_PROBE_EDGE 10
726
+
724
 // X and Y axis travel speed (mm/m) between probes
727
 // X and Y axis travel speed (mm/m) between probes
725
 #define XY_PROBE_SPEED 8000
728
 #define XY_PROBE_SPEED 8000
726
 
729
 
958
   #define GRID_MAX_POINTS_X 3
961
   #define GRID_MAX_POINTS_X 3
959
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
962
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
960
 
963
 
961
-  // The Z probe minimum outer margin (to validate G29 parameters).
962
-  #define MIN_PROBE_EDGE 10
963
 
964
 
964
   // Set the boundaries for probing (where the probe can reach).
965
   // Set the boundaries for probing (where the probe can reach).
965
   #define LEFT_PROBE_BED_POSITION 15
966
   #define LEFT_PROBE_BED_POSITION 15
1007
 
1008
 
1008
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1009
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1009
 
1010
 
1010
-  #define MESH_INSET 1              // Mesh inset margin on print area
1011
+  #define MESH_INSET 1              // Set Mesh bounds as an inset region of the bed
1011
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1012
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1012
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1013
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1013
 
1014
 
1030
   //=================================== Mesh ==================================
1031
   //=================================== Mesh ==================================
1031
   //===========================================================================
1032
   //===========================================================================
1032
 
1033
 
1033
-  #define MESH_INSET 10          // Mesh inset margin on print area
1034
+  #define MESH_INSET 10          // Set Mesh bounds as an inset region of the bed
1034
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1035
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1035
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1036
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1036
 
1037
 

+ 5
- 4
Marlin/src/config/examples/SCARA/Configuration.h View File

734
 #define Y_PROBE_OFFSET_FROM_EXTRUDER -29     // Y offset: -front +behind [the nozzle]
734
 #define Y_PROBE_OFFSET_FROM_EXTRUDER -29     // Y offset: -front +behind [the nozzle]
735
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35  // Z offset: -below +above  [the nozzle]
735
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35  // Z offset: -below +above  [the nozzle]
736
 
736
 
737
+// Certain types of probes need to stay away from edges
738
+#define MIN_PROBE_EDGE 10
739
+
737
 // X and Y axis travel speed (mm/m) between probes
740
 // X and Y axis travel speed (mm/m) between probes
738
 #define XY_PROBE_SPEED 8000
741
 #define XY_PROBE_SPEED 8000
739
 
742
 
971
   #define GRID_MAX_POINTS_X 3
974
   #define GRID_MAX_POINTS_X 3
972
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
975
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
973
 
976
 
974
-  // The Z probe minimum outer margin (to validate G29 parameters).
975
-  #define MIN_PROBE_EDGE 10
976
 
977
 
977
   // Set the boundaries for probing (where the probe can reach).
978
   // Set the boundaries for probing (where the probe can reach).
978
   #define LEFT_PROBE_BED_POSITION 15
979
   #define LEFT_PROBE_BED_POSITION 15
1020
 
1021
 
1021
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1022
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1022
 
1023
 
1023
-  #define MESH_INSET 1              // Mesh inset margin on print area
1024
+  #define MESH_INSET 1              // Set Mesh bounds as an inset region of the bed
1024
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1025
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1025
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1026
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1026
 
1027
 
1043
   //=================================== Mesh ==================================
1044
   //=================================== Mesh ==================================
1044
   //===========================================================================
1045
   //===========================================================================
1045
 
1046
 
1046
-  #define MESH_INSET 10          // Mesh inset margin on print area
1047
+  #define MESH_INSET 10          // Set Mesh bounds as an inset region of the bed
1047
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1048
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1048
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1049
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1049
 
1050
 

+ 5
- 4
Marlin/src/config/examples/STM32F10/Configuration.h View File

726
 #define Y_PROBE_OFFSET_FROM_EXTRUDER -29  // Y offset: -front +behind [the nozzle]
726
 #define Y_PROBE_OFFSET_FROM_EXTRUDER -29  // Y offset: -front +behind [the nozzle]
727
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35   // Z offset: -below +above  [the nozzle]
727
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35   // Z offset: -below +above  [the nozzle]
728
 
728
 
729
+// Certain types of probes need to stay away from edges
730
+#define MIN_PROBE_EDGE 10
731
+
729
 // X and Y axis travel speed (mm/m) between probes
732
 // X and Y axis travel speed (mm/m) between probes
730
 #define XY_PROBE_SPEED 8000
733
 #define XY_PROBE_SPEED 8000
731
 
734
 
963
   #define GRID_MAX_POINTS_X 3
966
   #define GRID_MAX_POINTS_X 3
964
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
967
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
965
 
968
 
966
-  // The Z probe minimum outer margin (to validate G29 parameters).
967
-  #define MIN_PROBE_EDGE 10
968
 
969
 
969
   // Set the boundaries for probing (where the probe can reach).
970
   // Set the boundaries for probing (where the probe can reach).
970
   #define LEFT_PROBE_BED_POSITION 15
971
   #define LEFT_PROBE_BED_POSITION 15
1012
 
1013
 
1013
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1014
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1014
 
1015
 
1015
-  #define MESH_INSET 1              // Mesh inset margin on print area
1016
+  #define MESH_INSET 1              // Set Mesh bounds as an inset region of the bed
1016
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1017
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1017
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1018
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1018
 
1019
 
1035
   //=================================== Mesh ==================================
1036
   //=================================== Mesh ==================================
1036
   //===========================================================================
1037
   //===========================================================================
1037
 
1038
 
1038
-  #define MESH_INSET 10          // Mesh inset margin on print area
1039
+  #define MESH_INSET 10          // Set Mesh bounds as an inset region of the bed
1039
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1040
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1040
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1041
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1041
 
1042
 

+ 5
- 4
Marlin/src/config/examples/Sanguinololu/Configuration.h View File

754
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 10  // Y offset: -front +behind [the nozzle]
754
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 10  // Y offset: -front +behind [the nozzle]
755
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
755
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
756
 
756
 
757
+// Certain types of probes need to stay away from edges
758
+#define MIN_PROBE_EDGE 10
759
+
757
 // X and Y axis travel speed (mm/m) between probes
760
 // X and Y axis travel speed (mm/m) between probes
758
 #define XY_PROBE_SPEED 8000
761
 #define XY_PROBE_SPEED 8000
759
 
762
 
991
   #define GRID_MAX_POINTS_X 3
994
   #define GRID_MAX_POINTS_X 3
992
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
995
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
993
 
996
 
994
-  // The Z probe minimum outer margin (to validate G29 parameters).
995
-  #define MIN_PROBE_EDGE 10
996
 
997
 
997
   // Set the boundaries for probing (where the probe can reach).
998
   // Set the boundaries for probing (where the probe can reach).
998
   #define LEFT_PROBE_BED_POSITION 15
999
   #define LEFT_PROBE_BED_POSITION 15
1040
 
1041
 
1041
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1042
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1042
 
1043
 
1043
-  #define MESH_INSET 1              // Mesh inset margin on print area
1044
+  #define MESH_INSET 1              // Set Mesh bounds as an inset region of the bed
1044
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1045
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1045
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1046
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1046
 
1047
 
1063
   //=================================== Mesh ==================================
1064
   //=================================== Mesh ==================================
1064
   //===========================================================================
1065
   //===========================================================================
1065
 
1066
 
1066
-  #define MESH_INSET 10          // Mesh inset margin on print area
1067
+  #define MESH_INSET 10          // Set Mesh bounds as an inset region of the bed
1067
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1068
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1068
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1069
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1069
 
1070
 

+ 5
- 4
Marlin/src/config/examples/TheBorg/Configuration.h View File

723
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 5     // Y offset: -front +behind [the nozzle]
723
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 5     // Y offset: -front +behind [the nozzle]
724
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -1.3     // Z offset: -below +above  [the nozzle]
724
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -1.3     // Z offset: -below +above  [the nozzle]
725
 
725
 
726
+// Certain types of probes need to stay away from edges
727
+#define MIN_PROBE_EDGE 10
728
+
726
 // X and Y axis travel speed (mm/m) between probes
729
 // X and Y axis travel speed (mm/m) between probes
727
 #define XY_PROBE_SPEED 8000
730
 #define XY_PROBE_SPEED 8000
728
 
731
 
966
   #define FRONT_PROBE_BED_POSITION 10
969
   #define FRONT_PROBE_BED_POSITION 10
967
   #define BACK_PROBE_BED_POSITION 210
970
   #define BACK_PROBE_BED_POSITION 210
968
 
971
 
969
-  // The Z probe minimum outer margin (to validate G29 parameters).
970
-  #define MIN_PROBE_EDGE 10
971
 
972
 
972
   // Probe along the Y axis, advancing X after each column
973
   // Probe along the Y axis, advancing X after each column
973
   //#define PROBE_Y_FIRST
974
   //#define PROBE_Y_FIRST
1009
 
1010
 
1010
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1011
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1011
 
1012
 
1012
-  #define MESH_INSET 1              // Mesh inset margin on print area
1013
+  #define MESH_INSET 1              // Set Mesh bounds as an inset region of the bed
1013
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1014
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1014
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1015
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1015
 
1016
 
1032
   //=================================== Mesh ==================================
1033
   //=================================== Mesh ==================================
1033
   //===========================================================================
1034
   //===========================================================================
1034
 
1035
 
1035
-  #define MESH_INSET 10          // Mesh inset margin on print area
1036
+  #define MESH_INSET 10          // Set Mesh bounds as an inset region of the bed
1036
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1037
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1037
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1038
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1038
 
1039
 

+ 5
- 4
Marlin/src/config/examples/TinyBoy2/Configuration.h View File

774
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 15  // Y offset: -front +behind [the nozzle]
774
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 15  // Y offset: -front +behind [the nozzle]
775
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
775
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
776
 
776
 
777
+// Certain types of probes need to stay away from edges
778
+#define MIN_PROBE_EDGE 10
779
+
777
 // X and Y axis travel speed (mm/m) between probes
780
 // X and Y axis travel speed (mm/m) between probes
778
 #define XY_PROBE_SPEED 8000
781
 #define XY_PROBE_SPEED 8000
779
 
782
 
1016
   #define GRID_MAX_POINTS_X 3
1019
   #define GRID_MAX_POINTS_X 3
1017
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1020
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1018
 
1021
 
1019
-  // The Z probe minimum outer margin (to validate G29 parameters).
1020
-  #define MIN_PROBE_EDGE 10
1021
 
1022
 
1022
   // Set the boundaries for probing (where the probe can reach).
1023
   // Set the boundaries for probing (where the probe can reach).
1023
   #define LEFT_PROBE_BED_POSITION 15
1024
   #define LEFT_PROBE_BED_POSITION 15
1065
 
1066
 
1066
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1067
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1067
 
1068
 
1068
-  #define MESH_INSET 1              // Mesh inset margin on print area
1069
+  #define MESH_INSET 1              // Set Mesh bounds as an inset region of the bed
1069
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1070
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1070
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1071
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1071
 
1072
 
1088
   //=================================== Mesh ==================================
1089
   //=================================== Mesh ==================================
1089
   //===========================================================================
1090
   //===========================================================================
1090
 
1091
 
1091
-  #define MESH_INSET 10          // Mesh inset margin on print area
1092
+  #define MESH_INSET 10          // Set Mesh bounds as an inset region of the bed
1092
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1093
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1093
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1094
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1094
 
1095
 

+ 5
- 4
Marlin/src/config/examples/Tronxy/X1/Configuration.h View File

723
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 10  // Y offset: -front +behind [the nozzle]
723
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 10  // Y offset: -front +behind [the nozzle]
724
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
724
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
725
 
725
 
726
+// Certain types of probes need to stay away from edges
727
+#define MIN_PROBE_EDGE 10
728
+
726
 // X and Y axis travel speed (mm/m) between probes
729
 // X and Y axis travel speed (mm/m) between probes
727
 #define XY_PROBE_SPEED 8000
730
 #define XY_PROBE_SPEED 8000
728
 
731
 
960
   #define GRID_MAX_POINTS_X 3
963
   #define GRID_MAX_POINTS_X 3
961
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
964
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
962
 
965
 
963
-  // The Z probe minimum outer margin (to validate G29 parameters).
964
-  #define MIN_PROBE_EDGE 10
965
 
966
 
966
   // Set the boundaries for probing (where the probe can reach).
967
   // Set the boundaries for probing (where the probe can reach).
967
   #define LEFT_PROBE_BED_POSITION 15
968
   #define LEFT_PROBE_BED_POSITION 15
1009
 
1010
 
1010
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1011
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1011
 
1012
 
1012
-  #define MESH_INSET 1              // Mesh inset margin on print area
1013
+  #define MESH_INSET 1              // Set Mesh bounds as an inset region of the bed
1013
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1014
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1014
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1015
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1015
 
1016
 
1032
   //=================================== Mesh ==================================
1033
   //=================================== Mesh ==================================
1033
   //===========================================================================
1034
   //===========================================================================
1034
 
1035
 
1035
-  #define MESH_INSET 10          // Mesh inset margin on print area
1036
+  #define MESH_INSET 10          // Set Mesh bounds as an inset region of the bed
1036
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1037
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1037
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1038
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1038
 
1039
 

+ 5
- 4
Marlin/src/config/examples/Tronxy/X5S/Configuration.h View File

723
 #define Y_PROBE_OFFSET_FROM_EXTRUDER -55  // Y offset: -front +behind [the nozzle]
723
 #define Y_PROBE_OFFSET_FROM_EXTRUDER -55  // Y offset: -front +behind [the nozzle]
724
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -0   // Z offset: -below +above  [the nozzle]
724
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -0   // Z offset: -below +above  [the nozzle]
725
 
725
 
726
+// Certain types of probes need to stay away from edges
727
+#define MIN_PROBE_EDGE 10
728
+
726
 // X and Y axis travel speed (mm/m) between probes
729
 // X and Y axis travel speed (mm/m) between probes
727
 #define XY_PROBE_SPEED 8000
730
 #define XY_PROBE_SPEED 8000
728
 
731
 
960
   #define GRID_MAX_POINTS_X 3
963
   #define GRID_MAX_POINTS_X 3
961
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
964
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
962
 
965
 
963
-  // The Z probe minimum outer margin (to validate G29 parameters).
964
-  #define MIN_PROBE_EDGE 10
965
 
966
 
966
   // Set the boundaries for probing (where the probe can reach).
967
   // Set the boundaries for probing (where the probe can reach).
967
   #define LEFT_PROBE_BED_POSITION 15
968
   #define LEFT_PROBE_BED_POSITION 15
1009
 
1010
 
1010
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1011
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1011
 
1012
 
1012
-  #define MESH_INSET 1              // Mesh inset margin on print area
1013
+  #define MESH_INSET 1              // Set Mesh bounds as an inset region of the bed
1013
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1014
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1014
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1015
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1015
 
1016
 
1032
   //=================================== Mesh ==================================
1033
   //=================================== Mesh ==================================
1033
   //===========================================================================
1034
   //===========================================================================
1034
 
1035
 
1035
-  #define MESH_INSET 10          // Mesh inset margin on print area
1036
+  #define MESH_INSET 10          // Set Mesh bounds as an inset region of the bed
1036
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1037
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1037
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1038
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1038
 
1039
 

+ 5
- 4
Marlin/src/config/examples/Tronxy/XY100/Configuration.h View File

734
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 10  // Y offset: -front +behind [the nozzle]
734
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 10  // Y offset: -front +behind [the nozzle]
735
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
735
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
736
 
736
 
737
+// Certain types of probes need to stay away from edges
738
+#define MIN_PROBE_EDGE 10
739
+
737
 // X and Y axis travel speed (mm/m) between probes
740
 // X and Y axis travel speed (mm/m) between probes
738
 #define XY_PROBE_SPEED 8000
741
 #define XY_PROBE_SPEED 8000
739
 
742
 
971
   #define GRID_MAX_POINTS_X 3
974
   #define GRID_MAX_POINTS_X 3
972
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
975
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
973
 
976
 
974
-  // The Z probe minimum outer margin (to validate G29 parameters).
975
-  #define MIN_PROBE_EDGE 10
976
 
977
 
977
   // Set the boundaries for probing (where the probe can reach).
978
   // Set the boundaries for probing (where the probe can reach).
978
   #define LEFT_PROBE_BED_POSITION 15
979
   #define LEFT_PROBE_BED_POSITION 15
1020
 
1021
 
1021
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1022
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1022
 
1023
 
1023
-  #define MESH_INSET 1              // Mesh inset margin on print area
1024
+  #define MESH_INSET 1              // Set Mesh bounds as an inset region of the bed
1024
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1025
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1025
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1026
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1026
 
1027
 
1043
   //=================================== Mesh ==================================
1044
   //=================================== Mesh ==================================
1044
   //===========================================================================
1045
   //===========================================================================
1045
 
1046
 
1046
-  #define MESH_INSET 10          // Mesh inset margin on print area
1047
+  #define MESH_INSET 10          // Set Mesh bounds as an inset region of the bed
1047
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1048
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1048
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1049
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1049
 
1050
 

+ 5
- 4
Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h View File

723
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 10  // Y offset: -front +behind [the nozzle]
723
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 10  // Y offset: -front +behind [the nozzle]
724
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
724
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
725
 
725
 
726
+// Certain types of probes need to stay away from edges
727
+#define MIN_PROBE_EDGE 10
728
+
726
 // X and Y axis travel speed (mm/m) between probes
729
 // X and Y axis travel speed (mm/m) between probes
727
 #define XY_PROBE_SPEED 8000
730
 #define XY_PROBE_SPEED 8000
728
 
731
 
960
   #define GRID_MAX_POINTS_X 3
963
   #define GRID_MAX_POINTS_X 3
961
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
964
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
962
 
965
 
963
-  // The Z probe minimum outer margin (to validate G29 parameters).
964
-  #define MIN_PROBE_EDGE 10
965
 
966
 
966
   // Set the boundaries for probing (where the probe can reach).
967
   // Set the boundaries for probing (where the probe can reach).
967
   #define LEFT_PROBE_BED_POSITION 15
968
   #define LEFT_PROBE_BED_POSITION 15
1009
 
1010
 
1010
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1011
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1011
 
1012
 
1012
-  #define MESH_INSET 1              // Mesh inset margin on print area
1013
+  #define MESH_INSET 1              // Set Mesh bounds as an inset region of the bed
1013
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1014
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1014
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1015
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1015
 
1016
 
1032
   //=================================== Mesh ==================================
1033
   //=================================== Mesh ==================================
1033
   //===========================================================================
1034
   //===========================================================================
1034
 
1035
 
1035
-  #define MESH_INSET 10          // Mesh inset margin on print area
1036
+  #define MESH_INSET 10          // Set Mesh bounds as an inset region of the bed
1036
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1037
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1037
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1038
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1038
 
1039
 

+ 5
- 4
Marlin/src/config/examples/Velleman/K8200/Configuration.h View File

752
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 10  // Y offset: -front +behind [the nozzle]
752
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 10  // Y offset: -front +behind [the nozzle]
753
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
753
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
754
 
754
 
755
+// Certain types of probes need to stay away from edges
756
+#define MIN_PROBE_EDGE 10
757
+
755
 // X and Y axis travel speed (mm/m) between probes
758
 // X and Y axis travel speed (mm/m) between probes
756
 #define XY_PROBE_SPEED 8000
759
 #define XY_PROBE_SPEED 8000
757
 
760
 
990
   #define GRID_MAX_POINTS_X 3
993
   #define GRID_MAX_POINTS_X 3
991
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
994
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
992
 
995
 
993
-  // The Z probe minimum outer margin (to validate G29 parameters).
994
-  #define MIN_PROBE_EDGE 10
995
 
996
 
996
   // Set the boundaries for probing (where the probe can reach).
997
   // Set the boundaries for probing (where the probe can reach).
997
   #define LEFT_PROBE_BED_POSITION 15
998
   #define LEFT_PROBE_BED_POSITION 15
1039
 
1040
 
1040
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1041
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1041
 
1042
 
1042
-  #define MESH_INSET 1              // Mesh inset margin on print area
1043
+  #define MESH_INSET 1              // Set Mesh bounds as an inset region of the bed
1043
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1044
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1044
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1045
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1045
 
1046
 
1062
   //=================================== Mesh ==================================
1063
   //=================================== Mesh ==================================
1063
   //===========================================================================
1064
   //===========================================================================
1064
 
1065
 
1065
-  #define MESH_INSET 10          // Mesh inset margin on print area
1066
+  #define MESH_INSET 10          // Set Mesh bounds as an inset region of the bed
1066
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1067
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1067
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1068
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1068
 
1069
 

+ 5
- 4
Marlin/src/config/examples/Velleman/K8400/Configuration.h View File

723
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 10  // Y offset: -front +behind [the nozzle]
723
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 10  // Y offset: -front +behind [the nozzle]
724
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
724
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
725
 
725
 
726
+// Certain types of probes need to stay away from edges
727
+#define MIN_PROBE_EDGE 10
728
+
726
 // X and Y axis travel speed (mm/m) between probes
729
 // X and Y axis travel speed (mm/m) between probes
727
 #define XY_PROBE_SPEED 8000
730
 #define XY_PROBE_SPEED 8000
728
 
731
 
960
   #define GRID_MAX_POINTS_X 3
963
   #define GRID_MAX_POINTS_X 3
961
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
964
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
962
 
965
 
963
-  // The Z probe minimum outer margin (to validate G29 parameters).
964
-  #define MIN_PROBE_EDGE 10
965
 
966
 
966
   // Set the boundaries for probing (where the probe can reach).
967
   // Set the boundaries for probing (where the probe can reach).
967
   #define LEFT_PROBE_BED_POSITION 15
968
   #define LEFT_PROBE_BED_POSITION 15
1009
 
1010
 
1010
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1011
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1011
 
1012
 
1012
-  #define MESH_INSET 1              // Mesh inset margin on print area
1013
+  #define MESH_INSET 1              // Set Mesh bounds as an inset region of the bed
1013
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1014
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1014
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1015
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1015
 
1016
 
1032
   //=================================== Mesh ==================================
1033
   //=================================== Mesh ==================================
1033
   //===========================================================================
1034
   //===========================================================================
1034
 
1035
 
1035
-  #define MESH_INSET 10          // Mesh inset margin on print area
1036
+  #define MESH_INSET 10          // Set Mesh bounds as an inset region of the bed
1036
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1037
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1037
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1038
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1038
 
1039
 

+ 5
- 4
Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h View File

723
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 10  // Y offset: -front +behind [the nozzle]
723
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 10  // Y offset: -front +behind [the nozzle]
724
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
724
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
725
 
725
 
726
+// Certain types of probes need to stay away from edges
727
+#define MIN_PROBE_EDGE 10
728
+
726
 // X and Y axis travel speed (mm/m) between probes
729
 // X and Y axis travel speed (mm/m) between probes
727
 #define XY_PROBE_SPEED 8000
730
 #define XY_PROBE_SPEED 8000
728
 
731
 
960
   #define GRID_MAX_POINTS_X 3
963
   #define GRID_MAX_POINTS_X 3
961
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
964
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
962
 
965
 
963
-  // The Z probe minimum outer margin (to validate G29 parameters).
964
-  #define MIN_PROBE_EDGE 10
965
 
966
 
966
   // Set the boundaries for probing (where the probe can reach).
967
   // Set the boundaries for probing (where the probe can reach).
967
   #define LEFT_PROBE_BED_POSITION 15
968
   #define LEFT_PROBE_BED_POSITION 15
1009
 
1010
 
1010
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1011
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1011
 
1012
 
1012
-  #define MESH_INSET 1              // Mesh inset margin on print area
1013
+  #define MESH_INSET 1              // Set Mesh bounds as an inset region of the bed
1013
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1014
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1014
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1015
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1015
 
1016
 
1032
   //=================================== Mesh ==================================
1033
   //=================================== Mesh ==================================
1033
   //===========================================================================
1034
   //===========================================================================
1034
 
1035
 
1035
-  #define MESH_INSET 10          // Mesh inset margin on print area
1036
+  #define MESH_INSET 10          // Set Mesh bounds as an inset region of the bed
1036
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1037
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1037
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1038
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1038
 
1039
 

+ 5
- 4
Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h View File

733
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 10  // Y offset: -front +behind [the nozzle]
733
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 10  // Y offset: -front +behind [the nozzle]
734
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
734
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
735
 
735
 
736
+// Certain types of probes need to stay away from edges
737
+#define MIN_PROBE_EDGE 10
738
+
736
 // X and Y axis travel speed (mm/m) between probes
739
 // X and Y axis travel speed (mm/m) between probes
737
 #define XY_PROBE_SPEED 8000
740
 #define XY_PROBE_SPEED 8000
738
 
741
 
970
   #define GRID_MAX_POINTS_X 3
973
   #define GRID_MAX_POINTS_X 3
971
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
974
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
972
 
975
 
973
-  // The Z probe minimum outer margin (to validate G29 parameters).
974
-  #define MIN_PROBE_EDGE 10
975
 
976
 
976
   // Set the boundaries for probing (where the probe can reach).
977
   // Set the boundaries for probing (where the probe can reach).
977
   #define LEFT_PROBE_BED_POSITION 15
978
   #define LEFT_PROBE_BED_POSITION 15
1019
 
1020
 
1020
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1021
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1021
 
1022
 
1022
-  #define MESH_INSET 1              // Mesh inset margin on print area
1023
+  #define MESH_INSET 1              // Set Mesh bounds as an inset region of the bed
1023
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1024
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1024
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1025
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1025
 
1026
 
1042
   //=================================== Mesh ==================================
1043
   //=================================== Mesh ==================================
1043
   //===========================================================================
1044
   //===========================================================================
1044
 
1045
 
1045
-  #define MESH_INSET 10          // Mesh inset margin on print area
1046
+  #define MESH_INSET 10          // Set Mesh bounds as an inset region of the bed
1046
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1047
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1047
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1048
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1048
 
1049
 

+ 5
- 4
Marlin/src/config/examples/adafruit/ST7565/Configuration.h View File

723
 #define Y_PROBE_OFFSET_FROM_EXTRUDER -29     // Y offset: -front +behind [the nozzle]
723
 #define Y_PROBE_OFFSET_FROM_EXTRUDER -29     // Y offset: -front +behind [the nozzle]
724
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35  // Z offset: -below +above  [the nozzle]
724
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35  // Z offset: -below +above  [the nozzle]
725
 
725
 
726
+// Certain types of probes need to stay away from edges
727
+#define MIN_PROBE_EDGE 10
728
+
726
 // X and Y axis travel speed (mm/m) between probes
729
 // X and Y axis travel speed (mm/m) between probes
727
 #define XY_PROBE_SPEED 8000
730
 #define XY_PROBE_SPEED 8000
728
 
731
 
960
   #define GRID_MAX_POINTS_X 3
963
   #define GRID_MAX_POINTS_X 3
961
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
964
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
962
 
965
 
963
-  // The Z probe minimum outer margin (to validate G29 parameters).
964
-  #define MIN_PROBE_EDGE 10
965
 
966
 
966
   // Set the boundaries for probing (where the probe can reach).
967
   // Set the boundaries for probing (where the probe can reach).
967
   #define LEFT_PROBE_BED_POSITION 15
968
   #define LEFT_PROBE_BED_POSITION 15
1009
 
1010
 
1010
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1011
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1011
 
1012
 
1012
-  #define MESH_INSET 1              // Mesh inset margin on print area
1013
+  #define MESH_INSET 1              // Set Mesh bounds as an inset region of the bed
1013
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1014
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1014
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1015
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1015
 
1016
 
1032
   //=================================== Mesh ==================================
1033
   //=================================== Mesh ==================================
1033
   //===========================================================================
1034
   //===========================================================================
1034
 
1035
 
1035
-  #define MESH_INSET 10          // Mesh inset margin on print area
1036
+  #define MESH_INSET 10          // Set Mesh bounds as an inset region of the bed
1036
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1037
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1037
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1038
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1038
 
1039
 

+ 5
- 5
Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h View File

803
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 0     // Y offset: -front +behind [the nozzle]
803
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 0     // Y offset: -front +behind [the nozzle]
804
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0.10  // Z offset: -below +above  [the nozzle]
804
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0.10  // Z offset: -below +above  [the nozzle]
805
 
805
 
806
+// Certain types of probes need to stay away from edges
807
+#define MIN_PROBE_EDGE 20
808
+
806
 // X and Y axis travel speed (mm/m) between probes
809
 // X and Y axis travel speed (mm/m) between probes
807
 #define XY_PROBE_SPEED 5000
810
 #define XY_PROBE_SPEED 5000
808
 
811
 
1091
   #define GRID_MAX_POINTS_X 7
1094
   #define GRID_MAX_POINTS_X 7
1092
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1095
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1093
 
1096
 
1094
-  // The Z probe minimum outer margin (to validate G29 parameters).
1095
-  #define MIN_PROBE_EDGE 20
1096
-
1097
   // Set the boundaries for probing (where the probe can reach).
1097
   // Set the boundaries for probing (where the probe can reach).
1098
   #define DELTA_PROBEABLE_RADIUS (DELTA_PRINTABLE_RADIUS - 15)
1098
   #define DELTA_PROBEABLE_RADIUS (DELTA_PRINTABLE_RADIUS - 15)
1099
   #define LEFT_PROBE_BED_POSITION -(DELTA_PROBEABLE_RADIUS)
1099
   #define LEFT_PROBE_BED_POSITION -(DELTA_PROBEABLE_RADIUS)
1141
 
1141
 
1142
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1142
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1143
 
1143
 
1144
-  #define MESH_INSET 1              // Mesh inset margin on print area
1144
+  #define MESH_INSET 1              // Set Mesh bounds as an inset region of the bed
1145
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1145
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1146
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1146
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1147
 
1147
 
1166
   //=================================== Mesh ==================================
1166
   //=================================== Mesh ==================================
1167
   //===========================================================================
1167
   //===========================================================================
1168
 
1168
 
1169
-  #define MESH_INSET 10          // Mesh inset margin on print area
1169
+  #define MESH_INSET 10          // Set Mesh bounds as an inset region of the bed
1170
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1170
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1171
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1171
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1172
 
1172
 

+ 5
- 5
Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h View File

803
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 0     // Y offset: -front +behind [the nozzle]
803
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 0     // Y offset: -front +behind [the nozzle]
804
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0.10  // Z offset: -below +above  [the nozzle]
804
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0.10  // Z offset: -below +above  [the nozzle]
805
 
805
 
806
+// Certain types of probes need to stay away from edges
807
+#define MIN_PROBE_EDGE 20
808
+
806
 // X and Y axis travel speed (mm/m) between probes
809
 // X and Y axis travel speed (mm/m) between probes
807
 #define XY_PROBE_SPEED 5000
810
 #define XY_PROBE_SPEED 5000
808
 
811
 
1091
   #define GRID_MAX_POINTS_X 7
1094
   #define GRID_MAX_POINTS_X 7
1092
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1095
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1093
 
1096
 
1094
-  // The Z probe minimum outer margin (to validate G29 parameters).
1095
-  #define MIN_PROBE_EDGE 20
1096
-
1097
   // Set the boundaries for probing (where the probe can reach).
1097
   // Set the boundaries for probing (where the probe can reach).
1098
   #define DELTA_PROBEABLE_RADIUS (DELTA_PRINTABLE_RADIUS - 15)
1098
   #define DELTA_PROBEABLE_RADIUS (DELTA_PRINTABLE_RADIUS - 15)
1099
   #define LEFT_PROBE_BED_POSITION -(DELTA_PROBEABLE_RADIUS)
1099
   #define LEFT_PROBE_BED_POSITION -(DELTA_PROBEABLE_RADIUS)
1141
 
1141
 
1142
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1142
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1143
 
1143
 
1144
-  #define MESH_INSET 1              // Mesh inset margin on print area
1144
+  #define MESH_INSET 1              // Set Mesh bounds as an inset region of the bed
1145
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1145
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1146
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1146
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1147
 
1147
 
1166
   //=================================== Mesh ==================================
1166
   //=================================== Mesh ==================================
1167
   //===========================================================================
1167
   //===========================================================================
1168
 
1168
 
1169
-  #define MESH_INSET 10          // Mesh inset margin on print area
1169
+  #define MESH_INSET 10          // Set Mesh bounds as an inset region of the bed
1170
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1170
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1171
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1171
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1172
 
1172
 

+ 5
- 4
Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h View File

803
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 0   // Y offset: -front +behind [the nozzle]
803
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 0   // Y offset: -front +behind [the nozzle]
804
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0.25  // Z offset: -below +above  [the nozzle]
804
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0.25  // Z offset: -below +above  [the nozzle]
805
 
805
 
806
+// Certain types of probes need to stay away from edges
807
+#define MIN_PROBE_EDGE 10
808
+
806
 // X and Y axis travel speed (mm/m) between probes
809
 // X and Y axis travel speed (mm/m) between probes
807
 #define XY_PROBE_SPEED 2000
810
 #define XY_PROBE_SPEED 2000
808
 
811
 
1090
   #define GRID_MAX_POINTS_X 9
1093
   #define GRID_MAX_POINTS_X 9
1091
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1094
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1092
 
1095
 
1093
-  // The Z probe minimum outer margin (to validate G29 parameters).
1094
-  #define MIN_PROBE_EDGE 10
1095
 
1096
 
1096
   // Set the boundaries for probing (where the probe can reach).
1097
   // Set the boundaries for probing (where the probe can reach).
1097
   #define DELTA_PROBEABLE_RADIUS (DELTA_PRINTABLE_RADIUS - 15)
1098
   #define DELTA_PROBEABLE_RADIUS (DELTA_PRINTABLE_RADIUS - 15)
1140
 
1141
 
1141
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1142
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1142
 
1143
 
1143
-  #define MESH_INSET 1              // Mesh inset margin on print area
1144
+  #define MESH_INSET 1              // Set Mesh bounds as an inset region of the bed
1144
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1145
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1145
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1146
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1146
 
1147
 
1165
   //=================================== Mesh ==================================
1166
   //=================================== Mesh ==================================
1166
   //===========================================================================
1167
   //===========================================================================
1167
 
1168
 
1168
-  #define MESH_INSET 10          // Mesh inset margin on print area
1169
+  #define MESH_INSET 10          // Set Mesh bounds as an inset region of the bed
1169
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1170
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1170
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1171
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1171
 
1172
 

+ 5
- 4
Marlin/src/config/examples/delta/Hatchbox_Alpha/Configuration.h View File

808
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 0   // Y offset: -front +behind [the nozzle]
808
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 0   // Y offset: -front +behind [the nozzle]
809
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0  // Z offset: -below +above  [the nozzle]
809
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0  // Z offset: -below +above  [the nozzle]
810
 
810
 
811
+// Certain types of probes need to stay away from edges
812
+#define MIN_PROBE_EDGE 10
813
+
811
 // X and Y axis travel speed (mm/m) between probes
814
 // X and Y axis travel speed (mm/m) between probes
812
 #define XY_PROBE_SPEED 4000
815
 #define XY_PROBE_SPEED 4000
813
 
816
 
1096
   #define GRID_MAX_POINTS_X 9
1099
   #define GRID_MAX_POINTS_X 9
1097
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1100
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1098
 
1101
 
1099
-  // The Z probe minimum outer margin (to validate G29 parameters).
1100
-  #define MIN_PROBE_EDGE 10
1101
 
1102
 
1102
   #define LEFT_PROBE_BED_POSITION -(DELTA_PROBEABLE_RADIUS)
1103
   #define LEFT_PROBE_BED_POSITION -(DELTA_PROBEABLE_RADIUS)
1103
   #define RIGHT_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
1104
   #define RIGHT_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
1144
 
1145
 
1145
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1146
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1146
 
1147
 
1147
-  #define MESH_INSET 1              // Mesh inset margin on print area
1148
+  #define MESH_INSET 1              // Set Mesh bounds as an inset region of the bed
1148
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1149
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1149
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1150
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1150
 
1151
 
1169
   //=================================== Mesh ==================================
1170
   //=================================== Mesh ==================================
1170
   //===========================================================================
1171
   //===========================================================================
1171
 
1172
 
1172
-  #define MESH_INSET 10          // Mesh inset margin on print area
1173
+  #define MESH_INSET 10          // Set Mesh bounds as an inset region of the bed
1173
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1174
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1174
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1175
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1175
 
1176
 

+ 5
- 4
Marlin/src/config/examples/delta/generic/Configuration.h View File

793
 #define Y_PROBE_OFFSET_FROM_EXTRUDER -10   // Y offset: -front +behind [the nozzle]
793
 #define Y_PROBE_OFFSET_FROM_EXTRUDER -10   // Y offset: -front +behind [the nozzle]
794
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -3.5  // Z offset: -below +above  [the nozzle]
794
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -3.5  // Z offset: -below +above  [the nozzle]
795
 
795
 
796
+// Certain types of probes need to stay away from edges
797
+#define MIN_PROBE_EDGE 10
798
+
796
 // X and Y axis travel speed (mm/m) between probes
799
 // X and Y axis travel speed (mm/m) between probes
797
 #define XY_PROBE_SPEED 4000
800
 #define XY_PROBE_SPEED 4000
798
 
801
 
1081
   #define GRID_MAX_POINTS_X 9
1084
   #define GRID_MAX_POINTS_X 9
1082
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1085
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1083
 
1086
 
1084
-  // The Z probe minimum outer margin (to validate G29 parameters).
1085
-  #define MIN_PROBE_EDGE 10
1086
 
1087
 
1087
   #define LEFT_PROBE_BED_POSITION -(DELTA_PROBEABLE_RADIUS)
1088
   #define LEFT_PROBE_BED_POSITION -(DELTA_PROBEABLE_RADIUS)
1088
   #define RIGHT_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
1089
   #define RIGHT_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
1129
 
1130
 
1130
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1131
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1131
 
1132
 
1132
-  #define MESH_INSET 1              // Mesh inset margin on print area
1133
+  #define MESH_INSET 1              // Set Mesh bounds as an inset region of the bed
1133
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1134
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1134
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1135
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1135
 
1136
 
1154
   //=================================== Mesh ==================================
1155
   //=================================== Mesh ==================================
1155
   //===========================================================================
1156
   //===========================================================================
1156
 
1157
 
1157
-  #define MESH_INSET 10          // Mesh inset margin on print area
1158
+  #define MESH_INSET 10          // Set Mesh bounds as an inset region of the bed
1158
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1159
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1159
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1160
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1160
 
1161
 

+ 5
- 4
Marlin/src/config/examples/delta/kossel_mini/Configuration.h View File

793
 #define Y_PROBE_OFFSET_FROM_EXTRUDER -10   // Y offset: -front +behind [the nozzle]
793
 #define Y_PROBE_OFFSET_FROM_EXTRUDER -10   // Y offset: -front +behind [the nozzle]
794
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -3.5  // Z offset: -below +above  [the nozzle]
794
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -3.5  // Z offset: -below +above  [the nozzle]
795
 
795
 
796
+// Certain types of probes need to stay away from edges
797
+#define MIN_PROBE_EDGE 10
798
+
796
 // X and Y axis travel speed (mm/m) between probes
799
 // X and Y axis travel speed (mm/m) between probes
797
 #define XY_PROBE_SPEED 4000
800
 #define XY_PROBE_SPEED 4000
798
 
801
 
1084
   #define GRID_MAX_POINTS_X 9
1087
   #define GRID_MAX_POINTS_X 9
1085
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1088
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1086
 
1089
 
1087
-  // The Z probe minimum outer margin (to validate G29 parameters).
1088
-  #define MIN_PROBE_EDGE 10
1089
 
1090
 
1090
   #define LEFT_PROBE_BED_POSITION -(DELTA_PROBEABLE_RADIUS)
1091
   #define LEFT_PROBE_BED_POSITION -(DELTA_PROBEABLE_RADIUS)
1091
   #define RIGHT_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
1092
   #define RIGHT_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
1132
 
1133
 
1133
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1134
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1134
 
1135
 
1135
-  #define MESH_INSET 1              // Mesh inset margin on print area
1136
+  #define MESH_INSET 1              // Set Mesh bounds as an inset region of the bed
1136
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1137
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1137
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1138
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1138
 
1139
 
1157
   //=================================== Mesh ==================================
1158
   //=================================== Mesh ==================================
1158
   //===========================================================================
1159
   //===========================================================================
1159
 
1160
 
1160
-  #define MESH_INSET 10          // Mesh inset margin on print area
1161
+  #define MESH_INSET 10          // Set Mesh bounds as an inset region of the bed
1161
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1162
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1162
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1163
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1163
 
1164
 

+ 5
- 4
Marlin/src/config/examples/delta/kossel_pro/Configuration.h View File

789
  * not giving someone a head crash. Use something like G29 Z-0.2 to adjust as needed.
789
  * not giving someone a head crash. Use something like G29 Z-0.2 to adjust as needed.
790
  */
790
  */
791
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -17.25  // Increase this if the first layer is too thin (remember: it's a negative number so increase means closer to zero).
791
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -17.25  // Increase this if the first layer is too thin (remember: it's a negative number so increase means closer to zero).
792
+// Certain types of probes need to stay away from edges
793
+#define MIN_PROBE_EDGE 10
794
+
792
 // X and Y axis travel speed (mm/m) between probes
795
 // X and Y axis travel speed (mm/m) between probes
793
 #define XY_PROBE_SPEED 8000
796
 #define XY_PROBE_SPEED 8000
794
 
797
 
1084
   #define GRID_MAX_POINTS_X 7
1087
   #define GRID_MAX_POINTS_X 7
1085
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1088
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1086
 
1089
 
1087
-  // The Z probe minimum outer margin (to validate G29 parameters).
1088
-  #define MIN_PROBE_EDGE 10
1089
 
1090
 
1090
   #define LEFT_PROBE_BED_POSITION -(DELTA_PROBEABLE_RADIUS)
1091
   #define LEFT_PROBE_BED_POSITION -(DELTA_PROBEABLE_RADIUS)
1091
   #define RIGHT_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
1092
   #define RIGHT_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
1132
 
1133
 
1133
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1134
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1134
 
1135
 
1135
-  #define MESH_INSET 1              // Mesh inset margin on print area
1136
+  #define MESH_INSET 1              // Set Mesh bounds as an inset region of the bed
1136
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1137
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1137
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1138
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1138
 
1139
 
1157
   //=================================== Mesh ==================================
1158
   //=================================== Mesh ==================================
1158
   //===========================================================================
1159
   //===========================================================================
1159
 
1160
 
1160
-  #define MESH_INSET 10          // Mesh inset margin on print area
1161
+  #define MESH_INSET 10          // Set Mesh bounds as an inset region of the bed
1161
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1162
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1162
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1163
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1163
 
1164
 

+ 5
- 4
Marlin/src/config/examples/delta/kossel_xl/Configuration.h View File

805
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 0.0     // Z probe to nozzle Y offset: -front +behind
805
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 0.0     // Z probe to nozzle Y offset: -front +behind
806
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0.3     // Z probe to nozzle Z offset: -below (always!)
806
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0.3     // Z probe to nozzle Z offset: -below (always!)
807
 
807
 
808
+// Certain types of probes need to stay away from edges
809
+#define MIN_PROBE_EDGE 10
810
+
808
 // X and Y axis travel speed (mm/m) between probes
811
 // X and Y axis travel speed (mm/m) between probes
809
 #define XY_PROBE_SPEED 8000
812
 #define XY_PROBE_SPEED 8000
810
 
813
 
1093
   #define GRID_MAX_POINTS_X 5
1096
   #define GRID_MAX_POINTS_X 5
1094
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1097
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1095
 
1098
 
1096
-  // The Z probe minimum outer margin (to validate G29 parameters).
1097
-  #define MIN_PROBE_EDGE 10
1098
 
1099
 
1099
   #define LEFT_PROBE_BED_POSITION -(DELTA_PROBEABLE_RADIUS)
1100
   #define LEFT_PROBE_BED_POSITION -(DELTA_PROBEABLE_RADIUS)
1100
   #define RIGHT_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
1101
   #define RIGHT_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
1141
 
1142
 
1142
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1143
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1143
 
1144
 
1144
-  #define MESH_INSET 1              // Mesh inset margin on print area
1145
+  #define MESH_INSET 1              // Set Mesh bounds as an inset region of the bed
1145
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1146
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1146
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1147
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1147
 
1148
 
1166
   //=================================== Mesh ==================================
1167
   //=================================== Mesh ==================================
1167
   //===========================================================================
1168
   //===========================================================================
1168
 
1169
 
1169
-  #define MESH_INSET 10          // Mesh inset margin on print area
1170
+  #define MESH_INSET 10          // Set Mesh bounds as an inset region of the bed
1170
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1171
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1171
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1172
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1172
 
1173
 

+ 5
- 4
Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h View File

736
 #define Y_PROBE_OFFSET_FROM_EXTRUDER -10    // Y offset: -front +behind [the nozzle]
736
 #define Y_PROBE_OFFSET_FROM_EXTRUDER -10    // Y offset: -front +behind [the nozzle]
737
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -0.25  // Z offset: -below +above  [the nozzle]
737
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -0.25  // Z offset: -below +above  [the nozzle]
738
 
738
 
739
+// Certain types of probes need to stay away from edges
740
+#define MIN_PROBE_EDGE 45
741
+
739
 // X and Y axis travel speed (mm/m) between probes
742
 // X and Y axis travel speed (mm/m) between probes
740
 #define XY_PROBE_SPEED 7500
743
 #define XY_PROBE_SPEED 7500
741
 
744
 
974
   #define GRID_MAX_POINTS_X 3
977
   #define GRID_MAX_POINTS_X 3
975
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
978
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
976
 
979
 
977
-  // The Z probe minimum outer margin (to validate G29 parameters).
978
-  #define MIN_PROBE_EDGE 10
979
 
980
 
980
   // Set the boundaries for probing (where the probe can reach).
981
   // Set the boundaries for probing (where the probe can reach).
981
   #define LEFT_PROBE_BED_POSITION 15
982
   #define LEFT_PROBE_BED_POSITION 15
1023
 
1024
 
1024
   #define MESH_EDIT_GFX_OVERLAY     // Display a graphics overlay while editing the mesh
1025
   #define MESH_EDIT_GFX_OVERLAY     // Display a graphics overlay while editing the mesh
1025
 
1026
 
1026
-  #define MESH_INSET 45             // Mesh inset margin on print area
1027
+  #define MESH_INSET 45             // Set Mesh bounds as an inset region of the bed
1027
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1028
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1028
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1029
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1029
 
1030
 
1046
   //=================================== Mesh ==================================
1047
   //=================================== Mesh ==================================
1047
   //===========================================================================
1048
   //===========================================================================
1048
 
1049
 
1049
-  #define MESH_INSET 10          // Mesh inset margin on print area
1050
+  #define MESH_INSET 10          // Set Mesh bounds as an inset region of the bed
1050
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1051
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1051
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1052
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1052
 
1053
 

+ 5
- 4
Marlin/src/config/examples/makibox/Configuration.h View File

726
 #define Y_PROBE_OFFSET_FROM_EXTRUDER -29     // Y offset: -front +behind [the nozzle]
726
 #define Y_PROBE_OFFSET_FROM_EXTRUDER -29     // Y offset: -front +behind [the nozzle]
727
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35  // Z offset: -below +above  [the nozzle]
727
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35  // Z offset: -below +above  [the nozzle]
728
 
728
 
729
+// Certain types of probes need to stay away from edges
730
+#define MIN_PROBE_EDGE 10
731
+
729
 // X and Y axis travel speed (mm/m) between probes
732
 // X and Y axis travel speed (mm/m) between probes
730
 #define XY_PROBE_SPEED 8000
733
 #define XY_PROBE_SPEED 8000
731
 
734
 
963
   #define GRID_MAX_POINTS_X 3
966
   #define GRID_MAX_POINTS_X 3
964
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
967
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
965
 
968
 
966
-  // The Z probe minimum outer margin (to validate G29 parameters).
967
-  #define MIN_PROBE_EDGE 10
968
 
969
 
969
   // Set the boundaries for probing (where the probe can reach).
970
   // Set the boundaries for probing (where the probe can reach).
970
   #define LEFT_PROBE_BED_POSITION 15
971
   #define LEFT_PROBE_BED_POSITION 15
1012
 
1013
 
1013
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1014
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1014
 
1015
 
1015
-  #define MESH_INSET 1              // Mesh inset margin on print area
1016
+  #define MESH_INSET 1              // Set Mesh bounds as an inset region of the bed
1016
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1017
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1017
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1018
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1018
 
1019
 
1035
   //=================================== Mesh ==================================
1036
   //=================================== Mesh ==================================
1036
   //===========================================================================
1037
   //===========================================================================
1037
 
1038
 
1038
-  #define MESH_INSET 10          // Mesh inset margin on print area
1039
+  #define MESH_INSET 10          // Set Mesh bounds as an inset region of the bed
1039
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1040
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1040
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1041
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1041
 
1042
 

+ 5
- 4
Marlin/src/config/examples/stm32f103ret6/Configuration.h View File

724
 #define Y_PROBE_OFFSET_FROM_EXTRUDER -29  // Y offset: -front +behind [the nozzle]
724
 #define Y_PROBE_OFFSET_FROM_EXTRUDER -29  // Y offset: -front +behind [the nozzle]
725
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35   // Z offset: -below +above  [the nozzle]
725
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35   // Z offset: -below +above  [the nozzle]
726
 
726
 
727
+// Certain types of probes need to stay away from edges
728
+#define MIN_PROBE_EDGE 10
729
+
727
 // X and Y axis travel speed (mm/m) between probes
730
 // X and Y axis travel speed (mm/m) between probes
728
 #define XY_PROBE_SPEED 8000
731
 #define XY_PROBE_SPEED 8000
729
 
732
 
961
   #define GRID_MAX_POINTS_X 3
964
   #define GRID_MAX_POINTS_X 3
962
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
965
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
963
 
966
 
964
-  // The Z probe minimum outer margin (to validate G29 parameters).
965
-  #define MIN_PROBE_EDGE 10
966
 
967
 
967
   // Set the boundaries for probing (where the probe can reach).
968
   // Set the boundaries for probing (where the probe can reach).
968
   #define LEFT_PROBE_BED_POSITION 15
969
   #define LEFT_PROBE_BED_POSITION 15
1010
 
1011
 
1011
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1012
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1012
 
1013
 
1013
-  #define MESH_INSET 1              // Mesh inset margin on print area
1014
+  #define MESH_INSET 1              // Set Mesh bounds as an inset region of the bed
1014
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1015
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1015
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1016
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1016
 
1017
 
1033
   //=================================== Mesh ==================================
1034
   //=================================== Mesh ==================================
1034
   //===========================================================================
1035
   //===========================================================================
1035
 
1036
 
1036
-  #define MESH_INSET 10          // Mesh inset margin on print area
1037
+  #define MESH_INSET 10          // Set Mesh bounds as an inset region of the bed
1037
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1038
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1038
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1039
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1039
 
1040
 

+ 5
- 4
Marlin/src/config/examples/tvrrug/Round2/Configuration.h View File

718
 #define Y_PROBE_OFFSET_FROM_EXTRUDER -29     // Y offset: -front +behind [the nozzle]
718
 #define Y_PROBE_OFFSET_FROM_EXTRUDER -29     // Y offset: -front +behind [the nozzle]
719
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35  // Z offset: -below +above  [the nozzle]
719
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35  // Z offset: -below +above  [the nozzle]
720
 
720
 
721
+// Certain types of probes need to stay away from edges
722
+#define MIN_PROBE_EDGE 10
723
+
721
 // X and Y axis travel speed (mm/m) between probes
724
 // X and Y axis travel speed (mm/m) between probes
722
 #define XY_PROBE_SPEED 8000
725
 #define XY_PROBE_SPEED 8000
723
 
726
 
955
   #define GRID_MAX_POINTS_X 3
958
   #define GRID_MAX_POINTS_X 3
956
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
959
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
957
 
960
 
958
-  // The Z probe minimum outer margin (to validate G29 parameters).
959
-  #define MIN_PROBE_EDGE 10
960
 
961
 
961
   // Set the boundaries for probing (where the probe can reach).
962
   // Set the boundaries for probing (where the probe can reach).
962
   #define LEFT_PROBE_BED_POSITION 15
963
   #define LEFT_PROBE_BED_POSITION 15
1004
 
1005
 
1005
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1006
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1006
 
1007
 
1007
-  #define MESH_INSET 1              // Mesh inset margin on print area
1008
+  #define MESH_INSET 1              // Set Mesh bounds as an inset region of the bed
1008
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1009
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1009
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1010
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1010
 
1011
 
1027
   //=================================== Mesh ==================================
1028
   //=================================== Mesh ==================================
1028
   //===========================================================================
1029
   //===========================================================================
1029
 
1030
 
1030
-  #define MESH_INSET 10          // Mesh inset margin on print area
1031
+  #define MESH_INSET 10          // Set Mesh bounds as an inset region of the bed
1031
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1032
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1032
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1033
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1033
 
1034
 

+ 5
- 4
Marlin/src/config/examples/wt150/Configuration.h View File

728
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 10  // Y offset: -front +behind [the nozzle]
728
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 10  // Y offset: -front +behind [the nozzle]
729
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
729
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
730
 
730
 
731
+// Certain types of probes need to stay away from edges
732
+#define MIN_PROBE_EDGE 10
733
+
731
 // X and Y axis travel speed (mm/m) between probes
734
 // X and Y axis travel speed (mm/m) between probes
732
 #define XY_PROBE_SPEED 8000
735
 #define XY_PROBE_SPEED 8000
733
 
736
 
965
   #define GRID_MAX_POINTS_X 3
968
   #define GRID_MAX_POINTS_X 3
966
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
969
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
967
 
970
 
968
-  // The Z probe minimum outer margin (to validate G29 parameters).
969
-  #define MIN_PROBE_EDGE 10
970
 
971
 
971
   // Set the boundaries for probing (where the probe can reach).
972
   // Set the boundaries for probing (where the probe can reach).
972
   #define LEFT_PROBE_BED_POSITION 15
973
   #define LEFT_PROBE_BED_POSITION 15
1014
 
1015
 
1015
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1016
   //#define MESH_EDIT_GFX_OVERLAY   // Display a graphics overlay while editing the mesh
1016
 
1017
 
1017
-  #define MESH_INSET 1              // Mesh inset margin on print area
1018
+  #define MESH_INSET 1              // Set Mesh bounds as an inset region of the bed
1018
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1019
   #define GRID_MAX_POINTS_X 10      // Don't use more than 15 points per axis, implementation limited.
1019
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1020
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1020
 
1021
 
1037
   //=================================== Mesh ==================================
1038
   //=================================== Mesh ==================================
1038
   //===========================================================================
1039
   //===========================================================================
1039
 
1040
 
1040
-  #define MESH_INSET 10          // Mesh inset margin on print area
1041
+  #define MESH_INSET 10          // Set Mesh bounds as an inset region of the bed
1041
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1042
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
1042
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1043
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
1043
 
1044
 

+ 0
- 8
Marlin/src/feature/bedlevel/bedlevel.cpp View File

284
 
284
 
285
 #endif
285
 #endif
286
 
286
 
287
-#if HAS_PROBING_PROCEDURE
288
-  void out_of_range_error(const char* p_edge) {
289
-    SERIAL_PROTOCOLPGM("?Probe ");
290
-    serialprintPGM(p_edge);
291
-    SERIAL_PROTOCOLLNPGM(" position out of range.");
292
-  }
293
-#endif
294
-
295
 #endif // HAS_LEVELING
287
 #endif // HAS_LEVELING

+ 0
- 4
Marlin/src/feature/bedlevel/bedlevel.h View File

67
   void _manual_goto_xy(const float &x, const float &y);
67
   void _manual_goto_xy(const float &x, const float &y);
68
 #endif
68
 #endif
69
 
69
 
70
-#if HAS_PROBING_PROCEDURE
71
-  void out_of_range_error(const char* p_edge);
72
-#endif
73
-
74
 #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
70
 #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
75
   #define _GET_MESH_X(I) (bilinear_start[X_AXIS] + (I) * bilinear_grid_spacing[X_AXIS])
71
   #define _GET_MESH_X(I) (bilinear_start[X_AXIS] + (I) * bilinear_grid_spacing[X_AXIS])
76
   #define _GET_MESH_Y(J) (bilinear_start[Y_AXIS] + (J) * bilinear_grid_spacing[Y_AXIS])
72
   #define _GET_MESH_Y(J) (bilinear_start[Y_AXIS] + (J) * bilinear_grid_spacing[Y_AXIS])

+ 3
- 26
Marlin/src/gcode/bedlevel/abl/G29.cpp View File

360
       front_probe_bed_position = parser.seenval('F') ? (int)RAW_Y_POSITION(parser.value_linear_units()) : FRONT_PROBE_BED_POSITION;
360
       front_probe_bed_position = parser.seenval('F') ? (int)RAW_Y_POSITION(parser.value_linear_units()) : FRONT_PROBE_BED_POSITION;
361
       back_probe_bed_position  = parser.seenval('B') ? (int)RAW_Y_POSITION(parser.value_linear_units()) : BACK_PROBE_BED_POSITION;
361
       back_probe_bed_position  = parser.seenval('B') ? (int)RAW_Y_POSITION(parser.value_linear_units()) : BACK_PROBE_BED_POSITION;
362
 
362
 
363
-      const bool left_out_l = left_probe_bed_position < MIN_PROBE_X,
364
-                 left_out = left_out_l || left_probe_bed_position > right_probe_bed_position - (MIN_PROBE_EDGE),
365
-                 right_out_r = right_probe_bed_position > MAX_PROBE_X,
366
-                 right_out = right_out_r || right_probe_bed_position < left_probe_bed_position + MIN_PROBE_EDGE,
367
-                 front_out_f = front_probe_bed_position < MIN_PROBE_Y,
368
-                 front_out = front_out_f || front_probe_bed_position > back_probe_bed_position - (MIN_PROBE_EDGE),
369
-                 back_out_b = back_probe_bed_position > MAX_PROBE_Y,
370
-                 back_out = back_out_b || back_probe_bed_position < front_probe_bed_position + MIN_PROBE_EDGE;
371
-
372
-      if (left_out || right_out || front_out || back_out) {
373
-        if (left_out) {
374
-          out_of_range_error(PSTR("(L)eft"));
375
-          left_probe_bed_position = left_out_l ? MIN_PROBE_X : right_probe_bed_position - (MIN_PROBE_EDGE);
376
-        }
377
-        if (right_out) {
378
-          out_of_range_error(PSTR("(R)ight"));
379
-          right_probe_bed_position = right_out_r ? MAX_PROBE_X : left_probe_bed_position + MIN_PROBE_EDGE;
380
-        }
381
-        if (front_out) {
382
-          out_of_range_error(PSTR("(F)ront"));
383
-          front_probe_bed_position = front_out_f ? MIN_PROBE_Y : back_probe_bed_position - (MIN_PROBE_EDGE);
384
-        }
385
-        if (back_out) {
386
-          out_of_range_error(PSTR("(B)ack"));
387
-          back_probe_bed_position = back_out_b ? MAX_PROBE_Y : front_probe_bed_position + MIN_PROBE_EDGE;
388
-        }
363
+      if ( !position_is_reachable_by_probe(left_probe_bed_position, front_probe_bed_position)
364
+        || !position_is_reachable_by_probe(right_probe_bed_position, back_probe_bed_position)) {
365
+        SERIAL_PROTOCOLLNPGM("? (L,R,F,B) out of bounds.");
389
         return;
366
         return;
390
       }
367
       }
391
 
368
 

+ 6
- 17
Marlin/src/gcode/calibrate/M48.cpp View File

78
   const float X_probe_location = parser.linearval('X', X_current + X_PROBE_OFFSET_FROM_EXTRUDER),
78
   const float X_probe_location = parser.linearval('X', X_current + X_PROBE_OFFSET_FROM_EXTRUDER),
79
               Y_probe_location = parser.linearval('Y', Y_current + Y_PROBE_OFFSET_FROM_EXTRUDER);
79
               Y_probe_location = parser.linearval('Y', Y_current + Y_PROBE_OFFSET_FROM_EXTRUDER);
80
 
80
 
81
-  #if DISABLED(DELTA)
82
-    if (!WITHIN(X_probe_location, MIN_PROBE_X, MAX_PROBE_X)) {
83
-      out_of_range_error(PSTR("X"));
84
-      return;
85
-    }
86
-    if (!WITHIN(Y_probe_location, MIN_PROBE_Y, MAX_PROBE_Y)) {
87
-      out_of_range_error(PSTR("Y"));
88
-      return;
89
-    }
90
-  #else
91
-    if (!position_is_reachable_by_probe(X_probe_location, Y_probe_location)) {
92
-      SERIAL_PROTOCOLLNPGM("? (X,Y) location outside of probeable radius.");
93
-      return;
94
-    }
95
-  #endif
81
+  if (!position_is_reachable_by_probe(X_probe_location, Y_probe_location)) {
82
+    SERIAL_PROTOCOLLNPGM("? (X,Y) out of bounds.");
83
+    return;
84
+  }
96
 
85
 
97
   bool seen_L = parser.seen('L');
86
   bool seen_L = parser.seen('L');
98
   uint8_t n_legs = seen_L ? parser.value_byte() : 0;
87
   uint8_t n_legs = seen_L ? parser.value_byte() : 0;
137
         float angle = random(0, 360);
126
         float angle = random(0, 360);
138
         const float radius = random(
127
         const float radius = random(
139
           #if ENABLED(DELTA)
128
           #if ENABLED(DELTA)
140
-            (int) (0.1250000000 * (DELTA_PROBEABLE_RADIUS)),
141
-            (int) (0.3333333333 * (DELTA_PROBEABLE_RADIUS))
129
+            (int) (0.1250000000 * (DELTA_PRINTABLE_RADIUS)),
130
+            (int) (0.3333333333 * (DELTA_PRINTABLE_RADIUS))
142
           #else
131
           #else
143
             (int) 5.0, (int) (0.125 * min(X_BED_SIZE, Y_BED_SIZE))
132
             (int) 5.0, (int) (0.125 * min(X_BED_SIZE, Y_BED_SIZE))
144
           #endif
133
           #endif

+ 38
- 36
Marlin/src/inc/Conditionals_post.h View File

1007
  * Delta radius/rod trimmers/angle trimmers
1007
  * Delta radius/rod trimmers/angle trimmers
1008
  */
1008
  */
1009
 #if ENABLED(DELTA)
1009
 #if ENABLED(DELTA)
1010
-  #ifndef DELTA_PROBEABLE_RADIUS
1011
-    #define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
1012
-  #endif
1013
   #ifndef DELTA_CALIBRATION_RADIUS
1010
   #ifndef DELTA_CALIBRATION_RADIUS
1014
     #define DELTA_CALIBRATION_RADIUS DELTA_PRINTABLE_RADIUS - 10
1011
     #define DELTA_CALIBRATION_RADIUS DELTA_PRINTABLE_RADIUS - 10
1015
   #endif
1012
   #endif
1053
  * Bed Probing rectangular bounds
1050
  * Bed Probing rectangular bounds
1054
  * These can be further constrained in code for Delta and SCARA
1051
  * These can be further constrained in code for Delta and SCARA
1055
  */
1052
  */
1053
+
1054
+#ifndef MIN_PROBE_EDGE
1055
+  #define MIN_PROBE_EDGE 0
1056
+#endif
1057
+
1056
 #if ENABLED(DELTA)
1058
 #if ENABLED(DELTA)
1057
   // Probing points may be verified at compile time within the radius
1059
   // Probing points may be verified at compile time within the radius
1058
   // using static_assert(HYPOT2(X2-X1,Y2-Y1)<=sq(DELTA_PRINTABLE_RADIUS),"bad probe point!")
1060
   // using static_assert(HYPOT2(X2-X1,Y2-Y1)<=sq(DELTA_PRINTABLE_RADIUS),"bad probe point!")
1059
   // so that may be added to SanityCheck.h in the future.
1061
   // so that may be added to SanityCheck.h in the future.
1060
-  #define _MIN_PROBE_X (X_CENTER - DELTA_PRINTABLE_RADIUS)
1061
-  #define _MIN_PROBE_Y (Y_CENTER - DELTA_PRINTABLE_RADIUS)
1062
-  #define _MAX_PROBE_X (X_CENTER + DELTA_PRINTABLE_RADIUS)
1063
-  #define _MAX_PROBE_Y (Y_CENTER + DELTA_PRINTABLE_RADIUS)
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))
1064
 #elif IS_SCARA
1066
 #elif IS_SCARA
1065
   #define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
1067
   #define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
1066
-  #define _MIN_PROBE_X (X_CENTER - (SCARA_PRINTABLE_RADIUS))
1067
-  #define _MIN_PROBE_Y (Y_CENTER - (SCARA_PRINTABLE_RADIUS))
1068
-  #define _MAX_PROBE_X (X_CENTER +  SCARA_PRINTABLE_RADIUS)
1069
-  #define _MAX_PROBE_Y (Y_CENTER +  SCARA_PRINTABLE_RADIUS)
1068
+  #define _MIN_PROBE_X (X_CENTER - (SCARA_PRINTABLE_RADIUS) + MIN_PROBE_EDGE)
1069
+  #define _MIN_PROBE_Y (Y_CENTER - (SCARA_PRINTABLE_RADIUS) + MIN_PROBE_EDGE)
1070
+  #define _MAX_PROBE_X (X_CENTER +  SCARA_PRINTABLE_RADIUS - (MIN_PROBE_EDGE))
1071
+  #define _MAX_PROBE_Y (Y_CENTER +  SCARA_PRINTABLE_RADIUS - (MIN_PROBE_EDGE))
1070
 #else
1072
 #else
1071
   // Boundaries for Cartesian probing based on bed limits
1073
   // Boundaries for Cartesian probing based on bed limits
1072
-  #define _MIN_PROBE_X (max(X_MIN_BED, X_MIN_POS + X_PROBE_OFFSET_FROM_EXTRUDER))
1073
-  #define _MIN_PROBE_Y (max(Y_MIN_BED, Y_MIN_POS + Y_PROBE_OFFSET_FROM_EXTRUDER))
1074
-  #define _MAX_PROBE_X (min(X_MAX_BED, X_MAX_POS + X_PROBE_OFFSET_FROM_EXTRUDER))
1075
-  #define _MAX_PROBE_Y (min(Y_MAX_BED, Y_MAX_POS + Y_PROBE_OFFSET_FROM_EXTRUDER))
1074
+  #define _MIN_PROBE_X (max(X_MIN_BED + MIN_PROBE_EDGE, X_MIN_POS + X_PROBE_OFFSET_FROM_EXTRUDER))
1075
+  #define _MIN_PROBE_Y (max(Y_MIN_BED + MIN_PROBE_EDGE, Y_MIN_POS + Y_PROBE_OFFSET_FROM_EXTRUDER))
1076
+  #define _MAX_PROBE_X (min(X_MAX_BED - (MIN_PROBE_EDGE), X_MAX_POS + X_PROBE_OFFSET_FROM_EXTRUDER))
1077
+  #define _MAX_PROBE_Y (min(Y_MAX_BED - (MIN_PROBE_EDGE), Y_MAX_POS + Y_PROBE_OFFSET_FROM_EXTRUDER))
1076
 #endif
1078
 #endif
1077
 
1079
 
1078
-// Allow configuration to override these for special purposes
1080
+// These may be overridden in Configuration.h if a smaller area is desired
1079
 #ifndef MIN_PROBE_X
1081
 #ifndef MIN_PROBE_X
1080
   #define MIN_PROBE_X _MIN_PROBE_X
1082
   #define MIN_PROBE_X _MIN_PROBE_X
1081
 #endif
1083
 #endif
1097
     // Probing points may be verified at compile time within the radius
1099
     // Probing points may be verified at compile time within the radius
1098
     // using static_assert(HYPOT2(X2-X1,Y2-Y1)<=sq(DELTA_PRINTABLE_RADIUS),"bad probe point!")
1100
     // using static_assert(HYPOT2(X2-X1,Y2-Y1)<=sq(DELTA_PRINTABLE_RADIUS),"bad probe point!")
1099
     // so that may be added to SanityCheck.h in the future.
1101
     // so that may be added to SanityCheck.h in the future.
1100
-    #define _MESH_MIN_X (MIN_PROBE_X + MESH_INSET)
1101
-    #define _MESH_MIN_Y (MIN_PROBE_Y + MESH_INSET)
1102
-    #define _MESH_MAX_X (MAX_PROBE_X - (MESH_INSET))
1103
-    #define _MESH_MAX_Y (MAX_PROBE_Y - (MESH_INSET))
1102
+    #define _MESH_MIN_X (X_MIN_BED + MESH_INSET)
1103
+    #define _MESH_MIN_Y (Y_MIN_BED + MESH_INSET)
1104
+    #define _MESH_MAX_X (X_MAX_BED - (MESH_INSET))
1105
+    #define _MESH_MAX_Y (Y_MAX_BED - (MESH_INSET))
1104
   #else
1106
   #else
1105
     // Boundaries for Cartesian probing based on set limits
1107
     // Boundaries for Cartesian probing based on set limits
1106
     #if ENABLED(AUTO_BED_LEVELING_UBL)
1108
     #if ENABLED(AUTO_BED_LEVELING_UBL)
1114
       #define _MESH_MAX_X (min(X_MAX_BED - (MESH_INSET), X_MAX_POS + X_PROBE_OFFSET_FROM_EXTRUDER))
1116
       #define _MESH_MAX_X (min(X_MAX_BED - (MESH_INSET), X_MAX_POS + X_PROBE_OFFSET_FROM_EXTRUDER))
1115
       #define _MESH_MAX_Y (min(Y_MAX_BED - (MESH_INSET), Y_MAX_POS + Y_PROBE_OFFSET_FROM_EXTRUDER))
1117
       #define _MESH_MAX_Y (min(Y_MAX_BED - (MESH_INSET), Y_MAX_POS + Y_PROBE_OFFSET_FROM_EXTRUDER))
1116
     #endif
1118
     #endif
1119
+
1117
   #endif
1120
   #endif
1118
-  /**
1119
-   * These may be overridden in Configuration if a smaller area is wanted
1120
-   */
1121
-  #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL)
1122
-    #ifndef MESH_MIN_X
1123
-      #define MESH_MIN_X _MESH_MIN_X
1124
-    #endif
1125
-    #ifndef MESH_MIN_Y
1126
-      #define MESH_MIN_Y _MESH_MIN_Y
1127
-    #endif
1128
-    #ifndef MESH_MAX_X
1129
-      #define MESH_MAX_X _MESH_MAX_X
1130
-    #endif
1131
-    #ifndef MESH_MAX_Y
1132
-      #define MESH_MAX_Y _MESH_MAX_Y
1133
-    #endif
1121
+
1122
+
1123
+  // These may be overridden in Configuration.h if a smaller area is desired
1124
+  #ifndef MESH_MIN_X
1125
+    #define MESH_MIN_X _MESH_MIN_X
1134
   #endif
1126
   #endif
1127
+  #ifndef MESH_MIN_Y
1128
+    #define MESH_MIN_Y _MESH_MIN_Y
1129
+  #endif
1130
+  #ifndef MESH_MAX_X
1131
+    #define MESH_MAX_X _MESH_MAX_X
1132
+  #endif
1133
+  #ifndef MESH_MAX_Y
1134
+    #define MESH_MAX_Y _MESH_MAX_Y
1135
+  #endif
1136
+
1135
 #endif // MESH_BED_LEVELING || AUTO_BED_LEVELING_UBL
1137
 #endif // MESH_BED_LEVELING || AUTO_BED_LEVELING_UBL
1136
 
1138
 
1137
 /**
1139
 /**

+ 23
- 34
Marlin/src/inc/SanityCheck.h View File

42
  * the bleeding-edge source code, but sometimes this is not enough. This check
42
  * the bleeding-edge source code, but sometimes this is not enough. This check
43
  * forces a minimum config file revision. Otherwise Marlin will not build.
43
  * forces a minimum config file revision. Otherwise Marlin will not build.
44
  */
44
  */
45
-#if ! defined(CONFIGURATION_H_VERSION) || CONFIGURATION_H_VERSION < REQUIRED_CONFIGURATION_H_VERSION
45
+#if !defined(CONFIGURATION_H_VERSION) || CONFIGURATION_H_VERSION < REQUIRED_CONFIGURATION_H_VERSION
46
   #error "You are using an old Configuration.h file, update it before building Marlin."
46
   #error "You are using an old Configuration.h file, update it before building Marlin."
47
 #endif
47
 #endif
48
 
48
 
49
-#if ! defined(CONFIGURATION_ADV_H_VERSION) || CONFIGURATION_ADV_H_VERSION < REQUIRED_CONFIGURATION_ADV_H_VERSION
49
+#if !defined(CONFIGURATION_ADV_H_VERSION) || CONFIGURATION_ADV_H_VERSION < REQUIRED_CONFIGURATION_ADV_H_VERSION
50
   #error "You are using an old Configuration_adv.h file, update it before building Marlin."
50
   #error "You are using an old Configuration_adv.h file, update it before building Marlin."
51
 #endif
51
 #endif
52
 
52
 
275
 /**
275
 /**
276
  * Serial
276
  * Serial
277
  */
277
  */
278
-#if !defined(__AVR__) || !defined(USBCON)
278
+#if !(defined(__AVR__) && defined(USBCON))
279
   #if ENABLED(SERIAL_XON_XOFF) && RX_BUFFER_SIZE < 1024
279
   #if ENABLED(SERIAL_XON_XOFF) && RX_BUFFER_SIZE < 1024
280
     #error "SERIAL_XON_XOFF requires RX_BUFFER_SIZE >= 1024 for reliable transfers without drops."
280
     #error "SERIAL_XON_XOFF requires RX_BUFFER_SIZE >= 1024 for reliable transfers without drops."
281
   #elif RX_BUFFER_SIZE && (RX_BUFFER_SIZE < 2 || !IS_POWER_OF_2(RX_BUFFER_SIZE))
281
   #elif RX_BUFFER_SIZE && (RX_BUFFER_SIZE < 2 || !IS_POWER_OF_2(RX_BUFFER_SIZE))
856
   #elif DISABLED(RESTORE_LEVELING_AFTER_G28)
856
   #elif DISABLED(RESTORE_LEVELING_AFTER_G28)
857
     #error "AUTO_BED_LEVELING_UBL (<=1.1.8) always has RESTORE_LEVELING_AFTER_G28 enabled. To keep this behavior, #define RESTORE_LEVELING_AFTER_G28. To keep it disabled comment out this line in SanityCheck.h."
857
     #error "AUTO_BED_LEVELING_UBL (<=1.1.8) always has RESTORE_LEVELING_AFTER_G28 enabled. To keep this behavior, #define RESTORE_LEVELING_AFTER_G28. To keep it disabled comment out this line in SanityCheck.h."
858
   #else
858
   #else
859
-    static_assert(WITHIN(UBL_PROBE_PT_1_X, MIN_PROBE_X, MAX_PROBE_X), "UBL_PROBE_PT_1_X can't be reached by the Z probe.");
860
-    static_assert(WITHIN(UBL_PROBE_PT_2_X, MIN_PROBE_X, MAX_PROBE_X), "UBL_PROBE_PT_2_X can't be reached by the Z probe.");
861
-    static_assert(WITHIN(UBL_PROBE_PT_3_X, MIN_PROBE_X, MAX_PROBE_X), "UBL_PROBE_PT_3_X can't be reached by the Z probe.");
862
-    static_assert(WITHIN(UBL_PROBE_PT_1_Y, MIN_PROBE_Y, MAX_PROBE_Y), "UBL_PROBE_PT_1_Y can't be reached by the Z probe.");
863
-    static_assert(WITHIN(UBL_PROBE_PT_2_Y, MIN_PROBE_Y, MAX_PROBE_Y), "UBL_PROBE_PT_2_Y can't be reached by the Z probe.");
864
-    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.");
859
+    static_assert(WITHIN(UBL_PROBE_PT_1_X, MIN_PROBE_X, MAX_PROBE_X), "UBL_PROBE_PT_1_X is outside the probe region.");
860
+    static_assert(WITHIN(UBL_PROBE_PT_2_X, MIN_PROBE_X, MAX_PROBE_X), "UBL_PROBE_PT_2_X is outside the probe region.");
861
+    static_assert(WITHIN(UBL_PROBE_PT_3_X, MIN_PROBE_X, MAX_PROBE_X), "UBL_PROBE_PT_3_X is outside the probe region.");
862
+    static_assert(WITHIN(UBL_PROBE_PT_1_Y, MIN_PROBE_Y, MAX_PROBE_Y), "UBL_PROBE_PT_1_Y is outside the probe region.");
863
+    static_assert(WITHIN(UBL_PROBE_PT_2_Y, MIN_PROBE_Y, MAX_PROBE_Y), "UBL_PROBE_PT_2_Y is outside the probe region.");
864
+    static_assert(WITHIN(UBL_PROBE_PT_3_Y, MIN_PROBE_Y, MAX_PROBE_Y), "UBL_PROBE_PT_3_Y is outside the probe region.");
865
   #endif
865
   #endif
866
 
866
 
867
 #elif OLDSCHOOL_ABL
867
 #elif OLDSCHOOL_ABL
870
    * Auto Bed Leveling
870
    * Auto Bed Leveling
871
    */
871
    */
872
 
872
 
873
-  #if ENABLED(USE_RAW_KINEMATICS)
874
-    #error "USE_RAW_KINEMATICS is not compatible with AUTO_BED_LEVELING"
875
-  #endif
876
-
877
   /**
873
   /**
878
    * Delta and SCARA have limited bed leveling options
874
    * Delta and SCARA have limited bed leveling options
879
    */
875
    */
886
    */
882
    */
887
   #if ABL_GRID
883
   #if ABL_GRID
888
 
884
 
889
-    #ifdef DELTA_PROBEABLE_RADIUS
890
-      static_assert(LEFT_PROBE_BED_POSITION >= -DELTA_PROBEABLE_RADIUS, "LEFT_PROBE_BED_POSITION must be within DELTA_PROBEABLE_RADIUS.");
891
-      static_assert(RIGHT_PROBE_BED_POSITION <= DELTA_PROBEABLE_RADIUS, "RIGHT_PROBE_BED_POSITION must be within DELTA_PROBEABLE_RADIUS.");
892
-      static_assert(FRONT_PROBE_BED_POSITION >= -DELTA_PROBEABLE_RADIUS, "FRONT_PROBE_BED_POSITION must be within DELTA_PROBEABLE_RADIUS.");
893
-      static_assert(BACK_PROBE_BED_POSITION <= DELTA_PROBEABLE_RADIUS, "BACK_PROBE_BED_POSITION must be within DELTA_PROBEABLE_RADIUS.");
894
-    #else
895
-      static_assert(LEFT_PROBE_BED_POSITION < RIGHT_PROBE_BED_POSITION, "LEFT_PROBE_BED_POSITION must be less than RIGHT_PROBE_BED_POSITION.");
896
-      static_assert(FRONT_PROBE_BED_POSITION < BACK_PROBE_BED_POSITION, "FRONT_PROBE_BED_POSITION must be less than BACK_PROBE_BED_POSITION.");
897
-      static_assert(LEFT_PROBE_BED_POSITION >= MIN_PROBE_X, "LEFT_PROBE_BED_POSITION can't be reached by the Z probe.");
898
-      static_assert(RIGHT_PROBE_BED_POSITION <= MAX_PROBE_X, "RIGHT_PROBE_BED_POSITION can't be reached by the Z probe.");
899
-      static_assert(FRONT_PROBE_BED_POSITION >= MIN_PROBE_Y, "FRONT_PROBE_BED_POSITION can't be reached by the Z probe.");
900
-      static_assert(BACK_PROBE_BED_POSITION <= MAX_PROBE_Y, "BACK_PROBE_BED_POSITION can't be reached by the Z probe.");
901
-    #endif
885
+    static_assert(LEFT_PROBE_BED_POSITION < RIGHT_PROBE_BED_POSITION, "LEFT_PROBE_BED_POSITION must be less than RIGHT_PROBE_BED_POSITION.");
886
+    static_assert(FRONT_PROBE_BED_POSITION < BACK_PROBE_BED_POSITION, "FRONT_PROBE_BED_POSITION must be less than BACK_PROBE_BED_POSITION.");
887
+    static_assert(LEFT_PROBE_BED_POSITION >= MIN_PROBE_X, "LEFT_PROBE_BED_POSITION is outside the probe region.");
888
+    static_assert(RIGHT_PROBE_BED_POSITION <= MAX_PROBE_X, "RIGHT_PROBE_BED_POSITION is outside the probe region.");
889
+    static_assert(FRONT_PROBE_BED_POSITION >= MIN_PROBE_Y, "FRONT_PROBE_BED_POSITION is outside the probe region.");
890
+    static_assert(BACK_PROBE_BED_POSITION <= MAX_PROBE_Y, "BACK_PROBE_BED_POSITION is outside the probe region.");
902
 
891
 
903
   #else // AUTO_BED_LEVELING_3POINT
892
   #else // AUTO_BED_LEVELING_3POINT
904
 
893
 
905
-    static_assert(WITHIN(ABL_PROBE_PT_1_X, MIN_PROBE_X, MAX_PROBE_X), "ABL_PROBE_PT_1_X can't be reached by the Z probe.");
906
-    static_assert(WITHIN(ABL_PROBE_PT_2_X, MIN_PROBE_X, MAX_PROBE_X), "ABL_PROBE_PT_2_X can't be reached by the Z probe.");
907
-    static_assert(WITHIN(ABL_PROBE_PT_3_X, MIN_PROBE_X, MAX_PROBE_X), "ABL_PROBE_PT_3_X can't be reached by the Z probe.");
908
-    static_assert(WITHIN(ABL_PROBE_PT_1_Y, MIN_PROBE_Y, MAX_PROBE_Y), "ABL_PROBE_PT_1_Y can't be reached by the Z probe.");
909
-    static_assert(WITHIN(ABL_PROBE_PT_2_Y, MIN_PROBE_Y, MAX_PROBE_Y), "ABL_PROBE_PT_2_Y can't be reached by the Z probe.");
910
-    static_assert(WITHIN(ABL_PROBE_PT_3_Y, MIN_PROBE_Y, MAX_PROBE_Y), "ABL_PROBE_PT_3_Y can't be reached by the Z probe.");
894
+    static_assert(WITHIN(ABL_PROBE_PT_1_X, MIN_PROBE_X, MAX_PROBE_X), "ABL_PROBE_PT_1_X is outside the probe region.");
895
+    static_assert(WITHIN(ABL_PROBE_PT_2_X, MIN_PROBE_X, MAX_PROBE_X), "ABL_PROBE_PT_2_X is outside the probe region.");
896
+    static_assert(WITHIN(ABL_PROBE_PT_3_X, MIN_PROBE_X, MAX_PROBE_X), "ABL_PROBE_PT_3_X is outside the probe region.");
897
+    static_assert(WITHIN(ABL_PROBE_PT_1_Y, MIN_PROBE_Y, MAX_PROBE_Y), "ABL_PROBE_PT_1_Y is outside the probe region.");
898
+    static_assert(WITHIN(ABL_PROBE_PT_2_Y, MIN_PROBE_Y, MAX_PROBE_Y), "ABL_PROBE_PT_2_Y is outside the probe region.");
899
+    static_assert(WITHIN(ABL_PROBE_PT_3_Y, MIN_PROBE_Y, MAX_PROBE_Y), "ABL_PROBE_PT_3_Y is outside the probe region.");
911
 
900
 
912
   #endif // AUTO_BED_LEVELING_3POINT
901
   #endif // AUTO_BED_LEVELING_3POINT
913
 
902
 
968
 #if ENABLED(Z_SAFE_HOMING)
957
 #if ENABLED(Z_SAFE_HOMING)
969
   #if HAS_BED_PROBE
958
   #if HAS_BED_PROBE
970
     #if !WITHIN(Z_SAFE_HOMING_X_POINT, MIN_PROBE_X, MAX_PROBE_X)
959
     #if !WITHIN(Z_SAFE_HOMING_X_POINT, MIN_PROBE_X, MAX_PROBE_X)
971
-      #error "Z_SAFE_HOMING_X_POINT can't be reached by the Z probe."
960
+      #error "Z_SAFE_HOMING_X_POINT is outside the probe region."
972
     #elif !WITHIN(Z_SAFE_HOMING_Y_POINT, MIN_PROBE_Y, MAX_PROBE_Y)
961
     #elif !WITHIN(Z_SAFE_HOMING_Y_POINT, MIN_PROBE_Y, MAX_PROBE_Y)
973
-      #error "Z_SAFE_HOMING_Y_POINT can't be reached by the Z probe."
962
+      #error "Z_SAFE_HOMING_Y_POINT is outside the probe region."
974
     #endif
963
     #endif
975
   #elif !WITHIN(Z_SAFE_HOMING_X_POINT, X_MIN_POS, X_MAX_POS)
964
   #elif !WITHIN(Z_SAFE_HOMING_X_POINT, X_MIN_POS, X_MAX_POS)
976
     #error "Z_SAFE_HOMING_X_POINT can't be reached by the nozzle."
965
     #error "Z_SAFE_HOMING_X_POINT can't be reached by the nozzle."

+ 39
- 30
Marlin/src/module/motion.h View File

236
 
236
 
237
 #if IS_KINEMATIC // (DELTA or SCARA)
237
 #if IS_KINEMATIC // (DELTA or SCARA)
238
 
238
 
239
+  #if IS_SCARA
240
+    extern const float L1, L2;
241
+  #endif
242
+
239
   // Return true if the given point is within the printable area
243
   // Return true if the given point is within the printable area
240
-  inline bool position_is_reachable(const float &rx, const float &ry) {
244
+  inline bool position_is_reachable(const float &rx, const float &ry, const float inset=0) {
241
     #if ENABLED(DELTA)
245
     #if ENABLED(DELTA)
242
-      return HYPOT2(rx, ry) <= sq(DELTA_PRINTABLE_RADIUS);
246
+      return HYPOT2(rx, ry) <= sq(DELTA_PRINTABLE_RADIUS - inset);
243
     #elif IS_SCARA
247
     #elif IS_SCARA
244
-      #if MIDDLE_DEAD_ZONE_R > 0
245
-        const float R2 = HYPOT2(rx - SCARA_OFFSET_X, ry - SCARA_OFFSET_Y);
246
-        return R2 >= sq(float(MIDDLE_DEAD_ZONE_R)) && R2 <= sq(L1 + L2);
247
-      #else
248
-        return HYPOT2(rx - SCARA_OFFSET_X, ry - SCARA_OFFSET_Y) <= sq(L1 + L2);
249
-      #endif
250
-    #else // CARTESIAN
251
-      // To be migrated from MakerArm branch in future
248
+      const float R2 = HYPOT2(rx - SCARA_OFFSET_X, ry - SCARA_OFFSET_Y);
249
+      return (
250
+        R2 <= sq(L1 + L2) - inset
251
+        #if MIDDLE_DEAD_ZONE_R > 0
252
+          && R2 >= sq(float(MIDDLE_DEAD_ZONE_R))
253
+        #endif
254
+      );
252
     #endif
255
     #endif
253
   }
256
   }
254
 
257
 
255
-  // Return true if the both nozzle and the probe can reach the given point.
256
-  // Note: This won't work on SCARA since the probe offset rotates with the arm.
257
-  inline bool position_is_reachable_by_probe(const float &rx, const float &ry) {
258
-    return position_is_reachable(rx, ry)
259
-        && position_is_reachable(rx - (X_PROBE_OFFSET_FROM_EXTRUDER), ry - (Y_PROBE_OFFSET_FROM_EXTRUDER));
260
-  }
258
+  #if HAS_BED_PROBE
259
+    // Return true if the both nozzle and the probe can reach the given point.
260
+    // Note: This won't work on SCARA since the probe offset rotates with the arm.
261
+    inline bool position_is_reachable_by_probe(const float &rx, const float &ry) {
262
+      return position_is_reachable(rx - (X_PROBE_OFFSET_FROM_EXTRUDER), ry - (Y_PROBE_OFFSET_FROM_EXTRUDER))
263
+             && position_is_reachable(rx, ry, FABS(MIN_PROBE_EDGE));
264
+    }
265
+  #endif
261
 
266
 
262
 #else // CARTESIAN
267
 #else // CARTESIAN
263
 
268
 
268
         && WITHIN(ry, Y_MIN_POS - 0.001, Y_MAX_POS + 0.001);
273
         && WITHIN(ry, Y_MIN_POS - 0.001, Y_MAX_POS + 0.001);
269
   }
274
   }
270
 
275
 
271
-  /**
272
-   * Return whether the given position is within the bed, and whether the nozzle
273
-   * can reach the position required to put the probe at the given position.
274
-   *
275
-   * Example: For a probe offset of -10,+10, then for the probe to reach 0,0 the
276
-   *          nozzle must be be able to reach +10,-10.
277
-   */
278
-  inline bool position_is_reachable_by_probe(const float &rx, const float &ry) {
279
-    const float nx = rx - (X_PROBE_OFFSET_FROM_EXTRUDER),
280
-                ny = ry - (Y_PROBE_OFFSET_FROM_EXTRUDER);
281
-    return position_is_reachable(nx, ny)
282
-        && WITHIN(rx, X_MIN_BED - 0.001, X_MAX_BED + 0.001)
283
-        && WITHIN(ry, Y_MIN_BED - 0.001, Y_MAX_BED + 0.001);
284
-  }
276
+  #if HAS_BED_PROBE
277
+    /**
278
+     * Return whether the given position is within the bed, and whether the nozzle
279
+     * can reach the position required to put the probe at the given position.
280
+     *
281
+     * Example: For a probe offset of -10,+10, then for the probe to reach 0,0 the
282
+     *          nozzle must be be able to reach +10,-10.
283
+     */
284
+    inline bool position_is_reachable_by_probe(const float &rx, const float &ry) {
285
+      return position_is_reachable(rx - (X_PROBE_OFFSET_FROM_EXTRUDER), ry - (Y_PROBE_OFFSET_FROM_EXTRUDER))
286
+          && WITHIN(rx, MIN_PROBE_X - 0.001, MAX_PROBE_X + 0.001)
287
+          && WITHIN(ry, MIN_PROBE_Y - 0.001, MAX_PROBE_Y + 0.001);
288
+    }
289
+  #endif
285
 
290
 
286
 #endif // CARTESIAN
291
 #endif // CARTESIAN
287
 
292
 
293
+#if !HAS_BED_PROBE
294
+  FORCE_INLINE bool position_is_reachable_by_probe(const float &rx, const float &ry) { return position_is_reachable(rx, ry); }
295
+#endif
296
+
288
 /**
297
 /**
289
  * Dual X Carriage / Dual Nozzle
298
  * Dual X Carriage / Dual Nozzle
290
  */
299
  */

Loading…
Cancel
Save