Adds most professional tablets to the database, and updates items
which are incorrect.

Signed-off-by: Jason Gerecke <[email protected]>
---
 data/cintiq-12wx.tablet    |   14 ++++++++++++++
 data/cintiq-20wsx.tablet   |   14 ++++++++++++++
 data/cintiq-21ux.tablet    |    4 +++-
 data/cintiq-21ux2.tablet   |   11 +++++++----
 data/cintiq-24hd.tablet    |   18 ++++++++++++++++++
 data/intuos-12x12.tablet   |   13 +++++++++++++
 data/intuos-12x18.tablet   |   13 +++++++++++++
 data/intuos-4x5.tablet     |   13 +++++++++++++
 data/intuos-6x8.tablet     |   13 +++++++++++++
 data/intuos-9x12.tablet    |   13 +++++++++++++
 data/intuos2-12x12.tablet  |   13 +++++++++++++
 data/intuos2-12x18.tablet  |   13 +++++++++++++
 data/intuos2-4x5.tablet    |   13 +++++++++++++
 data/intuos2-6x8.tablet    |   14 ++++++++++++++
 data/intuos2-9x12.tablet   |   13 +++++++++++++
 data/intuos3-12x12.tablet  |   13 +++++++++++++
 data/intuos3-12x19.tablet  |   13 +++++++++++++
 data/intuos3-4x5.tablet    |   13 +++++++++++++
 data/intuos3-4x6.tablet    |   13 +++++++++++++
 data/intuos3-6x11.tablet   |   13 +++++++++++++
 data/intuos3-6x8.tablet    |   13 +++++++++++++
 data/intuos3-9x12.tablet   |   13 +++++++++++++
 data/intuos4-12x19.tablet  |   16 ++++++++++++++++
 data/intuos4-4x6.tablet    |   16 ++++++++++++++++
 data/intuos4-6x9-wl.tablet |    8 ++++----
 data/intuos4-6x9.tablet    |    4 ++--
 data/intuos4-8x13.tablet   |   16 ++++++++++++++++
 27 files changed, 332 insertions(+), 11 deletions(-)
 create mode 100644 data/cintiq-12wx.tablet
 create mode 100644 data/cintiq-20wsx.tablet
 create mode 100644 data/cintiq-24hd.tablet
 create mode 100644 data/intuos-12x12.tablet
 create mode 100644 data/intuos-12x18.tablet
 create mode 100644 data/intuos-4x5.tablet
 create mode 100644 data/intuos-6x8.tablet
 create mode 100644 data/intuos-9x12.tablet
 create mode 100644 data/intuos2-12x12.tablet
 create mode 100644 data/intuos2-12x18.tablet
 create mode 100644 data/intuos2-4x5.tablet
 create mode 100644 data/intuos2-6x8.tablet
 create mode 100644 data/intuos2-9x12.tablet
 create mode 100644 data/intuos3-12x12.tablet
 create mode 100644 data/intuos3-12x19.tablet
 create mode 100644 data/intuos3-4x5.tablet
 create mode 100644 data/intuos3-4x6.tablet
 create mode 100644 data/intuos3-6x11.tablet
 create mode 100644 data/intuos3-6x8.tablet
 create mode 100644 data/intuos3-9x12.tablet
 create mode 100644 data/intuos4-12x19.tablet
 create mode 100644 data/intuos4-4x6.tablet
 create mode 100644 data/intuos4-8x13.tablet

diff --git a/data/cintiq-12wx.tablet b/data/cintiq-12wx.tablet
new file mode 100644
index 0000000..f82294c
--- /dev/null
+++ b/data/cintiq-12wx.tablet
@@ -0,0 +1,14 @@
+[Device]
+Name=Wacom Cintiq 12WX
+Class=Cintiq
+DeviceMatch=usb:056a:00c6
+Width=10
+Height=7
+Styli=0x913;0x91b;0x813;0x81b;0x823;0x82b;0x801;0x885;
+
+[Features]
+Stylus=true
+VStrip=true
+HStrip=true
+Buttons=10
+BuiltIn=true
diff --git a/data/cintiq-20wsx.tablet b/data/cintiq-20wsx.tablet
new file mode 100644
index 0000000..a94d843
--- /dev/null
+++ b/data/cintiq-20wsx.tablet
@@ -0,0 +1,14 @@
+[Device]
+Name=Wacom Cintiq 20WSX
+DeviceMatch=usb:056a:00c5
+Class=Cintiq
+Width=17
+Height=11
+Styli=0x913;0x91b;0x813;0x81b;0x823;0x82b;0x801;0x885;
+
+[Features]
+Stylus=true
+VStrip=true
+HStrip=true
+Buttons=14
+BuiltIn=true
diff --git a/data/cintiq-21ux.tablet b/data/cintiq-21ux.tablet
index 2d650e6..08a5d1f 100644
--- a/data/cintiq-21ux.tablet
+++ b/data/cintiq-21ux.tablet
@@ -4,10 +4,12 @@ DeviceMatch=usb:056a:003f
 Class=Cintiq
 Width=17
 Height=13
