zenermerps/lvgl_esp32_drivers
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #125 from lvgl/fix/update_ili9341

Browse source 
ili9341: Update driver to use new port interface
This commit is contained in:
Carlos Diaz 2021-10-13 19:19:03 -05:00 committed by GitHub
parent 3d775fadd1 f7164ff22a
commit f7b34f8a3e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 136 additions and 121 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
display_config.h
View file

@ -18,10 +18,17 @@ extern "C" {
#if defined (CONFIG_LV_INVERT_COLORS) #if defined (CONFIG_LV_INVERT_COLORS)
#define ST7789_INVERT_COLORS 1U #define ST7789_INVERT_COLORS 1U
#define ILI9341_INVERT_COLORS 1U
#endif #endif
#define ST7789_INITIAL_ORIENTATION CONFIG_LV_DISPLAY_ORIENTATION #define ST7789_INITIAL_ORIENTATION CONFIG_LV_DISPLAY_ORIENTATION
#if CONFIG_LV_DISP_USE_RST
#define ILI9341_USE_RST
#endif
#define ILI9341_INITIAL_ORIENTATION CONFIG_LV_DISPLAY_ORIENTATION
#ifdef __cplusplus #ifdef __cplusplus
} /* extern "C" */ } /* extern "C" */
#endif #endif

2
lvgl_tft/disp_driver.c
View file

