Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for firmware versions #620

Closed
wants to merge 6 commits into from
Closed

Add support for firmware versions #620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
32ca577
data: show the name matching in the example tablet file
whot Dec 20, 2023
8342404
Improve error debugging for invalid matches
whot Dec 20, 2023
dd77a64
Correct a warning referring to the wrong key
whot Dec 20, 2023
280e3dc
data: switch DeviceMatch to use a pipe as separator
whot Dec 20, 2023
2134c56
Rework match_from_string
whot Dec 20, 2023
075393e
Add a firmware string entry to the matches
whot Dec 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ jobs:
- name: copy and modify tablet files to override another one
run: |
sed -e 's/27QHD/27QHD MODIFIED/' data/cintiq-27hd.tablet | sudo tee /etc/libwacom/modified-cintiq.tablet
sed -e 's/Pro L/Pro L MODIFIED/' -e 's/usb:056a:0358;//' data/intuos-pro-2-l.tablet | sudo tee /etc/libwacom/modified-intuos.tablet
sed -e 's/Pro L/Pro L MODIFIED/' -e 's/usb|056a|0358;//' data/intuos-pro-2-l.tablet | sudo tee /etc/libwacom/modified-intuos.tablet
- name: list all devices for debugging
run: libwacom-list-devices --format=yaml

