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

Rename LCD conditionals (#19533)

Browse Source
This commit is contained in:
Scott Lahteine
2020-09-28 01:13:27 -05:00
committed by GitHub
parent 1c372df449
commit c2c6a679ea
138 changed files with 353 additions and 333 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -124,7 +124,7 @@
// LCDs and Controllers //
//////////////////////////
#if HAS_GRAPHICAL_LCD
#if HAS_MARLINUI_U8GLIB
#define LCD_PINS_RS 13
#define LCD_PINS_ENABLE 17
@ -152,7 +152,7 @@
#define BTN_EN2 12
#define BTN_ENC 14
#endif // HAS_GRAPHICAL_LCD
#endif // HAS_MARLINUI_U8GLIB
// Hardware serial pins
// Add the following to Configuration.h or Configuration_adv.h to assign

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

@ -389,7 +389,7 @@
// LCDs and Controllers //
//////////////////////////
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
//
// LCD Display output pins
@ -632,4 +632,4 @@
#endif
#endif // NEWPANEL
#endif // HAS_SPI_LCD
#endif // HAS_WIRED_LCD

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

@ -126,7 +126,7 @@
* for the onboard SD card, and a chip select signal is not provided for the remote
* SD card.
*/
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
#define BEEPER_PIN P1_31 // EXP1-1
@ -139,7 +139,7 @@
#define LCD_PINS_ENABLE P0_18 // (MOSI) EXP1-3
#define LCD_PINS_D4 P0_15 // (SCK) EXP1-5
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) && HAS_CHARACTER_LCD
#if BOTH(HAS_MARLINUI_HD44780, REPRAP_DISCOUNT_SMART_CONTROLLER)
#error "REPRAP_DISCOUNT_SMART_CONTROLLER is not supported by the BIQU B300 v1.0"
#endif
@ -147,7 +147,7 @@
#error "SDSUPPORT is not supported by the BIQU B300 v1.0 when an LCD controller is used"
#endif
#endif // HAS_SPI_LCD
#endif // HAS_WIRED_LCD
/**
* SD Card Reader

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

@ -97,7 +97,7 @@
* for the onboard SD card, and a chip select signal is not provided for the remote
* SD card.
*/
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
#define BEEPER_PIN P1_31 // EXP1-1
@ -110,7 +110,7 @@
#define LCD_PINS_ENABLE P0_18 // (MOSI) EXP1-3
#define LCD_PINS_D4 P0_15 // (SCK) EXP1-5
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) && HAS_CHARACTER_LCD
#if BOTH(HAS_MARLINUI_HD44780, REPRAP_DISCOUNT_SMART_CONTROLLER)
#error "REPRAP_DISCOUNT_SMART_CONTROLLER is not supported by the BIQU BQ111-A4"
#endif
@ -118,7 +118,7 @@
#error "SDSUPPORT is not supported by the BIQU BQ111-A4 when an LCD controller is used"
#endif
#endif // HAS_SPI_LCD
#endif // HAS_WIRED_LCD
/**
* SD Card Reader

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

@ -65,7 +65,7 @@
* by redrawing the screen after SD card accesses.
*/
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
#define BTN_EN1 P3_26
#define BTN_EN2 P3_25
#define BTN_ENC P2_11

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

@ -214,7 +214,7 @@
#define EXPA2_09_PIN P0_15
#define EXPA2_10_PIN P0_17
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
#if ENABLED(ANET_FULL_GRAPHICS_LCD)
@ -350,7 +350,7 @@
#endif // !CR10_STOCKDISPLAY
#endif // HAS_SPI_LCD
#endif // HAS_WIRED_LCD
//
// SD Support

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

@ -232,7 +232,7 @@
* ----- -----
* EXP2 EXP1
*/
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
#if ENABLED(ANET_FULL_GRAPHICS_LCD)
#define LCD_PINS_RS P1_23
@ -371,9 +371,9 @@
#endif // !FYSETC_MINI_12864
#endif // HAS_GRAPHICAL_LCD
#endif // HAS_MARLINUI_U8GLIB
#endif // HAS_SPI_LCD
#endif // HAS_WIRED_LCD
#if HAS_ADC_BUTTONS
#error "ADC BUTTONS do not work unmodifed on SKR 1.4, The ADC ports cannot take more than 3.3v."

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

@ -92,7 +92,7 @@
//
// LCD / Controller
//
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
#define BEEPER_PIN P1_30 // (37) not 5V tolerant
#endif

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

@ -217,7 +217,7 @@
* that the garbage/lines are erased immediately after the SD card accesses are completed.
*/
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
#define BEEPER_PIN P1_31 // EXP1.1
#define BTN_ENC P1_30 // EXP1.2
#define BTN_EN1 P3_26 // EXP2.5

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

@ -235,7 +235,8 @@
* ----- -----
* EXP1 EXP2
*/
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
#define BEEPER_PIN P1_31
#define BTN_ENC P1_30
@ -321,7 +322,7 @@
#endif // !CR10_STOCKDISPLAY
#endif // HAS_SPI_LCD
#endif // HAS_WIRED_LCD
#ifndef SDCARD_CONNECTION
#define SDCARD_CONNECTION ONBOARD

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

