Skip to content

Commit e528efc

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 e528efc

File tree

1 file changed

+138
-36
lines changed

1 file changed

+138
-36
lines changed

data/wacom.stylus

Lines changed: 138 additions & 36 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
@@ -297,68 +309,103 @@ Buttons=2
297309
Axes=Tilt;Pressure;Distance;RotationZ;
298310
Type=Marker
299311

300-
[0x56a:0x100804]
312+
[0x56a:0x10804]
301313
# Intuos4, 5 and Cintiq 21UX2, 22HD, 24HD
302314
Name=Art Pen
303315
Group=propengen2
304-
PairedStylusIds=0x56a:0x10080c;
316+
PairedStylusIds=0x56a:0x1080c;
305317
Buttons=2
306318
Axes=Tilt;Pressure;Distance;RotationZ;
307319
Type=Marker
308320

309-
[0x56a:0x100802]
321+
[0x56a:0x100804]
322+
# Mangled tool ID for kernel < 6.20
323+
PairedStylusIds=0x56a:0x10080c;
324+
AliasOf=0x56a:0x10804
325+
326+
[0x56a:0x10802]
310327
# Intuos4, 5 and Cintiq 21UX2, 24HD
311328
Name=Grip Pen
312329
Group=propengen2
313-
PairedStylusIds=0x56a:0x10080a;
330+
PairedStylusIds=0x56a:0x1080a;
314331
Buttons=2
315332
Axes=Tilt;Pressure;Distance;
316333
Type=General
317334

318-
[0x56a:0x100842]
335+
[0x56a:0x100802]
336+
# Mangled tool ID for kernel < 6.20
337+
PairedStylusIds=0x56a:0x10080a;
338+
AliasOf=0x56a:0x10802
339+
340+
[0x56a:0x10842]
319341
# MobileStudio Pro, Cintiq Pro, Intuos Pro
320342
Name=Pro Pen Slim
321343
Group=mobilestudio
322-
PairedStylusIds=0x56a:0x10084a;
344+
PairedStylusIds=0x56a:0x1084a;
323345
Buttons=2
324346
Axes=Tilt;Pressure;Distance;
325347
Type=General
326348

327-
[0x56a:0x40802]
349+
[0x56a:0x100842]
350+
# Mangled tool ID for kernel < 6.20
351+
PairedStylusIds=0x56a:0x10084a;
352+
AliasOf=0x56a:0x10842
353+
354+
[0x56a:0x4802]
328355
# Intuos4, 5 and Cintiq 21UX2, 24HD
329356
Name=Classic Pen
330-
PairedStylusIds=0x56a:0x4080a;
357+
PairedStylusIds=0x56a:0x480a;
331358
Buttons=2
332359
Axes=Tilt;Pressure;Distance;
333360
Type=Classic
334361

335-
[0x56a:0x140802]
362+
[0x56a:0x40802]
363+
# Mangled tool ID for kernel < 6.20
364+
PairedStylusIds=0x56a:0x4080a;
365+
AliasOf=0x56a:0x4802
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

344-
[0x56a:0x160802]
376+
[0x56a:0x140802]
377+
# Mangled tool ID for kernel < 6.20
378+
PairedStylusIds=0x56a:0x14080a;
379+
AliasOf=0x56a:0x14802
380+
381+
[0x56a:0x16802]
345382
# Cintiq 13HD Pro Pen
346383
Name=Pro Pen
347384
Group=propengen2
348-
PairedStylusIds=0x56a:0x16080a;
385+
PairedStylusIds=0x56a:0x1680a;
349386
Buttons=2
350387
Axes=Tilt;Pressure;Distance;
351388
Type=Classic
352389

353-
[0x56a:0x180802]
390+
[0x56a:0x160802]
391+
# Mangled tool ID for kernel < 6.20
392+
PairedStylusIds=0x56a:0x16080a;
393+
AliasOf=0x56a:0x16802
394+
395+
[0x56a:0x18802]
354396
# DTH2242 Pen
355397
Name=Pen
356398
Group=dth2242
357-
PairedStylusIds=0x56a:0x18080a;
399+
PairedStylusIds=0x56a:0x1880a;
358400
Buttons=2
359401
Axes=Tilt;Pressure;Distance;
360402
Type=General
361403

