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

@@ -105,8 +105,8 @@
#define HEATER_1_PIN 7
#define HEATER_BED_PIN 3
#ifndef FAN_PIN
#define FAN_PIN 8
#ifndef FAN0_PIN
#define FAN0_PIN 8
#endif
#define FAN1_PIN 6
#define FAN2_PIN 2
@@ -126,7 +126,7 @@
// LCD / Controller
//
#define LCD_PINS_RS 70 // Ext2_5
#define LCD_PINS_ENABLE 71 // Ext2_7
#define LCD_PINS_EN 71 // Ext2_7
#define LCD_PINS_D4 72 // Ext2_9 ?
#define LCD_PINS_D5 73 // Ext2_11 ?
#define LCD_PINS_D6 74 // Ext2_13
@@ -143,7 +143,7 @@
#define HOME_PIN BTN_HOME
#if EITHER(VIKI2, miniVIKI)
#if ANY(VIKI2, miniVIKI)
#define BEEPER_PIN 44
// Pins for DOGM SPI LCD Support
#define DOGLCD_A0 70