Skip to content

Commit 5e8c7b3

Browse files
thinkyheadthinkyhead
committed
♻️ LCD_PINS_ENABLE => LCD_PINS_EN
1 parent d403352 commit 5e8c7b3

File tree

160 files changed

+301
-301
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

160 files changed

+301
-301
lines changed

‎Marlin/src/HAL/LINUX/spi_pins.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include "../../core/macros.h"
2525
#include "../../inc/MarlinConfigPre.h"
2626

27-
#if ALL(HAS_MARLINUI_U8GLIB, HAS_MEDIA) && (LCD_PINS_D4 == SD_SCK_PIN || LCD_PINS_ENABLE == SD_MOSI_PIN || DOGLCD_SCK == SD_SCK_PIN || DOGLCD_MOSI == SD_MOSI_PIN)
27+
#if ALL(HAS_MARLINUI_U8GLIB, HAS_MEDIA) && (LCD_PINS_D4 == SD_SCK_PIN || LCD_PINS_EN == SD_MOSI_PIN || DOGLCD_SCK == SD_SCK_PIN || DOGLCD_MOSI == SD_MOSI_PIN)
2828
#define SOFTWARE_SPI // If the SD card and LCD adapter share the same SPI pins, then software SPI is currently
2929
// needed due to the speed and mode required for communicating with each device being different.
3030
// This requirement can be removed if the SPI access to these devices is updated to use

‎Marlin/src/HAL/LPC1768/spi_pins.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
#include "../../core/macros.h"
2525

26-
#if ALL(HAS_MEDIA, HAS_MARLINUI_U8GLIB) && (LCD_PINS_D4 == SD_SCK_PIN || LCD_PINS_ENABLE == SD_MOSI_PIN || DOGLCD_SCK == SD_SCK_PIN || DOGLCD_MOSI == SD_MOSI_PIN)
26+
#if ALL(HAS_MEDIA, HAS_MARLINUI_U8GLIB) && (LCD_PINS_D4 == SD_SCK_PIN || LCD_PINS_EN == SD_MOSI_PIN || DOGLCD_SCK == SD_SCK_PIN || DOGLCD_MOSI == SD_MOSI_PIN)
2727
#define SOFTWARE_SPI // If the SD card and LCD adapter share the same SPI pins, then software SPI is currently
2828
// needed due to the speed and mode required for communicating with each device being different.
2929
// This requirement can be removed if the SPI access to these devices is updated to use

‎Marlin/src/HAL/NATIVE_SIM/spi_pins.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include "../../core/macros.h"
2525
#include "../../inc/MarlinConfigPre.h"
2626

27-
#if ALL(HAS_MARLINUI_U8GLIB, HAS_MEDIA) && (LCD_PINS_D4 == SD_SCK_PIN || LCD_PINS_ENABLE == SD_MOSI_PIN || DOGLCD_SCK == SD_SCK_PIN || DOGLCD_MOSI == SD_MOSI_PIN)
27+
#if ALL(HAS_MARLINUI_U8GLIB, HAS_MEDIA) && (LCD_PINS_D4 == SD_SCK_PIN || LCD_PINS_EN == SD_MOSI_PIN || DOGLCD_SCK == SD_SCK_PIN || DOGLCD_MOSI == SD_MOSI_PIN)
2828
#define SOFTWARE_SPI // If the SD card and LCD adapter share the same SPI pins, then software SPI is currently
2929
// needed due to the speed and mode required for communicating with each device being different.
3030
// This requirement can be removed if the SPI access to these devices is updated to use

‎Marlin/src/lcd/HD44780/marlinui_HD44780.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
#else
109109

110110
// Standard direct-connected LCD implementations
111-
LCD_CLASS lcd(LCD_PINS_RS, LCD_PINS_ENABLE, LCD_PINS_D4, LCD_PINS_D5, LCD_PINS_D6, LCD_PINS_D7);
111+
LCD_CLASS lcd(LCD_PINS_RS, LCD_PINS_EN, LCD_PINS_D4, LCD_PINS_D5, LCD_PINS_D6, LCD_PINS_D7);
112112

113113
#endif
114114

‎Marlin/src/lcd/dogm/marlinui_DOGM.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
// RepRapWorld Graphical LCD
3838

3939

40-
#if !HAS_MEDIA && (LCD_PINS_D4 == SD_SCK_PIN) && (LCD_PINS_ENABLE == SD_MOSI_PIN)
40+
#if !HAS_MEDIA && (LCD_PINS_D4 == SD_SCK_PIN) && (LCD_PINS_EN == SD_MOSI_PIN)
4141
#define U8G_CLASS U8GLIB_ST7920_128X64_4X_HAL
4242
#define U8G_PARAM LCD_PINS_RS
4343
#elif HAS_MEDIA && __SAMD21__
@@ -46,15 +46,15 @@
4646
#define U8G_PARAM LCD_PINS_RS
4747
#else
4848
#define U8G_CLASS U8GLIB_ST7920_128X64_4X
49-
#define U8G_PARAM LCD_PINS_D4, LCD_PINS_ENABLE, LCD_PINS_RS
49+
#define U8G_PARAM LCD_PINS_D4, LCD_PINS_EN, LCD_PINS_RS
5050
#endif
5151

