Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-05 07:12:54 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

drivers/input/ft5x06.c: Fix a problem was was causing missing reports when the touch ends.

Browse Source
This commit is contained in:
Gregory Nutt
2017-12-18 20:06:42 -06:00
parent d9997846b6
commit d29de95996
2 changed files with 50 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configs/lpcxpresso-lpc54628/README.txt
+4 -8
View File
@@ -68,14 +68,10 @@ STATUS
based poll instead of interrupts. This is very inefficient in that it
will introduce delays in touchscreen response and will consume more CPU
bandwidth. The driver appears to be functional. Added the nxwm
configuration to do some integrated testing. It does not yet work and
I have not yet looked into the cause of the problem:
Initialize the NSH library
createTaskbar: Create CTaskbar instance
createTaskbar: Connect CTaskbar instance to the NX server
createTaskbar: ERROR: Failed to connect CTaskbar instance to the NX server
nxwm_main: ERROR: Failed to create the task bar
configuration to do some integrated testing. NxWM seems to be fully
functional. However, the action of the touchscreen could use some
human factors improvements. I imagine that this is a consequence of
the polled solution.
Configurations
==============
drivers/input/ft5x06.c
+46 -29
View File
@@ -212,7 +212,7 @@ static const struct file_operations ft5x06_fops =
static const uint8_t g_event_map[4] =
{
(TOUCH_DOWN | TOUCH_ID_VALID | TOUCH_POS_VALID), /* FT5x06_DOWN */
(TOUCH_UP | TOUCH_ID_VALID | TOUCH_POS_VALID), /* FT5x06_UP */
(TOUCH_UP | TOUCH_ID_VALID), /* FT5x06_UP */
(TOUCH_MOVE | TOUCH_ID_VALID | TOUCH_POS_VALID), /* FT5x06_CONTACT */
TOUCH_ID_VALID /* FT5x06_INVALID */
};
@@ -321,7 +321,9 @@ static void ft5x06_data_worker(FAR void *arg)
if (ret >= 0)
{
/* In polled mode, we may read invalid touch data. If there is
* no touch data, the FT5x06 returns all 0xff.
* no touch data, the FT5x06 returns all 0xff the very first time.
* After that, it returns the same old stale data when there is
* no touch data.
*/
sample = (FAR struct ft5x06_touch_data_s *)priv->touchbuf;
@@ -347,7 +349,9 @@ static void ft5x06_data_worker(FAR void *arg)
}
else if (priv->delay < POLL_MAXDELAY)
{
/* Let it rise gradually to the maximum if there is no touch */
/* Otherwise, let the poll rate rise gradually up to the maximum
* if there is no touch.
*/
priv->delay += POLL_INCREMENT;
}
@@ -467,17 +471,10 @@ static ssize_t ft5x06_sample(FAR struct ft5x06_dev_s *priv, FAR char *buffer,
/* Raw data pointers (source) */
raw = (FAR struct ft5x06_touch_data_s *)priv->touchbuf;
if (raw->tdstatus != 1)
{
priv->valid = false;
return 0; /* No touches read. */
}
touch = raw->touch;
/* Get the reported X and Y positions */
touch = raw->touch;
#ifdef CONFIG_FT5X06_SWAPXY
y = TOUCH_POINT_GET_X(touch[0]);
x = TOUCH_POINT_GET_Y(touch[0]);
@@ -491,37 +488,51 @@ static ssize_t ft5x06_sample(FAR struct ft5x06_dev_s *priv, FAR char *buffer,
event = TOUCH_POINT_GET_EVENT(touch[0]);
id = TOUCH_POINT_GET_ID(touch[0]);
if (event == FT5x06_INVALID)
{
priv->lastevent = FT5x06_INVALID;
goto drop;
}
if (id == priv->lastid && event == priv->lastevent)
{
int16_t deltax;
int16_t deltay;
/* Same ID and event.. Is there positional data? */
/* Same ID and event.. Compare the change in position from the last
* report.
*/
deltax = (x - priv->lastx);
if (deltax < 0)
if (raw->tdstatus == 0 || event == FT5x06_UP)
{
deltax = -deltax;
/* No... no new touch data */
goto drop;
}
if (deltax < CONFIG_FT5X06_THRESHX)
else
{
/* There as been no significant change in X, try Y */
int16_t deltax;
int16_t deltay;
deltay = (y - priv->lasty);
if (deltay < 0)
/* Compare the change in position from the last report. */
deltax = (x - priv->lastx);
if (deltax < 0)
{
deltay = -deltay;
deltax = -deltax;
}
if (deltax < CONFIG_FT5X06_THRESHX)
{
/* Ignore... no significant change in Y either */
/* There as been no significant change in X, try Y */
priv->valid = false;
return 0; /* No new touches read. */
deltay = (y - priv->lasty);
if (deltay < 0)
{
deltay = -deltay;
}
if (deltax < CONFIG_FT5X06_THRESHX)
{
/* Ignore... no significant change in Y either */
goto drop;
}
}
}
}
@@ -551,6 +562,12 @@ static ssize_t ft5x06_sample(FAR struct ft5x06_dev_s *priv, FAR char *buffer,
priv->valid = false;
return SIZEOF_TOUCH_SAMPLE_S(1);
drop:
priv->lastx = 0;
priv->lasty = 0;
priv->valid = false;
return 0; /* No new touches read. */
}
#else
static ssize_t ft5x06_sample(FAR struct ft5x06_dev_s *priv, FAR char *buffer,