|
diff -Naur ./Marlin/Marlin/Configuration.h ./Marlin-patched/Marlin/Configuration.h |
|
--- ./Marlin/Marlin/Configuration.h 2020-02-25 15:06:10.000000000 -0500 |
|
+++ ./Marlin-patched/Marlin/Configuration.h 2020-02-25 15:35:58.000000000 -0500 |
|
@@ -1,3 +1,7 @@ |
|
+// https://www.reddit.com/r/ender3/comments/e894j7/marlin_20x_guide_for_ender_3_using_skr_mini_e3_v12/ |
|
+// This is all the base stuff + manual mesh bed levelling, so that users who have a stock printer |
|
+// and an SKR Mini E3 can use this patch |
|
+ |
|
/** |
|
* Marlin 3D Printer Firmware |
|
* Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] |
|
@@ -71,7 +75,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 "Joshua Knarr" // Who made the changes. |
|
//#define CUSTOM_VERSION_FILE Version.h // Path from the root directory (no quotes) |
|
|
|
/** |
|
@@ -103,7 +107,7 @@ |
|
* |
|
* :[-1, 0, 1, 2, 3, 4, 5, 6, 7] |
|
*/ |
|
-#define SERIAL_PORT 0 |
|
+#define SERIAL_PORT 2 |
|
|
|
/** |
|
* Select a secondary serial port on the board to use for communication with the host. |
|
@@ -112,7 +116,7 @@ |
|
* |
|
* :[-1, 0, 1, 2, 3, 4, 5, 6, 7] |
|
*/ |
|
-//#define SERIAL_PORT_2 -1 |
|
+#define SERIAL_PORT_2 -1 |
|
|
|
/** |
|
* This setting determines the communication speed of the printer. |
|
@@ -123,18 +127,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_MINI_E3_V1_2 |
|
#endif |
|
|
|
// Name displayed in the LCD "Ready" message and Info menu |
|
-//#define CUSTOM_MACHINE_NAME "3D Printer" |
|
+#define CUSTOM_MACHINE_NAME "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 |
|
@@ -147,7 +151,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 |
|
@@ -415,7 +419,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 |
|
|
|
@@ -459,7 +463,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 ================================ |
|
@@ -518,7 +522,7 @@ |
|
* heater. If your configuration is significantly different than this and you don't understand |
|
* the issues involved, don't use bed PID until someone else verifies that your hardware works. |
|
*/ |
|
-//#define PIDTEMPBED |
|
+#define PIDTEMPBED |
|
|
|
//#define BED_LIMIT_SWITCHING |
|
|
|
@@ -566,7 +570,7 @@ |
|
* Note: For Bowden Extruders make this large enough to allow load/unload. |
|
*/ |
|
#define PREVENT_LENGTHY_EXTRUDE |
|
-#define EXTRUDE_MAXLENGTH 200 |
|
+#define EXTRUDE_MAXLENGTH 100 |
|
|
|
//=========================================================================== |
|
//======================== Thermal Runaway Protection ======================= |
|
@@ -649,7 +653,7 @@ |
|
// 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 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. |
|
@@ -671,15 +675,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 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 |
|
@@ -731,14 +735,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, 93 } |
|
|
|
/** |
|
* 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, 20, 60 } |
|
|
|
//#define LIMITED_MAX_FR_EDITING // Limit edit via M203 or LCD to DEFAULT_MAX_FEEDRATE * 2 |
|
#if ENABLED(LIMITED_MAX_FR_EDITING) |
|
@@ -766,9 +770,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) |
|
@@ -778,7 +782,7 @@ |
|
* When changing speed and direction, if the difference is less than the |
|
* value set here, it may happen instantaneously. |
|
*/ |
|
-//#define CLASSIC_JERK |
|
+#define CLASSIC_JERK |
|
#if ENABLED(CLASSIC_JERK) |
|
#define DEFAULT_XJERK 10.0 |
|
#define DEFAULT_YJERK 10.0 |
|
@@ -811,7 +815,7 @@ |
|
* |
|
* See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained |
|
*/ |
|
-//#define S_CURVE_ACCELERATION |
|
+#define S_CURVE_ACCELERATION |
|
|
|
//=========================================================================== |
|
//============================= Z Probe Options ============================= |
|
@@ -859,7 +863,7 @@ |
|
* Use G29 repeatedly, adjusting the Z height at each point with movement commands |
|
* or (with LCD_BED_LEVELING) the LCD controller. |
|
*/ |
|
-//#define PROBE_MANUALLY |
|
+#define PROBE_MANUALLY |
|
//#define MANUAL_PROBE_START_Z 0.2 |
|
|
|
/** |
|
@@ -947,7 +951,7 @@ |
|
* |
|
* Specify a Probe position as { X, Y, Z } |
|
*/ |
|
-#define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 } |
|
+#define NOZZLE_TO_PROBE_OFFSET { 0, 0, 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. |
|
@@ -1047,14 +1051,14 @@ |
|
// @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 |
|
@@ -1083,8 +1087,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 |
|
@@ -1092,7 +1096,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 |
|
@@ -1197,13 +1201,13 @@ |
|
//#define AUTO_BED_LEVELING_LINEAR |
|
//#define AUTO_BED_LEVELING_BILINEAR |
|
//#define AUTO_BED_LEVELING_UBL |
|
-//#define MESH_BED_LEVELING |
|
+#define MESH_BED_LEVELING |
|
|
|
/** |
|
* Normally G28 leaves leveling disabled on completion. Enable |
|
* this option to have G28 restore the prior leveling state. |
|
*/ |
|
-//#define RESTORE_LEVELING_AFTER_G28 |
|
+#define RESTORE_LEVELING_AFTER_G28 |
|
|
|
/** |
|
* Enable detailed logging of G28, G29, M48, etc. |
|
@@ -1242,7 +1246,7 @@ |
|
#if EITHER(AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_BILINEAR) |
|
|
|
// Set the number of grid points per dimension. |
|
- #define GRID_MAX_POINTS_X 3 |
|
+ #define GRID_MAX_POINTS_X 5 |
|
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X |
|
|
|
// Probe along the Y axis, advancing X after each column |
|
@@ -1302,7 +1306,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. |
|
@@ -1356,7 +1360,7 @@ |
|
|
|
// Homing speeds (mm/m) |
|
#define HOMING_FEEDRATE_XY (50*60) |
|
-#define HOMING_FEEDRATE_Z (4*60) |
|
+#define HOMING_FEEDRATE_Z (20*60) |
|
|
|
// Validate that endstops are triggered on homing moves |
|
#define VALIDATE_HOMING_ENDSTOPS |
|
@@ -1433,7 +1437,7 @@ |
|
* 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. |
|
#if ENABLED(EEPROM_SETTINGS) |
|
@@ -1484,11 +1488,11 @@ |
|
* P1 Raise the nozzle always to Z-park height. |
|
* P2 Raise the nozzle by Z-park amount, limited to Z_MAX_POS. |
|
*/ |
|
-//#define NOZZLE_PARK_FEATURE |
|
+#define NOZZLE_PARK_FEATURE |
|
|
|
#if ENABLED(NOZZLE_PARK_FEATURE) |
|
// Specify a park position as { X, Y, Z_raise } |
|
- #define NOZZLE_PARK_POINT { (X_MIN_POS + 10), (Y_MAX_POS - 10), 20 } |
|
+ #define NOZZLE_PARK_POINT { 0, (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_Z_FEEDRATE 5 // (mm/s) Z axis feedrate (not used for delta printers) |
|
#endif |
|
@@ -1630,7 +1634,7 @@ |
|
* |
|
* :['JAPANESE', 'WESTERN', 'CYRILLIC'] |
|
*/ |
|
-#define DISPLAY_CHARSET_HD44780 JAPANESE |
|
+//#define DISPLAY_CHARSET_HD44780 JAPANESE |
|
|
|
/** |
|
* Info Screen Style (0:Classic, 1:Prusa) |
|
@@ -1646,7 +1650,7 @@ |
|
* you must uncomment the following option or it won't work. |
|
* |
|
*/ |
|
-//#define SDSUPPORT |
|
+#define SDSUPPORT |
|
|
|
/** |
|
* SD CARD: SPI SPEED |
|
@@ -1977,7 +1981,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 |
|
@@ -2121,7 +2125,7 @@ |
|
// Use software PWM to drive the fan, as for the heaters. This uses a very low frequency |
|
// which is not as annoying as with the hardware PWM. On the other hand, if this frequency |
|
// is too low, you should also increment SOFT_PWM_SCALE. |
|
-//#define FAN_SOFT_PWM |
|
+#define FAN_SOFT_PWM |
|
|
|
// Incrementing this by 1 will double the software PWM frequency, |
|
// affecting heaters, and the fan if FAN_SOFT_PWM is enabled. |
|
diff -Naur ./Marlin/Marlin/Configuration_adv.h ./Marlin-patched/Marlin/Configuration_adv.h |
|
--- ./Marlin/Marlin/Configuration_adv.h 2020-02-25 15:06:10.000000000 -0500 |
|
+++ ./Marlin-patched/Marlin/Configuration_adv.h 2020-02-25 15:35:04.000000000 -0500 |
|
@@ -586,7 +586,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 |
|
@@ -923,7 +923,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" |
|
@@ -976,7 +976,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 |
|
@@ -991,11 +991,11 @@ |
|
//#define LCD_SHOW_E_TOTAL |
|
|
|
#if HAS_GRAPHICAL_LCD && HAS_PRINT_PROGRESS |
|
- //#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits |
|
- //#define SHOW_REMAINING_TIME // Display estimated time to completion |
|
+ #define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits |
|
+ #define SHOW_REMAINING_TIME // Display estimated time to completion |
|
#if ENABLED(SHOW_REMAINING_TIME) |
|
- //#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation |
|
- //#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time |
|
+ #define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation |
|
+ #define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time |
|
#endif |
|
#endif |
|
|
|
@@ -1094,10 +1094,10 @@ |
|
#endif |
|
|
|
// This allows hosts to request long names for files and folders with M33 |
|
- //#define LONG_FILENAME_HOST_SUPPORT |
|
+ #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 |
|
@@ -1182,7 +1182,7 @@ |
|
* |
|
* :[ 'LCD', 'ONBOARD', 'CUSTOM_CABLE' ] |
|
*/ |
|
- //#define SDCARD_CONNECTION LCD |
|
+ #define SDCARD_CONNECTION ONBOARD |
|
#endif |
|
|
|
#endif // SDSUPPORT |
|
@@ -1259,11 +1259,11 @@ |
|
#define STATUS_HOTEND_INVERTED // Show solid nozzle bitmaps when heating (Requires STATUS_HOTEND_ANIM) |
|
#define STATUS_HOTEND_ANIM // Use a second bitmap to indicate hotend heating |
|
#define STATUS_BED_ANIM // Use a second bitmap to indicate bed heating |
|
- #define STATUS_CHAMBER_ANIM // Use a second bitmap to indicate chamber heating |
|
+ //#define STATUS_CHAMBER_ANIM // Use a second bitmap to indicate chamber heating |
|
//#define STATUS_ALT_BED_BITMAP // Use the alternative bed bitmap |
|
//#define STATUS_ALT_FAN_BITMAP // Use the alternative fan bitmap |
|
//#define STATUS_FAN_FRAMES 3 // :[0,1,2,3,4] Number of fan animation frames |
|
- //#define STATUS_HEAT_PERCENT // Show heating in a progress bar |
|
+ #define STATUS_HEAT_PERCENT // Show heating in a progress bar |
|
//#define BOOT_MARLIN_LOGO_SMALL // Show a smaller Marlin logo on the Boot Screen (saving 399 bytes of flash) |
|
//#define BOOT_MARLIN_LOGO_ANIMATED // Animated Marlin logo. Costs ~3260 (or ~940) bytes of PROGMEM. |
|
|
|
@@ -1492,10 +1492,10 @@ |
|
* See http://marlinfw.org/docs/features/lin_advance.html for full instructions. |
|
* Mention @Sebastianv650 on GitHub to alert the author of any issues. |
|
*/ |
|
-//#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 |
|
+ #define LIN_ADVANCE_K 0.00 // Unit: mm compression per 1mm/s extruder speed |
|
//#define LA_DEBUG // If enabled, this will generate debug information output over USB. |
|
#endif |
|
|
|
@@ -1693,16 +1693,16 @@ |
|
// The number of linear motions that can be in the plan at any give time. |
|
// THE BLOCK_BUFFER_SIZE NEEDS TO BE A POWER OF 2 (e.g. 8, 16, 32) because shifts and ors are used to do the ring-buffering. |
|
#if ENABLED(SDSUPPORT) |
|
- #define BLOCK_BUFFER_SIZE 16 // SD,LCD,Buttons take more memory, block buffer needs to be smaller |
|
+ #define BLOCK_BUFFER_SIZE 32 // SD,LCD,Buttons take more memory, block buffer needs to be smaller |
|
#else |
|
- #define BLOCK_BUFFER_SIZE 16 // maximize block buffer |
|
+ #define BLOCK_BUFFER_SIZE 32 // maximize block buffer |
|
#endif |
|
|
|
// @section serial |
|
|
|
// The ASCII buffer for serial input |
|
#define MAX_CMD_SIZE 96 |
|
-#define BUFSIZE 4 |
|
+#define BUFSIZE 32 |
|
|
|
// Transmission to Host Buffer Size |
|
// To save 386 bytes of PROGMEM (and TX_BUFFER_SIZE+3 bytes of RAM) set to 0. |
|
@@ -1711,7 +1711,7 @@ |
|
// For debug-echo: 128 bytes for the optimal speed. |
|
// Other output doesn't need to be that speedy. |
|
// :[0, 2, 4, 8, 16, 32, 64, 128, 256] |
|
-#define TX_BUFFER_SIZE 0 |
|
+#define TX_BUFFER_SIZE 32 |
|
|
|
// Host Receive Buffer Size |
|
// Without XON/XOFF flow control (see SERIAL_XON_XOFF below) 32 bytes should be enough. |
|
@@ -2022,7 +2022,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 |
|
@@ -2038,7 +2038,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 |
|
@@ -2054,7 +2054,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 |
|
@@ -2086,7 +2086,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 |
|
@@ -2231,7 +2231,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, |
|
@@ -2244,7 +2244,7 @@ |
|
* M912 - Clear stepper driver overtemperature pre-warn condition flag. |
|
* M122 - Report driver parameters (Requires TMC_DEBUG) |
|
*/ |
|
- //#define MONITOR_DRIVER_STATUS |
|
+ #define MONITOR_DRIVER_STATUS |
|
|
|
#if ENABLED(MONITOR_DRIVER_STATUS) |
|
#define CURRENT_STEP_DOWN 50 // [mA] |
|
@@ -2259,7 +2259,7 @@ |
|
* 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 |
|
@@ -2331,7 +2331,7 @@ |
|
* Enable M122 debugging command for TMC stepper drivers. |
|
* M122 S0/1 will enable continous reporting. |
|
*/ |
|
- //#define TMC_DEBUG |
|
+ #define TMC_DEBUG |
|
|
|
/** |
|
* You can set your own advanced settings by filling in predefined functions. |
|
@@ -2875,7 +2875,7 @@ |
|
* |
|
* Implement M486 to allow Marlin to skip objects |
|
*/ |
|
-//#define CANCEL_OBJECTS |
|
+#define CANCEL_OBJECTS |
|
|
|
/** |
|
* I2C position encoders for closed loop control. |
|
diff -Naur ./Marlin/platformio.ini ./Marlin-patched/platformio.ini |
|
--- ./Marlin/platformio.ini 2020-02-25 15:06:10.000000000 -0500 |
|
+++ ./Marlin-patched/platformio.ini 2020-02-25 15:08:47.000000000 -0500 |
|
@@ -18,7 +18,7 @@ |
|
[platformio] |
|
src_dir = Marlin |
|
boards_dir = buildroot/share/PlatformIO/boards |
|
-default_envs = megaatmega2560 |
|
+default_envs = STM32F103RC_bigtree_512K |
|
|
|
[common] |
|
default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared> |
|
|
