A new stylus id, 0x8e2, is added to libwacom.stylus since stylus for this series reports data in old Intuos format, which support tool serial number and tool ID.
Signed-off-by: Ping Cheng <pi...@wacom.com> --- data/intuos-m-p2.tablet | 41 ++++++++++++++++++++++++++++++++ data/intuos-m-pt2.tablet | 55 +++++++++++++++++++++++++++++++++++++++++++ data/intuos-s-p2.tablet | 38 ++++++++++++++++++++++++++++++ data/intuos-s-pt2.tablet | 54 ++++++++++++++++++++++++++++++++++++++++++ data/layouts/intuos-m-p2.svg | 36 ++++++++++++++++++++++++++++ data/layouts/intuos-m-pt2.svg | 36 ++++++++++++++++++++++++++++ data/layouts/intuos-s-p2.svg | 36 ++++++++++++++++++++++++++++ data/layouts/intuos-s-pt2.svg | 36 ++++++++++++++++++++++++++++ data/libwacom.stylus | 8 +++++++ test/tablet-validity.c | 2 +- 10 files changed, 341 insertions(+), 1 deletion(-) create mode 100644 data/intuos-m-p2.tablet create mode 100644 data/intuos-m-pt2.tablet create mode 100644 data/intuos-s-p2.tablet create mode 100644 data/intuos-s-pt2.tablet create mode 100644 data/layouts/intuos-m-p2.svg create mode 100644 data/layouts/intuos-m-pt2.svg create mode 100644 data/layouts/intuos-s-p2.svg create mode 100644 data/layouts/intuos-s-pt2.svg diff --git a/data/intuos-m-p2.tablet b/data/intuos-m-p2.tablet new file mode 100644 index 0000000..40111e4 --- /dev/null +++ b/data/intuos-m-p2.tablet @@ -0,0 +1,41 @@ +# Wacom +# Intuos Pen Medium +# CTL-690 +# +# Successor of Bamboo3 series while stylus +# is in Intuos stylus format +# +# stylus with two buttons and no eraser +# Pen active area: 8.5 x 5.3in +# +# Button Map: +# (A=RIGHT, B=LEFT, C=FORWARD, D=BACKWARD) +# +# A C +# B D +# *-----------------------* +# | | +# | | +# | TABLET | +# | | +# | | +# *-----------------------* + +[Device] +Name=Intuos Pen Medium +DeviceMatch=usb:056a:033d +Class=Intuos +Width=9 +Height=5 +Layout=intuos-m-p2.svg +IntegratedIn= +Styli=0x8e2; + +[Features] +Stylus=true +Reversible=true +Buttons=4 + +[Buttons] +Left=A;B +Right=C;D diff --git a/data/intuos-m-pt2.tablet b/data/intuos-m-pt2.tablet new file mode 100644 index 0000000..58a8331 --- /dev/null +++ b/data/intuos-m-pt2.tablet @@ -0,0 +1,55 @@ +# Wacom +# Intuos Pen & Touch Medium +# CTH-690 +# +# Successor of Bamboo3 series while stylus +# is in Intuos stylus format +# +# stylus with two buttons and no eraser; 16FG touch +# Pen active area: 8.5 x 5.3in +# Touch active area: 8.5 x 5.3in +# +# Button Map: +# (A=RIGHT, B=LEFT, C=FORWARD, D=BACKWARD) +# +# A C +# B D +# *-----------------------* +# | | +# | | +# | TABLET | +# | | +# | | +# *-----------------------* +# +# Touch Switch Map: +# (on the edge of top right corner; switch to right: touch off; switch to left: touch on) +# +# S +# *-----------------------* +# | | +# | | +# | TABLET | +# | | +# | | +# *-----------------------* + +[Device] +Name=Intuos Pen & Touch Medium +DeviceMatch=usb:056a:033e +Class=Intuos +Width=9 +Height=5 +Layout=intuos-m-pt2.svg +IntegratedIn= +Styli=0x8e2; + +[Features] +Stylus=true +Reversible=true +Touch=true +Buttons=4 +TouchSwitch=true + +[Buttons] +Top=A;B;C;D diff --git a/data/intuos-s-p2.tablet b/data/intuos-s-p2.tablet new file mode 100644 index 0000000..cadb0e1 --- /dev/null +++ b/data/intuos-s-p2.tablet @@ -0,0 +1,38 @@ +# Wacom +# Intuos Pen Small +# CTL-490 +# +# Successor of Bamboo3 series while stylus +# is in Intuos stylus format +# +# stylus with two buttons and no eraser +# Pen active area: 6.0 x 3.7in +# +# Button Map: +# (A=RIGHT, B=LEFT, C=FORWARD, D=BACKWARD) +# +# A C +# B D +# *-----------------------* +# | | +# | TABLET | +# | | +# *-----------------------* + +[Device] +Name=Intuos Pen Small +DeviceMatch=usb:056a:033b +Class=Intuos +Width=6 +Height=4 +Layout=intuos-s-p2.svg +IntegratedIn= +Styli=0x8e2; + +[Features] +Stylus=true +Reversible=true +Buttons=4 + +[Buttons] +Top=A;B;C;D diff --git a/data/intuos-s-pt2.tablet b/data/intuos-s-pt2.tablet new file mode 100644 index 0000000..2252af2 --- /dev/null +++ b/data/intuos-s-pt2.tablet @@ -0,0 +1,54 @@ +# Wacom +# Intuos Pen & Touch Small +# CTH-490 +# +# Successor of Bamboo3 series while stylus +# is in Intuos stylus format +# +# stylus with two buttons and eraser; 16FG touch +# Pen active area: 6.0 x 3.7in +# Touch active area: 6.0 x 3.7in +# +# Button Map: +# (A=RIGHT, B=LEFT, C=FORWARD, D=BACKWARD) +# +# A C +# B D +# *-----------------------* +# | | +# | TABLET | +# | | +# | | +# *-----------------------* +# +# Touch Switch Map: +# (on the edge of top right corner; switch to right: touch off; switch to left: touch on) +# +# S +# *-----------------------* +# | | +# | | +# | TABLET | +# | | +# | | +# *-----------------------* + +[Device] +Name=Intuos Pen & Touch Small +DeviceMatch=usb:056a:033c +Class=Intuos +Width=6 +Height=4 +Layout=intuos-s-pt.svg +IntegratedIn= +Styli=0x8e2; + +[Features] +Stylus=true +Reversible=true +Touch=true +Buttons=4 +TouchSwitch=true + +[Buttons] +Top=A;B;C;D diff --git a/data/layouts/intuos-m-p2.svg b/data/layouts/intuos-m-p2.svg new file mode 100644 index 0000000..10ef9ac --- /dev/null +++ b/data/layouts/intuos-m-p2.svg @@ -0,0 +1,36 @@ +<?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-p2" width="275" height="222"> + <title id="title">Wacom Intuos Pen Medium (CTL-690)</title> + <g> + <path id="ButtonA" class="A Button" d="M 35 35 a 8 8 0 0 1 9 -9 l 14 0 l 0 20 l -23 0 z"/> + <circle id="DotA" cx="47" cy="36" r=".5"/> + <path id="LeaderA" class="A Leader" d="M 65 35 l 20 0"/> + <text id="LabelA" class="A Label" x="87" y="40" style="text-anchor:start;">A</text> + </g> + + <g> + <path id="ButtonB" class="B Button" d="M 35 47.5 l 23 0 l 0 20 l -23 0 z"/> + <circle id="DotB" cx="47" cy="57.5" r=".5"/> + <path id="LeaderB" class="B Leader" d="M 65 59 l 20 0"/> + <text id="LabelB" class="B Label" x="87" y="64" style="text-anchor:start;">B</text> + </g> + + <g> + <path id="ButtonC" class="C Button" d="M 185 26 l 14 0 a 8 -8 0 0 1 9 9 l 0 11 l -23 0 z"/> + <circle id="DotC" cx="197" cy="36" r=".5"/> + <path id="LeaderC" class="C Leader" d="M 160 35 l 20 0"/> + <text id="LabelC" class="C Label" x="145" y="40" style="text-anchor:start;">C</text> + </g> + + + <g> + <path id="ButtonD" class="D Button" d="M 185 47.5 l 23 0 l 0 20 l -23 0 z"/> + <circle id="DotD" cx="197" cy="57.5" r=".5"/> + <path id="LeaderD" class="D Leader" d="M 160 59 l 20 0"/> + <text id="LabelD" class="D Label" x="145" y="64" style="text-anchor:start;">D</text> + </g> + +</svg> diff --git a/data/layouts/intuos-m-pt2.svg b/data/layouts/intuos-m-pt2.svg new file mode 100644 index 0000000..091613e --- /dev/null +++ b/data/layouts/intuos-m-pt2.svg @@ -0,0 +1,36 @@ +<?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-pt2" width="275" height="222"> + <title id="title">Wacom Intuos PT Medium (CTH-690)</title> + <g> + <path id="ButtonA" class="A Button" d="M 35 35 a 8 8 0 0 1 9 -9 l 14 0 l 0 20 l -23 0 z"/> + <circle id="DotA" cx="47" cy="36" r=".5"/> + <path id="LeaderA" class="A Leader" d="M 65 35 l 20 0"/> + <text id="LabelA" class="A Label" x="87" y="40" style="text-anchor:start;">A</text> + </g> + + <g> + <path id="ButtonB" class="B Button" d="M 35 47.5 l 23 0 l 0 20 l -23 0 z"/> + <circle id="DotB" cx="47" cy="57.5" r=".5"/> + <path id="LeaderB" class="B Leader" d="M 65 59 l 20 0"/> + <text id="LabelB" class="B Label" x="87" y="64" style="text-anchor:start;">B</text> + </g> + + <g> + <path id="ButtonC" class="C Button" d="M 185 26 l 14 0 a 8 -8 0 0 1 9 9 l 0 11 l -23 0 z"/> + <circle id="DotC" cx="197" cy="36" r=".5"/> + <path id="LeaderC" class="C Leader" d="M 160 35 l 20 0"/> + <text id="LabelC" class="C Label" x="145" y="40" style="text-anchor:start;">C</text> + </g> + + + <g> + <path id="ButtonD" class="D Button" d="M 185 47.5 l 23 0 l 0 20 l -23 0 z"/> + <circle id="DotD" cx="197" cy="57.5" r=".5"/> + <path id="LeaderD" class="D Leader" d="M 160 59 l 20 0"/> + <text id="LabelD" class="D Label" x="145" y="64" style="text-anchor:start;">D</text> + </g> + +</svg> diff --git a/data/layouts/intuos-s-p2.svg b/data/layouts/intuos-s-p2.svg new file mode 100644 index 0000000..11ec08e --- /dev/null +++ b/data/layouts/intuos-s-p2.svg @@ -0,0 +1,36 @@ +<?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-s-p2" width="275" height="222"> + <title id="title">Wacom Intuos Pen Small (CTL-490)</title> + <g> + <path id="ButtonA" class="A Button" d="M 35 35 a 8 8 0 0 1 9 -9 l 14 0 l 0 20 l -23 0 z"/> + <circle id="DotA" cx="47" cy="36" r=".5"/> + <path id="LeaderA" class="A Leader" d="M 65 35 l 20 0"/> + <text id="LabelA" class="A Label" x="87" y="40" style="text-anchor:start;">A</text> + </g> + + <g> + <path id="ButtonB" class="B Button" d="M 35 47.5 l 23 0 l 0 20 l -23 0 z"/> + <circle id="DotB" cx="47" cy="57.5" r=".5"/> + <path id="LeaderB" class="B Leader" d="M 65 59 l 20 0"/> + <text id="LabelB" class="B Label" x="87" y="64" style="text-anchor:start;">B</text> + </g> + + <g> + <path id="ButtonC" class="C Button" d="M 185 26 l 14 0 a 8 -8 0 0 1 9 9 l 0 11 l -23 0 z"/> + <circle id="DotC" cx="197" cy="36" r=".5"/> + <path id="LeaderC" class="C Leader" d="M 160 35 l 20 0"/> + <text id="LabelC" class="C Label" x="145" y="40" style="text-anchor:start;">C</text> + </g> + + + <g> + <path id="ButtonD" class="D Button" d="M 185 47.5 l 23 0 l 0 20 l -23 0 z"/> + <circle id="DotD" cx="197" cy="57.5" r=".5"/> + <path id="LeaderD" class="D Leader" d="M 160 59 l 20 0"/> + <text id="LabelD" class="D Label" x="145" y="64" style="text-anchor:start;">D</text> + </g> + +</svg> diff --git a/data/layouts/intuos-s-pt2.svg b/data/layouts/intuos-s-pt2.svg new file mode 100644 index 0000000..3c0303d --- /dev/null +++ b/data/layouts/intuos-s-pt2.svg @@ -0,0 +1,36 @@ +<?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-s-pt2" width="275" height="222"> + <title id="title">Wacom Intuos PT Small (CTH-490)</title> + <g> + <path id="ButtonA" class="A Button" d="M 35 35 a 8 8 0 0 1 9 -9 l 14 0 l 0 20 l -23 0 z"/> + <circle id="DotA" cx="47" cy="36" r=".5"/> + <path id="LeaderA" class="A Leader" d="M 65 35 l 20 0"/> + <text id="LabelA" class="A Label" x="87" y="40" style="text-anchor:start;">A</text> + </g> + + <g> + <path id="ButtonB" class="B Button" d="M 35 47.5 l 23 0 l 0 20 l -23 0 z"/> + <circle id="DotB" cx="47" cy="57.5" r=".5"/> + <path id="LeaderB" class="B Leader" d="M 65 59 l 20 0"/> + <text id="LabelB" class="B Label" x="87" y="64" style="text-anchor:start;">B</text> + </g> + + <g> + <path id="ButtonC" class="C Button" d="M 185 26 l 14 0 a 8 -8 0 0 1 9 9 l 0 11 l -23 0 z"/> + <circle id="DotC" cx="197" cy="36" r=".5"/> + <path id="LeaderC" class="C Leader" d="M 160 35 l 20 0"/> + <text id="LabelC" class="C Label" x="145" y="40" style="text-anchor:start;">C</text> + </g> + + + <g> + <path id="ButtonD" class="D Button" d="M 185 47.5 l 23 0 l 0 20 l -23 0 z"/> + <circle id="DotD" cx="197" cy="57.5" r=".5"/> + <path id="LeaderD" class="D Leader" d="M 160 59 l 20 0"/> + <text id="LabelD" class="D Label" x="145" y="64" style="text-anchor:start;">D</text> + </g> + +</svg> diff --git a/data/libwacom.stylus b/data/libwacom.stylus index aeaee81..21c1949 100644 --- a/data/libwacom.stylus +++ b/data/libwacom.stylus @@ -69,6 +69,14 @@ Buttons=2 Axes=Tilt;Pressure;Distance; Type=Classic +[0x8e2] +# Intuos P/PT 2 +Name=Intuos Pen +HasEraser=false +Buttons=2 +Axes=Pressure;Distance; +Type=General + [0x842] # Intuos2 Name=Designer Pen diff --git a/test/tablet-validity.c b/test/tablet-validity.c index b959988..1fe741b 100644 --- a/test/tablet-validity.c +++ b/test/tablet-validity.c @@ -201,7 +201,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) { + } else if ((styli[i] != 0xffffd) && (styli[i] != 0x8e2)) { assert(axes & WACOM_AXIS_TYPE_TILT); assert(axes & WACOM_AXIS_TYPE_PRESSURE); assert(axes & WACOM_AXIS_TYPE_DISTANCE); -- 1.9.1 ------------------------------------------------------------------------------ _______________________________________________ Linuxwacom-devel mailing list Linuxwacom-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
