jessikitty/Marlin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Modify a few things to merge nicer

Browse Source
This commit is contained in:
InsanityAutomation
2018-04-26 15:24:23 -04:00
parent c6d99c772b
commit 3bdca8730e
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Marlin/pins_RAMPS.h
+12 -10
View File
@@ -428,7 +428,8 @@
#else
#define SD_DETECT_PIN -1
#endif
#define KILL_PIN 41
#define KILL_PIN 41
#if ENABLED(BQ_LCD_SMART_CONTROLLER)
#define LCD_BACKLIGHT_PIN 39
#endif
@@ -439,11 +440,10 @@
#define BTN_EN2 59
#define BTN_ENC 63
#if(ENABLED(BoardRev2))
#define SD_DETECT_PIN 49
#define SD_DETECT_PIN 42
#else
#define SD_DETECT_PIN -1
#endif
#define KILL_PIN 41
#elif ENABLED(LCD_I2C_PANELOLU2)
@@ -459,8 +459,8 @@
#define BTN_EN2 7 // 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13.
#define BTN_ENC -1
#define LCD_SDSS SDSS
//#define SD_DETECT_PIN 49
#define LCD_SDSS 53
#define SD_DETECT_PIN 49
#elif ENABLED(VIKI2) || ENABLED(miniVIKI)
@@ -476,7 +476,8 @@
#define BTN_EN2 7
#define BTN_ENC 39
#define SD_DETECT_PIN -1 // Pin 49 for display sd interface, 72 for easy adapter board
#define SDSS 53
#define SD_DETECT_PIN -1 // Pin 49 for display sd interface, 72 for easy adapter board
#define KILL_PIN 31
#elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
@@ -491,7 +492,7 @@
#define BTN_EN2 37
#define BTN_ENC 31
#define LCD_SDSS SDSS
#define LCD_SDSS 53
#if(ENABLED(BoardRev2))
#define SD_DETECT_PIN 49
#else
@@ -519,12 +520,13 @@
#define BTN_EN2 33
#define BTN_ENC 35
#define SDSS 53
#if(ENABLED(BoardRev2))
#define SD_DETECT_PIN 49
#else
#define SD_DETECT_PIN -1
#endif
#define KILL_PIN 41
#define KILL_PIN 64
#elif ENABLED(MINIPANEL)
@@ -545,13 +547,13 @@
#define BTN_EN1 40
#define BTN_EN2 63
#define BTN_ENC 59
#define SDSS 53
#if(ENABLED(BoardRev2))
#define SD_DETECT_PIN 49
#else
#define SD_DETECT_PIN -1
#endif
#define KILL_PIN 41
#define KILL_PIN 64
#elif ENABLED(ZONESTAR_LCD)