Fri 11 Oct 2019 06:59:27 EDT

Author: 32teeth

Components/super-go-play/odroid-go-common/components/odroid/odroid_display.c

@@ -96,7 +96,10 @@ DRAM_ATTR static const ili_init_cmd_t ili_sleep_cmds[] = {
 };
 
 
-// 2.4" LCD
+/*
+ CONFIG_LCD_DRIVER_CHIP_ODROID_GO
+*/
+#ifdef CONFIG_LCD_DRIVER_CHIP_ODROID_GO
 DRAM_ATTR static const ili_init_cmd_t ili_init_cmds[] = {
     // VCI=2.8V
     //************* Start Initial Sequence **********//
@@ -114,7 +117,7 @@ DRAM_ATTR static const ili_init_cmd_t ili_init_cmds[] = {
     //{0x36, {(MADCTL_MV | MADCTL_MX | TFT_RGB_BGR)}, 1},    // Memory Access Control
     {0x36, {(MADCTL_MV | MADCTL_MY | TFT_RGB_BGR)}, 1},    // Memory Access Control
     {0x3A, {0x55}, 1},
-    {0xB1, {0x00, 0x10}, 2},  // Frame Rate Control (1B=70, 1F=61, 10=119)
+    {0xB1, {0x00, 0x1B}, 2},  // Frame Rate Control (1B=70, 1F=61, 10=119)
     {0xB6, {0x0A, 0xA2}, 2},    // Display Function Control
     {0xF6, {0x01, 0x30}, 2},
     {0xF2, {0x00}, 1},    // 3Gamma Function Disable
@@ -124,23 +127,50 @@ DRAM_ATTR static const ili_init_cmd_t ili_init_cmds[] = {
     {0xE0, {0x0F, 0x31, 0x2B, 0x0C, 0x0E, 0x08, 0x4E, 0xF1, 0x37, 0x07, 0x10, 0x03, 0x0E, 0x09, 0x00}, 15},
     {0XE1, {0x00, 0x0E, 0x14, 0x03, 0x11, 0x07, 0x31, 0xC1, 0x48, 0x08, 0x0F, 0x0C, 0x31, 0x36, 0x0F}, 15},
 
+    {0x11, {0}, 0x80},    //Exit Sleep
+    {0x29, {0}, 0x80},    //Display on
+
+    {0, {0}, 0xff}
+};
+#endif
 /*
-    // LUT
-    {0x2d, {0x01, 0x03, 0x05, 0x07, 0x09, 0x0b, 0x0d, 0x0f, 0x11, 0x13, 0x15, 0x17, 0x19, 0x1b, 0x1d, 0x1f,
-            0x21, 0x23, 0x25, 0x27, 0x29, 0x2b, 0x2d, 0x2f, 0x31, 0x33, 0x35, 0x37, 0x39, 0x3b, 0x3d, 0x3f,
-            0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x09, 0x0a, 0x0b, 0x0c, 0x0d,
-            0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c,
-            0x1d, 0x1d, 0x1e, 0x1f, 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x26, 0x27, 0x28, 0x29, 0x2a,
-            0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 0x30, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39,
-            0x00, 0x00, 0x02, 0x04, 0x06, 0x08, 0x0a, 0x0c, 0x0e, 0x10, 0x12, 0x12, 0x14, 0x16, 0x18, 0x1a,
-            0x1c, 0x1e, 0x20, 0x22, 0x24, 0x26, 0x26, 0x28, 0x2a, 0x2c, 0x2e, 0x30, 0x32, 0x34, 0x36, 0x38}, 128},
+ CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32
 */
+#ifdef CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32
+DRAM_ATTR static const ili_init_cmd_t ili_init_cmds[] = {
+    // VCI=2.8V
+    //************* Start Initial Sequence **********//
+    {TFT_CMD_SWRESET, {0}, 0x80},
+    {0xCF, {0x00, 0xc3, 0x30}, 3},
+    {0xED, {0x64, 0x03, 0x12, 0x81}, 4},
+    {0xE8, {0x85, 0x00, 0x78}, 3},
+    {0xCB, {0x39, 0x2c, 0x00, 0x34, 0x02}, 5},
+    {0xF7, {0x20}, 1},
+    {0xEA, {0x00, 0x00}, 2},
+    {0xC0, {0x1B}, 1},    //Power control   //VRH[5:0]
+    {0xC1, {0x12}, 1},    //Power control   //SAP[2:0];BT[3:0]
+    {0xC5, {0x32, 0x3C}, 2},    //VCM control
+    {0x36, {(MADCTL_MV | MADCTL_MY | TFT_RGB_BGR)}, 1},    // Memory Access Control
+    {0x3A, {0x55}, 1},
+    {0xB1, {0x00, 0x1B}, 2},  // Frame Rate Control (1B=70, 1F=61, 10=119)
+    {0xB6, {0x0A, 0xA2}, 2},    // Display Function Control
+    {0xF6, {0x01, 0x30}, 2},
+    {0xF2, {0x00}, 1},    // 3Gamma Function Disable
+    {0x26, {0x01}, 1},     //Gamma curve selected
+
+    //Set Gamma
+    {0xE0, {0x0F, 0x31, 0x2B, 0x0C, 0x0E, 0x08, 0x4E, 0xF1, 0x37, 0x07, 0x10, 0x03, 0x0E, 0x09, 0x00}, 15},
+    {0XE1, {0x00, 0x0E, 0x14, 0x03, 0x11, 0x07, 0x31, 0xC1, 0x48, 0x08, 0x0F, 0x0C, 0x31, 0x36, 0x0F}, 15},
+    
+    // ILI9342 Specific
+    {0x36, {0x40|0x80|0x08}, 1}, // <-- ROTATE
+    {0x21, {0}, 0x80}, // <-- INVERT COLORS
 
     {0x11, {0}, 0x80},    //Exit Sleep
     {0x29, {0}, 0x80},    //Display on
-
     {0, {0}, 0xff}
 };
+#endif
 
 static inline uint16_t* line_buffer_get()
 {