From 5a5db64288414162a31a7e755757c32ddf55bf6c Mon Sep 17 00:00:00 2001 From: Joel Bodenmann Date: Sat, 10 Nov 2012 16:46:02 +0100 Subject: renamed tsIRQ() into tsPressed() --- src/touchscreen.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src') 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); -- cgit v1.2.3