On Wed, May 31, 2017 at 09:02:19AM -0700, Aaron Armstrong Skomra wrote: > Also correct width and height for intuos-pro-2-l.tablet, > cintiq-pro-13.tablet and cintiq-pro-16.tablet. > > Signed-off-by: Aaron Armstrong Skomra <aaron.sko...@wacom.com> > --- > Peter, > > Good catch, I had just copied those two files from their USB > equivalents, so I had to fix intuos-pro-2-l.tablet which had the > same error. Also reviewing another recent patch revealed that I > used the wrong dimensions (device instead of active area) for > the recent Cintiqs.
oops, guess I should've spotted those during review. Thanks for fixing, pushed as 46774c4..ecf0bf4 master -> master Cheers, Peter > > Aaron > > data/cintiq-pro-13.tablet | 4 +-- > data/cintiq-pro-16.tablet | 4 +-- > data/intuos-pro-2-l-wl.tablet | 67 > +++++++++++++++++++++++++++++++++++++++++++ > data/intuos-pro-2-l.tablet | 4 +-- > data/intuos-pro-2-m-wl.tablet | 67 > +++++++++++++++++++++++++++++++++++++++++++ > 5 files changed, 140 insertions(+), 6 deletions(-) > create mode 100644 data/intuos-pro-2-l-wl.tablet > create mode 100644 data/intuos-pro-2-m-wl.tablet > > diff --git a/data/cintiq-pro-13.tablet b/data/cintiq-pro-13.tablet > index 197ad3f9a05a..e9fb0254a301 100644 > --- a/data/cintiq-pro-13.tablet > +++ b/data/cintiq-pro-13.tablet > @@ -31,8 +31,8 @@ Name=Wacom Cintiq Pro 13 > Class=Cintiq > DeviceMatch=usb:056a:034F > PairedID=usb:056a:0353 > -Width=14 > -Height=9 > +Width=12 > +Height=7 > # No pad buttons, so no layout > > Styli=0x842;0x84a;0x160802;0x16080a;0x100802;0x10080a;0x140802;0x14080a;0x120802;0x100804;0x10080c;0x100902;0x10090a > IntegratedIn=Display > diff --git a/data/cintiq-pro-16.tablet b/data/cintiq-pro-16.tablet > index e64bdd39743f..6a8e3fab09d9 100644 > --- a/data/cintiq-pro-16.tablet > +++ b/data/cintiq-pro-16.tablet > @@ -31,8 +31,8 @@ Name=Wacom Cintiq Pro 16 > Class=Cintiq > DeviceMatch=usb:056a:0350 > PairedID=usb:056a:0354 > -Width=16 > -Height=10 > +Width=14 > +Height=8 > # No pad buttons, so no layout > > Styli=0x842;0x84a;0x160802;0x16080a;0x100802;0x10080a;0x140802;0x14080a;0x120802;0x100804;0x10080c;0x100902;0x10090a > IntegratedIn=Display > diff --git a/data/intuos-pro-2-l-wl.tablet b/data/intuos-pro-2-l-wl.tablet > new file mode 100644 > index 000000000000..89445e156068 > --- /dev/null > +++ b/data/intuos-pro-2-l-wl.tablet > @@ -0,0 +1,67 @@ > +# Wacom > +# Intuos Pro 2 L WL > +# PTH-860 > +# > +# Button Map: > +# (A=1, B=2, C=3, ...) > +# > +# *-----------------------* > +# | | > +# A | | > +# B | | > +# C | | > +# D | | > +# I | TABLET | > +# E | | > +# F | | > +# G | | > +# H | | > +# | | > +# *-----------------------* > +# > +# Touch Ring Map: > +# (A=1st ring, B=2nd ring, ...) > +# > +# *-----------------------* > +# | | > +# A | TABLET | > +# | | > +# *-----------------------* > +# > +# LED Map: > +# (XY=Bank X, LED Y; *=Invisible) > +# > +# *-----------------------* > +# | | > +# | | > +# 01 02 | | > +# | TABLET | > +# 00 03 | | > +# | | > +# | | > +# *-----------------------* > +# > + > +[Device] > +Name=Wacom Intuos Pro 2 L WL > +DeviceMatch=bluetooth:056a:0361 > +Class=Intuos5 > +Width=12 > +Height=8 > +Layout=intuos-pro-2-l.svg > +IntegratedIn= > +Styli=0x842;0x84a;0x160802;0x16080a;0x100802;0x10080a;0x140802;0x14080a;0x120802;0x100804;0x10080c;0x100902;0x10090a > + > +[Features] > +Stylus=true > +Reversible=true > +Touch=true > +Buttons=9 > +Ring=true > +StatusLEDs=Ring > + > +[Buttons] > +Left=A;B;C;D;E;F;G;H;I > + > +Ring=I > +RingNumModes=4 > diff --git a/data/intuos-pro-2-l.tablet b/data/intuos-pro-2-l.tablet > index 421b971404af..52cebcd81775 100644 > --- a/data/intuos-pro-2-l.tablet > +++ b/data/intuos-pro-2-l.tablet > @@ -46,8 +46,8 @@ > Name=Wacom Intuos Pro 2 L > DeviceMatch=usb:056a:0358 > Class=Intuos5 > -Width=9 > -Height=6 > +Width=12 > +Height=8 > Layout=intuos-pro-2-l.svg > IntegratedIn= > > Styli=0x842;0x84a;0x160802;0x16080a;0x100802;0x10080a;0x140802;0x14080a;0x120802;0x100804;0x10080c;0x100902;0x10090a > diff --git a/data/intuos-pro-2-m-wl.tablet b/data/intuos-pro-2-m-wl.tablet > new file mode 100644 > index 000000000000..d7d6694eb42a > --- /dev/null > +++ b/data/intuos-pro-2-m-wl.tablet > @@ -0,0 +1,67 @@ > +# Wacom > +# Intuos Pro 2 M WL > +# PTH-660 > +# > +# Button Map: > +# (A=1, B=2, C=3, ...) > +# > +# *-----------------------* > +# | | > +# A | | > +# B | | > +# C | | > +# D | | > +# I | TABLET | > +# E | | > +# F | | > +# G | | > +# H | | > +# | | > +# *-----------------------* > +# > +# Touch Ring Map: > +# (A=1st ring, B=2nd ring, ...) > +# > +# *-----------------------* > +# | | > +# A | TABLET | > +# | | > +# *-----------------------* > +# > +# LED Map: > +# (XY=Bank X, LED Y; *=Invisible) > +# > +# *-----------------------* > +# | | > +# | | > +# 01 02 | | > +# | TABLET | > +# 00 03 | | > +# | | > +# | | > +# *-----------------------* > +# > + > +[Device] > +Name=Wacom Intuos Pro 2 M WL > +DeviceMatch=bluetooth:056a:0360 > +Class=Intuos5 > +Width=9 > +Height=6 > +Layout=intuos-pro-2-m.svg > +IntegratedIn= > +Styli=0x842;0x84a;0x160802;0x16080a;0x100802;0x10080a;0x140802;0x14080a;0x120802;0x100804;0x10080c;0x100902;0x10090a > + > +[Features] > +Stylus=true > +Reversible=true > +Touch=true > +Buttons=9 > +Ring=true > +StatusLEDs=Ring > + > +[Buttons] > +Left=A;B;C;D;E;F;G;H;I > + > +Ring=I > +RingNumModes=4 > -- > 2.7.4 > ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ Linuxwacom-devel mailing list Linuxwacom-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
