On Wed, May 22, 2013 at 12:38:05PM -0700, Ping Cheng wrote: > 5 new styli are added for Cintiq 21UX2, 22HD, 24HD and Intuos 4 and 5. > > Signed-off-by: Ping Cheng <pi...@wacom.com> > --- > data/cintiq-13hd.tablet | 2 +- > data/cintiq-21ux2.tablet | 2 +- > data/cintiq-22hd.tablet | 2 +- > data/cintiq-24hd-touch.tablet | 2 +- > data/cintiq-24hd.tablet | 2 +- > data/intuos4-12x19.tablet | 2 +- > data/intuos4-4x6.tablet | 2 +- > data/intuos4-6x9-wl.tablet | 2 +- > data/intuos4-6x9.tablet | 2 +- > data/intuos4-8x13.tablet | 2 +- > data/intuos5-m.tablet | 2 +- > data/intuos5-s.tablet | 2 +- > data/intuos5-touch-l.tablet | 2 +- > data/intuos5-touch-m.tablet | 2 +- > data/intuos5-touch-s.tablet | 2 +- > data/libwacom.stylus | 60 > ++++++++++++++++++++++++++++++++++++++++--- > 16 files changed, 71 insertions(+), 19 deletions(-) > > diff --git a/data/cintiq-13hd.tablet b/data/cintiq-13hd.tablet > index 2371a54..4fe32b4 100644 > --- a/data/cintiq-13hd.tablet > +++ b/data/cintiq-13hd.tablet > @@ -39,4 +39,4 @@ Ring=false > Buttons=9 > > [Buttons] > -Left=A;B;C;D;E;F;G;H;I > +Left=B;C;G;H;A;F;I;D;E
this hunk seems it's misplaced? > diff --git a/data/cintiq-21ux2.tablet b/data/cintiq-21ux2.tablet > index df81807..dfebe35 100644 > --- a/data/cintiq-21ux2.tablet > +++ b/data/cintiq-21ux2.tablet > @@ -49,7 +49,7 @@ Class=Cintiq > Width=17 > Height=13 > Layout=cintiq-21ux2.svg > -Styli=0x802;0x80c;0x804;0x80a;0x40802;0x4080a;0x902;0x90a;0x20802; > +Styli=0x802;0x80c;0x804;0x80a;0x140802;0x14080a;0x902;0x90a;0x120802; > IntegratedIn=Display how come the styli changed number? this would break existing configurations since the stylus ID is in gsettings now. and doesn't the stylus ID come from the hardware? has this changed, or am I missing something here? Cheers, Peter > diff --git a/data/libwacom.stylus b/data/libwacom.stylus > index 536d3bb..94f2217 100644 > --- a/data/libwacom.stylus > +++ b/data/libwacom.stylus > @@ -25,8 +25,8 @@ Buttons=0 > HasEraser=false > Type=Inking > > -[0x20802] > -# Intuos4, 5 and Cintiq 21UX2, 24HD > +[0x120802] > +# Intuos4, 5 and Cintiq 21UX2, 22HD, 24HD > Name=Inking Pen > Buttons=0 > HasEraser=false > @@ -95,13 +95,34 @@ HasEraser=true > Buttons=2 > Type=Marker > > -[0x40802] > +[0x100804] > +# Intuos4, 5 and Cintiq 21UX2, 22HD, 24HD > +Name=Art Pen > +HasEraser=true > +Buttons=2 > +Type=Marker > + > +[0x140802] > # Intuos4, 5 and Cintiq 21UX2, 24HD > Name=Classic Pen > HasEraser=true > Buttons=2 > Type=Classic > > +[0x160802] > +# Cintiq 13HD Pro Pen > +Name=Pro Pen > +HasEraser=true > +Buttons=2 > +Type=Pro > + > +[0x180802] > +# DTH2242 Pen > +Name=Pen > +HasEraser=true > +Buttons=2 > +Type=General > + > [0x022] > Name=Pen > HasEraser=true > @@ -178,12 +199,36 @@ Name=Grip Pen Eraser > IsEraser=true > Type=General > > -[0x4080a] > +[0x14080a] > # Intuos4, 5 and Cintiq 21UX2, 24HD > Name=Classic Pen Eraser > IsEraser=true > Type=Classic > > +[0x10080c] > +# Intuos4, 5 and 13HD, 24HD Art Pen > +Name=Art Pen Eraser > +IsEraser=true > +Type=Marker > + > +[0x16080a] > +# Cintiq 13HD > +Name=Pro Pen Eraser > +IsEraser=true > +Type=Pro > + > +[0x18080a] > +# DTH2242 Eraser > +Name=Pen Eraser > +IsEraser=true > +Type=General > + > +[0x10090a] > +# Intuos4, 5 and Cintiq 13HD, 22HD, 24HD Airbrush Eraser > +Name=Airbrush Pen Eraser > +IsEraser=true > +Type=Airbrush > + > [0x90a] > # Intuos4, 5 and Cintiq 21UX2, 24HD > Name=Airbrush Pen Eraser > @@ -224,6 +269,13 @@ Buttons=1 > HasEraser=true > Type=Airbrush > > +[0x100902] > +# Intuos4, 5 and Cintiq 13HD, 21UX2, 22HD, 24HD > +Name=Airbrush Pen > +Buttons=1 > +HasEraser=true > +Type=Airbrush > + > # Puck devices > [0x096] > # Intuos and Intuos2 > -- > 1.8.1.2 > ------------------------------------------------------------------------------ Try New Relic Now & We'll Send You this Cool Shirt New Relic is the only SaaS-based application performance monitoring service that delivers powerful full stack analytics. Optimize and monitor your browser, app, & servers with just a few lines of code. Try New Relic and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_may _______________________________________________ Linuxwacom-devel mailing list Linuxwacom-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
