summaryrefslogtreecommitdiffstats
path: root/master/marek-f198907e2b4dda2b548baf557b32d94c1f5e7a1a
blob: e8aa1413409dffa090eeeac8f524d58526163754 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
diff --git a/Makefile b/Makefile
index 7efc80d..505a2cd 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ LIBRARY	= kobomultitouch_drv.so
 MODULES = src
 XMODULES = driver
 
-o_src	= capabilities hwstate mtstate memory mtouch gestures
+o_src	= capabilities hwstate mtstate memory mtouch gestures variance_filter jitter_filter
 
 o_driver= kobomultitouch_drv
 
diff --git a/include/jitter_filter.h b/include/jitter_filter.h
new file mode 100644
index 0000000..00acf98
--- /dev/null
+++ b/include/jitter_filter.h
@@ -0,0 +1,8 @@
+#ifndef __JITTER_FILTER_H__
+#define __JITTER_FILTER_H__
+
+#include "mtstate.h"
+
+int jitter_filter(struct MTState *state);
+
+#endif
diff --git a/include/variance_filter.h b/include/variance_filter.h
new file mode 100644
index 0000000..3aad910
--- /dev/null
+++ b/include/variance_filter.h
@@ -0,0 +1,8 @@
+#ifndef __VARIANCE_FILTER_H__
+#define __VARIANCE_FILTER_H__
+
+#include "mtstate.h"
+
+int variance_filter(struct MTState *state);
+
+#endif
diff --git a/src/jitter_filter.c b/src/jitter_filter.c
new file mode 100644
index 0000000..2c50adc
--- /dev/null
+++ b/src/jitter_filter.c
@@ -0,0 +1,185 @@
+/*
+ * Taken and modified from:
+ *
+ *  tslib/plugins/dejitter.c
+ *
+ *  Copyright (C) 2001 Russell King.
+ *
+ * This file is placed under the LGPL.  Please see the file
+ * COPYING for more details.
+ *
+ *
+ * Problem: some touchscreens read the X/Y values from ADC with a
+ * great level of noise in their lowest bits. This produces "jitter"
+ * in touchscreen output, e.g. even if we hold the stylus still,
+ * we get a great deal of X/Y coordinate pairs that are close enough
+ * but not equal. Also if we try to draw a straight line in a painter
+ * program, we'll get a line full of spikes.
+ *
+ * Solution: we apply a smoothing filter on the last several values
+ * thus excluding spikes from output. If we detect a substantial change
+ * in coordinates, we reset the backlog of pen positions, thus avoiding
+ * smoothing coordinates that are not supposed to be smoothed. This
+ * supposes all noise has been filtered by the lower-level filter,
+ * e.g. by the "variance" module.
+ */
+#include "jitter_filter.h"
+
+/**
+ * This filter works as follows: we keep track of latest N samples,
+ * and average them with certain weights. The oldest samples have the
+ * least weight and the most recent samples have the most weight.
+ * This helps remove the jitter and at the same time doesn't influence
+ * responsivity because for each input sample we generate one output
+ * sample; pen movement becomes just somehow more smooth.
+ */
+
+#define NR_SAMPHISTLEN 8
+#define MAX_FINGERS 2
+
+/* To keep things simple (avoiding division) we ensure that
+ * SUM(weight) = power-of-two. Also we must know how to approximate
+ * measurements when we have less than NR_SAMPHISTLEN samples.
+ */
+static const unsigned char weight [NR_SAMPHISTLEN - 1][NR_SAMPHISTLEN + 1] =
+{
+	/* The last element is pow2(SUM(0..3)) */
+	{ 5, 3, 0, 0, 0, 0, 0, 0, 3 },	/* When we have 2 samples ... */
+	{ 8, 5, 3, 0, 0, 0, 0, 0, 4 },	/* When we have 3 samples ... */
+	{ 6, 4, 3, 3, 0, 0, 0, 0, 4 },	/* When we have 4 samples ... */
+	{ 10, 8, 5, 5, 4, 0, 0, 0, 5 },	/* When we have 5 samples ... */
+	{ 9, 7, 5, 4, 4, 3, 0, 0, 5 },	/* When we have 6 samples ... */
+	{ 9, 6, 5, 4, 3, 3, 2, 0, 5 },	/* When we have 7 samples ... */
+	{ 9, 5, 4, 3, 3, 3, 3, 2, 5 },	/* When we have 8 samples ... */
+}; 
+
+struct ts_hist {
+	int x;
+	int y;
+	unsigned int p;
+};
+
+struct tslib_dejitter {
+	int delta;
+	int x;
+	int y;
+	int down;
+	int nr;
+	int head;
+	struct ts_hist hist[NR_SAMPHISTLEN];
+};
+
+static struct tslib_dejitter *djts = NULL;
+
+static int sqr (int x)
+{
+	return x * x;
+}
+
+static void average(struct tslib_dejitter *djt, struct FingerState *samp)
+{
+	const unsigned char *w;
+	int sn = djt->head;
+	int i, x = 0, y = 0;
+	unsigned int p = 0;
+
+        w = weight[djt->nr - 2];
+
+	for (i = 0; i < djt->nr; i++) {
+		x += djt->hist [sn].x * w [i];
+		y += djt->hist [sn].y * w [i];
+		p += djt->hist [sn].p * w [i];
+		sn = (sn - 1) & (NR_SAMPHISTLEN - 1);
+	}
+
+	samp->position_x = x >> w [NR_SAMPHISTLEN];
+	samp->position_y = y >> w [NR_SAMPHISTLEN];
+	samp->pressure = p >> w [NR_SAMPHISTLEN];
+//#ifdef DEBUG
+	//fprintf(stderr,"DEJITTER----------------> %d %d %d (nr: %d)\n",
+	//	samp->position_x, samp->position_y, samp->pressure, djt->nr);
+//#endif
+}
+
+static void init()
+{
+	int i;
+
+	djts = malloc(sizeof(struct tslib_dejitter) * MAX_FINGERS);
+	memset(djts, 0, sizeof(struct tslib_dejitter) * MAX_FINGERS);
+
+	for (i = 0; i < MAX_FINGERS; i++) {
+		djts[i].delta = 15;
+		djts[i].head = 0;
+	}
+}
+
+void jitter_finger(struct FingerState *s)
+{
+	struct tslib_dejitter *djt;
+
+	djt = &djts[s->tracking_id];
+
+	/* If the pen moves too fast, reset the backlog. */
+	if (djt->nr) {
+		int prev = (djt->head - 1) & (NR_SAMPHISTLEN - 1);
+		if (sqr (s->position_x - djt->hist [prev].x) +
+			sqr (s->position_y - djt->hist [prev].y) > djt->delta) {
+#ifdef DEBUG
+			//fprintf (stderr, "DEJITTER: pen movement exceeds threshold\n");
+#endif
+			djt->nr = 0;
+		}
+	}
+
+	djt->hist[djt->head].x = s->position_x;
+	djt->hist[djt->head].y = s->position_y;
+	djt->hist[djt->head].p = s->pressure;
+	if (djt->nr < NR_SAMPHISTLEN)
+		djt->nr++;
+
+	/* We'll pass through the very first sample since
+	 * we can't average it (no history yet).
+	 */
+	if (djt->nr > 1) {
+		average (djt, s);
+	}
+
+	djt->head = (djt->head + 1) & (NR_SAMPHISTLEN - 1);
+}
+
+int jitter_filter(struct MTState *state)
+{
+	int i;
+	static prev_fingers[MAX_FINGERS];
+
+	if (djts == NULL) {
+		init();
+		for (i = 0; i < MAX_FINGERS; i++)
+			prev_fingers[i] = 0;
+	}
+
+	for (i = 0; i < state->nfinger; i++) {
+		struct FingerState *s = &state->finger[i];
+		if (s->tracking_id < 0 || s->tracking_id >= MAX_FINGERS)
+			continue;
+
+		if (prev_fingers[s->tracking_id] == 0) {
+			// first event - leave it as it is
+			// and place in history
+			djts[s->tracking_id].nr = 0;
+		}
+
+		jitter_finger(s);
+	}
+
+	for (i = 0; i < MAX_FINGERS; i++)
+		prev_fingers[i] = 0;
+	for (i = 0; i < state->nfinger; i++) {
+		struct FingerState *s = &state->finger[i];
+		prev_fingers[s->tracking_id] = 1;
+	}
+
+	return 1;
+}
+
diff --git a/src/mtouch.c b/src/mtouch.c
index 388d68e..7b8801e 100644
--- a/src/mtouch.c
+++ b/src/mtouch.c
@@ -20,6 +20,8 @@
  **************************************************************************/
 
 #include "mtouch.h"
