From 3fdb630c42f75f2e2d112c0ce94e6b9f18a19925 Mon Sep 17 00:00:00 2001 From: michalprusa Date: Thu, 6 Jul 2017 20:40:56 +0200 Subject: [PATCH] Mesh bed leveling calibrated to new MK42 24V heatbed (rev 0.3b) Increased currents in Z and E axis Decreased stallguard sensitivity E axis microsteps changed to 64 --- Firmware/mesh_bed_calibration.cpp | 10 ++++---- .../variants/1_75mm_MK3-EINY04-E3Dv6full.h | 25 +++++++++++-------- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/Firmware/mesh_bed_calibration.cpp b/Firmware/mesh_bed_calibration.cpp index ca5312ac..9b207513 100644 --- a/Firmware/mesh_bed_calibration.cpp +++ b/Firmware/mesh_bed_calibration.cpp @@ -51,10 +51,10 @@ const float bed_skew_angle_extreme = (0.25f * M_PI / 180.f); // Positions of the bed reference points in the machine coordinates, referenced to the P.I.N.D.A sensor. // The points are ordered in a zig-zag fashion to speed up the calibration. const float bed_ref_points[] PROGMEM = { - 13.f - BED_ZERO_REF_X, 6.4f - BED_ZERO_REF_Y, - 115.f - BED_ZERO_REF_X, 6.4f - BED_ZERO_REF_Y, - 216.f - BED_ZERO_REF_X, 6.4f - BED_ZERO_REF_Y, - + 13.f - BED_ZERO_REF_X, 8.4f - BED_ZERO_REF_Y, + 115.f - BED_ZERO_REF_X, 8.4f - BED_ZERO_REF_Y, + 216.f - BED_ZERO_REF_X, 8.4f - BED_ZERO_REF_Y, + 216.f - BED_ZERO_REF_X, 104.4f - BED_ZERO_REF_Y, 115.f - BED_ZERO_REF_X, 104.4f - BED_ZERO_REF_Y, 13.f - BED_ZERO_REF_X, 104.4f - BED_ZERO_REF_Y, @@ -67,7 +67,7 @@ const float bed_ref_points[] PROGMEM = { // Positions of the bed reference points in the machine coordinates, referenced to the P.I.N.D.A sensor. // The points are the following: center front, center right, center rear, center left. const float bed_ref_points_4[] PROGMEM = { - 115.f - BED_ZERO_REF_X, 6.4f - BED_ZERO_REF_Y, + 115.f - BED_ZERO_REF_X, 8.4f - BED_ZERO_REF_Y, 216.f - BED_ZERO_REF_X, 104.4f - BED_ZERO_REF_Y, 115.f - BED_ZERO_REF_X, 202.4f - BED_ZERO_REF_Y, 13.f - BED_ZERO_REF_X, 104.4f - BED_ZERO_REF_Y diff --git a/Firmware/variants/1_75mm_MK3-EINY04-E3Dv6full.h b/Firmware/variants/1_75mm_MK3-EINY04-E3Dv6full.h index 7c201d8b..b9cae5ec 100644 --- a/Firmware/variants/1_75mm_MK3-EINY04-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3-EINY04-E3Dv6full.h @@ -33,7 +33,7 @@ // Steps per unit {X,Y,Z,E} //#define DEFAULT_AXIS_STEPS_PER_UNIT {100,100,3200/8,140} -#define DEFAULT_AXIS_STEPS_PER_UNIT {100,100,3200/8,280} +#define DEFAULT_AXIS_STEPS_PER_UNIT {100,100,3200/8,280*4} // Endstop inverting const bool X_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic of the endstop. @@ -42,14 +42,14 @@ const bool Z_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic o // Home position #define MANUAL_X_HOME_POS 0 -#define MANUAL_Y_HOME_POS -2.2 +#define MANUAL_Y_HOME_POS -13 #define MANUAL_Z_HOME_POS 0.2 // Travel limits after homing #define X_MAX_POS 255 #define X_MIN_POS 0 #define Y_MAX_POS 210 -#define Y_MIN_POS -4 +#define Y_MIN_POS -13 #define Z_MAX_POS 210 #define Z_MIN_POS 0.15 @@ -97,7 +97,7 @@ const bool Z_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic o #define TMC2130_USTEPS_XY 16 // microstep resolution for XY axes #define TMC2130_USTEPS_Z 16 // microstep resolution for Z axis -#define TMC2130_USTEPS_E 16 // microstep resolution for E axis +#define TMC2130_USTEPS_E 64 // microstep resolution for E axis #define TMC2130_INTPOL_XY 1 // extrapolate 256 for XY axes #define TMC2130_INTPOL_Z 1 // extrapolate 256 for Z axis #define TMC2130_INTPOL_E 1 // extrapolate 256 for E axis @@ -129,15 +129,15 @@ const bool Z_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic o #define TMC2130_SG_HOMING 1 // stallguard homing #define TMC2130_SG_HOMING_SW 1 // stallguard "software" homing -#define TMC2130_SG_THRS_X 30 // stallguard sensitivity for X axis -#define TMC2130_SG_THRS_Y 30 // stallguard sensitivity for Y axis +#define TMC2130_SG_THRS_X 40 // stallguard sensitivity for X axis +#define TMC2130_SG_THRS_Y 40 // stallguard sensitivity for Y axis #define TMC2130_SG_DELAY 10 // stallguard delay (temporary solution) //new settings is possible for vsense = 1 -#define TMC2130_CURRENTS_H {3, 3, 5, 8} // default holding currents for all axes -#define TMC2130_CURRENTS_R {13, 13, 20, 20} // default running currents for all axes +#define TMC2130_CURRENTS_H {15, 15, 20, 30} // default holding currents for all axes +#define TMC2130_CURRENTS_R {15, 15, 30, 30} // default running currents for all axes -#define TMC2130_DEBUG +//#define TMC2130_DEBUG //#define TMC2130_DEBUG_WR //#define TMC2130_DEBUG_RD @@ -273,7 +273,7 @@ const bool Z_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic o // Mesh definitions #define MESH_MIN_X 35 #define MESH_MAX_X 238 -#define MESH_MIN_Y 6 +#define MESH_MIN_Y 8 #define MESH_MAX_Y 202 // Mesh upsample definition @@ -287,7 +287,7 @@ const bool Z_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic o #define MESH_HOME_Z_SEARCH 5 //Z lift for homing, mesh bed leveling etc. #define X_PROBE_OFFSET_FROM_EXTRUDER 23 // Z probe to nozzle X offset: -left +right -#define Y_PROBE_OFFSET_FROM_EXTRUDER 9 // Z probe to nozzle Y offset: -front +behind +#define Y_PROBE_OFFSET_FROM_EXTRUDER 8 // Z probe to nozzle Y offset: -front +behind #define Z_PROBE_OFFSET_FROM_EXTRUDER -0.4 // Z probe to nozzle Z offset: -below (always!) #endif @@ -464,4 +464,7 @@ const bool Z_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic o #define DEFAULT_RETRACTION 1 //used for PINDA temp calibration and pause print #endif + +#define UVLO_Z_AXIS_SHIFT 2 + #endif //__CONFIGURATION_PRUSA_H