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

Replace hardcoded values #4687

Merged
merged 1 commit into from
Jul 5, 2024
Merged

Replace hardcoded values #4687

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 1 addition & 6 deletions Firmware/Marlin_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2235,12 +2235,7 @@ bool calibrate_z_auto()
plan_buffer_line_destinationXYZE(feedrate / 60);
st_synchronize();
enable_endstops(endstops_enabled);
if (PRINTER_TYPE == PRINTER_MK3) {
current_position[Z_AXIS] = Z_MAX_POS + 2.0;
}
else {
current_position[Z_AXIS] = Z_MAX_POS + 9.0;
}
current_position[Z_AXIS] = Z_MAX_POS + Z_MAX_POS_XYZ_CALIBRATION_CORRECTION;
plan_set_position_curposXYZE();
return true;
}
Expand Down
3 changes: 3 additions & 0 deletions Firmware/variants/MK3-E3DREVO.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,9 @@
#define Z_MAX_POS 210
#define Z_MIN_POS 0.15

// Z height correction value
#define Z_MAX_POS_XYZ_CALIBRATION_CORRECTION 2

// Canceled home position
#define X_CANCEL_POS 50
#define Y_CANCEL_POS 190
Expand Down
3 changes: 3 additions & 0 deletions Firmware/variants/MK3-E3DREVO_HF_60W.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,9 @@
#define Z_MAX_POS 210
#define Z_MIN_POS 0.15

// Z height correction value
#define Z_MAX_POS_XYZ_CALIBRATION_CORRECTION 2

// Canceled home position
#define X_CANCEL_POS 50
#define Y_CANCEL_POS 190
Expand Down
3 changes: 3 additions & 0 deletions Firmware/variants/MK3.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,9 @@
#define Z_MAX_POS 210
#define Z_MIN_POS 0.15

// Z height correction value
#define Z_MAX_POS_XYZ_CALIBRATION_CORRECTION 2

// Canceled home position
#define X_CANCEL_POS 50
#define Y_CANCEL_POS 190
Expand Down
3 changes: 3 additions & 0 deletions Firmware/variants/MK3S-E3DREVO.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@
#define Z_MAX_POS 210
#define Z_MIN_POS 0.15

// Z height correction value
#define Z_MAX_POS_XYZ_CALIBRATION_CORRECTION 9

// Canceled home position
#define X_CANCEL_POS 50
#define Y_CANCEL_POS 190
Expand Down
3 changes: 3 additions & 0 deletions Firmware/variants/MK3S-E3DREVO_HF_60W.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@
#define Z_MAX_POS 210
#define Z_MIN_POS 0.15

// Z height correction value
#define Z_MAX_POS_XYZ_CALIBRATION_CORRECTION 9

// Canceled home position
#define X_CANCEL_POS 50
#define Y_CANCEL_POS 190
Expand Down
3 changes: 3 additions & 0 deletions Firmware/variants/MK3S.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@
#define Z_MAX_POS 210
#define Z_MIN_POS 0.15

// Z height correction value
#define Z_MAX_POS_XYZ_CALIBRATION_CORRECTION 9

// Canceled home position
#define X_CANCEL_POS 50
#define Y_CANCEL_POS 190
Expand Down
Loading