zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

TFT: Restore ILI9341 colors and reversed logic (#19010)

Browse source 
Followup to #18877, #18901, #18817
This commit is contained in:
Tanguy Pruvot 2020-08-14 05:32:01 +02:00 committed by Scott Lahteine
parent 4e7c5f19fe
commit dc6e3d083e
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Marlin/src/lcd/dogm/u8g_dev_tft_320x240_upscale_from_128x64.cpp
View file

@ -366,7 +366,7 @@ static const uint16_t ili9328_init[] = {
static const uint16_t ili9341_init[] = { static const uint16_t ili9341_init[] = {
ESC_REG(0x0010), ESC_DELAY(10), ESC_REG(0x0010), ESC_DELAY(10),
ESC_REG(0x0001), ESC_DELAY(200), ESC_REG(0x0001), ESC_DELAY(200),
ESC_REG(0x0036), TERN(GRAPHICAL_TFT_ROTATE_180, 0x00E8, 0x0028), ESC_REG(0x0036), TERN(GRAPHICAL_TFT_ROTATE_180, 0x0028, 0x00E8),
ESC_REG(0x003A), 0x0055, ESC_REG(0x003A), 0x0055,
ESC_REG(0x002A), 0x0000, 0x0000, 0x0001, 0x003F, ESC_REG(0x002A), 0x0000, 0x0000, 0x0001, 0x003F,
ESC_REG(0x002B), 0x0000, 0x0000, 0x0000, 0x00EF, ESC_REG(0x002B), 0x0000, 0x0000, 0x0000, 0x00EF,
@ -658,6 +658,9 @@ uint8_t u8g_dev_tft_320x240_upscale_from_128x64_fn(u8g_t *u8g, u8g_dev_t *dev, u
setWindow = setWindow_ili9328; setWindow = setWindow_ili9328;
break; break;
case 0x9341: // ILI9341 case 0x9341: // ILI9341
WRITE_ESC_SEQUENCE(ili9341_init);
setWindow = setWindow_st7789v;
break;
case 0x8066: // Anycubic / TronXY TFTs (480x320) case 0x8066: // Anycubic / TronXY TFTs (480x320)
WRITE_ESC_SEQUENCE(ili9488_init); WRITE_ESC_SEQUENCE(ili9488_init);
setWindow = setWindow_st7789v; setWindow = setWindow_st7789v;

6
Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
View file

@ -130,6 +130,12 @@
#define DOGLCD_MOSI -1 // Prevent auto-define by Conditionals_post.h #define DOGLCD_MOSI -1 // Prevent auto-define by Conditionals_post.h
#define DOGLCD_SCK -1 #define DOGLCD_SCK -1
#define FSMC_UPSCALE 2
#define LCD_FULL_PIXEL_WIDTH 320
#define LCD_FULL_PIXEL_HEIGHT 240
#define LCD_PIXEL_OFFSET_X 32
#define LCD_PIXEL_OFFSET_Y 32
/** /**
* Note: Alfawise U20/U30 boards DON'T use SPI2, as the hardware designer * Note: Alfawise U20/U30 boards DON'T use SPI2, as the hardware designer
* mixed up MOSI and MISO pins. SPI is managed in SW, and needs pins * mixed up MOSI and MISO pins. SPI is managed in SW, and needs pins