@ -326,7 +326,7 @@
#define LCD_PINS_ENABLE P0_18 // J3-10 & AUX-3 (SID, MOSI)
#define LCD_PINS_D4 P2_06 // J3-8 & AUX-3 (SCK, CLK)
#elif HAS_SPI_LCD
#elif HAS_WIRED_LCD
//#define SCK_PIN P0_15 // (52) system defined J3-9 & AUX-3
//#define MISO_PIN P0_17 // (50) system defined J3-10 & AUX-3
@ -370,8 +370,9 @@
#define DOGLCD_SCK SCK_PIN
#define DOGLCD_MOSI MOSI_PIN
#define STAT_LED_BLUE_PIN P0_26 //(63) may change if cable changes
#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(FYSETC_MINI_12864)
@ -420,9 +421,9 @@
//#define LCD_SCREEN_ROT_90
//#define LCD_SCREEN_ROT_180
//#define LCD_SCREEN_ROT_270
#endif
#endif
#endif // HAS_SPI_LCD
#endif // HAS_WIRED_LCD
//
// Ethernet pins

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

@ -109,7 +109,7 @@
//
// Display
//
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
#if ENABLED(CR10_STOCKDISPLAY)
@ -185,7 +185,7 @@
#endif
#endif // HAS_SPI_LCD
#endif // HAS_WIRED_LCD
//
// SD Support

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

@ -193,7 +193,7 @@
#define EXPA1_09_PIN P0_16
#define EXPA1_10_PIN P2_08
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
#if ENABLED(CR10_STOCKDISPLAY)
@ -238,7 +238,7 @@
#endif
#endif // HAS_SPI_LCD
#endif // HAS_WIRED_LCD
//
// SD Support

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

@ -141,7 +141,7 @@
// connector are shared with the onboard SD card, and Marlin does not support reading
// G-code files from the onboard SD card.
//
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
#define BEEPER_PIN P0_27 // EXP2-7 - open drain
@ -160,7 +160,7 @@
#error "SDSUPPORT is not currently supported by the Cohesion3D boards"
#endif
#endif // HAS_SPI_LCD
#endif // HAS_WIRED_LCD
//
// Ethernet pins

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

@ -206,7 +206,7 @@
#define NEOPIXEL_PIN P1_16 // EXP1-6 => Ethernet pin 6 (top row, 3 from left)
#endif
#elif HAS_SPI_LCD
#elif HAS_WIRED_LCD
#define BEEPER_PIN P1_31 // EXP1-1
//#define SD_DETECT_PIN P0_27 // EXP2-7
@ -222,7 +222,7 @@
#define KILL_PIN P2_11 // EXP2-10
#endif // HAS_SPI_LCD
#endif // HAS_WIRED_LCD
//
// SD Support

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

@ -241,11 +241,12 @@
* ----- -----
* EXP1 EXP2
*/
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
#define BEEPER_PIN P1_31
#define BTN_ENC P1_30
#if ENABLED(CR10_STOCKDISPLAY)
#define LCD_PINS_RS P1_00
#define BTN_EN1 P0_18
@ -327,7 +328,7 @@
#endif // !CR10_STOCKDISPLAY
#endif // HAS_SPI_LCD
#endif // HAS_WIRED_LCD
#ifndef SDCARD_CONNECTION
#define SDCARD_CONNECTION ONBOARD

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