404+
[0x56a:0x180802]
405+
# Mangled tool ID for kernel < 6.20
406+
PairedStylusIds=0x56a:0x18080a;
407+
AliasOf=0x56a:0x18802
408+
362409
# Stroke pen has no eraser
363410
[0x56a:0x832]
364411
#Intuos and Intuos2
@@ -479,85 +526,125 @@ Buttons=2
479526
Axes=Tilt;Pressure;Distance;
480527
Type=General
481528

482-
[0x56a:0x4080a]
529+
[0x56a:0x480a]
483530
# Intuos4, 5 and Cintiq 21UX2, 24HD
484531
Name=Classic Pen Eraser
485-
PairedStylusIds=0x56a:0x40802;
532+
PairedStylusIds=0x56a:0x4802;
486533
EraserType=Invert
487534
Buttons=2
488535
Axes=Tilt;Pressure;Distance;
489536
Type=Classic
490537

491-
[0x56a:0x14080a]
538+
[0x56a:0x4080a]
539+
# Mangled tool ID for kernel < 6.20
540+
PairedStylusIds=0x56a:0x40802;
541+
AliasOf=0x56a:0x480a
542+
543+
[0x56a:0x1480a]
492544
# Intuos4, 5 and Cintiq 21UX2, 24HD
493545
Name=Classic Pen Eraser
494546
Group=propengen2
495-
PairedStylusIds=0x56a:0x140802;
547+
PairedStylusIds=0x56a:0x14802;
496548
EraserType=Invert
497549
Buttons=2
498550
Axes=Tilt;Pressure;Distance;
499551
Type=Classic
500552

501-
[0x56a:0x10080c]
553+
[0x56a:0x14080a]
554+
# Mangled tool ID for kernel < 6.20
555+
PairedStylusIds=0x56a:0x140802;
556+
AliasOf=0x56a:0x1480a
557+
558+
[0x56a:0x1080c]
502559
# Intuos4, 5 and 13HD, 24HD Art Pen
503560
Name=Art Pen Eraser
504561
Group=propengen2
505-
PairedStylusIds=0x56a:0x100804;
562+
PairedStylusIds=0x56a:0x10804;
506563
EraserType=Invert
507564
Buttons=2
508565
Axes=Tilt;Pressure;Distance;
509566
Type=Marker
510567

511-
[0x56a:0x10080a]
568+
[0x56a:0x10080c]
569+
# Mangled tool ID for kernel < 6.20
570+
PairedStylusIds=0x56a:0x100804;
571+
AliasOf=0x56a:0x1080c
572+
573+
[0x56a:0x1080a]
512574
# Intuos4, 5 and Cintiq 21UX2, 24HD
513575
Name=Grip Pen Eraser
514576
Group=propengen2
515-
PairedStylusIds=0x56a:0x100802;
577+
PairedStylusIds=0x56a:0x10802;
516578
EraserType=Invert
517579
Buttons=2
518580
Axes=Tilt;Pressure;Distance;
519581
Type=General
520582

521-
[0x56a:0x10084a]
583+
[0x56a:0x10080a]
584+
# Mangled tool ID for kernel < 6.20
585+
PairedStylusIds=0x56a:0x100802;
586+
AliasOf=0x56a:0x1080a
587+
588+
[0x56a:0x1084a]
522589
# MobileStudio Pro, Cintiq Pro, Intuos Pro
523590
Name=Pro Pen Slim
524591
Group=mobilestudio
525-
PairedStylusIds=0x56a:0x100842;
592+
PairedStylusIds=0x56a:0x10842;
526593
EraserType=Invert
527594
Buttons=2
528595
Axes=Tilt;Pressure;Distance;
529596
Type=General
530597

531-
[0x56a:0x16080a]
598+
[0x56a:0x10084a]
599+
# Mangled tool ID for kernel < 6.20
600+
PairedStylusIds=0x56a:0x100842;
601+
AliasOf=0x56a:0x1084a
602+
603+
[0x56a:0x1680a]
532604
# Cintiq 13HD
533605
Name=Pro Pen Eraser
534606
Group=propengen2
535-
PairedStylusIds=0x56a:0x160802;
607+
PairedStylusIds=0x56a:0x16802;
536608
EraserType=Invert
537609
Buttons=2
538610
Axes=Tilt;Pressure;Distance;
539611
Type=Classic
540612

