On Tue, Mar 06, 2018 at 10:12:47AM -0800, Aaron Armstrong Skomra wrote: > Also update test to reflect the lack of tilt with its stylus. > > Signed-off-by: Aaron Armstrong Skomra <sko...@gmail.com>
pushed, thanks To github.com:linuxwacom/libwacom.git 9ff640d..e191479 master -> master Cheers, Peter > --- > data/intuos-m-p3-wl.tablet | 36 ++++++++++++++++++++++++++++++++++++ > data/intuos-m-p3.tablet | 36 ++++++++++++++++++++++++++++++++++++ > data/intuos-s-p3-wl.tablet | 36 ++++++++++++++++++++++++++++++++++++ > data/intuos-s-p3.tablet | 36 ++++++++++++++++++++++++++++++++++++ > data/layouts/intuos-m-p3.svg | 31 +++++++++++++++++++++++++++++++ > data/layouts/intuos-s-p3.svg | 31 +++++++++++++++++++++++++++++++ > data/libwacom.stylus | 8 ++++++++ > test/tablet-validity.c | 2 +- > 8 files changed, 215 insertions(+), 1 deletion(-) > create mode 100644 data/intuos-m-p3-wl.tablet > create mode 100644 data/intuos-m-p3.tablet > create mode 100644 data/intuos-s-p3-wl.tablet > create mode 100644 data/intuos-s-p3.tablet > create mode 100644 data/layouts/intuos-m-p3.svg > create mode 100644 data/layouts/intuos-s-p3.svg > > diff --git a/data/intuos-m-p3-wl.tablet b/data/intuos-m-p3-wl.tablet > new file mode 100644 > index 000000000000..82918de62b5f > --- /dev/null > +++ b/data/intuos-m-p3-wl.tablet > @@ -0,0 +1,36 @@ > +# Wacom > +# Intuos Pen Medium Wireless > +# CTL-6100WL > +# > +# This is the third generation "Intuos", a successor to > +# the CTL-690. It has a Stylus with two buttons and no > +# eraser. The device has no touch. > +# > +# Buttons are no loger RIGHT, LEFT, FORWARD, and BACKWARD. > +# The buttons are now reported as numbered buttons as with > +# the Intuos Pro series. > +# > +# A B C D > +# *-----------------------* > +# | | > +# | TABLET | > +# | | > +# *-----------------------* > + > +[Device] > +Name=Wacom Intuos BT M > +DeviceMatch=usb:056a:0378;bluetooth:056a:0379 > +Class=Bamboo > +Width=10 > +Height=8 > +Layout=intuos-m-p3.svg > +IntegratedIn= > +Styli=0x862; > + > +[Features] > +Stylus=true > +Reversible=false > +Buttons=4 > + > +[Buttons] > +Top=A;B;C;D > diff --git a/data/intuos-m-p3.tablet b/data/intuos-m-p3.tablet > new file mode 100644 > index 000000000000..1a0b7c72e5ce > --- /dev/null > +++ b/data/intuos-m-p3.tablet > @@ -0,0 +1,36 @@ > +# Wacom > +# Intuos Pen Medium > +# CTL-6100 > +# > +# This is the third generation "Intuos", a successor to > +# the CTL-690. It has a Stylus with two buttons and no > +# eraser. The device has no touch. > +# > +# Buttons are no loger RIGHT, LEFT, FORWARD, and BACKWARD. > +# The buttons are now reported as numbered buttons as with > +# the Intuos Pro series. > +# > +# A B C D > +# *-----------------------* > +# | | > +# | TABLET | > +# | | > +# *-----------------------* > + > +[Device] > +Name=Wacom Intuos M > +DeviceMatch=usb:056a:0375 > +Class=Bamboo > +Width=10 > +Height=8 > +Layout=intuos-m-p3.svg > +IntegratedIn= > +Styli=0x862; > + > +[Features] > +Stylus=true > +Reversible=false > +Buttons=4 > + > +[Buttons] > +Top=A;B;C;D > diff --git a/data/intuos-s-p3-wl.tablet b/data/intuos-s-p3-wl.tablet > new file mode 100644 > index 000000000000..f16d65485177 > --- /dev/null > +++ b/data/intuos-s-p3-wl.tablet > @@ -0,0 +1,36 @@ > +# Wacom > +# Intuos Pen Small Wireless > +# CTL-4100WL > +# > +# This is the third generation "Intuos", a successor to > +# the CTL-490. It has a Stylus with two buttons and no > +# eraser. The device has no touch. > +# > +# Buttons are no loger RIGHT, LEFT, FORWARD, and BACKWARD. > +# The buttons are now reported as numbered buttons as with > +# the Intuos Pro series. > +# > +# A B C D > +# *-----------------------* > +# | | > +# | TABLET | > +# | | > +# *-----------------------* > + > +[Device] > +Name=Wacom Intuos BT S > +DeviceMatch=usb:056a:0376;bluetooth:056a:0377 > +Class=Bamboo > +Width=8 > +Height=6 > +Layout=intuos-s-p3.svg > +IntegratedIn= > +Styli=0x862; > + > +[Features] > +Stylus=true > +Reversible=false > +Buttons=4 > + > +[Buttons] > +Top=A;B;C;D > diff --git a/data/intuos-s-p3.tablet b/data/intuos-s-p3.tablet > new file mode 100644 > index 000000000000..644ba826549c > --- /dev/null > +++ b/data/intuos-s-p3.tablet > @@ -0,0 +1,36 @@ > +# Wacom > +# Intuos Pen Small > +# CTL-4100 > +# > +# This is the third generation "Intuos", a successor to > +# the CTL-490. It has a Stylus with two buttons and no > +# eraser. The device has no touch. > +# > +# Buttons are no loger RIGHT, LEFT, FORWARD, and BACKWARD. > +# The buttons are now reported as numbered buttons as with > +# the Intuos Pro series. > +# > +# A B C D > +# *-----------------------* > +# | | > +# | TABLET | > +# | | > +# *-----------------------* > + > +[Device] > +Name=Wacom Intuos S > +DeviceMatch=usb:056a:0374 > +Class=Bamboo > +Width=8 > +Height=6 > +Layout=intuos-s-p3.svg > +IntegratedIn= > +Styli=0x862; > + > +[Features] > +Stylus=true > +Reversible=false > +Buttons=4 > + > +[Buttons] > +Top=A;B;C;D > diff --git a/data/layouts/intuos-m-p3.svg b/data/layouts/intuos-m-p3.svg > new file mode 100644 > index 000000000000..10303fd80536 > --- /dev/null > +++ b/data/layouts/intuos-m-p3.svg > @@ -0,0 +1,31 @@ > +<?xml version="1.0" encoding="UTF-8" standalone="no"?> > +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" > "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";> > +<!-- > + --> > +<svg xmlns="http://www.w3.org/2000/svg"; version="1.1" > style="color:#000000;stroke:#7f7f7f;fill:none;stroke-width:.25;font-size:8" > id="intuos-m-p3" width="275" height="222"> > + <title id="title">Wacom Intuos Pen Medium (CTL-6100)</title> > + <g> > + <path id="ButtonA" class="A Button" d="M 42,10.5 a 12.75,8.5 0 0 1 > 12.75,-8.5 l 23.75,0 l 0,19 l -23.75,0 a 12.75,8.5 0 0 1 -12.75,-8.5 l 0,-2"/> > + <path id="LeaderA" class="A Leader" d="M 44,21.5 l 0,25 l 2,0"/> > + <text id="LabelA" class="A Label" x="48" y="53.5" > style="text-anchor:start;">A</text> > + </g> > + > + <g> > + <path id="ButtonB" class="B Button" d="M 80,2 l 42,0 l 0,19 l -42,0 z"/> > + <path id="LeaderB" class="B Leader" d="M 82,22.5 l 0,10 l 2,0"/> > + <text id="LabelB" class="B Label" x="86" y="38" > style="text-anchor:start;">B</text> > + </g> > + > + <g> > + <path id="ButtonC" class="C Button" d="M 153,2 l 42,0 l 0,19 l -42,0 z"/> > + <path id="LeaderC" class="C Leader" d="M 155,22.5 l 0,25 l 2,0"/> > + <text id="LabelC" class="C Label" x="170" y="53.5" > style="text-anchor:end;">C</text> > + </g> > + > + <g> > + <path id="ButtonD" class="D Button" d="M 196.5,2 l 23.75,0 a 12.75,8.5 0 > 0 1 12.75,8.5 l 0,2 a 12.75,8.5 0 0 1 -12.75,8.5 l -23.75,0 l 0,-19"/> > + <path id="LeaderD" class="D Leader" d="M 197.5,22.5 l 0,10 l 2,0"/> > + <text id="LabelD" class="D Label" x="212.5" y="38" > style="text-anchor:end;">D</text> > + </g> > + > +</svg> > diff --git a/data/layouts/intuos-s-p3.svg b/data/layouts/intuos-s-p3.svg > new file mode 100644 > index 000000000000..10303fd80536 > --- /dev/null > +++ b/data/layouts/intuos-s-p3.svg > @@ -0,0 +1,31 @@ > +<?xml version="1.0" encoding="UTF-8" standalone="no"?> > +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" > "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";> > +<!-- > + --> > +<svg xmlns="http://www.w3.org/2000/svg"; version="1.1" > style="color:#000000;stroke:#7f7f7f;fill:none;stroke-width:.25;font-size:8" > id="intuos-m-p3" width="275" height="222"> > + <title id="title">Wacom Intuos Pen Medium (CTL-6100)</title> > + <g> > + <path id="ButtonA" class="A Button" d="M 42,10.5 a 12.75,8.5 0 0 1 > 12.75,-8.5 l 23.75,0 l 0,19 l -23.75,0 a 12.75,8.5 0 0 1 -12.75,-8.5 l 0,-2"/> > + <path id="LeaderA" class="A Leader" d="M 44,21.5 l 0,25 l 2,0"/> > + <text id="LabelA" class="A Label" x="48" y="53.5" > style="text-anchor:start;">A</text> > + </g> > + > + <g> > + <path id="ButtonB" class="B Button" d="M 80,2 l 42,0 l 0,19 l -42,0 z"/> > + <path id="LeaderB" class="B Leader" d="M 82,22.5 l 0,10 l 2,0"/> > + <text id="LabelB" class="B Label" x="86" y="38" > style="text-anchor:start;">B</text> > + </g> > + > + <g> > + <path id="ButtonC" class="C Button" d="M 153,2 l 42,0 l 0,19 l -42,0 z"/> > + <path id="LeaderC" class="C Leader" d="M 155,22.5 l 0,25 l 2,0"/> > + <text id="LabelC" class="C Label" x="170" y="53.5" > style="text-anchor:end;">C</text> > + </g> > + > + <g> > + <path id="ButtonD" class="D Button" d="M 196.5,2 l 23.75,0 a 12.75,8.5 0 > 0 1 12.75,8.5 l 0,2 a 12.75,8.5 0 0 1 -12.75,8.5 l -23.75,0 l 0,-19"/> > + <path id="LeaderD" class="D Leader" d="M 197.5,22.5 l 0,10 l 2,0"/> > + <text id="LabelD" class="D Label" x="212.5" y="38" > style="text-anchor:end;">D</text> > + </g> > + > +</svg> > diff --git a/data/libwacom.stylus b/data/libwacom.stylus > index 2a6d6c2d2d46..a7eba3660f9c 100644 > --- a/data/libwacom.stylus > +++ b/data/libwacom.stylus > @@ -77,6 +77,14 @@ Buttons=2 > Axes=Pressure;Distance; > Type=General > > +[0x862] > +# Intuos P/PT 2 > +Name=Intuos Pen > +HasEraser=false > +Buttons=2 > +Axes=Pressure;Distance; > +Type=General > + > # Superseded by 0x842 for the MobileStudio Pro > # [0x842] > # Intuos2 > diff --git a/test/tablet-validity.c b/test/tablet-validity.c > index ee07dae5ce5a..e93740ea9187 100644 > --- a/test/tablet-validity.c > +++ b/test/tablet-validity.c > @@ -229,7 +229,7 @@ static void verify_tablet(WacomDeviceDatabase *db, > WacomDevice *device) > axes = libwacom_stylus_get_axes (stylus); > if (libwacom_stylus_get_type (stylus) == WSTYLUS_PUCK) { > assert((axes & WACOM_AXIS_TYPE_PRESSURE) == 0); > - } else if ((styli[i] != 0xffffd) && (styli[i] != 0x8e2)) { > + } else if ((styli[i] != 0xffffd) && (styli[i] != 0x8e2) && > (styli[i] != 0x862)) { > assert(axes & WACOM_AXIS_TYPE_TILT); > assert(axes & WACOM_AXIS_TYPE_PRESSURE); > assert(axes & WACOM_AXIS_TYPE_DISTANCE); > -- > 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 > ------------------------------------------------------------------------------ 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
