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

2
Marlin/src/pins/esp32/pins_MRR_ESPE.h
View File

@ -134,7 +134,7 @@
#define BEEPER_PIN 151
#elif ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#elif IS_RRD_FG_SC
#define BEEPER_PIN 151

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

4
Marlin/src/pins/lpc1768/pins_BIQU_B300_V1.0.h
View File

@ -138,8 +138,8 @@
#define LCD_PINS_ENABLE P0_18 // (MOSI) EXP1-3
#define LCD_PINS_D4 P0_15 // (SCK) EXP1-5
#if BOTH(HAS_MARLINUI_HD44780, REPRAP_DISCOUNT_SMART_CONTROLLER)
#error "REPRAP_DISCOUNT_SMART_CONTROLLER is not supported by the BIQU B300 v1.0"
#if BOTH(HAS_MARLINUI_HD44780, IS_RRD_SC)
#error "REPRAP_DISCOUNT_SMART_CONTROLLER displays aren't supported by the BIQU B300 v1.0"
#endif
#if ENABLED(SDSUPPORT)

4
Marlin/src/pins/lpc1768/pins_BIQU_BQ111_A4.h
View File

@ -109,8 +109,8 @@
#define LCD_PINS_ENABLE P0_18 // (MOSI) EXP1-3
#define LCD_PINS_D4 P0_15 // (SCK) EXP1-5
#if BOTH(HAS_MARLINUI_HD44780, REPRAP_DISCOUNT_SMART_CONTROLLER)
#error "REPRAP_DISCOUNT_SMART_CONTROLLER is not supported by the BIQU BQ111-A4"
#if BOTH(HAS_MARLINUI_HD44780, IS_RRD_SC)
#error "REPRAP_DISCOUNT_SMART_CONTROLLER displays aren't supported by the BIQU BQ111-A4"
#endif
#if ENABLED(SDSUPPORT)

2
Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
View File

@ -348,7 +348,7 @@
#define LCD_BACKLIGHT_PIN -1
#endif
#if ENABLED(ULTIPANEL)
#if IS_ULTIPANEL
#define LCD_PINS_D5 EXPA1_05_PIN
#define LCD_PINS_D6 EXPA1_04_PIN
#define LCD_PINS_D7 EXPA1_03_PIN

5
Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
View File

@ -293,9 +293,6 @@
#define TOUCH_BUTTONS_HW_SPI
#define TOUCH_BUTTONS_HW_SPI_DEVICE 1
#ifndef GRAPHICAL_TFT_UPSCALE
#define GRAPHICAL_TFT_UPSCALE 3
#endif
// SPI 1
#define SCK_PIN P0_15
#define MISO_PIN P0_17
@ -398,7 +395,7 @@
#define FORCE_SOFT_SPI
#endif
#if ENABLED(ULTIPANEL)
#if IS_ULTIPANEL
#define LCD_PINS_D5 P1_21
#define LCD_PINS_D6 P1_22
#define LCD_PINS_D7 P1_23

2
Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h
View File

@ -125,7 +125,7 @@
//
// LCD
//
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
#if IS_RRD_SC
#define BEEPER_PIN P0_19
#define BTN_EN1 P1_23
#define BTN_EN2 P1_24

2
Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
View File

@ -147,7 +147,7 @@
//
// Ethernet pins
//
#ifndef ULTIPANEL
#if !IS_ULTIPANEL
#define ENET_MDIO P1_17 // J12-4
#define ENET_RX_ER P1_14 // J12-6
#define ENET_RXD1 P1_10 // J12-8

2
Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
View File

@ -319,7 +319,7 @@
#define DOGLCD_A0 P1_00
#endif
#if ENABLED(ULTIPANEL)
#if IS_ULTIPANEL
#define LCD_PINS_D5 P0_17
#define LCD_PINS_D6 P1_00
#define LCD_PINS_D7 P1_22

8
Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
View File

@ -357,8 +357,8 @@
#define LCD_PINS_RS P0_16 // (16) J3-7 & AUX-4
#define LCD_SDSS P1_23 // (53) J3-5 & AUX-3
#if ENABLED(NEWPANEL)
#if ENABLED(REPRAPWORLD_KEYPAD)
#if IS_NEWPANEL
#if IS_RRW_KEYPAD
#define SHIFT_OUT P0_18 // (51) (MOSI) J3-10 & AUX-3
#define SHIFT_CLK P0_15 // (52) (SCK) J3-9 & AUX-3
#define SHIFT_LD P1_31 // (49) J3-1 & AUX-3 (NOT 5V tolerant)
@ -416,7 +416,7 @@
#define LCD_BACKLIGHT_PIN P0_16 //(16) J3-7 & AUX-4 - only used on DOGLCD controllers
#define LCD_PINS_ENABLE P0_18 // (51) (MOSI) J3-10 & AUX-3
#define LCD_PINS_D4 P0_15 // (52) (SCK) J3-9 & AUX-3
#if ENABLED(ULTIPANEL)
#if IS_ULTIPANEL
#define LCD_PINS_D5 P1_17 // (71) ENET_MDIO
#define LCD_PINS_D6 P1_14 // (73) ENET_RX_ER
#define LCD_PINS_D7 P1_10 // (75) ENET_RXD1
@ -436,7 +436,7 @@
//
// Ethernet pins
//
#if DISABLED(ULTIPANEL)
#if !IS_ULTIPANEL
#define ENET_MDIO P1_17 // (71) J12-4
#define ENET_RX_ER P1_14 // (73) J12-6
#define ENET_RXD1 P1_10 // (75) J12-8

4
Marlin/src/pins/lpc1768/pins_SELENA_COMPACT.h
View File

@ -96,7 +96,7 @@
// Display
//
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#if IS_RRD_FG_SC
#define LCD_PINS_RS P0_16
#define LCD_PINS_ENABLE P0_18
#define LCD_PINS_D4 P0_15
@ -110,4 +110,4 @@
#define BTN_ENC P1_30
#define SD_DETECT_PIN -1
#endif // REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
#endif // IS_RRD_FG_SC

6
Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h
View File

@ -144,11 +144,11 @@
#define DOGLCD_A0 P2_06 // (59) J3-8 & AUX-2
#if ENABLED(REPRAPWORLD_KEYPAD)
#if IS_RRW_KEYPAD
#define SHIFT_OUT P0_18 // (51) (MOSI) J3-10 & AUX-3
#define SHIFT_CLK P0_15 // (52) (SCK) J3-9 & AUX-3
#define SHIFT_LD P1_31 // (49) not 5V tolerant J3-1 & AUX-3
#elif DISABLED(NEWPANEL)
#elif !IS_NEWPANEL
//#define SHIFT_OUT P2_11 // (35) J3-3 & AUX-4
//#define SHIFT_CLK P3_26 // (31) J3-2 & AUX-4
//#define SHIFT_LD P3_25 // (33) J3-4 & AUX-4
@ -166,7 +166,7 @@
#define STAT_LED_BLUE_PIN P0_26 // (63) may change if cable changes
#define STAT_LED_RED_PIN P1_21 // ( 6) may change if cable changes
#else
#if ENABLED(ULTIPANEL)
#if IS_ULTIPANEL
#define LCD_PINS_D5 P1_17 // (71) ENET_MDIO
#define LCD_PINS_D6 P1_14 // (73) ENET_RX_ER
#define LCD_PINS_D7 P1_10 // (75) ENET_RXD1