@ -109,7 +109,7 @@
#define STAT_LED_RED_PIN P1_19
#define STAT_LED_BLUE_PIN P1_20
#elif HAS_SPI_LCD
#elif HAS_WIRED_LCD
/*
The Smoothieboard supports the REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER with either

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

@ -178,6 +178,6 @@
#define LCD_PINS_ENABLE P0_18
#define LCD_PINS_D4 P0_15
#define KILL_PIN P2_11
#elif HAS_SPI_LCD
#elif HAS_WIRED_LCD
#error "Only the CR10_STOCKDISPLAY is supported with TH3D EZBoard."
#endif

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

@ -105,7 +105,7 @@
#define SUICIDE_PIN 54 // Must be enabled at startup to keep power flowing
#define KILL_PIN -1
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
#define BEEPER_PIN 18
@ -148,4 +148,4 @@
#endif // !NEWPANEL
#endif // HAS_SPI_LCD
#endif // HAS_WIRED_LCD

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

@ -123,7 +123,7 @@
//
// LCD / Controller
//
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
#define BEEPER_PIN 18
@ -170,4 +170,4 @@
#endif // !NEWPANEL
#endif // HAS_SPI_LCD
#endif // HAS_WIRED_LCD

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

@ -122,7 +122,7 @@
#define BEEPER_PIN 18
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
#define LCD_PINS_RS 20
#define LCD_PINS_ENABLE 30
#define LCD_PINS_D4 14

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

@ -130,7 +130,7 @@
//
#define BEEPER_PIN 64
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
#define LCD_PINS_RS 14
#define LCD_PINS_ENABLE 15
@ -152,4 +152,4 @@
#define SHIFT_EN 17
#endif
#endif // HAS_SPI_LCD
#endif // HAS_WIRED_LCD

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

@ -212,7 +212,7 @@
//
// LCD / Controller
//
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
@ -260,7 +260,7 @@
#define BTN_CENTER 15 // J0
#define BTN_ENC BTN_CENTER
#endif // HAS_SPI_LCD
#endif // HAS_WIRED_LCD
//
// SD Card

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

@ -119,7 +119,7 @@
//
// LCD / Controller
//
#if HAS_GRAPHICAL_LCD
#if HAS_MARLINUI_U8GLIB
// OVERLORD OLED pins
#define LCD_PINS_RS 20
#define LCD_PINS_D5 21

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

@ -137,7 +137,7 @@
//
#define BEEPER_PIN 29
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
#define LCD_PINS_RS 33
#define LCD_PINS_ENABLE 30
#define LCD_PINS_D4 35

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

@ -72,7 +72,7 @@
#define HEATER_BED_PIN 8
#define TEMP_BED_PIN 6
#if HAS_GRAPHICAL_LCD
#if HAS_MARLINUI_U8GLIB
#if ENABLED(U8GLIB_ST7920) // SPI GLCD 12864 ST7920
#define LCD_PINS_RS 30
#define LCD_PINS_ENABLE 20

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

@ -1227,7 +1227,7 @@
#define LCD_PINS_D4 -1
#endif
#if HAS_CHARACTER_LCD || TOUCH_UI_ULTIPANEL
#if HAS_MARLINUI_HD44780 || TOUCH_UI_ULTIPANEL
#ifndef LCD_PINS_D5
#define LCD_PINS_D5 -1
#endif
@ -1597,7 +1597,7 @@
#define Z4_MS3_PIN -1
#endif
#if HAS_GRAPHICAL_LCD
#if HAS_MARLINUI_U8GLIB
#if !defined(ST7920_DELAY_1) && defined(BOARD_ST7920_DELAY_1)
#define ST7920_DELAY_1 BOARD_ST7920_DELAY_1
#endif

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

@ -160,7 +160,7 @@
//
// LCD / Controller
//
#if HAS_SPI_LCD || TOUCH_UI_ULTIPANEL
#if HAS_WIRED_LCD || TOUCH_UI_ULTIPANEL
#define KILL_PIN 32
@ -188,4 +188,4 @@
#define SD_DETECT_PIN 15
#endif // ULTIPANEL || TOUCH_UI_ULTIPANEL
#endif // HAS_SPI_LCD
#endif // HAS_WIRED_LCD

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

@ -166,7 +166,7 @@
//
// LCD / Controller
//
#if ANY(HAS_SPI_LCD, TOUCH_UI_ULTIPANEL, TOUCH_UI_FTDI_EVE)
#if ANY(HAS_WIRED_LCD, TOUCH_UI_ULTIPANEL, TOUCH_UI_FTDI_EVE)
#define KILL_PIN 32
@ -196,4 +196,4 @@
#endif // ULTIPANEL || TOUCH_UI_ULTIPANEL || TOUCH_UI_FTDI_EVE
#endif // HAS_SPI_LCD || 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

@ -141,7 +141,7 @@
//
// LCD / Controller
//
#if HAS_SPI_LCD || TOUCH_UI_ULTIPANEL
#if HAS_WIRED_LCD || TOUCH_UI_ULTIPANEL
#if !MB(MINIRAMBO_10A)
#define KILL_PIN 32
@ -189,4 +189,4 @@
#endif // ULTIPANEL || TOUCH_UI_ULTIPANEL
#endif // HAS_SPI_LCD || TOUCH_UI_ULTIPANEL
#endif // HAS_WIRED_LCD || TOUCH_UI_ULTIPANEL

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

@ -183,7 +183,7 @@
//
// LCD / Controller
//
#if HAS_SPI_LCD || TOUCH_UI_ULTIPANEL
#if HAS_WIRED_LCD || TOUCH_UI_ULTIPANEL
#define KILL_PIN 80
@ -249,4 +249,4 @@
#endif // !NEWPANEL
#endif // HAS_SPI_LCD
#endif // HAS_WIRED_LCD

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

@ -106,7 +106,7 @@
#define BEEPER_PIN 33
#endif // HAS_SPI_LCD && NEWPANEL
#endif // ULTRA_LCD && NEWPANEL
/**
* M3/M4/M5 - Spindle/Laser Control

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

@ -87,7 +87,7 @@
//
// LCDs and Controllers
//
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
#if ENABLED(ZONESTAR_LCD)
#define LCD_PINS_RS 2
#define LCD_PINS_ENABLE 36

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

@ -197,7 +197,7 @@
#define LCD_PINS_D7 29
#endif
#if HAS_GRAPHICAL_LCD
#if HAS_MARLINUI_U8GLIB
#ifndef BOARD_ST7920_DELAY_1
#define BOARD_ST7920_DELAY_1 DELAY_NS(200)
#endif

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

@ -261,7 +261,7 @@
#define NEOPIXEL_PIN 25
#endif
#elif HAS_GRAPHICAL_LCD
#elif HAS_MARLINUI_U8GLIB
#define LCD_PINS_RS 16
#define LCD_PINS_ENABLE 17

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

@ -95,7 +95,7 @@
//
#define BEEPER_PIN 6
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
#define LCD_SDSS 53
@ -119,4 +119,4 @@
#define BTN_ENC 23
#endif
#endif // HAS_SPI_LCD
#endif // HAS_WIRED_LCD

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

@ -430,7 +430,7 @@
// LCDs and Controllers //
//////////////////////////
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
//
// LCD Display output pins
@ -706,7 +706,7 @@
#endif
#endif // NEWPANEL
#endif // HAS_SPI_LCD
#endif // HAS_WIRED_LCD
#if ENABLED(REPRAPWORLD_KEYPAD) && DISABLED(ADC_KEYPAD)
#define SHIFT_OUT 40

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

@ -128,7 +128,7 @@
// AnyCubic made the following changes to 1.1.0-RC8
// If these are appropriate for your LCD let us know.
//
#if 0 && HAS_SPI_LCD
#if 0 && HAS_WIRED_LCD
// LCD Display output pins
#if BOTH(NEWPANEL, PANEL_ONE)
@ -154,4 +154,4 @@
#define DOGLCD_A0 42
#endif
#endif // HAS_SPI_LCD
#endif // HAS_WIRED_LCD

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

@ -271,7 +271,7 @@
// LCDs and Controllers //
//////////////////////////
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
//
// LCD Display output pins

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

@ -119,7 +119,7 @@
//
// LCD / Controller
//
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
#define BEEPER_PIN 18
@ -158,7 +158,7 @@
#endif // !NEWPANEL
#endif // HAS_SPI_LCD
#endif // HAS_WIRED_LCD
//
// M3/M4/M5 - Spindle/Laser Control

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

@ -181,7 +181,7 @@
//
// LCD / Controller
//
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
#define BEEPER_PIN 23 // D24 PA15_CTS1
#define LCD_PINS_RS 17 // D17 PA12_RXD1
#define LCD_PINS_ENABLE 24 // D23 PA14_RTS1
@ -198,4 +198,4 @@
#define BTN_EN2 13 // D13 PB27_TIOB0
#define BTN_ENC 16 // D16 PA13_TXD1
#endif // NEWPANEL
#endif // HAS_SPI_LCD
#endif // HAS_WIRED_LCD

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

@ -237,7 +237,7 @@
//
// LCD / Controller
//
#if ANY(HAS_SPI_LCD, TOUCH_UI_ULTIPANEL, TOUCH_UI_FTDI_EVE)
#if ANY(HAS_WIRED_LCD, TOUCH_UI_ULTIPANEL, TOUCH_UI_FTDI_EVE)
#define BEEPER_PIN 23 // D24 PA15_CTS1
#define LCD_PINS_RS 17 // D17 PA12_RXD1
#define LCD_PINS_ENABLE 24 // D23 PA14_RTS1

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

@ -113,7 +113,7 @@
//
// LCD / Controller
//
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
#define LCD_PINS_RS 42
#define LCD_PINS_ENABLE 43
@ -168,4 +168,4 @@
#define BEEPER_PIN -1
#endif // SPARK_FULL_GRAPHICS
#endif // HAS_SPI_LCD
#endif // HAS_WIRED_LCD

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

@ -105,7 +105,7 @@
//
// LCD / Controller
//
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
#define LCD_PINS_RS 42
#define LCD_PINS_ENABLE 43
@ -171,4 +171,4 @@
#define DOGLCD_CS 45
#endif // SPARK_FULL_GRAPHICS
#endif // HAS_SPI_LCD
#endif // HAS_WIRED_LCD

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

@ -226,7 +226,7 @@
//
// LCD / Controller
//
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
#if ENABLED(RADDS_DISPLAY)
@ -287,7 +287,7 @@
#endif // SPARK_FULL_GRAPHICS
#endif // HAS_SPI_LCD
#endif // HAS_WIRED_LCD
#ifndef SDSS
#define SDSS 4

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

@ -76,7 +76,7 @@
//
// LCD / Controller
//
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
#if BOTH(NEWPANEL, PANEL_ONE)
#undef LCD_PINS_D4
@ -129,4 +129,4 @@
#endif // NEWPANEL
#endif // HAS_SPI_LCD
#endif // HAS_WIRED_LCD

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

@ -139,7 +139,7 @@
//
// LCD / Controller
//
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
// ramps-fd lcd adaptor
#define BEEPER_PIN 37
@ -203,7 +203,7 @@
#define DOGLCD_MISO 74 // MISO_PIN
#endif
#endif // HAS_SPI_LCD
#endif // HAS_WIRED_LCD
#if HAS_TMC_UART
/**

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

@ -200,7 +200,7 @@
//
// LCD / Controller
//
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
#if ANY(RADDS_DISPLAY, REPRAP_DISCOUNT_SMART_CONTROLLER, REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BEEPER_PIN 62
@ -271,4 +271,4 @@
#define BTN_ENC 40
#endif
#endif // HAS_SPI_LCD
#endif // HAS_WIRED_LCD

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

@ -186,7 +186,7 @@
//
// LCD / Controller
//
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
#if ANY(RADDS_DISPLAY, REPRAP_DISCOUNT_SMART_CONTROLLER, REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BEEPER_PIN 62
@ -253,4 +253,4 @@
#define BTN_ENC 40
#endif
#endif // HAS_SPI_LCD
#endif // HAS_WIRED_LCD

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

@ -287,7 +287,7 @@
// LCDs and Controllers //
//////////////////////////
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
//
// LCD Display output pins
@ -594,7 +594,7 @@
#endif
#endif // NEWPANEL
#endif // HAS_SPI_LCD
#endif // HAS_WIRED_LCD
//
// SD Support

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

@ -152,7 +152,7 @@
* REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
*/
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
#define LCD_SDSS 28
#if ENABLED(ADC_KEYPAD)
#define SERVO0_PIN 27 // free for BLTouch/3D-Touch

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

