Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Expand corner leveling feature #16480

Closed
wants to merge 15 commits into from
Closed

Expand corner leveling feature #16480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
1d9ae54
Action to check PRs
thinkyhead Dec 21, 2019
e22f8bb
Add files via upload
Vertabreak Jan 5, 2020
d803206
Delete check-pr.yml
Vertabreak Jan 5, 2020
34b4cd0
Actions to check and label PRs
thinkyhead Dec 21, 2019
ada7cdb
Delete label-pr.yml
Vertabreak Jan 5, 2020
30eb44a
Delete labeler.yml
Vertabreak Jan 5, 2020
e28cd64
expand corner leveling feature
Vertabreak Jan 6, 2020
bd5f480
expand corner leveling feature
Vertabreak Jan 6, 2020
7d537c2
Update Configuration.h
Vertabreak Jan 6, 2020
90528d4
Merge branch 'dev-2.1.x' into bf2_corner_level_more_16480
thinkyhead Jan 9, 2020
5dcfcb4
Merge pull request #69 from MarlinFirmware/dev-2.1.x
Vertabreak Jan 12, 2020
63a5cb0
Add files via upload
Vertabreak Jan 12, 2020
081768b
Update Configuration.h
Vertabreak Jan 12, 2020
3647957
Update Configuration.h
Vertabreak Jan 12, 2020
2fd9a72
Update Configuration.h
Vertabreak Jan 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion Marlin/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1289,7 +1289,11 @@
//#define LEVEL_BED_CORNERS

