diff options
| author | inmarket <andrewh@inmarket.com.au> | 2015-05-10 17:12:30 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2015-05-10 17:12:30 +1000 |
| commit | af4d4c2da7ae717a5953f2c0bf3cb0d318995756 (patch) | |
| tree | 768f4e80c8da56c18e3cfd7f5c2858ebac5cd770 | |
| parent | 1a09f151e2b8998af522db463780d5bf7e50ca89 (diff) | |
| download | uGFX-af4d4c2da7ae717a5953f2c0bf3cb0d318995756.tar.gz uGFX-af4d4c2da7ae717a5953f2c0bf3cb0d318995756.tar.bz2 uGFX-af4d4c2da7ae717a5953f2c0bf3cb0d318995756.zip | |
Fixes to SSD1331
| -rw-r--r-- | drivers/gdisp/SSD1331/gdisp_lld_SSD1331.c | 11 | ||||
| -rw-r--r-- | drivers/gdisp/SSD1331/gdisp_lld_config.h | 4 |
2 files changed, 6 insertions, 9 deletions
diff --git a/drivers/gdisp/SSD1331/gdisp_lld_SSD1331.c b/drivers/gdisp/SSD1331/gdisp_lld_SSD1331.c index d53fa27e..f3d4e225 100644 --- a/drivers/gdisp/SSD1331/gdisp_lld_SSD1331.c +++ b/drivers/gdisp/SSD1331/gdisp_lld_SSD1331.c @@ -54,7 +54,7 @@ /* Driver exported functions. */ /*===========================================================================*/ -static const initdata[] = { +static const uint8_t initdata[] = { SSD1331_DISPLAY_OFF, SSD1331_START_LINE, 0x00, SSD1331_COM_OFFSET, 0x00, @@ -88,7 +88,7 @@ static const initdata[] = { }; LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { - int i; + unsigned i; // No private area for this controller g->priv = 0; @@ -108,17 +108,14 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { for(i=0;i<sizeof(initdata);i++) write_cmd(g, initdata[i]); - gfxSleepMilliseconds(2); write_cmd(g, SSD1331_DISPLAY_ON); + // Release the bus release_bus(g); // Finish Init post_init_board(g); - // Release the bus - release_bus(g); - /* Initialise the GDISP structure */ g->g.Width = GDISP_SCREEN_WIDTH; g->g.Height = GDISP_SCREEN_HEIGHT; @@ -174,7 +171,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { return; } - #if GDISP_LLD_PIXELFORMAT == GDISP_PIXELFORMAT_RGB565 || GDISP_LLD_PIXELFORMAT == GDISP_PIXELFORMAT_RGB322 + #if GDISP_LLD_PIXELFORMAT == GDISP_PIXELFORMAT_RGB565 || GDISP_LLD_PIXELFORMAT == GDISP_PIXELFORMAT_RGB332 c6 = RED_OF(g->p.color) >> 2; #if COLOR_BITS_R < 5 if (c6 & 0x20) c6 |= (1<<(6-COLOR_BITS_R))-1; diff --git a/drivers/gdisp/SSD1331/gdisp_lld_config.h b/drivers/gdisp/SSD1331/gdisp_lld_config.h index d941f714..dbbb3501 100644 --- a/drivers/gdisp/SSD1331/gdisp_lld_config.h +++ b/drivers/gdisp/SSD1331/gdisp_lld_config.h @@ -21,8 +21,8 @@ #define GDISP_HARDWARE_CONTROL TRUE // This driver supports 4 pixel formats - pick the one you want. -//#define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_RGB565 -#define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_BGR565 +#define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_RGB565 +//#define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_BGR565 //#define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_RGB332 //#define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_BGR332 |