@ -36,7 +36,7 @@
#define BOARD_INFO_NAME "Melzi (Creality)"
// Alter timing for graphical display
#if HAS_GRAPHICAL_LCD
#if HAS_MARLINUI_U8GLIB
#ifndef BOARD_ST7920_DELAY_1
#define BOARD_ST7920_DELAY_1 DELAY_NS(125)
#endif

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

@ -28,7 +28,7 @@
#define BOARD_INFO_NAME "Melzi (Malyan)"
// Alter timing for graphical display
#if HAS_GRAPHICAL_LCD
#if HAS_MARLINUI_U8GLIB
#ifndef BOARD_ST7920_DELAY_1
#define BOARD_ST7920_DELAY_1 DELAY_NS(125)
#endif

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

@ -27,7 +27,7 @@
#define BOARD_INFO_NAME "Melzi (Tronxy)"
#if HAS_GRAPHICAL_LCD
#if HAS_MARLINUI_U8GLIB
#ifndef BOARD_ST7920_DELAY_1
#define BOARD_ST7920_DELAY_1 DELAY_NS(0)
#endif

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

@ -24,7 +24,7 @@
#define BOARD_INFO_NAME "Melzi V2"
#if HAS_GRAPHICAL_LCD
#if HAS_MARLINUI_U8GLIB
#ifndef BOARD_ST7920_DELAY_1
#define BOARD_ST7920_DELAY_1 DELAY_NS(0)
#endif

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

