mirror of
https://github.com/MarlinFirmware/Configurations.git
synced 2025-07-06 22:47:35 -06:00
More parity with CR-10 configs, etc.
This commit is contained in:
parent
c40bed0672
commit
81cb940498
6 changed files with 14 additions and 14 deletions
|
@ -747,7 +747,7 @@
|
||||||
* Override with M203
|
* Override with M203
|
||||||
* X, Y, Z, E0 [, E1[, E2...]]
|
* X, Y, Z, E0 [, E1[, E2...]]
|
||||||
*/
|
*/
|
||||||
#define DEFAULT_MAX_FEEDRATE { 500, 500, 15, 25 }
|
#define DEFAULT_MAX_FEEDRATE { 2500, 2500, 100, 25 }
|
||||||
|
|
||||||
//#define LIMITED_MAX_FR_EDITING // Limit edit via M203 or LCD to DEFAULT_MAX_FEEDRATE * 2
|
//#define LIMITED_MAX_FR_EDITING // Limit edit via M203 or LCD to DEFAULT_MAX_FEEDRATE * 2
|
||||||
#if ENABLED(LIMITED_MAX_FR_EDITING)
|
#if ENABLED(LIMITED_MAX_FR_EDITING)
|
||||||
|
@ -775,9 +775,9 @@
|
||||||
* M204 R Retract Acceleration
|
* M204 R Retract Acceleration
|
||||||
* M204 T Travel Acceleration
|
* M204 T Travel Acceleration
|
||||||
*/
|
*/
|
||||||
#define DEFAULT_ACCELERATION 500 // X, Y, Z and E acceleration for printing moves
|
#define DEFAULT_ACCELERATION 600 // X, Y, Z and E acceleration for printing moves
|
||||||
#define DEFAULT_RETRACT_ACCELERATION 500 // E acceleration for retracts
|
#define DEFAULT_RETRACT_ACCELERATION 1000 // E acceleration for retracts
|
||||||
#define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves
|
#define DEFAULT_TRAVEL_ACCELERATION 800 // X, Y, Z acceleration for travel (non printing) moves
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Default Jerk limits (mm/s)
|
* Default Jerk limits (mm/s)
|
||||||
|
@ -811,7 +811,7 @@
|
||||||
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
|
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
|
||||||
*/
|
*/
|
||||||
#if DISABLED(CLASSIC_JERK)
|
#if DISABLED(CLASSIC_JERK)
|
||||||
#define JUNCTION_DEVIATION_MM 0.08 // (mm) Distance from real junction edge
|
#define JUNCTION_DEVIATION_MM 0.067 // (mm) Distance from real junction edge
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -1088,7 +1088,7 @@
|
||||||
|
|
||||||
//#define UNKNOWN_Z_NO_RAISE // Don't raise Z (lower the bed) if Z is "unknown." For beds that fall when Z is powered off.
|
//#define UNKNOWN_Z_NO_RAISE // Don't raise Z (lower the bed) if Z is "unknown." For beds that fall when Z is powered off.
|
||||||
|
|
||||||
//#define Z_HOMING_HEIGHT 5 // (mm) Minimal Z height before homing (G28) for Z clearance above the bed, clamps, ...
|
//#define Z_HOMING_HEIGHT 4 // (mm) Minimal Z height before homing (G28) for Z clearance above the bed, clamps, ...
|
||||||
// Be sure to have this much clearance over your Z_MAX_POS to prevent grinding.
|
// Be sure to have this much clearance over your Z_MAX_POS to prevent grinding.
|
||||||
|
|
||||||
//#define Z_AFTER_HOMING 10 // (mm) Height to move to after homing Z
|
//#define Z_AFTER_HOMING 10 // (mm) Height to move to after homing Z
|
||||||
|
|
|
@ -1344,8 +1344,8 @@
|
||||||
|
|
||||||
// Manually set the home position. Leave these undefined for automatic settings.
|
// Manually set the home position. Leave these undefined for automatic settings.
|
||||||
// For DELTA this is the top-center of the Cartesian print volume.
|
// For DELTA this is the top-center of the Cartesian print volume.
|
||||||
#define MANUAL_X_HOME_POS X_MIN_POS
|
//#define MANUAL_X_HOME_POS 0
|
||||||
#define MANUAL_Y_HOME_POS Y_MIN_POS
|
//#define MANUAL_Y_HOME_POS 0
|
||||||
//#define MANUAL_Z_HOME_POS 0
|
//#define MANUAL_Z_HOME_POS 0
|
||||||
|
|
||||||
// Use "Z Safe Homing" to avoid homing with a Z probe outside the bed area.
|
// Use "Z Safe Homing" to avoid homing with a Z probe outside the bed area.
|
||||||
|
@ -1499,7 +1499,7 @@
|
||||||
|
|
||||||
#if ENABLED(NOZZLE_PARK_FEATURE)
|
#if ENABLED(NOZZLE_PARK_FEATURE)
|
||||||
// Specify a park position as { X, Y, Z_raise }
|
// Specify a park position as { X, Y, Z_raise }
|
||||||
#define NOZZLE_PARK_POINT { (X_MIN_POS + 3), (Y_MAX_POS - 3), 10 }
|
#define NOZZLE_PARK_POINT { (X_MIN_POS + 10), (Y_MAX_POS - 10), 20 }
|
||||||
#define NOZZLE_PARK_XY_FEEDRATE 100 // (mm/s) X and Y axes feedrate (also used for delta Z axis)
|
#define NOZZLE_PARK_XY_FEEDRATE 100 // (mm/s) X and Y axes feedrate (also used for delta Z axis)
|
||||||
#define NOZZLE_PARK_Z_FEEDRATE 5 // (mm/s) Z axis feedrate (not used for delta printers)
|
#define NOZZLE_PARK_Z_FEEDRATE 5 // (mm/s) Z axis feedrate (not used for delta printers)
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -1239,7 +1239,7 @@
|
||||||
/**
|
/**
|
||||||
* Enable the G26 Mesh Validation Pattern tool.
|
* Enable the G26 Mesh Validation Pattern tool.
|
||||||
*/
|
*/
|
||||||
#define G26_MESH_VALIDATION // Enable G26 mesh validation
|
#define G26_MESH_VALIDATION
|
||||||
#if ENABLED(G26_MESH_VALIDATION)
|
#if ENABLED(G26_MESH_VALIDATION)
|
||||||
#define MESH_TEST_NOZZLE_SIZE 0.4 // (mm) Diameter of primary nozzle.
|
#define MESH_TEST_NOZZLE_SIZE 0.4 // (mm) Diameter of primary nozzle.
|
||||||
#define MESH_TEST_LAYER_HEIGHT 0.2 // (mm) Default layer height for the G26 Mesh Validation Tool.
|
#define MESH_TEST_LAYER_HEIGHT 0.2 // (mm) Default layer height for the G26 Mesh Validation Tool.
|
||||||
|
|
|
@ -1246,7 +1246,7 @@
|
||||||
/**
|
/**
|
||||||
* Enable the G26 Mesh Validation Pattern tool.
|
* Enable the G26 Mesh Validation Pattern tool.
|
||||||
*/
|
*/
|
||||||
#define G26_MESH_VALIDATION // Enable G26 mesh validation
|
#define G26_MESH_VALIDATION
|
||||||
#if ENABLED(G26_MESH_VALIDATION)
|
#if ENABLED(G26_MESH_VALIDATION)
|
||||||
#define MESH_TEST_NOZZLE_SIZE 0.4 // (mm) Diameter of primary nozzle.
|
#define MESH_TEST_NOZZLE_SIZE 0.4 // (mm) Diameter of primary nozzle.
|
||||||
#define MESH_TEST_LAYER_HEIGHT 0.2 // (mm) Default layer height for the G26 Mesh Validation Tool.
|
#define MESH_TEST_LAYER_HEIGHT 0.2 // (mm) Default layer height for the G26 Mesh Validation Tool.
|
||||||
|
|
|
@ -1346,9 +1346,9 @@
|
||||||
|
|
||||||
// Manually set the home position. Leave these undefined for automatic settings.
|
// Manually set the home position. Leave these undefined for automatic settings.
|
||||||
// For DELTA this is the top-center of the Cartesian print volume.
|
// For DELTA this is the top-center of the Cartesian print volume.
|
||||||
#define MANUAL_X_HOME_POS X_MAX_POS
|
//#define MANUAL_X_HOME_POS 0
|
||||||
#define MANUAL_Y_HOME_POS -7
|
#define MANUAL_Y_HOME_POS -7
|
||||||
#define MANUAL_Z_HOME_POS 0
|
//#define MANUAL_Z_HOME_POS 0
|
||||||
|
|
||||||
// Use "Z Safe Homing" to avoid homing with a Z probe outside the bed area.
|
// Use "Z Safe Homing" to avoid homing with a Z probe outside the bed area.
|
||||||
//
|
//
|
||||||
|
|
|
@ -1247,7 +1247,7 @@
|
||||||
/**
|
/**
|
||||||
* Enable the G26 Mesh Validation Pattern tool.
|
* Enable the G26 Mesh Validation Pattern tool.
|
||||||
*/
|
*/
|
||||||
#define G26_MESH_VALIDATION // Enable G26 mesh validation
|
#define G26_MESH_VALIDATION
|
||||||
#if ENABLED(G26_MESH_VALIDATION)
|
#if ENABLED(G26_MESH_VALIDATION)
|
||||||
#define MESH_TEST_NOZZLE_SIZE 0.4 // (mm) Diameter of primary nozzle.
|
#define MESH_TEST_NOZZLE_SIZE 0.4 // (mm) Diameter of primary nozzle.
|
||||||
#define MESH_TEST_LAYER_HEIGHT 0.2 // (mm) Default layer height for the G26 Mesh Validation Tool.
|
#define MESH_TEST_LAYER_HEIGHT 0.2 // (mm) Default layer height for the G26 Mesh Validation Tool.
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue