Shanling Q1: enable multi-touch reporting

The FT6x06 driver used for the Shanling Q1's touchscreen
has been extended to report more than one touch point. It
can also return the gesture detected by the controller,
but this doesn't seem to report anything useful on the Q1.

Multi-touch is only useful in 3x3 grid mode since the Rockbox
button API cannot report more than one touch point.

The FiiO M3K uses the same driver so it's been updated to the
multi-touch API, but functionality is unchanged.

Change-Id: I4de42f44808d6eb902e3da212d8f936b7a5042c7

1 files changed, 16 insertions, 7 deletions

diff --git a/firmware/export/ft6x06.h b/firmware/export/ft6x06.h
index de1fdd0979..6596f89272 100644
--- a/firmware/export/ft6x06.h
+++ b/firmware/export/ft6x06.h
@@ -25,23 +25,32 @@
 #include "config.h"
 #include <stdbool.h>
 
-typedef void(*ft6x06_event_cb)(int, int, int);
+enum ft6x06_event {
+    FT6x06_EVT_NONE = -1,
+    FT6x06_EVT_PRESS = 0,
+    FT6x06_EVT_RELEASE = 1,
+    FT6x06_EVT_CONTACT = 2,
+};
 
-struct ft6x06_state {
+struct ft6x06_point {
     int event;
+    int touch_id;
     int pos_x;
     int pos_y;
+    int weight;
+    int area;
 };
 
-enum ft6x06_event {
-    FT6x06_EVT_NONE = -1,
-    FT6x06_EVT_PRESS = 0,
-    FT6x06_EVT_RELEASE = 1,
-    FT6x06_EVT_CONTACT = 2,
+struct ft6x06_state {
+    int gesture;
+    int nr_points;
+    struct ft6x06_point points[FT6x06_NUM_POINTS];
 };
 
 extern struct ft6x06_state ft6x06_state;
 
+typedef void(*ft6x06_event_cb)(struct ft6x06_state* state);
+
 void ft6x06_init(void);
 void ft6x06_set_event_cb(ft6x06_event_cb fn);
 void ft6x06_enable(bool en);