2
Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h
View File

@ -325,7 +325,7 @@
#define DOGLCD_A0 P1_00
#endif
#if ENABLED(ULTIPANEL)
#if IS_ULTIPANEL
#define LCD_PINS_D5 P0_17
#define LCD_PINS_D6 P1_00
#define LCD_PINS_D7 P1_22

2
Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h
View File

@ -138,7 +138,7 @@
* http://chibidibidiwah.wdfiles.com/local--files/panel/smoothieboard2sd.jpg
* http://smoothieware.org/panel
*/
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#if IS_RRD_FG_SC
// EXP1 Pins
#define BEEPER_PIN P1_31 // EXP1 Pin 1
#define BTN_ENC P1_30 // EXP1 Pin 2

2
Marlin/src/pins/mega/pins_CHEAPTRONICv2.h
View File

@ -129,7 +129,7 @@
#define SD_DETECT_PIN 49
#endif
#if ENABLED(NEWPANEL)
#if IS_NEWPANEL
#define BTN_EN1 11
#define BTN_EN2 12
#define BTN_ENC 43

6
Marlin/src/pins/mega/pins_GT2560_REV_A.h
View File

@ -109,7 +109,7 @@
#define BEEPER_PIN 18
#if ENABLED(NEWPANEL)
#if IS_NEWPANEL
#if ENABLED(MKS_MINI_12864)
#define DOGLCD_A0 5
@ -130,7 +130,7 @@
#define BTN_ENC 19
#define SD_DETECT_PIN 38
#else // !NEWPANEL
#else // !IS_NEWPANEL
#define SHIFT_CLK 38
#define SHIFT_LD 42
@ -146,6 +146,6 @@
#define SD_DETECT_PIN -1
#endif // !NEWPANEL
#endif // !IS_NEWPANEL
#endif // HAS_WIRED_LCD

2
Marlin/src/pins/mega/pins_GT2560_V3.h
View File

@ -172,7 +172,7 @@
#define LCD_PINS_D7 36
#endif
#if ENABLED(NEWPANEL)
#if IS_NEWPANEL
#ifndef BTN_EN1
#define BTN_EN1 42
#endif

2
Marlin/src/pins/mega/pins_GT2560_V3_A20.h
View File

@ -32,7 +32,7 @@
#define SPEAKER // The speaker can produce tones
#if ENABLED(NEWPANEL)
#if IS_NEWPANEL
#define BTN_EN1 16
#define BTN_EN2 17
#define BTN_ENC 19

4
Marlin/src/pins/mega/pins_HJC2560C_REV2.h
View File

@ -127,7 +127,7 @@
#define BEEPER_PIN 18
#if ENABLED(NEWPANEL)
#if IS_NEWPANEL
#define LCD_PINS_RS 20 // LCD_CS
#define LCD_PINS_ENABLE 15 // LCD_SDA
@ -168,6 +168,6 @@
#define LCD_PINS_D6 20
#define LCD_PINS_D7 19
#endif // !NEWPANEL
#endif // !IS_NEWPANEL
#endif // HAS_WIRED_LCD

4
Marlin/src/pins/mega/pins_MEGATRONICS.h
View File

@ -108,7 +108,7 @@
//
#define BEEPER_PIN 33
#if BOTH(ULTRA_LCD, NEWPANEL)
#if IS_ULTRA_LCD && IS_NEWPANEL
#define LCD_PINS_RS 16
#define LCD_PINS_ENABLE 17
@ -124,7 +124,7 @@
#define SD_DETECT_PIN -1 // RAMPS doesn't use this
#endif // ULTRA_LCD && NEWPANEL
#endif // IS_ULTRA_LCD && IS_NEWPANEL
//
// M3/M4/M5 - Spindle/Laser Control

2
Marlin/src/pins/mega/pins_MEGATRONICS_2.h
View File

@ -139,7 +139,7 @@
#define LCD_PINS_D6 32
#define LCD_PINS_D7 33
#if ENABLED(NEWPANEL)
#if IS_NEWPANEL
// Buttons are directly attached using keypad
#define BTN_EN1 61
#define BTN_EN2 59

2
Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h
View File

@ -214,7 +214,7 @@
//
#if HAS_WIRED_LCD
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#if IS_RRD_FG_SC
#define LCD_PINS_RS 33 // C4: LCD-STROBE
#define LCD_PINS_ENABLE 72 // J2: LEFT

2
Marlin/src/pins/mega/pins_OVERLORD.h
View File

@ -132,7 +132,7 @@
#endif
#endif
#if ENABLED(NEWPANEL)
#if IS_NEWPANEL
#define BTN_ENC 16 // Enter Pin
#define BTN_UP 19 // Button UP Pin
#define BTN_DWN 17 // Button DOWN Pin

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

@ -49,7 +49,9 @@
#define IS_RAMPS_SF
#endif
#define HAS_FREE_AUX2_PINS !(BOTH(ULTRA_LCD, NEWPANEL) && ANY(PANEL_ONE, VIKI2, miniVIKI, MINIPANEL, REPRAPWORLD_KEYPAD))
#if !(BOTH(IS_ULTRA_LCD, IS_NEWPANEL) && ANY(PANEL_ONE, VIKI2, miniVIKI, MINIPANEL, REPRAPWORLD_KEYPAD))
#define HAS_FREE_AUX2_PINS 1
#endif
// Test the target within the included pins file
#ifdef __MARLIN_DEPS__

4
Marlin/src/pins/rambo/pins_EINSY_RAMBO.h
View File

@ -164,7 +164,7 @@
#define KILL_PIN 32
#if ENABLED(ULTIPANEL) || TOUCH_UI_ULTIPANEL
#if IS_ULTIPANEL || TOUCH_UI_ULTIPANEL
#if ENABLED(CR10_STOCKDISPLAY)
#define LCD_PINS_RS 85
@ -187,5 +187,5 @@
#define BEEPER_PIN 84 // AUX-4
#define SD_DETECT_PIN 15
#endif // ULTIPANEL || TOUCH_UI_ULTIPANEL
#endif // IS_ULTIPANEL || TOUCH_UI_ULTIPANEL
#endif // HAS_WIRED_LCD

4
Marlin/src/pins/rambo/pins_EINSY_RETRO.h
View File

@ -170,7 +170,7 @@
#define KILL_PIN 32
#if ANY(ULTIPANEL, TOUCH_UI_ULTIPANEL, TOUCH_UI_FTDI_EVE)
#if ANY(IS_ULTIPANEL, TOUCH_UI_ULTIPANEL, TOUCH_UI_FTDI_EVE)
#if ENABLED(CR10_STOCKDISPLAY)
#define LCD_PINS_RS 85
@ -194,6 +194,6 @@
#define SD_DETECT_PIN 15
#endif // ULTIPANEL || TOUCH_UI_ULTIPANEL || TOUCH_UI_FTDI_EVE
#endif // IS_ULTIPANEL || TOUCH_UI_ULTIPANEL || TOUCH_UI_FTDI_EVE
#endif // HAS_WIRED_LCD || TOUCH_UI_ULTIPANEL || TOUCH_UI_FTDI_EVE

