[Linuxwacom-devel] [PATCH libwacom 2/2] Add .data files for Intuos 2 series

2015-11-04 Thread Ping Cheng 
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 
---
 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 000..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 000..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 000..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 000..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)
+#
+#

Re: [Linuxwacom-devel] [PATCH libwacom 2/2] Add .data files for Intuos 2 series

2015-11-04 Thread Peter Hutterer 
On Wed, Nov 04, 2015 at 06:05:39PM -0800, Ping Cheng wrote:
> 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 

both pushed, thanks

Cheers,
   Peter

> ---
>  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 000..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 000..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 000..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