From 56c6e24e3e89097c78756cccfa90469f98839268 Mon Sep 17 00:00:00 2001 From: Holger Wirtz Date: Sat, 20 Mar 2021 14:59:44 +0100 Subject: [PATCH] Changes with Niklas. --- Marlin/Configuration.h | 66 +++++++++++++++++++++++++++----------- Marlin/Configuration_adv.h | 7 +++- 2 files changed, 53 insertions(+), 20 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index ac19e1b..ae08ef9 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -468,7 +468,8 @@ #define HEATER_5_MAXTEMP 275 #define HEATER_6_MAXTEMP 275 #define HEATER_7_MAXTEMP 275 -#define BED_MAXTEMP 150 +//#define BED_MAXTEMP 150 +#define BED_MAXTEMP 100 //HW //=========================================================================== //============================= PID Settings ================================ @@ -524,6 +525,7 @@ * the issues involved, don't use bed PID until someone else verifies that your hardware works. */ //#define PIDTEMPBED +#define PIDTEMPBED //HW //#define BED_LIMIT_SWITCHING @@ -751,14 +753,16 @@ * Override with M92 * X, Y, Z, E0 [, E1[, E2...]] */ -#define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 400, 96 } +//#define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 400, 96 } +#define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 400, 93 } //HW /** * Default Max Feed Rate (mm/s) * Override with M203 * X, Y, Z, E0 [, E1[, E2...]] */ -#define DEFAULT_MAX_FEEDRATE { 300, 300, 5, 25 } +// #define DEFAULT_MAX_FEEDRATE { 300, 300, 5, 25 } +#define DEFAULT_MAX_FEEDRATE { 300, 300, 5, 25 } //HW //#define LIMITED_MAX_FR_EDITING // Limit edit via M203 or LCD to DEFAULT_MAX_FEEDRATE * 2 #if ENABLED(LIMITED_MAX_FR_EDITING) @@ -771,7 +775,8 @@ * Override with M201 * X, Y, Z, E0 [, E1[, E2...]] */ -#define DEFAULT_MAX_ACCELERATION { 3000, 3000, 100, 10000 } +//#define DEFAULT_MAX_ACCELERATION { 3000, 3000, 100, 10000 } +#define DEFAULT_MAX_ACCELERATION { 500, 500, 100, 5000 } //HW //#define LIMITED_MAX_ACCEL_EDITING // Limit edit via M201 or LCD to DEFAULT_MAX_ACCELERATION * 2 #if ENABLED(LIMITED_MAX_ACCEL_EDITING) @@ -786,9 +791,12 @@ * M204 R Retract Acceleration * M204 T Travel Acceleration */ -#define DEFAULT_ACCELERATION 3000 // X, Y, Z and E acceleration for printing moves -#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts -#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves +//#define DEFAULT_ACCELERATION 3000 // X, Y, Z and E acceleration for printing moves +//#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts +//#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves +#define DEFAULT_ACCELERATION 500 // X, Y, Z and E acceleration for printing moves //HW +#define DEFAULT_RETRACT_ACCELERATION 500 // E acceleration for retracts //HW +#define DEFAULT_TRAVEL_ACCELERATION 500 // X, Y, Z acceleration for travel (non printing) moves //HW /** * Default Jerk limits (mm/s) @@ -822,7 +830,8 @@ * https://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html */ #if DISABLED(CLASSIC_JERK) - #define JUNCTION_DEVIATION_MM 0.013 // (mm) Distance from real junction edge + //#define JUNCTION_DEVIATION_MM 0.013 // (mm) Distance from real junction edge + #define JUNCTION_DEVIATION_MM 0.08 // (mm) Distance from real junction edge //HW #define JD_HANDLE_SMALL_SEGMENTS // Use curvature estimation instead of just the junction angle // for small segments (< 1mm) with large junction angles (> 135°). #endif @@ -836,6 +845,7 @@ * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained */ //#define S_CURVE_ACCELERATION +#define S_CURVE_ACCELERATION //HW //=========================================================================== //============================= Z Probe Options ============================= @@ -1000,12 +1010,14 @@ * O-- FRONT --+ */ //#define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 } -#define NOZZLE_TO_PROBE_OFFSET { -42, -12, -1 } //HW +//#define NOZZLE_TO_PROBE_OFFSET { -40, -10, -1 } //HW +#define NOZZLE_TO_PROBE_OFFSET { -10, -5, -1 } //HW +//#define NOZZLE_TO_PROBE_OFFSET { -41, -16, -2.57 } //HW Niklas // 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. //#define PROBING_MARGIN 10 -#define PROBING_MARGIN 10 //HW +#define PROBING_MARGIN 15 //HW // X and Y axis travel speed (mm/min) between probes #define XY_PROBE_SPEED (133*60) @@ -1047,6 +1059,7 @@ #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points #define Z_CLEARANCE_MULTI_PROBE 5 // Z Clearance between multiple probes //#define Z_AFTER_PROBING 5 // Z position after probing is done +#define Z_AFTER_PROBING 5 // Z position after probing is done //HW #define Z_PROBE_LOW_POINT -2 // Farthest distance below the trigger-point to go before stopping @@ -1056,6 +1069,7 @@ // Enable the M48 repeatability test to test probe accuracy //#define Z_MIN_PROBE_REPEATABILITY_TEST +#define Z_MIN_PROBE_REPEATABILITY_TEST //HW // Before deploy/stow pause for user confirmation //#define PAUSE_BEFORE_DEPLOY_STOW @@ -1073,10 +1087,12 @@ //#define PROBING_HEATERS_OFF // Turn heaters off when probing #if ENABLED(PROBING_HEATERS_OFF) //#define WAIT_FOR_BED_HEATER // Wait for bed to heat back up between probes (to improve accuracy) + #define WAIT_FOR_BED_HEATER // Wait for bed to heat back up between probes (to improve accuracy) //HW #endif //#define PROBING_FANS_OFF // Turn fans off when probing //#define PROBING_STEPPERS_OFF // Turn steppers off (unless needed to hold position) when probing //#define DELAY_BEFORE_PROBING 200 // (ms) To prevent vibrations from triggering piezo sensors +#define DELAY_BEFORE_PROBING 200 // (ms) To prevent vibrations from triggering piezo sensors //HW // For Inverting Stepper Enable Pins (Active Low) use 0, Non Inverting (Active High) use 1 // :{ 0:'Low', 1:'High' } @@ -1123,6 +1139,7 @@ // @section homing //#define NO_MOTION_BEFORE_HOMING // Inhibit movement until all axes have been homed +#define NO_MOTION_BEFORE_HOMING // Inhibit movement until all axes have been homed //HW //#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. @@ -1147,10 +1164,10 @@ #define Y_BED_SIZE 220 //HW // Travel limits (mm) after homing, corresponding to endstop positions. -//#define X_MIN_POS 0 -//#define Y_MIN_POS 0 -#define X_MIN_POS -6 //HW -#define Y_MIN_POS -6 //HW +#define X_MIN_POS 0 +#define Y_MIN_POS 0 +//#define X_MIN_POS -6 //HW +//#define Y_MIN_POS -6 //HW #define Z_MIN_POS 0 #define X_MAX_POS X_BED_SIZE #define Y_MAX_POS Y_BED_SIZE @@ -1184,6 +1201,7 @@ #if EITHER(MIN_SOFTWARE_ENDSTOPS, MAX_SOFTWARE_ENDSTOPS) //#define SOFT_ENDSTOPS_MENU_ITEM // Enable/Disable software endstops from the LCD + #define SOFT_ENDSTOPS_MENU_ITEM // Enable/Disable software endstops from the LCD //HW #endif /** @@ -1318,6 +1336,7 @@ // Beyond the probed grid, continue the implied tilt? // Default is to maintain the height of the nearest edge. //#define EXTRAPOLATE_BEYOND_GRID + #define EXTRAPOLATE_BEYOND_GRID //HW // // Experimental Subdivision of the grid by Catmull-Rom method. @@ -1368,21 +1387,25 @@ * Include a guided procedure if manual probing is enabled. */ //#define LCD_BED_LEVELING +#define LCD_BED_LEVELING //HW #if ENABLED(LCD_BED_LEVELING) #define MESH_EDIT_Z_STEP 0.025 // (mm) Step size while manually probing Z axis. #define LCD_PROBE_Z_RANGE 4 // (mm) Z Range centered on Z_MIN_POS for LCD Z adjustment //#define MESH_EDIT_MENU // Add a menu to edit mesh points + #define MESH_EDIT_MENU // Add a menu to edit mesh points //HW #endif // Add a menu item to move between bed corners for manual bed adjustment //#define LEVEL_BED_CORNERS +#define LEVEL_BED_CORNERS //HW #if ENABLED(LEVEL_BED_CORNERS) #define LEVEL_CORNERS_INSET_LFRB { 30, 30, 30, 30 } // (mm) Left, Front, Right, Back insets #define LEVEL_CORNERS_HEIGHT 0.0 // (mm) Z height of nozzle at leveling points #define LEVEL_CORNERS_Z_HOP 4.0 // (mm) Z height of nozzle between leveling points //#define LEVEL_CENTER_TOO // Move to the center after the last corner + #define LEVEL_CENTER_TOO // Move to the center after the last corner //HW #endif /** @@ -1412,7 +1435,7 @@ // - Prevent Z homing when the Z probe is outside bed area. // //#define Z_SAFE_HOMING -#define Z_SAFE_HOMING //HW +//#define Z_SAFE_HOMING //HW #if ENABLED(Z_SAFE_HOMING) #define Z_SAFE_HOMING_X_POINT X_CENTER // X point for Z homing @@ -1530,14 +1553,18 @@ // Preheat Constants #define PREHEAT_1_LABEL "PLA" -#define PREHEAT_1_TEMP_HOTEND 180 -#define PREHEAT_1_TEMP_BED 70 -#define PREHEAT_1_FAN_SPEED 0 // Value from 0 to 255 +//#define PREHEAT_1_TEMP_HOTEND 180 +#define PREHEAT_1_TEMP_HOTEND 205 //HW +//#define PREHEAT_1_TEMP_BED 70 +#define PREHEAT_1_TEMP_BED 0 //HW +//#define PREHEAT_1_FAN_SPEED 0 // Value from 0 to 255 +#define PREHEAT_1_FAN_SPEED 255 // Value from 0 to 255 //HW #define PREHEAT_2_LABEL "ABS" #define PREHEAT_2_TEMP_HOTEND 240 #define PREHEAT_2_TEMP_BED 110 -#define PREHEAT_2_FAN_SPEED 0 // Value from 0 to 255 +//#define PREHEAT_2_FAN_SPEED 0 // Value from 0 to 255 +#define PREHEAT_2_FAN_SPEED 255 // Value from 0 to 255 //HW /** * Nozzle Park @@ -1551,6 +1578,7 @@ * P2 Raise the nozzle by Z-park amount, limited to Z_MAX_POS. */ //#define NOZZLE_PARK_FEATURE +#define NOZZLE_PARK_FEATURE //HW #if ENABLED(NOZZLE_PARK_FEATURE) // Specify a park position as { X, Y, Z_raise } diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 4b8eec1..d9296d7 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -687,6 +687,7 @@ * Use the option below to force an eeprom write to a V3.1 probe regardless. */ //#define BLTOUCH_SET_5V_MODE + #define BLTOUCH_SET_5V_MODE //HW /** * Safety: Activate if connecting a probe with an unknown voltage mode. @@ -1053,6 +1054,7 @@ // Include a page of printer information in the LCD Main Menu //#define LCD_INFO_MENU + #define LCD_INFO_MENU //HW #if ENABLED(LCD_INFO_MENU) //#define LCD_PRINTER_INFO_IS_BOOTSCREEN // Show bootscreen(s) instead of Printer Info pages #endif @@ -1090,6 +1092,7 @@ // Scroll a longer status message into view //#define STATUS_MESSAGE_SCROLLING +#define STATUS_MESSAGE_SCROLLING //HW // On the Info Screen, display XY with one decimal place when possible //#define LCD_DECIMAL_SMALL_XY @@ -1218,9 +1221,11 @@ // This allows hosts to request long names for files and folders with M33 //#define LONG_FILENAME_HOST_SUPPORT + #define LONG_FILENAME_HOST_SUPPORT //HW // Enable this option to scroll long filenames in the SD card menu //#define SCROLL_LONG_FILENAMES + #define SCROLL_LONG_FILENAMES //HW // Leave the heaters on after Stop Print (not recommended!) //#define SD_ABORT_NO_COOLDOWN @@ -2524,7 +2529,7 @@ #define X_STALL_SENSITIVITY 118 //HW #define X2_STALL_SENSITIVITY X_STALL_SENSITIVITY //#define Y_STALL_SENSITIVITY 8 - #define Y_STALL_SENSITIVITY 128 //HW + #define Y_STALL_SENSITIVITY 118 //HW #define Y2_STALL_SENSITIVITY Y_STALL_SENSITIVITY //#define Z_STALL_SENSITIVITY 8 //#define Z2_STALL_SENSITIVITY Z_STALL_SENSITIVITY