4
Marlin/src/pins/rambo/pins_MINIRAMBO.h
View File

@ -147,7 +147,7 @@
#define KILL_PIN 32
#endif
#if ENABLED(ULTIPANEL) || TOUCH_UI_ULTIPANEL
#if IS_ULTIPANEL || TOUCH_UI_ULTIPANEL
#if MB(MINIRAMBO_10A)
@ -187,6 +187,6 @@
#endif // !MINIRAMBO_10A
#endif // ULTIPANEL || TOUCH_UI_ULTIPANEL
#endif // IS_ULTIPANEL || TOUCH_UI_ULTIPANEL
#endif // HAS_WIRED_LCD || TOUCH_UI_ULTIPANEL

6
Marlin/src/pins/rambo/pins_RAMBO.h
View File

@ -187,7 +187,7 @@
#define KILL_PIN 80
#if ENABLED(ULTIPANEL) || TOUCH_UI_ULTIPANEL
#if IS_ULTIPANEL || TOUCH_UI_ULTIPANEL
#define LCD_PINS_RS 70
#define LCD_PINS_ENABLE 71
@ -228,7 +228,7 @@
#endif // !VIKI2 && !miniVIKI
#else // !NEWPANEL - old style panel with shift register
#else // !IS_NEWPANEL - old style panel with shift register
// No Beeper added
#define BEEPER_PIN 33
@ -247,6 +247,6 @@
#define LCD_PINS_D6 27
#define LCD_PINS_D7 29
#endif // !NEWPANEL
#endif // !IS_NEWPANEL
#endif // HAS_WIRED_LCD

6
Marlin/src/pins/ramps/pins_3DRAG.h
View File

