-
-
Save bafxyz/6119e5d5a8f5a659b820e7acba8ea29f to your computer and use it in GitHub Desktop.
diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h | |
index f02e69ee5..d006ae218 100644 | |
--- a/Marlin/Configuration.h | |
+++ b/Marlin/Configuration.h | |
@@ -71,7 +71,7 @@ | |
// @section info | |
// Author info of this build printed to the host during boot and M115 | |
-#define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes. | |
+#define STRING_CONFIG_H_AUTHOR "(Anrei Bunulu. SKR 1.4, MTC2209, BLTOUCH, Ender-3)" // Who made the changes. | |
//#define CUSTOM_VERSION_FILE Version.h // Path from the root directory (no quotes) | |
/** | |
@@ -89,10 +89,10 @@ | |
#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 | |
+#define CUSTOM_STATUS_SCREEN_IMAGE | |
// @section machine | |
@@ -104,13 +104,13 @@ | |
* | |
* :[-1, 0, 1, 2, 3, 4, 5, 6, 7] | |
*/ | |
-#define SERIAL_PORT 0 | |
+#define SERIAL_PORT -1 | |
/** | |
* Select a secondary serial port on the board to use for communication with the host. | |
* :[-1, 0, 1, 2, 3, 4, 5, 6, 7] | |
*/ | |
-//#define SERIAL_PORT_2 -1 | |
+#define SERIAL_PORT_2 0 | |
/** | |
* This setting determines the communication speed of the printer. | |
@@ -121,18 +121,18 @@ | |
* | |
* :[2400, 9600, 19200, 38400, 57600, 115200, 250000, 500000, 1000000] | |
*/ | |
-#define BAUDRATE 250000 | |
+#define BAUDRATE 115200 | |
// Enable the Bluetooth serial interface on AT90USB devices | |
//#define BLUETOOTH | |
// Choose the name from boards.h that matches your setup | |
#ifndef MOTHERBOARD | |
- #define MOTHERBOARD BOARD_RAMPS_14_EFB | |
+ #define MOTHERBOARD BOARD_BTT_SKR_V1_4_TURBO | |
#endif | |
// Name displayed in the LCD "Ready" message and Info menu | |
-//#define CUSTOM_MACHINE_NAME "3D Printer" | |
+#define CUSTOM_MACHINE_NAME "SKR 1.4 Turbo - Ender-3" | |
// Printer's unique ID, used by some programs to differentiate between machines. | |
// Choose your own or use a service like http://www.uuidgenerator.net/version4 | |
@@ -145,7 +145,7 @@ | |
#define EXTRUDERS 1 | |
// Generally expected filament diameter (1.75, 2.85, 3.0, ...). Used for Volumetric, Filament Width Sensor, etc. | |
-#define DEFAULT_NOMINAL_FILAMENT_DIA 3.0 | |
+#define DEFAULT_NOMINAL_FILAMENT_DIA 1.75 | |
// For Cyclops or any "multi-extruder" that shares a single nozzle. | |
//#define SINGLENOZZLE | |
@@ -414,7 +414,7 @@ | |
#define TEMP_SENSOR_5 0 | |
#define TEMP_SENSOR_6 0 | |
#define TEMP_SENSOR_7 0 | |
-#define TEMP_SENSOR_BED 0 | |
+#define TEMP_SENSOR_BED 1 | |
#define TEMP_SENSOR_PROBE 0 | |
#define TEMP_SENSOR_CHAMBER 0 | |
@@ -458,7 +458,7 @@ | |
#define HEATER_5_MAXTEMP 275 | |
#define HEATER_6_MAXTEMP 275 | |
#define HEATER_7_MAXTEMP 275 | |
-#define BED_MAXTEMP 150 | |
+#define BED_MAXTEMP 125 | |
//=========================================================================== | |
//============================= PID Settings ================================ | |
@@ -471,8 +471,8 @@ | |
#define PID_MAX BANG_MAX // Limits current to nozzle while PID is active (see PID_FUNCTIONAL_RANGE below); 255=full current | |
#define PID_K1 0.95 // Smoothing factor within any PID loop | |
#if ENABLED(PIDTEMP) | |
- //#define PID_EDIT_MENU // Add PID editing to the "Advanced Settings" menu. (~700 bytes of PROGMEM) | |
- //#define PID_AUTOTUNE_MENU // Add PID auto-tuning to the "Advanced Settings" menu. (~250 bytes of PROGMEM) | |
+ #define PID_EDIT_MENU // Add PID editing to the "Advanced Settings" menu. (~700 bytes of PROGMEM) | |
+ #define PID_AUTOTUNE_MENU // Add PID auto-tuning to the "Advanced Settings" menu. (~250 bytes of PROGMEM) | |
//#define PID_DEBUG // Sends debug data to the serial port. Use 'M303 D' to toggle activation. | |
//#define PID_OPENLOOP 1 // Puts PID in open loop. M104/M140 sets the output power from 0 to PID_MAX | |
//#define SLOW_PWM_HEATERS // PWM with very low frequency (roughly 0.125Hz=8s) and minimum state time of approximately 1s useful for heaters driven by a relay | |
@@ -482,11 +482,15 @@ | |
// is more than PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max. | |
// If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it | |
+ // Creality Ender-3 | |
+ #define DEFAULT_Kp 21.73 | |
+ #define DEFAULT_Ki 1.54 | |
+ #define DEFAULT_Kd 76.55 | |
// Ultimaker | |
- #define DEFAULT_Kp 22.2 | |
- #define DEFAULT_Ki 1.08 | |
- #define DEFAULT_Kd 114 | |
+ //#define DEFAULT_Kp 22.2 | |
+ //#define DEFAULT_Ki 1.08 | |
+ //#define DEFAULT_Kd 114 | |
// MakerGear | |
//#define DEFAULT_Kp 7.0 | |
@@ -558,7 +562,7 @@ | |
* *** IT IS HIGHLY RECOMMENDED TO LEAVE THIS OPTION ENABLED! *** | |
*/ | |
#define PREVENT_COLD_EXTRUSION | |
-#define EXTRUDE_MINTEMP 170 | |
+#define EXTRUDE_MINTEMP 185 | |
/** | |
* Prevent a single extrusion longer than EXTRUDE_MAXLENGTH. | |
@@ -646,9 +650,9 @@ | |
#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 Z_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 true // Set to true to invert the logic of the endstop. | |
#define X_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop. | |
#define Y_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop. | |
#define Z_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop. | |
@@ -670,15 +674,15 @@ | |
* 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 X2_DRIVER_TYPE A4988 | |
//#define Y2_DRIVER_TYPE A4988 | |
-//#define Z2_DRIVER_TYPE A4988 | |
+#define Z2_DRIVER_TYPE TMC2209 | |
//#define Z3_DRIVER_TYPE A4988 | |
//#define Z4_DRIVER_TYPE A4988 | |
-//#define E0_DRIVER_TYPE A4988 | |
+#define E0_DRIVER_TYPE TMC2209 | |
//#define E1_DRIVER_TYPE A4988 | |
//#define E2_DRIVER_TYPE A4988 | |
//#define E3_DRIVER_TYPE A4988 | |
@@ -730,14 +734,14 @@ | |
* Override with M92 | |
* X, Y, Z, E0 [, E1[, E2...]] | |
*/ | |
-#define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 4000, 500 } | |
+#define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 400, 96.87 } | |
/** | |
* 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 { 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) | |
@@ -750,7 +754,7 @@ | |
* Override with M201 | |
* X, Y, Z, E0 [, E1[, E2...]] | |
*/ | |
-#define DEFAULT_MAX_ACCELERATION { 3000, 3000, 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) | |
@@ -765,9 +769,9 @@ | |
* 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 500 // X, Y, Z and E acceleration for printing moves | |
+#define DEFAULT_RETRACT_ACCELERATION 500 // E acceleration for retracts | |
+#define DEFAULT_TRAVEL_ACCELERATION 500 // X, Y, Z acceleration for travel (non printing) moves | |
/** | |
* Default Jerk limits (mm/s) | |
@@ -801,7 +805,7 @@ | |
* http://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.08 // (mm) Distance from real junction edge | |
#endif | |
/** | |
@@ -884,7 +888,7 @@ | |
/** | |
* The BLTouch probe uses a Hall effect sensor and emulates a servo. | |
*/ | |
-//#define BLTOUCH | |
+#define BLTOUCH | |
/** | |
* Touch-MI Probe by hotends.fr | |
@@ -956,7 +960,7 @@ | |
* | |
* Specify a Probe position as { X, Y, Z } | |
*/ | |
-#define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 } | |
+#define NOZZLE_TO_PROBE_OFFSET { -43, -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. | |
@@ -1051,19 +1055,19 @@ | |
// @section extruder | |
#define DISABLE_E false // For all extruders | |
-#define DISABLE_INACTIVE_EXTRUDER // Keep only the active extruder enabled | |
+//#define DISABLE_INACTIVE_EXTRUDER // Keep only the active extruder enabled | |
// @section machine | |
// Invert the stepper direction. Change (or reverse the motor connector) if an axis goes the wrong way. | |
-#define INVERT_X_DIR false | |
+#define INVERT_X_DIR true | |
#define INVERT_Y_DIR true | |
#define INVERT_Z_DIR false | |
// @section extruder | |
// For direct drive extruder v9 set to true, for geared extruder set to false. | |
-#define INVERT_E0_DIR false | |
+#define INVERT_E0_DIR true | |
#define INVERT_E1_DIR false | |
#define INVERT_E2_DIR false | |
#define INVERT_E3_DIR false | |
@@ -1092,8 +1096,8 @@ | |
// @section machine | |
// The size of the print bed | |
-#define X_BED_SIZE 200 | |
-#define Y_BED_SIZE 200 | |
+#define X_BED_SIZE 235 | |
+#define Y_BED_SIZE 235 | |
// Travel limits (mm) after homing, corresponding to endstop positions. | |
#define X_MIN_POS 0 | |
@@ -1101,7 +1105,7 @@ | |
#define Z_MIN_POS 0 | |
#define X_MAX_POS X_BED_SIZE | |
#define Y_MAX_POS Y_BED_SIZE | |
-#define Z_MAX_POS 200 | |
+#define Z_MAX_POS 250 | |
/** | |
* Software Endstops | |
@@ -1117,7 +1121,7 @@ | |
#if ENABLED(MIN_SOFTWARE_ENDSTOPS) | |
#define MIN_SOFTWARE_ENDSTOP_X | |
#define MIN_SOFTWARE_ENDSTOP_Y | |
- #define MIN_SOFTWARE_ENDSTOP_Z | |
+ // #define MIN_SOFTWARE_ENDSTOP_Z | |
#endif | |
// Max software endstops constrain movement within maximum coordinate bounds | |
@@ -1204,7 +1208,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 | |
@@ -1356,7 +1360,7 @@ | |
// - Move the Z probe (or nozzle) to a defined XY point before Z Homing when homing all axes (G28). | |
// - Prevent Z homing when the Z probe is outside bed area. | |
// | |
-//#define Z_SAFE_HOMING | |
+#define Z_SAFE_HOMING | |
#if ENABLED(Z_SAFE_HOMING) | |
#define Z_SAFE_HOMING_X_POINT ((X_BED_SIZE) / 2) // X point for Z homing when homing all axes (G28). | |
@@ -1364,7 +1368,7 @@ | |
#endif | |
// Homing speeds (mm/m) | |
-#define HOMING_FEEDRATE_XY (50*60) | |
+#define HOMING_FEEDRATE_XY (20*60) | |
#define HOMING_FEEDRATE_Z (4*60) | |
// Validate that endstops are triggered on homing moves | |
@@ -1442,10 +1446,9 @@ | |
* M501 - Read settings from EEPROM. (i.e., Throw away unsaved changes) | |
* M502 - Revert settings to "factory" defaults. (Follow with M500 to init the EEPROM.) | |
*/ | |
-//#define EEPROM_SETTINGS // Persistent storage with M500 and M501 | |
+#define EEPROM_SETTINGS // Persistent storage with M500 and M501 | |
//#define DISABLE_M503 // Saves ~2700 bytes of PROGMEM. Disable for release! | |
#define EEPROM_CHITCHAT // Give feedback on EEPROM commands. Disable to save PROGMEM. | |
-#define EEPROM_BOOT_SILENT // Keep M503 quiet and only give errors during first load | |
#if ENABLED(EEPROM_SETTINGS) | |
//#define EEPROM_AUTO_INIT // Init EEPROM automatically on any errors. | |
#endif | |
@@ -1474,14 +1477,14 @@ | |
// 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 215 | |
+#define PREHEAT_1_TEMP_BED 60 | |
+#define PREHEAT_1_FAN_SPEED 255 // Value from 0 to 255 | |
#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_TEMP_BED 70 | |
+#define PREHEAT_2_FAN_SPEED 255 // Value from 0 to 255 | |
/** | |
* Nozzle Park | |
@@ -1640,7 +1643,7 @@ | |
* | |
* :['JAPANESE', 'WESTERN', 'CYRILLIC'] | |
*/ | |
-#define DISPLAY_CHARSET_HD44780 JAPANESE | |
+#define DISPLAY_CHARSET_HD44780 WESTERN | |
/** | |
* Info Screen Style (0:Classic, 1:Prusa) | |
@@ -1656,7 +1659,7 @@ | |
* you must uncomment the following option or it won't work. | |
* | |
*/ | |
-//#define SDSUPPORT | |
+#define SDSUPPORT | |
/** | |
* SD CARD: SPI SPEED | |
@@ -1744,7 +1747,7 @@ | |
// If you have a speaker that can produce tones, enable it here. | |
// By default Marlin assumes you have a buzzer with a fixed frequency. | |
// | |
-//#define SPEAKER | |
+#define SPEAKER | |
// | |
// The duration and frequency for the UI feedback sound. | |
@@ -1987,7 +1990,7 @@ | |
// This is RAMPS-compatible using a single 10-pin connector. | |
// (For CR-10 owners who want to replace the Melzi Creality board but retain the display) | |
// | |
-//#define CR10_STOCKDISPLAY | |
+#define CR10_STOCKDISPLAY | |
// | |
// Ender-2 OEM display, a variant of the MKS_MINI_12864 | |
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h | |
index 00f89662c..978a41549 100644 | |
--- a/Marlin/Configuration_adv.h | |
+++ b/Marlin/Configuration_adv.h | |
@@ -340,7 +340,6 @@ | |
* | |
* The fan turns on automatically whenever any driver is enabled and turns | |
* off (or reduces to idle speed) shortly after drivers are turned off. | |
- * | |
*/ | |
//#define USE_CONTROLLER_FAN | |
#if ENABLED(USE_CONTROLLER_FAN) | |
@@ -420,7 +419,7 @@ | |
* Multiple extruders can be assigned to the same pin in which case | |
* the fan will turn on when any selected extruder is above the threshold. | |
*/ | |
-#define E0_AUTO_FAN_PIN -1 | |
+#define E0_AUTO_FAN_PIN P2_04 | |
#define E1_AUTO_FAN_PIN -1 | |
#define E2_AUTO_FAN_PIN -1 | |
#define E3_AUTO_FAN_PIN -1 | |
@@ -595,7 +594,7 @@ | |
#define Y_HOME_BUMP_MM 5 | |
#define Z_HOME_BUMP_MM 2 | |
#define HOMING_BUMP_DIVISOR { 2, 2, 4 } // Re-Bump Speed Divisor (Divides the Homing Feedrate) | |
-//#define QUICK_HOME // If homing includes X and Y, do a diagonal move initially | |
+#define QUICK_HOME // If homing includes X and Y, do a diagonal move initially | |
//#define HOMING_BACKOFF_MM { 2, 2, 2 } // (mm) Move away from the endstops after homing | |
// When G28 is called, this option will make Y home before X | |
@@ -648,7 +647,7 @@ | |
* differs, a mode set eeprom write will be completed at initialization. | |
* 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 | |
/** | |
* Safety: Activate if connecting a probe with an unknown voltage mode. | |
@@ -715,14 +714,14 @@ | |
// Define one position per Z stepper in stepper driver order. | |
#define Z_STEPPER_ALIGN_STEPPER_XY { { 210.7, 102.5 }, { 152.6, 220.0 }, { 94.5, 102.5 } } | |
#else | |
- // Amplification factor. Used to scale the correction step up or down in case | |
- // the stepper (spindle) position is farther out than the test point. | |
- #define Z_STEPPER_ALIGN_AMP 1.0 // Use a value > 1.0 NOTE: This may cause instability! | |
+ // Amplification factor. Used to scale the correction step up or down. | |
+ // In case the stepper (spindle) position is further out than the test point. | |
+ // Use a value > 1. NOTE: This may cause instability | |
+ #define Z_STEPPER_ALIGN_AMP 1.0 | |
#endif | |
- // On a 300mm bed a 5% grade would give a misalignment of ~1.5cm | |
#define G34_MAX_GRADE 5 // (%) Maximum incline that G34 will handle | |
- #define Z_STEPPER_ALIGN_ITERATIONS 5 // Number of iterations to apply during alignment | |
+ #define Z_STEPPER_ALIGN_ITERATIONS 3 // Number of iterations to apply during alignment | |
#define Z_STEPPER_ALIGN_ACC 0.02 // Stop iterating early if the accuracy is better than this | |
#define RESTORE_LEVELING_AFTER_G34 // Restore leveling after G34 is done? | |
// After G34, re-home Z (G28 Z) or just calculate it from the last probe heights? | |
@@ -760,6 +759,7 @@ | |
// Minimum time that a segment needs to take if the buffer is emptied | |
#define DEFAULT_MINSEGMENTTIME 20000 // (ms) | |
+// If defined the movements slow down when the look ahead buffer is only half full | |
// Slow down the machine if the look ahead buffer is (by default) half full. | |
// Increase the slowdown divisor for larger buffer sizes. | |
#define SLOWDOWN | |
@@ -939,7 +939,7 @@ | |
// @section lcd | |
#if EITHER(ULTIPANEL, EXTENSIBLE_UI) | |
- #define MANUAL_FEEDRATE { 50*60, 50*60, 4*60, 60 } // Feedrates for manual moves along X, Y, Z, E from panel | |
+ #define MANUAL_FEEDRATE { 50*60, 50*60, 4*60, 2*60 } // Feedrates for manual moves along X, Y, Z, E from panel | |
#define SHORT_MANUAL_Z_MOVE 0.025 // (mm) Smallest manual Z move (< 0.1mm) | |
#if ENABLED(ULTIPANEL) | |
#define MANUAL_E_MOVES_RELATIVE // Display extruder move distance rather than "position" | |
@@ -964,7 +964,7 @@ | |
#if HAS_LCD_MENU | |
// Include a page of printer information in the LCD Main Menu | |
- //#define LCD_INFO_MENU | |
+ #define LCD_INFO_MENU | |
#if ENABLED(LCD_INFO_MENU) | |
//#define LCD_PRINTER_INFO_IS_BOOTSCREEN // Show bootscreen(s) instead of Printer Info pages | |
#endif | |
@@ -992,7 +992,7 @@ | |
#endif // HAS_LCD_MENU | |
// Scroll a longer status message into view | |
-//#define STATUS_MESSAGE_SCROLLING | |
+#define STATUS_MESSAGE_SCROLLING | |
// On the Info Screen, display XY with one decimal place when possible | |
//#define LCD_DECIMAL_SMALL_XY | |
@@ -1060,9 +1060,6 @@ | |
* during SD printing. If the recovery file is found at boot time, present | |
* an option on the LCD screen to continue the print from the last-known | |
* point in the file. | |
- * | |
- * If the machine reboots when resuming a print you may need to replace or | |
- * reformat the SD card. (Bad sectors delay startup triggering the watchdog.) | |
*/ | |
//#define POWER_LOSS_RECOVERY | |
#if ENABLED(POWER_LOSS_RECOVERY) | |
@@ -1122,7 +1119,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 | |
@@ -1468,16 +1465,16 @@ | |
* | |
* Warning: Does not respect endstops! | |
*/ | |
-//#define BABYSTEPPING | |
+#define BABYSTEPPING | |
#if ENABLED(BABYSTEPPING) | |
//#define INTEGRATED_BABYSTEPPING // EXPERIMENTAL integration of babystepping into the Stepper ISR | |
//#define BABYSTEP_WITHOUT_HOMING | |
//#define BABYSTEP_XY // Also enable X/Y Babystepping. Not supported on DELTA! | |
#define BABYSTEP_INVERT_Z false // Change if Z babysteps should go the other way | |
- #define BABYSTEP_MULTIPLICATOR_Z 1 // Babysteps are very small. Increase for faster motion. | |
+ #define BABYSTEP_MULTIPLICATOR_Z 5 // Babysteps are very small. Increase for faster motion. | |
#define BABYSTEP_MULTIPLICATOR_XY 1 | |
- //#define DOUBLECLICK_FOR_Z_BABYSTEPPING // Double-click on the Status Screen for Z Babystepping. | |
+ #define DOUBLECLICK_FOR_Z_BABYSTEPPING // Double-click on the Status Screen for Z Babystepping. | |
#if ENABLED(DOUBLECLICK_FOR_Z_BABYSTEPPING) | |
#define DOUBLECLICK_MAX_INTERVAL 1250 // Maximum interval between clicks, in milliseconds. | |
// Note: Extra time may be added to mitigate controller latency. | |
@@ -1490,7 +1487,7 @@ | |
//#define BABYSTEP_DISPLAY_TOTAL // Display total babysteps since last G28 | |
- //#define BABYSTEP_ZPROBE_OFFSET // Combine M851 Z and Babystepping | |
+ #define BABYSTEP_ZPROBE_OFFSET // Combine M851 Z and Babystepping | |
#if ENABLED(BABYSTEP_ZPROBE_OFFSET) | |
//#define BABYSTEP_HOTEND_Z_OFFSET // For multiple hotends, babystep relative Z offsets | |
//#define BABYSTEP_ZPROBE_GFX_OVERLAY // Enable graphical overlay on Z-offset editor | |
@@ -2045,7 +2042,7 @@ | |
#define INTERPOLATE true // Interpolate X/Y/Z_MICROSTEPS to 256 | |
#if AXIS_IS_TMC(X) | |
- #define X_CURRENT 800 // (mA) RMS current. Multiply by 1.414 for peak current. | |
+ #define X_CURRENT 580 // (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 | |
@@ -2061,7 +2058,7 @@ | |
#endif | |
#if AXIS_IS_TMC(Y) | |
- #define Y_CURRENT 800 | |
+ #define Y_CURRENT 580 | |
#define Y_CURRENT_HOME Y_CURRENT | |
#define Y_MICROSTEPS 16 | |
#define Y_RSENSE 0.11 | |
@@ -2077,7 +2074,7 @@ | |
#endif | |
#if AXIS_IS_TMC(Z) | |
- #define Z_CURRENT 800 | |
+ #define Z_CURRENT 580 | |
#define Z_CURRENT_HOME Z_CURRENT | |
#define Z_MICROSTEPS 16 | |
#define Z_RSENSE 0.11 | |
@@ -2109,7 +2106,7 @@ | |
#endif | |
#if AXIS_IS_TMC(E0) | |
- #define E0_CURRENT 800 | |
+ #define E0_CURRENT 650 | |
#define E0_MICROSTEPS 16 | |
#define E0_RSENSE 0.11 | |
#define E0_CHAIN_POS -1 | |
@@ -2254,7 +2251,7 @@ | |
* Define you own with | |
* { <off_time[1..15]>, <hysteresis_end[-3..12]>, hysteresis_start[1..8] } | |
*/ | |
- #define CHOPPER_TIMING CHOPPER_DEFAULT_12V | |
+ #define CHOPPER_TIMING CHOPPER_DEFAULT_24V | |
/** | |
* Monitor Trinamic drivers for error conditions, | |
diff --git a/Marlin/_Bootscreen.h b/Marlin/_Bootscreen.h | |
new file mode 100644 | |
index 000000000..cd04d65cb | |
--- /dev/null | |
+++ b/Marlin/_Bootscreen.h | |
@@ -0,0 +1,97 @@ | |
+/** | |
+ * Marlin 3D Printer Firmware | |
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] | |
+ * | |
+ * Based on Sprinter and grbl. | |
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm | |
+ * | |
+ * This program is free software: you can redistribute it and/or modify | |
+ * it under the terms of the GNU General Public License as published by | |
+ * the Free Software Foundation, either version 3 of the License, or | |
+ * (at your option) any later version. | |
+ * | |
+ * This program is distributed in the hope that it will be useful, | |
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
+ * GNU General Public License for more details. | |
+ * | |
+ * You should have received a copy of the GNU General Public License | |
+ * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
+ * | |
+ */ | |
+#pragma once | |
+ | |
+/** | |
+ * Custom Boot Screen bitmap | |
+ * | |
+ * Place this file in the root with your configuration files | |
+ * and enable SHOW_CUSTOM_BOOTSCREEN in Configuration.h. | |
+ * | |
+ * Use the Marlin Bitmap Converter to make your own: | |
+ * http://marlinfw.org/tools/u8glib/converter.html | |
+ */ | |
+ | |
+#define CUSTOM_BOOTSCREEN_TIMEOUT 1000 | |
+#define CUSTOM_BOOTSCREEN_BMPWIDTH 81 | |
+#define CUSTOM_BOOTSCREEN_INVERTED | |
+ | |
+const unsigned char custom_start_bmp[] PROGMEM = { | |
+ B11111111,B11111111,B11111111,B11111111,B11101111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111, | |
+ B11111111,B11111111,B11111111,B11111111,B11101111,B11101111,B11111111,B11111111,B11111111,B11111111,B11111111, | |
+ B11111111,B11111111,B11111111,B11111111,B11100111,B11011111,B11111111,B11111111,B11111111,B11111111,B11111111, | |
+ B11111111,B11111111,B11111111,B11111111,B11100111,B11011111,B11111111,B11111111,B11111111,B11111111,B11111111, | |
+ B11111111,B11111111,B11111111,B11111111,B11100011,B11011111,B11111111,B11111111,B11111111,B11111111,B11111111, | |
+ B11111111,B11111111,B11111111,B11111111,B11110011,B11001111,B11111111,B11111111,B11111111,B11111111,B11111111, | |
+ B11111111,B11111111,B11111111,B11100001,B11100001,B11001111,B11111111,B11111111,B11111111,B11111111,B11111111, | |
+ B11111111,B11111110,B01111000,B00000000,B00000000,B00000011,B11011101,B11111111,B11111111,B11111111,B11111111, | |
+ B11111110,B11111111,B10000000,B01111110,B00000000,B00000001,B11101110,B11111111,B11111111,B11111111,B11111111, | |
+ B11111110,B01111101,B11001111,B11111100,B00000000,B00000000,B11110111,B01111111,B11111111,B11111111,B11111111, | |
+ B11111111,B10001110,B00000110,B00000000,B00000000,B00000000,B01111011,B10111111,B11111111,B11111111,B11111111, | |
+ B11111111,B11000000,B00000000,B00000000,B00000000,B00000000,B01111101,B11011111,B11111111,B11111111,B11111111, | |
+ B11111111,B11111100,B00000001,B11111110,B00000000,B00000000,B00111110,B11100111,B11111111,B11111111,B11111111, | |
+ B11111111,B11111111,B11111111,B11111100,B00000000,B00000011,B00011111,B01110011,B11111111,B11111111,B11111111, | |
+ B11111111,B11111111,B11111111,B11111000,B00000000,B00000001,B10001111,B10000001,B11111111,B11111111,B11111111, | |
+ B11111111,B11111111,B11111111,B11100000,B00000000,B00000000,B10000011,B11111001,B11111111,B11111111,B11111111, | |
+ B11111111,B11111111,B11111111,B00000000,B11111100,B00000000,B00000000,B11110000,B11111111,B11111111,B11111111, | |
+ B11111111,B11111111,B11100000,B00001111,B11111111,B11000000,B00000000,B00000000,B11111111,B11111111,B11111111, | |
+ B11111111,B11111110,B00000011,B11111111,B11111111,B11000000,B00000000,B00000000,B11111111,B11111111,B11111111, | |
+ B11111111,B11111111,B11111111,B11111111,B11111001,B00000000,B00000000,B00000000,B11111111,B11111111,B11111111, | |
+ B11111111,B11111111,B11111111,B11111111,B11111100,B00000000,B00000111,B11000000,B11111111,B11111111,B11111111, | |
+ B11111111,B11111111,B11111111,B11111111,B11111111,B00000000,B00000111,B11100000,B11111111,B11111111,B11111111, | |
+ B11111111,B11111111,B11111111,B11111111,B11111111,B11100000,B00000111,B11110001,B11111111,B11111111,B11111111, | |
+ B11111111,B11111111,B11111111,B11111111,B11111111,B11111100,B00000111,B11111001,B11111111,B11111111,B11111111, | |
+ B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B00000011,B11111001,B11111111,B11111111,B11111111, | |
+ B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B10000011,B11111001,B11111111,B11111111,B11111111, | |
+ B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11000011,B11111111,B11111111,B11111111,B11111111, | |
+ B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11100001,B11111111,B11111111,B11111111,B11111111, | |
+ B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11110000,B10111111,B11111111,B11111111,B11111111, | |
+ B11111111,B11111111,B11111111,B11111111,B11111111,B11111011,B11111000,B00111111,B11111111,B11111111,B11111111, | |
+ B11111111,B11111111,B11111111,B11111111,B11111111,B11111001,B11111000,B00111111,B11111111,B11111111,B11111111, | |
+ B11111111,B11111111,B11111111,B11111111,B11111111,B01111110,B11110000,B11111111,B11111111,B11111111,B11111111, | |
+ B11111111,B11111111,B11111111,B11111111,B11111111,B10001110,B00000011,B11111111,B11111111,B11111111,B11111111, | |
+ B11111111,B11111111,B11111111,B11111111,B11111111,B11100000,B00011111,B11111111,B11111111,B11111111,B11111111, | |
+ B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111, | |
+ B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111, | |
+ B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B01111111,B11111111,B11111111,B11111111, | |
+ B11111111,B00000000,B00000000,B01111111,B11111111,B11111111,B11111000,B01111111,B11111111,B11111111,B11111111, | |
+ B11111111,B10000000,B00000000,B01111111,B11111111,B11111111,B11100000,B01111111,B11111111,B11111111,B11111111, | |
+ B11111111,B11000011,B11111100,B11111111,B11111111,B11111111,B11111000,B11111111,B11111111,B11111111,B11111111, | |
+ B11111111,B11000011,B11111100,B11111111,B11111111,B11111111,B11111000,B11111111,B11111111,B11111111,B11111111, | |
+ B11111111,B10000111,B11111101,B11111111,B11111111,B11111111,B11110001,B11111111,B11111111,B11111111,B11111111, | |
+ B11111111,B10000111,B11111111,B11111111,B11111111,B11111111,B11110001,B11111111,B11111111,B11111111,B11111111, | |
+ B11111111,B00001111,B11100111,B11110011,B00001111,B11111100,B00100011,B11111100,B00111111,B11111111,B11111111, | |
+ B11111111,B00001111,B11101111,B10000000,B00000111,B11110000,B00000011,B11110000,B00011110,B00000000,B01111111, | |
+ B11111110,B00011111,B11001111,B10000001,B10000111,B11000111,B10000111,B11000111,B00001100,B00000000,B01111111, | |
+ B11111110,B00000000,B00011111,B11000111,B11000111,B10001111,B11000111,B10011111,B00001111,B00001100,B11111111, | |
+ B11111110,B00000000,B00011111,B10000111,B10001111,B00011111,B10001111,B00011111,B00001111,B00011111,B11111111, | |
+ B11111100,B00111111,B10011111,B10001111,B10001111,B00011111,B10001110,B00000000,B00011110,B00111111,B11111111, | |
+ B11111100,B01111111,B00111111,B00001111,B00011110,B00111111,B00011110,B00111111,B11111110,B00111111,B11111111, | |
+ B11111000,B01111111,B11111111,B00011111,B00011100,B00111111,B00011100,B01111111,B11111100,B01111111,B11111111, | |
+ B11111000,B11111111,B11111111,B00011110,B00011100,B01111110,B00011100,B01111111,B11111100,B01111111,B11111111, | |
+ B11110000,B11111111,B11001110,B00111110,B00111100,B01111110,B00111100,B01111111,B10111000,B11111111,B11111111, | |
+ B11110000,B11111111,B10011110,B00111100,B00111000,B01111100,B00111000,B01111110,B01111000,B11111111,B11111111, | |
+ B11100001,B11111111,B00111100,B01111100,B01111000,B01111100,B01111000,B00111100,B11110001,B11111111,B11111111, | |
+ B11100001,B11111000,B00111000,B01111000,B01111000,B00010000,B00011000,B00000001,B11110001,B11111111,B11111111, | |
+ B00000000,B00000000,B01100000,B00100000,B00111100,B00000000,B01111100,B00000111,B10000000,B01111111,B11111111, | |
+ B11111111,B11111111,B11111111,B11111111,B11111110,B00011111,B11111110,B00011111,B11111111,B11111111,B11111111 | |
+}; | |
diff --git a/Marlin/_Statusscreen.h b/Marlin/_Statusscreen.h | |
new file mode 100644 | |
index 000000000..6dbf72085 | |
--- /dev/null | |
+++ b/Marlin/_Statusscreen.h | |
@@ -0,0 +1,62 @@ | |
+/** | |
+ * Marlin 3D Printer Firmware | |
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] | |
+ * | |
+ * Based on Sprinter and grbl. | |
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm | |
+ * | |
+ * This program is free software: you can redistribute it and/or modify | |
+ * it under the terms of the GNU General Public License as published by | |
+ * the Free Software Foundation, either version 3 of the License, or | |
+ * (at your option) any later version. | |
+ * | |
+ * This program is distributed in the hope that it will be useful, | |
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
+ * GNU General Public License for more details. | |
+ * | |
+ * You should have received a copy of the GNU General Public License | |
+ * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
+ * | |
+ */ | |
+#pragma once | |
+ | |
+/** | |
+ * Custom Status Screen bitmap | |
+ * | |
+ * Place this file in the root with your configuration files | |
+ * and enable CUSTOM_STATUS_SCREEN_IMAGE in Configuration.h. | |
+ * | |
+ * Use the Marlin Bitmap Converter to make your own: | |
+ * http://marlinfw.org/tools/u8glib/converter.html | |
+ */ | |
+ | |
+// | |
+// Status Screen Logo bitmap | |
+// | |
+#define STATUS_LOGO_Y 8 | |
+#define STATUS_LOGO_WIDTH 39 | |
+ | |
+const unsigned char status_logo_bmp[] PROGMEM = { | |
+ B11111000,B00000001,B10000000,B00000000,B00001100, | |
+ B01001000,B00000000,B10000000,B00000000,B00010010, | |
+ B01000011,B11000011,B10001100,B11010000,B00000010, | |
+ B01110001,B00100100,B10010010,B01100111,B11001100, | |
+ B01000001,B00100100,B10011110,B01000000,B00000010, | |
+ B01001001,B00100100,B10010000,B01000000,B00010010, | |
+ B11111011,B10110011,B11001110,B11100000,B00001100 | |
+}; | |
+ | |
+// | |
+// Use default bitmaps | |
+// | |
+#define STATUS_HOTEND_ANIM | |
+#define STATUS_BED_ANIM | |
+#define STATUS_HEATERS_XSPACE 20 | |
+#if HOTENDS < 2 | |
+ #define STATUS_HEATERS_X 48 | |
+ #define STATUS_BED_X 72 | |
+#else | |
+ #define STATUS_HEATERS_X 40 | |
+ #define STATUS_BED_X 80 | |
+#endif | |
diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h | |
index 7e722ea45..2381c8e45 100644 | |
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h | |
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h | |
@@ -88,7 +88,7 @@ | |
#endif | |
#else | |
#ifndef Z_STOP_PIN | |
- #define Z_STOP_PIN P1_27 // Z-STOP | |
+ #define Z_STOP_PIN P0_10 // Z-STOP | |
#endif | |
#endif | |
diff --git a/platformio.ini b/platformio.ini | |
index f578ff864..dd1a24124 100644 | |
--- a/platformio.ini | |
+++ b/platformio.ini | |
@@ -18,7 +18,7 @@ | |
[platformio] | |
src_dir = Marlin | |
boards_dir = buildroot/share/PlatformIO/boards | |
-default_envs = mega2560 | |
+default_envs = LPC1769 | |
[common] | |
default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared> |
Start G-code
; Ender 3 Custom Start G-code
M117 Getting the bed up to temp!
M140 S{material_bed_temperature_layer_0} ; Set Heat Bed temperature
M190 S{material_bed_temperature_layer_0} ; Wait for Heat Bed temperature
M117 Pre-heating the extruder!
M104 S215; start warming extruder to 215
G28 ; Home all axes
M117 Auto bed-level GO!
G29 ; Auto bed-level (BL-Touch)
G92 E0 ; Reset Extruder
M117 Getting the extruder up to temp!
M104 S{material_print_temperature_layer_0} ; Set Extruder temperature
M109 S{material_print_temperature_layer_0} ; Wait for Extruder temperature
G1 Z10.0 F3000 ; move z up little to prevent scratching of surface
G1 X0.1 Y20 Z0.3 F5000.0 ; move to start-line position
M117 LET THE PURGE BEGIN!
G1 X0.1 Y200.0 Z0.3 F1500.0 E15 ; draw 1st line
G1 X0.4 Y200.0 Z0.3 F5000.0 ; move to side a little
G1 X0.4 Y20 Z0.3 F1500.0 E30 ; draw 2nd line
G92 E0 ; reset extruder
G1 Z1.0 F3000 ; move z up little to prevent scratching of surface
M117 Autobots! Roll Out!
; End of custom start GCode
Extruder calibration
Checking if we have 100mm length
G91 - For reverse in my case
G1 E100 F100 - move 100mm
Formula
E(res) = (E(res0) * L0) / L
In my case
96.875 = (100(desired length) * 93(default firmware value can be checked with M503 command)) / 96(extruded length)
Set new value
M92 E96.87
M500
BLTouch Z-Offset Instructions:
Setup
G28 - Home 3D printer
M851 Z0 - Reset Z0 offset
M500 - Store settings to eeprom
M501 - Set active parameters
M503 - Display Active Parameters
G28 Z - Home Z Axis
G1 F60 Z0 - Move nozzle to true 0 offset
M851 Z-4.31 - (-4.31 being set for my glass, your z offset should be different) !!!!!!!!!!!! HERE SHOULD BE CORRECT VALUE, BASED ON MANUAL OFFSET
M500 - Store settings to eeprom
M501 - Set Active Parameters
M503 - display current settings
Recheck
G28 Z
G1 F60 Z0