* [PATCH 1/2] input: wacom: Support up to 2048 pressure levels with ISDv4 @ 2014-06-30 21:46 Jason Gerecke 2014-06-30 21:46 ` [PATCH 2/2] input: wacom: Add support for 0x12C ISDv4 sensor Jason Gerecke 2014-07-18 23:12 ` [PATCH 1/2] input: wacom: Support up to 2048 pressure levels with ISDv4 Jason Gerecke 0 siblings, 2 replies; 4+ messages in thread From: Jason Gerecke @ 2014-06-30 21:46 UTC (permalink / raw) To: linux-input, pinglinux, dmitry.torokhov; +Cc: Jason Gerecke Signed-off-by: Jason Gerecke <killertofu@gmail.com> --- drivers/input/tablet/wacom_wac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c index 977d05c..61a45a5 100644 --- a/drivers/input/tablet/wacom_wac.c +++ b/drivers/input/tablet/wacom_wac.c @@ -1093,7 +1093,7 @@ static int wacom_tpc_pen(struct wacom_wac *wacom) input_report_key(input, BTN_STYLUS2, data[1] & 0x10); input_report_abs(input, ABS_X, le16_to_cpup((__le16 *)&data[2])); input_report_abs(input, ABS_Y, le16_to_cpup((__le16 *)&data[4])); - input_report_abs(input, ABS_PRESSURE, ((data[7] & 0x03) << 8) | data[6]); + input_report_abs(input, ABS_PRESSURE, ((data[7] & 0x07) << 8) | data[6]); input_report_key(input, BTN_TOUCH, data[1] & 0x05); input_report_key(input, wacom->tool[0], prox); return 1; -- 2.0.0 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] input: wacom: Add support for 0x12C ISDv4 sensor 2014-06-30 21:46 [PATCH 1/2] input: wacom: Support up to 2048 pressure levels with ISDv4 Jason Gerecke @ 2014-06-30 21:46 ` Jason Gerecke 2014-07-18 23:12 ` [PATCH 1/2] input: wacom: Support up to 2048 pressure levels with ISDv4 Jason Gerecke 1 sibling, 0 replies; 4+ messages in thread From: Jason Gerecke @ 2014-06-30 21:46 UTC (permalink / raw) To: linux-input, pinglinux, dmitry.torokhov; +Cc: Jason Gerecke Signed-off-by: Jason Gerecke <killertofu@gmail.com> --- drivers/input/tablet/wacom_wac.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c index 61a45a5..58022ff 100644 --- a/drivers/input/tablet/wacom_wac.c +++ b/drivers/input/tablet/wacom_wac.c @@ -2248,6 +2248,9 @@ static const struct wacom_features wacom_features_0x10F = static const struct wacom_features wacom_features_0x116 = { "Wacom ISDv4 116", WACOM_PKGLEN_GRAPHIRE, 26202, 16325, 255, 0, TABLETPCE, WACOM_INTUOS_RES, WACOM_INTUOS_RES }; +static const struct wacom_features wacom_features_0x12C = + { "Wacom ISDv4 12C", WACOM_PKGLEN_GRAPHIRE, 27848, 15752, 2047, + 0, TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES }; static const struct wacom_features wacom_features_0x4001 = { "Wacom ISDv4 4001", WACOM_PKGLEN_MTTPC, 26202, 16325, 255, 0, MTTPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES }; @@ -2472,6 +2475,7 @@ const struct usb_device_id wacom_ids[] = { { USB_DEVICE_WACOM(0x10E) }, { USB_DEVICE_WACOM(0x10F) }, { USB_DEVICE_WACOM(0x116) }, + { USB_DEVICE_WACOM(0x12C) }, { USB_DEVICE_WACOM(0x300) }, { USB_DEVICE_WACOM(0x301) }, { USB_DEVICE_DETAILED(0x302, USB_CLASS_HID, 0, 0) }, -- 2.0.0 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] input: wacom: Support up to 2048 pressure levels with ISDv4 2014-06-30 21:46 [PATCH 1/2] input: wacom: Support up to 2048 pressure levels with ISDv4 Jason Gerecke 2014-06-30 21:46 ` [PATCH 2/2] input: wacom: Add support for 0x12C ISDv4 sensor Jason Gerecke @ 2014-07-18 23:12 ` Jason Gerecke 2014-07-28 18:00 ` Dmitry Torokhov 1 sibling, 1 reply; 4+ messages in thread From: Jason Gerecke @ 2014-07-18 23:12 UTC (permalink / raw) To: Linux Input, Ping Cheng, Dmitry Torokhov; +Cc: Jason Gerecke On Mon, Jun 30, 2014 at 2:46 PM, Jason Gerecke <killertofu@gmail.com> wrote: > Signed-off-by: Jason Gerecke <killertofu@gmail.com> > --- > drivers/input/tablet/wacom_wac.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c > index 977d05c..61a45a5 100644 > --- a/drivers/input/tablet/wacom_wac.c > +++ b/drivers/input/tablet/wacom_wac.c > @@ -1093,7 +1093,7 @@ static int wacom_tpc_pen(struct wacom_wac *wacom) > input_report_key(input, BTN_STYLUS2, data[1] & 0x10); > input_report_abs(input, ABS_X, le16_to_cpup((__le16 *)&data[2])); > input_report_abs(input, ABS_Y, le16_to_cpup((__le16 *)&data[4])); > - input_report_abs(input, ABS_PRESSURE, ((data[7] & 0x03) << 8) | data[6]); > + input_report_abs(input, ABS_PRESSURE, ((data[7] & 0x07) << 8) | data[6]); > input_report_key(input, BTN_TOUCH, data[1] & 0x05); > input_report_key(input, wacom->tool[0], prox); > return 1; > -- > 2.0.0 > Just making sure these two patches don't get lost in all the work Benjamin's doing. They're going to conflict, so depending on the timeline for merging his patches, we can either push these up now(ish) or I'll rebase afterwards. Jason --- Now instead of four in the eights place / you’ve got three, ‘Cause you added one / (That is to say, eight) to the two, / But you can’t take seven from three, / So you look at the sixty-fours.... -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] input: wacom: Support up to 2048 pressure levels with ISDv4 2014-07-18 23:12 ` [PATCH 1/2] input: wacom: Support up to 2048 pressure levels with ISDv4 Jason Gerecke @ 2014-07-28 18:00 ` Dmitry Torokhov 0 siblings, 0 replies; 4+ messages in thread From: Dmitry Torokhov @ 2014-07-28 18:00 UTC (permalink / raw) To: Jason Gerecke; +Cc: Linux Input, Ping Cheng On Fri, Jul 18, 2014 at 04:12:21PM -0700, Jason Gerecke wrote: > On Mon, Jun 30, 2014 at 2:46 PM, Jason Gerecke <killertofu@gmail.com> wrote: > > Signed-off-by: Jason Gerecke <killertofu@gmail.com> > > --- > > drivers/input/tablet/wacom_wac.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c > > index 977d05c..61a45a5 100644 > > --- a/drivers/input/tablet/wacom_wac.c > > +++ b/drivers/input/tablet/wacom_wac.c > > @@ -1093,7 +1093,7 @@ static int wacom_tpc_pen(struct wacom_wac *wacom) > > input_report_key(input, BTN_STYLUS2, data[1] & 0x10); > > input_report_abs(input, ABS_X, le16_to_cpup((__le16 *)&data[2])); > > input_report_abs(input, ABS_Y, le16_to_cpup((__le16 *)&data[4])); > > - input_report_abs(input, ABS_PRESSURE, ((data[7] & 0x03) << 8) | data[6]); > > + input_report_abs(input, ABS_PRESSURE, ((data[7] & 0x07) << 8) | data[6]); > > input_report_key(input, BTN_TOUCH, data[1] & 0x05); > > input_report_key(input, wacom->tool[0], prox); > > return 1; > > -- > > 2.0.0 > > > > Just making sure these two patches don't get lost in all the work > Benjamin's doing. They're going to conflict, so depending on the > timeline for merging his patches, we can either push these up now(ish) > or I'll rebase afterwards. Benjamin added the first one to his series and I adjusted the 2nd one to apply on top of his and applied. Thanks. -- Dmitry ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-07-28 18:00 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-06-30 21:46 [PATCH 1/2] input: wacom: Support up to 2048 pressure levels with ISDv4 Jason Gerecke 2014-06-30 21:46 ` [PATCH 2/2] input: wacom: Add support for 0x12C ISDv4 sensor Jason Gerecke 2014-07-18 23:12 ` [PATCH 1/2] input: wacom: Support up to 2048 pressure levels with ISDv4 Jason Gerecke 2014-07-28 18:00 ` Dmitry Torokhov
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).