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/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