Expand Down
2 changes: 1 addition & 1 deletion data/bamboo-0fg-m-p-alt.tablet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
[Device]
Name=Wacom Bamboo Fun medium
ModelName=CTE-650
DeviceMatch=usb:056a:0018
DeviceMatch=usb|056a|0018
Class=Bamboo
Width=9
Height=5
Expand Down
2 changes: 1 addition & 1 deletion data/bamboo-0fg-s-p-alt.tablet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
[Device]
Name=Wacom Bamboo Fun small
ModelName=CTE-450
DeviceMatch=usb:056a:0017
DeviceMatch=usb|056a|0017
Class=Bamboo
Width=6
Height=4
Expand Down
2 changes: 1 addition & 1 deletion data/bamboo-0fg-s-p.tablet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
[Device]
Name=Wacom Bamboo Pen
ModelName=MTE-450
DeviceMatch=usb:056a:0065
DeviceMatch=usb|056a|0065
Class=Bamboo
Width=6
Height=4
Expand Down
2 changes: 1 addition & 1 deletion data/bamboo-16fg-m-pt.tablet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
[Device]
Name=Wacom Bamboo Create
ModelName=CTH-670
DeviceMatch=usb:056a:00df
DeviceMatch=usb|056a|00df
Class=Bamboo
Width=6
Height=4
Expand Down
2 changes: 1 addition & 1 deletion data/bamboo-16fg-s-p.tablet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
[Device]
Name=Wacom Bamboo Connect
ModelName=CTL-470
DeviceMatch=usb:056a:00dd
DeviceMatch=usb|056a|00dd
Class=Bamboo
Width=6
Height=4
Expand Down
2 changes: 1 addition & 1 deletion data/bamboo-16fg-s-pt.tablet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
[Device]
Name=Wacom Bamboo Capture
ModelName=CTH-470
DeviceMatch=usb:056a:00de
DeviceMatch=usb|056a|00de
Class=Bamboo
Width=6
Height=4
Expand Down
2 changes: 1 addition & 1 deletion data/bamboo-16fg-s-t.tablet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
[Device]
Name=Wacom Bamboo 16FG 4x5
ModelName=CTT-470
DeviceMatch=usb:056a:00dc
DeviceMatch=usb|056a|00dc
Class=Bamboo
Width=6
Height=4
Expand Down
2 changes: 1 addition & 1 deletion data/bamboo-2fg-fun-m-pt.tablet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
[Device]
Name=Wacom Bamboo Fun medium (2FG)
ModelName=CTH-661
DeviceMatch=usb:056a:00d3
DeviceMatch=usb|056a|00d3
Class=Bamboo
Width=9
Height=5
Expand Down
2 changes: 1 addition & 1 deletion data/bamboo-2fg-fun-s-pt.tablet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
[Device]
Name=Wacom Bamboo Fun small (2FG)
ModelName=CTH-461
DeviceMatch=usb:056a:00d2
DeviceMatch=usb|056a|00d2
Class=Bamboo
Width=6
Height=4
Expand Down
2 changes: 1 addition & 1 deletion data/bamboo-2fg-m-p.tablet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
[Device]
Name=Wacom Bamboo Pen medium
ModelName=CTL-660
DeviceMatch=usb:056a:00d5
DeviceMatch=usb|056a|00d5
Class=Bamboo
Width=6
Height=4
Expand Down
2 changes: 1 addition & 1 deletion data/bamboo-2fg-s-p.tablet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
[Device]
Name=Wacom Bamboo Pen small
ModelName=CTL-460
DeviceMatch=usb:056a:00d4
DeviceMatch=usb|056a|00d4
Class=Bamboo
Width=6
Height=4
Expand Down
2 changes: 1 addition & 1 deletion data/bamboo-2fg-s-pt.tablet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
[Device]
Name=Wacom Bamboo (2FG)
ModelName=CTH-460
DeviceMatch=usb:056a:00d1
DeviceMatch=usb|056a|00d1
Class=Bamboo
Width=6
Height=4
Expand Down
2 changes: 1 addition & 1 deletion data/bamboo-2fg-s-t.tablet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
[Device]
Name=Wacom Bamboo Touch (2FG)
ModelName=CTT-460
DeviceMatch=usb:056a:00d0
DeviceMatch=usb|056a|00d0
Class=Bamboo
Width=5
Height=3
Expand Down
2 changes: 1 addition & 1 deletion data/bamboo-4fg-fun-m.tablet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
[Device]
Name=Wacom Bamboo Fun medium (2+FG)
ModelName=CTH-661(A)
DeviceMatch=usb:056a:00d8
DeviceMatch=usb|056a|00d8
Class=Bamboo
Width=9
Height=5
Expand Down
2 changes: 1 addition & 1 deletion data/bamboo-4fg-fun-s.tablet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
[Device]
Name=Wacom Bamboo Fun small (2+FG)
ModelName=CTH-461(A)
DeviceMatch=usb:056a:00d7
DeviceMatch=usb|056a|00d7
Class=Bamboo
Width=6
Height=4
Expand Down
2 changes: 1 addition & 1 deletion data/bamboo-4fg-s-pt.tablet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
[Device]
Name=Wacom Bamboo Pen & Touch (2+FG)
ModelName=CTH-460(A)
DeviceMatch=usb:056a:00d6
DeviceMatch=usb|056a|00d6
Class=Bamboo
Width=6
Height=4
Expand Down
2 changes: 1 addition & 1 deletion data/bamboo-4fg-s-t.tablet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
[Device]
Name=Wacom Bamboo (2+FG)
ModelName=CTT-460(A)
DeviceMatch=usb:056a:00d9
DeviceMatch=usb|056a|00d9
Class=Bamboo
Width=5
Height=3
Expand Down
2 changes: 1 addition & 1 deletion data/bamboo-4fg-se-m-pt.tablet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
[Device]
Name=Wacom Bamboo Special Edition Pen & Touch medium
ModelName=CTH-661SE
DeviceMatch=usb:056a:00db
DeviceMatch=usb|056a|00db
Class=Bamboo
Width=9
Height=5
Expand Down
2 changes: 1 addition & 1 deletion data/bamboo-4fg-se-s-pt.tablet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
[Device]
Name=Wacom Bamboo Special Edition Pen & Touch small
ModelName=CTH-461SE
DeviceMatch=usb:056a:00da
DeviceMatch=usb|056a|00da
Class=Bamboo
Width=6
Height=4
Expand Down
2 changes: 1 addition & 1 deletion data/bamboo-one-m-p.tablet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
[Device]
Name=Wacom Bamboo1 5x8 Pen
ModelName=CTE-660
DeviceMatch=usb:056a:006b
DeviceMatch=usb|056a|006b
Class=Bamboo
Width=8
Height=5
Expand Down
2 changes: 1 addition & 1 deletion data/bamboo-one.tablet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
[Device]
Name=Bamboo One
ModelName=CTF-430
DeviceMatch=usb:056a:0069
DeviceMatch=usb|056a|0069
Class=Bamboo
Width=5
Height=4
Expand Down
2 changes: 1 addition & 1 deletion data/bamboo-pad-wireless.tablet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
[Device]
Name=Wacom Bamboo Pad Wireless
ModelName=CTH-300
DeviceMatch=usb:056a:0319
DeviceMatch=usb|056a|0319
Class=Bamboo
Width=4
Height=3
Expand Down
2 changes: 1 addition & 1 deletion data/bamboo-pad.tablet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
[Device]
Name=Wacom Bamboo Pad
ModelName=CTH-301
DeviceMatch=usb:056a:0318
DeviceMatch=usb|056a|0318
Class=Bamboo
Width=4
Height=3
Expand Down
2 changes: 1 addition & 1 deletion data/chuwi-minibookx.tablet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
[Device]
Name=Chuwi Minibook X
Class=ISDV4
DeviceMatch=i2c:27c6:011a
DeviceMatch=i2c|27c6|011a
Width=9
Height=6
IntegratedIn=Display;System;
Expand Down
2 changes: 1 addition & 1 deletion data/cintiq-12wx.tablet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
Name=Wacom Cintiq 12WX
ModelName=DTZ-1200W
Class=Cintiq
DeviceMatch=usb:056a:00c6
DeviceMatch=usb|056a|00c6
Width=10
Height=7
Layout=cintiq-12wx.svg
Expand Down
2 changes: 1 addition & 1 deletion data/cintiq-13hd.tablet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
Name=Wacom Cintiq 13HD
ModelName=DTK-1300
Class=Cintiq
DeviceMatch=usb:056a:0304
DeviceMatch=usb|056a|0304
Width=12
Height=7
Layout=cintiq-13hd.svg
Expand Down
6 changes: 3 additions & 3 deletions data/cintiq-13hdt.tablet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@
# *-----------------------*
#
# Note: Buttons F, G, H, I are on a circle
# touch data comes through the usb:056a:0335 interface
# touch data comes through the usb|056a|0335 interface

