diff options
| author | Joel Bodenmann <joel@unormal.org> | 2012-10-05 09:12:57 +0200 |
|---|---|---|
| committer | Joel Bodenmann <joel@unormal.org> | 2012-10-05 09:12:57 +0200 |
| commit | ec637ad2df8bc938813ece64496f0965743fabfc (patch) | |
| tree | 576ff32fc989b9c85d0c324148a21712002d92a0 /drivers/gdisp/S6D1121/s6d1121_lld.c.h | |
| parent | d6b17a157392b40a1131fe70d798ad3eaab6378f (diff) | |
| download | uGFX-ec637ad2df8bc938813ece64496f0965743fabfc.tar.gz uGFX-ec637ad2df8bc938813ece64496f0965743fabfc.tar.bz2 uGFX-ec637ad2df8bc938813ece64496f0965743fabfc.zip | |
Revert "rename of orientation"
This reverts commit d6b17a157392b40a1131fe70d798ad3eaab6378f.
Diffstat (limited to 'drivers/gdisp/S6D1121/s6d1121_lld.c.h')
| -rw-r--r-- | drivers/gdisp/S6D1121/s6d1121_lld.c.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/gdisp/S6D1121/s6d1121_lld.c.h b/drivers/gdisp/S6D1121/s6d1121_lld.c.h index b4b24469..1d7ede61 100644 --- a/drivers/gdisp/S6D1121/s6d1121_lld.c.h +++ b/drivers/gdisp/S6D1121/s6d1121_lld.c.h @@ -182,19 +182,19 @@ static void lld_lcdSetCursor(coord_t x, coord_t y) { * R21h - 9 bit
*/
switch(GDISP.Orientation) {
- case GDISP_ROTATE_0Inv:
+ case portraitInv:
lld_lcdWriteReg(0x0020, (SCREEN_WIDTH-1-x) & 0x00FF);
lld_lcdWriteReg(0x0021, (SCREEN_HEIGHT-1-y) & 0x01FF);
break;
- case GDISP_ROTATE_0:
+ case portrait:
lld_lcdWriteReg(0x0020, x & 0x00FF);
lld_lcdWriteReg(0x0021, y & 0x01FF);
break;
- case GDISP_ROTATE_90:
+ case landscape:
lld_lcdWriteReg(0x0020, y & 0x00FF);
lld_lcdWriteReg(0x0021, x & 0x01FF);
break;
- case GDISP_ROTATE_90Inv:
+ case landscapeInv:
lld_lcdWriteReg(0x0020, (SCREEN_WIDTH - y - 1) & 0x00FF);
lld_lcdWriteReg(0x0021, (SCREEN_HEIGHT - x - 1) & 0x01FF);
break;
@@ -208,22 +208,22 @@ static void lld_lcdSetViewPort(uint16_t x, uint16_t y, uint16_t cx, uint16_t cy) */
switch(GDISP.Orientation) {
- case GDISP_ROTATE_0:
+ case portrait:
lld_lcdWriteReg(0x46, (((x+cx-1) << 8) & 0xFF00 ) | (x & 0x00FF));
lld_lcdWriteReg(0x48, y & 0x01FF);
lld_lcdWriteReg(0x47, (y+cy-1) & 0x01FF);
break;
- case GDISP_ROTATE_90:
+ case landscape:
lld_lcdWriteReg(0x46, (((x+cx-1) << 8) & 0xFF00) | ((y+cy) & 0x00FF));
lld_lcdWriteReg(0x48, x & 0x01FF);
lld_lcdWriteReg(0x47, (x+cx-1) & 0x01FF);
break;
- case GDISP_ROTATE_0Inv:
+ case portraitInv:
lld_lcdWriteReg(0x46, (((SCREEN_WIDTH-x-1) & 0x00FF) << 8) | ((SCREEN_WIDTH - (x+cx)) & 0x00FF));
lld_lcdWriteReg(0x48, (SCREEN_HEIGHT-(y+cy)) & 0x01FF);
lld_lcdWriteReg(0x47, (SCREEN_HEIGHT-y-1) & 0x01FF);
break;
- case GDISP_ROTATE_90Inv:
+ case landscapeInv:
lld_lcdWriteReg(0x46, (((SCREEN_WIDTH - y - 1) & 0x00FF) << 8) | ((SCREEN_WIDTH - (y+cy)) & 0x00FF));
lld_lcdWriteReg(0x48, (SCREEN_HEIGHT - (x+cx)) & 0x01FF);
lld_lcdWriteReg(0x47, (SCREEN_HEIGHT - x - 1) & 0x01FF);
@@ -235,12 +235,12 @@ static void lld_lcdSetViewPort(uint16_t x, uint16_t y, uint16_t cx, uint16_t cy) static void lld_lcdResetViewPort(void) {
switch(GDISP.Orientation) {
- case GDISP_ROTATE_0:
- case GDISP_ROTATE_0Inv:
+ case portrait:
+ case portraitInv:
lld_lcdSetViewPort(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT);
break;
- case GDISP_ROTATE_90:
- case GDISP_ROTATE_90Inv:
+ case landscape:
+ case landscapeInv:
lld_lcdSetViewPort(0, 0, SCREEN_HEIGHT, SCREEN_WIDTH);
break;
}
|