aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJoel Bodenmann <joel@unormal.org>2012-11-10 16:46:02 +0100
committerJoel Bodenmann <joel@unormal.org>2012-11-10 16:46:02 +0100
commit5a5db64288414162a31a7e755757c32ddf55bf6c (patch)
tree3a86993c6bd65f894642e9484a005fc340cec66f /src
parentcc5ae04b7bba81739bf9b8f5c9a79ea98e6e9319 (diff)
downloaduGFX-5a5db64288414162a31a7e755757c32ddf55bf6c.tar.gz
uGFX-5a5db64288414162a31a7e755757c32ddf55bf6c.tar.bz2
uGFX-5a5db64288414162a31a7e755757c32ddf55bf6c.zip
renamed tsIRQ() into tsPressed()
Diffstat (limited to 'src')
-rw-r--r--src/touchscreen.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/touchscreen.c b/src/touchscreen.c
index b6a1a0c3..7c2ec34f 100644
--- a/src/touchscreen.c
+++ b/src/touchscreen.c
@@ -270,8 +270,8 @@ coord_t tsReadY(void) {
* @api
*/
#if TOUCHSCREEN_HAS_IRQ || defined(__DOXYGEN__)
- bool_t tsIRQ(void) {
- return ts_lld_irq();
+ bool_t tsPressed(void) {
+ return ts_lld_pressed();
}
#endif
@@ -311,7 +311,7 @@ calibrate:
#endif
_tsDrawCross(cross[i][0], cross[i][1]);
- while(!tsIRQ())
+ while(!tsPressed())
chThdSleepMilliseconds(2); /* Be nice to other threads*/
chThdSleepMilliseconds(20); /* Allow screen to settle */
@@ -321,8 +321,8 @@ calibrate:
px = py = 0;
j = 0;
- while (j < MAX_CAL_SAMPLES) {
- if (tsIRQ()) {
+ while(j < MAX_CAL_SAMPLES) {
+ if(tsPressed()) {
/* We have valid pointer data */
px += _tsReadRealX();
py += _tsReadRealY();
@@ -336,7 +336,7 @@ calibrate:
chThdSleepMilliseconds(100);
- while(tsIRQ())
+ while(tsPressed())
chThdSleepMilliseconds(2); /* Be nice to other threads*/
gdispFillArea(cross[i][0] - 15, cross[i][1] - 15, 42, 42, Blue);