diff options
author | Thomas Sterren <thomas.sterren@simulton.com> | 2018-03-06 09:38:37 +0100 |
---|---|---|
committer | Thomas Sterren <thomas.sterren@simulton.com> | 2018-03-06 09:38:37 +0100 |
commit | 65d00b16b9fbb46ecd69a383dc4adde5c5c03790 (patch) | |
tree | 30920f0457522be32ce2b332afe0d2916d93cf66 /drivers/gdisp/ST7735 | |
parent | 992850bcb1992ff052d5ac2379e4675a34861723 (diff) | |
parent | f265924396167729e8d9fb36a0383263f36c1270 (diff) | |
download | uGFX-65d00b16b9fbb46ecd69a383dc4adde5c5c03790.tar.gz uGFX-65d00b16b9fbb46ecd69a383dc4adde5c5c03790.tar.bz2 uGFX-65d00b16b9fbb46ecd69a383dc4adde5c5c03790.zip |
Merge branch 'master' of https://git.ugfx.io/uGFX/uGFX
Diffstat (limited to 'drivers/gdisp/ST7735')
-rw-r--r-- | drivers/gdisp/ST7735/gdisp_lld_ST7735.c | 16 | ||||
-rw-r--r-- | drivers/gdisp/ST7735/gdisp_lld_config.h | 6 |
2 files changed, 11 insertions, 11 deletions
diff --git a/drivers/gdisp/ST7735/gdisp_lld_ST7735.c b/drivers/gdisp/ST7735/gdisp_lld_ST7735.c index c0bf2164..ea1966a5 100644 --- a/drivers/gdisp/ST7735/gdisp_lld_ST7735.c +++ b/drivers/gdisp/ST7735/gdisp_lld_ST7735.c @@ -43,19 +43,19 @@ // Define one of supported type, if not defined yet #if !defined(ST7735_TYPE_R) && !defined(ST7735_TYPE_B) // It seems all modern boards is 7735R - #define ST7735_TYPE_R TRUE + #define ST7735_TYPE_R GFXON #endif // Define one of supported color packing, if not defined yet #if !defined(ST7735_COLOR_RGB) && !defined(ST7735_COLOR_BRG) // It seems all modern boards is RGB - #define ST7735_COLOR_RGB TRUE + #define ST7735_COLOR_RGB GFXON #endif // Strange boars with shifted coords #if !defined (ST7735_SHIFTED_COORDS) - #define ST7735_SHIFTED_COORDS FALSE + #define ST7735_SHIFTED_COORDS GFXOFF #endif @@ -193,12 +193,12 @@ static const unsigned char ST7735_NORON , DELAY, // 3: Normal display on, no args, w/delay 10, // 10 ms delay ST7735_DISPON , DELAY, // 4: Main screen turn on, no args w/delay - 100 + 100 }; // 100 ms delay #endif -static void execute_cmds (const uint8_t *addr) { +static void execute_cmds(GDisplay *g, const uint8_t *addr) { unsigned int cmds = *addr++; while (cmds--) { @@ -211,7 +211,7 @@ static void execute_cmds (const uint8_t *addr) { if (ms) { ms = *addr++; gfxSleepMilliseconds(ms==255?500:ms); - } + } } } @@ -231,7 +231,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { // Get the bus for the following initialisation commands acquire_bus(g); - execute_cmds (init_cmds); + execute_cmds(g, init_cmds); release_bus(g); // Finish Init @@ -252,7 +252,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { static void set_viewport(GDisplay *g) { write_cmd (g, ST7735_CASET); - write_data (g, g->p.x+ST7735_COL_SHIFT); + write_data (g, g->p.x+ST7735_COL_SHIFT); write_data (g, g->p.x+g->p.cx-1+ST7735_COL_SHIFT); write_cmd (g, ST7735_RASET); write_data (g, g->p.y+ST7735_ROW_SHIFT); diff --git a/drivers/gdisp/ST7735/gdisp_lld_config.h b/drivers/gdisp/ST7735/gdisp_lld_config.h index 5c76924e..b910e3d1 100644 --- a/drivers/gdisp/ST7735/gdisp_lld_config.h +++ b/drivers/gdisp/ST7735/gdisp_lld_config.h @@ -12,9 +12,9 @@ /* Driver hardware support. */ /*===========================================================================*/ -#define GDISP_HARDWARE_STREAM_WRITE TRUE -#define GDISP_HARDWARE_CONTROL TRUE -#define GDISP_HARDWARE_FILLS TRUE +#define GDISP_HARDWARE_STREAM_WRITE GFXON +#define GDISP_HARDWARE_CONTROL GFXON +#define GDISP_HARDWARE_FILLS GFXON #define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_RGB565 |