Whole set of 4 has been pushed. Thank you for your support.
Ping
On Thu, May 23, 2013 at 3:17 PM, Ping Cheng <pingli...@gmail.com> wrote:
> 5 new styli are added for Cintiq 21UX2, 22HD, 24HD and Intuos 4 and 5.
>
> Signed-off-by: Ping Cheng <pi...@wacom.com>
> ---
> data/cintiq-21ux2.tablet | 2 +-
> data/cintiq-22hd.tablet | 2 +-
> data/cintiq-24hd-touch.tablet | 2 +-
> data/cintiq-24hd.tablet | 2 +-
> data/intuos4-12x19.tablet | 2 +-
> data/intuos4-4x6.tablet | 2 +-
> data/intuos4-6x9-wl.tablet | 2 +-
> data/intuos4-6x9.tablet | 2 +-
> data/intuos4-8x13.tablet | 2 +-
> data/intuos5-m.tablet | 2 +-
> data/intuos5-s.tablet | 2 +-
> data/intuos5-touch-l.tablet | 2 +-
> data/intuos5-touch-m.tablet | 2 +-
> data/intuos5-touch-s.tablet | 2 +-
> data/libwacom.stylus | 60
> ++++++++++++++++++++++++++++++++++++++++---
> 15 files changed, 70 insertions(+), 18 deletions(-)
>
> diff --git a/data/cintiq-21ux2.tablet b/data/cintiq-21ux2.tablet
> index df81807..dfebe35 100644
> --- a/data/cintiq-21ux2.tablet
> +++ b/data/cintiq-21ux2.tablet
> @@ -49,7 +49,7 @@ Class=Cintiq
> Width=17
> Height=13
> Layout=cintiq-21ux2.svg
> -Styli=0x802;0x80c;0x804;0x80a;0x40802;0x4080a;0x902;0x90a;0x20802;
> +Styli=0x802;0x80c;0x804;0x80a;0x140802;0x14080a;0x902;0x90a;0x120802;
> IntegratedIn=Display
>
> [Features]
> diff --git a/data/cintiq-22hd.tablet b/data/cintiq-22hd.tablet
> index 9faac95..6dc6729 100644
> --- a/data/cintiq-22hd.tablet
> +++ b/data/cintiq-22hd.tablet
> @@ -37,7 +37,7 @@ Class=Cintiq
> Width=19
> Height=11
> Layout=cintiq-22hd.svg
> -Styli=0x802;0x80c;0x804;0x80a;0x40802;0x4080a;0x902;0x90a;0x20802;
> +Styli=0x802;0x80c;0x804;0x80a;0x140802;0x14080a;0x902;0x90a;0x120802;
> IntegratedIn=Display
>
> [Features]
> diff --git a/data/cintiq-24hd-touch.tablet b/data/cintiq-24hd-touch.tablet
> index 41d05de..5b8cc7d 100644
> --- a/data/cintiq-24hd-touch.tablet
> +++ b/data/cintiq-24hd-touch.tablet
> @@ -46,7 +46,7 @@ Class=Cintiq
> Width=21
> Height=13
> Layout=cintiq-24hd.svg
> -Styli=0x802;0x80c;0x804;0x80a;0x40802;0x4080a;0x902;0x90a;0x20802;
> +Styli=0x802;0x80c;0x804;0x80a;0x140802;0x14080a;0x902;0x90a;0x120802;
> IntegratedIn=Display
>
> [Features]
> diff --git a/data/cintiq-24hd.tablet b/data/cintiq-24hd.tablet
> index 0a3f4ef..4f32d91 100644
> --- a/data/cintiq-24hd.tablet
> +++ b/data/cintiq-24hd.tablet
> @@ -45,7 +45,7 @@ Class=Cintiq
> Width=21
> Height=13
> Layout=cintiq-24hd.svg
> -Styli=0x802;0x80c;0x804;0x80a;0x40802;0x4080a;0x902;0x90a;0x20802;
> +Styli=0x802;0x80c;0x804;0x80a;0x140802;0x14080a;0x902;0x90a;0x120802;
> IntegratedIn=Display
>
> [Features]
> diff --git a/data/intuos4-12x19.tablet b/data/intuos4-12x19.tablet
> index 7b8f960..63a0dce 100644
> --- a/data/intuos4-12x19.tablet
> +++ b/data/intuos4-12x19.tablet
> @@ -40,7 +40,7 @@ Width=19
> Height=12
> Layout=intuos4-12x19.svg
> IntegratedIn=
>
> -Styli=0x802;0x80c;0x804;0x80a;0x40802;0x4080a;0x902;0x90a;0x20802;0x806;0x006;
>
> +Styli=0x802;0x80c;0x804;0x80a;0x140802;0x14080a;0x902;0x90a;0x120802;0x806;0x006;
>
> [Features]
> Reversible=true
> diff --git a/data/intuos4-4x6.tablet b/data/intuos4-4x6.tablet
> index 09e2f84..2ca12b2 100644
> --- a/data/intuos4-4x6.tablet
> +++ b/data/intuos4-4x6.tablet
> @@ -41,7 +41,7 @@ Width=6
> Height=4
> Layout=intuos4-4x6.svg
> IntegratedIn=
> -Styli=0x802;0x80c;0x804;0x80a;0x40802;0x4080a;0x902;0x90a;0x20802;0x806;
>
> +Styli=0x802;0x80c;0x804;0x80a;0x140802;0x14080a;0x902;0x90a;0x120802;0x806;
>
> [Features]
> Reversible=true
> diff --git a/data/intuos4-6x9-wl.tablet b/data/intuos4-6x9-wl.tablet
> index 2fb0478..bd8e9a3 100644
> --- a/data/intuos4-6x9-wl.tablet
> +++ b/data/intuos4-6x9-wl.tablet
> @@ -40,7 +40,7 @@ Width=8
> Height=5
> IntegratedIn=
> Layout=intuos4-6x9-wl.svg
> -Styli=0x802;0x80c;0x804;0x80a;0x40802;0x4080a;0x902;0x90a;0x20802;0x806;
>
> +Styli=0x802;0x80c;0x804;0x80a;0x140802;0x14080a;0x902;0x90a;0x120802;0x806;
>
> [Features]
> Reversible=true
> diff --git a/data/intuos4-6x9.tablet b/data/intuos4-6x9.tablet
> index 945f453..1c98b6b 100644
> --- a/data/intuos4-6x9.tablet
> +++ b/data/intuos4-6x9.tablet
> @@ -40,7 +40,7 @@ Width=9
> Height=6
> Layout=intuos4-6x9.svg
> IntegratedIn=
> -Styli=0x802;0x80c;0x804;0x80a;0x40802;0x4080a;0x902;0x90a;0x20802;0x806;
>
> +Styli=0x802;0x80c;0x804;0x80a;0x140802;0x14080a;0x902;0x90a;0x120802;0x806;
>
> [Features]
> Reversible=true
> diff --git a/data/intuos4-8x13.tablet b/data/intuos4-8x13.tablet
> index 18aedf5..6e9f204 100644
> --- a/data/intuos4-8x13.tablet
> +++ b/data/intuos4-8x13.tablet
> @@ -40,7 +40,7 @@ Width=13
> Height=8
> Layout=intuos4-8x13.svg
> IntegratedIn=
>
> -Styli=0x802;0x80c;0x804;0x80a;0x40802;0x4080a;0x902;0x90a;0x20802;0x806;0x006;
>
> +Styli=0x802;0x80c;0x804;0x80a;0x140802;0x14080a;0x902;0x90a;0x120802;0x806;0x006;
>
> [Features]
> Reversible=true
> diff --git a/data/intuos5-m.tablet b/data/intuos5-m.tablet
> index f39a2b7..dab1c51 100644
> --- a/data/intuos5-m.tablet
> +++ b/data/intuos5-m.tablet
> @@ -50,7 +50,7 @@ Width=9
> Height=6
> Layout=intuos5-m.svg
> IntegratedIn=
> -Styli=0x802;0x80c;0x804;0x80a;0x40802;0x4080a;0x902;0x90a;0x20802;0x806;
>
> +Styli=0x802;0x80c;0x804;0x80a;0x140802;0x14080a;0x902;0x90a;0x120802;0x806;
>
> [Features]
> Stylus=true
> diff --git a/data/intuos5-s.tablet b/data/intuos5-s.tablet
> index 8e7d140..93b8362 100644
> --- a/data/intuos5-s.tablet
> +++ b/data/intuos5-s.tablet
> @@ -48,7 +48,7 @@ Width=6
> Height=4
> Layout=intuos5-s.svg
> IntegratedIn=
> -Styli=0x802;0x80c;0x804;0x80a;0x40802;0x4080a;0x902;0x90a;0x20802;0x806;
>
> +Styli=0x802;0x80c;0x804;0x80a;0x140802;0x14080a;0x902;0x90a;0x120802;0x806;
>
> [Features]
> Stylus=true
> diff --git a/data/intuos5-touch-l.tablet b/data/intuos5-touch-l.tablet
> index faaacbe..0e2e176 100644
> --- a/data/intuos5-touch-l.tablet
> +++ b/data/intuos5-touch-l.tablet
> @@ -50,7 +50,7 @@ Width=13
> Height=8
> Layout=intuos5-l.svg
> IntegratedIn=
>
> -Styli=0x802;0x80c;0x804;0x80a;0x40802;0x4080a;0x902;0x90a;0x20802;0x806;0x006;
>
> +Styli=0x802;0x80c;0x804;0x80a;0x140802;0x14080a;0x902;0x90a;0x120802;0x806;0x006;
>
> [Features]
> Stylus=true
> diff --git a/data/intuos5-touch-m.tablet b/data/intuos5-touch-m.tablet
> index 92ae854..d8161b3 100644
> --- a/data/intuos5-touch-m.tablet
> +++ b/data/intuos5-touch-m.tablet
> @@ -50,7 +50,7 @@ Width=9
> Height=6
> Layout=intuos5-m.svg
> IntegratedIn=
> -Styli=0x802;0x80c;0x804;0x80a;0x40802;0x4080a;0x902;0x90a;0x20802;0x806;
>
> +Styli=0x802;0x80c;0x804;0x80a;0x140802;0x14080a;0x902;0x90a;0x120802;0x806;
>
> [Features]
> Stylus=true
> diff --git a/data/intuos5-touch-s.tablet b/data/intuos5-touch-s.tablet
> index f75c664..af94d0d 100644
> --- a/data/intuos5-touch-s.tablet
> +++ b/data/intuos5-touch-s.tablet
> @@ -48,7 +48,7 @@ Width=6
> Height=4
> Layout=intuos5-s.svg
> IntegratedIn=
> -Styli=0x802;0x80c;0x804;0x80a;0x40802;0x4080a;0x902;0x90a;0x20802;0x806;
>
> +Styli=0x802;0x80c;0x804;0x80a;0x140802;0x14080a;0x902;0x90a;0x120802;0x806;
>
> [Features]
> Stylus=true
> diff --git a/data/libwacom.stylus b/data/libwacom.stylus
> index 536d3bb..94f2217 100644
> --- a/data/libwacom.stylus
> +++ b/data/libwacom.stylus
> @@ -25,8 +25,8 @@ Buttons=0
> HasEraser=false
> Type=Inking
>
> -[0x20802]
> -# Intuos4, 5 and Cintiq 21UX2, 24HD
> +[0x120802]
> +# Intuos4, 5 and Cintiq 21UX2, 22HD, 24HD
> Name=Inking Pen
> Buttons=0
> HasEraser=false
> @@ -95,13 +95,34 @@ HasEraser=true
> Buttons=2
> Type=Marker
>
> -[0x40802]
> +[0x100804]
> +# Intuos4, 5 and Cintiq 21UX2, 22HD, 24HD
> +Name=Art Pen
> +HasEraser=true
> +Buttons=2
> +Type=Marker
> +
> +[0x140802]
> # Intuos4, 5 and Cintiq 21UX2, 24HD
> Name=Classic Pen
> HasEraser=true
> Buttons=2
> Type=Classic
>
> +[0x160802]
> +# Cintiq 13HD Pro Pen
> +Name=Pro Pen
> +HasEraser=true
> +Buttons=2
> +Type=Pro
> +
> +[0x180802]
> +# DTH2242 Pen
> +Name=Pen
> +HasEraser=true
> +Buttons=2
> +Type=General
> +
> [0x022]
> Name=Pen
> HasEraser=true
> @@ -178,12 +199,36 @@ Name=Grip Pen Eraser
> IsEraser=true
> Type=General
>
> -[0x4080a]
> +[0x14080a]
> # Intuos4, 5 and Cintiq 21UX2, 24HD
> Name=Classic Pen Eraser
> IsEraser=true
> Type=Classic
>
> +[0x10080c]
> +# Intuos4, 5 and 13HD, 24HD Art Pen
> +Name=Art Pen Eraser
> +IsEraser=true
> +Type=Marker
> +
> +[0x16080a]
> +# Cintiq 13HD
> +Name=Pro Pen Eraser
> +IsEraser=true
> +Type=Pro
> +
> +[0x18080a]
> +# DTH2242 Eraser
> +Name=Pen Eraser
> +IsEraser=true
> +Type=General
> +
> +[0x10090a]
> +# Intuos4, 5 and Cintiq 13HD, 22HD, 24HD Airbrush Eraser
> +Name=Airbrush Pen Eraser
> +IsEraser=true
> +Type=Airbrush
> +
> [0x90a]
> # Intuos4, 5 and Cintiq 21UX2, 24HD
> Name=Airbrush Pen Eraser
> @@ -224,6 +269,13 @@ Buttons=1
> HasEraser=true
> Type=Airbrush
>
> +[0x100902]
> +# Intuos4, 5 and Cintiq 13HD, 21UX2, 22HD, 24HD
> +Name=Airbrush Pen
> +Buttons=1
> +HasEraser=true
> +Type=Airbrush
> +
> # Puck devices
> [0x096]
> # Intuos and Intuos2
> --
> 1.8.1.2
>
>
------------------------------------------------------------------------------
Try New Relic Now & We'll Send You this Cool Shirt
New Relic is the only SaaS-based application performance monitoring service
that delivers powerful full stack analytics. Optimize and monitor your
browser, app, & servers with just a few lines of code. Try New Relic
and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_may
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
