Skip to content

Commit e108436

Browse files
author
Ping Cheng
committed
data: add unmangled stylus IDs to wacom.stylus
Years ago, an extra '0' accidently landed on the 4th nybble of the stylus IDs in Wacom kernel driver. We decided to fix the issue in the kernel (linuxwacom#767). But, we want libwacom to be prepared for the change. The "Mangled tool ID for kernel < 6.20" comments in the patch is only a placeholder. We will replace 6.20 with the actual kernel version that the mangled IDs are replaced by the correct ones.
1 parent e6474bc commit e108436

File tree

1 file changed

+102
-18
lines changed

1 file changed

+102
-18
lines changed

data/wacom.stylus

Lines changed: 102 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -164,13 +164,21 @@ Axes=Tilt;Pressure;Distance;
164164
Type=Inking
165165

166166
[0x56a:0x20802]
167+
# Mangled tool ID for kernel < 6.20
168+
AliasOf=0x56a:0x2802
169+
170+
[0x56a:0x2802]
167171
# Intuos4, 5 and Cintiq 21UX2, 22HD, 24HD
168172
Name=Inking Pen
169173
Buttons=0
170174
Axes=Tilt;Pressure;Distance;
171175
Type=Inking
172176

173177
[0x56a:0x120802]
178+
# Mangled tool ID for kernel < 6.20
179+
AliasOf=0x56a:0x12802
180+
181+
[0x56a:0x12802]
174182
# Intuos4, 5 and Cintiq 21UX2, 22HD, 24HD
175183
Name=Inking Pen
176184
Group=intuos5
@@ -237,6 +245,10 @@ Axes=Tilt;Pressure;Distance;
237245
Type=General
238246

239247
[0x56a:0x80842]
248+
# Mangled tool ID for kernel < 6.20
249+
AliasOf=0x56a:0x8842
250+
251+
[0x56a:0x8842]
240252
# MobileStudio Pro
241253
Name=Pro Pen 3D
242254
Group=mobilestudio
@@ -298,63 +310,91 @@ Axes=Tilt;Pressure;Distance;RotationZ;
298310
Type=Marker
299311

300312
[0x56a:0x100804]
313+
# Mangled tool ID for kernel < 6.20
314+
AliasOf=0x56a:0x10804
315+
316+
[0x56a:0x10804]
301317
# Intuos4, 5 and Cintiq 21UX2, 22HD, 24HD
302318
Name=Art Pen
303319
Group=propengen2
304-
PairedStylusIds=0x56a:0x10080c;
320+
PairedStylusIds=0x56a:0x1080c;
305321
Buttons=2
306322
Axes=Tilt;Pressure;Distance;RotationZ;
307323
Type=Marker
308324

309325
[0x56a:0x100802]
326+
# Mangled tool ID for kernel < 6.20
327+
AliasOf=0x56a:0x10802
328+
329+
[0x56a:0x10802]
310330
# Intuos4, 5 and Cintiq 21UX2, 24HD
311331
Name=Grip Pen
312332
Group=propengen2
313-
PairedStylusIds=0x56a:0x10080a;
333+
PairedStylusIds=0x56a:0x1080a;
314334
Buttons=2
315335
Axes=Tilt;Pressure;Distance;
316336
Type=General
317337

318338
[0x56a:0x100842]
339+
# Mangled tool ID for kernel < 6.20
340+
AliasOf=0x56a:0x10842
341+
342+
[0x56a:0x10842]
319343
# MobileStudio Pro, Cintiq Pro, Intuos Pro
320344
Name=Pro Pen Slim
321345
Group=mobilestudio
322-
PairedStylusIds=0x56a:0x10084a;
346+
PairedStylusIds=0x56a:0x1084a;
323347
Buttons=2
324348
Axes=Tilt;Pressure;Distance;
325349
Type=General
326350

327351
[0x56a:0x40802]
352+
# Mangled tool ID for kernel < 6.20
353+
AliasOf=0x56a:0x4802
354+
355+
[0x56a:0x4802]
328356
# Intuos4, 5 and Cintiq 21UX2, 24HD
329357
Name=Classic Pen
330-
PairedStylusIds=0x56a:0x4080a;
358+
PairedStylusIds=0x56a:0x480a;
331359
Buttons=2
332360
Axes=Tilt;Pressure;Distance;
333361
Type=Classic
334362

335363
[0x56a:0x140802]
364+
# Mangled tool ID for kernel < 6.20
365+
AliasOf=0x56a:0x14802
366+
367+
[0x56a:0x14802]
336368
# Intuos4, 5 and Cintiq 21UX2, 24HD
337369
Name=Classic Pen
338370
Group=propengen2
339-
PairedStylusIds=0x56a:0x14080a;
371+
PairedStylusIds=0x56a:0x1480a;
340372
Buttons=2
341373
Axes=Tilt;Pressure;Distance;
342374
Type=Classic
343375

344376
[0x56a:0x160802]
377+
# Mangled tool ID for kernel < 6.20
378+
AliasOf=0x56a:0x16802
379+
380+
[0x56a:0x16802]
345381
# Cintiq 13HD Pro Pen
346382
Name=Pro Pen
347383
Group=propengen2
348-
PairedStylusIds=0x56a:0x16080a;
384+
PairedStylusIds=0x56a:0x1680a;
349385
Buttons=2
350386
Axes=Tilt;Pressure;Distance;
351387
Type=Classic
352388

353389
[0x56a:0x180802]
390+
# Mangled tool ID for kernel < 6.20
391+
AliasOf=0x56a:0x18802
392+
393+
[0x56a:0x18802]
354394
# DTH2242 Pen
355395
Name=Pen
356396
Group=dth2242
357-
PairedStylusIds=0x56a:0x18080a;
397+
PairedStylusIds=0x56a:0x1880a;
358398
Buttons=2
359399
Axes=Tilt;Pressure;Distance;
360400
Type=General
@@ -480,79 +520,111 @@ Axes=Tilt;Pressure;Distance;
480520
Type=General
481521

482522
[0x56a:0x4080a]
523+
# Mangled tool ID for kernel < 6.20
524+
AliasOf=0x56a:0x480a
525+
526+
[0x56a:0x480a]
483527
# Intuos4, 5 and Cintiq 21UX2, 24HD
484528
Name=Classic Pen Eraser
485-
PairedStylusIds=0x56a:0x40802;
529+
PairedStylusIds=0x56a:0x4802;
486530
EraserType=Invert
487531
Buttons=2
488532
Axes=Tilt;Pressure;Distance;
489533
Type=Classic
490534

491535
[0x56a:0x14080a]
536+
# Mangled tool ID for kernel < 6.20
537+
AliasOf=0x56a:0x1480a
538+
539+
[0x56a:0x1480a]
492540
# Intuos4, 5 and Cintiq 21UX2, 24HD
493541
Name=Classic Pen Eraser
494542
Group=propengen2
495-
PairedStylusIds=0x56a:0x140802;
543+
PairedStylusIds=0x56a:0x14802;
496544
EraserType=Invert
497545
Buttons=2
498546
Axes=Tilt;Pressure;Distance;
499547
Type=Classic
500548

501549
[0x56a:0x10080c]
550+
# Mangled tool ID for kernel < 6.20
551+
AliasOf=0x56a:0x1080c
552+
553+
[0x56a:0x1080c]
502554
# Intuos4, 5 and 13HD, 24HD Art Pen
503555
Name=Art Pen Eraser
504556
Group=propengen2
505-
PairedStylusIds=0x56a:0x100804;
557+
PairedStylusIds=0x56a:0x10804;
506558
EraserType=Invert
507559
Buttons=2
508560
Axes=Tilt;Pressure;Distance;
509561
Type=Marker
510562

511563
[0x56a:0x10080a]
564+
# Mangled tool ID for kernel < 6.20
565+
AliasOf=0x56a:0x1080a
566+
567+
[0x56a:0x1080a]
512568
# Intuos4, 5 and Cintiq 21UX2, 24HD
513569
Name=Grip Pen Eraser
514570
Group=propengen2
515-
PairedStylusIds=0x56a:0x100802;
571+
PairedStylusIds=0x56a:0x10802;
516572
EraserType=Invert
517573
Buttons=2
518574
Axes=Tilt;Pressure;Distance;
519575
Type=General
520576

521577
[0x56a:0x10084a]
578+
# Mangled tool ID for kernel < 6.20
579+
AliasOf=0x56a:0x1084a
580+
581+
[0x56a:0x1084a]
522582
# MobileStudio Pro, Cintiq Pro, Intuos Pro
523583
Name=Pro Pen Slim
524584
Group=mobilestudio
525-
PairedStylusIds=0x56a:0x100842;
585+
PairedStylusIds=0x56a:0x10842;
526586
EraserType=Invert
527587
Buttons=2
528588
Axes=Tilt;Pressure;Distance;
529589
Type=General
530590

531591
[0x56a:0x16080a]
592+
# Mangled tool ID for kernel < 6.20
593+
AliasOf=0x56a:0x1680a
594+
595+
[0x56a:0x1680a]
532596
# Cintiq 13HD
533597
Name=Pro Pen Eraser
534598
Group=propengen2
535-
PairedStylusIds=0x56a:0x160802;
599+
PairedStylusIds=0x56a:0x16802;
536600
EraserType=Invert
537601
Buttons=2
538602
Axes=Tilt;Pressure;Distance;
539603
Type=Classic
540604

541605
[0x56a:0x18080a]
606+
# Mangled tool ID for kernel < 6.20
607+
AliasOf=0x56a:0x1880a
608+
609+
[0x56a:0x1880a]
542610
# DTH2242 Eraser
543611
Name=Pen Eraser
544612
Group=dth2242
545-
PairedStylusIds=0x56a:0x180802;
613+
PairedStylusIds=0x56a:0x18802;
546614
EraserType=Invert
547615
Buttons=2
548616
Axes=Tilt;Pressure;Distance;
549617
Type=General
550618

551619
[0x56a:0x10090a]
620+
# Mangled tool ID for kernel < 6.20
621+
AliasOf=0x56a:0x1090a
622+
623+
[0x56a:0x1090a]
552624
# Intuos4, 5 and Cintiq 13HD, 22HD, 24HD Airbrush Eraser
553625
Name=Airbrush Pen Eraser
554626
Group=intuos5
555-
PairedStylusIds=0x56a:0x100902;
627+
PairedStylusIds=0x56a:0x10902;
556628
EraserType=Invert
557629
Buttons=1
558630
Axes=Tilt;Pressure;Distance;
@@ -606,10 +678,14 @@ Axes=Tilt;Pressure;Distance;Slider;
606678
Type=Airbrush
607679

608680
[0x56a:0x100902]
681+
# Mangled tool ID for kernel < 6.
682+
AliasOf=0x56a:0x10902
683+
684+
[0x56a:0x10902]
609685
# Intuos4, 5 and Cintiq 13HD, 21UX2, 22HD, 24HD
610686
Name=Airbrush Pen
611687
Group=intuos5
612-
PairedStylusIds=0x56a:0x10090a;
688+
PairedStylusIds=0x56a:0x1090a;
613689
Buttons=1
614690
Axes=Tilt;Pressure;Distance;Slider;
615691
Type=Airbrush
@@ -686,19 +762,27 @@ HasWheel=true
686762
Buttons=5
687763

688764
[0x56a:0x10002]
765+
# Mangled tool ID for kernel < 6.20
766+
AliasOf=0x56a:0x1002
767+
768+
[0x56a:0x1002]
689769
# Wacom Movink 13
690770
Name=UD Pen
691771
Group=udpen
692-
PairedStylusIds=0x56a:0x1000a;
772+
PairedStylusIds=0x56a:0x100a;
693773
Buttons=2
694774
Axes=Tilt;Pressure;Distance;
695775
Type=General
696776

697777
[0x56a:0x1000a]
778+
# Mangled tool ID for kernel < 6.20
779+
AliasOf=0x56a:0x100a
780+
781+
[0x56a:0x100a]
698782
# Wacom Movink 13
699783
Name=UD Pen Eraser
700784
Group=udpen
701-
PairedStylusIds=0x56a:0x10002;
785+
PairedStylusIds=0x56a:0x1002;
702786
Buttons=1
703787
EraserType=Invert
704788
Axes=Tilt;Pressure;Distance;

0 commit comments

Comments
 (0)