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

4
Marlin/src/pins/sam/pins_ALLIGATOR_R2.h
View File

@@ -143,7 +143,7 @@
//
// LCD / Controller
//
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#if IS_RRD_FG_SC
#define LCD_PINS_RS 18
#define LCD_PINS_ENABLE 15
#define LCD_PINS_D4 19
@@ -152,7 +152,7 @@
#define UI_VOLTAGE_LEVEL 1
#endif
#if ENABLED(NEWPANEL)
#if IS_NEWPANEL
#define BTN_EN1 14
#define BTN_EN2 16
#define BTN_ENC 17

4
Marlin/src/pins/sam/pins_ARCHIM1.h
View File

@@ -192,10 +192,10 @@
#define SD_DETECT_PIN 2 // D2 PB25_TIOA0
#if ENABLED(NEWPANEL)
#if IS_NEWPANEL
// Buttons on AUX-2
#define BTN_EN1 60 // D60 PA3_TIOB1
#define BTN_EN2 13 // D13 PB27_TIOB0
#define BTN_ENC 16 // D16 PA13_TXD1
#endif // NEWPANEL
#endif // IS_NEWPANEL
#endif // HAS_WIRED_LCD

14
Marlin/src/pins/sam/pins_ARCHIM2.h
View File

@@ -247,11 +247,11 @@
#define LCD_PINS_D7 34 // D34 PC2_PWML0
#define SD_DETECT_PIN 2 // D2 PB25_TIOA0
#if ANY(ULTIPANEL, TOUCH_UI_ULTIPANEL, TOUCH_UI_FTDI_EVE)
// Buttons on AUX-2
#define BTN_EN1 60 // D60 PA3_TIOB1
#define BTN_EN2 13 // D13 PB27_TIOB0
#define BTN_ENC 16 // D16 PA13_TXD1 // the click
#endif
#endif
#if ANY(IS_ULTIPANEL, TOUCH_UI_ULTIPANEL, TOUCH_UI_FTDI_EVE)
// Buttons on AUX-2
#define BTN_EN1 60 // D60 PA3_TIOB1
#define BTN_EN2 13 // D13 PB27_TIOB0
#define BTN_ENC 16 // D16 PA13_TXD1 // the click
#endif

2
Marlin/src/pins/sam/pins_DUE3DOM.h
View File

@@ -122,7 +122,7 @@
#define LCD_PINS_D6 46
#define LCD_PINS_D7 47
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
#if IS_RRD_SC
#define BEEPER_PIN 41

2
Marlin/src/pins/sam/pins_DUE3DOM_MINI.h
View File

@@ -114,7 +114,7 @@
#define LCD_PINS_D6 46
#define LCD_PINS_D7 47
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
#if IS_RRD_SC
#define BEEPER_PIN 41

2
Marlin/src/pins/sam/pins_RADDS.h
View File

@@ -248,7 +248,7 @@
#define SDSS 10
#define SD_DETECT_PIN 14
#elif ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#elif IS_RRD_FG_SC
// The REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER requires
// an adapter such as https://www.thingiverse.com/thing:1740725

8
Marlin/src/pins/sam/pins_RAMPS_DUO.h
View File

@@ -78,7 +78,7 @@
//
#if HAS_WIRED_LCD
#if BOTH(NEWPANEL, PANEL_ONE)
#if BOTH(IS_NEWPANEL, PANEL_ONE)
#undef LCD_PINS_D4
#define LCD_PINS_D4 68
@@ -89,7 +89,7 @@
#define LCD_PINS_D7 67
#endif
#if ENABLED(NEWPANEL)
#if IS_NEWPANEL
#if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
@@ -115,7 +115,7 @@
#else
#if ENABLED(REPRAPWORLD_KEYPAD)
#if IS_RRW_KEYPAD
#undef BTN_EN1
#define BTN_EN1 67 // encoder
@@ -127,6 +127,6 @@
#endif
#endif
#endif // NEWPANEL
#endif // IS_NEWPANEL
#endif // HAS_WIRED_LCD

4
Marlin/src/pins/sam/pins_RAMPS_FD_V1.h
View File

@@ -148,7 +148,7 @@
#define BTN_ENC 35
#define SD_DETECT_PIN 49
#if ENABLED(NEWPANEL)
#if IS_NEWPANEL
#define LCD_PINS_RS 16
#define LCD_PINS_ENABLE 17
#endif
@@ -178,7 +178,7 @@
#define NEOPIXEL_PIN 25
#endif
#elif ENABLED(NEWPANEL)
#elif IS_NEWPANEL
#define LCD_PINS_D4 23
#define LCD_PINS_D5 25

8
Marlin/src/pins/sam/pins_RURAMPS4D_11.h
View File

@@ -202,7 +202,7 @@
//
#if HAS_WIRED_LCD
#if ANY(RADDS_DISPLAY, REPRAP_DISCOUNT_SMART_CONTROLLER, REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#if ANY(RADDS_DISPLAY, IS_RRD_SC, IS_RRD_FG_SC)
#define BEEPER_PIN 62
#define LCD_PINS_D4 48
#define LCD_PINS_D5 50
@@ -211,12 +211,12 @@
#define SD_DETECT_PIN 51
#endif
#if EITHER(RADDS_DISPLAY, REPRAP_DISCOUNT_SMART_CONTROLLER)
#if EITHER(RADDS_DISPLAY, IS_RRD_SC)
#define LCD_PINS_RS 63
#define LCD_PINS_ENABLE 64
#elif ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#elif IS_RRD_FG_SC
#define LCD_PINS_RS 52
#define LCD_PINS_ENABLE 53
@@ -265,7 +265,7 @@
#endif // SPARK_FULL_GRAPHICS
#if ENABLED(NEWPANEL)
#if IS_NEWPANEL
#define BTN_EN1 44
#define BTN_EN2 42
#define BTN_ENC 40

8
Marlin/src/pins/sam/pins_RURAMPS4D_13.h
View File

@@ -188,7 +188,7 @@
//
#if HAS_WIRED_LCD
#if ANY(RADDS_DISPLAY, REPRAP_DISCOUNT_SMART_CONTROLLER, REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#if ANY(RADDS_DISPLAY, IS_RRD_SC, IS_RRD_FG_SC)
#define BEEPER_PIN 62
#define LCD_PINS_D4 48
#define LCD_PINS_D5 50
@@ -197,12 +197,12 @@
#define SD_DETECT_PIN 51
#endif
#if EITHER(RADDS_DISPLAY, REPRAP_DISCOUNT_SMART_CONTROLLER)
#if EITHER(RADDS_DISPLAY, IS_RRD_SC)
#define LCD_PINS_RS 63
#define LCD_PINS_ENABLE 64
#elif ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#elif IS_RRD_FG_SC
#define LCD_PINS_RS 52
#define LCD_PINS_ENABLE 53
@@ -247,7 +247,7 @@
#endif
#if ENABLED(NEWPANEL)
#if IS_NEWPANEL
#define BTN_EN1 44
#define BTN_EN2 42
#define BTN_ENC 40