* [PATCH input-wacom] HID: wacom: Bluetooth IRQ for Intuos Pro should handle prox/range
@ 2017-02-11 0:14 Aaron Armstrong Skomra
2017-02-13 19:00 ` Ping Cheng
2017-02-14 14:03 ` Jiri Kosina
0 siblings, 2 replies; 3+ messages in thread
From: Aaron Armstrong Skomra @ 2017-02-11 0:14 UTC (permalink / raw)
To: linux-input, jkosina, pinglinux, killertofu; +Cc: Jason Gerecke
From: Jason Gerecke <killertofu@gmail.com>
The prox/range bits included in the Bluetooth reports from the Intuos Pro
were being ignored, leading to two issues. Firstly, the pen would never
announce a BTN_TOOL_PEN event with value 0, leaving userspace to believe
the pen was always active. Secondly, the driver would continue to send
events for data while the packet's "prox" bit was clear. This can lead
to sudden incorrect pointer jumps if the pen is slowly moved away from
the tablet surface.
Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
---
drivers/hid/wacom_wac.c | 25 +++++++++++++++----------
1 file changed, 15 insertions(+), 10 deletions(-)
diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
index bb98ca8..63b2485 100644
--- a/drivers/hid/wacom_wac.c
+++ b/drivers/hid/wacom_wac.c
@@ -1213,29 +1213,34 @@ static void wacom_intuos_pro2_bt_pen(struct wacom_wac *wacom)
for (i = 0; i < pen_frames; i++) {
unsigned char *frame = &data[i*pen_frame_len + 1];
+ bool valid = frame[0] & 0x80;
+ bool prox = frame[0] & 0x40;
+ bool range = frame[0] & 0x20;
- if (!(frame[0] & 0x80))
+ if (!valid)
continue;
- input_report_abs(pen_input, ABS_X, get_unaligned_le16(&frame[1]));
- input_report_abs(pen_input, ABS_Y, get_unaligned_le16(&frame[3]));
+ if (range) {
+ input_report_abs(pen_input, ABS_X, get_unaligned_le16(&frame[1]));
+ input_report_abs(pen_input, ABS_Y, get_unaligned_le16(&frame[3]));
+ input_report_abs(pen_input, ABS_TILT_X, frame[7]);
+ input_report_abs(pen_input, ABS_TILT_Y, frame[8]);
+ input_report_abs(pen_input, ABS_Z, get_unaligned_le16(&frame[9]));
+ input_report_abs(pen_input, ABS_WHEEL, get_unaligned_le16(&frame[11]));
+ }
input_report_abs(pen_input, ABS_PRESSURE, get_unaligned_le16(&frame[5]));
- input_report_abs(pen_input, ABS_TILT_X, frame[7]);
- input_report_abs(pen_input, ABS_TILT_Y, frame[8]);
- input_report_abs(pen_input, ABS_Z, get_unaligned_le16(&frame[9]));
- input_report_abs(pen_input, ABS_WHEEL, get_unaligned_le16(&frame[11]));
- input_report_abs(pen_input, ABS_DISTANCE, frame[13]);
+ input_report_abs(pen_input, ABS_DISTANCE, range ? frame[13] : wacom->features.distance_max);
input_report_key(pen_input, BTN_TOUCH, frame[0] & 0x01);
input_report_key(pen_input, BTN_STYLUS, frame[0] & 0x02);
input_report_key(pen_input, BTN_STYLUS2, frame[0] & 0x04);
- input_report_key(pen_input, wacom->tool[0], 1);
+ input_report_key(pen_input, wacom->tool[0], prox);
input_event(pen_input, EV_MSC, MSC_SERIAL, wacom->serial[0]);
input_report_abs(pen_input, ABS_MISC,
wacom_intuos_id_mangle(wacom->id[0])); /* report tool id */
- wacom->shared->stylus_in_proximity = frame[0] & 0x40;
+ wacom->shared->stylus_in_proximity = prox;
input_sync(pen_input);
}
--
2.11.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH input-wacom] HID: wacom: Bluetooth IRQ for Intuos Pro should handle prox/range
2017-02-11 0:14 [PATCH input-wacom] HID: wacom: Bluetooth IRQ for Intuos Pro should handle prox/range Aaron Armstrong Skomra
@ 2017-02-13 19:00 ` Ping Cheng
2017-02-14 14:03 ` Jiri Kosina
1 sibling, 0 replies; 3+ messages in thread
From: Ping Cheng @ 2017-02-13 19:00 UTC (permalink / raw)
To: Aaron Armstrong Skomra
Cc: linux-input, Jiri Kosina, Jason Gerecke, Jason Gerecke
On Fri, Feb 10, 2017 at 4:14 PM, Aaron Armstrong Skomra
<skomra@gmail.com> wrote:
> From: Jason Gerecke <killertofu@gmail.com>
>
> The prox/range bits included in the Bluetooth reports from the Intuos Pro
> were being ignored, leading to two issues. Firstly, the pen would never
> announce a BTN_TOOL_PEN event with value 0, leaving userspace to believe
> the pen was always active. Secondly, the driver would continue to send
> events for data while the packet's "prox" bit was clear. This can lead
> to sudden incorrect pointer jumps if the pen is slowly moved away from
> the tablet surface.
>
> Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
Reviewed-by: Ping Cheng <ping.cheng@wacom.com>
Hi Jiri,
This patch needs to go into the same release as the last set, under
your for-4.11/wacom branch. It fixes a bug for that set.
Thanks,
Ping
> ---
> drivers/hid/wacom_wac.c | 25 +++++++++++++++----------
> 1 file changed, 15 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
> index bb98ca8..63b2485 100644
> --- a/drivers/hid/wacom_wac.c
> +++ b/drivers/hid/wacom_wac.c
> @@ -1213,29 +1213,34 @@ static void wacom_intuos_pro2_bt_pen(struct wacom_wac *wacom)
>
> for (i = 0; i < pen_frames; i++) {
> unsigned char *frame = &data[i*pen_frame_len + 1];
> + bool valid = frame[0] & 0x80;
> + bool prox = frame[0] & 0x40;
> + bool range = frame[0] & 0x20;
>
> - if (!(frame[0] & 0x80))
> + if (!valid)
> continue;
>
> - input_report_abs(pen_input, ABS_X, get_unaligned_le16(&frame[1]));
> - input_report_abs(pen_input, ABS_Y, get_unaligned_le16(&frame[3]));
> + if (range) {
> + input_report_abs(pen_input, ABS_X, get_unaligned_le16(&frame[1]));
> + input_report_abs(pen_input, ABS_Y, get_unaligned_le16(&frame[3]));
> + input_report_abs(pen_input, ABS_TILT_X, frame[7]);
> + input_report_abs(pen_input, ABS_TILT_Y, frame[8]);
> + input_report_abs(pen_input, ABS_Z, get_unaligned_le16(&frame[9]));
> + input_report_abs(pen_input, ABS_WHEEL, get_unaligned_le16(&frame[11]));
> + }
> input_report_abs(pen_input, ABS_PRESSURE, get_unaligned_le16(&frame[5]));
> - input_report_abs(pen_input, ABS_TILT_X, frame[7]);
> - input_report_abs(pen_input, ABS_TILT_Y, frame[8]);
> - input_report_abs(pen_input, ABS_Z, get_unaligned_le16(&frame[9]));
> - input_report_abs(pen_input, ABS_WHEEL, get_unaligned_le16(&frame[11]));
> - input_report_abs(pen_input, ABS_DISTANCE, frame[13]);
> + input_report_abs(pen_input, ABS_DISTANCE, range ? frame[13] : wacom->features.distance_max);
>
> input_report_key(pen_input, BTN_TOUCH, frame[0] & 0x01);
> input_report_key(pen_input, BTN_STYLUS, frame[0] & 0x02);
> input_report_key(pen_input, BTN_STYLUS2, frame[0] & 0x04);
>
> - input_report_key(pen_input, wacom->tool[0], 1);
> + input_report_key(pen_input, wacom->tool[0], prox);
> input_event(pen_input, EV_MSC, MSC_SERIAL, wacom->serial[0]);
> input_report_abs(pen_input, ABS_MISC,
> wacom_intuos_id_mangle(wacom->id[0])); /* report tool id */
>
> - wacom->shared->stylus_in_proximity = frame[0] & 0x40;
> + wacom->shared->stylus_in_proximity = prox;
>
> input_sync(pen_input);
> }
> --
> 2.11.1
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH input-wacom] HID: wacom: Bluetooth IRQ for Intuos Pro should handle prox/range
2017-02-11 0:14 [PATCH input-wacom] HID: wacom: Bluetooth IRQ for Intuos Pro should handle prox/range Aaron Armstrong Skomra
2017-02-13 19:00 ` Ping Cheng
@ 2017-02-14 14:03 ` Jiri Kosina
1 sibling, 0 replies; 3+ messages in thread
From: Jiri Kosina @ 2017-02-14 14:03 UTC (permalink / raw)
To: Aaron Armstrong Skomra; +Cc: linux-input, pinglinux, killertofu, Jason Gerecke
On Fri, 10 Feb 2017, Aaron Armstrong Skomra wrote:
> From: Jason Gerecke <killertofu@gmail.com>
>
> The prox/range bits included in the Bluetooth reports from the Intuos Pro
> were being ignored, leading to two issues. Firstly, the pen would never
> announce a BTN_TOOL_PEN event with value 0, leaving userspace to believe
> the pen was always active. Secondly, the driver would continue to send
> events for data while the packet's "prox" bit was clear. This can lead
> to sudden incorrect pointer jumps if the pen is slowly moved away from
> the tablet surface.
>
> Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
Applied to hid.git#for-4.11/wacom
--
Jiri Kosina
SUSE Labs
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-02-14 14:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-02-11 0:14 [PATCH input-wacom] HID: wacom: Bluetooth IRQ for Intuos Pro should handle prox/range Aaron Armstrong Skomra
2017-02-13 19:00 ` Ping Cheng
2017-02-14 14:03 ` Jiri Kosina
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).