bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

TFT Presets, Generic options, Sanity checks (#19723)

Browse Source
This commit is contained in:
Scott Lahteine
2020-10-15 03:00:27 -05:00
committed by GitHub
parent 04c27573d6
commit f6ffbe548c
116 changed files with 593 additions and 599 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Marlin/src/pins/linux/pins_RAMPS_LINUX.h
View File

@ -400,7 +400,7 @@
#define LCD_PINS_ENABLE 51 // SID (MOSI)
#define LCD_PINS_D4 52 // SCK (CLK) clock
#elif BOTH(NEWPANEL, PANEL_ONE)
#elif BOTH(IS_NEWPANEL, PANEL_ONE)
#define LCD_PINS_RS 40
#define LCD_PINS_ENABLE 42
@ -417,7 +417,7 @@
#define LCD_PINS_ENABLE 29
#define LCD_PINS_D4 25
#if DISABLED(NEWPANEL)
#if !IS_NEWPANEL
#define BEEPER_PIN 37
#endif
@ -450,13 +450,13 @@
#define LCD_PINS_D7 29
#if DISABLED(NEWPANEL)
#if !IS_NEWPANEL
#define BEEPER_PIN 33
#endif
#endif
#if DISABLED(NEWPANEL)
#if !IS_NEWPANEL
// Buttons attached to a shift register
// Not wired yet
//#define SHIFT_CLK 38
@ -470,7 +470,7 @@
//
// LCD Display input pins
//
#if ENABLED(NEWPANEL)
#if IS_NEWPANEL
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
@ -607,7 +607,7 @@
#define BEEPER_PIN 33
// Buttons are directly attached to AUX-2
#if ENABLED(REPRAPWORLD_KEYPAD)
#if IS_RRW_KEYPAD
#define SHIFT_OUT 40
#define SHIFT_CLK 44
#define SHIFT_LD 42
@ -630,6 +630,6 @@
#endif
#endif
#endif // NEWPANEL
#endif // IS_NEWPANEL
#endif // HAS_WIRED_LCD