| Message ID | 20190219175819.4995-1-jason.gerecke@wacom.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 4e6e7d7252745ff589a5b02834c1b228d2c9140f |
| Delegated to: | Jiri Kosina |
| Headers | show |
| Series | HID: wacom: Add support for Pro Pen slim | expand |
Hi Jason, On Tue, Feb 19, 2019 at 7:00 PM Gerecke, Jason <Jason.Gerecke@wacom.com> wrote: > > From: Jason Gerecke <killertofu@gmail.com> You almost got it right :) The email is sent with the proper From, but your patch has an extra from which breaks checkpatch :/ I think it should be better to send the patch from your gmail address and add the From: line to your wacom one. Patch looks good besides that (but you forgot to CC Jiri and myself). I'll try to apply it later today. Cheers, Benjamin > > Wacom has introduced a new pen compatible with its MobileStudio Pro and > other tablets. Although adding it to the tool ID tablet is not strictly > necessary unrecognized pens are reported as BTN_TOOL_PEN already, unless > the tablet sends the "eraser" bit, when BTN_TOOL_RUBBER is used instead), > we'll keep it updated anyway. > > Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com> > --- > drivers/hid/wacom_wac.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c > index 5ecda99bf431..747730d32ab6 100644 > --- a/drivers/hid/wacom_wac.c > +++ b/drivers/hid/wacom_wac.c > @@ -626,6 +626,7 @@ static int wacom_intuos_get_tool_type(int tool_id) > case 0x8e2: /* IntuosHT2 pen */ > case 0x022: > case 0x10804: /* Intuos4/5 13HD/24HD Art Pen */ > + case 0x10842: /* MobileStudio Pro Pro Pen slim */ > case 0x14802: /* Intuos4/5 13HD/24HD Classic Pen */ > case 0x16802: /* Cintiq 13HD Pro Pen */ > case 0x18802: /* DTH2242 Pen */ > @@ -667,6 +668,7 @@ static int wacom_intuos_get_tool_type(int tool_id) > case 0x1480a: /* Intuos4/5 13HD/24HD Classic Pen Eraser */ > case 0x1090a: /* Intuos4/5 13HD/24HD Airbrush Eraser */ > case 0x1080c: /* Intuos4/5 13HD/24HD Art Pen Eraser */ > + case 0x1084a: /* MobileStudio Pro Pro Pen slim Eraser */ > case 0x1680a: /* Cintiq 13HD Pro Pen Eraser */ > case 0x1880a: /* DTH2242 Eraser */ > case 0x1080a: /* Intuos4/5 13HD/24HD General Pen Eraser */ > -- > 2.20.1 >
On Wed, Feb 20, 2019 at 12:17 AM Benjamin Tissoires <benjamin.tissoires@gmail.com> wrote: > > Hi Jason, > > On Tue, Feb 19, 2019 at 7:00 PM Gerecke, Jason <Jason.Gerecke@wacom.com> wrote: > > > > From: Jason Gerecke <killertofu@gmail.com> > > You almost got it right :) > The email is sent with the proper From, but your patch has an extra > from which breaks checkpatch :/ > > I think it should be better to send the patch from your gmail address > and add the From: line to your wacom one. > > Patch looks good besides that (but you forgot to CC Jiri and myself). > > I'll try to apply it later today. > > Cheers, > Benjamin > Thanks, and >.< Darn Outlook server apparently added the "From" behind my back. I'll see if I can get it fixed or convince Gmail to do something similar. :) 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.... > > > > Wacom has introduced a new pen compatible with its MobileStudio Pro and > > other tablets. Although adding it to the tool ID tablet is not strictly > > necessary unrecognized pens are reported as BTN_TOOL_PEN already, unless > > the tablet sends the "eraser" bit, when BTN_TOOL_RUBBER is used instead), > > we'll keep it updated anyway. > > > > Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com> > > --- > > drivers/hid/wacom_wac.c | 2 ++ > > 1 file changed, 2 insertions(+) > > > > diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c > > index 5ecda99bf431..747730d32ab6 100644 > > --- a/drivers/hid/wacom_wac.c > > +++ b/drivers/hid/wacom_wac.c > > @@ -626,6 +626,7 @@ static int wacom_intuos_get_tool_type(int tool_id) > > case 0x8e2: /* IntuosHT2 pen */ > > case 0x022: > > case 0x10804: /* Intuos4/5 13HD/24HD Art Pen */ > > + case 0x10842: /* MobileStudio Pro Pro Pen slim */ > > case 0x14802: /* Intuos4/5 13HD/24HD Classic Pen */ > > case 0x16802: /* Cintiq 13HD Pro Pen */ > > case 0x18802: /* DTH2242 Pen */ > > @@ -667,6 +668,7 @@ static int wacom_intuos_get_tool_type(int tool_id) > > case 0x1480a: /* Intuos4/5 13HD/24HD Classic Pen Eraser */ > > case 0x1090a: /* Intuos4/5 13HD/24HD Airbrush Eraser */ > > case 0x1080c: /* Intuos4/5 13HD/24HD Art Pen Eraser */ > > + case 0x1084a: /* MobileStudio Pro Pro Pen slim Eraser */ > > case 0x1680a: /* Cintiq 13HD Pro Pen Eraser */ > > case 0x1880a: /* DTH2242 Eraser */ > > case 0x1080a: /* Intuos4/5 13HD/24HD General Pen Eraser */ > > -- > > 2.20.1 > >
On Wed, Feb 20, 2019 at 4:25 PM Jason Gerecke <killertofu@gmail.com> wrote: > > On Wed, Feb 20, 2019 at 12:17 AM Benjamin Tissoires > <benjamin.tissoires@gmail.com> wrote: > > > > Hi Jason, > > > > On Tue, Feb 19, 2019 at 7:00 PM Gerecke, Jason <Jason.Gerecke@wacom.com> wrote: > > > > > > From: Jason Gerecke <killertofu@gmail.com> > > > > You almost got it right :) > > The email is sent with the proper From, but your patch has an extra > > from which breaks checkpatch :/ > > > > I think it should be better to send the patch from your gmail address > > and add the From: line to your wacom one. > > > > Patch looks good besides that (but you forgot to CC Jiri and myself). > > > > I'll try to apply it later today. > > > > Cheers, > > Benjamin > > > > Thanks, and >.< > > Darn Outlook server apparently added the "From" behind my back. I'll > see if I can get it fixed or convince Gmail to do something similar. > :) Probably easier to just keep your current workflow and just manually add your From line in the commit message. Applied to for 5.1/wacom Cheers, Benjamin > > 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.... > > > > > > > Wacom has introduced a new pen compatible with its MobileStudio Pro and > > > other tablets. Although adding it to the tool ID tablet is not strictly > > > necessary unrecognized pens are reported as BTN_TOOL_PEN already, unless > > > the tablet sends the "eraser" bit, when BTN_TOOL_RUBBER is used instead), > > > we'll keep it updated anyway. > > > > > > Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com> > > > --- > > > drivers/hid/wacom_wac.c | 2 ++ > > > 1 file changed, 2 insertions(+) > > > > > > diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c > > > index 5ecda99bf431..747730d32ab6 100644 > > > --- a/drivers/hid/wacom_wac.c > > > +++ b/drivers/hid/wacom_wac.c > > > @@ -626,6 +626,7 @@ static int wacom_intuos_get_tool_type(int tool_id) > > > case 0x8e2: /* IntuosHT2 pen */ > > > case 0x022: > > > case 0x10804: /* Intuos4/5 13HD/24HD Art Pen */ > > > + case 0x10842: /* MobileStudio Pro Pro Pen slim */ > > > case 0x14802: /* Intuos4/5 13HD/24HD Classic Pen */ > > > case 0x16802: /* Cintiq 13HD Pro Pen */ > > > case 0x18802: /* DTH2242 Pen */ > > > @@ -667,6 +668,7 @@ static int wacom_intuos_get_tool_type(int tool_id) > > > case 0x1480a: /* Intuos4/5 13HD/24HD Classic Pen Eraser */ > > > case 0x1090a: /* Intuos4/5 13HD/24HD Airbrush Eraser */ > > > case 0x1080c: /* Intuos4/5 13HD/24HD Art Pen Eraser */ > > > + case 0x1084a: /* MobileStudio Pro Pro Pen slim Eraser */ > > > case 0x1680a: /* Cintiq 13HD Pro Pen Eraser */ > > > case 0x1880a: /* DTH2242 Eraser */ > > > case 0x1080a: /* Intuos4/5 13HD/24HD General Pen Eraser */ > > > -- > > > 2.20.1 > > >
woo, only a month late here... On Tue, Feb 19, 2019 at 05:58:56PM +0000, Gerecke, Jason wrote: > From: Jason Gerecke <killertofu@gmail.com> > > Wacom has introduced a new pen compatible with its MobileStudio Pro and > other tablets. Although adding it to the tool ID tablet is not strictly > necessary unrecognized pens are reported as BTN_TOOL_PEN already, unless > the tablet sends the "eraser" bit, when BTN_TOOL_RUBBER is used instead), > we'll keep it updated anyway. I got a bit confused reading this message. - "tool ID tablet" -> tool ID table? - "when BTN_TOOL_RUBBER" -> "then BTN_TOOL_RUBBER"? ACK otherwise though Cheers, Peter > > Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com> > --- > drivers/hid/wacom_wac.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c > index 5ecda99bf431..747730d32ab6 100644 > --- a/drivers/hid/wacom_wac.c > +++ b/drivers/hid/wacom_wac.c > @@ -626,6 +626,7 @@ static int wacom_intuos_get_tool_type(int tool_id) > case 0x8e2: /* IntuosHT2 pen */ > case 0x022: > case 0x10804: /* Intuos4/5 13HD/24HD Art Pen */ > + case 0x10842: /* MobileStudio Pro Pro Pen slim */ > case 0x14802: /* Intuos4/5 13HD/24HD Classic Pen */ > case 0x16802: /* Cintiq 13HD Pro Pen */ > case 0x18802: /* DTH2242 Pen */ > @@ -667,6 +668,7 @@ static int wacom_intuos_get_tool_type(int tool_id) > case 0x1480a: /* Intuos4/5 13HD/24HD Classic Pen Eraser */ > case 0x1090a: /* Intuos4/5 13HD/24HD Airbrush Eraser */ > case 0x1080c: /* Intuos4/5 13HD/24HD Art Pen Eraser */ > + case 0x1084a: /* MobileStudio Pro Pro Pen slim Eraser */ > case 0x1680a: /* Cintiq 13HD Pro Pen Eraser */ > case 0x1880a: /* DTH2242 Eraser */ > case 0x1080a: /* Intuos4/5 13HD/24HD General Pen Eraser */ > -- > 2.20.1 >
On Mon, Mar 25, 2019 at 03:54:04PM +1000, Peter Hutterer wrote: > woo, only a month late here... > > On Tue, Feb 19, 2019 at 05:58:56PM +0000, Gerecke, Jason wrote: > > From: Jason Gerecke <killertofu@gmail.com> > > > > Wacom has introduced a new pen compatible with its MobileStudio Pro and > > other tablets. Although adding it to the tool ID tablet is not strictly > > necessary unrecognized pens are reported as BTN_TOOL_PEN already, unless > > the tablet sends the "eraser" bit, when BTN_TOOL_RUBBER is used instead), > > we'll keep it updated anyway. > > I got a bit confused reading this message. > - "tool ID tablet" -> tool ID table? > - "when BTN_TOOL_RUBBER" -> "then BTN_TOOL_RUBBER"? > > ACK otherwise though nevermind, I had a filter active and didn't see Benjamin's replies... sorry about the noise. Cheers, Peter > > Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com> > > --- > > drivers/hid/wacom_wac.c | 2 ++ > > 1 file changed, 2 insertions(+) > > > > diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c > > index 5ecda99bf431..747730d32ab6 100644 > > --- a/drivers/hid/wacom_wac.c > > +++ b/drivers/hid/wacom_wac.c > > @@ -626,6 +626,7 @@ static int wacom_intuos_get_tool_type(int tool_id) > > case 0x8e2: /* IntuosHT2 pen */ > > case 0x022: > > case 0x10804: /* Intuos4/5 13HD/24HD Art Pen */ > > + case 0x10842: /* MobileStudio Pro Pro Pen slim */ > > case 0x14802: /* Intuos4/5 13HD/24HD Classic Pen */ > > case 0x16802: /* Cintiq 13HD Pro Pen */ > > case 0x18802: /* DTH2242 Pen */ > > @@ -667,6 +668,7 @@ static int wacom_intuos_get_tool_type(int tool_id) > > case 0x1480a: /* Intuos4/5 13HD/24HD Classic Pen Eraser */ > > case 0x1090a: /* Intuos4/5 13HD/24HD Airbrush Eraser */ > > case 0x1080c: /* Intuos4/5 13HD/24HD Art Pen Eraser */ > > + case 0x1084a: /* MobileStudio Pro Pro Pen slim Eraser */ > > case 0x1680a: /* Cintiq 13HD Pro Pen Eraser */ > > case 0x1880a: /* DTH2242 Eraser */ > > case 0x1080a: /* Intuos4/5 13HD/24HD General Pen Eraser */ > > -- > > 2.20.1 > >
diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c index 5ecda99bf431..747730d32ab6 100644 --- a/drivers/hid/wacom_wac.c +++ b/drivers/hid/wacom_wac.c @@ -626,6 +626,7 @@ static int wacom_intuos_get_tool_type(int tool_id) case 0x8e2: /* IntuosHT2 pen */ case 0x022: case 0x10804: /* Intuos4/5 13HD/24HD Art Pen */ + case 0x10842: /* MobileStudio Pro Pro Pen slim */ case 0x14802: /* Intuos4/5 13HD/24HD Classic Pen */ case 0x16802: /* Cintiq 13HD Pro Pen */ case 0x18802: /* DTH2242 Pen */ @@ -667,6 +668,7 @@ static int wacom_intuos_get_tool_type(int tool_id) case 0x1480a: /* Intuos4/5 13HD/24HD Classic Pen Eraser */ case 0x1090a: /* Intuos4/5 13HD/24HD Airbrush Eraser */ case 0x1080c: /* Intuos4/5 13HD/24HD Art Pen Eraser */ + case 0x1084a: /* MobileStudio Pro Pro Pen slim Eraser */ case 0x1680a: /* Cintiq 13HD Pro Pen Eraser */ case 0x1880a: /* DTH2242 Eraser */ case 0x1080a: /* Intuos4/5 13HD/24HD General Pen Eraser */