5252
#elif IS_U8GLIB_ST7920
5353

5454
// RepRap Discount Full Graphics Smart Controller
5555
// and other variant LCDs using ST7920
5656

57-
#if !HAS_MEDIA && (LCD_PINS_D4 == SD_SCK_PIN) && (LCD_PINS_ENABLE == SD_MOSI_PIN)
57+
#if !HAS_MEDIA && (LCD_PINS_D4 == SD_SCK_PIN) && (LCD_PINS_EN == SD_MOSI_PIN)
5858
#define U8G_CLASS U8GLIB_ST7920_128X64_4X_HAL // 2 stripes, HW SPI (Shared with SD card. Non-standard LCD adapter on AVR.)
5959
#define U8G_PARAM LCD_PINS_RS
6060
#else
@@ -63,7 +63,7 @@
6363
#else
6464
#define U8G_CLASS U8GLIB_ST7920_128X64_RRD // Adjust stripes with PAGE_HEIGHT in ultralcd_st7920_u8glib_rrd.h
6565
#endif
66-
#define U8G_PARAM LCD_PINS_D4, LCD_PINS_ENABLE, LCD_PINS_RS // AVR version ignores these pin settings
66+
#define U8G_PARAM LCD_PINS_D4, LCD_PINS_EN, LCD_PINS_RS // AVR version ignores these pin settings
6767
// HAL version uses these pin settings
6868
#endif
6969

‎Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include "../../HAL/shared/Delay.h"
2929

3030
#define ST7920_CLK_PIN LCD_PINS_D4
31-
#define ST7920_DAT_PIN LCD_PINS_ENABLE
31+
#define ST7920_DAT_PIN LCD_PINS_EN
3232
#define ST7920_CS_PIN LCD_PINS_RS
3333

3434
//#define PAGE_HEIGHT 8 // 128 byte framebuffer

‎Marlin/src/lcd/extui/ftdi_eve_touch_ui/pin_mappings.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343

4444
#define CLCD_USE_SOFT_SPI
4545
#define CLCD_SOFT_SPI_SCLK LCD_PINS_D4 // PORTA1 Pin 6
46-
#define CLCD_SOFT_SPI_MOSI LCD_PINS_ENABLE // PORTC1 Pin 8
46+
#define CLCD_SOFT_SPI_MOSI LCD_PINS_EN // PORTC1 Pin 8
4747
#define CLCD_SPI_CS LCD_PINS_RS // PORTA3 Pin 7
4848
#define CLCD_SOFT_SPI_MISO 16 // PORTC0 BTN_ENC Pin 2
4949
#define CLCD_MOD_RESET 11 // PORTD3 BTN_EN1 Pin 3
@@ -60,7 +60,7 @@
6060
#define CLCD_MOD_RESET LCD_PINS_D4
6161
#define CLCD_SPI_CS LCD_PINS_D5
6262

63-
#define CLCD_AUX_0 LCD_PINS_ENABLE
63+
#define CLCD_AUX_0 LCD_PINS_EN
6464
#define CLCD_AUX_1 BTN_ENC
6565
#define CLCD_AUX_2 BEEPER_PIN
6666

@@ -93,7 +93,7 @@
9393
* functionality over software SPI.
9494
*/
9595

96-
#define CLCD_MOD_RESET LCD_PINS_ENABLE
96+
#define CLCD_MOD_RESET LCD_PINS_EN
9797
#define CLCD_SPI_CS LCD_PINS_D4
9898

9999
#define CLCD_USE_SOFT_SPI

‎Marlin/src/pins/esp32/pins_MKS_TINYBEE.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@
158158

159159
#if HAS_WIRED_LCD
160160
#define BEEPER_PIN EXP1_01_PIN
161-
#define LCD_PINS_ENABLE EXP1_03_PIN
161+
#define LCD_PINS_EN EXP1_03_PIN
162162
#define LCD_PINS_RS EXP1_04_PIN
163163
#define BTN_ENC EXP1_02_PIN
164164
#define BTN_EN1 EXP2_03_PIN

‎Marlin/src/pins/esp32/pins_MRR_ESPE.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@
126126
#if HAS_WIRED_LCD
127127

128128
#define LCD_PINS_RS 13
129-
#define LCD_PINS_ENABLE 17
129+
#define LCD_PINS_EN 17
130130
#define LCD_PINS_D4 16
131131

132132
#if ENABLED(CR10_STOCKDISPLAY)

‎Marlin/src/pins/esp32/pins_PANDA_common.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,6 @@
123123
#define BTN_EN2 EXP2_05_PIN
124124

125125
#define LCD_PINS_RS EXP1_04_PIN
126-
#define LCD_PINS_ENABLE EXP1_03_PIN
126+
#define LCD_PINS_EN EXP1_03_PIN
127127
#define LCD_PINS_D4 EXP1_05_PIN
128128
#endif

0 commit comments

Comments
 (0)