diff --git a/docs/releases.txt b/docs/releases.txt index ee6b5ada..73c26344 100644 --- a/docs/releases.txt +++ b/docs/releases.txt @@ -24,6 +24,7 @@ FIX: Improving gdispDrawThickLine() FEATURE: Added gdispAddFont() for adding a dynamic font to the permanent font list FEATURE: Added gmiscHittestPoly() for checking whether a point is inside of a polygon FIX: Fixed strange multi-thread issues in GEVENT +FEATURE: Added ILI9488 driver *** Release 2.6 *** diff --git a/drivers/gdisp/ILI9488/board_ILI9488_template.h b/drivers/gdisp/ILI9488/board_ILI9488_template.h new file mode 100644 index 00000000..aac744f9 --- /dev/null +++ b/drivers/gdisp/ILI9488/board_ILI9488_template.h @@ -0,0 +1,60 @@ +/* + * This file is subject to the terms of the GFX License. If a copy of + * the license was not distributed with this file, you can obtain one at: + * + * http://ugfx.org/license.html + */ + +#ifndef _GDISP_LLD_BOARD_H +#define _GDISP_LLD_BOARD_H + +static GFXINLINE void init_board(GDisplay *g) { + (void) g; +} + +static GFXINLINE void post_init_board(GDisplay *g) { + (void) g; +} + +static GFXINLINE void setpin_reset(GDisplay *g, bool_t state) { + (void) g; + (void) state; +} + +static GFXINLINE void set_backlight(GDisplay *g, uint8_t percent) { + (void) g; + (void) percent; +} + +static GFXINLINE void acquire_bus(GDisplay *g) { + (void) g; +} + +static GFXINLINE void release_bus(GDisplay *g) { + (void) g; +} + +static GFXINLINE void write_index(GDisplay *g, uint16_t index) { + (void) g; + (void) index; +} + +static GFXINLINE void write_data(GDisplay *g, uint16_t data) { + (void) g; + (void) data; +} + +static GFXINLINE void setreadmode(GDisplay *g) { + (void) g; +} + +static GFXINLINE void setwritemode(GDisplay *g) { + (void) g; +} + +static GFXINLINE uint16_t read_data(GDisplay *g) { + (void) g; + return 0; +} + +#endif /* _GDISP_LLD_BOARD_H */ diff --git a/drivers/gdisp/ILI9488/driver.mk b/drivers/gdisp/ILI9488/driver.mk new file mode 100644 index 00000000..1a809d5f --- /dev/null +++ b/drivers/gdisp/ILI9488/driver.mk @@ -0,0 +1,2 @@ +GFXINC += $(GFXLIB)/drivers/gdisp/ILI9488 +GFXSRC += $(GFXLIB)/drivers/gdisp/ILI9488/gdisp_lld_ILI9488.c diff --git a/drivers/gdisp/ILI9488/gdisp_lld_ILI9488.c b/drivers/gdisp/ILI9488/gdisp_lld_ILI9488.c new file mode 100644 index 00000000..82e2e908 --- /dev/null +++ b/drivers/gdisp/ILI9488/gdisp_lld_ILI9488.c @@ -0,0 +1,338 @@ +/* + * This file is subject to the terms of the GFX License. If a copy of + * the license was not distributed with this file, you can obtain one at: + * + * http://ugfx.org/license.html + */ + +#include "gfx.h" + +#if GFX_USE_GDISP + +#if defined(GDISP_SCREEN_HEIGHT) + #warning "GDISP: This low level driver does not support setting a screen size. It is being ignored." + #undef GISP_SCREEN_HEIGHT +#endif +#if defined(GDISP_SCREEN_WIDTH) + #warning "GDISP: This low level driver does not support setting a screen size. It is being ignored." + #undef GDISP_SCREEN_WIDTH +#endif + +#define GDISP_DRIVER_VMT GDISPVMT_ILI9488 +#include "gdisp_lld_config.h" +#include "../../../src/gdisp/gdisp_driver.h" + +#include "board_ILI9488.h" + +/*===========================================================================*/ +/* Driver local definitions. */ +/*===========================================================================*/ + +#ifndef GDISP_SCREEN_HEIGHT + #define GDISP_SCREEN_HEIGHT 480 +#endif +#ifndef GDISP_SCREEN_WIDTH + #define GDISP_SCREEN_WIDTH 320 +#endif +#ifndef GDISP_INITIAL_CONTRAST + #define GDISP_INITIAL_CONTRAST 50 +#endif +#ifndef GDISP_INITIAL_BACKLIGHT + #define GDISP_INITIAL_BACKLIGHT 100 +#endif + +/*===========================================================================*/ +/* Driver local functions. */ +/*===========================================================================*/ +static void dummy_read(GDisplay* g) { + volatile uint16_t dummy; + dummy = read_data(g); + (void)dummy; +} + +static void set_viewport(GDisplay* g) { + write_index(g, 0x2A); + write_data(g, ((g->p.x >> 8) & 0x00FF)); + write_data(g, ((g->p.x >> 0) & 0x00FF)); + write_data(g, ((g->p.x + g->p.cx - 1) >> 8) & 0x00FF); + write_data(g, ((g->p.x + g->p.cx - 1) >> 0) & 0x00FF); + + write_index(g, 0x2B); + write_data(g, ((g->p.y >> 8) & 0x00FF)); + write_data(g, ((g->p.y >> 0) & 0x00FF)); + write_data(g, ((g->p.y + g->p.cy - 1) >> 8) & 0x00FF); + write_data(g, ((g->p.y + g->p.cy - 1) >> 0) & 0x00FF); + + write_index(g, 0x2C); +} + +/*===========================================================================*/ +/* Driver interrupt handlers. */ +/*===========================================================================*/ + +/*===========================================================================*/ +/* Driver exported functions. */ +/*===========================================================================*/ + +LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { + // No private area for this controller + g->priv = 0; + + // Initialise the board interface + init_board(g); + + /* Hardware reset */ + setpin_reset(g, TRUE); + gfxSleepMilliseconds(2); + setpin_reset(g, FALSE); + gfxSleepMilliseconds(10); + setpin_reset(g, TRUE); + gfxSleepMilliseconds(120); + + /* Get the bus for the following initialisation commands */ + acquire_bus(g); + + write_index(g, 0XF7); + write_data(g, 0xA9); + write_data(g, 0x51); + write_data(g, 0x2C); + write_data(g, 0x82); + + write_index(g, 0xC0); + write_data(g, 0x11); + write_data(g, 0x09); + + write_index(g, 0xC1); + write_data(g, 0x41); + + write_index(g, 0XC5); + write_data(g, 0x00); + write_data(g, 0x2A); + write_data(g, 0x80); + + write_index(g, 0xB1); + write_data(g, 0xB0); + write_data(g, 0x11); + + write_index(g, 0xB4); + write_data(g, 0x02); + + write_index(g, 0xB6); + write_data(g, 0x02); + write_data(g, 0x22); + write_data(g, 0x3B); + + write_index(g, 0xB7); + write_data(g, 0xC6); + + write_index(g, 0xBE); + write_data(g, 0x00); + write_data(g, 0x04); + + write_index(g, 0xE9); + write_data(g, 0x00); + + write_index(g, 0x36); + write_data(g, 0x08); + + write_index(g, 0x3A); + write_data(g, 0x55); + + write_index(g, 0xE0); + write_data(g, 0x00); + write_data(g, 0x07); + write_data(g, 0x12); + write_data(g, 0x0B); + write_data(g, 0x18); + write_data(g, 0x0B); + write_data(g, 0x3F); + write_data(g, 0x9B); + write_data(g, 0x4B); + write_data(g, 0x0B); + write_data(g, 0x0F); + write_data(g, 0x0B); + write_data(g, 0x15); + write_data(g, 0x17); + write_data(g, 0x0F); + + write_index(g, 0xE1); + write_data(g, 0x00); + write_data(g, 0x16); + write_data(g, 0x1B); + write_data(g, 0x02); + write_data(g, 0x0F); + write_data(g, 0x06); + write_data(g, 0x34); + write_data(g, 0x46); + write_data(g, 0x48); + write_data(g, 0x04); + write_data(g, 0x0D); + write_data(g, 0x0D); + write_data(g, 0x35); + write_data(g, 0x36); + write_data(g, 0x0F); + + write_index(g, 0x11); + gfxSleepMilliseconds(120); + write_index(g, 0x29); + + // Finish Init + post_init_board(g); + + // Release the bus + release_bus(g); + + // Turn on the back-light + set_backlight(g, GDISP_INITIAL_BACKLIGHT); + + // Initialise the GDISP structure + g->g.Width = GDISP_SCREEN_WIDTH; + g->g.Height = GDISP_SCREEN_HEIGHT; + g->g.Orientation = GDISP_ROTATE_0; + g->g.Powermode = powerOn; + g->g.Backlight = GDISP_INITIAL_BACKLIGHT; + g->g.Contrast = GDISP_INITIAL_CONTRAST; + + return TRUE; +} + +#if GDISP_HARDWARE_STREAM_WRITE + LLDSPEC void gdisp_lld_write_start(GDisplay *g) { + acquire_bus(g); + set_viewport(g); + } + + LLDSPEC void gdisp_lld_write_color(GDisplay *g) { + write_data(g, gdispColor2Native(g->p.color)); + } + + LLDSPEC void gdisp_lld_write_stop(GDisplay *g) { + release_bus(g); + } +#endif + +#if GDISP_HARDWARE_STREAM_READ + LLDSPEC void gdisp_lld_read_start(GDisplay *g) { + acquire_bus(g); + set_viewport(g); + setreadmode(g); + dummy_read(g); + } + + LLDSPEC color_t gdisp_lld_read_color(GDisplay *g) { + uint16_t data; + + data = read_data(g); + return gdispNative2Color(data); + } + + LLDSPEC void gdisp_lld_read_stop(GDisplay *g) { + setwritemode(g); + release_bus(g); + } +#endif + +#if GDISP_NEED_CONTROL && GDISP_HARDWARE_CONTROL + LLDSPEC void gdisp_lld_control(GDisplay *g) { + switch(g->p.x) { + case GDISP_CONTROL_POWER: + if (g->g.Powermode == (powermode_t)g->p.ptr) + return; + + switch((powermode_t)g->p.ptr) { + case powerOff: + acquire_bus(g); + write_index(g, 0x28); + gfxSleepMilliseconds(10); + write_index(g, 0x10); + release_bus(g); + break; + + case powerOn: + acquire_bus(g); + write_index(g, 0x11); + gfxSleepMilliseconds(120); + write_index(g, 0x29); + release_bus(g); + if (g->g.Powermode != powerSleep) + gdisp_lld_init(g); + break; + + case powerSleep: + acquire_bus(g); + write_index(g, 0x28); + gfxSleepMilliseconds(10); + write_index(g, 0x10); + release_bus(g); + break; + + default: + return; + } + + g->g.Powermode = (powermode_t)g->p.ptr; + return; + + case GDISP_CONTROL_ORIENTATION: + if (g->g.Orientation == (orientation_t)g->p.ptr) + return; + + switch((orientation_t)g->p.ptr) { + case GDISP_ROTATE_0: + acquire_bus(g); + + write_index(g, 0x36); + write_data(g, 0x08); + + release_bus(g); + g->g.Height = GDISP_SCREEN_HEIGHT; + g->g.Width = GDISP_SCREEN_WIDTH; + break; + + case GDISP_ROTATE_90: + acquire_bus(g); + + write_index(g, 0x36); + write_data(g, 0x68); + + release_bus(g); + g->g.Height = GDISP_SCREEN_WIDTH; + g->g.Width = GDISP_SCREEN_HEIGHT; + break; + + case GDISP_ROTATE_180: + acquire_bus(g); + + write_index(g, 0x36); + write_data(g, 0xC8); + + release_bus(g); + g->g.Height = GDISP_SCREEN_HEIGHT; + g->g.Width = GDISP_SCREEN_WIDTH; + break; + + case GDISP_ROTATE_270: + acquire_bus(g); + + write_index(g, 0x36); + write_data(g, 0xA8); + + release_bus(g); + g->g.Height = GDISP_SCREEN_WIDTH; + g->g.Width = GDISP_SCREEN_HEIGHT; + break; + + default: + return; + } + + g->g.Orientation = (orientation_t)g->p.ptr; + return; + + default: + return; + } + } +#endif + +#endif /* GFX_USE_GDISP */ diff --git a/drivers/gdisp/ILI9488/gdisp_lld_config.h b/drivers/gdisp/ILI9488/gdisp_lld_config.h new file mode 100644 index 00000000..dd128d28 --- /dev/null +++ b/drivers/gdisp/ILI9488/gdisp_lld_config.h @@ -0,0 +1,25 @@ +/* + * This file is subject to the terms of the GFX License. If a copy of + * the license was not distributed with this file, you can obtain one at: + * + * http://ugfx.org/license.html + */ + +#ifndef _GDISP_LLD_CONFIG_H +#define _GDISP_LLD_CONFIG_H + +#if GFX_USE_GDISP + +/*===========================================================================*/ +/* Driver hardware support. */ +/*===========================================================================*/ + +#define GDISP_HARDWARE_STREAM_WRITE TRUE +#define GDISP_HARDWARE_STREAM_READ TRUE +#define GDISP_HARDWARE_CONTROL TRUE + +#define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_RGB565 + +#endif /* GFX_USE_GDISP */ + +#endif /* _GDISP_LLD_CONFIG_H */