@ -78,7 +78,7 @@
//
// LCD / Controller
//
#if BOTH(ULTRA_LCD, NEWPANEL)
#if IS_ULTRA_LCD && IS_NEWPANEL
#undef BEEPER_PIN
#undef LCD_PINS_RS
@ -106,7 +106,7 @@
#define BEEPER_PIN 33
#endif // ULTRA_LCD && NEWPANEL
#endif // IS_ULTRA_LCD && IS_NEWPANEL
/**
* M3/M4/M5 - Spindle/Laser Control
@ -157,7 +157,7 @@
#define SPINDLE_LASER_PWM_PIN 46 // Hardware PWM
#define SPINDLE_LASER_ENA_PIN 62 // Pullup!
#define SPINDLE_DIR_PIN 48
#elif !BOTH(ULTRA_LCD, NEWPANEL) // use expansion header if no LCD in use
#elif !BOTH(IS_ULTRA_LCD, IS_NEWPANEL) // use expansion header if no LCD in use
#define SPINDLE_LASER_ENA_PIN 16 // Pullup or pulldown!
#define SPINDLE_DIR_PIN 17
#endif

4
Marlin/src/pins/ramps/pins_FELIX2.h
View File

@ -49,11 +49,11 @@
//
// LCD / Controller
//
#if BOTH(ULTRA_LCD, NEWPANEL)
#if IS_ULTRA_LCD && IS_NEWPANEL
#define SD_DETECT_PIN 6
#endif // NEWPANEL && ULTRA_LCD
#endif
//
// M3/M4/M5 - Spindle/Laser Control

2
Marlin/src/pins/ramps/pins_FORMBOT_RAPTOR.h
View File

@ -181,7 +181,7 @@
//
// Formbot only supports REPRAP_DISCOUNT_SMART_CONTROLLER
//
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
#if IS_RRD_SC
#define BEEPER_PIN 37
#define BTN_EN1 31
#define BTN_EN2 33

2
Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h
View File

@ -175,7 +175,7 @@
//
// Formbot only supports REPRAP_DISCOUNT_SMART_CONTROLLER
//
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
#if IS_RRD_SC
#ifndef BEEPER_PIN
#define BEEPER_PIN 37
#endif

2
Marlin/src/pins/ramps/pins_FORMBOT_TREX3.h
View File

@ -155,7 +155,7 @@
//
// Formbot only supports REPRAP_DISCOUNT_SMART_CONTROLLER
//
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
#if IS_RRD_SC
#define LCD_PINS_RS 16
#define LCD_PINS_ENABLE 17
#define LCD_PINS_D4 23

2
Marlin/src/pins/ramps/pins_FYSETC_F6_13.h
View File

@ -277,7 +277,7 @@
#endif
#if ENABLED(NEWPANEL)
#if IS_NEWPANEL
#define BTN_EN1 31
#define BTN_EN2 33
#define BTN_ENC 35

2
Marlin/src/pins/ramps/pins_K8600.h
View File

@ -96,7 +96,7 @@
//
// LCD / Controller
//
#if BOTH(ULTRA_LCD, NEWPANEL)
#if IS_ULTRA_LCD && IS_NEWPANEL
#undef BEEPER_PIN
#undef LCD_PINS_RS

2
Marlin/src/pins/ramps/pins_K8800.h
View File

@ -113,7 +113,7 @@
#define LCD_CONTRAST_MAX 100
#define DEFAULT_LCD_CONTRAST 30
#if ENABLED(NEWPANEL)
#if IS_NEWPANEL
#define BTN_EN1 17
#define BTN_EN2 16
#define BTN_ENC 23

2
Marlin/src/pins/ramps/pins_ORTUR_4.h
View File

@ -91,7 +91,7 @@
//
// LCD / Controller
//
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#if IS_RRD_FG_SC
#undef BEEPER_PIN
#define BEEPER_PIN 35

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

@ -441,7 +441,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
@ -462,7 +462,7 @@
#define LCD_PINS_ENABLE 29
#define LCD_PINS_D4 25
#if DISABLED(NEWPANEL)
#if !IS_NEWPANEL
#define BEEPER_PIN 37
#endif
@ -481,10 +481,10 @@
#define LCD_PINS_DC 25 // Set as output on init
#define LCD_PINS_RS 27 // Pull low for 1s to init
// DOGM SPI LCD Support
#define DOGLCD_A0 LCD_PINS_DC
#define DOGLCD_CS 16
#define DOGLCD_MOSI 17
#define DOGLCD_SCK 23
#define DOGLCD_A0 LCD_PINS_DC
#else
#define LCD_PINS_RS 16
#define LCD_PINS_ENABLE 17
@ -495,13 +495,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
@ -515,9 +515,9 @@
//
// LCD Display input pins
//
#if ENABLED(NEWPANEL)
#if IS_NEWPANEL
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
#if IS_RRD_SC
#define BEEPER_PIN 37
@ -685,6 +685,7 @@
#elif ENABLED(AZSMZ_12864)
// Pins only defined for RAMPS_SMART currently
#error "No pins defined for RAMPS with AZSMZ_12864."
#elif IS_TFTGLCD_PANEL
@ -712,11 +713,11 @@
#endif
#endif
#endif // NEWPANEL
#endif // IS_NEWPANEL
#endif // HAS_WIRED_LCD
#if ENABLED(REPRAPWORLD_KEYPAD) && DISABLED(ADC_KEYPAD)
#if IS_RRW_KEYPAD && !HAS_ADC_BUTTONS
#define SHIFT_OUT 40
#define SHIFT_CLK 44
#define SHIFT_LD 42

2
Marlin/src/pins/ramps/pins_RAMPS_PLUS.h
View File

@ -73,7 +73,7 @@
#undef E0_CS_PIN
#undef E1_CS_PIN
#if ENABLED(ULTRA_LCD) && NONE(REPRAPWORLD_GRAPHICAL_LCD, CR10_STOCKDISPLAY) && !BOTH(NEWPANEL, PANEL_ONE)
#if IS_ULTRA_LCD && NONE(REPRAPWORLD_GRAPHICAL_LCD, CR10_STOCKDISPLAY) && !BOTH(IS_NEWPANEL, PANEL_ONE)
#if DISABLED(MKS_12864OLED) || ENABLED(MKS_12864OLED_SSD1306)
#undef LCD_PINS_RS
#define LCD_PINS_RS 42 // 3DYMY boards pin 16 -> 42

2
Marlin/src/pins/ramps/pins_RIGIDBOARD.h
View File

@ -124,7 +124,7 @@
#undef SD_DETECT_PIN
#define SD_DETECT_PIN 22
#elif ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
#elif IS_RRD_SC
#undef SD_DETECT_PIN
#define SD_DETECT_PIN 22

2
Marlin/src/pins/ramps/pins_RUMBA.h
View File

@ -227,7 +227,7 @@
#define SD_DETECT_PIN 49
#endif
#if ENABLED(NEWPANEL)
#if IS_NEWPANEL
#define BTN_EN1 11
#define BTN_EN2 12
#define BTN_ENC 43

4
Marlin/src/pins/ramps/pins_TENLOG_D3_HERO.h
View File

@ -163,7 +163,7 @@
// LCD / Controller
//
//#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
//#if IS_RRD_SC
#define LCD_PINS_RS -1
#define LCD_PINS_ENABLE -1
@ -182,4 +182,4 @@
#define BEEPER_PIN -1
//#endif
//#endif // REPRAP_DISCOUNT_SMART_CONTROLLER
//#endif // IS_RRD_SC

4
Marlin/src/pins/ramps/pins_TRIGORILLA_14.h
View File

@ -131,13 +131,13 @@
#if 0 && HAS_WIRED_LCD
// LCD Display output pins
#if BOTH(NEWPANEL, PANEL_ONE)
#if BOTH(IS_NEWPANEL, PANEL_ONE)
#undef LCD_PINS_D6
#define LCD_PINS_D6 57
#endif
// LCD Display input pins
#if ENABLED(NEWPANEL)
#if IS_NEWPANEL
#if ANY(VIKI2, miniVIKI)
#undef DOGLCD_A0
#define DOGLCD_A0 23

16
Marlin/src/pins/ramps/pins_TT_OSCAR.h
View File

@ -282,7 +282,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
@ -309,7 +309,7 @@
#define LCD_PINS_ENABLE 29
#define LCD_PINS_D4 25
#if DISABLED(NEWPANEL)
#if !IS_NEWPANEL
#define BEEPER_PIN 37
#endif
@ -333,13 +333,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
@ -353,9 +353,9 @@
//
// LCD Display input pins
//
#if ENABLED(NEWPANEL)
#if IS_NEWPANEL
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
#if IS_RRD_SC
#define BEEPER_PIN 37
@ -486,7 +486,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
@ -510,6 +510,6 @@
#endif
#endif // NEWPANEL
#endif // IS_NEWPANEL
#endif

6
Marlin/src/pins/ramps/pins_ULTIMAKER.h
View File

@ -123,7 +123,7 @@
#define BEEPER_PIN 18
#if ENABLED(NEWPANEL)
#if IS_NEWPANEL
#define LCD_PINS_RS 20
#define LCD_PINS_ENABLE 17
@ -139,7 +139,7 @@
#define SD_DETECT_PIN 38
#else // !NEWPANEL - Old style panel with shift register
#else // !IS_NEWPANEL - Old style panel with shift register
// Buttons attached to a shift register
#define SHIFT_CLK 38
@ -156,7 +156,7 @@
#define SD_DETECT_PIN -1
#endif // !NEWPANEL
#endif // !IS_NEWPANEL
#endif // HAS_WIRED_LCD

8
Marlin/src/pins/ramps/pins_ULTIMAKER_OLD.h
View File

@ -174,11 +174,11 @@
#define LCD_PINS_D6 32
#define LCD_PINS_D7 30
#elif BOTH(BOARD_REV_1_5, ULTRA_LCD)
#elif BOTH(BOARD_REV_1_5, IS_ULTRA_LCD)
#define BEEPER_PIN 18
#if ENABLED(NEWPANEL)
#if IS_NEWPANEL
#define LCD_PINS_RS 20
#define LCD_PINS_ENABLE 17
@ -194,7 +194,7 @@
#define SD_DETECT_PIN 38
#else // !NEWPANEL - Old style panel with shift register
#else // !IS_NEWPANEL - Old style panel with shift register
// Buttons attached to a shift register
#define SHIFT_CLK 38
@ -209,7 +209,7 @@
#define LCD_PINS_D6 20
#define LCD_PINS_D7 19
#endif // !NEWPANEL
#endif // !IS_NEWPANEL
#endif

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

16
Marlin/src/pins/samd/pins_RAMPS_144.h
View File

@ -299,7 +299,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)
// TO TEST
//#define LCD_PINS_RS 40
@ -318,7 +318,7 @@
//#define LCD_PINS_ENABLE 29
//#define LCD_PINS_D4 25
#if DISABLED(NEWPANEL)
#if !IS_NEWPANEL
// TO TEST
//#define BEEPER_PIN 37
#endif
@ -354,13 +354,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
@ -374,9 +374,9 @@
//
// LCD Display input pins
//
#if ENABLED(NEWPANEL)
#if IS_NEWPANEL
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
#if IS_RRD_SC
#define BEEPER_PIN 37
@ -565,7 +565,7 @@
//#define BEEPER_PIN 33
// Buttons are directly attached to AUX-2
#if ENABLED(REPRAPWORLD_KEYPAD)
#if IS_RRW_KEYPAD
// TO TEST
//#define SHIFT_OUT 40
//#define SHIFT_CLK 44
@ -592,7 +592,7 @@
#endif
#endif
#endif // NEWPANEL
#endif // IS_NEWPANEL
#endif // HAS_WIRED_LCD

4
Marlin/src/pins/sanguino/pins_ANET_10.h
View File

@ -151,7 +151,7 @@
#if HAS_WIRED_LCD
#define LCD_SDSS 28
#if ENABLED(ADC_KEYPAD)
#if HAS_ADC_BUTTONS
#define SERVO0_PIN 27 // free for BLTouch/3D-Touch
#define LCD_PINS_RS 28
#define LCD_PINS_ENABLE 29
@ -160,7 +160,7 @@
#define LCD_PINS_D6 16
#define LCD_PINS_D7 17
#define ADC_KEYPAD_PIN 1
#elif ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#elif IS_RRD_FG_SC
// Pin definitions for the Anet A6 Full Graphics display and the RepRapDiscount Full Graphics
// display using an adapter board // https://go.aisler.net/benlye/anet-lcd-adapter/pcb
// See below for alternative pin definitions for use with https://www.thingiverse.com/thing:2103748

8
Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h
View File

@ -136,7 +136,7 @@
#define LCD_BACKLIGHT_PIN 17 // LCD backlight LED
#endif
#if NONE(SPINDLE_FEATURE, LASER_FEATURE) && ENABLED(SANGUINOLOLU_V_1_2) && !BOTH(ULTRA_LCD, NEWPANEL)// try to use IO Header
#if NONE(SPINDLE_FEATURE, LASER_FEATURE) && ENABLED(SANGUINOLOLU_V_1_2) && !BOTH(IS_ULTRA_LCD, IS_NEWPANEL) // try to use IO Header
#define CASE_LIGHT_PIN 4 // Hardware PWM - see if IO Header is available
#endif
@ -185,7 +185,7 @@
// with M42 instead of BEEPER_PIN.
#define BEEPER_PIN 27
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#if IS_RRD_FG_SC
#ifndef BOARD_ST7920_DELAY_1
#define BOARD_ST7920_DELAY_1 DELAY_NS(0)
#endif
@ -283,7 +283,7 @@
#endif
#if ENABLED(NEWPANEL) && !defined(BTN_EN1)
#if IS_NEWPANEL && !defined(BTN_EN1)
#define BTN_EN1 11
#define BTN_EN2 10
#endif
@ -294,7 +294,7 @@
// M3/M4/M5 - Spindle/Laser Control
//
#if HAS_CUTTER
#if !MB(AZTEEG_X1) && ENABLED(SANGUINOLOLU_V_1_2) && !BOTH(ULTRA_LCD, NEWPANEL)// try to use IO Header
#if !MB(AZTEEG_X1) && ENABLED(SANGUINOLOLU_V_1_2) && !BOTH(IS_ULTRA_LCD, IS_NEWPANEL) // try to use IO Header
#define SPINDLE_LASER_ENA_PIN 10 // Pullup or pulldown!
#define SPINDLE_LASER_PWM_PIN 4 // Hardware PWM

2
Marlin/src/pins/sanguino/pins_ZMIB_V2.h
View File

@ -225,7 +225,7 @@
//
// All the above are also RRDSC with rotary encoder
//
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
#if IS_RRD_SC
#define BTN_EN1 2
#define BTN_EN2 12
#define BTN_ENC 29

2
Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h
View File

@ -175,7 +175,7 @@
#else // !FYSETC_MINI_12864
#define LCD_PINS_D4 PC13
#if ENABLED(ULTIPANEL)
#if IS_ULTIPANEL
#define LCD_PINS_D5 PB7
#define LCD_PINS_D6 PC15
#define LCD_PINS_D7 PC14

12
Marlin/src/pins/stm32f1/pins_CHITU3D.h
View File

@ -126,7 +126,7 @@
#define LCD_PINS_RS PD1 // 49 // CS chip select /SS chip slave select
#define LCD_PINS_ENABLE PD3 // 51 // SID (MOSI)
#define LCD_PINS_D4 PD4 // 52 // SCK (CLK) clock
#elif BOTH(NEWPANEL, PANEL_ONE)
#elif BOTH(IS_NEWPANEL, PANEL_ONE)
#define LCD_PINS_RS PB8
#define LCD_PINS_ENABLE PD2
#define LCD_PINS_D4 PB12
@ -140,7 +140,7 @@
#define LCD_PINS_D5 PB13
#define LCD_PINS_D6 PB14
#define LCD_PINS_D7 PB15
#if DISABLED(NEWPANEL)
#if !IS_NEWPANEL
#define BEEPER_PIN PC1 // 33
// Buttons attached to a shift register
// Not wired yet
@ -151,9 +151,9 @@
#endif
#endif
#if ENABLED(NEWPANEL)
#if IS_NEWPANEL
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
#if IS_RRD_SC
#define BEEPER_PIN PC5
@ -254,7 +254,7 @@
#define BEEPER_PIN PC1 // 33
// Buttons directly attached to AUX-2
#if ENABLED(REPRAPWORLD_KEYPAD)
#if IS_RRW_KEYPAD
#define BTN_EN1 PE0 // 64
#define BTN_EN2 PD11 // 59
#define BTN_ENC PD15 // 63
@ -279,6 +279,6 @@
#endif
#endif
#endif // NEWPANEL
#endif // IS_NEWPANEL
#endif // HAS_WIRED_LCD

3
Marlin/src/pins/stm32f1/pins_CHITU3D_V5.h
View File

@ -152,9 +152,6 @@
// Color UI
#define TFT_DRIVER ILI9488
#define TFT_BUFFER_SIZE 14400
#elif ENABLED(TFT_CLASSIC_UI)
// Emulated DOGM
#define GRAPHICAL_TFT_UPSCALE 3
#endif
// XPT2046 Touch Screen calibration

3
Marlin/src/pins/stm32f1/pins_CHITU3D_V6.h
View File

@ -167,9 +167,6 @@
// Color UI
#define TFT_DRIVER ILI9488
#define TFT_BUFFER_SIZE 14400
#elif ENABLED(TFT_CLASSIC_UI)
// Emulated DOGM
#define GRAPHICAL_TFT_UPSCALE 3
#endif
// XPT2046 Touch Screen calibration

2
Marlin/src/pins/stm32f1/pins_FYSETC_AIO_II.h
View File

@ -162,7 +162,7 @@
// not connected to a pin
#define SD_DETECT_PIN PC3
#if ENABLED(NEWPANEL)
#if IS_NEWPANEL
// The encoder and click button
#define BTN_EN1 PC10
#define BTN_EN2 PC11

2
Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h
View File

@ -153,7 +153,7 @@
//#define LCD_CONTRAST_INIT 190
#if ENABLED(NEWPANEL)
#if IS_NEWPANEL
#define BTN_EN1 PC10
#define BTN_EN2 PC11
#define BTN_ENC PC12

4
Marlin/src/pins/stm32f1/pins_GTM32_MINI.h
View File

@ -137,7 +137,7 @@
//
#if HAS_WIRED_LCD
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
#if IS_RRD_SC
//
// LCD display on J2 FFC40
// Geeetech's LCD2004A Control Panel is very much like
@ -172,7 +172,7 @@
#endif // HAS_WIRED_LCD
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
#if IS_RRD_SC
//
// Geeetech's LCD2004A Control Panel is very much like
// RepRapDiscount Smart Controller, but adds an FFC40 connector

2
Marlin/src/pins/stm32f1/pins_GTM32_MINI_A30.h
View File

@ -137,7 +137,7 @@
//
#if HAS_WIRED_LCD
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
#if IS_RRD_SC
//
// LCD display on J2 FFC40
// Geeetech's LCD2004A Control Panel is very much like

4
Marlin/src/pins/stm32f1/pins_GTM32_PRO_VB.h
View File

@ -137,7 +137,7 @@
//
#if HAS_WIRED_LCD
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
#if IS_RRD_SC
//
// LCD display on J2 FFC40
// Geeetech's LCD2004A Control Panel is very much like
@ -172,7 +172,7 @@
#endif // HAS_WIRED_LCD
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
#if IS_RRD_SC
//
// Geeetech's LCD2004A Control Panel is very much like
// RepRapDiscount Smart Controller, but adds an FFC40 connector

2
Marlin/src/pins/stm32f1/pins_GTM32_REV_B.h
View File

@ -137,7 +137,7 @@
//
#if HAS_WIRED_LCD
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
#if IS_RRD_SC
//
// LCD display on J2 FFC40

13
Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h
View File

@ -126,6 +126,11 @@
#endif
#define LED_PIN PB2
#if HAS_FSMC_TFT || HAS_GRAPHICAL_TFT
#define TFT_CS_PIN PG12 // NE4
#define TFT_RS_PIN PF0 // A0
#endif
#if HAS_FSMC_TFT
/**
* Note: MKS Robin TFT screens use various TFT controllers
@ -141,10 +146,8 @@
*/
//#define LCD_RESET_PIN PF6
#define LCD_BACKLIGHT_PIN PG11
#define FSMC_CS_PIN PG12 // NE4
#define FSMC_RS_PIN PF0 // A0
#define TFT_CS_PIN FSMC_CS_PIN
#define TFT_RS_PIN FSMC_RS_PIN
#define FSMC_CS_PIN TFT_CS_PIN
#define FSMC_RS_PIN TFT_RS_PIN
#define LCD_USE_DMA_FSMC // Use DMA transfers to send data to the TFT
#define FSMC_DMA_DEV DMA2
@ -152,8 +155,6 @@
#elif HAS_GRAPHICAL_TFT
#define TFT_RESET_PIN PF6
#define TFT_BACKLIGHT_PIN PG11
#define TFT_CS_PIN PG12 // NE4
#define TFT_RS_PIN PF0 // A0
#endif
#if NEED_TOUCH_PINS

