Describe the axes per stylus

The tablet's evdev device has all possible axes set for all tools on this
device. We can't know which axes are available for each tool. Fix this.

For now, the database was fixed to provide tilt, pressure and distance for all
devices. Except Puck devices, they only get tilt.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Tested-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>

1 files changed, 53 insertions, 0 deletions

diff --git a/data/libwacom.stylus b/data/libwacom.stylus
index ceed599..49c3bde 100644
--- a/data/libwacom.stylus
+++ b/data/libwacom.stylus
@@ -3,11 +3,13 @@
 Name=General Pen
 Buttons=2
 HasEraser=true
+Axes=Tilt;Pressure;Distance;
 Type=General
 
 [0xffffe]
 Name=General Pen Eraser
 IsEraser=true
+Axes=Tilt;Pressure;Distance;
 Type=General
 
 # Inking pen have no eraser
@@ -16,6 +18,7 @@ Type=General
 Name=Inking Pen
 Buttons=0
 HasEraser=false
+Axes=Tilt;Pressure;Distance;
 Type=Inking
 
 [0x801]
@@ -23,6 +26,7 @@ Type=Inking
 Name=Inking Pen
 Buttons=0
 HasEraser=false
+Axes=Tilt;Pressure;Distance;
 Type=Inking
 
 [0x20802]
@@ -30,6 +34,7 @@ Type=Inking
 Name=Inking Pen
 Buttons=0
 HasEraser=false
+Axes=Tilt;Pressure;Distance;
 Type=Inking
 
 [0x120802]
@@ -37,12 +42,14 @@ Type=Inking
 Name=Inking Pen
 Buttons=0
 HasEraser=false
+Axes=Tilt;Pressure;Distance;
 Type=Inking
 
 [0x012]
 Name=Inking Pen
 Buttons=0
 HasEraser=false
+Axes=Tilt;Pressure;Distance;
 Type=Inking
 
 # Regular pen has eraser
@@ -51,6 +58,7 @@ Type=Inking
 Name=Classic Pen
 HasEraser=true
 Buttons=2
+Axes=Tilt;Pressure;Distance;
 Type=Classic
 
 [0x842]
@@ -58,6 +66,7 @@ Type=Classic
 Name=Designer Pen
 HasEraser=false
 Buttons=2
+Axes=Tilt;Pressure;Distance;
 Type=General
 
 [0x852]
@@ -65,6 +74,7 @@ Type=General
 Name=Grip Pen
 HasEraser=true
 Buttons=2
+Axes=Tilt;Pressure;Distance;
 Type=General
 
 [0x823]
@@ -72,6 +82,7 @@ Type=General
 Name=Grip Pen
 HasEraser=true
 Buttons=2
+Axes=Tilt;Pressure;Distance;
 Type=General
 
 [0x813]
@@ -79,6 +90,7 @@ Type=General
 Name=Classic Pen
 HasEraser=true
 Buttons=2
+Axes=Tilt;Pressure;Distance;
 Type=Classic
 
 [0x885]
@@ -86,6 +98,7 @@ Type=Classic
 Name=6D Art Pen
 HasEraser=false
 Buttons=0
+Axes=Tilt;Pressure;Distance;
 Type=Marker
 
 [0x802]
@@ -93,6 +106,7 @@ Type=Marker
 Name=Grip Pen
 HasEraser=true
 Buttons=2
+Axes=Tilt;Pressure;Distance;
 Type=General
 
 [0x804]
@@ -100,6 +114,7 @@ Type=General
 Name=Art Pen
 HasEraser=true
 Buttons=2
+Axes=Tilt;Pressure;Distance;
 Type=Marker
 
 [0x100804]
@@ -107,12 +122,14 @@ Type=Marker
 Name=Art Pen
 HasEraser=true
 Buttons=2
+Axes=Tilt;Pressure;Distance;
 Type=Marker
 
 [0x100802]
 # Intuos4, 5 and Cintiq 21UX2, 24HD
 Name=Grip Pen
 IsEraser=true
