Browse Source

Merge pull request #3918 from epatel/marlin/mbl_negative_xy_adv

MBL: Move border macros to Configuration_adv.h
Scott Lahteine 8 years ago
parent
commit
1582ed43bf

+ 12
- 0
Marlin/Configuration_adv.h View File

@@ -445,6 +445,18 @@
445 445
   #define D_FILAMENT 2.85
446 446
 #endif
447 447
 
448
+// @section leveling
449
+
450
+// Default mesh area is an area with an inset margin on the print area.
451
+// Below are the macros that are used to define the borders for the mesh area,
452
+// made available here for specialized needs, ie dual extruder setup.
453
+#if ENABLED(MESH_BED_LEVELING)
454
+  #define MESH_MIN_X (X_MIN_POS + MESH_INSET)
455
+  #define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
456
+  #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
457
+  #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
458
+#endif
459
+
448 460
 // @section extras
449 461
 
450 462
 // Arc interpretation settings:

+ 12
- 0
Marlin/example_configurations/Felix/Configuration_adv.h View File

@@ -445,6 +445,18 @@
445 445
   #define D_FILAMENT 2.85
446 446
 #endif
447 447
 
448
+// @section leveling
449
+
450
+// Default mesh area is an area with an inset margin on the print area.
451
+// Below are the macros that are used to define the borders for the mesh area,
452
+// made available here for specialized needs, ie dual extruder setup.
453
+#if ENABLED(MESH_BED_LEVELING)
454
+  #define MESH_MIN_X (X_MIN_POS + MESH_INSET)
455
+  #define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
456
+  #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
457
+  #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
458
+#endif
459
+
448 460
 // @section extras
449 461
 
450 462
 // Arc interpretation settings:

+ 12
- 0
Marlin/example_configurations/Hephestos/Configuration_adv.h View File

@@ -445,6 +445,18 @@
445 445
   #define D_FILAMENT 1.75
446 446
 #endif
447 447
 
448
+// @section leveling
449
+
450
+// Default mesh area is an area with an inset margin on the print area.
451
+// Below are the macros that are used to define the borders for the mesh area,
452
+// made available here for specialized needs, ie dual extruder setup.
453
+#if ENABLED(MESH_BED_LEVELING)
454
+  #define MESH_MIN_X (X_MIN_POS + MESH_INSET)
455
+  #define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
456
+  #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
457
+  #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
458
+#endif
459
+
448 460
 // @section extras
449 461
 
450 462
 // Arc interpretation settings:

+ 12
- 0
Marlin/example_configurations/Hephestos_2/Configuration_adv.h View File

@@ -445,6 +445,18 @@
445 445
   #define D_FILAMENT 2.85
446 446
 #endif
447 447
 
448
+// @section leveling
449
+
450
+// Default mesh area is an area with an inset margin on the print area.
451
+// Below are the macros that are used to define the borders for the mesh area,
452
+// made available here for specialized needs, ie dual extruder setup.
453
+#if ENABLED(MESH_BED_LEVELING)
454
+  #define MESH_MIN_X (X_MIN_POS + MESH_INSET)
455
+  #define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
456
+  #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
457
+  #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
458
+#endif
459
+
448 460
 // @section extras
449 461
 
450 462
 // Arc interpretation settings:

+ 12
- 0
Marlin/example_configurations/K8200/Configuration_adv.h View File

@@ -451,6 +451,18 @@
451 451
   #define D_FILAMENT 2.85
452 452
 #endif
453 453
 
454
+// @section leveling
455
+
456
+// Default mesh area is an area with an inset margin on the print area.
457
+// Below are the macros that are used to define the borders for the mesh area,
458
+// made available here for specialized needs, ie dual extruder setup.
459
+#if ENABLED(MESH_BED_LEVELING)
460
+  #define MESH_MIN_X (X_MIN_POS + MESH_INSET)
461
+  #define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
462
+  #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
463
+  #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
464
+#endif
465
+
454 466
 // @section extras
455 467
 
456 468
 // Arc interpretation settings:

+ 12
- 0
Marlin/example_configurations/RigidBot/Configuration_adv.h View File

@@ -445,6 +445,18 @@
445 445
   #define D_FILAMENT 1.75
446 446
 #endif
447 447
 
