wp/Marlin-2-0-x-Anycubic-i3-MEGA-S
1
0
Fork 0
Code Issues 28 Pull Requests 2 Actions Packages Projects Releases 30 Wiki Activity

Merge upstream changes from Marlin 2.1.2.2

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

5
Marlin/src/pins/ramps/pins_3DRAG.h
View File

@@ -117,7 +117,7 @@
#define SPINDLE_LASER_PWM_PIN 46 // Hardware PWM
#define SPINDLE_LASER_ENA_PIN 62 // Pullup!
#define SPINDLE_DIR_PIN 48
#elif !BOTH(HAS_WIRED_LCD, IS_NEWPANEL) // Use expansion header if no LCD in use
#elif !ALL(HAS_WIRED_LCD, IS_NEWPANEL) // Use expansion header if no LCD in use
#define SPINDLE_LASER_ENA_PIN 16 // Pullup or pulldown!
#define SPINDLE_DIR_PIN 17
#if !NUM_SERVOS // Use servo connector if possible
@@ -131,12 +131,13 @@
//
// LCD / Controller
//
#if HAS_WIRED_LCD && IS_NEWPANEL
#undef BEEPER_PIN
// TODO: Remap EXP1/2 based on adapter
#define LCD_PINS_RS 27
#define LCD_PINS_ENABLE 29
#define LCD_PINS_EN 29
#define LCD_PINS_D4 37
#define LCD_PINS_D5 35
#define LCD_PINS_D6 33