19
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
View File

@ -269,22 +269,13 @@
#endif
#if ENABLED(SPI_GRAPHICAL_TFT)
#if HAS_SPI_GRAPHICAL_TFT
// Emulated DOGM SPI
#ifndef GRAPHICAL_TFT_UPSCALE
#define GRAPHICAL_TFT_UPSCALE 3
#endif
#ifndef TFT_PIXEL_OFFSET_Y
#define TFT_PIXEL_OFFSET_Y 32
#endif
#define LCD_PINS_ENABLE PD13
#define LCD_PINS_RS PC6
#define BTN_ENC PE13
#define BTN_EN1 PE8
#define BTN_EN2 PE11
#define LCD_PINS_ENABLE PD13
#define LCD_PINS_RS PC6
#elif ENABLED(TFT_480x320_SPI)
#define TFT_DRIVER ST7796
#define TFT_BUFFER_SIZE 14400
@ -304,7 +295,7 @@
#ifndef XPT2046_Y_OFFSET
#define XPT2046_Y_OFFSET -24
#endif
#elif ENABLED(SPI_GRAPHICAL_TFT)
#elif HAS_SPI_GRAPHICAL_TFT
#ifndef XPT2046_X_CALIBRATION
#define XPT2046_X_CALIBRATION -11386
#endif
@ -342,7 +333,7 @@
#else // !MKS_MINI_12864
#define LCD_PINS_D4 PE14
#if ENABLED(ULTIPANEL)
#if IS_ULTIPANEL
#define LCD_PINS_D5 PE15
#define LCD_PINS_D6 PD11
#define LCD_PINS_D7 PD10

