Add FYSETC 2.42 inch OLED support (#18485)
This commit is contained in:
parent
e401b0c8ee
commit
097347b575
6 changed files with 108 additions and 51 deletions
|
@ -2091,6 +2091,11 @@
|
||||||
//
|
//
|
||||||
//#define OVERLORD_OLED
|
//#define OVERLORD_OLED
|
||||||
|
|
||||||
|
//
|
||||||
|
// FYSETC OLED 2.42" 128 × 64 FULL GRAPHICS CONTROLLER with WS2812 RGB
|
||||||
|
// Where to find : https://www.aliexpress.com/item/4000345255731.html
|
||||||
|
//#define FYSETC_242_OLED_12864 // Uses the SSD1309 controller
|
||||||
|
|
||||||
//=============================================================================
|
//=============================================================================
|
||||||
//========================== Extensible UI Displays ===========================
|
//========================== Extensible UI Displays ===========================
|
||||||
//=============================================================================
|
//=============================================================================
|
||||||
|
|
|
@ -120,6 +120,27 @@
|
||||||
#define IS_RRD_SC
|
#define IS_RRD_SC
|
||||||
#define IS_U8GLIB_SSD1306
|
#define IS_U8GLIB_SSD1306
|
||||||
|
|
||||||
|
#elif ENABLED(FYSETC_242_OLED_12864)
|
||||||
|
|
||||||
|
#define IS_RRD_SC
|
||||||
|
#define U8GLIB_SH1106
|
||||||
|
|
||||||
|
#define LED_CONTROL_MENU
|
||||||
|
#define NEOPIXEL_LED
|
||||||
|
#undef NEOPIXEL_TYPE
|
||||||
|
#define NEOPIXEL_TYPE NEO_RGB
|
||||||
|
#if NEOPIXEL_PIXELS < 3
|
||||||
|
#undef NEOPIXELS_PIXELS
|
||||||
|
#define NEOPIXEL_PIXELS 3
|
||||||
|
#endif
|
||||||
|
#ifndef NEOPIXEL_BRIGHTNESS
|
||||||
|
#define NEOPIXEL_BRIGHTNESS 127
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if ENABLED(PSU_CONTROL)
|
||||||
|
#define LED_BACKLIGHT_TIMEOUT 10000
|
||||||
|
#endif
|
||||||
|
|
||||||
#elif ANY(FYSETC_MINI_12864_X_X, FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0, FYSETC_MINI_12864_2_1, FYSETC_GENERIC_12864_1_1)
|
#elif ANY(FYSETC_MINI_12864_X_X, FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0, FYSETC_MINI_12864_2_1, FYSETC_GENERIC_12864_1_1)
|
||||||
|
|
||||||
#define FYSETC_MINI_12864
|
#define FYSETC_MINI_12864
|
||||||
|
|
|
@ -208,7 +208,7 @@
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(FYSETC_MINI_12864_2_1)
|
#if ENABLED(FYSETC_MINI_12864_2_1, FYSETC_242_OLED_12864)
|
||||||
#define LED_CONTROL_MENU
|
#define LED_CONTROL_MENU
|
||||||
#define LED_USER_PRESET_STARTUP
|
#define LED_USER_PRESET_STARTUP
|
||||||
#define LED_COLOR_PRESETS
|
#define LED_COLOR_PRESETS
|
||||||
|
|
|
@ -246,7 +246,7 @@ void MarlinUI::init_lcd() {
|
||||||
OUT_WRITE(LCD_BACKLIGHT_PIN, DISABLED(DELAYED_BACKLIGHT_INIT)); // Illuminate after reset or right away
|
OUT_WRITE(LCD_BACKLIGHT_PIN, DISABLED(DELAYED_BACKLIGHT_INIT)); // Illuminate after reset or right away
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if EITHER(MKS_12864OLED, MKS_12864OLED_SSD1306)
|
#if EITHER(MKS_12864OLED, MKS_12864OLED_SSD1306, FYSETC_242_OLED_12864)
|
||||||
SET_OUTPUT(LCD_PINS_DC);
|
SET_OUTPUT(LCD_PINS_DC);
|
||||||
#ifndef LCD_RESET_PIN
|
#ifndef LCD_RESET_PIN
|
||||||
#define LCD_RESET_PIN LCD_PINS_RS
|
#define LCD_RESET_PIN LCD_PINS_RS
|
||||||
|
|
|
@ -123,6 +123,18 @@
|
||||||
#define U8G_CLASS U8GLIB_SH1106_128X64 // 8 stripes
|
#define U8G_CLASS U8GLIB_SH1106_128X64 // 8 stripes
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#elif ENABLED(FYSETC_242_OLED_12864)
|
||||||
|
|
||||||
|
// FYSETC OLED 2.42" 128 × 64 FULL GRAPHICS CONTROLLER
|
||||||
|
|
||||||
|
#define FORCE_SOFT_SPI // SW-SPI
|
||||||
|
|
||||||
|
#if ENABLED(ALTERNATIVE_LCD)
|
||||||
|
#define U8G_CLASS U8GLIB_SSD1306_128X64_2X // 4 stripes
|
||||||
|
#else
|
||||||
|
#define U8G_CLASS U8GLIB_SSD1306_128X64 // 8 stripes
|
||||||
|
#endif
|
||||||
|
|
||||||
#elif ENABLED(U8GLIB_SH1106)
|
#elif ENABLED(U8GLIB_SH1106)
|
||||||
|
|
||||||
// Generic SH1106 OLED I2C LCD
|
// Generic SH1106 OLED I2C LCD
|
||||||
|
|
|
@ -211,10 +211,28 @@
|
||||||
//
|
//
|
||||||
// LCDs and Controllers
|
// LCDs and Controllers
|
||||||
//
|
//
|
||||||
#define BEEPER_PIN 37
|
|
||||||
#define SD_DETECT_PIN 49
|
#define SD_DETECT_PIN 49
|
||||||
|
|
||||||
#if ENABLED(FYSETC_MINI_12864)
|
#if ENABLED(FYSETC_242_OLED_12864)
|
||||||
|
#define BTN_EN1 37
|
||||||
|
#define BTN_EN2 29
|
||||||
|
#define BTN_ENC 35
|
||||||
|
#define BEEPER_PIN 31
|
||||||
|
|
||||||
|
#define LCD_PINS_DC 25
|
||||||
|
#define LCD_PINS_RS 33
|
||||||
|
#define DOGLCD_CS 16
|
||||||
|
#define DOGLCD_MOSI 23
|
||||||
|
#define DOGLCD_SCK 17
|
||||||
|
#define DOGLCD_A0 LCD_PINS_DC
|
||||||
|
|
||||||
|
#define KILL_PIN -1 // NC
|
||||||
|
#define NEOPIXEL_PIN 27
|
||||||
|
|
||||||
|
#else
|
||||||
|
#define BEEPER_PIN 37
|
||||||
|
|
||||||
|
#if ENABLED(FYSETC_MINI_12864)
|
||||||
//
|
//
|
||||||
// See https://wiki.fysetc.com/Mini12864_Panel/?fbclid=IwAR1FyjuNdVOOy9_xzky3qqo_WeM5h-4gpRnnWhQr_O1Ef3h0AFnFXmCehK8
|
// See https://wiki.fysetc.com/Mini12864_Panel/?fbclid=IwAR1FyjuNdVOOy9_xzky3qqo_WeM5h-4gpRnnWhQr_O1Ef3h0AFnFXmCehK8
|
||||||
//
|
//
|
||||||
|
@ -243,7 +261,7 @@
|
||||||
#define NEOPIXEL_PIN 25
|
#define NEOPIXEL_PIN 25
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#elif HAS_GRAPHICAL_LCD
|
#elif HAS_GRAPHICAL_LCD
|
||||||
|
|
||||||
#define LCD_PINS_RS 16
|
#define LCD_PINS_RS 16
|
||||||
#define LCD_PINS_ENABLE 17
|
#define LCD_PINS_ENABLE 17
|
||||||
|
@ -257,12 +275,13 @@
|
||||||
#define DOGLCD_A0 27
|
#define DOGLCD_A0 27
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(NEWPANEL)
|
#if ENABLED(NEWPANEL)
|
||||||
#define BTN_EN1 31
|
#define BTN_EN1 31
|
||||||
#define BTN_EN2 33
|
#define BTN_EN2 33
|
||||||
#define BTN_ENC 35
|
#define BTN_ENC 35
|
||||||
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef RGB_LED_R_PIN
|
#ifndef RGB_LED_R_PIN
|
||||||
|
|
Reference in a new issue