Merge pull request #3918 from epatel/marlin/mbl_negative_xy_adv
MBL: Move border macros to Configuration_adv.h
This commit is contained in:
commit
1582ed43bf
17 changed files with 192 additions and 4 deletions
|
@ -445,6 +445,18 @@
|
||||||
#define D_FILAMENT 2.85
|
#define D_FILAMENT 2.85
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// @section leveling
|
||||||
|
|
||||||
|
// Default mesh area is an area with an inset margin on the print area.
|
||||||
|
// Below are the macros that are used to define the borders for the mesh area,
|
||||||
|
// made available here for specialized needs, ie dual extruder setup.
|
||||||
|
#if ENABLED(MESH_BED_LEVELING)
|
||||||
|
#define MESH_MIN_X (X_MIN_POS + MESH_INSET)
|
||||||
|
#define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
|
||||||
|
#define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
|
||||||
|
#define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
|
||||||
|
#endif
|
||||||
|
|
||||||
// @section extras
|
// @section extras
|
||||||
|
|
||||||
// Arc interpretation settings:
|
// Arc interpretation settings:
|
||||||
|
|
|
@ -445,6 +445,18 @@
|
||||||
#define D_FILAMENT 2.85
|
#define D_FILAMENT 2.85
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// @section leveling
|
||||||
|
|
||||||
|
// Default mesh area is an area with an inset margin on the print area.
|
||||||
|
// Below are the macros that are used to define the borders for the mesh area,
|
||||||
|
// made available here for specialized needs, ie dual extruder setup.
|
||||||
|
#if ENABLED(MESH_BED_LEVELING)
|
||||||
|
#define MESH_MIN_X (X_MIN_POS + MESH_INSET)
|
||||||
|
#define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
|
||||||
|
#define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
|
||||||
|
#define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
|
||||||
|
#endif
|
||||||
|
|
||||||
// @section extras
|
// @section extras
|
||||||
|
|
||||||
// Arc interpretation settings:
|
// Arc interpretation settings:
|
||||||
|
|
|
@ -445,6 +445,18 @@
|
||||||
#define D_FILAMENT 1.75
|
#define D_FILAMENT 1.75
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// @section leveling
|
||||||
|
|
||||||
|
// Default mesh area is an area with an inset margin on the print area.
|
||||||
|
// Below are the macros that are used to define the borders for the mesh area,
|
||||||
|
// made available here for specialized needs, ie dual extruder setup.
|
||||||
|
#if ENABLED(MESH_BED_LEVELING)
|
||||||
|
#define MESH_MIN_X (X_MIN_POS + MESH_INSET)
|
||||||
|
#define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
|
||||||
|
#define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
|
||||||
|
#define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
|
||||||
|
#endif
|
||||||
|
|
||||||
// @section extras
|
// @section extras
|
||||||
|
|
||||||
// Arc interpretation settings:
|
// Arc interpretation settings:
|
||||||
|
|
|
@ -445,6 +445,18 @@
|
||||||
#define D_FILAMENT 2.85
|
#define D_FILAMENT 2.85
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// @section leveling
|
||||||
|
|
||||||
|
// Default mesh area is an area with an inset margin on the print area.
|
||||||
|
// Below are the macros that are used to define the borders for the mesh area,
|
||||||
|
// made available here for specialized needs, ie dual extruder setup.
|
||||||
|
#if ENABLED(MESH_BED_LEVELING)
|
||||||
|
#define MESH_MIN_X (X_MIN_POS + MESH_INSET)
|
||||||
|
#define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
|
||||||
|
#define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
|
||||||
|
#define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
|
||||||
|
#endif
|
||||||
|
|
||||||
// @section extras
|
// @section extras
|
||||||
|
|
||||||
// Arc interpretation settings:
|
// Arc interpretation settings:
|
||||||
|
|
|
@ -451,6 +451,18 @@
|
||||||
#define D_FILAMENT 2.85
|
#define D_FILAMENT 2.85
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// @section leveling
|
||||||
|
|
||||||
|
// Default mesh area is an area with an inset margin on the print area.
|
||||||
|
// Below are the macros that are used to define the borders for the mesh area,
|
||||||
|
// made available here for specialized needs, ie dual extruder setup.
|
||||||
|
#if ENABLED(MESH_BED_LEVELING)
|
||||||
|
#define MESH_MIN_X (X_MIN_POS + MESH_INSET)
|
||||||
|
#define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
|
||||||
|
#define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
|
||||||
|
#define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
|
||||||
|
#endif
|
||||||
|
|
||||||
// @section extras
|
// @section extras
|
||||||
|
|
||||||
// Arc interpretation settings:
|
// Arc interpretation settings:
|
||||||
|
|
|
@ -445,6 +445,18 @@
|
||||||
#define D_FILAMENT 1.75
|
#define D_FILAMENT 1.75
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// @section leveling
|
||||||
|
|
||||||
|
// Default mesh area is an area with an inset margin on the print area.
|
||||||
|
// Below are the macros that are used to define the borders for the mesh area,
|
||||||
|
// made available here for specialized needs, ie dual extruder setup.
|
||||||
|
#if ENABLED(MESH_BED_LEVELING)
|
||||||
|
#define MESH_MIN_X (X_MIN_POS + MESH_INSET)
|
||||||
|
#define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
|
||||||
|
#define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
|
||||||
|
#define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
|
||||||
|
#endif
|
||||||
|
|
||||||
// @section extras
|
// @section extras
|
||||||
|
|
||||||
// Arc interpretation settings:
|
// Arc interpretation settings:
|
||||||
|
|
|
@ -445,6 +445,18 @@
|
||||||
#define D_FILAMENT 1.75
|
#define D_FILAMENT 1.75
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// @section leveling
|
||||||
|
|
||||||
|
// Default mesh area is an area with an inset margin on the print area.
|
||||||
|
// Below are the macros that are used to define the borders for the mesh area,
|
||||||
|
// made available here for specialized needs, ie dual extruder setup.
|
||||||
|
#if ENABLED(MESH_BED_LEVELING)
|
||||||
|
#define MESH_MIN_X (X_MIN_POS + MESH_INSET)
|
||||||
|
#define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
|
||||||
|
#define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
|
||||||
|
#define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
|
||||||
|
#endif
|
||||||
|
|
||||||
// @section extras
|
// @section extras
|
||||||
|
|
||||||
// Arc interpretation settings:
|
// Arc interpretation settings:
|
||||||
|
|
|
@ -453,6 +453,18 @@
|
||||||
#define D_FILAMENT 2.85
|
#define D_FILAMENT 2.85
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// @section leveling
|
||||||
|
|
||||||
|
// Default mesh area is an area with an inset margin on the print area.
|
||||||
|
// Below are the macros that are used to define the borders for the mesh area,
|
||||||
|
// made available here for specialized needs, ie dual extruder setup.
|
||||||
|
#if ENABLED(MESH_BED_LEVELING)
|
||||||
|
#define MESH_MIN_X (X_MIN_POS + MESH_INSET)
|
||||||
|
#define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
|
||||||
|
#define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
|
||||||
|
#define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
|
||||||
|
#endif
|
||||||
|
|
||||||
// @section extras
|
// @section extras
|
||||||
|
|
||||||
// Arc interpretation settings:
|
// Arc interpretation settings:
|
||||||
|
|
|
@ -445,6 +445,18 @@
|
||||||
#define D_FILAMENT 1.75
|
#define D_FILAMENT 1.75
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// @section leveling
|
||||||
|
|
||||||
|
// Default mesh area is an area with an inset margin on the print area.
|
||||||
|
// Below are the macros that are used to define the borders for the mesh area,
|
||||||
|
// made available here for specialized needs, ie dual extruder setup.
|
||||||
|
#if ENABLED(MESH_BED_LEVELING)
|
||||||
|
#define MESH_MIN_X (X_MIN_POS + MESH_INSET)
|
||||||
|
#define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
|
||||||
|
#define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
|
||||||
|
#define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
|
||||||
|
#endif
|
||||||
|
|
||||||
// @section extras
|
// @section extras
|
||||||
|
|
||||||
// Arc interpretation settings:
|
// Arc interpretation settings:
|
||||||
|
|
|
@ -447,6 +447,18 @@
|
||||||
#define D_FILAMENT 2.85
|
#define D_FILAMENT 2.85
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// @section leveling
|
||||||
|
|
||||||
|
// Default mesh area is an area with an inset margin on the print area.
|
||||||
|
// Below are the macros that are used to define the borders for the mesh area,
|
||||||
|
// made available here for specialized needs, ie dual extruder setup.
|
||||||
|
#if ENABLED(MESH_BED_LEVELING)
|
||||||
|
#define MESH_MIN_X (X_MIN_POS + MESH_INSET)
|
||||||
|
#define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
|
||||||
|
#define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
|
||||||
|
#define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
|
||||||
|
#endif
|
||||||
|
|
||||||
// @section extras
|
// @section extras
|
||||||
|
|
||||||
// Arc interpretation settings:
|
// Arc interpretation settings:
|
||||||
|
|
|
@ -447,6 +447,18 @@
|
||||||
#define D_FILAMENT 2.85
|
#define D_FILAMENT 2.85
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// @section leveling
|
||||||
|
|
||||||
|
// Default mesh area is an area with an inset margin on the print area.
|
||||||
|
// Below are the macros that are used to define the borders for the mesh area,
|
||||||
|
// made available here for specialized needs, ie dual extruder setup.
|
||||||
|
#if ENABLED(MESH_BED_LEVELING)
|
||||||
|
#define MESH_MIN_X (X_MIN_POS + MESH_INSET)
|
||||||
|
#define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
|
||||||
|
#define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
|
||||||
|
#define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
|
||||||
|
#endif
|
||||||
|
|
||||||
// @section extras
|
// @section extras
|
||||||
|
|
||||||
// Arc interpretation settings:
|
// Arc interpretation settings:
|
||||||
|
|
|
@ -446,6 +446,18 @@
|
||||||
#define D_FILAMENT 2.85
|
#define D_FILAMENT 2.85
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// @section leveling
|
||||||
|
|
||||||
|
// Default mesh area is an area with an inset margin on the print area.
|
||||||
|
// Below are the macros that are used to define the borders for the mesh area,
|
||||||
|
// made available here for specialized needs, ie dual extruder setup.
|
||||||
|
#if ENABLED(MESH_BED_LEVELING)
|
||||||
|
#define MESH_MIN_X (X_MIN_POS + MESH_INSET)
|
||||||
|
#define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
|
||||||
|
#define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
|
||||||
|
#define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
|
||||||
|
#endif
|
||||||
|
|
||||||
// @section extras
|
// @section extras
|
||||||
|
|
||||||
// Arc interpretation settings:
|
// Arc interpretation settings:
|
||||||
|
|
|
@ -451,6 +451,18 @@
|
||||||
#define D_FILAMENT 2.85
|
#define D_FILAMENT 2.85
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// @section leveling
|
||||||
|
|
||||||
|
// Default mesh area is an area with an inset margin on the print area.
|
||||||
|
// Below are the macros that are used to define the borders for the mesh area,
|
||||||
|
// made available here for specialized needs, ie dual extruder setup.
|
||||||
|
#if ENABLED(MESH_BED_LEVELING)
|
||||||
|
#define MESH_MIN_X (X_MIN_POS + MESH_INSET)
|
||||||
|
#define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
|
||||||
|
#define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
|
||||||
|
#define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
|
||||||
|
#endif
|
||||||
|
|
||||||
// @section extras
|
// @section extras
|
||||||
|
|
||||||
// Arc interpretation settings:
|
// Arc interpretation settings:
|
||||||
|
|
|
@ -447,6 +447,18 @@
|
||||||
#define D_FILAMENT 2.85
|
#define D_FILAMENT 2.85
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// @section leveling
|
||||||
|
|
||||||
|
// Default mesh area is an area with an inset margin on the print area.
|
||||||
|
// Below are the macros that are used to define the borders for the mesh area,
|
||||||
|
// made available here for specialized needs, ie dual extruder setup.
|
||||||
|
#if ENABLED(MESH_BED_LEVELING)
|
||||||
|
#define MESH_MIN_X (X_MIN_POS + MESH_INSET)
|
||||||
|
#define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
|
||||||
|
#define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
|
||||||
|
#define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
|
||||||
|
#endif
|
||||||
|
|
||||||
// @section extras
|
// @section extras
|
||||||
|
|
||||||
// Arc interpretation settings:
|
// Arc interpretation settings:
|
||||||
|
|
|
@ -445,6 +445,18 @@
|
||||||
#define D_FILAMENT 2.85
|
#define D_FILAMENT 2.85
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// @section leveling
|
||||||
|
|
||||||
|
// Default mesh area is an area with an inset margin on the print area.
|
||||||
|
// Below are the macros that are used to define the borders for the mesh area,
|
||||||
|
// made available here for specialized needs, ie dual extruder setup.
|
||||||
|
#if ENABLED(MESH_BED_LEVELING)
|
||||||
|
#define MESH_MIN_X (X_MIN_POS + MESH_INSET)
|
||||||
|
#define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
|
||||||
|
#define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
|
||||||
|
#define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
|
||||||
|
#endif
|
||||||
|
|
||||||
// @section extras
|
// @section extras
|
||||||
|
|
||||||
// Arc interpretation settings:
|
// Arc interpretation settings:
|
||||||
|
|
|
@ -445,6 +445,18 @@
|
||||||
#define D_FILAMENT 2.85
|
#define D_FILAMENT 2.85
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// @section leveling
|
||||||
|
|
||||||
|
// Default mesh area is an area with an inset margin on the print area.
|
||||||
|
// Below are the macros that are used to define the borders for the mesh area,
|
||||||
|
// made available here for specialized needs, ie dual extruder setup.
|
||||||
|
#if ENABLED(MESH_BED_LEVELING)
|
||||||
|
#define MESH_MIN_X (X_MIN_POS + MESH_INSET)
|
||||||
|
#define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
|
||||||
|
#define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
|
||||||
|
#define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
|
||||||
|
#endif
|
||||||
|
|
||||||
// @section extras
|
// @section extras
|
||||||
|
|
||||||
// Arc interpretation settings:
|
// Arc interpretation settings:
|
||||||
|
|
|
@ -24,10 +24,6 @@
|
||||||
|
|
||||||
#if ENABLED(MESH_BED_LEVELING)
|
#if ENABLED(MESH_BED_LEVELING)
|
||||||
|
|
||||||
#define MESH_MIN_X (X_MIN_POS + MESH_INSET)
|
|
||||||
#define MESH_MAX_X (X_MAX_POS - (MESH_INSET))
|
|
||||||
#define MESH_MIN_Y (Y_MIN_POS + MESH_INSET)
|
|
||||||
#define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET))
|
|
||||||
#define MESH_X_DIST ((MESH_MAX_X - (MESH_MIN_X))/(MESH_NUM_X_POINTS - 1))
|
#define MESH_X_DIST ((MESH_MAX_X - (MESH_MIN_X))/(MESH_NUM_X_POINTS - 1))
|
||||||
#define MESH_Y_DIST ((MESH_MAX_Y - (MESH_MIN_Y))/(MESH_NUM_Y_POINTS - 1))
|
#define MESH_Y_DIST ((MESH_MAX_Y - (MESH_MIN_Y))/(MESH_NUM_Y_POINTS - 1))
|
||||||
|
|
||||||
|
|
Reference in a new issue