diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 7226831..f495d14 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -4,5 +4,8 @@ "recommendations": [ "marlinfirmware.auto-build", "platformio.platformio-ide" + ], + "unwantedRecommendations": [ + "ms-vscode.cpptools-extension-pack" ] } diff --git a/Custom_configuration_params_v1.diff b/Custom_configuration_params_v1.diff new file mode 100644 index 0000000..b17c256 --- /dev/null +++ b/Custom_configuration_params_v1.diff @@ -0,0 +1,349 @@ +diff --git a/.vscode/extensions.json b/.vscode/extensions.json +index 7226831..f495d14 100644 +--- a/.vscode/extensions.json ++++ b/.vscode/extensions.json +@@ -4,5 +4,8 @@ + "recommendations": [ + "marlinfirmware.auto-build", + "platformio.platformio-ide" ++ ], ++ "unwantedRecommendations": [ ++ "ms-vscode.cpptools-extension-pack" + ] + } +diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h +index cc7778a..b42b685 100644 +--- a/Marlin/Configuration.h ++++ b/Marlin/Configuration.h +@@ -21,7 +21,7 @@ + */ + #pragma once + +-#define CONFIG_EXAMPLES_DIR "Creality/CR-10/CrealityV1" ++//#define CONFIG_EXAMPLES_DIR "Creality/CR-10/CrealityV1" + + /** + * Configuration.h +@@ -86,10 +86,10 @@ + */ + + // Show the Marlin bootscreen on startup. ** ENABLE FOR PRODUCTION ** +-#define SHOW_BOOTSCREEN ++//#define SHOW_BOOTSCREEN + + // Show the bitmap in Marlin/_Bootscreen.h on startup. +-#define SHOW_CUSTOM_BOOTSCREEN ++//#define SHOW_CUSTOM_BOOTSCREEN + + // Show the bitmap in Marlin/_Statusscreen.h on the status screen. + //#define CUSTOM_STATUS_SCREEN_IMAGE +@@ -98,7 +98,7 @@ + + // Choose the name from boards.h that matches your setup + #ifndef MOTHERBOARD +- #define MOTHERBOARD BOARD_MELZI_CREALITY ++ #define MOTHERBOARD BOARD_BTT_SKR_V1_4_TURBO + #endif + + /** +@@ -109,7 +109,7 @@ + * + * :[-1, 0, 1, 2, 3, 4, 5, 6, 7] + */ +-#define SERIAL_PORT 0 ++#define SERIAL_PORT -1 + + /** + * Serial Port Baud Rate +@@ -130,8 +130,8 @@ + * Currently Ethernet (-2) is only supported on Teensy 4.1 boards. + * :[-2, -1, 0, 1, 2, 3, 4, 5, 6, 7] + */ +-//#define SERIAL_PORT_2 -1 +-//#define BAUDRATE_2 250000 // Enable to override BAUDRATE ++#define SERIAL_PORT_2 0 ++#define BAUDRATE_2 115200 // Enable to override BAUDRATE + + /** + * Select a third serial port on the board to use for communication with the host. +@@ -557,14 +557,14 @@ + // Above this temperature the heater will be switched off. + // This can protect components from overheating, but NOT from shorts and failures. + // (Use MINTEMP for thermistor short/failure protection.) +-#define HEATER_0_MAXTEMP 275 +-#define HEATER_1_MAXTEMP 275 +-#define HEATER_2_MAXTEMP 275 +-#define HEATER_3_MAXTEMP 275 +-#define HEATER_4_MAXTEMP 275 +-#define HEATER_5_MAXTEMP 275 +-#define HEATER_6_MAXTEMP 275 +-#define HEATER_7_MAXTEMP 275 ++#define HEATER_0_MAXTEMP 290 ++#define HEATER_1_MAXTEMP 290 ++#define HEATER_2_MAXTEMP 290 ++#define HEATER_3_MAXTEMP 290 ++#define HEATER_4_MAXTEMP 290 ++#define HEATER_5_MAXTEMP 290 ++#define HEATER_6_MAXTEMP 290 ++#define HEATER_7_MAXTEMP 290 + #define BED_MAXTEMP 120 + #define CHAMBER_MAXTEMP 60 + +@@ -603,9 +603,14 @@ + #define DEFAULT_Ki_LIST { 1.72, 1.72 } + #define DEFAULT_Kd_LIST { 73.96, 73.96 } + #else +- #define DEFAULT_Kp 22.57 +- #define DEFAULT_Ki 1.72 +- #define DEFAULT_Kd 73.96 ++ // #define DEFAULT_Kp 22.57 ++ // #define DEFAULT_Ki 1.72 ++ // #define DEFAULT_Kd 73.96 ++ ++ //autotune for cr-10 ++ #define DEFAULT_Kp 16.84 ++ #define DEFAULT_Ki 1.04 ++ #define DEFAULT_Kd 67.97 + #endif + #endif // PIDTEMP + +@@ -863,9 +868,13 @@ + * TMC5130, TMC5130_STANDALONE, TMC5160, TMC5160_STANDALONE + * :['A4988', 'A5984', 'DRV8825', 'LV8729', 'L6470', 'L6474', 'POWERSTEP01', 'TB6560', 'TB6600', 'TMC2100', 'TMC2130', 'TMC2130_STANDALONE', 'TMC2160', 'TMC2160_STANDALONE', 'TMC2208', 'TMC2208_STANDALONE', 'TMC2209', 'TMC2209_STANDALONE', 'TMC26X', 'TMC26X_STANDALONE', 'TMC2660', 'TMC2660_STANDALONE', 'TMC5130', 'TMC5130_STANDALONE', 'TMC5160', 'TMC5160_STANDALONE'] + */ +-#define X_DRIVER_TYPE A4988 +-#define Y_DRIVER_TYPE A4988 +-#define Z_DRIVER_TYPE A4988 ++ ++#define X_DRIVER_TYPE TMC2209 ++#define Y_DRIVER_TYPE TMC2209 ++#define Z_DRIVER_TYPE TMC2209 ++// #define X_DRIVER_TYPE A4988 ++// #define Y_DRIVER_TYPE A4988 ++// #define Z_DRIVER_TYPE A4988 + //#define X2_DRIVER_TYPE A4988 + //#define Y2_DRIVER_TYPE A4988 + //#define Z2_DRIVER_TYPE A4988 +@@ -874,7 +883,8 @@ + //#define I_DRIVER_TYPE A4988 + //#define J_DRIVER_TYPE A4988 + //#define K_DRIVER_TYPE A4988 +-#define E0_DRIVER_TYPE A4988 ++#define E0_DRIVER_TYPE TMC2209 ++// #define E0_DRIVER_TYPE A4988 + //#define E1_DRIVER_TYPE A4988 + //#define E2_DRIVER_TYPE A4988 + //#define E3_DRIVER_TYPE A4988 +@@ -929,7 +939,7 @@ + * Override with M92 + * X, Y, Z [, I [, J [, K]]], E0 [, E1[, E2...]] + */ +-#define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 400, 95 } ++#define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 400, 93 } + + /** + * Default Max Feed Rate (mm/s) +@@ -950,6 +960,7 @@ + * X, Y, Z [, I [, J [, K]]], E0 [, E1[, E2...]] + */ + #define DEFAULT_MAX_ACCELERATION { 500, 500, 100, 5000 } ++// PREV: #define DEFAULT_MAX_ACCELERATION { 2500, 2500, 500, 5000 } + + //#define LIMITED_MAX_ACCEL_EDITING // Limit edit via M201 or LCD to DEFAULT_MAX_ACCELERATION * 2 + #if ENABLED(LIMITED_MAX_ACCEL_EDITING) +@@ -1016,7 +1027,8 @@ + * + * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained + */ +-//#define S_CURVE_ACCELERATION ++#define S_CURVE_ACCELERATION ++//Говорят качество улучшается и разгоны плавнее. + + //=========================================================================== + //============================= Z Probe Options ============================= +@@ -1032,10 +1044,10 @@ + * The probe replaces the Z-MIN endstop and is used for Z homing. + * (Automatically enables USE_PROBE_FOR_Z_HOMING.) + */ +-#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN ++// #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN + + // Force the use of the probe for Z-axis homing +-//#define USE_PROBE_FOR_Z_HOMING ++#define USE_PROBE_FOR_Z_HOMING + + /** + * Z_MIN_PROBE_PIN +@@ -1052,7 +1064,7 @@ + * - normally-closed switches to GND and D32. + * - normally-open switches to 5V and D32. + */ +-//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default ++#define Z_MIN_PROBE_PIN P0_10 // Pin 32 is the RAMPS default + + /** + * Probe Type +@@ -1089,7 +1101,7 @@ + /** + * The BLTouch probe uses a Hall effect sensor and emulates a servo. + */ +-//#define BLTOUCH ++#define BLTOUCH + + /** + * Touch-MI Probe by hotends.fr +@@ -1181,7 +1193,8 @@ + * | [-] | + * O-- FRONT --+ + */ +-#define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 } ++#define NOZZLE_TO_PROBE_OFFSET { -40, -10, 0 } ++// #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 } + + // 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. +@@ -1258,8 +1271,8 @@ + * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. + * But: `M851 Z+1` with a CLEARANCE of 2 => 2mm from bed to nozzle. + */ +-#define Z_CLEARANCE_DEPLOY_PROBE 10 // Z Clearance for Deploy/Stow +-#define Z_CLEARANCE_BETWEEN_PROBES 10 // Z Clearance between probe points ++#define Z_CLEARANCE_DEPLOY_PROBE 5 //10 // Z Clearance for Deploy/Stow ++#define Z_CLEARANCE_BETWEEN_PROBES 5 //10 // Z Clearance between probe points + #define Z_CLEARANCE_MULTI_PROBE 5 // Z Clearance between multiple probes + //#define Z_AFTER_PROBING 10 // Z position after probing is done + +@@ -1270,7 +1283,7 @@ + #define Z_PROBE_OFFSET_RANGE_MAX 20 + + // Enable the M48 repeatability test to test probe accuracy +-//#define Z_MIN_PROBE_REPEATABILITY_TEST ++#define Z_MIN_PROBE_REPEATABILITY_TEST + + // Before deploy/stow pause for user confirmation + //#define PAUSE_BEFORE_DEPLOY_STOW +@@ -1385,7 +1398,7 @@ + + // Travel limits (mm) after homing, corresponding to endstop positions. + #define X_MIN_POS 0 +-#define Y_MIN_POS 0 ++#define Y_MIN_POS -10 //0 + #define Z_MIN_POS 0 + #define X_MAX_POS X_BED_SIZE + 20 + #define Y_MAX_POS Y_BED_SIZE +@@ -1547,7 +1560,7 @@ + */ + //#define AUTO_BED_LEVELING_3POINT + //#define AUTO_BED_LEVELING_LINEAR +-//#define AUTO_BED_LEVELING_BILINEAR ++#define AUTO_BED_LEVELING_BILINEAR + //#define AUTO_BED_LEVELING_UBL + //#define MESH_BED_LEVELING + +@@ -1678,7 +1691,7 @@ + * Add a bed leveling sub-menu for ABL or MBL. + * Include a guided procedure if manual probing is enabled. + */ +-//#define LCD_BED_LEVELING ++#define LCD_BED_LEVELING + + #if ENABLED(LCD_BED_LEVELING) + #define MESH_EDIT_Z_STEP 0.025 // (mm) Step size while manually probing Z axis. +@@ -1748,7 +1761,7 @@ + * - Allows Z homing only when XY positions are known and trusted. + * - If stepper drivers sleep, XY homing may be required again before Z homing. + */ +-//#define Z_SAFE_HOMING ++#define Z_SAFE_HOMING + + #if ENABLED(Z_SAFE_HOMING) + #define Z_SAFE_HOMING_X_POINT X_CENTER // X point for Z homing +diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h +index d5a0529..ccb5162 100644 +--- a/Marlin/Configuration_adv.h ++++ b/Marlin/Configuration_adv.h +@@ -1282,17 +1282,17 @@ + + // Add Probe Z Offset calibration to the Z Probe Offsets menu + #if HAS_BED_PROBE +- //#define PROBE_OFFSET_WIZARD ++ #define PROBE_OFFSET_WIZARD + #if ENABLED(PROBE_OFFSET_WIZARD) + // + // Enable to init the Probe Z-Offset when starting the Wizard. + // Use a height slightly above the estimated nozzle-to-probe Z offset. + // For example, with an offset of -5, consider a starting height of -4. + // +- //#define PROBE_OFFSET_WIZARD_START_Z -4.0 ++ #define PROBE_OFFSET_WIZARD_START_Z -4.0 + + // Set a convenient position to do the calibration (probing point and nozzle/bed-distance) +- //#define PROBE_OFFSET_WIZARD_XY_POS { X_CENTER, Y_CENTER } ++ #define PROBE_OFFSET_WIZARD_XY_POS { X_CENTER, Y_CENTER } + #endif + + #if ENABLED(AUTO_BED_LEVELING_BILINEAR) +@@ -1528,7 +1528,7 @@ + //#define LONG_FILENAME_HOST_SUPPORT + + // Enable this option to scroll long filenames in the SD card menu +- //#define SCROLL_LONG_FILENAMES ++ #define SCROLL_LONG_FILENAMES + + // Leave the heaters on after Stop Print (not recommended!) + //#define SD_ABORT_NO_COOLDOWN +@@ -1629,6 +1629,8 @@ + * :[ 'LCD', 'ONBOARD', 'CUSTOM_CABLE' ] + */ + //#define SDCARD_CONNECTION LCD ++ //Для CR-10 выставляем слот SD на плате ++ #define SDCARD_CONNECTION ONBOARD + + // Enable if SD detect is rendered useless (e.g., by using an SD extender) + //#define NO_SD_DETECT +@@ -1991,7 +1993,7 @@ + * + * See https://marlinfw.org/docs/features/lin_advance.html for full instructions. + */ +-//#define LIN_ADVANCE ++// #define LIN_ADVANCE + #if ENABLED(LIN_ADVANCE) + //#define EXTRA_LIN_ADVANCE_K // Enable for second linear advance constants + #define LIN_ADVANCE_K 0.22 // Unit: mm compression per 1mm/s extruder speed +@@ -2686,7 +2688,8 @@ + #define INTERPOLATE true + + #if AXIS_IS_TMC(X) +- #define X_CURRENT 650 // (mA) RMS current. Multiply by 1.414 for peak current. ++ //more current ++ #define X_CURRENT 720 // (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 +@@ -2706,7 +2709,7 @@ + #endif + + #if AXIS_IS_TMC(Y) +- #define Y_CURRENT 650 ++ #define Y_CURRENT 720 + #define Y_CURRENT_HOME Y_CURRENT + #define Y_MICROSTEPS 16 + #define Y_RSENSE 0.11 +@@ -2726,7 +2729,7 @@ + #endif + + #if AXIS_IS_TMC(Z) +- #define Z_CURRENT 580 ++ #define Z_CURRENT 680 + #define Z_CURRENT_HOME Z_CURRENT + #define Z_MICROSTEPS 16 + #define Z_RSENSE 0.11 +@@ -2796,7 +2799,7 @@ + #endif + + #if AXIS_IS_TMC(E0) +- #define E0_CURRENT 650 ++ #define E0_CURRENT 750 + #define E0_MICROSTEPS 16 + #define E0_RSENSE 0.11 + #define E0_CHAIN_POS -1 diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index cc7778a..b42b685 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -21,7 +21,7 @@ */ #pragma once -#define CONFIG_EXAMPLES_DIR "Creality/CR-10/CrealityV1" +//#define CONFIG_EXAMPLES_DIR "Creality/CR-10/CrealityV1" /** * Configuration.h @@ -86,10 +86,10 @@ */ // Show the Marlin bootscreen on startup. ** ENABLE FOR PRODUCTION ** -#define SHOW_BOOTSCREEN +//#define SHOW_BOOTSCREEN // Show the bitmap in Marlin/_Bootscreen.h on startup. -#define SHOW_CUSTOM_BOOTSCREEN +//#define SHOW_CUSTOM_BOOTSCREEN // Show the bitmap in Marlin/_Statusscreen.h on the status screen. //#define CUSTOM_STATUS_SCREEN_IMAGE @@ -98,7 +98,7 @@ // Choose the name from boards.h that matches your setup #ifndef MOTHERBOARD - #define MOTHERBOARD BOARD_MELZI_CREALITY + #define MOTHERBOARD BOARD_BTT_SKR_V1_4_TURBO #endif /** @@ -109,7 +109,7 @@ * * :[-1, 0, 1, 2, 3, 4, 5, 6, 7] */ -#define SERIAL_PORT 0 +#define SERIAL_PORT -1 /** * Serial Port Baud Rate @@ -130,8 +130,8 @@ * Currently Ethernet (-2) is only supported on Teensy 4.1 boards. * :[-2, -1, 0, 1, 2, 3, 4, 5, 6, 7] */ -//#define SERIAL_PORT_2 -1 -//#define BAUDRATE_2 250000 // Enable to override BAUDRATE +#define SERIAL_PORT_2 0 +#define BAUDRATE_2 115200 // Enable to override BAUDRATE /** * Select a third serial port on the board to use for communication with the host. @@ -557,14 +557,14 @@ // Above this temperature the heater will be switched off. // This can protect components from overheating, but NOT from shorts and failures. // (Use MINTEMP for thermistor short/failure protection.) -#define HEATER_0_MAXTEMP 275 -#define HEATER_1_MAXTEMP 275 -#define HEATER_2_MAXTEMP 275 -#define HEATER_3_MAXTEMP 275 -#define HEATER_4_MAXTEMP 275 -#define HEATER_5_MAXTEMP 275 -#define HEATER_6_MAXTEMP 275 -#define HEATER_7_MAXTEMP 275 +#define HEATER_0_MAXTEMP 290 +#define HEATER_1_MAXTEMP 290 +#define HEATER_2_MAXTEMP 290 +#define HEATER_3_MAXTEMP 290 +#define HEATER_4_MAXTEMP 290 +#define HEATER_5_MAXTEMP 290 +#define HEATER_6_MAXTEMP 290 +#define HEATER_7_MAXTEMP 290 #define BED_MAXTEMP 120 #define CHAMBER_MAXTEMP 60 @@ -603,9 +603,14 @@ #define DEFAULT_Ki_LIST { 1.72, 1.72 } #define DEFAULT_Kd_LIST { 73.96, 73.96 } #else - #define DEFAULT_Kp 22.57 - #define DEFAULT_Ki 1.72 - #define DEFAULT_Kd 73.96 + // #define DEFAULT_Kp 22.57 + // #define DEFAULT_Ki 1.72 + // #define DEFAULT_Kd 73.96 + + //autotune for cr-10 + #define DEFAULT_Kp 16.84 + #define DEFAULT_Ki 1.04 + #define DEFAULT_Kd 67.97 #endif #endif // PIDTEMP @@ -863,9 +868,13 @@ * TMC5130, TMC5130_STANDALONE, TMC5160, TMC5160_STANDALONE * :['A4988', 'A5984', 'DRV8825', 'LV8729', 'L6470', 'L6474', 'POWERSTEP01', 'TB6560', 'TB6600', 'TMC2100', 'TMC2130', 'TMC2130_STANDALONE', 'TMC2160', 'TMC2160_STANDALONE', 'TMC2208', 'TMC2208_STANDALONE', 'TMC2209', 'TMC2209_STANDALONE', 'TMC26X', 'TMC26X_STANDALONE', 'TMC2660', 'TMC2660_STANDALONE', 'TMC5130', 'TMC5130_STANDALONE', 'TMC5160', 'TMC5160_STANDALONE'] */ -#define X_DRIVER_TYPE A4988 -#define Y_DRIVER_TYPE A4988 -#define Z_DRIVER_TYPE A4988 + +#define X_DRIVER_TYPE TMC2209 +#define Y_DRIVER_TYPE TMC2209 +#define Z_DRIVER_TYPE TMC2209 +// #define X_DRIVER_TYPE A4988 +// #define Y_DRIVER_TYPE A4988 +// #define Z_DRIVER_TYPE A4988 //#define X2_DRIVER_TYPE A4988 //#define Y2_DRIVER_TYPE A4988 //#define Z2_DRIVER_TYPE A4988 @@ -874,7 +883,8 @@ //#define I_DRIVER_TYPE A4988 //#define J_DRIVER_TYPE A4988 //#define K_DRIVER_TYPE A4988 -#define E0_DRIVER_TYPE A4988 +#define E0_DRIVER_TYPE TMC2209 +// #define E0_DRIVER_TYPE A4988 //#define E1_DRIVER_TYPE A4988 //#define E2_DRIVER_TYPE A4988 //#define E3_DRIVER_TYPE A4988 @@ -929,7 +939,7 @@ * Override with M92 * X, Y, Z [, I [, J [, K]]], E0 [, E1[, E2...]] */ -#define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 400, 95 } +#define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 400, 93 } /** * Default Max Feed Rate (mm/s) @@ -950,6 +960,7 @@ * X, Y, Z [, I [, J [, K]]], E0 [, E1[, E2...]] */ #define DEFAULT_MAX_ACCELERATION { 500, 500, 100, 5000 } +// PREV: #define DEFAULT_MAX_ACCELERATION { 2500, 2500, 500, 5000 } //#define LIMITED_MAX_ACCEL_EDITING // Limit edit via M201 or LCD to DEFAULT_MAX_ACCELERATION * 2 #if ENABLED(LIMITED_MAX_ACCEL_EDITING) @@ -1016,7 +1027,8 @@ * * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained */ -//#define S_CURVE_ACCELERATION +#define S_CURVE_ACCELERATION +//Говорят качество улучшается и разгоны плавнее. //=========================================================================== //============================= Z Probe Options ============================= @@ -1032,10 +1044,10 @@ * The probe replaces the Z-MIN endstop and is used for Z homing. * (Automatically enables USE_PROBE_FOR_Z_HOMING.) */ -#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN +// #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN // Force the use of the probe for Z-axis homing -//#define USE_PROBE_FOR_Z_HOMING +#define USE_PROBE_FOR_Z_HOMING /** * Z_MIN_PROBE_PIN @@ -1052,7 +1064,7 @@ * - normally-closed switches to GND and D32. * - normally-open switches to 5V and D32. */ -//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default +#define Z_MIN_PROBE_PIN P0_10 // Pin 32 is the RAMPS default /** * Probe Type @@ -1089,7 +1101,7 @@ /** * The BLTouch probe uses a Hall effect sensor and emulates a servo. */ -//#define BLTOUCH +#define BLTOUCH /** * Touch-MI Probe by hotends.fr @@ -1181,7 +1193,8 @@ * | [-] | * O-- FRONT --+ */ -#define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 } +#define NOZZLE_TO_PROBE_OFFSET { -40, -10, 0 } +// #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 } // 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. @@ -1258,8 +1271,8 @@ * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * But: `M851 Z+1` with a CLEARANCE of 2 => 2mm from bed to nozzle. */ -#define Z_CLEARANCE_DEPLOY_PROBE 10 // Z Clearance for Deploy/Stow -#define Z_CLEARANCE_BETWEEN_PROBES 10 // Z Clearance between probe points +#define Z_CLEARANCE_DEPLOY_PROBE 5 //10 // Z Clearance for Deploy/Stow +#define Z_CLEARANCE_BETWEEN_PROBES 5 //10 // Z Clearance between probe points #define Z_CLEARANCE_MULTI_PROBE 5 // Z Clearance between multiple probes //#define Z_AFTER_PROBING 10 // Z position after probing is done @@ -1270,7 +1283,7 @@ #define Z_PROBE_OFFSET_RANGE_MAX 20 // Enable the M48 repeatability test to test probe accuracy -//#define Z_MIN_PROBE_REPEATABILITY_TEST +#define Z_MIN_PROBE_REPEATABILITY_TEST // Before deploy/stow pause for user confirmation //#define PAUSE_BEFORE_DEPLOY_STOW @@ -1385,7 +1398,7 @@ // Travel limits (mm) after homing, corresponding to endstop positions. #define X_MIN_POS 0 -#define Y_MIN_POS 0 +#define Y_MIN_POS -10 //0 #define Z_MIN_POS 0 #define X_MAX_POS X_BED_SIZE + 20 #define Y_MAX_POS Y_BED_SIZE @@ -1547,7 +1560,7 @@ */ //#define AUTO_BED_LEVELING_3POINT //#define AUTO_BED_LEVELING_LINEAR -//#define AUTO_BED_LEVELING_BILINEAR +#define AUTO_BED_LEVELING_BILINEAR //#define AUTO_BED_LEVELING_UBL //#define MESH_BED_LEVELING @@ -1678,7 +1691,7 @@ * Add a bed leveling sub-menu for ABL or MBL. * Include a guided procedure if manual probing is enabled. */ -//#define LCD_BED_LEVELING +#define LCD_BED_LEVELING #if ENABLED(LCD_BED_LEVELING) #define MESH_EDIT_Z_STEP 0.025 // (mm) Step size while manually probing Z axis. @@ -1748,7 +1761,7 @@ * - Allows Z homing only when XY positions are known and trusted. * - If stepper drivers sleep, XY homing may be required again before Z homing. */ -//#define Z_SAFE_HOMING +#define Z_SAFE_HOMING #if ENABLED(Z_SAFE_HOMING) #define Z_SAFE_HOMING_X_POINT X_CENTER // X point for Z homing diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index d5a0529..ccb5162 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -1282,17 +1282,17 @@ // Add Probe Z Offset calibration to the Z Probe Offsets menu #if HAS_BED_PROBE - //#define PROBE_OFFSET_WIZARD + #define PROBE_OFFSET_WIZARD #if ENABLED(PROBE_OFFSET_WIZARD) // // Enable to init the Probe Z-Offset when starting the Wizard. // Use a height slightly above the estimated nozzle-to-probe Z offset. // For example, with an offset of -5, consider a starting height of -4. // - //#define PROBE_OFFSET_WIZARD_START_Z -4.0 + #define PROBE_OFFSET_WIZARD_START_Z -4.0 // Set a convenient position to do the calibration (probing point and nozzle/bed-distance) - //#define PROBE_OFFSET_WIZARD_XY_POS { X_CENTER, Y_CENTER } + #define PROBE_OFFSET_WIZARD_XY_POS { X_CENTER, Y_CENTER } #endif #if ENABLED(AUTO_BED_LEVELING_BILINEAR) @@ -1528,7 +1528,7 @@ //#define LONG_FILENAME_HOST_SUPPORT // Enable this option to scroll long filenames in the SD card menu - //#define SCROLL_LONG_FILENAMES + #define SCROLL_LONG_FILENAMES // Leave the heaters on after Stop Print (not recommended!) //#define SD_ABORT_NO_COOLDOWN @@ -1629,6 +1629,8 @@ * :[ 'LCD', 'ONBOARD', 'CUSTOM_CABLE' ] */ //#define SDCARD_CONNECTION LCD + //Для CR-10 выставляем слот SD на плате + #define SDCARD_CONNECTION ONBOARD // Enable if SD detect is rendered useless (e.g., by using an SD extender) //#define NO_SD_DETECT @@ -1991,7 +1993,7 @@ * * See https://marlinfw.org/docs/features/lin_advance.html for full instructions. */ -//#define LIN_ADVANCE +// #define LIN_ADVANCE #if ENABLED(LIN_ADVANCE) //#define EXTRA_LIN_ADVANCE_K // Enable for second linear advance constants #define LIN_ADVANCE_K 0.22 // Unit: mm compression per 1mm/s extruder speed @@ -2686,7 +2688,8 @@ #define INTERPOLATE true #if AXIS_IS_TMC(X) - #define X_CURRENT 650 // (mA) RMS current. Multiply by 1.414 for peak current. + //more current + #define X_CURRENT 720 // (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 @@ -2706,7 +2709,7 @@ #endif #if AXIS_IS_TMC(Y) - #define Y_CURRENT 650 + #define Y_CURRENT 720 #define Y_CURRENT_HOME Y_CURRENT #define Y_MICROSTEPS 16 #define Y_RSENSE 0.11 @@ -2726,7 +2729,7 @@ #endif #if AXIS_IS_TMC(Z) - #define Z_CURRENT 580 + #define Z_CURRENT 680 #define Z_CURRENT_HOME Z_CURRENT #define Z_MICROSTEPS 16 #define Z_RSENSE 0.11 @@ -2796,7 +2799,7 @@ #endif #if AXIS_IS_TMC(E0) - #define E0_CURRENT 650 + #define E0_CURRENT 750 #define E0_MICROSTEPS 16 #define E0_RSENSE 0.11 #define E0_CHAIN_POS -1