Update broken TFT Configurations (#288)

This commit is contained in:
Jason Smith 2020-11-02 18:31:38 -08:00 committed by GitHub
parent 6f2ac1a555
commit 2db44102bb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 25 deletions

View file

@ -111,7 +111,6 @@
* :[-2, -1, 0, 1, 2, 3, 4, 5, 6, 7] * :[-2, -1, 0, 1, 2, 3, 4, 5, 6, 7]
*/ */
#define SERIAL_PORT_2 3 #define SERIAL_PORT_2 3
#define NUM_SERIAL 2
/** /**
* This setting determines the communication speed of the printer. * This setting determines the communication speed of the printer.
@ -788,7 +787,6 @@
//============================================================================= //=============================================================================
// @section motion // @section motion
// delta speeds must be the same on xyz
/** /**
* Default Settings * Default Settings
* *
@ -2369,7 +2367,7 @@
// //
// 480x320, 3.5", FSMC Stock Display from AnyCubic // 480x320, 3.5", FSMC Stock Display from AnyCubic
// //
//#define ANYCUBIC_TFT35 #define ANYCUBIC_TFT35
// //
// 320x240, 2.8", FSMC Stock Display from Longer/Alfawise // 320x240, 2.8", FSMC Stock Display from Longer/Alfawise
@ -2379,17 +2377,17 @@
// //
// Generic TFT with detailed options // Generic TFT with detailed options
// //
#define TFT_GENERIC //#define TFT_GENERIC
#if ENABLED(TFT_GENERIC) #if ENABLED(TFT_GENERIC)
// :[ 'AUTO', 'ST7735', 'ST7789', 'ST7796', 'R61505', 'ILI9328', 'ILI9341', 'ILI9488' ] // :[ 'AUTO', 'ST7735', 'ST7789', 'ST7796', 'R61505', 'ILI9328', 'ILI9341', 'ILI9488' ]
#define TFT_DRIVER AUTO #define TFT_DRIVER AUTO
// Interface. Enable one of the following options: // Interface. Enable one of the following options:
#define TFT_INTERFACE_FSMC //#define TFT_INTERFACE_FSMC
//#define TFT_INTERFACE_SPI //#define TFT_INTERFACE_SPI
// TFT Resolution. Enable one of the following options: // TFT Resolution. Enable one of the following options:
#define TFT_RES_320x240 //#define TFT_RES_320x240
//#define TFT_RES_480x272 //#define TFT_RES_480x272
//#define TFT_RES_480x320 //#define TFT_RES_480x320
#endif #endif

View file

@ -1571,23 +1571,12 @@
// Classic UI Options // Classic UI Options
// //
#if TFT_SCALED_DOGLCD #if TFT_SCALED_DOGLCD
// //#define TFT_MARLINUI_COLOR 0xFFFF // White
// FSMC_UPSCALE 2 2x upscaler for 320x240 displays (default) //#define TFT_MARLINBG_COLOR 0x0000 // Black
// FSMC_UPSCALE 3 3x upscaler for 480x320 displays //#define TFT_DISABLED_COLOR 0x0003 // Almost black
// //#define TFT_BTCANCEL_COLOR 0xF800 // Red
#define FSMC_UPSCALE 3 //#define TFT_BTARROWS_COLOR 0xDEE6 // 11011 110111 00110 Yellow
//#define TFT_BTOKMENU_COLOR 0x145F // 00010 100010 11111 Cyan
//
// Change colors
// some colors are predefined, see /src/lcd/dogm/u8g_dev_tft_480~.cpp Line 160
// or use 16bit color (e.g. 0x0000 = black, 0xFFE0 = yellow)
// see https://ee-programming-notepad.blogspot.com/2016/10/16-bit-color-generator-picker.html
//
#define TFT_MARLINUI_COLOR COLOR_WHITE // Main foreground color
#define TFT_MARLINBG_COLOR COLOR_BLACK // Background color
#define TFT_BTCANCEL_COLOR COLOR_RED // Cancel button
#define TFT_BTARROWS_COLOR COLOR_WHITE // Arrows up/down
#define TFT_BTOKMENU_COLOR COLOR_NAVY // Enter button
#endif #endif
// //

View file

@ -2399,9 +2399,9 @@
* For LVGL_UI also copy the 'assets' folder from the build directory to the * For LVGL_UI also copy the 'assets' folder from the build directory to the
* root of your SD card, together with the compiled firmware. * root of your SD card, together with the compiled firmware.
*/ */
//#define TFT_CLASSIC_UI #define TFT_CLASSIC_UI
//#define TFT_COLOR_UI //#define TFT_COLOR_UI
#define TFT_LVGL_UI //#define TFT_LVGL_UI
/** /**
* TFT Rotation. Set to one of the following values: * TFT Rotation. Set to one of the following values: