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

@@ -116,7 +116,7 @@
// 4bit LCD Support
#define LCD_PINS_RS 18
#define LCD_PINS_ENABLE 17
#define LCD_PINS_EN 17
#define LCD_PINS_D4 16
#define LCD_PINS_D5 15
#define LCD_PINS_D6 13
@@ -134,6 +134,8 @@
//
// M3/M4/M5 - Spindle/Laser Control
//
#define SPINDLE_LASER_ENA_PIN 5 // Pullup or pulldown!
#define SPINDLE_LASER_PWM_PIN 16 // Hardware PWM
#define SPINDLE_DIR_PIN 6
#if HAS_CUTTER
#define SPINDLE_LASER_PWM_PIN 16 // Hardware PWM
#define SPINDLE_LASER_ENA_PIN 5 // Pullup or pulldown!
#define SPINDLE_DIR_PIN 6
#endif