@ -154,11 +154,11 @@
//
// LCD / Controller
//
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
#define SD_DETECT_PIN -1
#if HAS_GRAPHICAL_LCD
#if HAS_MARLINUI_U8GLIB
#if ENABLED(LCD_FOR_MELZI)
@ -290,7 +290,7 @@
#define BTN_EN2 10
#endif
#endif // HAS_SPI_LCD
#endif // HAS_WIRED_LCD
//
// M3/M4/M5 - Spindle/Laser Control

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

@ -171,7 +171,7 @@
* EXP1
*/
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
#if ENABLED(CR10_STOCKDISPLAY)
@ -225,7 +225,7 @@
#error "Only CR10_STOCKDISPLAY, ZONESTAR_LCD, ENDER2_STOCKDISPLAY, MKS_MINI_12864, and MKS_LCD12864 are currently supported on the BIGTREE_SKR_E3_DIP."
#endif
#endif // HAS_SPI_LCD
#endif // HAS_WIRED_LCD
#if BOTH(TOUCH_UI_FTDI_EVE, LCD_FYSETC_TFT81050)

6
Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
View File

@ -129,7 +129,7 @@
#define EXP1_3 PB7
#endif
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
#if ENABLED(CR10_STOCKDISPLAY)
@ -173,7 +173,7 @@
#error "Only CR10_STOCKDISPLAY, ZONESTAR_LCD, ENDER2_STOCKDISPLAY, and MKS_MINI_12864 are currently supported on the BIGTREE_SKR_MINI_E3."
#endif
#endif // HAS_SPI_LCD
#endif // HAS_WIRED_LCD
#if BOTH(TOUCH_UI_FTDI_EVE, LCD_FYSETC_TFT81050)
@ -185,7 +185,7 @@
* _____ _____
* 5V | 1 2 | GND (SPI1-MISO) MISO | 1 2 | SCK (SPI1-SCK)
* (FREE) PB7 | 3 4 | PB8 (LCD_CS) (PA9) MOD_RESET | 3 4 | SD_CS (PA10)
* (FREE) PB9 | 5 6 PA10 (SD_CS) (PB8) LCD_CS | 5 6 MOSI (SPI1-MOSI)
* (FREE) PB9 | 5 6 | PA10 (SD_CS) (PB8) LCD_CS | 5 6 | MOSI (SPI1-MOSI)
* RESET | 7 8 | PA9 (MOD_RESET) (PB5) SD_DET | 7 8 | RESET
* (BEEPER) PB6 | 9 10| PB5 (SD_DET) GND | 9 10| 5V
* ----- -----

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

@ -110,7 +110,7 @@
* EXP2 EXP1
*/
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
#define BEEPER_PIN PC10
#define BTN_ENC PC11
@ -172,7 +172,7 @@
#endif // !FYSETC_MINI_12864
#if HAS_GRAPHICAL_LCD
#if HAS_MARLINUI_U8GLIB
#ifndef BOARD_ST7920_DELAY_1
#define BOARD_ST7920_DELAY_1 DELAY_NS(125)
#endif
@ -186,7 +186,7 @@
#endif
#endif // HAS_SPI_LCD
#endif // HAS_WIRED_LCD
//
// SD Card

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

@ -142,7 +142,7 @@
#endif
// Alter timing for graphical display
#if HAS_GRAPHICAL_LCD
#if HAS_MARLINUI_U8GLIB
#ifndef BOARD_ST7920_DELAY_1
#define BOARD_ST7920_DELAY_1 DELAY_NS(125)
#endif

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

@ -120,7 +120,7 @@
//
// LCD Pins
//
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
#if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
#define LCD_PINS_RS PD1 // 49 // CS chip select /SS chip slave select
@ -281,4 +281,4 @@
#endif
#endif // NEWPANEL
#endif // HAS_SPI_LCD
#endif // HAS_WIRED_LCD

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

@ -139,11 +139,11 @@
//
// LCD Pins
//
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
#define BEEPER_PIN PC9
#if HAS_GRAPHICAL_LCD
#if HAS_MARLINUI_U8GLIB
#define DOGLCD_A0 PA15
#ifdef pins_v2_20190128

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

@ -130,10 +130,10 @@
* Note: Pin 4 on the Cheetah board is assigned to an I/O, it is assigned to RESET on the Ender-3 board.
*/
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
#define BEEPER_PIN PC9
#if HAS_GRAPHICAL_LCD
#if HAS_MARLINUI_U8GLIB
#define DOGLCD_A0 PB14
#define DOGLCD_CS PB12
#define DOGLCD_SCK PB13

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

@ -135,7 +135,7 @@
//
// LCD / Controller
//
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
//
@ -158,7 +158,7 @@
//#define LCD_UART_RX PD9
#endif
#if HAS_GRAPHICAL_LCD
#if HAS_MARLINUI_U8GLIB
#ifndef BOARD_ST7920_DELAY_1
#define BOARD_ST7920_DELAY_1 DELAY_NS(96)
#endif
@ -170,7 +170,7 @@
#endif
#endif
#endif // HAS_SPI_LCD
#endif // HAS_WIRED_LCD
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
//

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