2
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
View File

@ -154,7 +154,7 @@
#else
#define LCD_PINS_D4 PA6
#if ENABLED(ULTIPANEL)
#if IS_ULTIPANEL
#define LCD_PINS_D5 PA7
#define LCD_PINS_D6 PC4
#define LCD_PINS_D7 PC5

2
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h
View File

@ -103,7 +103,7 @@
#else // !MKS_MINI_12864
#define LCD_PINS_D4 PC1
#if ENABLED(ULTIPANEL)
#if IS_ULTIPANEL
#define LCD_PINS_D5 -1
#define LCD_PINS_D6 -1
#define LCD_PINS_D7 -1

2
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE3.h
View File

@ -124,7 +124,7 @@
#else // !MKS_MINI_12864
#define LCD_PINS_D4 PA6
#if ENABLED(ULTIPANEL)
#if IS_ULTIPANEL
#define LCD_PINS_D5 PA7
#define LCD_PINS_D6 PC4
#define LCD_PINS_D7 PC5

75
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h
View File

@ -139,6 +139,35 @@
* If the screen stays white, disable 'LCD_RESET_PIN'
* to let the bootloader init the screen.
*/
#if EITHER(HAS_FSMC_GRAPHICAL_TFT, TFT_320x240)
#define FSMC_CS_PIN PD7 // NE4
#define FSMC_RS_PIN PD11 // A0
#define LCD_USE_DMA_FSMC // Use DMA transfers to send data to the TFT
#define FSMC_DMA_DEV DMA2
#define FSMC_DMA_CHANNEL DMA_CH5
#define LCD_RESET_PIN PC6 // FSMC_RST
#define LCD_BACKLIGHT_PIN PD13
#endif
#if BOTH(NEED_TOUCH_PINS, HAS_FSMC_GRAPHICAL_TFT) || ENABLED(TFT_320x240)
#define TOUCH_CS_PIN PC2 // SPI2_NSS
#define TOUCH_SCK_PIN PB13 // SPI2_SCK
#define TOUCH_MISO_PIN PB14 // SPI2_MISO
#define TOUCH_MOSI_PIN PB15 // SPI2_MOSI
#endif
#if ENABLED(TFT_320x240) // TFT32/28
#define TFT_DRIVER ILI9341
#define TFT_BUFFER_SIZE 14400
#define ILI9341_COLOR_RGB
// YV for normal screen mounting
#define ILI9341_ORIENTATION ILI9341_MADCTL_MY | ILI9341_MADCTL_MV
// XV for 180° rotated screen mounting
//#define ILI9341_ORIENTATION ILI9341_MADCTL_MX | ILI9341_MADCTL_MV
#endif
#if ENABLED(TOUCH_SCREEN)
#ifndef XPT2046_X_CALIBRATION
#define XPT2046_X_CALIBRATION 12033
@ -154,52 +183,6 @@
#endif
#endif
#if ENABLED(FSMC_GRAPHICAL_TFT)
#define FSMC_CS_PIN PD7 // NE4
#define FSMC_RS_PIN PD11 // A0
#define LCD_USE_DMA_FSMC // Use DMA transfers to send data to the TFT
#define FSMC_DMA_DEV DMA2
#define FSMC_DMA_CHANNEL DMA_CH5
#define LCD_RESET_PIN PC6 // FSMC_RST
#define LCD_BACKLIGHT_PIN PD13
#if NEED_TOUCH_PINS
#define TOUCH_CS_PIN PC2 // SPI2_NSS
#define TOUCH_SCK_PIN PB13 // SPI2_SCK
#define TOUCH_MISO_PIN PB14 // SPI2_MISO
#define TOUCH_MOSI_PIN PB15 // SPI2_MOSI
#endif
#elif ENABLED(TFT_320x240) //TFT32/28
#define TFT_RESET_PIN PC6
#define TFT_BACKLIGHT_PIN PD13
#define LCD_USE_DMA_FSMC // Use DMA transfers to send data to the TFT
#define FSMC_CS_PIN PD7
#define FSMC_RS_PIN PD11
#define FSMC_DMA_DEV DMA2
#define FSMC_DMA_CHANNEL DMA_CH5
#define TOUCH_CS_PIN PC2 // SPI2_NSS
#define TOUCH_SCK_PIN PB13 // SPI2_SCK
#define TOUCH_MISO_PIN PB14 // SPI2_MISO
#define TOUCH_MOSI_PIN PB15 // SPI2_MOSI
#define TFT_DRIVER ILI9341
#define TFT_BUFFER_SIZE 14400
// YV for normal screen mounting
#define ILI9341_ORIENTATION ILI9341_MADCTL_MY | ILI9341_MADCTL_MV
// XV for 180° rotated screen mounting
//#define ILI9341_ORIENTATION ILI9341_MADCTL_MX | ILI9341_MADCTL_MV
#define ILI9341_COLOR_RGB
#endif
#define HAS_SPI_FLASH 1
#if HAS_SPI_FLASH
#define SPI_FLASH_SIZE 0x1000000 // 16MB

