On Tue, Jan 31, 2017 at 02:07:32PM -0800, Aaron Armstrong Skomra wrote: > Hi Peter, > > On Mon, Jan 30, 2017 at 3:06 PM, Peter Hutterer <peter.hutte...@who-t.net> > wrote: > > > thanks aaron - note that breaks make check here, see below > > > > Thanks, hopefully it's not another year before my next commit to libwacom. > Otherwise > I'm likely to forget to run make check again.
hehe. try this: echo "make check" > .git/hooks/post-commit chmod +x .git/hooks/post-commit I *think* this should work. Cheers, Peter > On Mon, Jan 30, 2017 at 09:03:37AM -0800, Aaron Armstrong Skomra wrote: > > > Signed-off-by: Aaron Armstrong Skomra <aaron.sko...@wacom.com> > > > --- > > > data/intuos-pro-2-l.tablet | 67 +++++++++ > > > data/intuos-pro-2-m.tablet | 67 +++++++++ > > > data/layouts/intuos-pro-2-l.svg | 323 ++++++++++++++++++++++++++++++ > > ++++++++++ > > > data/layouts/intuos-pro-2-m.svg | 323 ++++++++++++++++++++++++++++++ > > ++++++++++ > > > 4 files changed, 780 insertions(+) > > > create mode 100644 data/intuos-pro-2-l.tablet > > > create mode 100644 data/intuos-pro-2-m.tablet > > > create mode 100644 data/layouts/intuos-pro-2-l.svg > > > create mode 100644 data/layouts/intuos-pro-2-m.svg > > > > > > diff --git a/data/intuos-pro-2-l.tablet b/data/intuos-pro-2-l.tablet > > > new file mode 100644 > > > index 0000000..a6bd811 > > > --- /dev/null > > > +++ b/data/intuos-pro-2-l.tablet > > > @@ -0,0 +1,67 @@ > > > +# Wacom > > > +# Intuos Pro 2 L > > > +# 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 > > > +DeviceMatch=usb:056a:0358 > > > +Class=Intuos5 > > > +Width=9 > > > +Height=6 > > > +Layout=intuos-pro-2-l.svg > > > +IntegratedIn= > > > +Styli=0x842;0x84a;0x802;0x80a;0x804;0x80c;0x902;0x90a; > > 0x16802;0x10802;0x14802;0x10804;0x10902;0x2842;0x4842 > > > > 0x16802 breaks the dbverify and tablet-validity test, it doesn't exist in > > our database. I suspect 0x14802 would too, not sure about the others > > > > I'll fix this in the update. I should have had the same styli list as the > Mobile Studio Pro. > > > > > + > > > +[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 > > > > just to verify: it's really BTN_8 that triggers the modes? > > > > Yes with the Pro 2 the mode-switch/led is last in the sequence instead of > first. > > > > also, something isn't right with the buttons, I get this error when running > > test/load > > > > (process:13800): libwacom-CRITICAL **: libwacom_get_button_flag: > > assertion 'button < 'A' + device->num_buttons' failed > > > > When I look at test/load it looks like this test only applies to the > Intuos 4 WL and that it is supposed to tickle the assertion: > > Following critical warning in libwacom_get_button_flag() is expected > > (process:23185): libwacom-CRITICAL **: libwacom_get_button_flag: assertion > 'button < 'A' + device->num_buttons' failed > > Best, > Aaron ------------------------------------------------------------------------------ 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