@ -135,7 +135,7 @@
//
// LCD / Controller
//
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
//
@ -166,7 +166,7 @@
//#define LCD_UART_RX PD9
#endif
#if HAS_GRAPHICAL_LCD
#if HAS_MARLINUI_U8GLIB
#ifndef BOARD_ST7920_DELAY_1
#define BOARD_ST7920_DELAY_1 DELAY_NS(96)
#endif
@ -178,7 +178,7 @@
#endif
#endif
#endif // HAS_SPI_LCD
#endif // HAS_WIRED_LCD
//
// Beeper

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

@ -135,7 +135,7 @@
//
// LCD / Controller
//
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
//
@ -158,7 +158,7 @@
//#define LCD_UART_RX PD9
#endif
#if HAS_GRAPHICAL_LCD
#if HAS_MARLINUI_U8GLIB
#ifndef BOARD_ST7920_DELAY_1
#define BOARD_ST7920_DELAY_1 DELAY_NS(96)
#endif
@ -170,7 +170,7 @@
#endif
#endif
#endif // HAS_SPI_LCD
#endif // HAS_WIRED_LCD
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
//

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

@ -135,7 +135,7 @@
//
// LCD / Controller
//
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
@ -168,7 +168,7 @@
//#define LCD_UART_RX PD9
#endif
#if HAS_GRAPHICAL_LCD
#if HAS_MARLINUI_U8GLIB
#ifndef BOARD_ST7920_DELAY_1
#define BOARD_ST7920_DELAY_1 DELAY_NS(96)
#endif
@ -180,7 +180,7 @@
#endif
#endif
#endif // HAS_SPI_LCD
#endif // HAS_WIRED_LCD
//
// Beeper

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

@ -320,7 +320,7 @@
#endif
#if HAS_SPI_LCD && !HAS_SPI_TFT
#if HAS_WIRED_LCD && !HAS_SPI_TFT
// NON TFT Displays
@ -361,7 +361,7 @@
#endif // !MKS_MINI_12864
#endif // HAS_SPI_LCD && !HAS_SPI_TFT
#endif // HAS_WIRED_LCD && !HAS_SPI_TFT
#define HAS_SPI_FLASH 1
#define SPI_FLASH_SIZE 0x1000000 // 16MB

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

@ -132,7 +132,7 @@
* ----- ----- -----
* EXP1 EXP2 EXP3
*/
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
#define BEEPER_PIN PC1
#define BTN_ENC PC3
@ -162,7 +162,7 @@
#endif // !MKS_MINI_12864
#endif // HAS_SPI_LCD
#endif // HAS_WIRED_LCD
//
// SD Card

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

@ -81,7 +81,7 @@
//
// LCD Pins
//
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
#define BEEPER_PIN PD2
#define BTN_ENC PB3
#define LCD_PINS_RS PC3
@ -111,7 +111,7 @@
#endif // !MKS_MINI_12864
#if HAS_GRAPHICAL_LCD
#if HAS_MARLINUI_U8GLIB
#ifndef BOARD_ST7920_DELAY_1
#define BOARD_ST7920_DELAY_1 DELAY_NS(125)
#endif
@ -123,7 +123,7 @@
#endif
#endif
#endif // HAS_SPI_LCD
#endif // HAS_WIRED_LCD
// Motor current PWM pins
#define MOTOR_CURRENT_PWM_XY_PIN PB0

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

@ -96,7 +96,7 @@
//
// LCD Pins
//
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
#define BEEPER_PIN PC1
#define BTN_ENC PC3
@ -126,7 +126,7 @@
#endif // !MKS_MINI_12864
#endif // HAS_SPI_LCD
#endif // HAS_WIRED_LCD
//
// SD Card

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