2
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h
View File

@ -198,7 +198,7 @@
#endif
// XPT2046 Touch Screen calibration
#if EITHER(TFT_LVGL_UI_FSMC, TFT_480x320)
#if EITHER(HAS_TFT_LVGL_UI_FSMC, TFT_480x320)
#ifndef XPT2046_X_CALIBRATION
#define XPT2046_X_CALIBRATION 17880
#endif

15
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
View File

@ -275,20 +275,11 @@
#if ENABLED(TFT_CLASSIC_UI)
// Emulated DOGM SPI
#ifndef GRAPHICAL_TFT_UPSCALE
#define GRAPHICAL_TFT_UPSCALE 3
#endif
#ifndef TFT_PIXEL_OFFSET_Y
#define TFT_PIXEL_OFFSET_Y 32
#endif
#define LCD_PINS_ENABLE PD13
#define LCD_PINS_RS PC6
#define BTN_ENC PE13
#define BTN_EN1 PE8
#define BTN_EN2 PE11
#define LCD_PINS_ENABLE PD13
#define LCD_PINS_RS PC6
#elif ENABLED(TFT_COLOR_UI)
#define TFT_BUFFER_SIZE 14400
#endif
@ -354,7 +345,7 @@
#else // !MKS_MINI_12864
#define LCD_PINS_D4 PE14
#if ENABLED(ULTIPANEL)
#if IS_ULTIPANEL
#define LCD_PINS_D5 PE15
#define LCD_PINS_D6 PD11
#define LCD_PINS_D7 PD10

4
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
View File

@ -210,7 +210,7 @@
* If the screen stays white, disable 'LCD_RESET_PIN'
* to let the bootloader init the screen.
*/
#if ENABLED(FSMC_GRAPHICAL_TFT)
#if HAS_FSMC_GRAPHICAL_TFT
#define FSMC_CS_PIN PD7 // NE4
#define FSMC_RS_PIN PD11 // A0
@ -254,7 +254,7 @@
#else // !MKS_MINI_12864 && !ENDER2_STOCKDISPLAY
#define LCD_PINS_D4 PF14
#if ENABLED(ULTIPANEL)
#if IS_ULTIPANEL
#define LCD_PINS_D5 PF15
#define LCD_PINS_D6 PF12
#define LCD_PINS_D7 PF13

12
Marlin/src/pins/stm32f1/pins_STM32F1R.h
View File

@ -103,7 +103,7 @@
#define LCD_PINS_RS 49 // CS chip select /SS chip slave select
#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 PB8
#define LCD_PINS_ENABLE PD2
#define LCD_PINS_D4 PB12
@ -117,7 +117,7 @@
#define LCD_PINS_D5 PB13
#define LCD_PINS_D6 PB14
#define LCD_PINS_D7 PB15
#if DISABLED(NEWPANEL)
#if !IS_NEWPANEL
#define BEEPER_PIN 33
// Buttons attached to a shift register
// Not wired yet
@ -128,9 +128,9 @@
#endif
#endif
#if ENABLED(NEWPANEL)
#if IS_NEWPANEL
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
#if IS_RRD_SC
#define BEEPER_PIN 37
@ -231,7 +231,7 @@
#define BEEPER_PIN 33
// Buttons directly attached to AUX-2
#if ENABLED(REPRAPWORLD_KEYPAD)
#if IS_RRW_KEYPAD
#define BTN_EN1 64
#define BTN_EN2 59
#define BTN_ENC 63
@ -256,6 +256,6 @@
#endif
#endif
#endif // NEWPANEL
#endif // IS_NEWPANEL
#endif // HAS_WIRED_LCD

12
Marlin/src/pins/stm32f1/pins_STM3R_MINI.h
View File

@ -118,7 +118,7 @@
#define LCD_PINS_RS 49 // CS chip select /SS chip slave select
#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 PB8
#define LCD_PINS_ENABLE PD2
#define LCD_PINS_D4 PB12
@ -132,7 +132,7 @@
#define LCD_PINS_D5 PB13
#define LCD_PINS_D6 PB14
#define LCD_PINS_D7 PB15
#if DISABLED(NEWPANEL)
#if !IS_NEWPANEL
#define BEEPER_PIN 33
// Buttons attached to a shift register
// Not wired yet
@ -151,9 +151,9 @@
#define TOUCH_MISO_PIN PB15
#define TOUCH_INT_PIN PC6 // (PenIRQ coming from ADS7843)
#elif ENABLED(NEWPANEL)
#elif IS_NEWPANEL
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
#if IS_RRD_SC
#define BEEPER_PIN 37
@ -255,7 +255,7 @@
#define BEEPER_PIN 33
// Buttons directly attached to AUX-2
#if ENABLED(REPRAPWORLD_KEYPAD)
#if IS_RRW_KEYPAD
#define BTN_EN1 64
#define BTN_EN2 59
#define BTN_ENC 63
@ -280,6 +280,6 @@
#endif
#endif
#endif // NEWPANEL
#endif // IS_NEWPANEL
#endif // HAS_WIRED_LCD

12
Marlin/src/pins/stm32f4/pins_BEAST.h
View File

