Add Intuos5 tablets to database and support in libwacom

7 files changed, 314 insertions, 0 deletions

diff --git a/data/intuos5-m.tablet b/data/intuos5-m.tablet
new file mode 100644
index 0000000..ef18b34
--- /dev/null
+++ b/data/intuos5-m.tablet
@@ -0,0 +1,63 @@
+# Wacom
+# Intuos5 M
+# PTK-650
+#
+# Button Map:
+# (A=1, B=2, C=3, ...)
+#
+#    *-----------------------*
+#    |                       |
+#  B |                       |
+#  C |                       |
+#  D |                       |
+#  E |                       |
+#  A |        TABLET         |
+#  F |                       |
+#  G |                       |
+#  H |                       |
+#  I |                       |
+#    |                       |
+#    *-----------------------*
+#
+# Touch Ring Map:
+# (A=1st ring, B=2nd ring, ...)
+#
+#    *-----------------------*
+#    |                       |
+#  A |        TABLET         |
+#    |                       |
+#    *-----------------------*
+#
+# LED Map:
+# (XY=Bank X, LED Y; *=Invisible)
+#
+#        *-----------------------*
+#        |                       |
+#        |                       |
+#  00 01 |                       |
+#        |        TABLET         |
+#  03 02 |                       |
+#        |                       |
+#        |                       |
+#        *-----------------------*
+#
+
+[Device]
+Name=Wacom Intuos5 M
+DeviceMatch=usb:056a:002a
+Class=Intuos5
+Width=9
+Height=6
+Styli=0x802;0x80c;0x804;0x80a;0x40802;0x4080a;0x902;0x90a;0x20802;0x806;
+
+[Features]
+Stylus=true
+Reversible=true
+Touch=false
+Buttons=9
+Ring=true
+BuiltIn=false
+
+[Buttons]
+Ring=A
+RingNumModes=4
diff --git a/data/intuos5-s.tablet b/data/intuos5-s.tablet
new file mode 100644
index 0000000..9368463
--- /dev/null
+++ b/data/intuos5-s.tablet
@@ -0,0 +1,61 @@
+# Wacom
+# Intuos5 S
+# PTK-450
+#
+# Button Map:
+# (A=1, B=2, C=3, ...)
+#
+#    *-----------------------*
+#    |                       |
+#  B |                       |
+#  C |                       |
+#  D |                       |
+#  A |        TABLET         |
+#  E |                       |
+#  F |                       |
+#  G |                       |
+#    |                       |
+#    *-----------------------*
+#
+# Touch Ring Map:
+# (A=1st ring, B=2nd ring, ...)
+#
+#    *-----------------------*
+#    |                       |
+#  A |        TABLET         |
+#    |                       |
+#    *-----------------------*
+#
+# LED Map:
+# (XY=Bank X, LED Y; *=Invisible)
+#
+#        *-----------------------*
+#        |                       |
+#        |                       |
+#  00 01 |                       |
+#        |        TABLET         |
+#  03 02 |                       |
+#        |                       |
+#        |                       |
+#        *-----------------------*
+#
+
+[Device]
+Name=Wacom Intuos5 S
+DeviceMatch=usb:056a:0029
+Class=Intuos5
+Width=6
+Height=4
+Styli=0x802;0x80c;0x804;0x80a;0x40802;0x4080a;0x902;0x90a;0x20802;0x806;
+
+[Features]
+Stylus=true
+Reversible=true
+Touch=false
+Buttons=7
+Ring=true
+BuiltIn=false
+
+[Buttons]
+Ring=A
+RingNumModes=4
diff --git a/data/intuos5-touch-l.tablet b/data/intuos5-touch-l.tablet
new file mode 100644
index 0000000..d3c2571
--- /dev/null
+++ b/data/intuos5-touch-l.tablet
@@ -0,0 +1,63 @@
+# Wacom
+# Intuos5 touch L
+# PTH-850
+#
+# Button Map:
+# (A=1, B=2, C=3, ...)
+#
+#    *-----------------------*
+#    |                       |
+#  B |                       |
+#  C |                       |
+#  D |                       |
+#  E |                       |
+#  A |        TABLET         |
+#  F |                       |
+#  G |                       |
+#  H |                       |
+#  I |                       |
+#    |                       |
+#    *-----------------------*
+#
+# Touch Ring Map:
+# (A=1st ring, B=2nd ring, ...)
+#
+#    *-----------------------*
+#    |                       |
+#  A |        TABLET         |
+#    |                       |
+#    *-----------------------*
+#
+# LED Map:
+# (XY=Bank X, LED Y; *=Invisible)
+#
+#        *-----------------------*
+#        |                       |
+#        |                       |
+#  00 01 |                       |
+#        |        TABLET         |
+#  03 02 |                       |
+#        |                       |
+#        |                       |
+#        *-----------------------*
+#
+
+[Device]
+Name=Wacom Intuos5 touch L
+DeviceMatch=usb:056a:0028
+Class=Intuos5
+Width=13
+Height=8
+Styli=0x802;0x80c;0x804;0x80a;0x40802;0x4080a;0x902;0x90a;0x20802;0x806;0x006;
+
+[Features]
+Stylus=true
+Reversible=true
+Touch=true
+Buttons=9
+Ring=true
+BuiltIn=false
+
+[Buttons]
+Ring=A
+RingNumModes=4
diff --git a/data/intuos5-touch-m.tablet b/data/intuos5-touch-m.tablet
new file mode 100644
index 0000000..5c78053
--- /dev/null
+++ b/data/intuos5-touch-m.tablet
@@ -0,0 +1,63 @@
+# Wacom
+# Intuos5 touch M
+# PTH-650
+#
+# Button Map:
+# (A=1, B=2, C=3, ...)
+#
+#    *-----------------------*
+#    |                       |
+#  B |                       |
+#  C |                       |
+#  D |                       |
+#  E |                       |
+#  A |        TABLET         |
+#  F |                       |
+#  G |                       |
+#  H |                       |
+#  I |                       |
+#    |                       |
+#    *-----------------------*
+#
+# Touch Ring Map:
+# (A=1st ring, B=2nd ring, ...)
+#
+#    *-----------------------*
+#    |                       |
+#  A |        TABLET         |
+#    |                       |
+#    *-----------------------*
+#
+# LED Map:
+# (XY=Bank X, LED Y; *=Invisible)
+#
+#        *-----------------------*
+#        |                       |
+#        |                       |
+#  00 01 |                       |
+#        |        TABLET         |
+#  03 02 |                       |
+#        |                       |
+#        |                       |
+#        *-----------------------*
+#
+
+[Device]
+Name=Wacom Intuos5 touch M
+DeviceMatch=usb:056a:0027
+Class=Intuos5
+Width=9
+Height=6
+Styli=0x802;0x80c;0x804;0x80a;0x40802;0x4080a;0x902;0x90a;0x20802;0x806;
+
+[Features]
+Stylus=true
+Reversible=true
+Touch=true
+Buttons=9
+Ring=true
+BuiltIn=false
+
+[Buttons]
+Ring=A
+RingNumModes=4
diff --git a/data/intuos5-touch-s.tablet b/data/intuos5-touch-s.tablet
new file mode 100644
index 0000000..24dfd76
--- /dev/null
+++ b/data/intuos5-touch-s.tablet
@@ -0,0 +1,61 @@
+# Wacom
+# Intuos5 touch S
+# PTH-450
+#
+# Button Map:
+# (A=1, B=2, C=3, ...)
+#
+#    *-----------------------*
+#    |                       |
+#  B |                       |
+#  C |                       |
+#  D |                       |
+#  A |        TABLET         |
+#  E |                       |
+#  F |                       |
+#  G |                       |
+#    |                       |
+#    *-----------------------*
+#
+# Touch Ring Map:
+# (A=1st ring, B=2nd ring, ...)
+#
+#    *-----------------------*
+#    |                       |
+#  A |        TABLET         |
+#    |                       |
+#    *-----------------------*
+#
+# LED Map:
+# (XY=Bank X, LED Y; *=Invisible)
+#
+#        *-----------------------*
+#        |                       |
+#        |                       |
+#  00 01 |                       |
+#        |        TABLET         |
+#  03 02 |                       |
+#        |                       |
+#        |                       |
+#        *-----------------------*
+#
+
+[Device]
+Name=Wacom Intuos5 touch S
+DeviceMatch=usb:056a:0026
+Class=Intuos5
+Width=6
+Height=4
+Styli=0x802;0x80c;0x804;0x80a;0x40802;0x4080a;0x902;0x90a;0x20802;0x806;
+
+[Features]
+Stylus=true
+Reversible=true
+Touch=true
+Buttons=7
+Ring=true
+BuiltIn=false
+
+[Buttons]
+Ring=A
+RingNumModes=4
diff --git a/libwacom/libwacom-database.c b/libwacom/libwacom-database.c
index c9f31b6..cf8a6e2 100644
--- a/libwacom/libwacom-database.c
+++ b/libwacom/libwacom-database.c
@@ -51,6 +51,8 @@ libwacom_class_string_to_enum(const char *class)
 		return WCLASS_INTUOS3;
 	if (strcmp(class, "Intuos4") == 0)
 		return WCLASS_INTUOS4;
+	if (strcmp(class, "Intuos5") == 0)
+		return WCLASS_INTUOS5;
 	if (strcmp(class, "Cintiq") == 0)
 		return WCLASS_CINTIQ;
 	if (strcmp(class, "Bamboo") == 0)
diff --git a/libwacom/libwacom.h b/libwacom/libwacom.h
index 4f537c4..30849d2 100644
--- a/libwacom/libwacom.h
+++ b/libwacom/libwacom.h
@@ -110,6 +110,7 @@ typedef enum {
     WCLASS_UNKNOWN,		/**< Unknown/unsupported device class */
     WCLASS_INTUOS3,		/**< Any Intuos3 series */
     WCLASS_INTUOS4,		/**< Any Intuos4 series */
+    WCLASS_INTUOS5,		/**< Any Intuos5 series */
     WCLASS_CINTIQ,		/**< Any Cintiq device */
     WCLASS_BAMBOO,		/**< Any Bamboo device */
     WCLASS_GRAPHIRE,		/**< Any Graphire device */