aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Bodenmann <joel@unormal.org>2012-10-08 00:26:18 +0200
committerJoel Bodenmann <joel@unormal.org>2012-10-08 00:26:18 +0200
commitdb5d270a401b2e444b0e0bfff1cb3e68fd3aa12b (patch)
tree71934814b404be4286ef21895292fd4c5142b372
parent2ec39c7dbbfa9ce01c517a6204d85a0357a4e66f (diff)
downloaduGFX-db5d270a401b2e444b0e0bfff1cb3e68fd3aa12b.tar.gz
uGFX-db5d270a401b2e444b0e0bfff1cb3e68fd3aa12b.tar.bz2
uGFX-db5d270a401b2e444b0e0bfff1cb3e68fd3aa12b.zip
cleanup
-rw-r--r--src/touchpad.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/touchpad.c b/src/touchpad.c
index b55823dc..6f5ea537 100644
--- a/src/touchpad.c
+++ b/src/touchpad.c
@@ -149,7 +149,8 @@ void tpInit(const TOUCHPADDriver *tp) {
*/
uint16_t tpReadX(void) {
uint16_t x, y;
-#if defined(TOUCHPAD_XY_INVERTED) && (TOUCHPAD_XY_INVERTED == TRUE)
+
+#if TOUCHPAD_XY_INVERTED == TRUE
x = cal.xm * _tpReadRealY() + cal.xn;
y = cal.ym * _tpReadRealX() + cal.yn;
#else
@@ -179,7 +180,8 @@ uint16_t tpReadX(void) {
*/
uint16_t tpReadY(void) {
uint16_t x, y;
-#if defined(TOUCHPAD_XY_INVERTED) && (TOUCHPAD_XY_INVERTED == TRUE)
+
+#if TOUCHPAD_XY_INVERTED == TRUE
x = cal.xm * _tpReadRealY() + cal.xn;
y = cal.ym * _tpReadRealX() + cal.yn;
#else