michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: display: ili9340: add support for configuring pixel format

Browse source 
Move pixel format setting (RGB565/RGB888) to DeviceTree. Add support for
changing pixel format at runtime.

Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
This commit is contained in:
Gerard Marull-Paretas 2020-09-08 23:28:30 +02:00 • committed by Maureen Helm
commit 347e0f2bdc
10 changed files with 113 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

4
boards/shields/adafruit_2_8_tft_touch_v2/Kconfig.defconfig
View file

@ -45,6 +45,10 @@ config LVGL_VDB_SIZE
config LVGL_BITS_PER_PIXEL
default 24
choice LVGL_COLOR_DEPTH
default LVGL_COLOR_DEPTH_32
endchoice
config KSCAN
default y

3
boards/shields/adafruit_2_8_tft_touch_v2/adafruit_2_8_tft_touch_v2.overlay
View file

@ -4,6 +4,8 @@
* SPDX-License-Identifier: Apache-2.0
*/
#include <dt-bindings/display/ili9340.h>
&arduino_spi {
status = "okay";
cs-gpios = <&arduino_header 16 GPIO_ACTIVE_LOW>; /* D10 */
@ -15,6 +17,7 @@
spi-max-frequency = <15151515>;
reg = <0>;
cmd-data-gpios = <&arduino_header 15 GPIO_ACTIVE_LOW>; /* D9 */
pixel-format = <ILI9340_PIXEL_FORMAT_RGB888>;
};
};

9
boards/shields/buydisplay_2_8_tft_touch_arduino/Kconfig.defconfig
View file

@ -43,7 +43,14 @@ config LVGL_VDB_SIZE
default 64
config LVGL_BITS_PER_PIXEL
default 24
default 16
choice LVGL_COLOR_DEPTH
default LVGL_COLOR_DEPTH_16
endchoice
config LVGL_COLOR_16_SWAP
default y
config KSCAN
default y

3
boards/shields/buydisplay_2_8_tft_touch_arduino/buydisplay_2_8_tft_touch_arduino.overlay
View file

@ -4,6 +4,8 @@
* SPDX-License-Identifier: Apache-2.0
*/
#include <dt-bindings/display/ili9340.h>
&arduino_spi {
status = "okay";
cs-gpios = <&arduino_header 15 GPIO_ACTIVE_LOW>; /* D9 */
@ -15,6 +17,7 @@
reg = <0>;
cmd-data-gpios = <&arduino_header 13 GPIO_ACTIVE_LOW>; /* D7 */
reset-gpios = <&arduino_header 16 GPIO_ACTIVE_LOW>; /* D10 */
pixel-format = <ILI9340_PIXEL_FORMAT_RGB565>;
};
};

13
drivers/display/Kconfig.ili9340
View file

@ -25,17 +25,4 @@ config ILI9340_LCD_SEEED_TFTV2
endchoice
choice
prompt "Color pixel format"
help
Specify the color pixel format of the ILI9340 display controller.
config ILI9340_RGB888
bool "RGB888"
config ILI9340_RGB565
bool "RGB565"
endchoice
endif # ILI9340

97
drivers/display/display_ili9340.c
View file

