diff options
| author | inmarket <andrewh@inmarket.com.au> | 2013-10-29 01:12:03 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2013-10-29 01:12:03 +1000 |
| commit | ffee80299d616f1b634eacb514fcd7b3e4dc1a02 (patch) | |
| tree | 2a101d641458753bfe255e6703dd4e1413c2dfbc | |
| parent | 553dea5fcdd38a8bbc09c9181199916fd36a841b (diff) | |
| download | uGFX-ffee80299d616f1b634eacb514fcd7b3e4dc1a02.tar.gz uGFX-ffee80299d616f1b634eacb514fcd7b3e4dc1a02.tar.bz2 uGFX-ffee80299d616f1b634eacb514fcd7b3e4dc1a02.zip | |
ILI9341 driver fixes
| -rw-r--r-- | drivers/gdisp/ILI9341/gdisp_lld_ILI9341.c | 33 | ||||
| -rw-r--r-- | drivers/gdisp/ILI9341/gdisp_lld_config.h | 1 |
2 files changed, 5 insertions, 29 deletions
diff --git a/drivers/gdisp/ILI9341/gdisp_lld_ILI9341.c b/drivers/gdisp/ILI9341/gdisp_lld_ILI9341.c index e5c4b7d0..33ca68d4 100644 --- a/drivers/gdisp/ILI9341/gdisp_lld_ILI9341.c +++ b/drivers/gdisp/ILI9341/gdisp_lld_ILI9341.c @@ -60,22 +60,6 @@ #define delay(us) gfxSleepMicroseconds(us) #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) { write_index(g, 0x2A); 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) { acquire_bus(g); set_viewport(g); - #if !GDISP_HARDWARE_STREAM_POS - set_cursor(g); - #endif + write_index(g, 0x2C); } LLDSPEC void gdisp_lld_write_color(GDisplay *g) { 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) { release_bus(g); } - #if GDISP_HARDWARE_STREAM_POS - LLDSPEC void gdisp_lld_write_pos(GDisplay *g) { - set_cursor(g); - } - #endif #endif #if GDISP_HARDWARE_STREAM_READ LLDSPEC void gdisp_lld_read_start(GDisplay *g) { acquire_bus(g); set_viewport(g); - set_cursor(g); + write_index(g, 0x2E); setreadmode(g); dummy_read(g); } @@ -331,21 +308,21 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { break; case GDISP_ROTATE_90: 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); g->g.Height = GDISP_SCREEN_WIDTH; g->g.Width = GDISP_SCREEN_HEIGHT; break; case GDISP_ROTATE_180: 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); g->g.Height = GDISP_SCREEN_HEIGHT; g->g.Width = GDISP_SCREEN_WIDTH; break; case GDISP_ROTATE_270: 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); g->g.Height = GDISP_SCREEN_WIDTH; g->g.Width = GDISP_SCREEN_HEIGHT; diff --git a/drivers/gdisp/ILI9341/gdisp_lld_config.h b/drivers/gdisp/ILI9341/gdisp_lld_config.h index 8246934d..ba9c05bc 100644 --- a/drivers/gdisp/ILI9341/gdisp_lld_config.h +++ b/drivers/gdisp/ILI9341/gdisp_lld_config.h @@ -25,7 +25,6 @@ #define GDISP_HARDWARE_STREAM_WRITE TRUE //#define GDISP_HARDWARE_STREAM_READ TRUE -//#define GDISP_HARDWARE_STREAM_POS TRUE #define GDISP_HARDWARE_CONTROL TRUE #define GDISP_PIXELFORMAT GDISP_PIXELFORMAT_RGB565 |