+Axes=Tilt;Pressure;Distance;
 Type=General
 
 [0x40802]
@@ -120,6 +137,7 @@ Type=General
 Name=Classic Pen
 HasEraser=true
 Buttons=2
+Axes=Tilt;Pressure;Distance;
 Type=Classic
 
 [0x140802]
@@ -127,6 +145,7 @@ Type=Classic
 Name=Classic Pen
 HasEraser=true
 Buttons=2
+Axes=Tilt;Pressure;Distance;
 Type=Classic
 
 [0x160802]
@@ -134,6 +153,7 @@ Type=Classic
 Name=Pro Pen
 HasEraser=true
 Buttons=2
+Axes=Tilt;Pressure;Distance;
 Type=Classic
 
 [0x180802]
@@ -141,6 +161,7 @@ Type=Classic
 Name=Pen
 HasEraser=true
 Buttons=2
+Axes=Tilt;Pressure;Distance;
 Type=General
 
 [0x022]
@@ -153,11 +174,13 @@ HasEraser=true
 Name=Stroke Pen
 HasEraser=false
 Buttons=0
+Axes=Tilt;Pressure;Distance;
 Type=Stroke
 
 [0x032]
 Name=Stroke Pen
 HasEraser=false
+Axes=Tilt;Pressure;Distance;
 Type=Stroke
 
 # Erasers
@@ -165,24 +188,28 @@ Type=Stroke
 # Intuos and Intuos2
 Name=Classic Pen Eraser
 IsEraser=true
+Axes=Tilt;Pressure;Distance;
 Type=Classic
 
 [0x85a]
 # Intuos2
 Name=Grip Pen Eraser
 IsEraser=true
+Axes=Tilt;Pressure;Distance;
 Type=General
 
 [0x91a]
 # Intuos2
 Name=Airbrush Pen Eraser
 IsEraser=true
+Axes=Tilt;Pressure;Distance;
 Type=Airbrush
 
 [0xd1a]
 # Intuos
 Name=Airbrush Pen Eraser
 IsEraser=true
+Axes=Tilt;Pressure;Distance;
 Type=Airbrush
 
 [0x0fa]
@@ -193,78 +220,91 @@ IsEraser=true
 # Intuos3 and Cintiq 21UX
 Name=Grip Pen Eraser
 IsEraser=true
+Axes=Tilt;Pressure;Distance;
 Type=General
 
 [0x81b]
 # Intuos3 and Cintiq 21UX
 Name=Classic Pen Eraser
 IsEraser=true
+Axes=Tilt;Pressure;Distance;
 Type=Classic
 
 [0x91b]
 # Intuos3 and Cintiq 21UX
 Name=Airbrush Pen Eraser
 IsEraser=true
+Axes=Tilt;Pressure;Distance;
 Type=Airbrush
 
 [0x80c]
 # Intuos4, 5 and Cintiq 21UX2, 24HD
 Name=Art Pen Eraser
 IsEraser=true
+Axes=Tilt;Pressure;Distance;
 Type=Marker
 
 [0x80a]
 # Intuos4, 5 and Cintiq 21UX2, 24HD
 Name=Grip Pen Eraser
 IsEraser=true
+Axes=Tilt;Pressure;Distance;
 Type=General
 
 [0x4080a]
 # Intuos4, 5 and Cintiq 21UX2, 24HD
 Name=Classic Pen Eraser
 IsEraser=true
+Axes=Tilt;Pressure;Distance;
 Type=Classic
 
 [0x14080a]
 # Intuos4, 5 and Cintiq 21UX2, 24HD
 Name=Classic Pen Eraser
 IsEraser=true
+Axes=Tilt;Pressure;Distance;
 Type=Classic
 
 [0x10080c]
 # Intuos4, 5 and 13HD, 24HD Art Pen
 Name=Art Pen Eraser
 IsEraser=true
