TFT Presets, Generic options, Sanity checks (#19723)
This commit is contained in:
Scott Lahteine
GitHub
@ -46,7 +46,7 @@
|
||||
*
|
||||
* DOGLCD : Run a Graphical LCD through U8GLib (with MarlinUI)
|
||||
* IS_ULTIPANEL : Define LCD_PINS_D5/6/7 for direct-connected "Ultipanel" LCDs
|
||||
* IS_ULTRA_LCD : Ultra LCD, not necessarily Ultipanel. Used most often with NEWPANEL.
|
||||
* IS_ULTRA_LCD : Ultra LCD, not necessarily Ultipanel.
|
||||
* IS_RRD_SC : Common RRD Smart Controller digital interface pins
|
||||
* IS_RRD_FG_SC : Common RRD Full Graphical Smart Controller digital interface pins
|
||||
* U8GLIB_ST7920 : Most common DOGM display SPI interface, supporting a "lightweight" display mode.
|
||||
@ -63,22 +63,21 @@
|
||||
#elif ENABLED(CARTESIO_UI)
|
||||
|
||||
#define DOGLCD
|
||||
#define IS_ULTIPANEL
|
||||
#define IS_ULTIPANEL 1
|
||||
|
||||
#elif EITHER(DWIN_MARLINUI_PORTRAIT, DWIN_MARLINUI_LANDSCAPE)
|
||||
|
||||
#define IS_DWIN_MARLINUI 1
|
||||
#define IS_ULTIPANEL
|
||||
#define IS_ULTIPANEL 1
|
||||
|
||||
#elif ENABLED(ZONESTAR_LCD)
|
||||
|
||||
#define ADC_KEYPAD
|
||||
#define IS_RRW_KEYPAD
|
||||
#define HAS_ADC_BUTTONS 1
|
||||
#define REPRAPWORLD_KEYPAD_MOVE_STEP 10.0
|
||||
#define ADC_KEY_NUM 8
|
||||
#define IS_ULTIPANEL
|
||||
#define IS_ULTIPANEL 1
|
||||
|
||||
// This helps to implement ADC_KEYPAD menus
|
||||
// This helps to implement HAS_ADC_BUTTONS menus
|
||||
#define REVERSE_MENU_DIRECTION
|
||||
#define ENCODER_PULSES_PER_STEP 1
|
||||
#define ENCODER_STEPS_PER_MENU_ITEM 1
|
||||
@ -86,29 +85,25 @@
|
||||
|
||||
#elif ENABLED(ZONESTAR_12864LCD)
|
||||
#define DOGLCD
|
||||
#define IS_RRD_SC
|
||||
#define IS_RRD_SC 1
|
||||
#define U8GLIB_ST7920
|
||||
|
||||
#elif ENABLED(ZONESTAR_12864OLED)
|
||||
#define IS_RRD_SC
|
||||
#define IS_RRD_SC 1
|
||||
#define U8GLIB_SH1106
|
||||
|
||||
#elif ENABLED(ZONESTAR_12864OLED_SSD1306)
|
||||
#define IS_RRD_SC
|
||||
#define IS_RRD_SC 1
|
||||
#define IS_U8GLIB_SSD1306
|
||||
|
||||
#elif ENABLED(RADDS_DISPLAY)
|
||||
#define IS_ULTIPANEL
|
||||
#define IS_ULTIPANEL 1
|
||||
#define ENCODER_PULSES_PER_STEP 2
|
||||
|
||||
#elif EITHER(ANET_FULL_GRAPHICS_LCD, BQ_LCD_SMART_CONTROLLER)
|
||||
|
||||
#define IS_RRD_FG_SC
|
||||
|
||||
#elif ANY(miniVIKI, VIKI2, ELB_FULL_GRAPHIC_CONTROLLER, AZSMZ_12864)
|
||||
|
||||
#define DOGLCD
|
||||
#define IS_ULTIPANEL
|
||||
#define IS_ULTIPANEL 1
|
||||
|
||||
#if ENABLED(miniVIKI)
|
||||
#define U8GLIB_ST7565_64128N
|
||||
@ -123,40 +118,33 @@
|
||||
#elif ENABLED(OLED_PANEL_TINYBOY2)
|
||||
|
||||
#define IS_U8GLIB_SSD1306
|
||||
#define IS_ULTIPANEL
|
||||
#define IS_ULTIPANEL 1
|
||||
|
||||
#elif ENABLED(RA_CONTROL_PANEL)
|
||||
|
||||
#define LCD_I2C_TYPE_PCA8574
|
||||
#define LCD_I2C_ADDRESS 0x27 // I2C Address of the port expander
|
||||
#define IS_ULTIPANEL
|
||||
#define IS_ULTIPANEL 1
|
||||
|
||||
#elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
|
||||
|
||||
#define DOGLCD
|
||||
#define U8GLIB_ST7920
|
||||
#define IS_ULTIPANEL
|
||||
|
||||
#elif ENABLED(CR10_STOCKDISPLAY)
|
||||
|
||||
#define IS_RRD_FG_SC
|
||||
#define BOARD_ST7920_DELAY_1 DELAY_NS(125)
|
||||
#define BOARD_ST7920_DELAY_2 DELAY_NS(125)
|
||||
#define BOARD_ST7920_DELAY_3 DELAY_NS(125)
|
||||
#define IS_ULTIPANEL 1
|
||||
|
||||
#elif ENABLED(MKS_12864OLED)
|
||||
|
||||
#define IS_RRD_SC
|
||||
#define IS_RRD_SC 1
|
||||
#define U8GLIB_SH1106
|
||||
|
||||
#elif ENABLED(MKS_12864OLED_SSD1306)
|
||||
|
||||
#define IS_RRD_SC
|
||||
#define IS_RRD_SC 1
|
||||
#define IS_U8GLIB_SSD1306
|
||||
|
||||
#elif ENABLED(FYSETC_242_OLED_12864)
|
||||
|
||||
#define IS_RRD_SC
|
||||
#define IS_RRD_SC 1
|
||||
#define U8GLIB_SH1106
|
||||
|
||||
#define LED_CONTROL_MENU
|
||||
@ -179,7 +167,7 @@
|
||||
|
||||
#define FYSETC_MINI_12864
|
||||
#define DOGLCD
|
||||
#define IS_ULTIPANEL
|
||||
#define IS_ULTIPANEL 1
|
||||
#define LED_COLORS_REDUCE_GREEN
|
||||
#if ENABLED(PSU_CONTROL) && EITHER(FYSETC_MINI_12864_2_0, FYSETC_MINI_12864_2_1)
|
||||
#define LED_BACKLIGHT_TIMEOUT 10000
|
||||
@ -205,7 +193,7 @@
|
||||
|
||||
#elif ENABLED(ULTI_CONTROLLER)
|
||||
|
||||
#define IS_ULTIPANEL
|
||||
#define IS_ULTIPANEL 1
|
||||
#define U8GLIB_SSD1309
|
||||
#define LCD_RESET_PIN LCD_PINS_D6 // This controller need a reset pin
|
||||
#define ENCODER_PULSES_PER_STEP 2
|
||||
@ -213,14 +201,14 @@
|
||||
|
||||
#elif ENABLED(MAKEBOARD_MINI_2_LINE_DISPLAY_1602)
|
||||
|
||||
#define IS_RRD_SC
|
||||
#define IS_RRD_SC 1
|
||||
#define LCD_WIDTH 16
|
||||
#define LCD_HEIGHT 2
|
||||
|
||||
#elif EITHER(TFTGLCD_PANEL_SPI, TFTGLCD_PANEL_I2C)
|
||||
|
||||
#define IS_TFTGLCD_PANEL 1
|
||||
#define IS_ULTIPANEL // Note that IS_ULTIPANEL leads to HAS_WIRED_LCD
|
||||
#define IS_ULTIPANEL 1 // Note that IS_ULTIPANEL leads to HAS_WIRED_LCD
|
||||
|
||||
#if ENABLED(SDSUPPORT) && DISABLED(LCD_PROGRESS_BAR)
|
||||
#define LCD_PROGRESS_BAR
|
||||
@ -239,14 +227,35 @@
|
||||
#define CONVERT_TO_EXT_ASCII // Use extended 128-255 symbols from ASCII table.
|
||||
// At this time present conversion only for cyrillic - bg, ru and uk languages.
|
||||
// First 7 ASCII symbols in panel font must be replaced with Marlin's special symbols.
|
||||
|
||||
#elif ENABLED(CR10_STOCKDISPLAY)
|
||||
|
||||
#define IS_RRD_FG_SC 1
|
||||
#define BOARD_ST7920_DELAY_1 DELAY_NS(125)
|
||||
#define BOARD_ST7920_DELAY_2 DELAY_NS(125)
|
||||
#define BOARD_ST7920_DELAY_3 DELAY_NS(125)
|
||||
|
||||
#elif ANY(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER, ANET_FULL_GRAPHICS_LCD, BQ_LCD_SMART_CONTROLLER)
|
||||
|
||||
#define IS_RRD_FG_SC 1
|
||||
|
||||
#elif ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
|
||||
|
||||
// RepRapDiscount LCD or Graphical LCD with rotary click encoder
|
||||
#define IS_RRD_SC 1
|
||||
|
||||
#endif
|
||||
|
||||
#if ENABLED(IS_RRD_FG_SC)
|
||||
#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
|
||||
// ST7920-based graphical displays
|
||||
#if ANY(IS_RRD_FG_SC, LCD_FOR_MELZI, SILVER_GATE_GLCD_CONTROLLER)
|
||||
#define DOGLCD
|
||||
#define U8GLIB_ST7920
|
||||
#define IS_RRD_SC 1
|
||||
#endif
|
||||
|
||||
// ST7565 / 64128N graphical displays
|
||||
#if EITHER(MAKRPANEL, MINIPANEL)
|
||||
#define IS_ULTIPANEL
|
||||
#define IS_ULTIPANEL 1
|
||||
#define DOGLCD
|
||||
#if ENABLED(MAKRPANEL)
|
||||
#define U8GLIB_ST7565_64128N
|
||||
@ -258,7 +267,7 @@
|
||||
#endif
|
||||
|
||||
#if ENABLED(OVERLORD_OLED)
|
||||
#define IS_ULTIPANEL
|
||||
#define IS_ULTIPANEL 1
|
||||
#define U8GLIB_SH1106
|
||||
/**
|
||||
* PCA9632 for buzzer and LEDs via i2c
|
||||
@ -278,64 +287,44 @@
|
||||
// 128x64 I2C OLED LCDs - SSD1306/SSD1309/SH1106
|
||||
#if ANY(U8GLIB_SSD1306, U8GLIB_SSD1309, U8GLIB_SH1106)
|
||||
#define HAS_U8GLIB_I2C_OLED 1
|
||||
#endif
|
||||
#if HAS_U8GLIB_I2C_OLED
|
||||
#define IS_ULTRA_LCD
|
||||
#define IS_ULTRA_LCD 1
|
||||
#define DOGLCD
|
||||
#endif
|
||||
|
||||
// ST7920-based graphical displays
|
||||
#if ANY(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER, LCD_FOR_MELZI, SILVER_GATE_GLCD_CONTROLLER)
|
||||
#define DOGLCD
|
||||
#define U8GLIB_ST7920
|
||||
#define IS_RRD_SC
|
||||
#endif
|
||||
|
||||
// RepRapDiscount LCD or Graphical LCD with rotary click encoder
|
||||
#if ENABLED(IS_RRD_SC)
|
||||
#define REPRAP_DISCOUNT_SMART_CONTROLLER
|
||||
#endif
|
||||
|
||||
/**
|
||||
* SPI Ultipanels
|
||||
*/
|
||||
|
||||
// Basic Ultipanel-like displays
|
||||
#if ANY(ULTIMAKERCONTROLLER, REPRAP_DISCOUNT_SMART_CONTROLLER, G3D_PANEL, RIGIDBOT_PANEL, PANEL_ONE, U8GLIB_SH1106)
|
||||
#define IS_ULTIPANEL
|
||||
#if ANY(ULTIMAKERCONTROLLER, IS_RRD_SC, G3D_PANEL, RIGIDBOT_PANEL, PANEL_ONE, U8GLIB_SH1106)
|
||||
#define IS_ULTIPANEL 1
|
||||
#endif
|
||||
|
||||
// Einstart OLED has Cardinal nav via pins defined in pins_EINSTART-S.h
|
||||
#if ENABLED(U8GLIB_SH1106_EINSTART)
|
||||
#define DOGLCD
|
||||
#define IS_ULTIPANEL
|
||||
#define IS_ULTIPANEL 1
|
||||
#endif
|
||||
|
||||
// Compatibility
|
||||
#if ENABLED(FSMC_GRAPHICAL_TFT)
|
||||
// TFT Compatibility
|
||||
#if ANY(FSMC_GRAPHICAL_TFT, SPI_GRAPHICAL_TFT, TFT_320x240, TFT_480x320, TFT_320x240_SPI, TFT_480x320_SPI, TFT_LVGL_UI_FSMC, TFT_LVGL_UI_SPI)
|
||||
#define IS_LEGACY_TFT 1
|
||||
#define TFT_GENERIC
|
||||
#warning "Don't forget to update your TFT settings in Configuration.h."
|
||||
#endif
|
||||
|
||||
#if ANY(FSMC_GRAPHICAL_TFT, TFT_320x240, TFT_480x320, TFT_LVGL_UI_FSMC)
|
||||
#define TFT_INTERFACE_FSMC
|
||||
#elif ANY(SPI_GRAPHICAL_TFT, TFT_320x240_SPI, TFT_480x320_SPI, TFT_LVGL_UI_SPI)
|
||||
#define TFT_INTERFACE_SPI
|
||||
#endif
|
||||
|
||||
#if EITHER(FSMC_GRAPHICAL_TFT, SPI_GRAPHICAL_TFT)
|
||||
#define TFT_CLASSIC_UI
|
||||
#define TFT_INTERFACE_FSMC
|
||||
#define TFT_GENERIC
|
||||
#elif ENABLED(SPI_GRAPHICAL_TFT)
|
||||
#define TFT_CLASSIC_UI
|
||||
#define TFT_INTERFACE_SPI
|
||||
#define TFT_GENERIC
|
||||
#elif EITHER(TFT_320x240, TFT_480x320)
|
||||
#elif ANY(TFT_320x240, TFT_480x320, TFT_320x240_SPI, TFT_480x320_SPI)
|
||||
#define TFT_COLOR_UI
|
||||
#define TFT_INTERFACE_FSMC
|
||||
#define TFT_GENERIC
|
||||
#elif EITHER(TFT_320x240_SPI, TFT_480x320_SPI)
|
||||
#define TFT_COLOR_UI
|
||||
#define TFT_INTERFACE_SPI
|
||||
#define TFT_GENERIC
|
||||
#elif ENABLED(TFT_LVGL_UI_FSMC)
|
||||
#elif EITHER(TFT_LVGL_UI_FSMC, TFT_LVGL_UI_SPI)
|
||||
#define TFT_LVGL_UI
|
||||
#define TFT_INTERFACE_FSMC
|
||||
#define TFT_GENERIC
|
||||
#elif ENABLED(TFT_LVGL_UI_SPI)
|
||||
#define TFT_LVGL_UI
|
||||
#define TFT_INTERFACE_SPI
|
||||
#define TFT_GENERIC
|
||||
#endif
|
||||
|
||||
// FSMC/SPI TFT Panels (LVGL)
|
||||
@ -350,7 +339,7 @@
|
||||
|
||||
#if TFT_SCALED_DOGLCD
|
||||
#define DOGLCD
|
||||
#define IS_ULTIPANEL
|
||||
#define IS_ULTIPANEL 1
|
||||
#define DELAYED_BACKLIGHT_INIT
|
||||
#elif ENABLED(TFT_LVGL_UI)
|
||||
#define DELAYED_BACKLIGHT_INIT
|
||||
@ -359,7 +348,7 @@
|
||||
// Color UI
|
||||
#if ENABLED(TFT_COLOR_UI)
|
||||
#define HAS_GRAPHICAL_TFT 1
|
||||
#define IS_ULTIPANEL
|
||||
#define IS_ULTIPANEL 1
|
||||
#endif
|
||||
|
||||
/**
|
||||
@ -383,7 +372,7 @@
|
||||
#define LCD_I2C_TYPE_MCP23017
|
||||
#define LCD_I2C_ADDRESS 0x20 // I2C Address of the port expander
|
||||
#define LCD_USE_I2C_BUZZER // Enable buzzer on LCD (optional)
|
||||
#define IS_ULTIPANEL
|
||||
#define IS_ULTIPANEL 1
|
||||
|
||||
#elif ENABLED(LCD_I2C_VIKI)
|
||||
|
||||
@ -398,7 +387,7 @@
|
||||
#define LCD_I2C_TYPE_MCP23017
|
||||
#define LCD_I2C_ADDRESS 0x20 // I2C Address of the port expander
|
||||
#define LCD_USE_I2C_BUZZER // Enable buzzer on LCD (requires LiquidTWI2 v1.2.3 or later)
|
||||
#define IS_ULTIPANEL
|
||||
#define IS_ULTIPANEL 1
|
||||
|
||||
#define ENCODER_FEEDRATE_DEADZONE 4
|
||||
|
||||
@ -410,7 +399,7 @@
|
||||
#define STD_ENCODER_PULSES_PER_STEP 2
|
||||
#define STD_ENCODER_STEPS_PER_MENU_ITEM 1
|
||||
|
||||
#elif ANY(REPRAP_DISCOUNT_SMART_CONTROLLER, miniVIKI, VIKI2, ELB_FULL_GRAPHIC_CONTROLLER, AZSMZ_12864, OLED_PANEL_TINYBOY2, BQ_LCD_SMART_CONTROLLER, LCD_I2C_PANELOLU2)
|
||||
#elif ANY(IS_RRD_SC, miniVIKI, VIKI2, ELB_FULL_GRAPHIC_CONTROLLER, AZSMZ_12864, OLED_PANEL_TINYBOY2, BQ_LCD_SMART_CONTROLLER, LCD_I2C_PANELOLU2)
|
||||
|
||||
#define STD_ENCODER_PULSES_PER_STEP 4
|
||||
#define STD_ENCODER_STEPS_PER_MENU_ITEM 1
|
||||
@ -443,30 +432,24 @@
|
||||
// https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/schematics#!shiftregister-connection
|
||||
#if ENABLED(FF_INTERFACEBOARD)
|
||||
#define SR_LCD_3W_NL // Non latching 3 wire shift register
|
||||
#define IS_ULTIPANEL
|
||||
#define IS_ULTIPANEL 1
|
||||
#elif ENABLED(SAV_3DLCD)
|
||||
#define SR_LCD_2W_NL // Non latching 2 wire shift register
|
||||
#define IS_ULTIPANEL
|
||||
#define IS_ULTIPANEL 1
|
||||
#elif ENABLED(ULTIPANEL)
|
||||
#define IS_ULTIPANEL 1
|
||||
#endif
|
||||
|
||||
#if ENABLED(IS_ULTIPANEL)
|
||||
#define ULTIPANEL
|
||||
#endif
|
||||
#if ENABLED(ULTIPANEL)
|
||||
#define IS_ULTRA_LCD
|
||||
#define NEWPANEL
|
||||
#endif
|
||||
#if ENABLED(IS_ULTRA_LCD)
|
||||
#define ULTRA_LCD
|
||||
#if EITHER(IS_ULTIPANEL, ULTRA_LCD)
|
||||
#define IS_ULTRA_LCD 1
|
||||
#endif
|
||||
|
||||
#if ENABLED(IS_RRW_KEYPAD)
|
||||
#define REPRAPWORLD_KEYPAD
|
||||
#if EITHER(IS_ULTIPANEL, REPRAPWORLD_KEYPAD)
|
||||
#define IS_NEWPANEL 1
|
||||
#endif
|
||||
|
||||
// Keypad needs a move step
|
||||
#if ENABLED(REPRAPWORLD_KEYPAD)
|
||||
#define NEWPANEL
|
||||
#if EITHER(ZONESTAR_LCD, REPRAPWORLD_KEYPAD)
|
||||
#define IS_RRW_KEYPAD 1
|
||||
#ifndef REPRAPWORLD_KEYPAD_MOVE_STEP
|
||||
#define REPRAPWORLD_KEYPAD_MOVE_STEP 1.0
|
||||
#endif
|
||||
@ -479,16 +462,16 @@
|
||||
|
||||
// Extensible UI serial touch screens. (See src/lcd/extui)
|
||||
#if ANY(HAS_DGUS_LCD, MALYAN_LCD, TOUCH_UI_FTDI_EVE, ANYCUBIC_LCD_I3MEGA, ANYCUBIC_LCD_CHIRON)
|
||||
#define IS_EXTUI
|
||||
#define IS_EXTUI 1
|
||||
#define EXTENSIBLE_UI
|
||||
#endif
|
||||
|
||||
// Aliases for LCD features
|
||||
#if EITHER(ULTRA_LCD, EXTENSIBLE_UI)
|
||||
#if EITHER(IS_ULTRA_LCD, EXTENSIBLE_UI)
|
||||
#define HAS_DISPLAY 1
|
||||
#endif
|
||||
|
||||
#if ENABLED(ULTRA_LCD)
|
||||
#if IS_ULTRA_LCD
|
||||
#define HAS_WIRED_LCD 1
|
||||
#if ENABLED(DOGLCD)
|
||||
#define HAS_MARLINUI_U8GLIB 1
|
||||
@ -499,12 +482,9 @@
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if ENABLED(ULTIPANEL) && DISABLED(NO_LCD_MENUS)
|
||||
#if IS_ULTIPANEL && DISABLED(NO_LCD_MENUS)
|
||||
#define HAS_LCD_MENU 1
|
||||
#endif
|
||||
#if ENABLED(ADC_KEYPAD)
|
||||
#define HAS_ADC_BUTTONS 1
|
||||
#endif
|
||||
|
||||
#if HAS_MARLINUI_U8GLIB
|
||||
#ifndef LCD_PIXEL_WIDTH
|
||||
@ -837,83 +817,85 @@
|
||||
#if ENABLED(MKS_TS35_V2_0)
|
||||
// Most common: ST7796
|
||||
#define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY)
|
||||
#define TFT_WIDTH 480
|
||||
#define TFT_HEIGHT 320
|
||||
#define TFT_RES_480x320
|
||||
#define TFT_INTERFACE_SPI
|
||||
#define GRAPHICAL_TFT_UPSCALE 3
|
||||
#elif ENABLED(MKS_ROBIN_TFT24)
|
||||
// Most common: ST7789
|
||||
#define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY | TFT_INVERT_Y)
|
||||
#define TFT_WIDTH 320
|
||||
#define TFT_HEIGHT 240
|
||||
#define TFT_RES_320x240
|
||||
#define TFT_INTERFACE_FSMC
|
||||
#define GRAPHICAL_TFT_UPSCALE 2
|
||||
#elif ENABLED(MKS_ROBIN_TFT28)
|
||||
// Most common: ST7789
|
||||
#define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY | TFT_INVERT_Y)
|
||||
#define TFT_WIDTH 320
|
||||
#define TFT_HEIGHT 240
|
||||
#define TFT_RES_320x240
|
||||
#define TFT_INTERFACE_FSMC
|
||||
#define GRAPHICAL_TFT_UPSCALE 2
|
||||
#elif ENABLED(MKS_ROBIN_TFT32)
|
||||
// Most common: ST7789
|
||||
#define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY | TFT_INVERT_Y)
|
||||
#define TFT_WIDTH 320
|
||||
#define TFT_HEIGHT 240
|
||||
#define TFT_RES_320x240
|
||||
#define TFT_INTERFACE_FSMC
|
||||
#define GRAPHICAL_TFT_UPSCALE 2
|
||||
#elif ENABLED(MKS_ROBIN_TFT35)
|
||||
// Most common: ILI9488
|
||||
#define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY | TFT_INVERT_X | TFT_INVERT_Y)
|
||||
#define TFT_WIDTH 480
|
||||
#define TFT_HEIGHT 320
|
||||
#define TFT_RES_480x320
|
||||
#define TFT_INTERFACE_FSMC
|
||||
#define GRAPHICAL_TFT_UPSCALE 3
|
||||
#elif ENABLED(MKS_ROBIN_TFT43)
|
||||
#define TFT_DEFAULT_ORIENTATION 0
|
||||
#define TFT_DRIVER SSD1963
|
||||
#define TFT_WIDTH 480
|
||||
#define TFT_HEIGHT 272
|
||||
#define TFT_RES_480x272
|
||||
#define TFT_INTERFACE_FSMC
|
||||
#define GRAPHICAL_TFT_UPSCALE 2
|
||||
#elif ENABLED(MKS_ROBIN_TFT_V1_1R)
|
||||
// ILI9328 or R61505
|
||||
#define TFT_DEFAULT_ORIENTATION (TFT_INVERT_X | TFT_INVERT_Y | TFT_EXCHANGE_XY)
|
||||
#define TFT_WIDTH 320
|
||||
#define TFT_HEIGHT 240
|
||||
#define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY | TFT_INVERT_X | TFT_INVERT_Y)
|
||||
#define TFT_RES_320x240
|
||||
#define TFT_INTERFACE_FSMC
|
||||
#define GRAPHICAL_TFT_UPSCALE 2
|
||||
#elif EITHER(TFT_TRONXY_X5SA, ANYCUBIC_TFT35)
|
||||
#define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY | TFT_INVERT_X | TFT_INVERT_Y)
|
||||
#define TFT_DRIVER ILI9488
|
||||
#define TFT_WIDTH 480
|
||||
#define TFT_HEIGHT 320
|
||||
#define TFT_RES_480x320
|
||||
#define TFT_INTERFACE_FSMC
|
||||
#define GRAPHICAL_TFT_UPSCALE 3
|
||||
#elif ENABLED(LONGER_LK_TFT28)
|
||||
#define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY | TFT_INVERT_X | TFT_INVERT_Y)
|
||||
#define TFT_WIDTH 320
|
||||
#define TFT_HEIGHT 240
|
||||
#define TFT_RES_320x240
|
||||
#define TFT_INTERFACE_FSMC
|
||||
#define GRAPHICAL_TFT_UPSCALE 2
|
||||
#elif ENABLED(TFT_GENERIC)
|
||||
#define TFT_DEFAULT_ORIENTATION (TFT_EXCHANGE_XY | TFT_INVERT_X | TFT_INVERT_Y)
|
||||
#if NONE(TFT_RES_320x240, TFT_RES_480x272, TFT_RES_480x320)
|
||||
#define TFT_RES_320x240
|
||||
#endif
|
||||
#if NONE(TFT_INTERFACE_FSMC, TFT_INTERFACE_SPI)
|
||||
#define TFT_INTERFACE_SPI
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if ENABLED(TFT_RES_320x240)
|
||||
#define TFT_WIDTH 320
|
||||
#define TFT_HEIGHT 240
|
||||
#define GRAPHICAL_TFT_UPSCALE 2
|
||||
#elif ENABLED(TFT_RES_480x272)
|
||||
#define TFT_WIDTH 480
|
||||
#define TFT_HEIGHT 272
|
||||
#define GRAPHICAL_TFT_UPSCALE 2
|
||||
#elif ENABLED(TFT_RES_480x320)
|
||||
#define TFT_WIDTH 480
|
||||
#define TFT_HEIGHT 320
|
||||
#define GRAPHICAL_TFT_UPSCALE 3
|
||||
#endif
|
||||
|
||||
// FSMC/SPI TFT Panels using standard HAL/tft/tft_(fsmc|spi).h
|
||||
#if ENABLED(TFT_INTERFACE_FSMC)
|
||||
#define HAS_FSMC_TFT 1
|
||||
#if ENABLED(TFT_CLASSIC_UI)
|
||||
#define FSMC_GRAPHICAL_TFT
|
||||
#define HAS_FSMC_GRAPHICAL_TFT 1
|
||||
#elif ENABLED(TFT_LVGL_UI)
|
||||
#define TFT_LVGL_UI_FSMC
|
||||
#define HAS_TFT_LVGL_UI_FSMC 1
|
||||
#endif
|
||||
#elif ENABLED(TFT_INTERFACE_SPI)
|
||||
#define HAS_SPI_TFT 1
|
||||
#if ENABLED(TFT_CLASSIC_UI)
|
||||
#define SPI_GRAPHICAL_TFT
|
||||
#define HAS_SPI_GRAPHICAL_TFT 1
|
||||
#elif ENABLED(TFT_LVGL_UI)
|
||||
#define TFT_LVGL_UI_SPI
|
||||
#define HAS_TFT_LVGL_UI_SPI 1
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
||||
@ -148,7 +148,7 @@
|
||||
|
||||
#if ANY(MARLIN_BRICKOUT, MARLIN_INVADERS, MARLIN_SNAKE, MARLIN_MAZE)
|
||||
#define HAS_GAMES 1
|
||||
#if (1 < ENABLED(MARLIN_BRICKOUT) + ENABLED(MARLIN_INVADERS) + ENABLED(MARLIN_SNAKE) + ENABLED(MARLIN_MAZE))
|
||||
#if MANY(MARLIN_BRICKOUT, MARLIN_INVADERS, MARLIN_SNAKE, MARLIN_MAZE)
|
||||
#define HAS_GAME_MENU 1
|
||||
#endif
|
||||
#endif
|
||||
@ -163,7 +163,7 @@
|
||||
#if EITHER(MIN_SOFTWARE_ENDSTOPS, MAX_SOFTWARE_ENDSTOPS)
|
||||
#define HAS_SOFTWARE_ENDSTOPS 1
|
||||
#endif
|
||||
#if ANY(EXTENSIBLE_UI, NEWPANEL, EMERGENCY_PARSER, HAS_ADC_BUTTONS, DWIN_CREALITY_LCD)
|
||||
#if ANY(EXTENSIBLE_UI, IS_NEWPANEL, EMERGENCY_PARSER, HAS_ADC_BUTTONS, DWIN_CREALITY_LCD)
|
||||
#define HAS_RESUME_CONTINUE 1
|
||||
#endif
|
||||
|
||||
|
||||
@ -383,7 +383,7 @@
|
||||
|
||||
#endif
|
||||
|
||||
#if ANY(HAS_GRAPHICAL_TFT, LCD_USE_DMA_FSMC, FSMC_GRAPHICAL_TFT, SPI_GRAPHICAL_TFT) || !PIN_EXISTS(SD_DETECT)
|
||||
#if ANY(HAS_GRAPHICAL_TFT, LCD_USE_DMA_FSMC, HAS_FSMC_GRAPHICAL_TFT, HAS_SPI_GRAPHICAL_TFT) || !PIN_EXISTS(SD_DETECT)
|
||||
#define NO_LCD_REINIT 1 // Suppress LCD re-initialization
|
||||
#endif
|
||||
|
||||
@ -2578,7 +2578,7 @@
|
||||
// Force SDCARD_SORT_ALPHA to be enabled for Graphical LCD on LPC1768
|
||||
// on boards where SD card and LCD display share the same SPI bus
|
||||
// because of a bug in the shared SPI implementation. (See #8122)
|
||||
#if defined(TARGET_LPC1768) && ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) && (SCK_PIN == LCD_PINS_D4)
|
||||
#if defined(TARGET_LPC1768) && IS_RRD_FG_SC && (SCK_PIN == LCD_PINS_D4)
|
||||
#define SDCARD_SORT_ALPHA // Keep one directory level in RAM. Changing directory levels
|
||||
// may still glitch the screen, but LCD updates clean it up.
|
||||
#undef SDSORT_LIMIT
|
||||
|
||||
@ -702,8 +702,10 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
|
||||
#elif PROGRESS_MSG_EXPIRE < 0
|
||||
#error "PROGRESS_MSG_EXPIRE must be greater than or equal to 0."
|
||||
#endif
|
||||
#elif ENABLED(LCD_SET_PROGRESS_MANUALLY) && NONE(HAS_MARLINUI_U8GLIB, HAS_GRAPHICAL_TFT, HAS_MARLINUI_HD44780, EXTENSIBLE_UI)
|
||||
#error "LCD_SET_PROGRESS_MANUALLY requires LCD_PROGRESS_BAR, Character LCD, Graphical LCD, TFT, or EXTENSIBLE_UI."
|
||||
#elif ENABLED(LCD_SET_PROGRESS_MANUALLY)
|
||||
#if NONE(HAS_MARLINUI_U8GLIB, HAS_GRAPHICAL_TFT, HAS_MARLINUI_HD44780, EXTENSIBLE_UI)
|
||||
#error "LCD_SET_PROGRESS_MANUALLY requires LCD_PROGRESS_BAR, Character LCD, Graphical LCD, TFT, or EXTENSIBLE_UI."
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if !HAS_LCD_MENU && ENABLED(SD_REPRINT_LAST_SELECTED_FILE)
|
||||
@ -843,7 +845,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
|
||||
#error "ADVANCED_PAUSE_FEATURE requires FILAMENT_UNLOAD_PURGE_FEEDRATE. Please add it to Configuration_adv.h."
|
||||
#elif ENABLED(EXTRUDER_RUNOUT_PREVENT)
|
||||
#error "EXTRUDER_RUNOUT_PREVENT is incompatible with ADVANCED_PAUSE_FEATURE."
|
||||
#elif ENABLED(PARK_HEAD_ON_PAUSE) && NONE(SDSUPPORT, NEWPANEL, EMERGENCY_PARSER)
|
||||
#elif ENABLED(PARK_HEAD_ON_PAUSE) && NONE(SDSUPPORT, IS_NEWPANEL, EMERGENCY_PARSER)
|
||||
#error "PARK_HEAD_ON_PAUSE requires SDSUPPORT, EMERGENCY_PARSER, or an LCD controller."
|
||||
#elif ENABLED(HOME_BEFORE_FILAMENT_CHANGE) && DISABLED(PAUSE_PARK_NO_STEPPER_TIMEOUT)
|
||||
#error "HOME_BEFORE_FILAMENT_CHANGE requires PAUSE_PARK_NO_STEPPER_TIMEOUT."
|
||||
@ -1026,15 +1028,8 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
|
||||
/**
|
||||
* Special tool-changing options
|
||||
*/
|
||||
#if 1 < 0 \
|
||||
+ ENABLED(SINGLENOZZLE) \
|
||||
+ ENABLED(DUAL_X_CARRIAGE) \
|
||||
+ ENABLED(PARKING_EXTRUDER) \
|
||||
+ ENABLED(MAGNETIC_PARKING_EXTRUDER) \
|
||||
+ ENABLED(SWITCHING_TOOLHEAD) \
|
||||
+ ENABLED(MAGNETIC_SWITCHING_TOOLHEAD) \
|
||||
+ ENABLED(ELECTROMAGNETIC_SWITCHING_TOOLHEAD)
|
||||
#error "Please select only one of SINGLENOZZLE, DUAL_X_CARRIAGE, PARKING_EXTRUDER, SWITCHING_TOOLHEAD, MAGNETIC_SWITCHING_TOOLHEAD, or ELECTROMAGNETIC_SWITCHING_TOOLHEAD."
|
||||
#if MANY(SINGLENOZZLE, DUAL_X_CARRIAGE, PARKING_EXTRUDER, MAGNETIC_PARKING_EXTRUDER, SWITCHING_TOOLHEAD, MAGNETIC_SWITCHING_TOOLHEAD, ELECTROMAGNETIC_SWITCHING_TOOLHEAD)
|
||||
#error "Please select only one of SINGLENOZZLE, DUAL_X_CARRIAGE, PARKING_EXTRUDER, MAGNETIC_PARKING_EXTRUDER, SWITCHING_TOOLHEAD, MAGNETIC_SWITCHING_TOOLHEAD, or ELECTROMAGNETIC_SWITCHING_TOOLHEAD."
|
||||
#endif
|
||||
|
||||
/**
|
||||
@ -1161,16 +1156,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
|
||||
/**
|
||||
* Allow only one kinematic type to be defined
|
||||
*/
|
||||
#if 1 < 0 \
|
||||
+ ENABLED(DELTA) \
|
||||
+ ENABLED(MORGAN_SCARA) \
|
||||
+ ENABLED(COREXY) \
|
||||
+ ENABLED(COREXZ) \
|
||||
+ ENABLED(COREYZ) \
|
||||
+ ENABLED(COREYX) \
|
||||
+ ENABLED(COREZX) \
|
||||
+ ENABLED(COREZY) \
|
||||
+ ENABLED(MARKFORGED_XY)
|
||||
#if MANY(DELTA, MORGAN_SCARA, COREXY, COREXZ, COREYZ, COREYX, COREZX, COREZY, MARKFORGED_XY)
|
||||
#error "Please enable only one of DELTA, MORGAN_SCARA, COREXY, COREYX, COREXZ, COREZX, COREYZ, COREZY, or MARKFORGED_XY."
|
||||
#endif
|
||||
|
||||
@ -1210,18 +1196,9 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
|
||||
* Allow only one probe option to be defined
|
||||
*/
|
||||
#if 1 < 0 \
|
||||
+ ENABLED(PROBE_MANUALLY) \
|
||||
+ ENABLED(FIX_MOUNTED_PROBE) \
|
||||
+ ENABLED(NOZZLE_AS_PROBE) \
|
||||
+ (HAS_Z_SERVO_PROBE && DISABLED(BLTOUCH)) \
|
||||
+ ENABLED(BLTOUCH) && DISABLED(CREALITY_TOUCH) \
|
||||
+ ENABLED(CREALITY_TOUCH) \
|
||||
+ ENABLED(TOUCH_MI_PROBE) \
|
||||
+ ENABLED(SOLENOID_PROBE) \
|
||||
+ ENABLED(Z_PROBE_ALLEN_KEY) \
|
||||
+ ENABLED(Z_PROBE_SLED) \
|
||||
+ ENABLED(RACK_AND_PINION_PROBE) \
|
||||
+ ENABLED(SENSORLESS_PROBING)
|
||||
+ (DISABLED(BLTOUCH) && HAS_Z_SERVO_PROBE) \
|
||||
+ (ENABLED(BLTOUCH) && DISABLED(CREALITY_TOUCH)) \
|
||||
+ COUNT_ENABLED(PROBE_MANUALLY, FIX_MOUNTED_PROBE, NOZZLE_AS_PROBE, CREALITY_TOUCH, TOUCH_MI_PROBE, SOLENOID_PROBE, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, RACK_AND_PINION_PROBE, SENSORLESS_PROBING)
|
||||
#error "Please enable only one probe option: PROBE_MANUALLY, SENSORLESS_PROBING, BLTOUCH, FIX_MOUNTED_PROBE, NOZZLE_AS_PROBE, TOUCH_MI_PROBE, SOLENOID_PROBE, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, or Z Servo."
|
||||
#endif
|
||||
|
||||
@ -1391,12 +1368,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
|
||||
/**
|
||||
* Allow only one bed leveling option to be defined
|
||||
*/
|
||||
#if 1 < 0 \
|
||||
+ ENABLED(AUTO_BED_LEVELING_LINEAR) \
|
||||
+ ENABLED(AUTO_BED_LEVELING_3POINT) \
|
||||
+ ENABLED(AUTO_BED_LEVELING_BILINEAR) \
|
||||
+ ENABLED(AUTO_BED_LEVELING_UBL) \
|
||||
+ ENABLED(MESH_BED_LEVELING)
|
||||
#if MANY(AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_3POINT, AUTO_BED_LEVELING_BILINEAR, AUTO_BED_LEVELING_UBL, MESH_BED_LEVELING)
|
||||
#error "Select only one of: MESH_BED_LEVELING, AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_3POINT, AUTO_BED_LEVELING_BILINEAR or AUTO_BED_LEVELING_UBL."
|
||||
#endif
|
||||
|
||||
@ -1558,8 +1530,8 @@ static_assert(hbm[Z_AXIS] >= 0, "HOMING_BUMP_MM.Z must be greater than or equal
|
||||
/**
|
||||
* ULTIPANEL encoder
|
||||
*/
|
||||
#if ENABLED(ULTIPANEL) && NONE(NEWPANEL, SR_LCD_2W_NL) && !defined(SHIFT_CLK)
|
||||
#error "ULTIPANEL requires some kind of encoder."
|
||||
#if IS_ULTIPANEL && NONE(IS_NEWPANEL, SR_LCD_2W_NL) && !defined(SHIFT_CLK)
|
||||
#error "ULTIPANEL controllers require some kind of encoder."
|
||||
#endif
|
||||
|
||||
#if ENCODER_PULSES_PER_STEP < 0
|
||||
@ -2237,89 +2209,100 @@ static_assert(hbm[Z_AXIS] >= 0, "HOMING_BUMP_MM.Z must be greater than or equal
|
||||
* Make sure only one display is enabled
|
||||
*/
|
||||
#if 1 < 0 \
|
||||
+ (ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) && DISABLED(IS_RRD_SC)) \
|
||||
+ (ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) && DISABLED(IS_RRD_FG_SC)) \
|
||||
+ (ENABLED(ULTRA_LCD) && DISABLED(IS_ULTRA_LCD)) \
|
||||
+ ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) \
|
||||
+ ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) \
|
||||
+ ENABLED(ULTIPANEL) \
|
||||
+ ENABLED(ULTRA_LCD) \
|
||||
+ (ENABLED(U8GLIB_SSD1306) && DISABLED(IS_U8GLIB_SSD1306)) \
|
||||
+ (ENABLED(MINIPANEL) && NONE(MKS_MINI_12864, ENDER2_STOCKDISPLAY)) \
|
||||
+ (ENABLED(MKS_MINI_12864) && DISABLED(MKS_LCD12864)) \
|
||||
+ (ENABLED(EXTENSIBLE_UI) && DISABLED(IS_EXTUI)) \
|
||||
+ (ENABLED(ULTIPANEL) && DISABLED(IS_ULTIPANEL)) \
|
||||
+ ENABLED(RADDS_DISPLAY) \
|
||||
+ ENABLED(ULTIMAKERCONTROLLER) \
|
||||
+ ENABLED(PANEL_ONE) \
|
||||
+ ENABLED(G3D_PANEL) \
|
||||
+ ENABLED(RIGIDBOT_PANEL) \
|
||||
+ ENABLED(MAKEBOARD_MINI_2_LINE_DISPLAY_1602) \
|
||||
+ ENABLED(ZONESTAR_LCD) \
|
||||
+ ENABLED(RA_CONTROL_PANEL) \
|
||||
+ ENABLED(LCD_SAINSMART_I2C_1602) \
|
||||
+ ENABLED(LCD_SAINSMART_I2C_2004) \
|
||||
+ ENABLED(LCM1602) \
|
||||
+ ENABLED(LCD_I2C_PANELOLU2) \
|
||||
+ ENABLED(LCD_I2C_VIKI) \
|
||||
+ ENABLED(SAV_3DLCD) \
|
||||
+ ENABLED(FF_INTERFACEBOARD) \
|
||||
+ ENABLED(REPRAPWORLD_GRAPHICAL_LCD) \
|
||||
+ ENABLED(VIKI2) \
|
||||
+ ENABLED(miniVIKI) \
|
||||
+ ENABLED(MAKRPANEL) \
|
||||
+ ENABLED(ELB_FULL_GRAPHIC_CONTROLLER) \
|
||||
+ ENABLED(BQ_LCD_SMART_CONTROLLER) \
|
||||
+ ENABLED(CARTESIO_UI) \
|
||||
+ ENABLED(LCD_FOR_MELZI) \
|
||||
+ ENABLED(ULTI_CONTROLLER) \
|
||||
+ ENABLED(MKS_LCD12864) \
|
||||
+ ENABLED(ENDER2_STOCKDISPLAY) \
|
||||
+ ENABLED(FYSETC_MINI_12864_X_X) \
|
||||
+ ENABLED(FYSETC_MINI_12864_1_2) \
|
||||
+ ENABLED(FYSETC_MINI_12864_2_0) \
|
||||
+ ENABLED(FYSETC_MINI_12864_2_1) \
|
||||
+ ENABLED(FYSETC_GENERIC_12864_1_1) \
|
||||
+ ENABLED(CR10_STOCKDISPLAY) \
|
||||
+ ENABLED(DWIN_CREALITY_LCD) \
|
||||
+ (DISABLED(IS_LEGACY_TFT) && ENABLED(TFT_GENERIC)) \
|
||||
+ (ENABLED(IS_LEGACY_TFT) && COUNT_ENABLED(TFT_320x240, TFT_320x240_SPI, TFT_480x320, TFT_480x320_SPI)) \
|
||||
+ COUNT_ENABLED(ANYCUBIC_LCD_I3MEGA, ANYCUBIC_LCD_CHIRON, ANYCUBIC_TFT35) \
|
||||
+ COUNT_ENABLED(DGUS_LCD_UI_ORIGIN, DGUS_LCD_UI_FYSETC, DGUS_LCD_UI_HIPRECY) \
|
||||
+ COUNT_ENABLED(ENDER2_STOCKDISPLAY, CR10_STOCKDISPLAY, DWIN_CREALITY_LCD) \
|
||||
+ COUNT_ENABLED(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) \
|
||||
+ COUNT_ENABLED(LCD_SAINSMART_I2C_1602, LCD_SAINSMART_I2C_2004) \
|
||||
+ COUNT_ENABLED(MKS_12864OLED, MKS_12864OLED_SSD1306) \
|
||||
+ COUNT_ENABLED(MKS_TS35_V2_0, MKS_ROBIN_TFT24, MKS_ROBIN_TFT28, MKS_ROBIN_TFT32, MKS_ROBIN_TFT35, MKS_ROBIN_TFT43, MKS_ROBIN_TFT_V1_1R) \
|
||||
+ COUNT_ENABLED(TFTGLCD_PANEL_SPI, TFTGLCD_PANEL_I2C) \
|
||||
+ COUNT_ENABLED(VIKI2, miniVIKI) \
|
||||
+ COUNT_ENABLED(ZONESTAR_12864LCD, ZONESTAR_12864OLED, ZONESTAR_12864OLED_SSD1306) \
|
||||
+ ENABLED(ANET_FULL_GRAPHICS_LCD) \
|
||||
+ ENABLED(AZSMZ_12864) \
|
||||
+ ENABLED(SILVER_GATE_GLCD_CONTROLLER) \
|
||||
+ ENABLED(SAV_3DGLCD) \
|
||||
+ ENABLED(OLED_PANEL_TINYBOY2) \
|
||||
+ ENABLED(MKS_12864OLED) \
|
||||
+ ENABLED(MKS_12864OLED_SSD1306) \
|
||||
+ ENABLED(ZONESTAR_12864LCD) \
|
||||
+ ENABLED(ZONESTAR_12864OLED) \
|
||||
+ ENABLED(ZONESTAR_12864OLED_SSD1306) \
|
||||
+ ENABLED(U8GLIB_SH1106_EINSTART) \
|
||||
+ ENABLED(OVERLORD_OLED) \
|
||||
+ ENABLED(BQ_LCD_SMART_CONTROLLER) \
|
||||
+ ENABLED(CARTESIO_UI) \
|
||||
+ ENABLED(ELB_FULL_GRAPHIC_CONTROLLER) \
|
||||
+ ENABLED(FF_INTERFACEBOARD) \
|
||||
+ ENABLED(FYSETC_242_OLED_12864) \
|
||||
+ ENABLED(DGUS_LCD_UI_ORIGIN) \
|
||||
+ ENABLED(DGUS_LCD_UI_FYSETC) \
|
||||
+ ENABLED(DGUS_LCD_UI_HIPRECY) \
|
||||
+ ENABLED(G3D_PANEL) \
|
||||
+ ENABLED(LCD_FOR_MELZI) \
|
||||
+ ENABLED(LCD_I2C_PANELOLU2) \
|
||||
+ ENABLED(LCD_I2C_VIKI) \
|
||||
+ ENABLED(LCM1602) \
|
||||
+ ENABLED(LONGER_LK_TFT28) \
|
||||
+ ENABLED(MAKEBOARD_MINI_2_LINE_DISPLAY_1602) \
|
||||
+ ENABLED(MAKRPANEL) \
|
||||
+ ENABLED(MALYAN_LCD) \
|
||||
+ ENABLED(MKS_LCD12864) \
|
||||
+ ENABLED(OLED_PANEL_TINYBOY2) \
|
||||
+ ENABLED(OVERLORD_OLED) \
|
||||
+ ENABLED(PANEL_ONE) \
|
||||
+ ENABLED(RA_CONTROL_PANEL) \
|
||||
+ ENABLED(RADDS_DISPLAY) \
|
||||
+ ENABLED(REPRAPWORLD_GRAPHICAL_LCD) \
|
||||
+ ENABLED(RIGIDBOT_PANEL) \
|
||||
+ ENABLED(SAV_3DGLCD) \
|
||||
+ ENABLED(SAV_3DLCD) \
|
||||
+ ENABLED(SILVER_GATE_GLCD_CONTROLLER) \
|
||||
+ ENABLED(TFT_TRONXY_X5SA) \
|
||||
+ ENABLED(TOUCH_UI_FTDI_EVE) \
|
||||
+ ENABLED(TFT_320x240) \
|
||||
+ ENABLED(TFT_320x240_SPI) \
|
||||
+ ENABLED(FSMC_GRAPHICAL_TFT) \
|
||||
+ ENABLED(TFT_LVGL_UI_FSMC) \
|
||||
+ ENABLED(TFT_LVGL_UI_SPI) \
|
||||
+ ENABLED(ANYCUBIC_LCD_I3MEGA) \
|
||||
+ ENABLED(ANYCUBIC_LCD_CHIRON) \
|
||||
+ ENABLED(TFTGLCD_PANEL_SPI) \
|
||||
+ ENABLED(TFTGLCD_PANEL_I2C)
|
||||
+ ENABLED(U8GLIB_SH1106_EINSTART) \
|
||||
+ ENABLED(ULTI_CONTROLLER) \
|
||||
+ ENABLED(ULTIMAKERCONTROLLER) \
|
||||
+ ENABLED(ZONESTAR_LCD)
|
||||
#error "Please select only one LCD controller option."
|
||||
#endif
|
||||
|
||||
#undef IS_RRD_SC
|
||||
#undef IS_RRD_FG_SC
|
||||
#undef IS_ULTRA_LCD
|
||||
#undef IS_U8GLIB_SSD1306
|
||||
#undef IS_RRW_KEYPAD
|
||||
#undef IS_EXTUI
|
||||
#undef IS_ULTIPANEL
|
||||
#undef IS_LEGACY_TFT
|
||||
|
||||
#if 1 < ENABLED(LCD_SCREEN_ROT_0) + ENABLED(LCD_SCREEN_ROT_90) + ENABLED(LCD_SCREEN_ROT_180) + ENABLED(LCD_SCREEN_ROT_270)
|
||||
#if ANY(TFT_GENERIC, MKS_TS35_V2_0, MKS_ROBIN_TFT24, MKS_ROBIN_TFT28, MKS_ROBIN_TFT32, MKS_ROBIN_TFT35, MKS_ROBIN_TFT43, MKS_ROBIN_TFT_V1_1R, TFT_TRONXY_X5SA, ANYCUBIC_TFT35, ANYCUBIC_TFT35, LONGER_LK_TFT28)
|
||||
#if NONE(TFT_COLOR_UI, TFT_CLASSIC_UI, TFT_LVGL_UI)
|
||||
#error "TFT_COLOR_UI, TFT_CLASSIC_UI, TFT_LVGL_UI is required for your TFT. Please enable one."
|
||||
#elif 1 < ENABLED(TFT_COLOR_UI) + ENABLED(TFT_CLASSIC_UI) + ENABLED(TFT_LVGL_UI)
|
||||
#error "Please select only one of TFT_COLOR_UI, TFT_CLASSIC_UI, or TFT_LVGL_UI."
|
||||
#endif
|
||||
#elif ANY(TFT_COLOR_UI, TFT_CLASSIC_UI, TFT_LVGL_UI)
|
||||
#error "TFT_(COLOR|CLASSIC|LVGL)_UI requires a TFT display to be enabled."
|
||||
#endif
|
||||
|
||||
#if ENABLED(TFT_GENERIC) && NONE(TFT_INTERFACE_FSMC, TFT_INTERFACE_SPI)
|
||||
#error "TFT_GENERIC requires either TFT_INTERFACE_FSMC or TFT_INTERFACE_SPI interface."
|
||||
#endif
|
||||
|
||||
#if BOTH(TFT_INTERFACE_FSMC, TFT_INTERFACE_SPI)
|
||||
#error "Please enable only one of TFT_INTERFACE_SPI or TFT_INTERFACE_SPI."
|
||||
#endif
|
||||
|
||||
#if MANY(LCD_SCREEN_ROT_0, LCD_SCREEN_ROT_90, LCD_SCREEN_ROT_180, LCD_SCREEN_ROT_270)
|
||||
#error "Please enable only one LCD_SCREEN_ROT_* option: 0, 90, 180, or 270."
|
||||
#endif
|
||||
|
||||
#if MANY(TFT_RES_320x240, TFT_RES_480x272, TFT_RES_480x320)
|
||||
#error "Please select only one of TFT_RES_480x320, TFT_RES_480x320, or TFT_RES_480x272."
|
||||
#endif
|
||||
|
||||
#if HAS_TFT_LVGL_UI && DISABLED(TFT_RES_480x320)
|
||||
#error "(FMSC|SPI)TFT_LVGL_UI requires TFT_RES_480x320."
|
||||
#endif
|
||||
|
||||
#if defined(GRAPHICAL_TFT_UPSCALE) && !WITHIN(GRAPHICAL_TFT_UPSCALE, 2, 3)
|
||||
#error "GRAPHICAL_TFT_UPSCALE must be set to 2 or 3."
|
||||
#endif
|
||||
|
||||
/**
|
||||
* Serial displays require a dedicated serial port
|
||||
*/
|
||||
@ -2756,7 +2739,7 @@ static_assert( _ARR_TEST(3,0) && _ARR_TEST(3,1) && _ARR_TEST(3,2)
|
||||
#error "BLOCK_BUFFER_SIZE must be a power of 2."
|
||||
#endif
|
||||
|
||||
#if ENABLED(LED_CONTROL_MENU) && DISABLED(ULTIPANEL)
|
||||
#if ENABLED(LED_CONTROL_MENU) && !IS_ULTIPANEL
|
||||
#error "LED_CONTROL_MENU requires an LCD controller."
|
||||
#endif
|
||||
|
||||
|
||||
@ -52,7 +52,7 @@
|
||||
* to alert users to major changes.
|
||||
*/
|
||||
|
||||
#define MARLIN_HEX_VERSION 020007
|
||||
#define MARLIN_HEX_VERSION 020008
|
||||
#ifndef REQUIRED_CONFIGURATION_H_VERSION
|
||||
#define REQUIRED_CONFIGURATION_H_VERSION MARLIN_HEX_VERSION
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user