448
+// @section leveling
449
+
450
+// Default mesh area is an area with an inset margin on the print area.
451
+// Below are the macros that are used to define the borders for the mesh area,
452
+// made available here for specialized needs, ie dual extruder setup.
453
+#if ENABLED(MESH_BED_LEVELING)
454
+  #define MESH_MIN_X (X_MIN_POS + MESH_INSET)
455
+  #define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
456
+  #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
457
+  #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
458
+#endif
459
+
448 460
 // @section extras
449 461
 
450 462
 // Arc interpretation settings:

+ 12
- 0
Marlin/example_configurations/SCARA/Configuration_adv.h View File

@@ -445,6 +445,18 @@
445 445
   #define D_FILAMENT 1.75
446 446
 #endif
447 447
 
448
+// @section leveling
449
+
450
+// Default mesh area is an area with an inset margin on the print area.
451
+// Below are the macros that are used to define the borders for the mesh area,
452
+// made available here for specialized needs, ie dual extruder setup.
453
+#if ENABLED(MESH_BED_LEVELING)
454
+  #define MESH_MIN_X (X_MIN_POS + MESH_INSET)
455
+  #define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
456
+  #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
457
+  #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
458
+#endif
459
+
448 460
 // @section extras
449 461
 
450 462
 // Arc interpretation settings:

+ 12
- 0
Marlin/example_configurations/TAZ4/Configuration_adv.h View File

@@ -453,6 +453,18 @@
453 453
   #define D_FILAMENT 2.85
454 454
 #endif
455 455
 
456
+// @section leveling
457
+
458
+// Default mesh area is an area with an inset margin on the print area.
459
+// Below are the macros that are used to define the borders for the mesh area,
460
+// made available here for specialized needs, ie dual extruder setup.
461
+#if ENABLED(MESH_BED_LEVELING)
462
+  #define MESH_MIN_X (X_MIN_POS + MESH_INSET)
463
+  #define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
464
+  #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
465
+  #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
466
+#endif
467
+
456 468
 // @section extras
457 469
 
458 470
 // Arc interpretation settings:

+ 12
- 0
Marlin/example_configurations/WITBOX/Configuration_adv.h View File

@@ -445,6 +445,18 @@
445 445
   #define D_FILAMENT 1.75
446 446
 #endif
447 447
 
448
+// @section leveling
449
+
450
+// Default mesh area is an area with an inset margin on the print area.
451
+// Below are the macros that are used to define the borders for the mesh area,
452
+// made available here for specialized needs, ie dual extruder setup.
453
+#if ENABLED(MESH_BED_LEVELING)
454
+  #define MESH_MIN_X (X_MIN_POS + MESH_INSET)
455
+  #define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
456
+  #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
457
+  #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
458
+#endif
459
+
448 460
 // @section extras
449 461
 
450 462
 // Arc interpretation settings:

+ 12
- 0
Marlin/example_configurations/delta/biv2.5/Configuration_adv.h View File

@@ -447,6 +447,18 @@
447 447
   #define D_FILAMENT 2.85
448 448
 #endif
449 449
 
450
+// @section leveling
451
+
452
+// Default mesh area is an area with an inset margin on the print area.
453
+// Below are the macros that are used to define the borders for the mesh area,
454
+// made available here for specialized needs, ie dual extruder setup.
455
+#if ENABLED(MESH_BED_LEVELING)
456
+  #define MESH_MIN_X (X_MIN_POS + MESH_INSET)
457
+  #define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
458
+  #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
459
+  #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
460
+#endif
461
+
450 462
 // @section extras
451 463
 
452 464
 // Arc interpretation settings:

+ 12
- 0
Marlin/example_configurations/delta/generic/Configuration_adv.h View File

@@ -447,6 +447,18 @@
447 447
   #define D_FILAMENT 2.85
448 448
 #endif
449 449
 
450
+// @section leveling
451
+
452
+// Default mesh area is an area with an inset margin on the print area.
453
+// Below are the macros that are used to define the borders for the mesh area,
454
+// made available here for specialized needs, ie dual extruder setup.
455
+#if ENABLED(MESH_BED_LEVELING)
456
+  #define MESH_MIN_X (X_MIN_POS + MESH_INSET)
457
+  #define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
458
+  #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
459
+  #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
460
+#endif
461
+
450 462
 // @section extras
451 463
 
452 464
 // Arc interpretation settings:

