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

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