diff options
| author | merge <null@invalid> | 2008-12-08 11:03:03 +0000 |
|---|---|---|
| committer | Andy Green <agreen@pads.home.warmcat.com> | 2008-12-08 11:03:03 +0000 |
| commit | c3be736aeb24f44cf95dfad8fe3f1c7c6f367aaf (patch) | |
| tree | 1ba8dbf5784f805847652d896d9ee98ceffae22b /arch/arm/mach-s3c2440 | |
| parent | 2eb3742db1ecd3d9ffe8f02eaa8def1b2bd2a2c2 (diff) | |
MERGE-via-pending-tracking-hist-MERGE-via-stable-tracking-remove-skip-filter-1228733704
pending-tracking-hist top was MERGE-via-stable-tracking-remove-skip-filter-1228733704 / 552c6fdd4c644ab2618ad27564d159ed28bbd859 ... parent commitmessage:
From: merge <null@invalid>
MERGE-via-stable-tracking-hist-remove-skip-filter
stable-tracking-hist top was remove-skip-filter / 92bdef8636873a19efc05b2a19578a0aa93dba41 ... parent commitmessage:
From: Nelson Castillo <nelsoneci@gmail.com>
Remove skip filter
With more reliable points median and mean filters perform a better job.
We no longer need this filter.
Signed-off-by: Nelson Castillo <nelsoneci@gmail.com>
Diffstat (limited to 'arch/arm/mach-s3c2440')
| -rw-r--r-- | arch/arm/mach-s3c2440/mach-gta02.c | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c index 41ba0c8f586..e90f82bdfc3 100644 --- a/arch/arm/mach-s3c2440/mach-gta02.c +++ b/arch/arm/mach-s3c2440/mach-gta02.c @@ -105,7 +105,7 @@ #include <linux/ts_filter_mean.h> #include <linux/ts_filter_median.h> -#include <linux/ts_filter_variance.h> +#include <linux/ts_filter_group.h> /* arbitrates which sensor IRQ owns the shared SPI bus */ static spinlock_t motion_irq_lock; @@ -1019,35 +1019,34 @@ static struct s3c2410_udc_mach_info gta02_udc_cfg = { /* touchscreen configuration */ -static struct ts_filter_variance_configuration gta02_ts_variance_config = { - .extent = 20, - .window = 5, - .threshold = 10, /* variance = 10, std = 3.1623 */ - .attempts = 5, /* try 5 times before giving up */ +static struct ts_filter_group_configuration gta02_ts_group_config = { + .extent = 12, + .close_enough = 10, + .threshold = 6, /* at least half of the points in a group */ + .attempts = 10, }; static struct ts_filter_median_configuration gta02_ts_median_config = { - .extent = 31, - .decimation_below = 5, + .extent = 20, + .decimation_below = 3, .decimation_threshold = 8 * 3, - .decimation_above = 10, + .decimation_above = 4, }; static struct ts_filter_mean_configuration gta02_ts_mean_config = { - .bits_filter_length = 3, - .averaging_threshold = 6 * 3, + .bits_filter_length = 2, /* 4 points */ }; static struct s3c2410_ts_mach_info gta02_ts_cfg = { .delay = 10000, .presc = 0xff, /* slow as we can go */ .filter_sequence = { - [0] = &ts_filter_variance_api, + [0] = &ts_filter_group_api, [1] = &ts_filter_median_api, [2] = &ts_filter_mean_api, }, .filter_config = { - [0] = >a02_ts_variance_config, + [0] = >a02_ts_group_config, [1] = >a02_ts_median_config, [2] = >a02_ts_mean_config, }, |