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.1

Browse Source
This commit is contained in:
Stefan Kalscheuer
2023-05-26 18:48:34 +02:00
parent 22dedaeb81
commit f92a587638
620 changed files with 41015 additions and 28889 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
Marlin/src/pins/ramps/pins_RAMPS.h Executable file → Normal file
View File

@@ -23,6 +23,7 @@
/**
* Arduino Mega with RAMPS v1.4 (or v1.3) pin assignments
* ATmega2560, ATmega1280
*
* Applies to the following boards:
*
@@ -96,10 +97,10 @@
#define Z_MAX_PIN -1
#endif
#ifndef I_STOP_PIN
#define I_STOP_PIN 18
#define I_STOP_PIN 18 // Z-
#endif
#ifndef J_STOP_PIN
#define J_STOP_PIN 19
#define J_STOP_PIN 19 // Z+
#endif
#endif
@@ -108,26 +109,26 @@
//
#ifndef X_STOP_PIN
#ifndef X_MIN_PIN
#define X_MIN_PIN 3
#define X_MIN_PIN 3 // X-
#endif
#ifndef X_MAX_PIN
#define X_MAX_PIN 43 // PATCH: Knutwurst
#define X_MAX_PIN 43 // X+ // PATCH: Knutwurst
#endif
#endif
#ifndef Y_STOP_PIN
#ifndef Y_MIN_PIN
#define Y_MIN_PIN 42 // PATCH: Knutwurst
#define Y_MIN_PIN 42 // Y- // PATCH: Knutwurst
#endif
#ifndef Y_MAX_PIN
#define Y_MAX_PIN -1 // PATCH: Knutwurst
#define Y_MAX_PIN -1 // Y+ // PATCH: Knutwurst
#endif
#endif
#ifndef Z_STOP_PIN
#ifndef Z_MIN_PIN
#define Z_MIN_PIN 18
#define Z_MIN_PIN 18 // Z-
#endif
#ifndef Z_MAX_PIN
#define Z_MAX_PIN -1 // PATCH: Knutwurst
#define Z_MAX_PIN -1 // Z+ // PATCH: Knutwurst
#endif
#endif
@@ -694,8 +695,6 @@
#if IS_RRD_SC
#define BEEPER_PIN EXP1_01_PIN
#if ENABLED(CR10_STOCKDISPLAY)
#define BTN_EN1 EXP1_03_PIN
#define BTN_EN2 EXP1_05_PIN
@@ -750,7 +749,9 @@
#define DOGLCD_A0 AUX2_07_PIN
#define LCD_SCREEN_ROTATE 180 // 0, 90, 180, 270
#define BEEPER_PIN EXP2_05_PIN
#ifndef BEEPER_PIN
#define BEEPER_PIN EXP2_05_PIN
#endif
#define STAT_LED_RED_PIN AUX4_03_PIN
#define STAT_LED_BLUE_PIN EXP1_02_PIN
@@ -768,7 +769,9 @@
#define DOGLCD_CS EXP1_08_PIN
#define DOGLCD_A0 EXP1_07_PIN
#define BEEPER_PIN EXP1_05_PIN
#ifndef BEEPER_PIN
#define BEEPER_PIN EXP1_05_PIN
#endif
#define LCD_BACKLIGHT_PIN EXP2_05_PIN
#define BTN_EN1 EXP1_02_PIN
@@ -783,7 +786,6 @@
#elif EITHER(MKS_MINI_12864, FYSETC_MINI_12864)
#define BEEPER_PIN EXP1_01_PIN
#define BTN_ENC EXP1_02_PIN
#ifndef SD_DETECT_PIN
#define SD_DETECT_PIN EXP2_07_PIN
@@ -837,7 +839,9 @@
#elif ENABLED(MINIPANEL)
#define BEEPER_PIN AUX2_08_PIN
#ifndef BEEPER_PIN
#define BEEPER_PIN AUX2_08_PIN
#endif
#define LCD_BACKLIGHT_PIN AUX2_10_PIN
#define DOGLCD_A0 AUX2_07_PIN
@@ -862,8 +866,6 @@
#elif ENABLED(G3D_PANEL)
#define BEEPER_PIN EXP1_01_PIN
#ifndef SD_DETECT_PIN
#define SD_DETECT_PIN EXP2_07_PIN
#endif
@@ -881,7 +883,9 @@
#else
#define BEEPER_PIN EXP2_05_PIN
#ifndef BEEPER_PIN
#define BEEPER_PIN EXP2_05_PIN
#endif
#if ENABLED(PANEL_ONE) // Buttons connect directly to AUX-2
#define BTN_EN1 AUX2_03_PIN
@@ -896,6 +900,10 @@
#endif
#endif // IS_NEWPANEL
#ifndef BEEPER_PIN
#define BEEPER_PIN EXP1_01_PIN // Most common mapping
#endif
#endif // HAS_WIRED_LCD && !LCD_PINS_DEFINED
#if IS_RRW_KEYPAD && !HAS_ADC_BUTTONS