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

48
Marlin/src/pins/ramps/pins_RAMPS.h
View File

@@ -233,16 +233,22 @@
#define HEATER_0_PIN MOSFET_A_PIN
#if FET_ORDER_EFB // Hotend, Fan, Bed
#define HEATER_BED_PIN MOSFET_C_PIN
#ifndef HEATER_BED_PIN
#define HEATER_BED_PIN MOSFET_C_PIN
#endif
#elif FET_ORDER_EEF // Hotend, Hotend, Fan
#define HEATER_1_PIN MOSFET_B_PIN
#elif FET_ORDER_EEB // Hotend, Hotend, Bed
#define HEATER_1_PIN MOSFET_B_PIN
#define HEATER_BED_PIN MOSFET_C_PIN
#ifndef HEATER_BED_PIN
#define HEATER_BED_PIN MOSFET_C_PIN
#endif
#elif FET_ORDER_EFF // Hotend, Fan, Fan
#define FAN1_PIN MOSFET_C_PIN
#elif DISABLED(FET_ORDER_SF) // Not Spindle, Fan (i.e., "EFBF" or "EFBE")
#define HEATER_BED_PIN MOSFET_C_PIN
#ifndef HEATER_BED_PIN
#define HEATER_BED_PIN MOSFET_C_PIN
#endif
#if EITHER(HAS_MULTI_HOTEND, HEATERS_PARALLEL)
#define HEATER_1_PIN MOSFET_D_PIN
#else
@@ -585,7 +591,7 @@
// LCDs and Controllers //
//////////////////////////
#if HAS_WIRED_LCD
#if HAS_WIRED_LCD && DISABLED(LCD_PINS_DEFINED)
//#define LCD_SCREEN_ROTATE 180 // 0, 90, 180, 270
@@ -715,7 +721,9 @@
#define BTN_EN1 AUX2_05_PIN
#define BTN_EN2 AUX2_03_PIN
#define BTN_ENC AUX2_04_PIN
#define SD_DETECT_PIN AUX2_08_PIN
#ifndef SD_DETECT_PIN
#define SD_DETECT_PIN AUX2_08_PIN
#endif
#elif ENABLED(LCD_I2C_PANELOLU2)
@@ -732,7 +740,9 @@
#define BTN_ENC -1
#define LCD_SDSS SDSS
#define SD_DETECT_PIN EXP2_07_PIN
#ifndef SD_DETECT_PIN
#define SD_DETECT_PIN EXP2_07_PIN
#endif
#elif EITHER(VIKI2, miniVIKI)
@@ -748,7 +758,9 @@
#define BTN_EN2 7
#define BTN_ENC AUX4_08_PIN
#define SD_DETECT_PIN -1 // Pin 49 for display SD interface, 72 for easy adapter board
#ifndef SD_DETECT_PIN
#define SD_DETECT_PIN -1 // Pin 49 for display SD interface, 72 for easy adapter board
#endif
#define KILL_PIN EXP2_03_PIN
#elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
@@ -764,7 +776,9 @@
#define BTN_ENC EXP2_03_PIN
#define LCD_SDSS SDSS
#define SD_DETECT_PIN EXP2_07_PIN
#ifndef SD_DETECT_PIN
#define SD_DETECT_PIN EXP2_07_PIN
#endif
#define KILL_PIN EXP2_08_PIN
#elif EITHER(MKS_MINI_12864, FYSETC_MINI_12864)
@@ -833,7 +847,9 @@
#define BTN_EN2 AUX2_04_PIN
#define BTN_ENC AUX2_03_PIN
#define SD_DETECT_PIN AUX3_02_PIN
#ifndef SD_DETECT_PIN
#define SD_DETECT_PIN AUX3_02_PIN
#endif
#define KILL_PIN AUX2_05_PIN
#elif ENABLED(ZONESTAR_LCD)
@@ -848,7 +864,9 @@
#define BEEPER_PIN EXP1_01_PIN
#define SD_DETECT_PIN EXP2_07_PIN
#ifndef SD_DETECT_PIN
#define SD_DETECT_PIN EXP2_07_PIN
#endif
#define KILL_PIN EXP2_08_PIN
#define BTN_EN1 EXP2_05_PIN
@@ -857,7 +875,9 @@
#elif IS_TFTGLCD_PANEL
#define SD_DETECT_PIN EXP2_07_PIN
#ifndef SD_DETECT_PIN
#define SD_DETECT_PIN EXP2_07_PIN
#endif
#else
@@ -876,7 +896,7 @@
#endif
#endif // IS_NEWPANEL
#endif // HAS_WIRED_LCD
#endif // HAS_WIRED_LCD && !LCD_PINS_DEFINED
#if IS_RRW_KEYPAD && !HAS_ADC_BUTTONS
#define SHIFT_OUT_PIN AUX2_06_PIN
@@ -933,7 +953,9 @@
#define BEEPER_PIN EXP1_01_PIN
#define SD_DETECT_PIN EXP2_07_PIN
#ifndef SD_DETECT_PIN
#define SD_DETECT_PIN EXP2_07_PIN
#endif
#define CLCD_MOD_RESET EXP2_05_PIN
#define CLCD_SPI_CS EXP2_03_PIN