ili9341 wrover4 display orientation added

lvgl · Mar 27, 2020 · 42c2fd2 · 42c2fd2
1 parent 900c1d1
commit 42c2fd2
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 5 deletions.
diff --git a/components/lvgl_esp32_drivers/lvgl_tft/Kconfig b/components/lvgl_esp32_drivers/lvgl_tft/Kconfig
@@ -16,6 +16,7 @@ menu "LittlevGL (LVGL) TFT Display controller"
         config LVGL_PREDEFINED_DISPLAY_NONE
             bool "None"
         config LVGL_PREDEFINED_DISPLAY_WROVER4
+	    select LVGL_DISPLAY_ORIENTATION_LANDSCAPE
             bool "ESP-Wrover-KIT v4.1"
         config LVGL_PREDEFINED_DISPLAY_M5STACK
 	    select LVGL_DISPLAY_ORIENTATION_LANDSCAPE
@@ -98,6 +99,10 @@ menu "LittlevGL (LVGL) TFT Display controller"
         int "TFT display width in pixels." if LVGL_PREDEFINED_DISPLAY_NONE
         default 240 if LVGL_PREDEFINED_DISPLAY_M5STACK && LVGL_DISPLAY_ORIENTATION_PORTRAIT
         default 320 if LVGL_PREDEFINED_DISPLAY_M5STACK && LVGL_DISPLAY_ORIENTATION_LANDSCAPE
+
+        default 240 if LVGL_PREDEFINED_DISPLAY_WROVER4 && LVGL_DISPLAY_ORIENTATION_PORTRAIT
+	default 320 if LVGL_PREDEFINED_DISPLAY_WROVER4 && LVGL_DISPLAY_ORIENTATION_LANDSCAPE
+
 	default 480 if LVGL_PREDEFINED_DISPLAY_ERTFT0356
 	default 480 if LVGL_PREDEFINED_DISPLAY_ADA_FEATHERWING
 	default 320
@@ -106,6 +111,10 @@ menu "LittlevGL (LVGL) TFT Display controller"
         int "TFT display height in pixels." if LVGL_PREDEFINED_DISPLAY_NONE
         default 320 if LVGL_PREDEFINED_DISPLAY_M5STACK && LVGL_DISPLAY_ORIENTATION_PORTRAIT
         default 240 if LVGL_PREDEFINED_DISPLAY_M5STACK && LVGL_DISPLAY_ORIENTATION_LANDSCAPE
+
+        default 320 if LVGL_PREDEFINED_DISPLAY_WROVER4 && LVGL_DISPLAY_ORIENTATION_PORTRAIT
+        default 240 if LVGL_PREDEFINED_DISPLAY_WROVER4 && LVGL_DISPLAY_ORIENTATION_LANDSCAPE
+
 	default 320 if LVGL_PREDEFINED_DISPLAY_ERTFT0356
 	default 320 if LVGL_PREDEFINED_DISPLAY_ADA_FEATHERWING
         default 240

diff --git a/components/lvgl_esp32_drivers/lvgl_tft/ili9341.c b/components/lvgl_esp32_drivers/lvgl_tft/ili9341.c
@@ -61,7 +61,7 @@ void ili9341_init(void)
 		{0xC1, {0x11}, 1},			/*Power control */
 		{0xC5, {0x35, 0x3E}, 2},	/*VCOM control*/
 		{0xC7, {0xBE}, 1},			/*VCOM control*/
-		{0x36, {0x28}, 1},			/*Memory Access Control*/
+		// {0x36, {0x28}, 1},			/*Memory Access Control*/
 		{0x3A, {0x55}, 1},			/*Pixel Format Set*/
 		{0xB1, {0x00, 0x1B}, 2},
 		{0xF2, {0x08}, 1},
@@ -116,18 +116,34 @@ void ili9341_init(void)
 
 	ili9341_enable_backlight(true);
 
-#if (ILI9341_DISPLAY_ORIENTATION == TFT_ORIENTATION_LANDSCAPE)
+#if CONFIG_LVGL_PREDEFINED_DISPLAY_M5STACK
+#if (CONFIG_LVGL_DISPLAY_ORIENTATION_LANDSCAPE)
+#pragma message "M5STACK - LANDSCAPE"
 	uint8_t data[] = {0x08};
-#elif (ILI9341_DISPLAY_ORIENTATION == TFT_ORIENTATION_PORTRAIT)
+#elif (CONFIG_LVGL_DISPLAY_ORIENTATION_PORTRAIT)
+#pragma message "M5STACK - PORTRAIT"
 	uint8_t data[] = {0x68};
-#else
-#pragma message "Choose an display orientation"
 #endif
 
 	// this same command also sets rotation (portrait/landscape) and inverts colors.
 	// https://gist.github.com/motters/38a26a66020f674b6389063932048e4c#file-ili9844_defines-h-L24
 	ili9341_send_cmd(0x36);
 	ili9341_send_data(&data, 1);
+
+#elif CONFIG_LVGL_PREDEFINED_DISPLAY_WROVER4
+#if (CONFIG_LVGL_DISPLAY_ORIENTATION_LANDSCAPE)
+#pragma message "WROVER4 - LANDSCAPE"
+	uint8_t data[] = {0x28};
+#elif (CONFIG_LVGL_DISPLAY_ORIENTATION_PORTRAIT)
+#pragma message "WROVER4 - PORTRAIT"
+	uint8_t data[] = {0x4C};
+#endif
+
+	// this same command also sets rotation (portrait/landscape) and inverts colors.
+	// https://gist.github.com/motters/38a26a66020f674b6389063932048e4c#file-ili9844_defines-h-L24
+	ili9341_send_cmd(0x36);
+	ili9341_send_data(&data, 1);
+#endif
 }