+Axes=Tilt;Pressure;Distance;
 Type=Marker
 
 [0x10080a]
 # Intuos4, 5 and Cintiq 21UX2, 24HD
 Name=Grip Pen Eraser
 IsEraser=true
+Axes=Tilt;Pressure;Distance;
 Type=General
 
 [0x16080a]
 # Cintiq 13HD
 Name=Pro Pen Eraser
 IsEraser=true
+Axes=Tilt;Pressure;Distance;
 Type=Classic
 
 [0x18080a]
 # DTH2242 Eraser
 Name=Pen Eraser
 IsEraser=true
+Axes=Tilt;Pressure;Distance;
 Type=General
 
 [0x10090a]
 # Intuos4, 5 and Cintiq 13HD, 22HD, 24HD Airbrush Eraser
 Name=Airbrush Pen Eraser
 IsEraser=true
+Axes=Tilt;Pressure;Distance;
 Type=Airbrush
 
 [0x90a]
 # Intuos4, 5 and Cintiq 21UX2, 24HD
 Name=Airbrush Pen Eraser
 IsEraser=true
+Axes=Tilt;Pressure;Distance;
 Type=Airbrush
 
 # Airbrush pen has eraser
@@ -273,6 +313,7 @@ Type=Airbrush
 Name=Airbrush Pen
 HasEraser=true
 Buttons=1
+Axes=Tilt;Pressure;Distance;
 Type=Airbrush
 
 [0x912]
@@ -280,11 +321,13 @@ Type=Airbrush
 Name=Airbrush Pen
 HasEraser=true
 Buttons=1
+Axes=Tilt;Pressure;Distance;
 Type=Airbrush
 
 [0x112]
 Name=Airbrush Pen
 HasEraser=true
+Axes=Tilt;Pressure;Distance;
 Type=Airbrush
 
 [0x913]
@@ -292,6 +335,7 @@ Type=Airbrush
 Name=Airbrush Pen
 Buttons=1
 HasEraser=true
+Axes=Tilt;Pressure;Distance;
 Type=Airbrush
 
 [0x902]
@@ -299,6 +343,7 @@ Type=Airbrush
 Name=Airbrush Pen
 Buttons=1
 HasEraser=true
+Axes=Tilt;Pressure;Distance;
 Type=Airbrush
 
 [0x100902]
@@ -306,12 +351,14 @@ Type=Airbrush
 Name=Airbrush Pen
 Buttons=1
 HasEraser=true
+Axes=Tilt;Pressure;Distance;
 Type=Airbrush
 
 # Puck devices
 [0x096]
 # Intuos and Intuos2
 Name=Lens Cursor
+Axes=Tilt;
 Type=Puck
 HasLens=true
 HasWheel=false
@@ -320,6 +367,7 @@ Buttons=5
 [0x097]
 # Intuos3
 Name=Lens Cursor
+Axes=Tilt;
 Type=Puck
 HasLens=true
 HasWheel=false
@@ -328,6 +376,7 @@ Buttons=5
 [0x006]
 # Intuos4 and Intuos5
 Name=Lens Cursor
+Axes=Tilt;
 Type=Puck
 HasLens=true
 HasWheel=false
@@ -336,6 +385,7 @@ Buttons=5
 [0x094]
 # Intuos and Intuos2
 Name=4D Mouse
+Axes=Tilt;
 Type=Puck
 HasLens=false
 HasWheel=false
@@ -344,6 +394,7 @@ Buttons=5
 [0x007]
 # Intuos3
 Name=2D Mouse
+Axes=Tilt;
 Type=Puck
 HasLens=false
 HasWheel=true
@@ -352,6 +403,7 @@ Buttons=3
 [0x017]
 # Intuos3
 Name=Mouse
+Axes=Tilt;
 Type=Puck
 HasLens=false
 HasWheel=true
@@ -360,6 +412,7 @@ Buttons=5
 [0x806]
 # Intuos4 and Intuos5
 Name=Five Button Mouse
+Axes=Tilt;
 Type=Puck
 HasLens=false
 HasWheel=true