[Device]
Name=Wacom Cintiq 13HD touch
ModelName=DTH-1300
Class=Cintiq
DeviceMatch=usb:056a:0333
PairedID=usb:056a:0335
DeviceMatch=usb|056a|0333
PairedID=usb|056a|0335
Width=12
Height=7
Layout=cintiq-13hd.svg
Expand Down
2 changes: 1 addition & 1 deletion data/cintiq-16-2.tablet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
Name=Wacom Cintiq 16
ModelName=DTK-1660
Class=Cintiq
DeviceMatch=usb:056a:03ae
DeviceMatch=usb|056a|03ae
Width=14
Height=8
# No pad buttons, so no layout
Expand Down
2 changes: 1 addition & 1 deletion data/cintiq-16.tablet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
Name=Wacom Cintiq 16
ModelName=DTK-1660
Class=Cintiq
DeviceMatch=usb:056a:0390
DeviceMatch=usb|056a|0390
Width=14
Height=8
# No pad buttons, so no layout
Expand Down
2 changes: 1 addition & 1 deletion data/cintiq-20wsx.tablet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
[Device]
Name=Wacom Cintiq 20WSX
ModelName=DTZ-2000W
DeviceMatch=usb:056a:00c5
DeviceMatch=usb|056a|00c5
Class=Cintiq
Width=17
Height=11
Expand Down
2 changes: 1 addition & 1 deletion data/cintiq-21ux.tablet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
[Device]
Name=Wacom Cintiq 21UX
ModelName=DTZ-2100
DeviceMatch=usb:056a:003f
DeviceMatch=usb|056a|003f
Class=Cintiq
Width=17
Height=13
Expand Down
2 changes: 1 addition & 1 deletion data/cintiq-21ux2.tablet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
[Device]
Name=Wacom Cintiq 21UX2
ModelName=DTK-2100
DeviceMatch=usb:056a:00cc
DeviceMatch=usb|056a|00cc
Class=Cintiq
Width=17
Height=13
Expand Down
2 changes: 1 addition & 1 deletion data/cintiq-22.tablet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
Name=Wacom Cintiq 22
ModelName=DTK-2260
Class=Cintiq
DeviceMatch=usb:056a:0391
DeviceMatch=usb|056a|0391
Width=19
Height=10
# No pad buttons, so no layout
Expand Down
2 changes: 1 addition & 1 deletion data/cintiq-22hd.tablet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
[Device]
Name=Wacom Cintiq 22HD
ModelName=DTK-2200
DeviceMatch=usb:056a:00fa
DeviceMatch=usb|056a|00fa
Class=Cintiq
Width=19
Height=11
Expand Down
6 changes: 3 additions & 3 deletions data/cintiq-22hdt.tablet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@
# | |
# @-----------------------@
#
# Note: touch data comes through the usb:056a:005e interface
# Note: touch data comes through the usb|056a|005e interface

[Device]
Name=Wacom Cintiq 22HD touch
ModelName=DTH-2200
DeviceMatch=usb:056a:005b
PairedID=usb:056a:005e
DeviceMatch=usb|056a|005b
PairedID=usb|056a|005e
Class=Cintiq
Width=19
Height=11
Expand Down
6 changes: 3 additions & 3 deletions data/cintiq-24hd-touch.tablet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@
# | |
# *-----------------------*
#
# Note: touch data comes through the usb:056a:00f6 interface
# Note: touch data comes through the usb|056a|00f6 interface

[Device]
Name=Wacom Cintiq 24HD touch
ModelName=DTH-2400
DeviceMatch=usb:056a:00f8
PairedID=usb:056a:00f6
DeviceMatch=usb|056a|00f8
PairedID=usb|056a|00f6
Class=Cintiq
Width=21
Height=13
Expand Down
2 changes: 1 addition & 1 deletion data/cintiq-24hd.tablet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
[Device]
Name=Wacom Cintiq 24HD
ModelName=DTK-2400
DeviceMatch=usb:056a:00f4
DeviceMatch=usb|056a|00f4
Class=Cintiq
Width=21
Height=13
Expand Down
2 changes: 1 addition & 1 deletion data/cintiq-27hd.tablet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
[Device]
Name=Wacom Cintiq 27QHD
ModelName=DTK-2700
DeviceMatch=usb:056a:032a
DeviceMatch=usb|056a|032a
Class=Cintiq
Width=24
Height=12
Expand Down
6 changes: 3 additions & 3 deletions data/cintiq-27hdt.tablet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
# Cintiq 27QHD touch
# DTH-2700
#
# Note: touch data comes through the usb:056a:032c interface
# Note: touch data comes through the usb|056a|032c interface

[Device]
Name=Wacom Cintiq 27QHD touch
ModelName=DTH-2700
DeviceMatch=usb:056a:032b
PairedID=usb:056a:032c
DeviceMatch=usb|056a|032b
PairedID=usb|056a|032c
Class=Cintiq
Width=24
Height=12
Expand Down
Loading
Loading