aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authormobyfab <mobyfab@free.fr>2012-10-06 14:37:13 +0200
committermobyfab <mobyfab@free.fr>2012-10-06 14:37:13 +0200
commit52e9fb7d59d3019fe346e8cd65a6581238b51e2c (patch)
tree8e4e842f168cc137d5df9e65ea0913afbbde0f72 /src
parent142ee8f26dba68618743564ec34c01b6604b6b77 (diff)
parenta6e7a35b39ba36488dd7bc0a08d32226168e8871 (diff)
downloaduGFX-52e9fb7d59d3019fe346e8cd65a6581238b51e2c.tar.gz
uGFX-52e9fb7d59d3019fe346e8cd65a6581238b51e2c.tar.bz2
uGFX-52e9fb7d59d3019fe346e8cd65a6581238b51e2c.zip
Merge branch 'master' of https://github.com/Tectu/ChibiOS-GFX
Diffstat (limited to 'src')
-rw-r--r--src/touchpad.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/touchpad.c b/src/touchpad.c
index bdd6b386..bead82bc 100644
--- a/src/touchpad.c
+++ b/src/touchpad.c
@@ -157,11 +157,11 @@ uint16_t tpReadX(void) {
case GDISP_ROTATE_0:
return x;
case GDISP_ROTATE_90:
- return SCREEN_HEIGHT - y;
+ return y;
case GDISP_ROTATE_180:
- return SCREEN_WIDTH - x;
+ return SCREEN_WIDTH - x - 1;
case GDISP_ROTATE_270:
- return y;
+ return SCREEN_HEIGHT - y - 1;
}
return 0;
@@ -184,11 +184,11 @@ uint16_t tpReadY(void) {
case GDISP_ROTATE_0:
return y;
case GDISP_ROTATE_90:
- return x;
+ return SCREEN_WIDTH - x - 1;
case GDISP_ROTATE_180:
- return SCREEN_HEIGHT - y;
+ return SCREEN_HEIGHT - y - 1;
case GDISP_ROTATE_270:
- return SCREEN_WIDTH - x;
+ return x;
}
return 0;