#if ENABLED(LEVEL_BED_CORNERS)
#define LEVEL_CORNERS_INSET 30 // (mm) An inset for corner leveling
#define LEVEL_CORNERS_INSET 0 // (mm) An inset for all sides corner leveling if this value is larger then the individual sides it is used
#define LEVEL_CORNERS_INSET_LEFT 30 // (mm) An inset left for corner leveling
#define LEVEL_CORNERS_INSET_RIGHT 30 // (mm) An inset right for corner leveling
#define LEVEL_CORNERS_INSET_FRONT 30 // (mm) An inset front for corner leveling
#define LEVEL_CORNERS_INSET_BACK 30 // (mm) An inset back for corner leveling
#define LEVEL_CORNERS_Z_HOP 4.0 // (mm) Move nozzle up before moving between corners
#define LEVEL_CORNERS_HEIGHT 0.0 // (mm) Z height of nozzle at leveling points
//#define LEVEL_CENTER_TOO // Move to the center after the last corner
Expand Down
8 changes: 4 additions & 4 deletions Marlin/src/lcd/menu/menu_bed_corners.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,16 +58,16 @@ static inline void _lcd_goto_next_corner() {
line_to_z(LEVEL_CORNERS_Z_HOP);
switch (bed_corner) {
case 0:
current_position.set(X_MIN_BED + LEVEL_CORNERS_INSET, Y_MIN_BED + LEVEL_CORNERS_INSET);
current_position.set(X_MIN_BED + _MAX(LEVEL_CORNERS_INSET, LEVEL_CORNERS_INSET_LEFT), Y_MIN_BED + _MAX(LEVEL_CORNERS_INSET, LEVEL_CORNERS_INSET_FRONT));
break;
case 1:
current_position.x = X_MAX_BED - (LEVEL_CORNERS_INSET);
current_position.x = X_MAX_BED - (_MAX(LEVEL_CORNERS_INSET, LEVEL_CORNERS_INSET_RIGHT));
break;
case 2:
current_position.y = Y_MAX_BED - (LEVEL_CORNERS_INSET);
current_position.y = Y_MAX_BED - (_MAX(LEVEL_CORNERS_INSET, LEVEL_CORNERS_INSET_BACK));
break;
case 3:
current_position.x = X_MIN_BED + LEVEL_CORNERS_INSET;
current_position.x = X_MIN_BED + _MAX(LEVEL_CORNERS_INSET, LEVEL_CORNERS_INSET_LEFT);
break;
#if ENABLED(LEVEL_CENTER_TOO)
case 4:
Expand Down
6 changes: 5 additions & 1 deletion config/default/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1289,7 +1289,11 @@
//#define LEVEL_BED_CORNERS

#if ENABLED(LEVEL_BED_CORNERS)
#define LEVEL_CORNERS_INSET 30 // (mm) An inset for corner leveling
#define LEVEL_CORNERS_INSET 0 // (mm) An inset for all sides corner leveling if this value is larger then the individual sides it is used
#define LEVEL_CORNERS_INSET_LEFT 30 // (mm) An inset left for corner leveling
#define LEVEL_CORNERS_INSET_RIGHT 30 // (mm) An inset right for corner leveling
#define LEVEL_CORNERS_INSET_FRONT 30 // (mm) An inset front for corner leveling
#define LEVEL_CORNERS_INSET_BACK 30 // (mm) An inset back for corner leveling
#define LEVEL_CORNERS_Z_HOP 4.0 // (mm) Move nozzle up before moving between corners
#define LEVEL_CORNERS_HEIGHT 0.0 // (mm) Z height of nozzle at leveling points
//#define LEVEL_CENTER_TOO // Move to the center after the last corner
Expand Down
6 changes: 5 additions & 1 deletion config/examples/Alfawise/U20/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1367,7 +1367,11 @@
#define LEVEL_BED_CORNERS

#if ENABLED(LEVEL_BED_CORNERS)
#define LEVEL_CORNERS_INSET 30 // (mm) An inset for corner leveling
#define LEVEL_CORNERS_INSET 0 // (mm) An inset for all sides corner leveling if this value is larger then the individual sides it is used
#define LEVEL_CORNERS_INSET_LEFT 30 // (mm) An inset left for corner leveling
#define LEVEL_CORNERS_INSET_RIGHT 30 // (mm) An inset right for corner leveling
#define LEVEL_CORNERS_INSET_FRONT 30 // (mm) An inset front for corner leveling
#define LEVEL_CORNERS_INSET_BACK 30 // (mm) An inset back for corner leveling
#define LEVEL_CORNERS_Z_HOP 4.0 // (mm) Move nozzle up before moving between corners
#define LEVEL_CORNERS_HEIGHT 0.2 // (mm) Z height of nozzle at leveling points
#define LEVEL_CENTER_TOO // Move to the center after the last corner
Expand Down
6 changes: 5 additions & 1 deletion config/examples/Creality/CR-10S/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1290,7 +1290,11 @@
#define LEVEL_BED_CORNERS

#if ENABLED(LEVEL_BED_CORNERS)
#define LEVEL_CORNERS_INSET 30 // (mm) An inset for corner leveling
#define LEVEL_CORNERS_INSET 0 // (mm) An inset for all sides corner leveling if this value is larger then the individual sides it is used
#define LEVEL_CORNERS_INSET_LEFT 30 // (mm) An inset left for corner leveling
#define LEVEL_CORNERS_INSET_RIGHT 30 // (mm) An inset right for corner leveling
#define LEVEL_CORNERS_INSET_FRONT 30 // (mm) An inset front for corner leveling
#define LEVEL_CORNERS_INSET_BACK 30 // (mm) An inset back for corner leveling
#define LEVEL_CORNERS_Z_HOP 4.0 // (mm) Move nozzle up before moving between corners
#define LEVEL_CORNERS_HEIGHT 0.0 // (mm) Z height of nozzle at leveling points
//#define LEVEL_CENTER_TOO // Move to the center after the last corner
Expand Down
6 changes: 5 additions & 1 deletion config/examples/JGAurora/A5S/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1296,7 +1296,11 @@
#define LEVEL_BED_CORNERS

#if ENABLED(LEVEL_BED_CORNERS)
#define LEVEL_CORNERS_INSET 30 // (mm) An inset for corner leveling
#define LEVEL_CORNERS_INSET 0 // (mm) An inset for all sides corner leveling if this value is larger then the individual sides it is used
#define LEVEL_CORNERS_INSET_LEFT 30 // (mm) An inset left for corner leveling
#define LEVEL_CORNERS_INSET_RIGHT 30 // (mm) An inset right for corner leveling
#define LEVEL_CORNERS_INSET_FRONT 30 // (mm) An inset front for corner leveling
#define LEVEL_CORNERS_INSET_BACK 30 // (mm) An inset back for corner leveling
#define LEVEL_CORNERS_Z_HOP 5.0 // (mm) Move nozzle up before moving between corners
#define LEVEL_CORNERS_HEIGHT 0.0 // (mm) Z height of nozzle at leveling points
//#define LEVEL_CENTER_TOO // Move to the center after the last corner
Expand Down