josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4687 from 3d-gussner/MK3_Replace_hard_coded_values_1 

Replace hardcoded values
This commit is contained in:
3d-gussner 2024-07-05 07:54:07 +02:00 committed by GitHub
parent 152b290d1d bc48d34a2f
commit e405e9140c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Firmware/Marlin_main.cpp
View File

@ -2235,12 +2235,7 @@ bool calibrate_z_auto()
plan_buffer_line_destinationXYZE(feedrate / 60); plan_buffer_line_destinationXYZE(feedrate / 60);
st_synchronize(); st_synchronize();
enable_endstops(endstops_enabled); enable_endstops(endstops_enabled);
if (PRINTER_TYPE == PRINTER_MK3) { current_position[Z_AXIS] = Z_MAX_POS + Z_MAX_POS_XYZ_CALIBRATION_CORRECTION;
current_position[Z_AXIS] = Z_MAX_POS + 2.0;
}
else {
current_position[Z_AXIS] = Z_MAX_POS + 9.0;
}
plan_set_position_curposXYZE(); plan_set_position_curposXYZE();
return true; return true;
} }

3
Firmware/variants/MK3-E3DREVO.h
View File

@ -64,6 +64,9 @@
#define Z_MAX_POS 210 #define Z_MAX_POS 210
#define Z_MIN_POS 0.15 #define Z_MIN_POS 0.15
// Z height correction value
#define Z_MAX_POS_XYZ_CALIBRATION_CORRECTION 2
// Canceled home position // Canceled home position
#define X_CANCEL_POS 50 #define X_CANCEL_POS 50
#define Y_CANCEL_POS 190 #define Y_CANCEL_POS 190

3
Firmware/variants/MK3-E3DREVO_HF_60W.h
View File

@ -64,6 +64,9 @@
#define Z_MAX_POS 210 #define Z_MAX_POS 210
#define Z_MIN_POS 0.15 #define Z_MIN_POS 0.15
// Z height correction value
#define Z_MAX_POS_XYZ_CALIBRATION_CORRECTION 2
// Canceled home position // Canceled home position
#define X_CANCEL_POS 50 #define X_CANCEL_POS 50
#define Y_CANCEL_POS 190 #define Y_CANCEL_POS 190

3
Firmware/variants/MK3.h
View File

@ -64,6 +64,9 @@
#define Z_MAX_POS 210 #define Z_MAX_POS 210
#define Z_MIN_POS 0.15 #define Z_MIN_POS 0.15
// Z height correction value
#define Z_MAX_POS_XYZ_CALIBRATION_CORRECTION 2
// Canceled home position // Canceled home position
#define X_CANCEL_POS 50 #define X_CANCEL_POS 50
#define Y_CANCEL_POS 190 #define Y_CANCEL_POS 190

3
Firmware/variants/MK3S-E3DREVO.h
View File

@ -66,6 +66,9 @@
#define Z_MAX_POS 210 #define Z_MAX_POS 210
#define Z_MIN_POS 0.15 #define Z_MIN_POS 0.15
// Z height correction value
#define Z_MAX_POS_XYZ_CALIBRATION_CORRECTION 9
// Canceled home position // Canceled home position
#define X_CANCEL_POS 50 #define X_CANCEL_POS 50
#define Y_CANCEL_POS 190 #define Y_CANCEL_POS 190

3
Firmware/variants/MK3S-E3DREVO_HF_60W.h
View File

@ -66,6 +66,9 @@
#define Z_MAX_POS 210 #define Z_MAX_POS 210
#define Z_MIN_POS 0.15 #define Z_MIN_POS 0.15
// Z height correction value
#define Z_MAX_POS_XYZ_CALIBRATION_CORRECTION 9
// Canceled home position // Canceled home position
#define X_CANCEL_POS 50 #define X_CANCEL_POS 50
#define Y_CANCEL_POS 190 #define Y_CANCEL_POS 190

3
Firmware/variants/MK3S.h
View File

@ -66,6 +66,9 @@
#define Z_MAX_POS 210 #define Z_MAX_POS 210
#define Z_MIN_POS 0.15 #define Z_MIN_POS 0.15
// Z height correction value
#define Z_MAX_POS_XYZ_CALIBRATION_CORRECTION 9
// Canceled home position // Canceled home position
#define X_CANCEL_POS 50 #define X_CANCEL_POS 50
#define Y_CANCEL_POS 190 #define Y_CANCEL_POS 190