@ -126,7 +126,7 @@
#define LCD_PINS_RS 49 // CS chip select /SS chip slave select
#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 PB8
#define LCD_PINS_ENABLE PD2
#define LCD_PINS_D4 PB12
@ -140,7 +140,7 @@
#define LCD_PINS_D5 PB13
#define LCD_PINS_D6 PB14
#define LCD_PINS_D7 PB15
#if DISABLED(NEWPANEL)
#if !IS_NEWPANEL
#define BEEPER_PIN 33
// Buttons attached to a shift register
// Not wired yet
@ -151,9 +151,9 @@
#endif
#endif
#if ENABLED(NEWPANEL)
#if IS_NEWPANEL
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
#if IS_RRD_SC
#define BEEPER_PIN 37
@ -255,7 +255,7 @@
#define BEEPER_PIN 33
// Buttons directly attached to AUX-2
#if ENABLED(REPRAPWORLD_KEYPAD)
#if IS_RRW_KEYPAD
#define BTN_EN1 64
#define BTN_EN2 59
#define BTN_ENC 63
@ -280,6 +280,6 @@
#endif
#endif
#endif // NEWPANEL
#endif // IS_NEWPANEL
#endif // HAS_WIRED_LCD

2
Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h
View File

@ -228,7 +228,7 @@
#define LCD_PINS_ENABLE PE9
#define LCD_PINS_D4 PE10
#if ENABLED(ULTIPANEL)
#if IS_ULTIPANEL
#define LCD_PINS_D5 PE11
#define LCD_PINS_D6 PE12
#define LCD_PINS_D7 PE13

2
Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h
View File

@ -385,7 +385,7 @@
#endif
#endif // !FYSETC_MINI_12864
#if ENABLED(ULTIPANEL)
#if IS_ULTIPANEL
#define LCD_PINS_D5 PG7
#define LCD_PINS_D6 PG6
#define LCD_PINS_D7 PG5

2
Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h
View File

@ -350,7 +350,7 @@
#endif
#endif // !FYSETC_MINI_12864
#if ENABLED(ULTIPANEL)
#if IS_ULTIPANEL
#define LCD_PINS_D5 PG3
#define LCD_PINS_D6 PG6
#define LCD_PINS_D7 PG7

2
Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
View File

@ -252,7 +252,7 @@
#endif
#endif // !FYSETC_MINI_12864
#if ENABLED(ULTIPANEL)
#if IS_ULTIPANEL
#define LCD_PINS_D5 PC12
#define LCD_PINS_D6 PD0
#define LCD_PINS_D7 PD1

2
Marlin/src/pins/stm32f4/pins_RUMBA32_common.h
View File

@ -161,7 +161,7 @@
#define DOGLCD_A0 PE14
#endif
#if ENABLED(ULTIPANEL)
#if IS_ULTIPANEL
#define LCD_PINS_D5 PE13
#define LCD_PINS_D6 PE14
#define LCD_PINS_D7 PE15

12
Marlin/src/pins/stm32f7/pins_NUCLEO_F767ZI.h
View File

@ -41,7 +41,7 @@
/**
* Timer assignments
*
*
* TIM1 -
* TIM2 - Hardware PWM (Fan/Heater Pins)
* TIM3 - Hardware PWM (Servo Pins)
@ -55,7 +55,7 @@
* TIM12 -
* TIM13 -
* TIM14 - TEMP_TIMER (Marlin)
*
*
*/
#define STEP_TIMER 4
#define TEMP_TIMER 14
@ -66,7 +66,7 @@
* Assignments may not be ideal, and not every assignment has been tested.
* Proceed at your own risk.
* _CN7_
* (X_STEP) PC6 | · · | PB8 (X_EN)
* (X_STEP) PC6 | · · | PB8 (X_EN)
* (X_DIR) PB15 | · · | PB9 (X_CS)
* (LCD_D4) PB13 | · · | AVDD
* _CN8_ PB12 | · · | GND
@ -77,7 +77,7 @@
* +5V | · · | PC12 (SDSS) PA4 | · · | PD15 (LCD_ENABLE)
* GND | · · | PD2 (SERVO0_PIN) PB4 | · · | PF12 (LCD_RS)
* GND | · · | PG2 ￣￣￣
* VIN | · · | PG3
* VIN | · · | PG3
_* ￣￣￣ _CN10
* AVDD | · · | PF13 (BTN_EN1)
* _CN9_ AGND | · · | PE9 (BTN_EN2)
@ -140,7 +140,7 @@ _* ￣￣￣ _CN10
#define Z_SERIAL_RX_PIN PE12
#define E_SERIAL_TX_PIN PG9
#define E_SERIAL_RX_PIN PG9
#define E_SERIAL_RX_PIN PG9
#endif
//
@ -182,7 +182,7 @@ _* ￣￣￣ _CN10
//
// LCD / Controller
//
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#if IS_RRD_FG_SC
#define BEEPER_PIN PC7 // LCD_BEEPER
#define BTN_ENC PE11 // BTN_ENC
#define SD_DETECT_PIN PD14

4
Marlin/src/pins/teensy2/pins_PRINTRBOARD.h
View File

@ -124,7 +124,7 @@
//
// LCD / Controller
//
#if BOTH(ULTRA_LCD, NEWPANEL)
#if IS_ULTRA_LCD && IS_NEWPANEL
#define LCD_PINS_RS 9 // E1 JP11-11
#define LCD_PINS_ENABLE 8 // E0 JP11-10
@ -166,4 +166,4 @@
#endif
#endif // ULTRA_LCD && NEWPANEL
#endif // IS_ULTRA_LCD && IS_NEWPANEL

2
Marlin/src/pins/teensy2/pins_TEENSY2.h
View File

@ -168,7 +168,7 @@
//
// LCD / Controller
//
#if ENABLED(ULTIPANEL)
#if IS_ULTIPANEL
#define LCD_PINS_RS 8 // E0
#define LCD_PINS_ENABLE 9 // E1
#define LCD_PINS_D4 10 // C0

4
Marlin/src/pins/teensy2/pins_TEENSYLU.h
View File

@ -141,7 +141,7 @@
//
// LCD / Controller
//
#if BOTH(ULTRA_LCD, NEWPANEL)
#if IS_ULTRA_LCD && IS_NEWPANEL
#define BEEPER_PIN -1
@ -154,7 +154,7 @@
#define SD_DETECT_PIN -1
#endif // ULTRA_LCD && NEWPANEL
#endif // IS_ULTRA_LCD && IS_NEWPANEL
//
// M3/M4/M5 - Spindle/Laser Control

4
Marlin/src/pins/teensy3/pins_TEENSY35_36.h
View File

@ -139,13 +139,13 @@
#define LCD_PINS_D7 45
#endif
#if ENABLED(NEWPANEL)
#if IS_NEWPANEL
#define BTN_EN1 46
#define BTN_EN2 47
#define BTN_ENC 48
#endif
#if ENABLED(REPRAPWORLD_KEYPAD)
#if IS_RRW_KEYPAD
#define SHIFT_OUT 40
#define SHIFT_CLK 44
#define SHIFT_LD 42