HID: uclogic: Support Huion tilt reporting

Add support for Huion v2 protocol tilt reporting. Describe reports as
angles in degrees, which is not exactly true, but there doesn't seem to
be a straightforward, consistent conversion possible, and what's
reported would have to be enough.

Signed-off-by: Nikolai Kondrashov <spbnick@gmail.com>
Signed-off-by: José Expósito <jose.exposito89@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

diff --git a/drivers/hid/hid-uclogic-core.c b/drivers/hid/hid-uclogic-core.c
index d8ab0139e5cdae30d70191ae08d7a479849b04d2..823704bc02ef8aa7d60f3e9c378a260de8e45293 100644 (file)
--- a/drivers/hid/hid-uclogic-core.c
+++ b/drivers/hid/hid-uclogic-core.c
@@ -304,6 +304,9 @@ static int uclogic_raw_event(struct hid_device *hdev,
                        mod_timer(&drvdata->inrange_timer,
                                        jiffies + msecs_to_jiffies(100));
                }
+               /* If we report tilt and Y direction is flipped */
+               if (size >= 12 && params->pen.tilt_y_flipped)
+                       data[11] = -data[11];
        }
 
        /* Tweak frame control reports, if necessary */

diff --git a/drivers/hid/hid-uclogic-params.c b/drivers/hid/hid-uclogic-params.c
index 3e70f969fb8495bb7196e8b6e2aa876378713158..30e0f69ed5af9ff2dc3052ea4e08935420020e9d 100644 (file)
--- a/drivers/hid/hid-uclogic-params.c
+++ b/drivers/hid/hid-uclogic-params.c
@@ -369,6 +369,7 @@ static int uclogic_params_pen_init_v2(struct uclogic_params_pen *pen,
        pen->id = UCLOGIC_RDESC_PEN_V2_ID;
        pen->inrange = UCLOGIC_PARAMS_PEN_INRANGE_NONE;
        pen->fragmented_hires = true;
+       pen->tilt_y_flipped = true;
        found = true;
 finish:
        *pfound = found;

diff --git a/drivers/hid/hid-uclogic-params.h b/drivers/hid/hid-uclogic-params.h
index ba48b1c7a0e52fc7dc1bec925c35200c9491eea4..e8381bb77bd01d6a65b9569ca26dd2c2314d9ce7 100644 (file)
--- a/drivers/hid/hid-uclogic-params.h
+++ b/drivers/hid/hid-uclogic-params.h
@@ -62,6 +62,12 @@ struct uclogic_params_pen {
         * Only valid if "id" is not zero.
         */
        bool fragmented_hires;
+       /*
+        * True if the pen reports tilt in bytes at offset 10 (X) and 11 (Y),
+        * and the Y tilt direction is flipped.
+        * Only valid if "id" is not zero.
+        */
+       bool tilt_y_flipped;
 };
 
 /*
@@ -171,6 +177,7 @@ extern int uclogic_params_init(struct uclogic_params *params,
                ".pen.id = %u\n"                    \
                ".pen.inrange = %s\n"               \
                ".pen.fragmented_hires = %s\n"      \
+               ".pen.tilt_y_flipped = %s\n"        \
                ".frame.desc_ptr = %p\n"            \
                ".frame.desc_size = %u\n"           \
                ".frame.id = %u\n"                  \
@@ -189,6 +196,7 @@ extern int uclogic_params_init(struct uclogic_params *params,
                (_params)->pen.id,                                          \
                uclogic_params_pen_inrange_to_str((_params)->pen.inrange),  \
                ((_params)->pen.fragmented_hires ? "true" : "false"),       \
+               ((_params)->pen.tilt_y_flipped ? "true" : "false"),         \
                (_params)->frame.desc_ptr,                                  \
                (_params)->frame.desc_size,                                 \
                (_params)->frame.id,                                        \

diff --git a/drivers/hid/hid-uclogic-rdesc.c b/drivers/hid/hid-uclogic-rdesc.c
index 6dd6dcd09c8bc16c8c40d16866f8318f84fba2bc..2607cbdf8ff27d09bf5245d96e3601f7190005f0 100644 (file)
--- a/drivers/hid/hid-uclogic-rdesc.c
+++ b/drivers/hid/hid-uclogic-rdesc.c
@@ -633,7 +633,17 @@ const __u8 uclogic_rdesc_pen_v2_template_arr[] = {
        0x27, UCLOGIC_RDESC_PEN_PH(PRESSURE_LM),
                                /*          Logical Maximum (PLACEHOLDER),  */
        0x81, 0x02,             /*          Input (Variable),               */
-       0x81, 0x03,             /*          Input (Constant, Variable),     */
+       0x54,                   /*          Unit Exponent (0),              */
+       0x65, 0x14,             /*          Unit (Degrees),                 */
+       0x35, 0xC4,             /*          Physical Minimum (-60),         */
+       0x45, 0x3C,             /*          Physical Maximum (60),          */
+       0x15, 0xC4,             /*          Logical Minimum (-60),          */
+       0x25, 0x3C,             /*          Logical Maximum (60),           */
+       0x75, 0x08,             /*          Report Size (8),                */
+       0x95, 0x02,             /*          Report Count (2),               */
+       0x09, 0x3D,             /*          Usage (X Tilt),                 */
+       0x09, 0x3E,             /*          Usage (Y Tilt),                 */
+       0x81, 0x02,             /*          Input (Variable),               */
        0xC0,                   /*      End Collection,                     */
        0xC0                    /*  End Collection                          */
 };