@ -233,9 +233,6 @@
//
// LCD / Controller
//
#ifndef BEEPER_PIN
#define BEEPER_PIN PC5
#endif
/**
* Note: MKS Robin TFT screens use various TFT controllers.
@ -343,7 +340,7 @@
#endif
#if HAS_SPI_LCD && !HAS_SPI_TFT
#if HAS_WIRED_LCD && !HAS_SPI_TFT
// NON TFT Displays
@ -380,7 +377,7 @@
#endif // !MKS_MINI_12864
#endif // HAS_SPI_LCD && !HAS_SPI_TFT
#endif // HAS_WIRED_LCD && !HAS_SPI_TFT
#define HAS_SPI_FLASH 1
#define SPI_FLASH_SIZE 0x1000000 // 16MB
@ -391,6 +388,10 @@
#define W25QXX_SCK_PIN PB13
#endif
#ifndef BEEPER_PIN
#define BEEPER_PIN PC5
#endif
#if ENABLED(SPEAKER) && BEEPER_PIN == PC5
#error "MKS Robin nano default BEEPER_PIN is not a SPEAKER."
#endif

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

@ -225,7 +225,7 @@
#define BTN_EN2 PG4
#endif
#elif HAS_SPI_LCD
#elif HAS_WIRED_LCD
#define BEEPER_PIN PC5
#define BTN_ENC PG2

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

@ -97,7 +97,7 @@
//
// LCD Pins
//
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
#if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
#define LCD_PINS_RS 49 // CS chip select /SS chip slave select
@ -258,4 +258,4 @@
#endif
#endif // NEWPANEL
#endif // HAS_SPI_LCD
#endif // HAS_WIRED_LCD

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

@ -112,7 +112,7 @@
//
// LCD Pins
//
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
#if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
#define LCD_PINS_RS 49 // CS chip select /SS chip slave select
@ -282,4 +282,4 @@
#endif
#endif // NEWPANEL
#endif // HAS_SPI_LCD
#endif // HAS_WIRED_LCD

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

@ -120,7 +120,7 @@
//
// LCD Pins
//
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
#if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
#define LCD_PINS_RS 49 // CS chip select /SS chip slave select
@ -282,4 +282,4 @@
#endif
#endif // NEWPANEL
#endif // HAS_SPI_LCD
#endif // HAS_WIRED_LCD

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

@ -187,21 +187,22 @@
#define SDSS PA4
/**
* -------------------------------------BTT002 V1.0-----------------------------------------------
* _____ _____ |
* -------------------------------------BTT002 V1.0--------------------------------------------
* ----- ----- |
* PA3 | · · | GND 5V | · · | GND |
* NRESET | · · | PC4(SD_DET) (LCD_D7) PE13 | · · | PE12 (LCD_D6) |
* (MOSI)PA7 | · · | PB0(BTN_EN2) (LCD_D5) PE11 | · · | PE10 (LCD_D4) |
* (SD_SS)PA4 | · · | PC5(BTN_EN1) (LCD_RS) PE8 | · · | PE9 (LCD_EN) |
* (SCK)PA5 | · · | PA6(MISO) (BTN_ENC) PB1 | · · | PE7 (BEEPER) |
* ￣￣ ￣￣ |
* ----- ----- |
* EXP2 EXP1 |
* ---------------------------------------------------------------------------------------------
* --------------------------------------------------------------------------------------------
*/
//
// LCDs and Controllers
//
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
#define BEEPER_PIN PE7
#define BTN_ENC PB1
@ -236,7 +237,7 @@
#endif
// Alter timing for graphical display
#if HAS_GRAPHICAL_LCD
#if HAS_MARLINUI_U8GLIB
#ifndef BOARD_ST7920_DELAY_1
#define BOARD_ST7920_DELAY_1 DELAY_NS(96)
#endif
@ -248,7 +249,7 @@
#endif
#endif
#endif // HAS_SPI_LCD
#endif // HAS_WIRED_LCD
//
// RGB LEDs

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

@ -290,9 +290,12 @@
// overriding pins to access.
//
#if SD_CONNECTION_IS(LCD)
#define SD_DETECT_PIN PB10
#define SDSS PB12
#elif SD_CONNECTION_IS(ONBOARD)
// Instruct the STM32 HAL to override the default SPI pins from the variant.h file
#define CUSTOM_SPI_PINS
#define SDSS PA4
@ -301,25 +304,26 @@
#define MISO_PIN PA6
#define MOSI_PIN PA7
#define SD_DETECT_PIN PC4
#elif SD_CONNECTION_IS(CUSTOM_CABLE)
#define "CUSTOM_CABLE is not a supported SDCARD_CONNECTION for this board"
#error "CUSTOM_CABLE is not a supported SDCARD_CONNECTION for this board"
#endif
/**
* _____ _____
* ----- -----
* NC | · · | GND 5V | · · | GND
* RESET | · · | PB10(SD_DETECT) (LCD_D7) PG5 | · · | PG6 (LCD_D6)
* (MOSI)PB15 | · · | PH10(BTN_EN2) (LCD_D5) PG7 | · · | PG8 (LCD_D4)
* (SD_SS)PB12 | · · | PD10(BTN_EN1) (LCD_RS) PA8 | · · | PC10 (LCD_EN)
* (SCK)PB13 | · · | PB14(MISO) (BTN_ENC) PA15 | · · | PC11 (BEEPER)
* ￣￣ ￣￣
* ----- -----
* EXP2 EXP1
*/
//
// LCDs and Controllers
//
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
#define BEEPER_PIN PC11
#define BTN_ENC PA15
@ -390,7 +394,7 @@
#endif
// Alter timing for graphical display
#if HAS_GRAPHICAL_LCD
#if HAS_MARLINUI_U8GLIB
#ifndef BOARD_ST7920_DELAY_1
#define BOARD_ST7920_DELAY_1 DELAY_NS(96)
#endif
@ -402,6 +406,6 @@
#endif
#endif
#endif // HAS_SPI_LCD
#endif // HAS_WIRED_LCD
#undef TP

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

