uGFX/ugfx
2
0
Fork 0
Code Issues 2 Pull requests Projects Releases Wiki Activity

ILI9341 driver fixes

Browse source
This commit is contained in:
inmarket 2013-10-29 01:12:03 +10:00
parent 553dea5fcd
commit ffee80299d
2 changed files with 5 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
drivers/gdisp/ILI9341/gdisp_lld_ILI9341.c
View file

@ -60,22 +60,6 @@
#define delay(us) gfxSleepMicroseconds(us) #define delay(us) gfxSleepMicroseconds(us)
#define delayms(ms) gfxSleepMilliseconds(ms) #define delayms(ms) gfxSleepMilliseconds(ms)
static inline void set_cursor(GDisplay *g) {
write_index(g, 0x2A);
write_data(g, (g->p.x >> 8));
write_data(g, (uint8_t) g->p.x);
write_data(g, (g->p.x) >> 8);
write_data(g, (uint8_t) (g->p.x));
write_index(g, 0x2B);
write_data(g, (g->p.y >> 8));
write_data(g, (uint8_t) g->p.y);
write_data(g, (g->p.y) >> 8);
write_data(g, (uint8_t) (g->p.y));
write_index(g, 0x2C);
}
static void set_viewport(GDisplay *g) { static void set_viewport(GDisplay *g) {
write_index(g, 0x2A); write_index(g, 0x2A);
write_data(g, (g->p.x >> 8)); write_data(g, (g->p.x >> 8));
@ -259,9 +243,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
LLDSPEC void gdisp_lld_write_start(GDisplay *g) { LLDSPEC void gdisp_lld_write_start(GDisplay *g) {
acquire_bus(g); acquire_bus(g);
set_viewport(g); set_viewport(g);
#if !GDISP_HARDWARE_STREAM_POS write_index(g, 0x2C);
set_cursor(g);
#endif
} }
LLDSPEC void gdisp_lld_write_color(GDisplay *g) { LLDSPEC void gdisp_lld_write_color(GDisplay *g) {
write_data16(g, g->p.color); write_data16(g, g->p.color);
@ -269,18 +251,13 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
LLDSPEC void gdisp_lld_write_stop(GDisplay *g) { LLDSPEC void gdisp_lld_write_stop(GDisplay *g) {
release_bus(g); release_bus(g);
} }
#if GDISP_HARDWARE_STREAM_POS
LLDSPEC void gdisp_lld_write_pos(GDisplay *g) {
set_cursor(g);
}
#endif
#endif #endif
#if GDISP_HARDWARE_STREAM_READ #if GDISP_HARDWARE_STREAM_READ
LLDSPEC void gdisp_lld_read_start(GDisplay *g) { LLDSPEC void gdisp_lld_read_start(GDisplay *g) {
acquire_bus(g); acquire_bus(g);
set_viewport(g); set_viewport(g);
set_cursor(g); write_index(g, 0x2E);
setreadmode(g); setreadmode(g);
dummy_read(g); dummy_read(g);
} }
@ -331,21 +308,21 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
break; break;
case GDISP_ROTATE_90: case GDISP_ROTATE_90:
acquire_bus(g); acquire_bus(g);
write_reg(g, 0x36, 0x20); /* Invert X and Y axes */ write_reg(g, 0x36, 0xE8); /* Invert X and Y axes */
release_bus(g); release_bus(g);
g->g.Height = GDISP_SCREEN_WIDTH; g->g.Height = GDISP_SCREEN_WIDTH;
g->g.Width = GDISP_SCREEN_HEIGHT; g->g.Width = GDISP_SCREEN_HEIGHT;
break; break;
case GDISP_ROTATE_180: case GDISP_ROTATE_180:
acquire_bus(g); acquire_bus(g);
write_reg(g, 0x36, 0x80); /* X and Y axes non-inverted */ write_reg(g, 0x36, 0x88); /* X and Y axes non-inverted */
release_bus(g); release_bus(g);
g->g.Height = GDISP_SCREEN_HEIGHT; g->g.Height = GDISP_SCREEN_HEIGHT;
g->g.Width = GDISP_SCREEN_WIDTH; g->g.Width = GDISP_SCREEN_WIDTH;
break; break;
case GDISP_ROTATE_270: case GDISP_ROTATE_270:
acquire_bus(g); acquire_bus(g);
write_reg(g, 0x36, 0xE0); /* Invert X and Y axes */ write_reg(g, 0x36, 0x28); /* Invert X and Y axes */
release_bus(g); release_bus(g);
g->g.Height = GDISP_SCREEN_WIDTH; g->g.Height = GDISP_SCREEN_WIDTH;
g->g.Width = GDISP_SCREEN_HEIGHT; g->g.Width = GDISP_SCREEN_HEIGHT;

1
drivers/gdisp/ILI9341/gdisp_lld_config.h
View file

@ -25,7 +25,6 @@
#define GDISP_HARDWARE_STREAM_WRITE TRUE #define GDISP_HARDWARE_STREAM_WRITE TRUE
//#define GDISP_HARDWARE_STREAM_READ TRUE //#define GDISP_HARDWARE_STREAM_READ TRUE
//#define GDISP_HARDWARE_STREAM_POS TRUE
#define GDISP_HARDWARE_CONTROL TRUE #define GDISP_HARDWARE_CONTROL TRUE
#define GDISP_PIXELFORMAT GDISP_PIXELFORMAT_RGB565 #define GDISP_PIXELFORMAT GDISP_PIXELFORMAT_RGB565