diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index e7a9181..bbeedc3 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -818,8 +818,8 @@ #endif // Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup). -#define X_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop. -#define Y_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop. +#define X_MIN_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop. +#define Y_MIN_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop. #define Z_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop. #define I_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop. #define J_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop. @@ -902,14 +902,14 @@ * Override with M92 * X, Y, Z [, I [, J [, K]]], E0 [, E1[, E2...]] */ -#define DEFAULT_AXIS_STEPS_PER_UNIT { 79.92, 79.92, 400, 150 } +#define DEFAULT_AXIS_STEPS_PER_UNIT { 79.92, 79.92, 400, 139.4 } /** * Default Max Feed Rate (mm/s) * Override with M203 * X, Y, Z [, I [, J [, K]]], E0 [, E1[, E2...]] */ -#define DEFAULT_MAX_FEEDRATE { 400, 400, 8, 50 } +#define DEFAULT_MAX_FEEDRATE { 500, 500, 5, 25 } //#define LIMITED_MAX_FR_EDITING // Limit edit via M203 or LCD to DEFAULT_MAX_FEEDRATE * 2 #if ENABLED(LIMITED_MAX_FR_EDITING) @@ -922,7 +922,7 @@ * Override with M201 * X, Y, Z [, I [, J [, K]]], E0 [, E1[, E2...]] */ -#define DEFAULT_MAX_ACCELERATION { 800, 800, 100, 10000 } +#define DEFAULT_MAX_ACCELERATION { 500, 500, 100, 5000 } //#define LIMITED_MAX_ACCEL_EDITING // Limit edit via M201 or LCD to DEFAULT_MAX_ACCELERATION * 2 #if ENABLED(LIMITED_MAX_ACCEL_EDITING) @@ -1154,7 +1154,7 @@ * | [-] | * O-- FRONT --+ */ -#define NOZZLE_TO_PROBE_OFFSET { 63, 8, 2 } +#define NOZZLE_TO_PROBE_OFFSET { 63, 8, -1.9 } // Most probes should stay away from the edges of the bed, but // with NOZZLE_AS_PROBE this can be negative for a wider probing area. @@ -1230,8 +1230,8 @@ #define Z_PROBE_LOW_POINT -3 // Farthest distance below the trigger-point to go before stopping // For M851 give a range for adjusting the Z probe offset -#define Z_PROBE_OFFSET_RANGE_MIN -30 -#define Z_PROBE_OFFSET_RANGE_MAX 30 +#define Z_PROBE_OFFSET_RANGE_MIN -50 +#define Z_PROBE_OFFSET_RANGE_MAX 50 // Enable the M48 repeatability test to test probe accuracy #define Z_MIN_PROBE_REPEATABILITY_TEST @@ -1297,7 +1297,7 @@ // Invert the stepper direction. Change (or reverse the motor connector) if an axis goes the wrong way. #define INVERT_X_DIR false -#define INVERT_Y_DIR false +#define INVERT_Y_DIR true #define INVERT_Z_DIR true //#define INVERT_I_DIR false //#define INVERT_J_DIR false @@ -1344,8 +1344,8 @@ // @section machine // The size of the printable area -#define X_BED_SIZE 225 -#define Y_BED_SIZE 225 +#define X_BED_SIZE 235 +#define Y_BED_SIZE 235 // Travel limits (mm) after homing, corresponding to endstop positions. #define X_MIN_POS 0 @@ -1353,7 +1353,7 @@ #define Z_MIN_POS 0 #define X_MAX_POS X_BED_SIZE #define Y_MAX_POS Y_BED_SIZE -#define Z_MAX_POS 225 +#define Z_MAX_POS 250 //#define I_MIN_POS 0 //#define I_MAX_POS 50 //#define J_MIN_POS 0 diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index d0be182..6759517 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -2583,7 +2583,7 @@ #define INTERPOLATE true #if AXIS_IS_TMC(X) - #define X_CURRENT 800 // (mA) RMS current. Multiply by 1.414 for peak current. + #define X_CURRENT 450 // (mA) RMS current. Multiply by 1.414 for peak current. #define X_CURRENT_HOME X_CURRENT // (mA) RMS current for sensorless homing #define X_MICROSTEPS 16 // 0..256 #define X_RSENSE 0.11 @@ -2592,7 +2592,7 @@ #endif #if AXIS_IS_TMC(X2) - #define X2_CURRENT 800 + #define X2_CURRENT 450 #define X2_CURRENT_HOME X2_CURRENT #define X2_MICROSTEPS X_MICROSTEPS #define X2_RSENSE 0.11 @@ -2601,7 +2601,7 @@ #endif #if AXIS_IS_TMC(Y) - #define Y_CURRENT 800 + #define Y_CURRENT 450 #define Y_CURRENT_HOME Y_CURRENT #define Y_MICROSTEPS 16 #define Y_RSENSE 0.11 @@ -2610,7 +2610,7 @@ #endif #if AXIS_IS_TMC(Y2) - #define Y2_CURRENT 800 + #define Y2_CURRENT 450 #define Y2_CURRENT_HOME Y2_CURRENT #define Y2_MICROSTEPS Y_MICROSTEPS #define Y2_RSENSE 0.11 @@ -2619,7 +2619,7 @@ #endif #if AXIS_IS_TMC(Z) - #define Z_CURRENT 800 + #define Z_CURRENT 600 #define Z_CURRENT_HOME Z_CURRENT #define Z_MICROSTEPS 16 #define Z_RSENSE 0.11 @@ -2628,7 +2628,7 @@ #endif #if AXIS_IS_TMC(Z2) - #define Z2_CURRENT 800 + #define Z2_CURRENT 600 #define Z2_CURRENT_HOME Z2_CURRENT #define Z2_MICROSTEPS Z_MICROSTEPS #define Z2_RSENSE 0.11 @@ -2637,7 +2637,7 @@ #endif #if AXIS_IS_TMC(Z3) - #define Z3_CURRENT 800 + #define Z3_CURRENT 450 #define Z3_CURRENT_HOME Z3_CURRENT #define Z3_MICROSTEPS Z_MICROSTEPS #define Z3_RSENSE 0.11 @@ -2646,7 +2646,7 @@ #endif #if AXIS_IS_TMC(Z4) - #define Z4_CURRENT 800 + #define Z4_CURRENT 450 #define Z4_CURRENT_HOME Z4_CURRENT #define Z4_MICROSTEPS Z_MICROSTEPS #define Z4_RSENSE 0.11 @@ -2655,7 +2655,7 @@ #endif #if AXIS_IS_TMC(I) - #define I_CURRENT 800 + #define I_CURRENT 450 #define I_CURRENT_HOME I_CURRENT #define I_MICROSTEPS 16 #define I_RSENSE 0.11 @@ -2664,7 +2664,7 @@ #endif #if AXIS_IS_TMC(J) - #define J_CURRENT 800 + #define J_CURRENT 450 #define J_CURRENT_HOME J_CURRENT #define J_MICROSTEPS 16 #define J_RSENSE 0.11 @@ -2673,7 +2673,7 @@ #endif #if AXIS_IS_TMC(K) - #define K_CURRENT 800 + #define K_CURRENT 450 #define K_CURRENT_HOME K_CURRENT #define K_MICROSTEPS 16 #define K_RSENSE 0.11 @@ -2682,7 +2682,7 @@ #endif #if AXIS_IS_TMC(E0) - #define E0_CURRENT 950 + #define E0_CURRENT 650 #define E0_MICROSTEPS 16 #define E0_RSENSE 0.11 #define E0_CHAIN_POS -1 @@ -2690,7 +2690,7 @@ #endif #if AXIS_IS_TMC(E1) - #define E1_CURRENT 800 + #define E1_CURRENT 650 #define E1_MICROSTEPS E0_MICROSTEPS #define E1_RSENSE 0.11 #define E1_CHAIN_POS -1 @@ -2698,7 +2698,7 @@ #endif #if AXIS_IS_TMC(E2) - #define E2_CURRENT 800 + #define E2_CURRENT 650 #define E2_MICROSTEPS E0_MICROSTEPS #define E2_RSENSE 0.11 #define E2_CHAIN_POS -1 @@ -2706,7 +2706,7 @@ #endif #if AXIS_IS_TMC(E3) - #define E3_CURRENT 800 + #define E3_CURRENT 650 #define E3_MICROSTEPS E0_MICROSTEPS #define E3_RSENSE 0.11 #define E3_CHAIN_POS -1 @@ -2714,7 +2714,7 @@ #endif #if AXIS_IS_TMC(E4) - #define E4_CURRENT 800 + #define E4_CURRENT 650 #define E4_MICROSTEPS E0_MICROSTEPS #define E4_RSENSE 0.11 #define E4_CHAIN_POS -1 @@ -2722,7 +2722,7 @@ #endif #if AXIS_IS_TMC(E5) - #define E5_CURRENT 800 + #define E5_CURRENT 650 #define E5_MICROSTEPS E0_MICROSTEPS #define E5_RSENSE 0.11 #define E5_CHAIN_POS -1 @@ -2730,7 +2730,7 @@ #endif #if AXIS_IS_TMC(E6) - #define E6_CURRENT 800 + #define E6_CURRENT 650 #define E6_MICROSTEPS E0_MICROSTEPS #define E6_RSENSE 0.11 #define E6_CHAIN_POS -1 @@ -2738,7 +2738,7 @@ #endif #if AXIS_IS_TMC(E7) - #define E7_CURRENT 800 + #define E7_CURRENT 650 #define E7_MICROSTEPS E0_MICROSTEPS #define E7_RSENSE 0.11 #define E7_CHAIN_POS -1 @@ -2826,9 +2826,9 @@ */ #define STEALTHCHOP_XY #define STEALTHCHOP_Z - #define STEALTHCHOP_I - #define STEALTHCHOP_J - #define STEALTHCHOP_K + //#define STEALTHCHOP_I + //#define STEALTHCHOP_J + //#define STEALTHCHOP_K #define STEALTHCHOP_E /** @@ -2846,7 +2846,7 @@ * Define your own with: * { , , hysteresis_start[1..8] } */ - #define CHOPPER_TIMING CHOPPER_DEFAULT_12V // All axes (override below) + #define CHOPPER_TIMING CHOPPER_DEFAULT_24V // All axes (override below) //#define CHOPPER_TIMING_X CHOPPER_TIMING // For X Axes (override below) //#define CHOPPER_TIMING_X2 CHOPPER_TIMING_X //#define CHOPPER_TIMING_Y CHOPPER_TIMING // For Y Axes (override below) @@ -2890,14 +2890,14 @@ * STEALTHCHOP_(XY|Z|E) must be enabled to use HYBRID_THRESHOLD. * M913 X/Y/Z/E to live tune the setting */ - //#define HYBRID_THRESHOLD + #define HYBRID_THRESHOLD - #define X_HYBRID_THRESHOLD 100 // [mm/s] - #define X2_HYBRID_THRESHOLD 100 - #define Y_HYBRID_THRESHOLD 100 - #define Y2_HYBRID_THRESHOLD 100 - #define Z_HYBRID_THRESHOLD 3 - #define Z2_HYBRID_THRESHOLD 3 + #define X_HYBRID_THRESHOLD 250 // [mm/s] + #define X2_HYBRID_THRESHOLD 250 + #define Y_HYBRID_THRESHOLD 250 + #define Y2_HYBRID_THRESHOLD 250 + #define Z_HYBRID_THRESHOLD 30 + #define Z2_HYBRID_THRESHOLD 30 #define Z3_HYBRID_THRESHOLD 3 #define Z4_HYBRID_THRESHOLD 3 #define I_HYBRID_THRESHOLD 3