New tools have been added when we added new tablets. Kernel driver has been updated with new tool IDs. But, we didn't update corresponding data/*.tablet and libwacom.stylus
Signed-off-by: Ping Cheng <pi...@wacom.com> --- data/cintiq-13hd.tablet | 2 +- data/cintiq-22hd.tablet | 2 +- data/cintiq-22hdt.tablet | 2 +- data/cintiq-24hd-touch.tablet | 2 +- data/cintiq-24hd.tablet | 2 +- data/cintiq-companion-hybrid.tablet | 2 +- data/cintiq-companion.tablet | 2 +- data/intuos-pro-l.tablet | 2 +- data/intuos-pro-m.tablet | 2 +- data/intuos-pro-s.tablet | 2 +- data/intuos5-m.tablet | 3 ++- data/intuos5-s.tablet | 2 +- data/intuos5-touch-l.tablet | 3 ++- data/intuos5-touch-m.tablet | 3 ++- data/intuos5-touch-s.tablet | 3 ++- data/libwacom.stylus | 20 -------------------- 16 files changed, 19 insertions(+), 35 deletions(-) diff --git a/data/cintiq-13hd.tablet b/data/cintiq-13hd.tablet index d9fadae..a737e6b 100644 --- a/data/cintiq-13hd.tablet +++ b/data/cintiq-13hd.tablet @@ -28,7 +28,7 @@ DeviceMatch=usb:056a:0304 Width=12 Height=7 Layout=cintiq-13hd.svg -Styli=0x913;0x91b;0x813;0x81b;0x823;0x82b;0x801;0x885;0x120802;0x100804;0x10080c;0x140802;0x14080a;0x100902;0x10090a;0x160802;0x16080a;0x100802;0x10080a; +Styli=0x802;0x80c;0x804;0x80a;0x902;0x90a;0x120802;0x100804;0x10080c;0x140802;0x14080a;0x100902;0x10090a;0x160802;0x16080a;0x100802;0x10080a; IntegratedIn=Display [Features] diff --git a/data/cintiq-22hd.tablet b/data/cintiq-22hd.tablet index 9068985..2e506e0 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;0x140802;0x14080a;0x902;0x90a;0x120802;0x40802;0x4080a;0x20802;0x100802;0x10080a; +Styli=0x802;0x80c;0x804;0x80a;0x140802;0x14080a;0x902;0x90a;0x120802;0x100802;0x10080a;0x100902;0x10090a;0x160802;0x16080a;0x100804;0x10080c; IntegratedIn=Display [Features] diff --git a/data/cintiq-22hdt.tablet b/data/cintiq-22hdt.tablet index 5dbb03c..2903ad2 100644 --- a/data/cintiq-22hdt.tablet +++ b/data/cintiq-22hdt.tablet @@ -38,7 +38,7 @@ Class=Cintiq Width=19 Height=11 Layout=cintiq-22hd.svg -Styli=0x802;0x80c;0x804;0x80a;0x140802;0x14080a;0x902;0x90a;0x120802;0x40802;0x4080a;0x20802;0x100802;0x10080a; +Styli=0x802;0x80c;0x804;0x80a;0x140802;0x14080a;0x902;0x90a;0x120802;0x100802;0x10080a;0x100902;0x10090a;0x160802;0x16080a;0x100804;0x10080c; IntegratedIn=Display [Features] diff --git a/data/cintiq-24hd-touch.tablet b/data/cintiq-24hd-touch.tablet index 97a7b6b..135d2e6 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;0x140802;0x14080a;0x902;0x90a;0x120802;0x40802;0x4080a;0x20802;0x100802;0x10080a; +Styli=0x802;0x80c;0x804;0x80a;0x140802;0x14080a;0x902;0x90a;0x120802;0x100802;0x10080a;0x100902;0x10090a;0x160802;0x16080a;0x100804;0x10080c; IntegratedIn=Display [Features] diff --git a/data/cintiq-24hd.tablet b/data/cintiq-24hd.tablet index 0ba8fd4..67a492a 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;0x140802;0x14080a;0x902;0x90a;0x120802;0x40802;0x4080a;0x20802;0x100802;0x10080a; +Styli=0x802;0x80c;0x804;0x80a;0x140802;0x14080a;0x902;0x90a;0x120802;0x100802;0x10080a;0x100902;0x10090a;0x160802;0x16080a;0x100804;0x10080c; IntegratedIn=Display [Features] diff --git a/data/cintiq-companion-hybrid.tablet b/data/cintiq-companion-hybrid.tablet index 817be0f..8b1722c 100644 --- a/data/cintiq-companion-hybrid.tablet +++ b/data/cintiq-companion-hybrid.tablet @@ -31,7 +31,7 @@ DeviceMatch=usb:056a:0307 Width=12 Height=7 Layout=cintiq-companion-hybrid.svg -Styli=0x913;0x91b;0x813;0x81b;0x823;0x82b;0x801;0x885;0x120802;0x100804;0x10080c;0x140802;0x14080a;0x100902;0x10090a;0x160802;0x16080a;0x100802;0x10080a; +Styli=0x802;0x80c;0x804;0x80a;0x902;0x90a;0x120802;0x100804;0x10080c;0x140802;0x14080a;0x100902;0x10090a;0x160802;0x16080a;0x100802;0x10080a; IntegratedIn=Display [Features] diff --git a/data/cintiq-companion.tablet b/data/cintiq-companion.tablet index 27da862..38403a7 100644 --- a/data/cintiq-companion.tablet +++ b/data/cintiq-companion.tablet @@ -31,7 +31,7 @@ DeviceMatch=usb:056a:030a Width=12 Height=7 Layout=cintiq-companion.svg -Styli=0x913;0x91b;0x813;0x81b;0x823;0x82b;0x801;0x885;0x120802;0x100804;0x10080c;0x140802;0x14080a;0x100902;0x10090a;0x160802;0x16080a;0x100802;0x10080a; +Styli=0x802;0x80c;0x804;0x80a;0x902;0x90a;0x120802;0x100804;0x10080c;0x140802;0x14080a;0x100902;0x10090a;0x160802;0x16080a;0x100802;0x10080a; IntegratedIn=Display;System [Features] diff --git a/data/intuos-pro-l.tablet b/data/intuos-pro-l.tablet index 3e98b70..2396361 100644 --- a/data/intuos-pro-l.tablet +++ b/data/intuos-pro-l.tablet @@ -50,7 +50,7 @@ Width=13 Height=8 Layout=intuos-pro-l.svg IntegratedIn= -Styli=0x802;0x80c;0x804;0x80a;0x140802;0x14080a;0x902;0x90a;0x120802;0x806;0x006;0x40802;0x4080a;0x20802;0x100802;0x10080a; +Styli=0x802;0x80c;0x804;0x80a;0x140802;0x14080a;0x902;0x90a;0x120802;0x806;0x006;0x100802;0x10080a;0x100902;0x10090a;0x160802;0x16080a;0x100804;0x10080c; [Features] Stylus=true diff --git a/data/intuos-pro-m.tablet b/data/intuos-pro-m.tablet index 02c8389..3c4e4fb 100644 --- a/data/intuos-pro-m.tablet +++ b/data/intuos-pro-m.tablet @@ -50,7 +50,7 @@ Width=9 Height=6 Layout=intuos-pro-m.svg IntegratedIn= -Styli=0x802;0x80c;0x804;0x80a;0x140802;0x14080a;0x902;0x90a;0x120802;0x806;0x40802;0x4080a;0x20802;0x100802;0x10080a; +Styli=0x802;0x80c;0x804;0x80a;0x140802;0x14080a;0x902;0x90a;0x120802;0x806;0x100802;0x10080a;0x100902;0x10090a;0x160802;0x16080a;0x100804;0x10080c; [Features] Stylus=true diff --git a/data/intuos-pro-s.tablet b/data/intuos-pro-s.tablet index 162dc67..e359423 100644 --- a/data/intuos-pro-s.tablet +++ b/data/intuos-pro-s.tablet @@ -48,7 +48,7 @@ Width=6 Height=4 Layout=intuos-pro-s.svg IntegratedIn= -Styli=0x802;0x80c;0x804;0x80a;0x140802;0x14080a;0x902;0x90a;0x120802;0x806;0x40802;0x4080a;0x20802;0x100802;0x10080a; +Styli=0x802;0x80c;0x804;0x80a;0x140802;0x14080a;0x902;0x90a;0x120802;0x806;0x100802;0x10080a;0x100902;0x10090a;0x160802;0x16080a;0x100804;0x10080c; [Features] Stylus=true diff --git a/data/intuos5-m.tablet b/data/intuos5-m.tablet index 5169c2d..0a9094b 100644 --- a/data/intuos5-m.tablet +++ b/data/intuos5-m.tablet @@ -50,7 +50,8 @@ Width=9 Height=6 Layout=intuos5-m.svg IntegratedIn= -Styli=0x802;0x80c;0x804;0x80a;0x140802;0x14080a;0x902;0x90a;0x120802;0x806;0x40802;0x4080a;0x20802;0x100802;0x10080a; +Styli=0x802;0x80c;0x804;0x80a;0x140802;0x14080a;0x902;0x90a;0x120802;0x806;0x100802;0x10080a;0x100902;0x10090a;0x160802;0x16080a;0x100804;0x10080c; + [Features] Stylus=true diff --git a/data/intuos5-s.tablet b/data/intuos5-s.tablet index d17a1e7..c27b01b 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;0x140802;0x14080a;0x902;0x90a;0x120802;0x806;0x40802;0x4080a;0x20802;0x100802;0x10080a; +Styli=0x802;0x80c;0x804;0x80a;0x140802;0x14080a;0x902;0x90a;0x120802;0x806;0x100802;0x10080a;0x100902;0x10090a;0x160802;0x16080a;0x100804;0x10080c; [Features] Stylus=true diff --git a/data/intuos5-touch-l.tablet b/data/intuos5-touch-l.tablet index d951590..7363ec4 100644 --- a/data/intuos5-touch-l.tablet +++ b/data/intuos5-touch-l.tablet @@ -50,7 +50,8 @@ Width=13 Height=8 Layout=intuos5-l.svg IntegratedIn= -Styli=0x802;0x80c;0x804;0x80a;0x140802;0x14080a;0x902;0x90a;0x120802;0x806;0x006;0x40802;0x4080a;0x20802;0x100802;0x10080a; +Styli=0x802;0x80c;0x804;0x80a;0x140802;0x14080a;0x902;0x90a;0x120802;0x806;0x006;0x100802;0x10080a;0x100902;0x10090a;0x160802;0x16080a;0x100804;0x10080c; + [Features] Stylus=true diff --git a/data/intuos5-touch-m.tablet b/data/intuos5-touch-m.tablet index bba6ea8..63c64f3 100644 --- a/data/intuos5-touch-m.tablet +++ b/data/intuos5-touch-m.tablet @@ -50,7 +50,8 @@ Width=9 Height=6 Layout=intuos5-m.svg IntegratedIn= -Styli=0x802;0x80c;0x804;0x80a;0x140802;0x14080a;0x902;0x90a;0x120802;0x806;0x40802;0x4080a;0x20802;0x100802;0x10080a; +Styli=0x802;0x80c;0x804;0x80a;0x140802;0x14080a;0x902;0x90a;0x120802;0x806;0x100802;0x10080a;0x100902;0x10090a;0x160802;0x16080a;0x100804;0x10080c; + [Features] Stylus=true diff --git a/data/intuos5-touch-s.tablet b/data/intuos5-touch-s.tablet index b0b9d5c..c2a1040 100644 --- a/data/intuos5-touch-s.tablet +++ b/data/intuos5-touch-s.tablet @@ -48,7 +48,8 @@ Width=6 Height=4 Layout=intuos5-s.svg IntegratedIn= -Styli=0x802;0x80c;0x804;0x80a;0x140802;0x14080a;0x902;0x90a;0x120802;0x806;0x40802;0x4080a;0x20802;0x100802;0x10080a; +Styli=0x802;0x80c;0x804;0x80a;0x140802;0x14080a;0x902;0x90a;0x120802;0x806;0x100802;0x10080a;0x100902;0x10090a;0x160802;0x16080a;0x100804;0x10080c; + [Features] Stylus=true diff --git a/data/libwacom.stylus b/data/libwacom.stylus index 290fe5e..99d9220 100644 --- a/data/libwacom.stylus +++ b/data/libwacom.stylus @@ -25,13 +25,6 @@ Buttons=0 HasEraser=false Type=Inking -[0x20802] -# Intuos4, 5 and Cintiq 21UX2, 22HD, 24HD -Name=Inking Pen -Buttons=0 -HasEraser=false -Type=Inking - [0x120802] # Intuos4, 5 and Cintiq 21UX2, 22HD, 24HD Name=Inking Pen @@ -115,13 +108,6 @@ Name=Grip Pen IsEraser=true Type=General -[0x40802] -# Intuos4, 5 and Cintiq 21UX2, 24HD -Name=Classic Pen -HasEraser=true -Buttons=2 -Type=Classic - [0x140802] # Intuos4, 5 and Cintiq 21UX2, 24HD Name=Classic Pen @@ -219,12 +205,6 @@ Name=Grip Pen Eraser IsEraser=true Type=General -[0x4080a] -# Intuos4, 5 and Cintiq 21UX2, 24HD -Name=Classic Pen Eraser -IsEraser=true -Type=Classic - [0x14080a] # Intuos4, 5 and Cintiq 21UX2, 24HD Name=Classic Pen Eraser -- 1.9.1 ------------------------------------------------------------------------------ Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server from Actuate! Instantly Supercharge Your Business Reports and Dashboards with Interactivity, Sharing, Native Excel Exports, App Integration & more Get technology previously reserved for billion-dollar corporations, FREE http://pubads.g.doubleclick.net/gampad/clk?id=164703151&iu=/4140/ostg.clktrk _______________________________________________ Linuxwacom-devel mailing list Linuxwacom-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel