From 1a6bf4bcd71f3a0aeb7b08cc9072bf00d5e0c408 Mon Sep 17 00:00:00 2001 From: prenticedavid Date: Fri, 20 Aug 2021 21:02:46 +0100 Subject: [PATCH] Revert "add conditonal 8BIT vs 16BIT" This reverts commit 239517d5ee1138e49e4c39c4aec7d352dbe0ed25. --- MCUFRIEND_kbv.cpp | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/MCUFRIEND_kbv.cpp b/MCUFRIEND_kbv.cpp index 6282468..0c8603f 100644 --- a/MCUFRIEND_kbv.cpp +++ b/MCUFRIEND_kbv.cpp @@ -1271,21 +1271,16 @@ void MCUFRIEND_kbv::begin(uint16_t ID) break; #endif -#if defined(SUPPORT_1963) +#if defined(SUPPORT_1963) && USING_16BIT_BUS case 0x1963: _lcd_capable = AUTO_READINC | MIPI_DCS_REV1 | READ_NODUMMY | INVERT_SS | INVERT_RGB; -#if USING_16BIT_BUS -#define SSD1963_PIXDATA 0x03 -#else -#define SSD1963_PIXDATA 0x00 -#endif - // from NHD 5.0" 8-bit + // from NHD 5.0" 8-bit static const uint8_t SSD1963_NHD_50_regValues[] PROGMEM = { (0xE0), 1, 0x01, // PLL enable TFTLCD_DELAY8, 10, (0xE0), 1, 0x03, // Lock PLL - (0xB0), 7, 0x24, 0x80, 0x03, 0x1F, 0x01, 0xDF, 0x00, //LCD SPECIFICATION was 0x08 - (0xF0), 1, SSD1963_PIXDATA, //was 00 pixel data interface + (0xB0), 7, 0x08, 0x80, 0x03, 0x1F, 0x01, 0xDF, 0x00, //LCD SPECIFICATION + (0xF0), 1, 0x03, //was 00 pixel data interface // (0x3A), 1, 0x60, // SET R G B format = 6 6 6 (0xE2), 3, 0x1D, 0x02, 0x54, //PLL multiplier, set PLL clock to 120M (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 0x01, 0, //Soft Reset TFTLCD_DELAY8, 120, - (0xB0), 7, 0x24, 0x80, 0x03, 0x1F, 0x01, 0xDF, 0x00, //LCD SPECIFICATION was 0x08 - (0xF0), 1, SSD1963_PIXDATA, //was 00 pixel data interface + (0xB0), 7, 0x08, 0x80, 0x03, 0x1F, 0x01, 0xDF, 0x00, //LCD SPECIFICATION + (0xF0), 1, 0x03, //was 00 pixel data interface // (0x3A), 1, 0x60, // SET R G B format = 6 6 6 (0xE6), 3, 0x0F, 0xFF, 0xFF, //PLL setting for PCLK, depends on resolution (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 (0xBA), 1, 0x0F, //GPIO[3:0] out 1 (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, 0x28, 0, //Display Off 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 (0xBA), 1, 0x0F, //GPIO[3:0] out 1 (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, 0x28, 0, //Display Off 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 (0xBA), 1, 0x0F, //GPIO[3:0] out 1 (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, 0x28, 0, //Display Off 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 (0xBA), 1, 0x0F, //GPIO[3:0] out 1 (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, 0x28, 0, //Display Off 0x11, 0, //Sleep Out