@ -251,9 +251,12 @@
// Must use soft SPI because Marlin's default hardware SPI is tied to LCD's EXP2
//
#if SD_CONNECTION_IS(LCD)
#define SD_DETECT_PIN PF12
#define SDSS PB12
#elif SD_CONNECTION_IS(ONBOARD)
// The SKR Pro's ONBOARD SD interface is on SPI1.
// Due to a pull resistor on the clock line, it needs to use SPI Data Mode 3 to
// function with Hardware SPI. This is not currently configurable in the HAL,
@ -264,29 +267,31 @@
#define MISO_PIN PA6
#define MOSI_PIN PB5
#define SD_DETECT_PIN PB11
#elif SD_CONNECTION_IS(CUSTOM_CABLE)
#define "CUSTOM_CABLE is not a supported SDCARD_CONNECTION for this board"
#error "CUSTOM_CABLE is not a supported SDCARD_CONNECTION for this board"
#endif
/**
* _____ _____
* ----- -----
* NC | · · | GND 5V | · · | GND
* RESET | · · | PF12(SD_DETECT) (LCD_D7) PG7 | · · | PG6 (LCD_D6)
* (MOSI)PB15 | · · | PF11(BTN_EN2) (LCD_D5) PG3 | · · | PG2 (LCD_D4)
* (SD_SS)PB12 | · · | PG10(BTN_EN1) (LCD_RS) PD10 | · · | PD11 (LCD_EN)
* (SCK)PB13 | · · | PB14(MISO) (BTN_ENC) PA8 | · · | PG4 (BEEPER)
* ￣￣ ￣￣
* ----- -----
* EXP2 EXP1
*/
//
// LCDs and Controllers
//
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
#define BEEPER_PIN PG4
#define BTN_ENC PA8
#if ENABLED(CR10_STOCKDISPLAY)
#define LCD_PINS_RS PG6
#define BTN_EN1 PD11
@ -301,10 +306,12 @@
#undef BOARD_ST7920_DELAY_3
#elif ENABLED(MKS_MINI_12864)
#define DOGLCD_A0 PG6
#define DOGLCD_CS PG3
#define BTN_EN1 PG10
#define BTN_EN2 PF11
#else
#define LCD_PINS_RS PD10
@ -343,32 +350,32 @@
#endif
// Alter timing for graphical display
#if HAS_GRAPHICAL_LCD
#ifndef BOARD_ST7920_DELAY_1
#define BOARD_ST7920_DELAY_1 DELAY_NS(96)
#endif
#ifndef BOARD_ST7920_DELAY_2
#define BOARD_ST7920_DELAY_2 DELAY_NS(48)
#endif
#ifndef BOARD_ST7920_DELAY_3
#define BOARD_ST7920_DELAY_3 DELAY_NS(600)
#endif
#endif
#endif // HAS_WIRED_LCD
#endif // HAS_SPI_LCD
// Alter timing for graphical display
#if HAS_MARLINUI_U8GLIB
#ifndef BOARD_ST7920_DELAY_1
#define BOARD_ST7920_DELAY_1 DELAY_NS(96)
#endif
#ifndef BOARD_ST7920_DELAY_2
#define BOARD_ST7920_DELAY_2 DELAY_NS(48)
#endif
#ifndef BOARD_ST7920_DELAY_3
#define BOARD_ST7920_DELAY_3 DELAY_NS(600)
#endif
#endif
//
// WIFI
//
/**
* _____
* -----
* TX | 1 2 | GND Enable PG1 // Must be high for module to run
* Enable | 3 4 | GPIO2 Reset PG0 // active low, probably OK to leave floating
* Reset | 5 6 | GPIO0 GPIO2 PF15 // must be high (ESP3D software configures this with a pullup so OK to leave as floating)
* 3.3V| 7 8 | RX GPIO0 PF14 // Leave as unused (ESP3D software configures this with a pullup so OK to leave as floating)
* ￣￣
* 3.3V | 7 8 | RX GPIO0 PF14 // Leave as unused (ESP3D software configures this with a pullup so OK to leave as floating)
* -----
* W1
*/
#define ESP_WIFI_MODULE_COM 6 // Must also set either SERIAL_PORT or SERIAL_PORT_2 to this

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

@ -199,7 +199,7 @@
//
// LCD / Controller
//
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
#define BEEPER_PIN PC9
#define BTN_ENC PA8
@ -261,7 +261,7 @@
#endif
// Alter timing for graphical display
#if HAS_GRAPHICAL_LCD
#if HAS_MARLINUI_U8GLIB
#ifndef BOARD_ST7920_DELAY_1
#define BOARD_ST7920_DELAY_1 DELAY_NS(96)
#endif
@ -273,7 +273,7 @@
#endif
#endif
#endif // HAS_SPI_LCD
#endif // HAS_WIRED_LCD
#ifndef RGB_LED_R_PIN
#define RGB_LED_R_PIN PB6

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

@ -184,7 +184,7 @@
//
// ST7920 Delays
//
#if HAS_GRAPHICAL_LCD
#if HAS_MARLINUI_U8GLIB
#ifndef BOARD_ST7920_DELAY_1
#define BOARD_ST7920_DELAY_1 DELAY_NS(96)
#endif

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

@ -147,7 +147,7 @@
//
// LCD / Controller
//
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
#define BTN_EN1 PB2
#define BTN_EN2 PB1
@ -169,7 +169,7 @@
#endif
// Alter timing for graphical display
#if HAS_GRAPHICAL_LCD
#if HAS_MARLINUI_U8GLIB
#ifndef BOARD_ST7920_DELAY_1
#define BOARD_ST7920_DELAY_1 DELAY_NS(96)
#endif

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

@ -165,7 +165,7 @@
//
// LCD / Controller
//
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
#if ENABLED(SDSUPPORT)
#define SDSS PB6 // CS for SD card in LCD
#endif

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

@ -201,7 +201,7 @@
//
//#define USE_INTERNAL_SD
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
#define LCD_PINS_RS 9 // E1 JP11-11
#define LCD_PINS_ENABLE 8 // E0 JP11-10
#define LCD_PINS_D4 7 // D7 JP11-8

2
Marlin/src/pins/teensy3/pins_TEENSY31_32.h
View File

@ -98,7 +98,7 @@
//
/*
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
#define LCD_PINS_RS 40
#define LCD_PINS_ENABLE 41
#define LCD_PINS_D4 42

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

@ -130,7 +130,7 @@
//
#define SDSS 39 // 8
#if HAS_SPI_LCD
#if HAS_WIRED_LCD
#define LCD_PINS_RS 40
#define LCD_PINS_ENABLE 41
#define LCD_PINS_D4 42