541-
[0x56a:0x18080a]
613+
[0x56a:0x16080a]
614+
# Mangled tool ID for kernel < 6.20
615+
PairedStylusIds=0x56a:0x160802;
616+
AliasOf=0x56a:0x1680a
617+
618+
[0x56a:0x1880a]
542619
# DTH2242 Eraser
543620
Name=Pen Eraser
544621
Group=dth2242
545-
PairedStylusIds=0x56a:0x180802;
622+
PairedStylusIds=0x56a:0x18802;
546623
EraserType=Invert
547624
Buttons=2
548625
Axes=Tilt;Pressure;Distance;
549626
Type=General
550627

551-
[0x56a:0x10090a]
628+
[0x56a:0x18080a]
629+
# Mangled tool ID for kernel < 6.20
630+
PairedStylusIds=0x56a:0x180802;
631+
AliasOf=0x56a:0x1880a
632+
633+
[0x56a:0x1090a]
552634
# Intuos4, 5 and Cintiq 13HD, 22HD, 24HD Airbrush Eraser
553635
Name=Airbrush Pen Eraser
554636
Group=intuos5
555-
PairedStylusIds=0x56a:0x100902;
637+
PairedStylusIds=0x56a:0x10902;
556638
EraserType=Invert
557639
Buttons=1
558640
Axes=Tilt;Pressure;Distance;
559641
Type=Airbrush
560642

643+
[0x56a:0x10090a]
644+
# Mangled tool ID for kernel < 6.20
645+
PairedStylusIds=0x56a:0x100902;
646+
AliasOf=0x56a:0x1090a
647+
561648
[0x56a:0x90a]
562649
# Intuos4, 5 and Cintiq 21UX2, 24HD
563650
Name=Airbrush Pen Eraser
@@ -605,15 +692,20 @@ Buttons=1
605692
Axes=Tilt;Pressure;Distance;Slider;
606693
Type=Airbrush
607694

608-
[0x56a:0x100902]
695+
[0x56a:0x10902]
609696
# Intuos4, 5 and Cintiq 13HD, 21UX2, 22HD, 24HD
610697
Name=Airbrush Pen
611698
Group=intuos5
612-
PairedStylusIds=0x56a:0x10090a;
699+
PairedStylusIds=0x56a:0x1090a;
613700
Buttons=1
614701
Axes=Tilt;Pressure;Distance;Slider;
615702
Type=Airbrush
616703

704+
[0x56a:0x100902]
705+
# Mangled tool ID for kernel < 6.20
706+
PairedStylusIds=0x56a:0x10090a;
707+
AliasOf=0x56a:0x10902
708+
617709
# Puck devices
618710
[0x56a:0x096]
619711
# Intuos and Intuos2
@@ -685,21 +777,31 @@ HasLens=false
685777
HasWheel=true
686778
Buttons=5
687779

688-
[0x56a:0x10002]
780+
[0x56a:0x1002]
689781
# Wacom Movink 13
690782
Name=UD Pen
691783
Group=udpen
692-
PairedStylusIds=0x56a:0x1000a;
784+
PairedStylusIds=0x56a:0x100a;
693785
Buttons=2
694786
Axes=Tilt;Pressure;Distance;
695787
Type=General
696788

697-
[0x56a:0x1000a]
789+
[0x56a:0x10002]
790+
# Mangled tool ID for kernel < 6.20
791+
PairedStylusIds=0x56a:0x1000a;
792+
AliasOf=0x56a:0x1002
793+
794+
[0x56a:0x100a]
698795
# Wacom Movink 13
699796
Name=UD Pen Eraser
700797
Group=udpen
701-
PairedStylusIds=0x56a:0x10002;
798+
PairedStylusIds=0x56a:0x1002;
702799
Buttons=1
703800
EraserType=Invert
704801
Axes=Tilt;Pressure;Distance;
705802
Type=General
803+
804+
[0x56a:0x1000a]
805+
# Mangled tool ID for kernel < 6.20
806+
PairedStylusIds=0x56a:0x10002;
807+
AliasOf=0x56a:0x100a

0 commit comments

Comments
 (0)