+#include "variance_filter.h"
+#include "jitter_filter.h"
 
 static const int use_grab = 0;
 
@@ -44,6 +46,7 @@ int open_mtouch(struct MTouch *mt, int fd)
 	init_mtstate(&mt->state);
 	init_memory(&mt->mem);
 
+	// we have better filters than included in mtdev
 	mtdev_set_abs_fuzz(&mt->dev, ABS_MT_POSITION_X, 0);
 	mtdev_set_abs_fuzz(&mt->dev, ABS_MT_POSITION_Y, 0);
 
@@ -78,6 +81,15 @@ int read_packet(struct MTouch *mt, int fd)
 	if (ret <= 0)
 		return ret;
 	extract_mtstate(&mt->state, &mt->hs, &mt->caps);
+
+	// apply filters
+	ret = variance_filter(&mt->state);
+	if (ret <= 0)
+		return ret;
+	ret = jitter_filter(&mt->state);
+	if (ret <= 0)
+		return ret;
+
 //#if 0
 	output_mtstate(&mt->state);
 //#endif
diff --git a/src/variance_filter.c b/src/variance_filter.c
new file mode 100644
index 0000000..e420bfe
--- /dev/null
+++ b/src/variance_filter.c
@@ -0,0 +1,6 @@
+#include "variance_filter.h"
+
+int variance_filter(struct MTState *state)
+{
+	return 1;
+}