From 8571e67d6a7cfb042ebd7dded77094b56409f126 Mon Sep 17 00:00:00 2001 From: Kevin Townsend Date: Tue, 24 Apr 2012 21:40:38 +0200 Subject: [PATCH] Fixed TS calib bug --- drivers/displays/tft/touchscreen.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/drivers/displays/tft/touchscreen.c b/drivers/displays/tft/touchscreen.c index 1ac7821..381976a 100644 --- a/drivers/displays/tft/touchscreen.c +++ b/drivers/displays/tft/touchscreen.c @@ -413,20 +413,9 @@ tsTouchError_t tsRead(tsTouchData_t* data, uint8_t calibrating) tsPoint_t location, touch; touch.x = x1; touch.y = y1; - // Only calculate the relative LCD value if this isn't for calibration - if (!calibrating) - { - getDisplayPoint( &location, &touch, &_tsMatrix) ; - data->xlcd = location.x; - data->ylcd = location.y; - } - else - { - // Assign some false values, but only xraw and yraw are - // used for calibration - data->xlcd = 0; - data->ylcd = 0; - } + getDisplayPoint( &location, &touch, &_tsMatrix) ; + data->xlcd = location.x; + data->ylcd = location.y; data->valid = true; return TS_ERROR_NONE; -- 2.20.1