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

Browse Source
This commit is contained in:
Stefan Kalscheuer
2022-12-19 15:23:45 +01:00
parent fe9ea826a5
commit 67c7ce7b79
427 changed files with 10732 additions and 7834 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,6 +66,8 @@
#define MOSFET_C_PIN 9
#define MOSFET_D_PIN 12
#define HEATER_2_PIN 6
//
// Misc. Functions
//
@@ -122,16 +124,6 @@
#endif
#endif
#include "pins_RAMPS.h"
//
// Heaters / Fans
//
#define HEATER_2_PIN 6
#undef SD_DETECT_PIN
#define SD_DETECT_PIN 53
//
// LCD / Controller
//
@@ -139,12 +131,6 @@
#undef BEEPER_PIN
// TODO: Remap EXP1/2 based on adapter
#undef LCD_PINS_RS
#undef LCD_PINS_ENABLE
#undef LCD_PINS_D4
#undef LCD_PINS_D5
#undef LCD_PINS_D6
#undef LCD_PINS_D7
#define LCD_PINS_RS 27
#define LCD_PINS_ENABLE 29
#define LCD_PINS_D4 37
@@ -153,13 +139,12 @@
#define LCD_PINS_D7 31
// Buttons
#undef BTN_EN1
#undef BTN_EN2
#undef BTN_ENC
#define BTN_EN1 16
#define BTN_EN2 17
#define BTN_ENC 23
#define LCD_PINS_DEFINED
#else
#define BEEPER_PIN 33
@@ -171,3 +156,7 @@
#define BOARD_ST7920_DELAY_2 188
#define BOARD_ST7920_DELAY_3 0
#endif
#define SD_DETECT_PIN 53
#include "pins_RAMPS.h"