@ -12,6 +12,7 @@
#include <string.h>
#include <dt-bindings/display/ili9340.h>
#include <drivers/display.h>
#include <drivers/gpio.h>
#include <drivers/spi.h>
@ -33,6 +34,7 @@ struct ili9340_config {
const char *reset_label;
gpio_pin_t reset_pin;
gpio_dt_flags_t reset_flags;
uint8_t pixel_format;
};
struct ili9340_data {
@ -41,15 +43,10 @@ struct ili9340_data {
const struct device *spi_dev;
struct spi_config spi_config;
struct spi_cs_control cs_ctrl;
uint8_t bytes_per_pixel;
enum display_pixel_format pixel_format;
};
/* The number of bytes taken by a RGB pixel */
#ifdef CONFIG_ILI9340_RGB565
#define ILI9340_RGB_SIZE 2U
#else
#define ILI9340_RGB_SIZE 3U
#endif
static int ili9340_exit_sleep(const struct device *dev)
{
int r;
@ -119,7 +116,7 @@ static int ili9340_write(const struct device *dev, const uint16_t x,
uint16_t write_h;
__ASSERT(desc->width <= desc->pitch, "Pitch is smaller than width");
__ASSERT((desc->pitch * ILI9340_RGB_SIZE * desc->height) <= desc->buf_size,
__ASSERT((desc->pitch * data->bytes_per_pixel * desc->height) <= desc->buf_size,
"Input buffer to small");
LOG_DBG("Writing %dx%d (w,h) @ %dx%d (x,y)", desc->width, desc->height,
@ -139,7 +136,7 @@ static int ili9340_write(const struct device *dev, const uint16_t x,
r = ili9340_transmit(dev, ILI9340_CMD_MEM_WRITE,
write_data_start,
desc->width * ILI9340_RGB_SIZE * write_h);
desc->width * data->bytes_per_pixel * write_h);
if (r < 0) {
return r;
}
@ -147,17 +144,17 @@ static int ili9340_write(const struct device *dev, const uint16_t x,
tx_bufs.buffers = &tx_buf;
tx_bufs.count = 1;
write_data_start += (desc->pitch * ILI9340_RGB_SIZE);
write_data_start += desc->pitch * data->bytes_per_pixel;
for (write_cnt = 1U; write_cnt < nbr_of_writes; ++write_cnt) {
tx_buf.buf = (void *)write_data_start;
tx_buf.len = desc->width * ILI9340_RGB_SIZE * write_h;
tx_buf.len = desc->width * data->bytes_per_pixel * write_h;
r = spi_write(data->spi_dev, &data->spi_config, &tx_bufs);
if (r < 0) {
return r;
}
write_data_start += desc->pitch * ILI9340_RGB_SIZE;
write_data_start += desc->pitch * data->bytes_per_pixel;
}
return 0;
@ -207,15 +204,34 @@ static int ili9340_set_pixel_format(const struct device *dev,
const enum display_pixel_format
pixel_format)
{
#ifdef CONFIG_ILI9340_RGB565
struct ili9340_data *data = (struct ili9340_data *)dev->data;
int r;
uint8_t tx_data;
uint8_t bytes_per_pixel;
if (pixel_format == PIXEL_FORMAT_RGB_565) {
#else
if (pixel_format == PIXEL_FORMAT_RGB_888) {
#endif
return 0;
}
LOG_ERR("Pixel format change not implemented");
bytes_per_pixel = 2U;
tx_data = ILI9340_DATA_PIXEL_FORMAT_MCU_16_BIT |
ILI9340_DATA_PIXEL_FORMAT_RGB_16_BIT;
} else if (pixel_format == PIXEL_FORMAT_RGB_888) {
bytes_per_pixel = 3U;
tx_data = ILI9340_DATA_PIXEL_FORMAT_MCU_18_BIT |
ILI9340_DATA_PIXEL_FORMAT_RGB_18_BIT;
} else {
LOG_ERR("Unsupported pixel format");
return -ENOTSUP;
}
r = ili9340_transmit(dev, ILI9340_CMD_PIXEL_FORMAT_SET, &tx_data, 1U);
if (r < 0) {
return r;
}
data->pixel_format = pixel_format;
data->bytes_per_pixel = bytes_per_pixel;
return 0;
}
static int ili9340_set_orientation(const struct device *dev,
@ -231,16 +247,16 @@ static int ili9340_set_orientation(const struct device *dev,
static void ili9340_get_capabilities(const struct device *dev,
struct display_capabilities *capabilities)
{
struct ili9340_data *data = (struct ili9340_data *)dev->data;
memset(capabilities, 0, sizeof(struct display_capabilities));
capabilities->supported_pixel_formats = PIXEL_FORMAT_RGB_565 |
PIXEL_FORMAT_RGB_888;
capabilities->current_pixel_format = data->pixel_format;
capabilities->x_resolution = ILI9340_X_RES;
capabilities->y_resolution = ILI9340_Y_RES;
#ifdef CONFIG_ILI9340_RGB565
capabilities->supported_pixel_formats = PIXEL_FORMAT_RGB_565;
capabilities->current_pixel_format = PIXEL_FORMAT_RGB_565;
#else
capabilities->supported_pixel_formats = PIXEL_FORMAT_RGB_888;
capabilities->current_pixel_format = PIXEL_FORMAT_RGB_888;
#endif
capabilities->current_orientation = DISPLAY_ORIENTATION_NORMAL;
}
@ -279,6 +295,28 @@ int ili9340_transmit(const struct device *dev, uint8_t cmd, const void *tx_data,
return 0;
}
static int ili9340_configure(const struct device *dev)
{
const struct ili9340_config *config = (struct ili9340_config *)dev->config;
int r;
enum display_pixel_format pixel_format;
/* pixel format */
if (config->pixel_format == ILI9340_PIXEL_FORMAT_RGB565) {
pixel_format = PIXEL_FORMAT_RGB_565;
} else {
pixel_format = PIXEL_FORMAT_RGB_888;
}
r = ili9340_set_pixel_format(dev, pixel_format);
if (r < 0) {
return r;
}
return 0;
}
static int ili9340_init(const struct device *dev)
{
const struct ili9340_config *config = (struct ili9340_config *)dev->config;
@ -329,6 +367,12 @@ static int ili9340_init(const struct device *dev)
ili9340_hw_reset(dev);
r = ili9340_configure(dev);
if (r < 0) {
LOG_ERR("Could not configure display (%d)", r);
return r;
}
r = ili9340_lcd_init(dev);
if (r < 0) {
LOG_ERR("Could not initialize LCD (%d)", r);
@ -386,6 +430,7 @@ static const struct display_driver_api ili9340_api = {
.reset_flags = UTIL_AND( \
DT_INST_NODE_HAS_PROP(index, reset_gpios), \
DT_INST_GPIO_FLAGS(index, reset_gpios)), \
.pixel_format = DT_INST_PROP(index, pixel_format), \
}; \
\
static struct ili9340_data ili9340_data_##index; \

12
drivers/display/display_ili9340_adafruit_1480.c
View file

@ -43,18 +43,6 @@ int ili9340_lcd_init(const struct device *dev)
return r;
}
#ifdef CONFIG_ILI9340_RGB565
tx_data[0] = ILI9340_DATA_PIXEL_FORMAT_MCU_16_BIT |
ILI9340_DATA_PIXEL_FORMAT_RGB_16_BIT;
#else
tx_data[0] = ILI9340_DATA_PIXEL_FORMAT_MCU_18_BIT |
ILI9340_DATA_PIXEL_FORMAT_RGB_18_BIT;
#endif
r = ili9340_transmit(dev, ILI9340_CMD_PIXEL_FORMAT_SET, tx_data, 1);
if (r < 0) {
return r;
}
tx_data[0] = 0x00;
tx_data[1] = 0x18;
r = ili9340_transmit(dev, ILI9340_CMD_FRAME_CTRL_NORMAL_MODE, tx_data, 2);

14
drivers/display/display_ili9340_seeed_tftv2.c
View file

@ -128,20 +128,6 @@ int ili9340_lcd_init(const struct device *dev)
return r;
}
/* Pixel Format Set */
cmd = ILI9340_CMD_PIXEL_FORMAT_SET;
#ifdef CONFIG_ILI9340_RGB565
data[0] = ILI9340_DATA_PIXEL_FORMAT_MCU_16_BIT |
ILI9340_DATA_PIXEL_FORMAT_RGB_16_BIT;
#else
data[0] = ILI9340_DATA_PIXEL_FORMAT_MCU_18_BIT |
ILI9340_DATA_PIXEL_FORMAT_RGB_18_BIT;
#endif
r = ili9340_transmit(dev, cmd, data, 1);
if (r < 0) {
return r;
}
/* Frame Rate */
cmd = ILI9340_CMD_FRAME_CTRL_NORMAL_MODE;
data[0] = 0x00U;

11
dts/bindings/display/ilitek,ili9340.yaml
View file

@ -25,3 +25,14 @@ properties:
The D/CX pin of ILI9340 is active low (transmission command byte).
If connected directly the MCU pin should be configured
as active low.
pixel-format:
type: int
default: 0
enum:
- 0 # RGB565
- 1 # RGB888
description:
Display pixel format. Note that when RGB888 pixel format is selected
only 6 color bits are actually used being in practice equivalent to
RGB666.

13
include/dt-bindings/display/ili9340.h Normal file
View file

@ -0,0 +1,13 @@
/*
* Copyright (c) 2020 Teslabs Engineering S.L.
*
* SPDX-License-Identifier: Apache-2.0
*/
#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_DISPLAY_ILI9340_H_
#define ZEPHYR_INCLUDE_DT_BINDINGS_DISPLAY_ILI9340_H_
/* Pixel formats */
#define ILI9340_PIXEL_FORMAT_RGB565 0U
#define ILI9340_PIXEL_FORMAT_RGB888 1U
#endif /* ZEPHYR_INCLUDE_DT_BINDINGS_DISPLAY_ILI9340_H_ */