yuzu/MCUFRIEND_kbv
1
0
Fork 0
mirror of https://github.com/YuzuZensai/MCUFRIEND_kbv.git synced 2026-01-31 14:57:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "add conditonal 8BIT vs 16BIT"

Browse Source 
This reverts commit 239517d5ee.
This commit is contained in:
prenticedavid
2021-08-20 21:02:46 +01:00
parent 239517d5ee
commit 1a6bf4bcd7
1 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
MCUFRIEND_kbv.cpp
View File

@@ -1271,21 +1271,16 @@ void MCUFRIEND_kbv::begin(uint16_t ID)
break; break;
#endif #endif
#if defined(SUPPORT_1963) #if defined(SUPPORT_1963) && USING_16BIT_BUS
case 0x1963: case 0x1963:
_lcd_capable = AUTO_READINC | MIPI_DCS_REV1 | READ_NODUMMY | INVERT_SS | INVERT_RGB; _lcd_capable = AUTO_READINC | MIPI_DCS_REV1 | READ_NODUMMY | INVERT_SS | INVERT_RGB;
#if USING_16BIT_BUS // from NHD 5.0" 8-bit
#define SSD1963_PIXDATA 0x03
#else
#define SSD1963_PIXDATA 0x00
#endif
// from NHD 5.0" 8-bit
static const uint8_t SSD1963_NHD_50_regValues[] PROGMEM = { static const uint8_t SSD1963_NHD_50_regValues[] PROGMEM = {
(0xE0), 1, 0x01, // PLL enable (0xE0), 1, 0x01, // PLL enable
TFTLCD_DELAY8, 10, TFTLCD_DELAY8, 10,
(0xE0), 1, 0x03, // Lock PLL (0xE0), 1, 0x03, // Lock PLL
(0xB0), 7, 0x24, 0x80, 0x03, 0x1F, 0x01, 0xDF, 0x00, //LCD SPECIFICATION was 0x08 (0xB0), 7, 0x08, 0x80, 0x03, 0x1F, 0x01, 0xDF, 0x00, //LCD SPECIFICATION
(0xF0), 1, SSD1963_PIXDATA, //was 00 pixel data interface (0xF0), 1, 0x03, //was 00 pixel data interface
// (0x3A), 1, 0x60, // SET R G B format = 6 6 6 // (0x3A), 1, 0x60, // SET R G B format = 6 6 6
(0xE2), 3, 0x1D, 0x02, 0x54, //PLL multiplier, set PLL clock to 120M (0xE2), 3, 0x1D, 0x02, 0x54, //PLL multiplier, set PLL clock to 120M
(0xE6), 3, 0x02, 0xFF, 0xFF, //PLL setting for PCLK, depends on resolution (0xE6), 3, 0x02, 0xFF, 0xFF, //PLL setting for PCLK, depends on resolution
@@ -1302,8 +1297,8 @@ void MCUFRIEND_kbv::begin(uint16_t ID)
(0xE0), 1, 0x03, // Lock PLL (0xE0), 1, 0x03, // Lock PLL
0x01, 0, //Soft Reset 0x01, 0, //Soft Reset
TFTLCD_DELAY8, 120, TFTLCD_DELAY8, 120,
(0xB0), 7, 0x24, 0x80, 0x03, 0x1F, 0x01, 0xDF, 0x00, //LCD SPECIFICATION was 0x08 (0xB0), 7, 0x08, 0x80, 0x03, 0x1F, 0x01, 0xDF, 0x00, //LCD SPECIFICATION
(0xF0), 1, SSD1963_PIXDATA, //was 00 pixel data interface (0xF0), 1, 0x03, //was 00 pixel data interface
// (0x3A), 1, 0x60, // SET R G B format = 6 6 6 // (0x3A), 1, 0x60, // SET R G B format = 6 6 6
(0xE6), 3, 0x0F, 0xFF, 0xFF, //PLL setting for PCLK, depends on resolution (0xE6), 3, 0x0F, 0xFF, 0xFF, //PLL setting for PCLK, depends on resolution
(0xB4), 8, 0x04, 0x20, 0x00, 0x58, 0x80, 0x00, 0x00, 0x00, //HSYNC (0xB4), 8, 0x04, 0x20, 0x00, 0x58, 0x80, 0x00, 0x00, 0x00, //HSYNC
@@ -1327,7 +1322,7 @@ void MCUFRIEND_kbv::begin(uint16_t ID)
(0xB6), 7, 0x02, 0x0D, 0x00, 0x10, 0x10, 0x00, 0x08, //VSYNC (0xB6), 7, 0x02, 0x0D, 0x00, 0x10, 0x10, 0x00, 0x08, //VSYNC
(0xBA), 1, 0x0F, //GPIO[3:0] out 1 (0xBA), 1, 0x0F, //GPIO[3:0] out 1
(0xB8), 2, 0x07, 0x01, //GPIO3=input, GPIO[2:0]=output (0xB8), 2, 0x07, 0x01, //GPIO3=input, GPIO[2:0]=output
(0xF0), 1, SSD1963_PIXDATA, //pixel data interface (0xF0), 1, 0x03, //pixel data interface
TFTLCD_DELAY8, 1, TFTLCD_DELAY8, 1,
0x28, 0, //Display Off 0x28, 0, //Display Off
0x11, 0, //Sleep Out 0x11, 0, //Sleep Out
@@ -1351,7 +1346,7 @@ void MCUFRIEND_kbv::begin(uint16_t ID)
(0xB6), 7, 0x02, 0x0D, 0x00, 0x10, 0x10, 0x00, 0x08, //VSYNC VT=525, VPS=16, VPW=16, FPS=8 (0xB6), 7, 0x02, 0x0D, 0x00, 0x10, 0x10, 0x00, 0x08, //VSYNC VT=525, VPS=16, VPW=16, FPS=8
(0xBA), 1, 0x0F, //GPIO[3:0] out 1 (0xBA), 1, 0x0F, //GPIO[3:0] out 1
(0xB8), 2, 0x07, 0x01, //GPIO3=input, GPIO[2:0]=output (0xB8), 2, 0x07, 0x01, //GPIO3=input, GPIO[2:0]=output
(0xF0), 1, SSD1963_PIXDATA, //pixel data interface (0xF0), 1, 0x03, //pixel data interface
TFTLCD_DELAY8, 1, TFTLCD_DELAY8, 1,
0x28, 0, //Display Off 0x28, 0, //Display Off
0x11, 0, //Sleep Out 0x11, 0, //Sleep Out
@@ -1375,7 +1370,7 @@ void MCUFRIEND_kbv::begin(uint16_t ID)
(0xB6), 7, 0x02, 0x0D, 0x00, 0x10, 0x10, 0x00, 0x08, //VSYNC VT=525, VPS=16, VPW=16, FPS=8 (0xB6), 7, 0x02, 0x0D, 0x00, 0x10, 0x10, 0x00, 0x08, //VSYNC VT=525, VPS=16, VPW=16, FPS=8
(0xBA), 1, 0x0F, //GPIO[3:0] out 1 (0xBA), 1, 0x0F, //GPIO[3:0] out 1
(0xB8), 2, 0x07, 0x01, //GPIO3=input, GPIO[2:0]=output (0xB8), 2, 0x07, 0x01, //GPIO3=input, GPIO[2:0]=output
(0xF0), 1, SSD1963_PIXDATA, //pixel data interface (0xF0), 1, 0x03, //pixel data interface
TFTLCD_DELAY8, 1, TFTLCD_DELAY8, 1,
0x28, 0, //Display Off 0x28, 0, //Display Off
0x11, 0, //Sleep Out 0x11, 0, //Sleep Out
@@ -1399,7 +1394,7 @@ void MCUFRIEND_kbv::begin(uint16_t ID)
(0xB6), 7, 0x01, 0x20, 0x00, 0x04, 0x0C, 0x00, 0x02, //VSYNC (0xB6), 7, 0x01, 0x20, 0x00, 0x04, 0x0C, 0x00, 0x02, //VSYNC
(0xBA), 1, 0x0F, //GPIO[3:0] out 1 (0xBA), 1, 0x0F, //GPIO[3:0] out 1
(0xB8), 2, 0x07, 0x01, //GPIO3=input, GPIO[2:0]=output (0xB8), 2, 0x07, 0x01, //GPIO3=input, GPIO[2:0]=output
(0xF0), 1, SSD1963_PIXDATA, //pixel data interface (0xF0), 1, 0x03, //pixel data interface
TFTLCD_DELAY8, 1, TFTLCD_DELAY8, 1,
0x28, 0, //Display Off 0x28, 0, //Display Off
0x11, 0, //Sleep Out 0x11, 0, //Sleep Out