+ 12
- 0
Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h View File

@@ -446,6 +446,18 @@
446 446
   #define D_FILAMENT 2.85
447 447
 #endif
448 448
 
449
+// @section leveling
450
+
451
+// Default mesh area is an area with an inset margin on the print area.
452
+// Below are the macros that are used to define the borders for the mesh area,
453
+// made available here for specialized needs, ie dual extruder setup.
454
+#if ENABLED(MESH_BED_LEVELING)
455
+  #define MESH_MIN_X (X_MIN_POS + MESH_INSET)
456
+  #define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
457
+  #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
458
+  #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
459
+#endif
460
+
449 461
 // @section extras
450 462
 
451 463
 // Arc interpretation settings:

+ 12
- 0
Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h View File

@@ -451,6 +451,18 @@
451 451
   #define D_FILAMENT 2.85
452 452
 #endif
453 453
 
454
+// @section leveling
455
+
456
+// Default mesh area is an area with an inset margin on the print area.
457
+// Below are the macros that are used to define the borders for the mesh area,
458
+// made available here for specialized needs, ie dual extruder setup.
459
+#if ENABLED(MESH_BED_LEVELING)
460
+  #define MESH_MIN_X (X_MIN_POS + MESH_INSET)
461
+  #define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
462
+  #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
463
+  #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
464
+#endif
465
+
454 466
 // @section extras
455 467
 
456 468
 // Arc interpretation settings:

+ 12
- 0
Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h View File

@@ -447,6 +447,18 @@
447 447
   #define D_FILAMENT 2.85
448 448
 #endif
449 449
 
450
+// @section leveling
451
+
452
+// Default mesh area is an area with an inset margin on the print area.
453
+// Below are the macros that are used to define the borders for the mesh area,
454
+// made available here for specialized needs, ie dual extruder setup.
455
+#if ENABLED(MESH_BED_LEVELING)
456
+  #define MESH_MIN_X (X_MIN_POS + MESH_INSET)
457
+  #define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
458
+  #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
459
+  #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
460
+#endif
461
+
450 462
 // @section extras
451 463
 
452 464
 // Arc interpretation settings:

+ 12
- 0
Marlin/example_configurations/makibox/Configuration_adv.h View File

@@ -445,6 +445,18 @@
445 445
   #define D_FILAMENT 2.85
446 446
 #endif
447 447
 
448
+// @section leveling
449
+
450
+// Default mesh area is an area with an inset margin on the print area.
451
+// Below are the macros that are used to define the borders for the mesh area,
452
+// made available here for specialized needs, ie dual extruder setup.
453
+#if ENABLED(MESH_BED_LEVELING)
454
+  #define MESH_MIN_X (X_MIN_POS + MESH_INSET)
455
+  #define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
456
+  #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
457
+  #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
458
+#endif
459
+
448 460
 // @section extras
449 461
 
450 462
 // Arc interpretation settings:

+ 12
- 0
Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h View File

@@ -445,6 +445,18 @@
445 445
   #define D_FILAMENT 2.85
446 446
 #endif
447 447
 
448
+// @section leveling
449
+
450
+// Default mesh area is an area with an inset margin on the print area.
451
+// Below are the macros that are used to define the borders for the mesh area,
452
+// made available here for specialized needs, ie dual extruder setup.
453
+#if ENABLED(MESH_BED_LEVELING)
454
+  #define MESH_MIN_X (X_MIN_POS + MESH_INSET)
455
+  #define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
456
+  #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
457
+  #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
458
+#endif
459
+
448 460
 // @section extras
449 461
 
450 462
 // Arc interpretation settings:

+ 0
- 4
Marlin/mesh_bed_leveling.h View File

@@ -24,10 +24,6 @@
24 24
 
25 25
 #if ENABLED(MESH_BED_LEVELING)
26 26
 
27
-  #define MESH_MIN_X (X_MIN_POS + MESH_INSET)
28
-  #define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
29
-  #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
30
-  #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
31 27
   #define MESH_X_DIST ((MESH_MAX_X - (MESH_MIN_X))/(MESH_NUM_X_POINTS - 1))
32 28
   #define MESH_Y_DIST ((MESH_MAX_Y - (MESH_MIN_Y))/(MESH_NUM_Y_POINTS - 1))
33 29
 

Loading…
Cancel
Save