Parity with bugfix-2.0.x

This commit is contained in:
Scott Lahteine 2020-04-26 00:45:23 -05:00
parent c1b2dcd747
commit 79a8587dd7
314 changed files with 10888 additions and 1178 deletions

View file

@ -1483,6 +1483,9 @@
#if ENABLED(NOZZLE_PARK_FEATURE)
// Specify a park position as { X, Y, Z_raise }
#define NOZZLE_PARK_POINT { (X_MIN_POS + 20), (Y_MIN_POS + 20),Z_MIN_POS + 20 }
//#define NOZZLE_PARK_X_ONLY // X move only is required to park
//#define NOZZLE_PARK_Y_ONLY // Y move only is required to park
#define NOZZLE_PARK_Z_RAISE_MIN 2 // (mm) Always raise Z by at least this distance
#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
@ -2056,6 +2059,11 @@
//#define DGUS_LCD_UI_FYSETC
//#define DGUS_LCD_UI_HIPRECY
//
// Ender-3 v2 OEM display. A DWIN display with Rotary Encoder.
//
#define DWIN_ENDER3_V2
//
// Touch-screen LCD for Malyan M200/M300 printers
//