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