Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add MKS 12864 OLED pins to SGEN-L #16188

Merged
merged 4 commits into from
Dec 11, 2019
Merged

Add MKS 12864 OLED pins to SGEN-L #16188

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6532495
Add MKS_12864OLED_SSD1306 pins
thisiskeithb Dec 11, 2019
aeee71d
Update pins_MKS_SGEN_L.h
thinkyhead Dec 11, 2019
668d475
Update pins_MKS_SGEN_L.h
thinkyhead Dec 11, 2019
522b21d
Update pins_MKS_SGEN_L.h
thinkyhead Dec 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
92 changes: 55 additions & 37 deletions Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,60 +203,78 @@
#define LCD_PINS_D4 P0_17

#else
#define LCD_PINS_RS P0_16

#define BTN_EN1 P3_25
#define BTN_EN2 P3_26

#define LCD_PINS_ENABLE P0_18
#define LCD_PINS_D4 P0_15

#define LCD_SDSS P0_28
#define SD_DETECT_PIN P0_27

#if ENABLED(FYSETC_MINI_12864)
#define DOGLCD_CS P0_18
#define DOGLCD_A0 P0_16
#define DOGLCD_SCK P0_07
#define DOGLCD_MOSI P1_20
#if ENABLED(MKS_12864OLED_SSD1306)

#define LCD_BACKLIGHT_PIN -1
#define LCD_PINS_DC P0_17
#define DOGLCD_CS P0_16
#define DOGLCD_A0 LCD_PINS_DC
#define DOGLCD_SCK P0_15
#define DOGLCD_MOSI P0_18

#define FORCE_SOFT_SPI // Use this if default of hardware SPI causes display problems
// results in LCD soft SPI mode 3, SD soft SPI mode 0
#define LCD_PINS_RS P1_00
#define LCD_PINS_D7 P1_22
#define KILL_PIN -1 // NC

#define LCD_RESET_PIN P0_15 // Must be high or open for LCD to operate normally.
#else // !MKS_12864OLED_SSD1306

#if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
#ifndef RGB_LED_R_PIN
#define RGB_LED_R_PIN P0_17
#endif
#ifndef RGB_LED_G_PIN
#define RGB_LED_G_PIN P1_00
#endif
#ifndef RGB_LED_B_PIN
#define RGB_LED_B_PIN P1_22
#define LCD_PINS_RS P0_16

#define LCD_PINS_ENABLE P0_18
#define LCD_PINS_D4 P0_15

#if ENABLED(FYSETC_MINI_12864)

#define DOGLCD_CS P0_18
#define DOGLCD_A0 P0_16
#define DOGLCD_SCK P0_07
#define DOGLCD_MOSI P1_20

#define LCD_BACKLIGHT_PIN -1

#define FORCE_SOFT_SPI // Use this if default of hardware SPI causes display problems
// results in LCD soft SPI mode 3, SD soft SPI mode 0

#define LCD_RESET_PIN P0_15 // Must be high or open for LCD to operate normally.

#if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
#ifndef RGB_LED_R_PIN
#define RGB_LED_R_PIN P0_17
#endif
#ifndef RGB_LED_G_PIN
#define RGB_LED_G_PIN P1_00
#endif
#ifndef RGB_LED_B_PIN
#define RGB_LED_B_PIN P1_22
#endif
#elif ENABLED(FYSETC_MINI_12864_2_1)
#define NEOPIXEL_PIN P0_17
#endif
#elif ENABLED(FYSETC_MINI_12864_2_1)
#define NEOPIXEL_PIN P0_17
#endif

#else // !FYSETC_MINI_12864
#else // !FYSETC_MINI_12864

#if ENABLED(MKS_MINI_12864)
#define DOGLCD_CS P0_17
#define DOGLCD_A0 P1_00
#endif
#if ENABLED(MKS_MINI_12864)
#define DOGLCD_CS P0_17
#define DOGLCD_A0 P1_00
#endif

#if ENABLED(ULTIPANEL)
#define LCD_PINS_D5 P0_17
#define LCD_PINS_D6 P1_00
#define LCD_PINS_D7 P1_22
#endif
#if ENABLED(ULTIPANEL)
#define LCD_PINS_D5 P0_17
#define LCD_PINS_D6 P1_00
#define LCD_PINS_D7 P1_22
#endif

#endif // !FYSETC_MINI_12864
#endif // !FYSETC_MINI_12864

#endif
#endif // !MKS_12864OLED_SSD1306

#endif // !CR10_STOCKDISPLAY

#endif // HAS_SPI_LCD

Expand Down