Merge upstream changes from Marlin 2.1.2.2

This commit is contained in:
Stefan Kalscheuer
2024-02-13 20:32:22 +01:00
parent e466309bfb
commit 752476dc8f
1367 changed files with 41601 additions and 31124 deletions

View File

@@ -57,8 +57,8 @@
#define FIL_RUNOUT_PIN 34 // X_MAX unless overridden
#endif
#ifndef FAN_PIN
#define FAN_PIN 5
#ifndef FAN0_PIN
#define FAN0_PIN 5
#endif
#define HEATER_0_PIN 7
@@ -75,9 +75,9 @@
#define TEMP_BED_PIN 6
#if HAS_WIRED_LCD
#if IS_U8GLIB_ST7920 // SPI GLCD 12864 ST7920
#if IS_U8GLIB_ST7920 // SPI GLCD 12864 ST7920
#define LCD_PINS_RS 30
#define LCD_PINS_ENABLE 20
#define LCD_PINS_EN 20
#define LCD_PINS_D4 25
#define BEEPER_PIN 29
#define BTN_EN1 19