@ -10,7 +10,7 @@
void *disp_driver_init(lv_disp_drv_t *drv) void *disp_driver_init(lv_disp_drv_t *drv)
{ {
#if defined CONFIG_LV_TFT_DISPLAY_CONTROLLER_ILI9341 #if defined CONFIG_LV_TFT_DISPLAY_CONTROLLER_ILI9341
ili9341_init(); ili9341_init(drv);
#elif defined CONFIG_LV_TFT_DISPLAY_CONTROLLER_ILI9481 #elif defined CONFIG_LV_TFT_DISPLAY_CONTROLLER_ILI9481
ili9481_init(); ili9481_init();
#elif defined CONFIG_LV_TFT_DISPLAY_CONTROLLER_ILI9488 #elif defined CONFIG_LV_TFT_DISPLAY_CONTROLLER_ILI9488

234
lvgl_tft/ili9341.c
View file

@ -7,22 +7,25 @@
* INCLUDES * INCLUDES
*********************/ *********************/
#include "ili9341.h" #include "ili9341.h"
#include "disp_spi.h" #include "disp_spi.h"
#include "driver/gpio.h" #include "display_port.h"
#include "esp_log.h"
#include "freertos/FreeRTOS.h"
#include "freertos/task.h"
/********************* /*********************
* DEFINES * DEFINES
*********************/ *********************/
#define TAG "ILI9341" #define TAG "ILI9341"
#define END_OF_CMD_MARKER 0xFFU
#define MEMORY_ACCESS_CONTROL_REG 0x36U
#define SOFTWARE_RESET_REG 0x01U
/********************** /**********************
* TYPEDEFS * TYPEDEFS
**********************/ **********************/
/*The LCD needs a bunch of command/argument values to be initialized. They are stored in this struct. */ /*The LCD needs a bunch of command/argument values to be initialized. They are stored in this struct. */
typedef struct { typedef struct {
uint8_t cmd; uint8_t cmd;
uint8_t data[16]; uint8_t data[16];
@ -32,12 +35,13 @@ typedef struct {
/********************** /**********************
* STATIC PROTOTYPES * STATIC PROTOTYPES
**********************/ **********************/
static void ili9341_set_orientation(uint8_t orientation); static void ili9341_set_orientation(lv_disp_drv_t * drv, uint8_t orientation);
static void ili9341_send_cmd(uint8_t cmd); static void ili9341_send_cmd(lv_disp_drv_t * drv, uint8_t cmd);
static void ili9341_send_data(void * data, uint16_t length); static void ili9341_send_data(lv_disp_drv_t * drv, void * data, uint16_t length);
static void ili9341_send_color(void * data, uint16_t length); static void ili9341_send_color(lv_disp_drv_t * drv, void * data, uint16_t length);
static void ili9341_reset(lv_disp_drv_t * drv);
/********************** /**********************
* STATIC VARIABLES * STATIC VARIABLES
**********************/ **********************/
@ -50,150 +54,148 @@ static void ili9341_send_color(void * data, uint16_t length);
* GLOBAL FUNCTIONS * GLOBAL FUNCTIONS
**********************/ **********************/
void ili9341_init(void) void ili9341_init(lv_disp_drv_t * drv)
{ {
lcd_init_cmd_t ili_init_cmds[]={ lcd_init_cmd_t ili_init_cmds[] = {
{0xCF, {0x00, 0x83, 0X30}, 3}, {0xCF, {0x00, 0x83, 0X30}, 3},
{0xED, {0x64, 0x03, 0X12, 0X81}, 4}, {0xED, {0x64, 0x03, 0X12, 0X81}, 4},
{0xE8, {0x85, 0x01, 0x79}, 3}, {0xE8, {0x85, 0x01, 0x79}, 3},
{0xCB, {0x39, 0x2C, 0x00, 0x34, 0x02}, 5}, {0xCB, {0x39, 0x2C, 0x00, 0x34, 0x02}, 5},
{0xF7, {0x20}, 1}, {0xF7, {0x20}, 1},
{0xEA, {0x00, 0x00}, 2}, {0xEA, {0x00, 0x00}, 2},
{0xC0, {0x26}, 1}, /*Power control*/ /* Power control */
{0xC1, {0x11}, 1}, /*Power control */ {0xC0, {0x26}, 1},
{0xC5, {0x35, 0x3E}, 2}, /*VCOM control*/ /* Power control */
{0xC7, {0xBE}, 1}, /*VCOM control*/ {0xC1, {0x11}, 1},
{0x36, {0x28}, 1}, /*Memory Access Control*/ /* VCOM control */
{0x3A, {0x55}, 1}, /*Pixel Format Set*/ {0xC5, {0x35, 0x3E}, 2},
{0xB1, {0x00, 0x1B}, 2}, /* VCOM control */
{0xF2, {0x08}, 1}, {0xC7, {0xBE}, 1},
{0x26, {0x01}, 1}, /* Memory Access Control */
{0xE0, {0x1F, 0x1A, 0x18, 0x0A, 0x0F, 0x06, 0x45, 0X87, 0x32, 0x0A, 0x07, 0x02, 0x07, 0x05, 0x00}, 15}, {0x36, {0x28}, 1},
{0XE1, {0x00, 0x25, 0x27, 0x05, 0x10, 0x09, 0x3A, 0x78, 0x4D, 0x05, 0x18, 0x0D, 0x38, 0x3A, 0x1F}, 15}, /* Pixel Format Set */
{0x2A, {0x00, 0x00, 0x00, 0xEF}, 4}, {0x3A, {0x55}, 1},
{0x2B, {0x00, 0x00, 0x01, 0x3f}, 4}, {0xB1, {0x00, 0x1B}, 2},
{0x2C, {0}, 0}, {0xF2, {0x08}, 1},
{0xB7, {0x07}, 1}, {0x26, {0x01}, 1},
{0xB6, {0x0A, 0x82, 0x27, 0x00}, 4}, {0xE0, {0x1F, 0x1A, 0x18, 0x0A, 0x0F, 0x06, 0x45, 0X87, 0x32, 0x0A, 0x07, 0x02, 0x07, 0x05, 0x00}, 15},
{0x11, {0}, 0x80}, {0XE1, {0x00, 0x25, 0x27, 0x05, 0x10, 0x09, 0x3A, 0x78, 0x4D, 0x05, 0x18, 0x0D, 0x38, 0x3A, 0x1F}, 15},
{0x29, {0}, 0x80}, {0x2A, {0x00, 0x00, 0x00, 0xEF}, 4},
{0, {0}, 0xff}, {0x2B, {0x00, 0x00, 0x01, 0x3f}, 4},
}; {0x2C, {0}, 0},
{0xB7, {0x07}, 1},
{0xB6, {0x0A, 0x82, 0x27, 0x00}, 4},
{0x11, {0}, 0x80},
{0x29, {0}, 0x80},
{0, {0}, END_OF_CMD_MARKER},
};
//Initialize non-SPI GPIOs ili9341_reset(drv);
gpio_pad_select_gpio(ILI9341_DC);
gpio_set_direction(ILI9341_DC, GPIO_MODE_OUTPUT);
#if ILI9341_USE_RST //Send all the commands
gpio_pad_select_gpio(ILI9341_RST); uint16_t cmd = 0;
gpio_set_direction(ILI9341_RST, GPIO_MODE_OUTPUT); while (ili_init_cmds[cmd].databytes != END_OF_CMD_MARKER) {
ili9341_send_cmd(drv, ili_init_cmds[cmd].cmd);
ili9341_send_data(drv, ili_init_cmds[cmd].data, ili_init_cmds[cmd].databytes & 0x1F);
if (ili_init_cmds[cmd].databytes & 0x80) {
display_port_delay(drv, 100);
}
//Reset the display cmd++;
gpio_set_level(ILI9341_RST, 0); }
vTaskDelay(100 / portTICK_RATE_MS);
gpio_set_level(ILI9341_RST, 1);
vTaskDelay(100 / portTICK_RATE_MS);
#endif
ESP_LOGI(TAG, "Initialization."); ili9341_set_orientation(drv, ILI9341_INITIAL_ORIENTATION);
//Send all the commands #if ILI9341_INVERT_COLORS == 1U
uint16_t cmd = 0; ili9341_send_cmd(drv, 0x21);
while (ili_init_cmds[cmd].databytes!=0xff) {
ili9341_send_cmd(ili_init_cmds[cmd].cmd);
ili9341_send_data(ili_init_cmds[cmd].data, ili_init_cmds[cmd].databytes&0x1F);
if (ili_init_cmds[cmd].databytes & 0x80) {
vTaskDelay(100 / portTICK_RATE_MS);
}
cmd++;
}
ili9341_set_orientation(CONFIG_LV_DISPLAY_ORIENTATION);
#if ILI9341_INVERT_COLORS == 1
ili9341_send_cmd(0x21);
#else #else
ili9341_send_cmd(0x20); ili9341_send_cmd(drv, 0x20);
#endif #endif
} }
void ili9341_flush(lv_disp_drv_t * drv, const lv_area_t * area, lv_color_t * color_map) void ili9341_flush(lv_disp_drv_t * drv, const lv_area_t * area, lv_color_t * color_map)
{ {
uint8_t data[4]; uint8_t data[4] = {0};
uint32_t size = lv_area_get_width(area) * lv_area_get_height(area);
/*Column addresses*/ /*Column addresses*/
ili9341_send_cmd(0x2A); data[0] = (area->x1 >> 8) & 0xFF;
data[0] = (area->x1 >> 8) & 0xFF; data[1] = area->x1 & 0xFF;
data[1] = area->x1 & 0xFF; data[2] = (area->x2 >> 8) & 0xFF;
data[2] = (area->x2 >> 8) & 0xFF; data[3] = area->x2 & 0xFF;
data[3] = area->x2 & 0xFF;
ili9341_send_data(data, 4);
/*Page addresses*/ ili9341_send_cmd(drv, 0x2A);
ili9341_send_cmd(0x2B); ili9341_send_data(drv, data, 4);
data[0] = (area->y1 >> 8) & 0xFF;
data[1] = area->y1 & 0xFF;
data[2] = (area->y2 >> 8) & 0xFF;
data[3] = area->y2 & 0xFF;
ili9341_send_data(data, 4);
/*Memory write*/ /* Page addresses */
ili9341_send_cmd(0x2C); data[0] = (area->y1 >> 8) & 0xFF;
uint32_t size = lv_area_get_width(area) * lv_area_get_height(area); data[1] = area->y1 & 0xFF;
ili9341_send_color((void*)color_map, size * 2); data[2] = (area->y2 >> 8) & 0xFF;
data[3] = area->y2 & 0xFF;
ili9341_send_cmd(drv, 0x2B);
ili9341_send_data(drv, data, 4);
/* Memory write */
ili9341_send_cmd(drv, 0x2C);
ili9341_send_color(drv, (void*)color_map, size * 2);
} }
void ili9341_sleep_in() void ili9341_sleep_in(lv_disp_drv_t * drv)
{ {
uint8_t data[] = {0x08}; uint8_t data[] = {0x08};
ili9341_send_cmd(0x10); ili9341_send_cmd(drv, 0x10);
ili9341_send_data(&data, 1); ili9341_send_data(drv, data, 1);
} }
void ili9341_sleep_out() void ili9341_sleep_out(lv_disp_drv_t * drv)
{ {
uint8_t data[] = {0x08}; uint8_t data[] = {0x08};
ili9341_send_cmd(0x11); ili9341_send_cmd(drv, 0x11);
ili9341_send_data(&data, 1); ili9341_send_data(drv, data, 1);
} }
/********************** /**********************
* STATIC FUNCTIONS * STATIC FUNCTIONS
**********************/ **********************/
static inline void set_cmd_mode(lv_disp_drv_t * drv)
{
display_port_gpio_dc(drv, 0);
}
static void ili9341_send_cmd(uint8_t cmd) static inline void set_data_mode(lv_disp_drv_t * drv)
{
display_port_gpio_dc(drv, 1);
}
static void ili9341_send_cmd(lv_disp_drv_t * drv, uint8_t cmd)
{ {
disp_wait_for_pending_transactions(); disp_wait_for_pending_transactions();
gpio_set_level(ILI9341_DC, 0); /*Command mode*/ set_cmd_mode(drv);
disp_spi_send_data(&cmd, 1); disp_spi_send_data(&cmd, 1);
} }
static void ili9341_send_data(void * data, uint16_t length) static void ili9341_send_data(lv_disp_drv_t *drv, void * data, uint16_t length)
{ {
disp_wait_for_pending_transactions(); disp_wait_for_pending_transactions();
gpio_set_level(ILI9341_DC, 1); /*Data mode*/ set_data_mode(drv);
disp_spi_send_data(data, length); disp_spi_send_data(data, length);
} }
static void ili9341_send_color(void * data, uint16_t length) static void ili9341_send_color(lv_disp_drv_t *drv, void * data, uint16_t length)
{ {
disp_wait_for_pending_transactions(); disp_wait_for_pending_transactions();
gpio_set_level(ILI9341_DC, 1); /*Data mode*/ set_data_mode(drv);
disp_spi_send_colors(data, length); disp_spi_send_colors(data, length);
} }
static void ili9341_set_orientation(uint8_t orientation) static void ili9341_set_orientation(lv_disp_drv_t *drv, uint8_t orientation)
{ {
assert(orientation < 4); assert(orientation < 4);
const char *orientation_str[] = {
"PORTRAIT", "PORTRAIT_INVERTED", "LANDSCAPE", "LANDSCAPE_INVERTED"
};
ESP_LOGI(TAG, "Display orientation: %s", orientation_str[orientation]);
#if defined CONFIG_LV_PREDEFINED_DISPLAY_M5STACK #if defined CONFIG_LV_PREDEFINED_DISPLAY_M5STACK
const uint8_t data[] = {0x68, 0x68, 0x08, 0x08}; const uint8_t data[] = {0x68, 0x68, 0x08, 0x08};
#elif defined (CONFIG_LV_PREDEFINED_DISPLAY_M5CORE2) #elif defined (CONFIG_LV_PREDEFINED_DISPLAY_M5CORE2)
@ -204,8 +206,20 @@ static void ili9341_set_orientation(uint8_t orientation)
const uint8_t data[] = {0x48, 0x88, 0x28, 0xE8}; const uint8_t data[] = {0x48, 0x88, 0x28, 0xE8};
#endif #endif
ESP_LOGD(TAG, "0x36 command value: 0x%02X", data[orientation]); ili9341_send_cmd(drv, MEMORY_ACCESS_CONTROL_REG);
ili9341_send_data(drv, (void *) &data[orientation], 1);
ili9341_send_cmd(0x36); }
ili9341_send_data((void *) &data[orientation], 1);
/* Reset the display, if we don't have a reset pin we use software reset */
static void ili9341_reset(lv_disp_drv_t *drv)
{
#if defined(ILI9341_USE_RST)
display_port_gpio_rst(drv, 0);
display_port_delay(drv, 100);
display_port_gpio_rst(drv, 1);
display_port_delay(drv, 100);
#else
ili9341_send_cmd(drv, SOFTWARE_RESET_REG);
display_port_delay(drv, 5);
#endif
} }

14
lvgl_tft/ili9341.h
View file

@ -13,23 +13,17 @@ extern "C" {
/********************* /*********************
* INCLUDES * INCLUDES
*********************/ *********************/
#include <stdbool.h>
#ifdef LV_LVGL_H_INCLUDE_SIMPLE #ifdef LV_LVGL_H_INCLUDE_SIMPLE
#include "lvgl.h" #include "lvgl.h"
#else #else
#include "lvgl/lvgl.h" #include "lvgl/lvgl.h"
#endif #endif
#include "sdkconfig.h" #include "display_config.h"
/********************* /*********************
* DEFINES * DEFINES
*********************/ *********************/
#define ILI9341_DC CONFIG_LV_DISP_PIN_DC
#define ILI9341_USE_RST CONFIG_LV_DISP_USE_RST
#define ILI9341_RST CONFIG_LV_DISP_PIN_RST
#define ILI9341_INVERT_COLORS CONFIG_LV_INVERT_COLORS
/********************** /**********************
* TYPEDEFS * TYPEDEFS
@ -39,10 +33,10 @@ extern "C" {
* GLOBAL PROTOTYPES * GLOBAL PROTOTYPES
**********************/ **********************/
void ili9341_init(void); void ili9341_init(lv_disp_drv_t * drv);
void ili9341_flush(lv_disp_drv_t * drv, const lv_area_t * area, lv_color_t * color_map); void ili9341_flush(lv_disp_drv_t * drv, const lv_area_t * area, lv_color_t * color_map);
void ili9341_sleep_in(void); void ili9341_sleep_in(lv_disp_drv_t * drv);
void ili9341_sleep_out(void); void ili9341_sleep_out(lv_disp_drv_t *drv);
/********************** /**********************
* MACROS * MACROS