On Fri, Nov 11, 2016 at 09:59:57AM -0800, Jason Gerecke wrote: > Note that the MobileStudio Pro introduces a new "Pro Pen" which supports > 8K pressure levels. The ID of this pen is identical to that of a (less > featureful) pen used by the Intuos2, so we have to slightly modify the > existing entry. Ideally, we would have some way to define multiple pens > which share the same IDs (which apparently, according to the technical > experts, are not guaranteed unique outside of a hardware generation). > Such a change will require serious design and planning that are outside > of the immediate scope of this patch. > > Signed-off-by: Jason Gerecke <jason.gere...@wacom.com> > --- > data/layouts/mobilestudio-pro-13.svg | 279 +++++++++++++++++++++++++++++ > data/layouts/mobilestudio-pro-16.svg | 331 > +++++++++++++++++++++++++++++++++++ > data/libwacom.stylus | 14 +- > data/mobilestudio-pro-13.tablet | 58 ++++++ > data/mobilestudio-pro-16.tablet | 60 +++++++ > 5 files changed, 740 insertions(+), 2 deletions(-) > create mode 100644 data/layouts/mobilestudio-pro-13.svg > create mode 100644 data/layouts/mobilestudio-pro-16.svg > create mode 100644 data/mobilestudio-pro-13.tablet > create mode 100644 data/mobilestudio-pro-16.tablet > > diff --git a/data/layouts/mobilestudio-pro-13.svg > b/data/layouts/mobilestudio-pro-13.svg > new file mode 100644 > index 0000000..172141b > --- /dev/null > +++ b/data/layouts/mobilestudio-pro-13.svg
[...] > diff --git a/data/libwacom.stylus b/data/libwacom.stylus > index 21c1949..c063370 100644 > --- a/data/libwacom.stylus > +++ b/data/libwacom.stylus > @@ -79,8 +79,11 @@ Type=General > > [0x842] > # Intuos2 > -Name=Designer Pen > -HasEraser=false > +#Name=Designer Pen > +#HasEraser=false > +# MobileStudio Pro > +Name=Pro Pen > +HasEraser=true I think this should warrant another entry, given that these files are quite static. If we replace the Intuos2 entry (fair enough, it's not exactly the most recent hardware) either drop all references and let the git hisotry handle the rest or duplicate the whole entry as comment and add a new one for the MSP: # Superseded by 0x842 for the Mobile Studio Pro # [0x842] # Intuos2 # Name=Designer Pen # HasEraser=false ... > Buttons=2 > Axes=Tilt;Pressure;Distance; > Type=General > @@ -209,6 +212,13 @@ Buttons=2 > Axes=Tilt;Pressure;Distance; > Type=Classic > > +[0x84a] > +Name=Pro Pen Eraser > +IsEraser=true > +Buttons=2 > +Axes=Tilt;Pressure;Distance; > +Type=General > + > [0x85a] > # Intuos2 > Name=Grip Pen Eraser > diff --git a/data/mobilestudio-pro-13.tablet b/data/mobilestudio-pro-13.tablet > new file mode 100644 > index 0000000..1b06421 > --- /dev/null > +++ b/data/mobilestudio-pro-13.tablet > @@ -0,0 +1,58 @@ > +# Wacom > +# MobileStudio Pro 13 > +# DTH-W1320 > +# > +# Button Map: > +# (A=1, B=2, C=3, ...) > +# > +# *-----------------------* > +# | | > +# A | | > +# B | | > +# C | | > +# | | > +# I | | > +# J G H | DISPLAY | > +# K | | > +# | | > +# D | | > +# E | | > +# F | | > +# | | > +# *-----------------------* > +# > +# Touch Ring Map: > +# (A=1st ring, B=2nd ring, ...) > +# > +# *-----------------------* > +# | | > +# A | TABLET | > +# | | > +# *-----------------------* > +# > +# Note: Buttons H, I, J, K are on a circle > +# > + > +[Device] > +Name=Wacom MobileStudio Pro 13 > +Class=Cintiq > +DeviceMatch=usb:056a:034d > +PairedID=usb:056a:034a > +Width=12 > +Height=7 > +Layout=mobilestudio-pro-13.svg > +Styli=0x842;0x84a;0x160802;0x16080a;0x100802;0x10080a;0x140802;0x14080a;0x120802;0x100804;0x10080c;0x100902;0x10090a > +IntegratedIn=Display;System > + > +[Features] > +Stylus=true > +Touch=true > +Ring=true > +Buttons=11 > + > +[Buttons] > +Left=A;B;C;D;E;F;G;H;I;J;K > + > +# This tablet has mode buttons but no LEDs to signal the current mode to the > +# user and thus requires the caller to display an on-screen notification. > +Ring=H;I;J;K I've pushed the 22HDT patch for this already, so IMO we should continue the same here, add the entry and wait for userspace to catch up. Cheers, Peter ------------------------------------------------------------------------------ Developer Access Program for Intel Xeon Phi Processors Access to Intel Xeon Phi processor-based developer platforms. With one year of Intel Parallel Studio XE. Training and support from Colfax. Order your platform today. http://sdm.link/xeonphi _______________________________________________ Linuxwacom-devel mailing list Linuxwacom-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
