diff options
| author | Tectu <joel@unormal.org> | 2012-08-24 02:37:03 +0200 |
|---|---|---|
| committer | Tectu <joel@unormal.org> | 2012-08-24 02:37:03 +0200 |
| commit | e24afca5e424218cd531eb0a8c88e0c8ebd3825c (patch) | |
| tree | e077994672fb8e38ffebde89ea25e468aa275253 /src/touchpad.c | |
| parent | fcfab985179f1a336c52bdbc03ac587767124708 (diff) | |
| parent | a7f5b7433e5a7c8ab8fd70cff0d26a1de2d66ccc (diff) | |
| download | uGFX-e24afca5e424218cd531eb0a8c88e0c8ebd3825c.tar.gz uGFX-e24afca5e424218cd531eb0a8c88e0c8ebd3825c.tar.bz2 uGFX-e24afca5e424218cd531eb0a8c88e0c8ebd3825c.zip | |
Merge branch 'master' of github.com:Tectu/ChibiOS-LCD-Driver
Diffstat (limited to 'src/touchpad.c')
| -rw-r--r-- | src/touchpad.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/touchpad.c b/src/touchpad.c index a18930da..44d5f426 100644 --- a/src/touchpad.c +++ b/src/touchpad.c @@ -158,8 +158,7 @@ uint16_t tpReadX(void) { x = cal.xm * _tpReadRealX() + cal.xn; y = cal.ym * _tpReadRealY() + cal.yn; - /* - switch(gdispGetOrientation()) { // implement gdispGetOrientation() + switch(gdispGetOrientation()) { case portrait: return x; case landscape: @@ -169,9 +168,6 @@ uint16_t tpReadX(void) { case landscapeInv: return y; } - */ - - return x; } /** @@ -187,8 +183,7 @@ uint16_t tpReadY(void) { x = cal.xm * _tpReadRealX() + cal.xn; y = cal.ym * _tpReadRealY() + cal.yn; - /* - switch(gdispGetOrientation()) { // implement gdispGetOrientation() + switch(gdispGetOrientation()) { case portrait: return y; case landscape: @@ -198,9 +193,6 @@ uint16_t tpReadY(void) { case landscapeInv: return SCREEN_WIDTH - x; } - */ - - return y; } void tpCalibrate(void) { |