-Styli=0x82b;0x823;0x81b;0x813;0x91b;0x913;
+Styli=0x913;0x91b;0x813;0x81b;0x823;0x82b;0x801;0x885;
 
 [Features]
 Reversible=true
 Stylus=true
+HStrip=true
 VStrip=true
 Buttons=8
+BuiltIn=true
diff --git a/data/cintiq-21ux2.tablet b/data/cintiq-21ux2.tablet
index 2303bd7..c0c69ae 100644
--- a/data/cintiq-21ux2.tablet
+++ b/data/cintiq-21ux2.tablet
@@ -1,12 +1,15 @@
 [Device]
 Name=Wacom Cintiq 21UX2
-DeviceMatch=usb:0xdeadbeef:0xdeadbeef
+DeviceMatch=usb:0x056a:0x00cc
 Class=Cintiq
+Width=17
+Height=13
+Styli=0x802;0x80c;0x804;0x80a;0x40802;0x4080a;0x902;0x90a;0x20802;
 
 [Features]
 Stylus=true
 Ring=false
-VStrip=false
-HStrip=false
-Buttons=0
+VStrip=true
+HStrip=true
+Buttons=18
 BuiltIn=true
diff --git a/data/cintiq-24hd.tablet b/data/cintiq-24hd.tablet
new file mode 100644
index 0000000..c1db628
--- /dev/null
+++ b/data/cintiq-24hd.tablet
@@ -0,0 +1,18 @@
+[Device]
+Name=Wacom Cintiq 24HD
+DeviceMatch=usb:056a:00f4
+Class=Cintiq
+Width=21
+Height=13
+Styli=0x802;0x80c;0x804;0x80a;0x40802;0x4080a;0x902;0x90a;0x20802;
+
+[Features]
+Stylus=true
+Reversible=false
+Touch=false
+Buttons=16
+VStrip=false
+HStrip=false
+Ring=true
+Ring2=true
+BuiltIn=true
diff --git a/data/intuos-12x12.tablet b/data/intuos-12x12.tablet
new file mode 100644
index 0000000..7da9d8d
--- /dev/null
+++ b/data/intuos-12x12.tablet
@@ -0,0 +1,13 @@
+[Device]
+Name=Wacom Intuos 12x12
+DeviceMatch=usb:056a:0023
+Class=Intuos
+Width=12
+Height=12
+Styli=0xd12;0xd1a;0x822;0x82a;0x812;0x832;
+
+[Features]
+Stylus=true
+HStrip=false
+VStrip=false
+Buttons=0
diff --git a/data/intuos-12x18.tablet b/data/intuos-12x18.tablet
new file mode 100644
index 0000000..27018dd
--- /dev/null
+++ b/data/intuos-12x18.tablet
@@ -0,0 +1,13 @@
+[Device]
+Name=Wacom Intuos 12x18
+DeviceMatch=usb:056a:0024
+Class=Intuos
+Width=18
+Height=12
+Styli=0xd12;0xd1a;0x822;0x82a;0x812;0x832;
+
+[Features]
+Stylus=true
+HStrip=false
+VStrip=false
+Buttons=0
diff --git a/data/intuos-4x5.tablet b/data/intuos-4x5.tablet
new file mode 100644
index 0000000..8e1a05b
--- /dev/null
+++ b/data/intuos-4x5.tablet
@@ -0,0 +1,13 @@
+[Device]
+Name=Wacom Intuos 4x5
+DeviceMatch=usb:056a:0020
+Class=Intuos
+Width=5
+Height=4
+Styli=0xd12;0xd1a;0x822;0x82a;0x812;0x832;
+
+[Features]
+Stylus=true
+HStrip=false
+VStrip=false
+Buttons=0
diff --git a/data/intuos-6x8.tablet b/data/intuos-6x8.tablet
new file mode 100644
index 0000000..d35dcfa
--- /dev/null
+++ b/data/intuos-6x8.tablet
@@ -0,0 +1,13 @@
+[Device]
+Name=Wacom Intuos 6x8
+DeviceMatch=usb:056a:0021
+Class=Intuos
+Width=8
+Height=6
+Styli=0xd12;0xd1a;0x822;0x82a;0x812;0x832;
+
+[Features]
+Stylus=true
+HStrip=false
+VStrip=false
+Buttons=0
diff --git a/data/intuos-9x12.tablet b/data/intuos-9x12.tablet
new file mode 100644
index 0000000..6ccea2d
--- /dev/null
+++ b/data/intuos-9x12.tablet
@@ -0,0 +1,13 @@
+[Device]
+Name=Wacom Intuos2 9x12
+DeviceMatch=usb:056a:0022
+Class=Intuos
+Width=12
+Height=9
+Styli=0xd12;0xd1a;0x822;0x82a;0x812;0x832;
+
+[Features]
+Stylus=true
+HStrip=false
+VStrip=false
+Buttons=0
diff --git a/data/intuos2-12x12.tablet b/data/intuos2-12x12.tablet
new file mode 100644
index 0000000..bb60ad0
--- /dev/null
+++ b/data/intuos2-12x12.tablet
@@ -0,0 +1,13 @@
+[Device]
+Name=Wacom Intuos2 12x12
+DeviceMatch=usb:056a:0044
+Class=Intuos2
+Width=12
+Height=12
+Styli=0x912;0x91a;0x822;0x82a;0x842;0x852;0x85a;0x812;0x832;
+
+[Features]
+Stylus=true
+HStrip=false
+VStrip=false
+Buttons=0
diff --git a/data/intuos2-12x18.tablet b/data/intuos2-12x18.tablet
new file mode 100644
index 0000000..ab8dabd
--- /dev/null
+++ b/data/intuos2-12x18.tablet
@@ -0,0 +1,13 @@
+[Device]
+Name=Wacom Intuos2 12x18
+DeviceMatch=usb:056a:0045
+Class=Intuos2
+Width=18
+Height=12
+Styli=0x912;0x91a;0x822;0x82a;0x842;0x852;0x85a;0x812;0x832;
+
+[Features]
+Stylus=true
+HStrip=false
+VStrip=false
+Buttons=0
diff --git a/data/intuos2-4x5.tablet b/data/intuos2-4x5.tablet
new file mode 100644
index 0000000..3837687
--- /dev/null
+++ b/data/intuos2-4x5.tablet
@@ -0,0 +1,13 @@
+[Device]
+Name=Wacom Intuos2 4x5
+DeviceMatch=usb:056a:0041
+Class=Intuos2
+Width=5
+Height=4
+Styli=0x912;0x91a;0x822;0x82a;0x842;0x852;0x85a;0x812;0x832;
+
+[Features]
+Stylus=true
+HStrip=false
+VStrip=false
+Buttons=0
diff --git a/data/intuos2-6x8.tablet b/data/intuos2-6x8.tablet
new file mode 100644
index 0000000..d205a24
--- /dev/null
+++ b/data/intuos2-6x8.tablet
@@ -0,0 +1,14 @@
+[Device]
+Name=Wacom Intuos2 6x8
+# FIXME add missing usb:0056a:0047 match
+DeviceMatch=usb:056a:0042
+Class=Intuos2
+Width=8
+Height=6
+Styli=0x912;0x91a;0x822;0x82a;0x842;0x852;0x85a;0x812;0x832;
+
+[Features]
+Stylus=true
+HStrip=false
+VStrip=false
+Buttons=0
diff --git a/data/intuos2-9x12.tablet b/data/intuos2-9x12.tablet
new file mode 100644
index 0000000..1029e08
--- /dev/null
+++ b/data/intuos2-9x12.tablet
@@ -0,0 +1,13 @@
+[Device]
+Name=Wacom Intuos2 9x12
+DeviceMatch=usb:056a:0043
+Class=Intuos2
+Width=12
+Height=9
+Styli=0x912;0x91a;0x822;0x82a;0x842;0x852;0x85a;0x812;0x832;
+
+[Features]
+Stylus=true
+HStrip=false
+VStrip=false
+Buttons=0
diff --git a/data/intuos3-12x12.tablet b/data/intuos3-12x12.tablet
new file mode 100644
index 0000000..f226eca
--- /dev/null
+++ b/data/intuos3-12x12.tablet
@@ -0,0 +1,13 @@
+[Device]
+Name=Wacom Intuos3 12x12
+DeviceMatch=usb:056a:00b3
+Class=Intuos3
+Width=12
+Height=12
+Styli=0x913;0x91b;0x813;0x81b;0x823;0x82b;0x801;0x885;
+
+[Features]
+Stylus=true
+HStrip=true
+VStrip=true
+Buttons=8
diff --git a/data/intuos3-12x19.tablet b/data/intuos3-12x19.tablet
new file mode 100644
index 0000000..cce9ecc
--- /dev/null
+++ b/data/intuos3-12x19.tablet
@@ -0,0 +1,13 @@
+[Device]
+Name=Wacom Intuos3 12x19
+DeviceMatch=usb:056a:00b4
+Class=Intuos3
+Width=19
+Height=12
+Styli=0x913;0x91b;0x813;0x81b;0x823;0x82b;0x801;0x885;
+
+[Features]
+Stylus=true
+HStrip=true
+VStrip=true
+Buttons=8
diff --git a/data/intuos3-4x5.tablet b/data/intuos3-4x5.tablet
new file mode 100644
index 0000000..0dd250b
--- /dev/null
+++ b/data/intuos3-4x5.tablet
@@ -0,0 +1,13 @@
+[Device]
+Name=Wacom Intuos3 4x5
+DeviceMatch=usb:056a:00b0
+Class=Intuos3
+Width=5
+Height=4
+Styli=0x913;0x91b;0x813;0x81b;0x823;0x82b;0x801;0x885;
+
+[Features]
+Stylus=true
+HStrip=true
+VStrip=false
+Buttons=4
diff --git a/data/intuos3-4x6.tablet b/data/intuos3-4x6.tablet
new file mode 100644
index 0000000..9312e55
--- /dev/null
+++ b/data/intuos3-4x6.tablet
@@ -0,0 +1,13 @@
+[Device]
+Name=Wacom Intuos3 4x6
+DeviceMatch=usb:056a:00b7
+Class=Intuos3
+Width=6
+Height=4
+Styli=0x913;0x91b;0x813;0x81b;0x823;0x82b;0x801;0x885;
+
+[Features]
+Stylus=true
+HStrip=true
+VStrip=false
+Buttons=4
diff --git a/data/intuos3-6x11.tablet b/data/intuos3-6x11.tablet
new file mode 100644
index 0000000..b6f7a97
--- /dev/null
+++ b/data/intuos3-6x11.tablet
@@ -0,0 +1,13 @@
+[Device]
+Name=Wacom Intuos3 6x11
+DeviceMatch=usb:056a:00b5
+Class=Intuos3
+Width=11
+Height=6
+Styli=0x913;0x91b;0x813;0x81b;0x823;0x82b;0x801;0x885;
+
+[Features]
+Stylus=true
+HStrip=true
+VStrip=true
+Buttons=8
diff --git a/data/intuos3-6x8.tablet b/data/intuos3-6x8.tablet
new file mode 100644
index 0000000..b5716ed
--- /dev/null
+++ b/data/intuos3-6x8.tablet
@@ -0,0 +1,13 @@
+[Device]
+Name=Wacom Intuos3 6x8
+DeviceMatch=usb:056a:00b1
+Class=Intuos3
+Width=8
+Height=6
+Styli=0x913;0x91b;0x813;0x81b;0x823;0x82b;0x801;0x885;
+
+[Features]
+Stylus=true
+HStrip=true
+VStrip=true
+Buttons=8
diff --git a/data/intuos3-9x12.tablet b/data/intuos3-9x12.tablet
new file mode 100644
index 0000000..b3b803d
--- /dev/null
+++ b/data/intuos3-9x12.tablet
@@ -0,0 +1,13 @@
+[Device]
+Name=Wacom Intuos3 9x12
+DeviceMatch=usb:056a:00b2
+Class=Intuos3
+Width=12
+Height=9
+Styli=0x913;0x91b;0x813;0x81b;0x823;0x82b;0x801;0x885;
+
+[Features]
+Stylus=true
+HStrip=true
+VStrip=true
+Buttons=8
diff --git a/data/intuos4-12x19.tablet b/data/intuos4-12x19.tablet
new file mode 100644
index 0000000..4dab324
--- /dev/null
+++ b/data/intuos4-12x19.tablet
@@ -0,0 +1,16 @@
+[Device]
+Name=Wacom Intuos4 12x19
+DeviceMatch=usb:056a:00bb
+Class=Intuos4
+Width=19
+Height=12
+Styli=0x802;0x80c;0x804;0x80a;0x40802;0x4080a;0x902;0x90a;0x20802;
+
+[Features]
+Reversible=true
+Stylus=true
+Ring=true
+VStrip=false
+HStrip=false
+Buttons=9
+BuiltIn=false
diff --git a/data/intuos4-4x6.tablet b/data/intuos4-4x6.tablet
new file mode 100644
index 0000000..f6f99ed
--- /dev/null
+++ b/data/intuos4-4x6.tablet
@@ -0,0 +1,16 @@
+[Device]
+Name=Wacom Intuos4 4x6
+DeviceMatch=usb:056a:00b8
+Class=Intuos4
+Width=6
+Height=4
+Styli=0x802;0x80c;0x804;0x80a;0x40802;0x4080a;0x902;0x90a;0x20802;
+
+[Features]
+Reversible=true
+Stylus=true
+Ring=true
+VStrip=false
+HStrip=false
+Buttons=7
+BuiltIn=false
diff --git a/data/intuos4-6x9-wl.tablet b/data/intuos4-6x9-wl.tablet
index 5fb2bbe..0761f6e 100644
--- a/data/intuos4-6x9-wl.tablet
+++ b/data/intuos4-6x9-wl.tablet
@@ -1,11 +1,11 @@
 [Device]
