Makes a number of small tweaks to the Bamboo data including renaming
the tablets to better match their marketing names.
Signed-off-by: Jason Gerecke <jason.gere...@wacom.com>
---
data/bamboo-16fg-4x5.tablet | 9 +++++----
data/bamboo-2fg-4x5.tablet | 6 +++---
data/bamboo-2fg-6x8.tablet | 8 ++++----
data/bamboo-2fg.tablet | 2 +-
data/bamboo-craft.tablet | 6 +++---
data/bamboo-pen.tablet | 5 +++--
data/layouts/bamboo-16fg-4x5.svg | 2 +-
data/layouts/bamboo-2fg-4x5.svg | 2 +-
data/layouts/bamboo-2fg-6x8.svg | 2 +-
data/layouts/bamboo-2fg.svg | 2 +-
data/layouts/bamboo-craft.svg | 2 +-
11 files changed, 24 insertions(+), 22 deletions(-)
diff --git a/data/bamboo-16fg-4x5.tablet b/data/bamboo-16fg-4x5.tablet
index 6aaaa82..d23c264 100644
--- a/data/bamboo-16fg-4x5.tablet
+++ b/data/bamboo-16fg-4x5.tablet
@@ -1,14 +1,15 @@
# Wacom
-# Bamboo Pen & Touch
+# Bamboo Capture
# CTH-470
#
-# second generation BambooPT
+# third generation BambooPT
#
-# stylus with two buttons and eraser; 16FG touch
+# stylus with one button no eraser (LP170G); 16FG touch
# Pen active area: 5.8 x 3.62in
# Touch active area: 4.92 x 3.35in
+
[Device]
-Name=Wacom Bamboo 16FG 4x5
+Name=Wacom Bamboo Capture
DeviceMatch=usb:056a:00de
Class=Bamboo
Width=6
diff --git a/data/bamboo-2fg-4x5.tablet b/data/bamboo-2fg-4x5.tablet
index 67f963d..25dbfe4 100644
--- a/data/bamboo-2fg-4x5.tablet
+++ b/data/bamboo-2fg-4x5.tablet
@@ -1,15 +1,15 @@
# Wacom
-# Bamboo Pen & Touch
+# Bamboo
# CTH-460
#
# first generation BambooPT
#
-# stylus with two buttons and eraser; 2FG touch
+# stylus with two buttons and eraser (LP160E); 2FG touch
# Pen active area: 5.8 x 3.62in
# Touch active area: 4.92 x 3.35in
[Device]
-Name=Wacom Bamboo 2FG 4x5
+Name=Wacom Bamboo (2FG)
DeviceMatch=usb:056a:00d1
Class=Bamboo
Width=6
diff --git a/data/bamboo-2fg-6x8.tablet b/data/bamboo-2fg-6x8.tablet
index f5f9131..35763b3 100644
--- a/data/bamboo-2fg-6x8.tablet
+++ b/data/bamboo-2fg-6x8.tablet
@@ -1,15 +1,15 @@
# Wacom
-# Bamboo Fun
+# Bamboo Fun medium / Bamboo Comic
# CTH-661
#
# first generation BambooPT
#
-# stylus with two buttons and eraser; 2FG touch
-# Pen active area: 8.53 x 5.40 in
+# stylus with two buttons and eraser (LP161E); 2FG touch
+# Pen active area: 8.52 x 5.39 in
# Touch active area: 7.48 x 5.12 in
[Device]
-Name=Wacom Bamboo 2FG 6x8
+Name=Wacom Bamboo Fun medium (2FG)
DeviceMatch=usb:056a:00d3
Class=Bamboo
Width=9
diff --git a/data/bamboo-2fg.tablet b/data/bamboo-2fg.tablet
index 6e37e7a..f6504d8 100644
--- a/data/bamboo-2fg.tablet
+++ b/data/bamboo-2fg.tablet
@@ -8,7 +8,7 @@
# Touch active area: 4.92 x 3.35in
[Device]
-Name=Wacom Bamboo 2FG
+Name=Wacom Bamboo Touch (2FG)
DeviceMatch=usb:056a:00d0
Class=Bamboo
Width=5
diff --git a/data/bamboo-craft.tablet b/data/bamboo-craft.tablet
index a69760c..053cdd5 100644
--- a/data/bamboo-craft.tablet
+++ b/data/bamboo-craft.tablet
@@ -1,15 +1,15 @@
# Wacom
-# Bamboo Craft
+# Bamboo Fun small / Bamboo Craft
# CTH-461
#
# first generation BambooPT
#
-# stylus with two buttons and eraser; 2FG touch
+# stylus with two buttons and eraser (LP161E); 2FG touch
# Pen active area: 5.8 x 3.62in
# Touch active area: 4.92 x 3.35in
[Device]
-Name=Wacom Bamboo Craft
+Name=Wacom Bamboo Fun small (2FG)
DeviceMatch=usb:056a:00d2
Class=Bamboo
Width=6
diff --git a/data/bamboo-pen.tablet b/data/bamboo-pen.tablet
index 05f1689..e670aa9 100644
--- a/data/bamboo-pen.tablet
+++ b/data/bamboo-pen.tablet
@@ -4,15 +4,16 @@
#
# first generation BambooPT
#
-# stylus with two buttons and no eraser
+# stylus with two buttons and no eraser (LP160)
# Pen active area: 5.8 x 3.62in
[Device]
-Name=Wacom Bamboo Pen
+Name=Wacom Bamboo Pen small
DeviceMatch=usb:056a:00d4
Class=Bamboo
Width=6
Height=4
+# No pad buttons, so no layout
IntegratedIn=
[Features]
diff --git a/data/layouts/bamboo-16fg-4x5.svg b/data/layouts/bamboo-16fg-4x5.svg
index 77ddccf..ac15aa0 100644
--- a/data/layouts/bamboo-16fg-4x5.svg
+++ b/data/layouts/bamboo-16fg-4x5.svg
@@ -13,7 +13,7 @@
width="248"
height="176">
<title
- id="title">Wacom Bamboo 16FG 4x5 (CTH-470)</title>
+ id="title">Wacom Bamboo Capture (CTH-470)</title>
<g>
<rect
id="ButtonA"
diff --git a/data/layouts/bamboo-2fg-4x5.svg b/data/layouts/bamboo-2fg-4x5.svg
index ec56790..0c77451 100644
--- a/data/layouts/bamboo-2fg-4x5.svg
+++ b/data/layouts/bamboo-2fg-4x5.svg
@@ -13,7 +13,7 @@
width="248"
height="176">
<title
- id="title">Wacom Bamboo 2FG 4x5 (CTH-460)</title>
+ id="title">Wacom Bamboo (2FG) (CTH-460)</title>
<g>
<rect
id="ButtonA"
diff --git a/data/layouts/bamboo-2fg-6x8.svg b/data/layouts/bamboo-2fg-6x8.svg
index 1a2ed9c..c8da175 100644
--- a/data/layouts/bamboo-2fg-6x8.svg
+++ b/data/layouts/bamboo-2fg-6x8.svg
@@ -13,7 +13,7 @@
width="337"
height="222">
<title
- id="title">Wacom Bamboo 2FG 6x8 (CTH-661)</title>
+ id="title">Wacom Bamboo Fun medium (CTH-661)</title>
<g>
<path
id="ButtonA"
diff --git a/data/layouts/bamboo-2fg.svg b/data/layouts/bamboo-2fg.svg
index 4dd3694..9c70bf0 100644
--- a/data/layouts/bamboo-2fg.svg
+++ b/data/layouts/bamboo-2fg.svg
@@ -13,7 +13,7 @@
width="208"
height="136">
<title
- id="title">Wacom Bamboo 2FG (CTT-460)</title>
+ id="title">Wacom Bamboo Touch (2FG) (CTT-460)</title>
<g>
<rect
id="ButtonA"
diff --git a/data/layouts/bamboo-craft.svg b/data/layouts/bamboo-craft.svg
index 9fd42d9..aad13b8 100644
--- a/data/layouts/bamboo-craft.svg
+++ b/data/layouts/bamboo-craft.svg
@@ -13,7 +13,7 @@
width="248"
height="176">
<title
- id="title">Wacom Bamboo Craft (CTH-461)</title>
+ id="title">Wacom Bamboo Fun small (2FG) (CTH-461)</title>
<g>
<path
id="ButtonA"
--
2.6.3
------------------------------------------------------------------------------
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
