diff options
author | inmarket <andrewh@inmarket.com.au> | 2018-07-08 13:51:20 +1000 |
---|---|---|
committer | inmarket <andrewh@inmarket.com.au> | 2018-07-08 13:51:20 +1000 |
commit | e61f0ae4248bdafeace54c330d488904a495c045 (patch) | |
tree | 448c5f4e99ae94fd41a99b3082b35208b2ba7c5f /drivers/gdisp/ED060SC4 | |
parent | d9258efd4dac2b7939bb11707cbbdfa135c02bf5 (diff) | |
download | uGFX-e61f0ae4248bdafeace54c330d488904a495c045.tar.gz uGFX-e61f0ae4248bdafeace54c330d488904a495c045.tar.bz2 uGFX-e61f0ae4248bdafeace54c330d488904a495c045.zip |
Added type gOrientation to replace V2.x orientation_t, and values gOrientationX replace GDISP_ROTATE_X
Diffstat (limited to 'drivers/gdisp/ED060SC4')
-rw-r--r-- | drivers/gdisp/ED060SC4/gdisp_lld_ED060SC4.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/gdisp/ED060SC4/gdisp_lld_ED060SC4.c b/drivers/gdisp/ED060SC4/gdisp_lld_ED060SC4.c index 0e2e7599..a77445ba 100644 --- a/drivers/gdisp/ED060SC4/gdisp_lld_ED060SC4.c +++ b/drivers/gdisp/ED060SC4/gdisp_lld_ED060SC4.c @@ -448,7 +448,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) { /* Initialise the GDISP structure */ g->g.Width = GDISP_SCREEN_WIDTH; g->g.Height = GDISP_SCREEN_HEIGHT; - g->g.Orientation = GDISP_ROTATE_0; + g->g.Orientation = gOrientation0; g->g.Powermode = gPowerOn; g->g.Backlight = 100; g->g.Contrast = 100; @@ -489,25 +489,25 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) { switch(g->g.Orientation) { default: - case GDISP_ROTATE_0: + case gOrientation0: bx = g->p.x / EINK_BLOCKWIDTH; dx = g->p.x % EINK_BLOCKWIDTH; by = g->p.y / EINK_BLOCKHEIGHT; dy = g->p.y % EINK_BLOCKHEIGHT; break; - case GDISP_ROTATE_90: + case gOrientation90: bx = g->p.y / EINK_BLOCKWIDTH; dx = g->p.y % EINK_BLOCKWIDTH; by = (GDISP_SCREEN_HEIGHT-1 - g->p.x) / EINK_BLOCKHEIGHT; dy = (GDISP_SCREEN_HEIGHT-1 - g->p.x) % EINK_BLOCKHEIGHT; break; - case GDISP_ROTATE_180: + case gOrientation180: bx = (GDISP_SCREEN_WIDTH-1 - g->p.x) / EINK_BLOCKWIDTH; dx = (GDISP_SCREEN_WIDTH-1 - g->p.x) % EINK_BLOCKWIDTH; by = (GDISP_SCREEN_HEIGHT-1 - g->p.y) / EINK_BLOCKHEIGHT; dy = (GDISP_SCREEN_HEIGHT-1 - g->p.y) % EINK_BLOCKHEIGHT; break; - case GDISP_ROTATE_270: + case gOrientation270: bx = (GDISP_SCREEN_WIDTH-1 - g->p.y) / EINK_BLOCKWIDTH; dx = (GDISP_SCREEN_WIDTH-1 - g->p.y) % EINK_BLOCKWIDTH; by = g->p.x / EINK_BLOCKHEIGHT; @@ -551,23 +551,23 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) { return; case GDISP_CONTROL_ORIENTATION: - if (g->g.Orientation == (orientation_t)g->p.ptr) + if (g->g.Orientation == (gOrientation)g->p.ptr) return; - switch((orientation_t)g->p.ptr) { - case GDISP_ROTATE_0: - case GDISP_ROTATE_180: + switch((gOrientation)g->p.ptr) { + case gOrientation0: + case gOrientation180: g->g.Height = GDISP_SCREEN_HEIGHT; g->g.Width = GDISP_SCREEN_WIDTH; break; - case GDISP_ROTATE_90: - case GDISP_ROTATE_270: + case gOrientation90: + case gOrientation270: g->g.Height = GDISP_SCREEN_WIDTH; g->g.Width = GDISP_SCREEN_HEIGHT; break; default: return; } - g->g.Orientation = (orientation_t)g->p.ptr; + g->g.Orientation = (gOrientation)g->p.ptr; return; default: |