Merge upstream changes from Marlin 2.1.1

This commit is contained in:
Stefan Kalscheuer
2022-09-03 09:23:32 +02:00
parent 626283aadb
commit 986e416c7f
1610 changed files with 73839 additions and 40857 deletions

View File

@@ -28,17 +28,17 @@
#define REQUIRE_MEGA2560
#include "env_validate.h"
#if HOTENDS > 1 || E_STEPPERS > 1
#error "Longer3D LGT KIT V1.0 board only supports one hotend / E-stepper. Comment out this line to continue."
#if HAS_MULTI_HOTEND || E_STEPPERS > 1
#error "Longer3D LGT KIT V1.0 only supports 1 hotend / E stepper."
#endif
#if SERIAL_PORT == 1 || SERIAL_PORT_2 == 1
#if SERIAL_PORT == 1 || SERIAL_PORT_2 == 1 || SERIAL_PORT_3 == 1
#warning "Serial 1 is originally reserved to DGUS LCD."
#endif
#if SERIAL_PORT == 2 || SERIAL_PORT_2 == 2
#if SERIAL_PORT == 2 || SERIAL_PORT_2 == 2 || SERIAL_PORT_3 == 2 || LCD_SERIAL_PORT == 2
#warning "Serial 2 has no connector. Hardware changes may be required to use it."
#endif
#if SERIAL_PORT == 3 || SERIAL_PORT_2 == 3
#if SERIAL_PORT == 3 || SERIAL_PORT_2 == 3 || SERIAL_PORT_3 == 3 || LCD_SERIAL_PORT == 3
#define CHANGE_Y_LIMIT_PINS
#warning "Serial 3 is originally reserved to Y limit switches. Hardware changes are required to use it."
#endif
@@ -105,7 +105,9 @@
//
// Průša i3 MK2 Multiplexer Support
//
#define E_MUX2_PIN -1
#if HAS_PRUSA_MMU1
#define E_MUX2_PIN -1
#endif
//
// Misc. Functions
@@ -116,5 +118,4 @@
//
// Other RAMPS 1.3 pins
//
#define IS_RAMPS_EFB // Override autodetection. Bed will be undefined.
#include "pins_RAMPS_13.h"
#include "pins_RAMPS_13.h" // ... RAMPS