-Name=Wacom Intuos 4 WL 6x9
+Name=Wacom Intuos4 WL
 # FIXME add missing bluetooth match
 DeviceMatch=usb:056a:00bc
 Class=Intuos4
-Width=9
-Height=6
-Styli=0x802;0x804;0x40802;0x80c;0x80a;0x4080a;0x90a;0x20802;0x902;
+Width=8
+Height=5
+Styli=0x802;0x80c;0x804;0x80a;0x40802;0x4080a;0x902;0x90a;0x20802;
 
 [Features]
 Reversible=true
diff --git a/data/intuos4-6x9.tablet b/data/intuos4-6x9.tablet
index e4884ad..4d83027 100644
--- a/data/intuos4-6x9.tablet
+++ b/data/intuos4-6x9.tablet
@@ -1,10 +1,10 @@
 [Device]
-Name=Wacom Intuos 4 M 6x9
+Name=Wacom Intuos4 6x9
 DeviceMatch=usb:056a:00b9
 Class=Intuos4
 Width=9
 Height=6
-Styli=0x802;0x804;0x40802;0x80c;0x80a;0x4080a;0x90a;0x20802;0x902;
+Styli=0x802;0x80c;0x804;0x80a;0x40802;0x4080a;0x902;0x90a;0x20802;
 
 [Features]
 Reversible=true
diff --git a/data/intuos4-8x13.tablet b/data/intuos4-8x13.tablet
new file mode 100644
index 0000000..a0f1503
--- /dev/null
+++ b/data/intuos4-8x13.tablet
@@ -0,0 +1,16 @@
+[Device]
+Name=Wacom Intuos4 8x13
+DeviceMatch=usb:056a:00ba
+Class=Intuos4
+Width=13
+Height=8
+Styli=0x802;0x80c;0x804;0x80a;0x40802;0x4080a;0x902;0x90a;0x20802;
+
+[Features]
+Reversible=true
+Stylus=true
+Ring=true
+VStrip=false
+HStrip=false
+Buttons=9
+BuiltIn=false
-- 
1.7.8.4


------------------------------------------------------------------------------
Keep Your Developer Skills Current with LearnDevNow!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-d2d
_______________________________________________
Linuxwacom-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel

Reply via email to