data: add ASUS TUF Gaming M3 Gen II

Signed-off-by: villamorrd <git@villamor.ph>
data: add ASUS ROG Strix Impact III Wireless
2026-11-07 15:14:38 +01:00 · 2026-09-17 20:56:39 +08:00 · 2026-08-18 20:11:11 +03:00 · 2026-08-18 20:11:11 +03:00 · 2026-08-18 20:11:11 +03:00 · 2026-08-12 18:07:56 +00:00
225 changed files with 8195 additions and 4114 deletions
--- a/.flake8
+++ b/.flake8
@@ -1,3 +0,0 @@
-[flake8]
-ignore = E402,E501
-exclude = .git,__pycache__,build,data,piper/piper.py
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -8,20 +8,24 @@ env:
    libjson-glib-dev libsystemd-dev libudev-dev libunistring-dev
    python3-dev python3-evdev swig python3-sphinx
  UBUNTU_DEP_TEST: check python3-gi python3-lxml valgrind
-  PIP_PACKAGES: meson ninja libevdev pyudev pytest sphinx_rtd_theme
+  PIP_PACKAGES: meson ninja libevdev pyudev pytest sphinx_rtd_theme black==25.12.0 ruff==0.15.12

 jobs:
  build-and-dist:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
    strategy:
      matrix:
-        meson_args:
-          - ''
-          - '-Dbuildtype=plain'
-          - '-Dbuildtype=release'
-          - '-Ddocumentation=true'
+        include:
+          - name: default
+            meson_args: ''
+          - name: plain
+            meson_args: '-Dbuildtype=plain'
+          - name: release
+            meson_args: '-Dbuildtype=release'
+          - name: documentation
+            meson_args: '-Ddocumentation=true'
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
      - uses: ./.github/actions/pkginstall
        with:
          apt: $UBUNTU_DEP_BUILD $UBUNTU_DEP_TEST
@@ -41,10 +45,10 @@ jobs:
      - name: check if any files are left after uninstall
        run: (test -d _instdir && tree _instdir && exit 1) || exit 0
      # Capture all the meson logs, even if we failed
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
        if: ${{ always() }}  # even if we fail
        with:
-          name: meson test logs
+          name: 'meson test logs ${{ matrix.name }}'
          path: |
            builddir/meson-logs/testlog*.txt
            builddir/meson-logs/meson-log.txt
--- a/.github/workflows/pages.yml
+++ b/.github/workflows/pages.yml
@@ -11,7 +11,7 @@ env:

 jobs:
  deploy:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
    steps:
      - uses: actions/checkout@v3
      - uses: ./.github/actions/pkginstall
--- a/README.md
+++ b/README.md
@@ -46,7 +46,7 @@ And to build or re-build after code-changes, run:
    ninja -C builddir
    sudo ninja -C builddir install
    
-To remove/uninstal simply run:
+To remove/uninstall simply run:

    sudo ninja -C builddir uninstall

--- a/data/devices/asus-rog-buzzard.device
+++ b/data/devices/asus-rog-buzzard.device
@@ -1,6 +1,7 @@
 [Device]
 Name=ASUS ROG GX860 Buzzard Mouse
 DeviceMatch=usb:0b05:1816
+DeviceType=mouse
 Driver=asus

 [Driver/asus]
--- a/data/devices/asus-rog-chakram-core.device
+++ b/data/devices/asus-rog-chakram-core.device
@@ -0,0 +1,14 @@
+# ASUS ROG Chakram, but corded
+[Device]
+Name=ASUS ROG Chakram Core
+DeviceMatch=usb:0b05:1958
+DeviceType=mouse
+Driver=asus
+
+[Driver/asus]
+Profiles=3
+Buttons=5
+Leds=3
+Dpis=4
+DpiRange=100:16000@100
+Quirks=DOUBLE_DPI;STRIX_PROFILE
--- a/data/devices/asus-rog-chakram-x.device
+++ b/data/devices/asus-rog-chakram-x.device
@@ -0,0 +1,16 @@
+[Device]
+Name=ASUS ROG Chakram X
+DeviceMatch=usb:0b05:1a18;usb:0b05:1a1a
+DeviceType=mouse
+Driver=asus
+
+[Driver/asus]
+Profiles=5
+Buttons=14
+Leds=3
+Dpis=4
+Wireless=1
+DpiRange=100:36000@100
+Quirks=DOUBLE_DPI;RAW_BRIGHTNESS;SEPARATE_XY_DPI;SEPARATE_LEDS;BUTTONS_SECONDARY
+ButtonMapping=f0;f1;f2;0;0;e6;e8;e9;d0;d1;d2;d3
+ButtonMappingSecondary=0;0;ea;eb;ec;ed
--- a/data/devices/asus-rog-chakram.device
+++ b/data/devices/asus-rog-chakram.device
@@ -1,6 +1,7 @@
 [Device]
 Name=ASUS ROG Chakram
 DeviceMatch=usb:0b05:18e3;usb:0b05:18e5
+DeviceType=mouse
 Driver=asus

 [Driver/asus]
--- a/data/devices/asus-rog-gladius2-origin-pink.device
+++ b/data/devices/asus-rog-gladius2-origin-pink.device
@@ -1,6 +1,7 @@
 [Device]
 Name=ASUS ROG Gladius II Origin PNK LTD
 DeviceMatch=usb:0b05:18cd
+DeviceType=mouse
 Driver=asus

 [Driver/asus]
@@ -9,5 +10,4 @@ Buttons=8
 Leds=3
 Dpis=2
 DpiRange=100:12000@100
-ButtonMapping=0;1;2;7;8;5;3;4
 Quirks=DOUBLE_DPI
--- a/data/devices/asus-rog-gladius2-origin.device
+++ b/data/devices/asus-rog-gladius2-origin.device
@@ -2,6 +2,7 @@
 [Device]
 Name=ASUS ROG Gladius II Origin
 DeviceMatch=usb:0b05:1877
+DeviceType=mouse
 Driver=asus

 [Driver/asus]
@@ -10,5 +11,4 @@ Buttons=8
 Leds=3
 Dpis=2
 DpiRange=100:12000@100
-ButtonMapping=0;1;2;7;8;5;3;4
 Quirks=DOUBLE_DPI
--- a/data/devices/asus-rog-gladius2.device
+++ b/data/devices/asus-rog-gladius2.device
@@ -1,12 +1,13 @@
 [Device]
 Name=ASUS ROG Gladius II
 DeviceMatch=usb:0b05:1845
+DeviceType=mouse
 Driver=asus

 [Driver/asus]
 Profiles=3
-Buttons=8
+Buttons=9
 Leds=3
 Dpis=2
 DpiRange=100:12000@100
-ButtonMapping=0;1;2;7;8;5;3;4
+ButtonMapping=f0;f1;f2;e4;e5;e6;e7;e8;e9
--- a/data/devices/asus-rog-harpe-wireless.device
+++ b/data/devices/asus-rog-harpe-wireless.device
@@ -0,0 +1,13 @@
+[Device]
+Name=ASUS ROG Harpe Wireless
+DeviceMatch=usb:0b05:1a92
+DeviceType=mouse
+Driver=asus
+
+[Driver/asus]
+Profiles=5
+Buttons=5
+Leds=1
+Dpis=4
+Wireless=1
+DpiRange=100:36000@50
--- a/data/devices/asus-rog-keris-wireless-aimpoint.device
+++ b/data/devices/asus-rog-keris-wireless-aimpoint.device
@@ -0,0 +1,13 @@
+[Device]
+Name=ASUS ROG Keris Wireless AimPoint
+DeviceMatch=usb:0b05:1a66;usb:0b05:1a68
+DeviceType=mouse
+Driver=asus
+
+[Driver/asus]
+Profiles=5
+Buttons=7
+Leds=1
+Dpis=4
+Wireless=1
+DpiRange=100:36000@50
--- a/data/devices/asus-rog-keris-wireless.device
+++ b/data/devices/asus-rog-keris-wireless.device
@@ -1,6 +1,7 @@
 [Device]
 Name=ASUS ROG Keris Wireless
 DeviceMatch=usb:0b05:195e;usb:0b05:1960
+DeviceType=mouse
 Driver=asus

 [Driver/asus]
--- a/data/devices/asus-rog-keris.device
+++ b/data/devices/asus-rog-keris.device
@@ -0,0 +1,13 @@
+[Device]
+Name=ASUS ROG Keris
+DeviceMatch=usb:0b05:195c
+DeviceType=mouse
+Driver=asus
+
+[Driver/asus]
+Profiles=3
+Buttons=8
+Leds=2
+Dpis=4
+DpiRange=100:16000@100
+Quirks=DOUBLE_DPI
--- a/data/devices/asus-rog-omni-receiver.device
+++ b/data/devices/asus-rog-omni-receiver.device
@@ -0,0 +1,12 @@
+[Device]
+Name=ASUS ROG Omni Receiver
+DeviceMatch=usb:0b05:1ace
+DeviceType=mouse
+Driver=asus
+
+# The Omni receiver is a shared USB device for multiple mice (all of them
+# enumerate with the same usb id), so the actual model is identified during
+# probe and resolved to the model-specific .device data. This file only
+# exists to get the asus driver probed on the receiver's hidraw nodes.
+[Driver/asus]
+Quirks=OMNI_RECEIVER
--- a/data/devices/asus-rog-pugio.device
+++ b/data/devices/asus-rog-pugio.device
@@ -1,6 +1,7 @@
 [Device]
 Name=ASUS ROG Pugio
 DeviceMatch=usb:0b05:1846
+DeviceType=mouse
 Driver=asus

 [Driver/asus]
@@ -9,6 +10,5 @@ Buttons=10
 Leds=3
 Dpis=2
 DpiRange=100:7200@100
-
-# Mappings the same as the Gladius II but with an extra 2 buttons
-ButtonMapping=0;1;2;7;8;5;3;4;9;10
+ButtonMapping=f0;f1;f2;e4;e5;e6;0;e8;e9;e1;e2
+LedModes=ON;BREATHING;ON;CYCLE
--- a/data/devices/asus-rog-spatha-x.device
+++ b/data/devices/asus-rog-spatha-x.device
@@ -0,0 +1,14 @@
+[Device]
+Name=ASUS ROG Spatha X
+DeviceMatch=usb:0b05:1979;usb:0b05:1977
+DeviceType=mouse
+Driver=asus
+
+[Driver/asus]
+Profiles=5
+Buttons=14
+Leds=3
+Dpis=4
+Wireless=1
+DpiRange=100:19000@50
+ButtonMapping=f0;f1;f2;e4;e5;e6;e8;e9;ea;eb;ec;ed;ee;ef
--- a/data/devices/asus-rog-strix-carry.device
+++ b/data/devices/asus-rog-strix-carry.device
@@ -1,6 +1,7 @@
 [Device]
 Name=ASUS ROG Strix Carry
 DeviceMatch=usb:0b05:18b4
+DeviceType=mouse
 Driver=asus

 [Driver/asus]
--- a/data/devices/asus-rog-strix-impact.device
+++ b/data/devices/asus-rog-strix-impact.device
@@ -1,10 +1,11 @@
 [Device]
 Name=ASUS ROG Strix Impact
 DeviceMatch=usb:0b05:1847
+DeviceType=mouse
 Driver=asus

 [Driver/asus]
-Profiles=0
+Profiles=1
 Buttons=6
 Leds=1
 Dpis=2
--- a/data/devices/asus-rog-strix-impact2-wireless.device
+++ b/data/devices/asus-rog-strix-impact2-wireless.device
@@ -1,6 +1,7 @@
 [Device]
 Name=ASUS ROG Strix Impact II Wireless
 DeviceMatch=usb:0b05:1947;usb:0b05:1949
+DeviceType=mouse
 Driver=asus

 [Driver/asus]
--- a/data/devices/asus-rog-strix-impact2.device
+++ b/data/devices/asus-rog-strix-impact2.device
@@ -0,0 +1,12 @@
+[Device]
+Name=ASUS ROG Strix Impact II
+DeviceMatch=usb:0b05:18e1
+DeviceType=mouse
+Driver=asus
+
+[Driver/asus]
+Profiles=3
+Buttons=8
+Leds=3
+Dpis=4
+DpiRange=200:6200@100
--- a/data/devices/asus-rog-strix-impact3-wireless.device
+++ b/data/devices/asus-rog-strix-impact3-wireless.device
@@ -0,0 +1,19 @@
+[Device]
+Name=ASUS ROG Strix Impact III Wireless
+DeviceMatch=usb:0b05:1ad7
+DeviceType=mouse
+Driver=asus
+
+# This device enumerates as usb 0b05:1ad7 behind the ASUS Omni receiver
+# (0b05:1ace). The usb id is resolved during probe: the receiver is
+# identified first (asus-rog-omni-receiver.device) and the serial number
+# signature prefix (OmniSignature) is matched against this file.
+[Driver/asus]
+Profiles=5
+Buttons=8
+Leds=1
+Dpis=4
+Wireless=1
+DpiRange=100:36000@50
+Quirks=OMNI_RECEIVER;SEPARATE_XY_DPI;LED_V2;SETTINGS_V2
+OmniSignature=20
--- a/data/devices/asus-rog-strix-impact3.device
+++ b/data/devices/asus-rog-strix-impact3.device
@@ -0,0 +1,13 @@
+[Device]
+Name=ASUS ROG Strix Impact III
+DeviceMatch=usb:0b05:1a88
+DeviceType=mouse
+Driver=asus
+
+[Driver/asus]
+Profiles=3
+Buttons=8
+Leds=2
+Dpis=4
+DpiRange=100:12000@50
+Quirks=LED_V2;SETTINGS_V2
--- a/data/devices/asus-tuf-gaming-m3-gen-ii.device
+++ b/data/devices/asus-tuf-gaming-m3-gen-ii.device
@@ -0,0 +1,12 @@
+[Device]
+Name=ASUSTeK TUF GAMING M3 GEN II
+DeviceMatch=usb:0b05:1a9b
+DeviceType=mouse
+Driver=asus
+
+[Driver/asus]
+Profiles=3
+Buttons=8
+Leds=1
+Dpis=4
+DpiRange=100:8000@100
--- a/data/devices/asus-tuf-gaming-m4-air.device
+++ b/data/devices/asus-tuf-gaming-m4-air.device
@@ -0,0 +1,12 @@
+[Device]
+Name=ASUS TUF GAMING M4 AIR
+DeviceMatch=usb:0b05:1a03
+DeviceType=mouse
+Driver=asus
+
+[Driver/asus]
+Profiles=3
+Buttons=6
+Leds=0
+Dpis=4
+DpiRange=100:16000@100
--- a/data/devices/asus-tuf-gaming-mini-wl-miku.device
+++ b/data/devices/asus-tuf-gaming-mini-wl-miku.device
@@ -0,0 +1,14 @@
+[Device]
+Name=ASUS TUF GAMING MINI WL MOUSE MIKU
+DeviceMatch=usb:0b05:1c56;usb:0b05:1c57
+DeviceType=mouse
+Driver=asus
+
+[Driver/asus]
+Profiles=5
+Buttons=8
+Leds=1
+Dpis=4
+Wireless=1
+DpiRange=100:12000@100
+Quirks=SEPARATE_XY_DPI;RAW_BRIGHTNESS
--- a/data/devices/device.example
+++ b/data/devices/device.example
@@ -15,10 +15,8 @@ DeviceMatch=usb:12ab:00f2
 # The libratbag driver backend
 Driver=hidpp10

-# The types of the LEDs, in the indexed order they appear in, separated by a
-# semicolon.
-# Allowed values: logo, side, battery, dpi
-LedTypes=logo;side
+# The type of this Device: either 'mouse', 'keyboard' or 'other'
+DeviceType=mouse

 # Only one group of driver-specific properties is permitted and it must be
 # [Driver/<drivername>]. It is a bug do have any other [Driver/foo] group in
@@ -73,8 +71,39 @@ Dpis=2
 # DPI range in format min:max@step
 DpiRange=100:16000@100

-# Button index mapping
-# ButtonMapping=0;1;2;6;7;5;3;4
+# Button mapping
+# ButtonMapping=f0;f1;f2;e4;e5;e6;e8;e9

 # Device quirks
 # Quirk=DOUBLE_DPI;STRIX_PROFILE
+
+# Replace `FEED` in the group name with firmware version of the device.
+# To find the right value, see the output of ratbagd and search a message like:
+# "ratbag error: Device with firmware version FEED is not supported"
+# Official software utility configuration file key: `PSD` (converted from
+# ASCII codes).
+[Driver/sinowealth/devices/FEED]
+# Number of buttons.
+# Official software utility configuration file key: `KM` (divided by 2).
+# Default: 0.
+Buttons=6
+
+# Device name.
+DeviceName=CoolVendor CoolMouse
+
+# The order of LED pins on the mouse.
+# Change this to `RBG` if LED colors are weird.
+# Use `None` if there are no LEDs on the mouse.
+# Permitted values: ("RGB", "RBG", "None").
+LedType=RGB
+
+# Number of profiles, called "modes" in official software utilities.
+# If you are unsure what the "mode" thing is about, don't set this field.
+# Official software utility configuration file key: `MDNUM` (divided by 3).
+# Default: 1.
+Profiles=1
+
+# Sensor type.
+# This field is unused, only used for book-keeping purposes.
+# Official software utility configuration file key: `Sensor`.
+SensorType=PMW3289
--- a/data/devices/etekcity-scroll-alpha.device
+++ b/data/devices/etekcity-scroll-alpha.device
@@ -2,3 +2,4 @@
 Name=Etekcity Scroll Alpha
 DeviceMatch=usb:1ea7:4011
 Driver=etekcity
+DeviceType=mouse
--- a/data/devices/glorious-model-d.device
+++ b/data/devices/glorious-model-d.device
@@ -1,11 +1,11 @@
 [Device]
 Name=Glorious Model D
 DeviceMatch=usb:258a:0033
+DeviceType=mouse
 Driver=sinowealth

-[Driver/sinowealth/devices/GloriousModelD]
-ButtonCount=6
+[Driver/sinowealth/devices/V102]
+Buttons=6
 DeviceName=Glorious Model D
-FwVersion=V102
 LedType=RBG
 SensorType=PMW3360
--- a/data/devices/glorious-model-o-eternal.device
+++ b/data/devices/glorious-model-o-eternal.device
@@ -0,0 +1,11 @@
+[Device]
+Name=Glorious Model O Eternal
+DeviceMatch=usb:3794:a000
+Driver=sinowealth
+DeviceType=mouse
+
+[Driver/sinowealth/devices/1009]
+Buttons=6
+LedType=RBG
+DeviceName=Glorious Model O Eternal
+SensorType=PMW3360
--- a/data/devices/glorious-model-o.device
+++ b/data/devices/glorious-model-o.device
@@ -1,11 +1,11 @@
 [Device]
 Name=Glorious Model O/O-
 DeviceMatch=usb:258a:0036
+DeviceType=mouse
 Driver=sinowealth

-[Driver/sinowealth/devices/GloriousModelO]
-ButtonCount=6
+[Driver/sinowealth/devices/V103]
+Buttons=6
 DeviceName=Glorious Model O/O- (updated firmware)
-FwVersion=V103
 LedType=RBG
 SensorType=PMW3360
--- a/data/devices/gskill-MX-780.device
+++ b/data/devices/gskill-MX-780.device
@@ -3,3 +3,4 @@
 Name=G.Skill MX-780
 DeviceMatch=usb:28da:3101
 Driver=gskill
+DeviceType=mouse
--- a/data/devices/logitech-M325.device
+++ b/data/devices/logitech-M325.device
@@ -3,3 +3,4 @@
 Name=Logitech M325
 DeviceMatch=usb:046d:400a
 Driver=hidpp20
+DeviceType=mouse
--- a/data/devices/logitech-M500s.device
+++ b/data/devices/logitech-M500s.device
@@ -2,4 +2,5 @@
 [Device]
 Name=Logitech M500s
 DeviceMatch=usb:046d:c093
+DeviceType=mouse
 Driver=hidpp20
--- a/data/devices/logitech-M545.device
+++ b/data/devices/logitech-M545.device
@@ -2,4 +2,5 @@
 [Device]
 Name=Logitech M545
 DeviceMatch=usb:046d:4052
+DeviceType=mouse
 Driver=hidpp20
--- a/data/devices/logitech-M570.device
+++ b/data/devices/logitech-M570.device
@@ -3,3 +3,4 @@
 Name=Logitech M570
 DeviceMatch=usb:046d:1028
 Driver=hidpp10
+DeviceType=mouse
--- a/data/devices/logitech-M585-M590.device
+++ b/data/devices/logitech-M585-M590.device
@@ -3,3 +3,4 @@
 Name=Logitech M585/M590
 DeviceMatch=usb:046d:406b;bluetooth:046d:b01b
 Driver=hidpp20
+DeviceType=mouse
--- a/data/devices/logitech-M705.device
+++ b/data/devices/logitech-M705.device
@@ -3,3 +3,4 @@
 Name=Logitech M705
 DeviceMatch=usb:046d:101b
 Driver=hidpp10
+DeviceType=mouse
--- a/data/devices/logitech-M720.device
+++ b/data/devices/logitech-M720.device
@@ -2,3 +2,4 @@
 Name=Logitech M720
 DeviceMatch=usb:046d:405e;bluetooth:046d:b015
 Driver=hidpp20
+DeviceType=mouse
--- a/data/devices/logitech-MX-Anywhere-3.device
+++ b/data/devices/logitech-MX-Anywhere-3.device
@@ -2,4 +2,5 @@
 [Device]
 Name=Logitech MX Anywhere 3
 DeviceMatch=bluetooth:046d:b025;usb:046d:4090
+DeviceType=mouse
 Driver=hidpp20
--- a/data/devices/logitech-MX-Anywhere-3S.device
+++ b/data/devices/logitech-MX-Anywhere-3S.device
@@ -0,0 +1,6 @@
+# Logitech MX Anywhere 3S
+[Device]
+Name=Logitech MX Anywhere 3S
+DeviceMatch=bluetooth:046d:b037
+DeviceType=mouse
+Driver=hidpp20
--- a/data/devices/logitech-MX-Anywhere2.device
+++ b/data/devices/logitech-MX-Anywhere2.device
@@ -2,3 +2,4 @@
 Name=Logitech MX Anywhere 2
 DeviceMatch=usb:046d:404a;usb:046d:4072;usb:046d:4063;bluetooth:046d:b013;bluetooth:046d:b018;bluetooth:046d:b01f
 Driver=hidpp20
+DeviceType=mouse
--- a/data/devices/logitech-MX-Anywhere2S.device
+++ b/data/devices/logitech-MX-Anywhere2S.device
@@ -2,3 +2,4 @@
 Name=Logitech MX Anywhere 2S
 DeviceMatch=bluetooth:046d:b01a;usb:046d:406a
 Driver=hidpp20
+DeviceType=mouse
--- a/data/devices/logitech-MX-Anywhere3B.device
+++ b/data/devices/logitech-MX-Anywhere3B.device
@@ -1,4 +1,6 @@
 # Logitech MX Anywhere 3B
 [Device]
+Driver=hidpp20
 Name=Logitech MX Anywhere 3B
-DeviceMatch=bluetooth:046d:b02d
+DeviceType=mouse
+DeviceMatch=bluetooth:046d:b02d
--- a/data/devices/logitech-MX-Ergo.device
+++ b/data/devices/logitech-MX-Ergo.device
@@ -3,3 +3,4 @@
 Name=Logitech MX Ergo
 DeviceMatch=bluetooth:046d:b01d;usb:046d:406f
 Driver=hidpp20
+DeviceType=mouse
--- a/data/devices/logitech-MX-Master-2S.device
+++ b/data/devices/logitech-MX-Master-2S.device
@@ -3,3 +3,4 @@
 Name=Logitech MX Master 2S
 DeviceMatch=bluetooth:046d:b019;usb:046d:4069
 Driver=hidpp20
+DeviceType=mouse
--- a/data/devices/logitech-MX-Master-3.device
+++ b/data/devices/logitech-MX-Master-3.device
@@ -3,3 +3,4 @@
 Name=Logitech MX Master 3
 DeviceMatch=bluetooth:046d:b023;usb:046d:4082
 Driver=hidpp20
+DeviceType=mouse
--- a/data/devices/logitech-MX-Master-3S-for-Business.device
+++ b/data/devices/logitech-MX-Master-3S-for-Business.device
@@ -0,0 +1,5 @@
+[Device]
+DeviceMatch=bluetooth:046d:b035
+DeviceType=mouse
+Driver=hidpp20
+Name=Logitech MX Master 3S for Business
--- a/data/devices/logitech-MX-Master-3S.device
+++ b/data/devices/logitech-MX-Master-3S.device
@@ -0,0 +1,5 @@
+[Device]
+DeviceMatch=bluetooth:046d:b034
+DeviceType=mouse
+Driver=hidpp20
+Name=Logitech MX Master 3S
--- a/data/devices/logitech-MX-Master-4.device
+++ b/data/devices/logitech-MX-Master-4.device
@@ -0,0 +1,5 @@
+[Device]
+DeviceMatch=bluetooth:046d:b042
+DeviceType=mouse
+Driver=hidpp20
+Name=Logitech MX Master 4
--- a/data/devices/logitech-MX-Master.device
+++ b/data/devices/logitech-MX-Master.device
@@ -3,3 +3,4 @@
 Name=Logitech MX Master
 DeviceMatch=usb:046d:4041;bluetooth:046d:b012;usb:046d:4060;bluetooth:046d:b017;bluetooth:046d:b01e;usb:046d:4071
 Driver=hidpp20
+DeviceType=mouse
--- a/data/devices/logitech-MX-Vertical.device
+++ b/data/devices/logitech-MX-Vertical.device
@@ -1,4 +1,5 @@
 [Device]
 Name=Logitech MX Vertical
-DeviceMatch=bluetooth:046d:b020;usb:046d:407b;usb:046d:c08a
+DeviceMatch=bluetooth:046d:b020;usb:046d:407b;usb:046d:c08a;usb:046d:c077
 Driver=hidpp20
+DeviceType=mouse
--- a/data/devices/logitech-MX518.device
+++ b/data/devices/logitech-MX518.device
@@ -2,3 +2,4 @@
 Name=MX518
 DeviceMatch=usb:046d:c08e
 Driver=hidpp20
+DeviceType=mouse
--- a/data/devices/logitech-Marathon-M705.device
+++ b/data/devices/logitech-Marathon-M705.device
@@ -2,3 +2,4 @@
 Name=Logitech Marathon M705
 DeviceMatch=usb:046d:406d
 Driver=hidpp20
+DeviceType=mouse
--- a/data/devices/logitech-T650.device
+++ b/data/devices/logitech-T650.device
@@ -3,3 +3,4 @@
 Name=Logitech T650
 DeviceMatch=usb:046d:4101
 Driver=hidpp20
+DeviceType=mouse
--- a/data/devices/logitech-Wireless-Touchpad.device
+++ b/data/devices/logitech-Wireless-Touchpad.device
@@ -3,3 +3,4 @@
 Name=Logitech Wireless Touchpad
 DeviceMatch=usb:046d:4011
 Driver=hidpp20
+DeviceType=mouse
--- a/data/devices/logitech-g-powerplay.device
+++ b/data/devices/logitech-g-powerplay.device
@@ -1,8 +1,8 @@
 [Device]
 Name=Logitech G Powerplay
 DeviceMatch=usb:046d:405f
-LedTypes=logo
 Driver=hidpp20
+DeviceType=other

 [Driver/hidpp20]
 DeviceIndex=7
--- a/data/devices/logitech-g-pro-keyboard.device
+++ b/data/devices/logitech-g-pro-keyboard.device
@@ -0,0 +1,5 @@
+[Device]
+DeviceMatch=usb:046d:c339
+DeviceType=keyboard
+Driver=hidpp20
+Name=Logitech G PRO Keyboard
--- a/data/devices/logitech-g-pro-wireless.device
+++ b/data/devices/logitech-g-pro-wireless.device
@@ -1,8 +1,8 @@
 [Device]
 Name=Logitech G Pro Wireless
 DeviceMatch=usb:046d:4079;usb:046d:c088
-LedTypes=logo;battery;dpi;
 Driver=hidpp20
+DeviceType=mouse

 [Driver/hidpp20]
 DeviceIndex=1
--- a/data/devices/logitech-g-pro-x-wireless-superlight.device
+++ b/data/devices/logitech-g-pro-x-wireless-superlight.device
@@ -1,5 +1,5 @@
 [Device]
 Name=Logitech G Pro X Wireless Superlight
 DeviceMatch=usb:046d:4093;usb:046d:c094
-LedTypes=logo;battery;dpi;
+DeviceType=mouse
 Driver=hidpp20
--- a/data/devices/logitech-g-pro.device
+++ b/data/devices/logitech-g-pro.device
@@ -2,4 +2,4 @@
 Name=Logitech Gaming Mouse G Pro
 DeviceMatch=usb:046d:c085;usb:046d:c08c
 Driver=hidpp20
-LedTypes=logo;side
+DeviceType=mouse
--- a/data/devices/logitech-g102-g203.device
+++ b/data/devices/logitech-g102-g203.device
@@ -1,6 +1,6 @@
 # G102, G103 and G203 (USB)
 [Device]
 Name=Logitech Gaming Mouse G102/G103/G203
-DeviceMatch=usb:046d:c084;usb:046d:c092
+DeviceMatch=usb:046d:c084;usb:046d:c092;usb:046d:c09d
 Driver=hidpp20
-LedTypes=logo;side;
+DeviceType=mouse
--- a/data/devices/logitech-g300.device
+++ b/data/devices/logitech-g300.device
@@ -3,3 +3,4 @@
 Name=Logitech G300
 DeviceMatch=usb:046d:c246
 Driver=logitech_g300
+DeviceType=mouse
--- a/data/devices/logitech-g302.device
+++ b/data/devices/logitech-g302.device
@@ -3,4 +3,4 @@
 Name=Logitech Gaming Mouse G302
 DeviceMatch=usb:046d:c07f
 Driver=hidpp20
-LedTypes=logo;side;
+DeviceType=mouse
--- a/data/devices/logitech-g303-shroud.device
+++ b/data/devices/logitech-g303-shroud.device
@@ -0,0 +1,5 @@
+[Device]
+Name=Logitech G303 Shroud Edition
+DeviceMatch=usb:046d:c097
+DeviceType=mouse
+Driver=hidpp20
--- a/data/devices/logitech-g303.device
+++ b/data/devices/logitech-g303.device
@@ -3,4 +3,4 @@
 Name=Logitech Gaming Mouse G303
 DeviceMatch=usb:046d:c080
 Driver=hidpp20
-LedTypes=logo;side;
+DeviceType=mouse
--- a/data/devices/logitech-g305.device
+++ b/data/devices/logitech-g305.device
@@ -2,6 +2,7 @@
 Name=Logitech Gaming Mouse G305
 DeviceMatch=usb:046d:4074
 Driver=hidpp20
+DeviceType=mouse

 [Driver/hidpp20]
 Leds=0
--- a/data/devices/logitech-g402.device
+++ b/data/devices/logitech-g402.device
@@ -2,5 +2,5 @@
 [Device]
 Name=Logitech G402 Gaming Mouse
 DeviceMatch=usb:046d:c07e
-LedTypes=logo
 Driver=hidpp20
+DeviceType=mouse
--- a/data/devices/logitech-g403-hero.device
+++ b/data/devices/logitech-g403-hero.device
@@ -2,3 +2,4 @@
 Name=Logitech G403 Hero
 DeviceMatch=usb:046d:c08f
 Driver=hidpp20
+DeviceType=mouse
--- a/data/devices/logitech-g403-wireless.device
+++ b/data/devices/logitech-g403-wireless.device
@@ -2,3 +2,4 @@
 Name=Logitech G403 Wireless
 DeviceMatch=usb:046d:405d;usb:046d:c082
 Driver=hidpp20
+DeviceType=mouse
--- a/data/devices/logitech-g403.device
+++ b/data/devices/logitech-g403.device
@@ -2,3 +2,4 @@
 Name=Logitech G403
 DeviceMatch=usb:046d:c083
 Driver=hidpp20
+DeviceType=mouse
--- a/data/devices/logitech-g413.device
+++ b/data/devices/logitech-g413.device
@@ -0,0 +1,5 @@
+[Device]
+DeviceMatch=usb:046d:c33a
+DeviceType=keyboard
+Driver=hidpp20
+Name=Logitech G413
--- a/data/devices/logitech-g5-2007.device
+++ b/data/devices/logitech-g5-2007.device
@@ -3,6 +3,7 @@
 Name=Logitech G5
 DeviceMatch=usb:046d:c049
 Driver=hidpp10
+DeviceType=mouse

 [Driver/hidpp10]
 DpiList=400;800;1600;2000
--- a/data/devices/logitech-g5.device
+++ b/data/devices/logitech-g5.device
@@ -2,6 +2,7 @@
 Name=G5
 DeviceMatch=usb:046d:c041
 Driver=hidpp10
+DeviceType=mouse

 [Driver/hidpp10]
 DpiList=400;800;1600;2000
--- a/data/devices/logitech-g500.device
+++ b/data/devices/logitech-g500.device
@@ -2,6 +2,7 @@
 Name=Logitech G500
 DeviceMatch=usb:046d:c068
 Driver=hidpp10
+DeviceType=mouse

 [Driver/hidpp10]
 DpiRange=0:5700@23.53
--- a/data/devices/logitech-g500s.device
+++ b/data/devices/logitech-g500s.device
@@ -2,6 +2,7 @@
 Name=Logitech G500s
 DeviceMatch=usb:046d:c24e
 Driver=hidpp10
+DeviceType=mouse

 [Driver/hidpp10]
 DpiRange=0:8200@50
--- a/data/devices/logitech-g502-hero-wireless.device
+++ b/data/devices/logitech-g502-hero-wireless.device
@@ -2,3 +2,7 @@
 Name=Logitech G502 Hero Wireless
 DeviceMatch=usb:046d:407f;usb:046d:c08d
 Driver=hidpp20
+DeviceType=mouse
+
+[Driver/hidpp20]
+Quirk=INDEX_OFFSET
--- a/data/devices/logitech-g502-hero.device
+++ b/data/devices/logitech-g502-hero.device
@@ -2,3 +2,7 @@
 Name=Logitech G502 Hero
 DeviceMatch=usb:046d:c08b
 Driver=hidpp20
+DeviceType=mouse
+
+[Driver/hidpp20]
+Quirk=INDEX_OFFSET
--- a/data/devices/logitech-g502-proteus-core.device
+++ b/data/devices/logitech-g502-proteus-core.device
@@ -2,3 +2,4 @@
 Name=Logitech G502 Proteus Core
 DeviceMatch=usb:046d:c07d
 Driver=hidpp20
+DeviceType=mouse
--- a/data/devices/logitech-g502-proteus-spectrum.device
+++ b/data/devices/logitech-g502-proteus-spectrum.device
@@ -2,3 +2,7 @@
 Name=Logitech G502 Proteus Spectrum
 DeviceMatch=usb:046d:c332
 Driver=hidpp20
+DeviceType=mouse
+
+[Driver/hidpp20]
+Quirk=INDEX_OFFSET
--- a/data/devices/logitech-g502-x-plus.device
+++ b/data/devices/logitech-g502-x-plus.device
@@ -0,0 +1,9 @@
+[Device]
+Name=Logitech G502 X PLUS
+DeviceMatch=usb:046d:4099;usb:046d:c095
+DeviceType=mouse
+Driver=hidpp20
+
+[Driver/hidpp20]
+# G502X_PLUS: LED is in the 2nd slot. INDEX_OFFSET: profile index is 1-indexed.
+Quirk=G502X_PLUS;INDEX_OFFSET
--- a/data/devices/logitech-g502-x-wireless.device
+++ b/data/devices/logitech-g502-x-wireless.device
@@ -1,4 +1,8 @@
 [Device]
 Name=Logitech G502 X Wireless
-DeviceMatch=usb:046d:c098
+DeviceMatch=usb:046d:c098;usb:046d:409f
+DeviceType=mouse
 Driver=hidpp20
+
+[Driver/hidpp20]
+Quirk=INDEX_OFFSET
--- a/data/devices/logitech-g502-x.device
+++ b/data/devices/logitech-g502-x.device
@@ -1,4 +1,8 @@
 [Device]
 Name=Logitech G502 X
 DeviceMatch=usb:046d:c099
+DeviceType=mouse
 Driver=hidpp20
+
+[Driver/hidpp20]
+Quirk=INDEX_OFFSET
--- a/data/devices/logitech-g513.device
+++ b/data/devices/logitech-g513.device
@@ -1,5 +1,5 @@
 [Device]
 Name=Logitech G513
 DeviceMatch=usb:046d:c33c
-LedTypes=switches
 Driver=hidpp20
+DeviceType=keyboard
--- a/data/devices/logitech-g600.device
+++ b/data/devices/logitech-g600.device
@@ -3,3 +3,4 @@
 Name=Logitech G600
 DeviceMatch=usb:046d:c24a
 Driver=logitech_g600
+DeviceType=mouse
--- a/data/devices/logitech-g602.device
+++ b/data/devices/logitech-g602.device
@@ -3,6 +3,7 @@
 Name=Logitech G602
 DeviceMatch=usb:046d:402c
 Driver=hidpp20
+DeviceType=mouse

 [Driver/hidpp20]
 DeviceIndex=1
--- a/data/devices/logitech-g603.device
+++ b/data/devices/logitech-g603.device
@@ -3,3 +3,4 @@
 Name=Logitech G603
 DeviceMatch=usb:046d:406c;bluetooth:046d:b01c
 Driver=hidpp20
+DeviceType=mouse
--- a/data/devices/logitech-g604.device
+++ b/data/devices/logitech-g604.device
@@ -2,3 +2,7 @@
 Name=Logitech G604
 DeviceMatch=usb:046d:4085;bluetooth:046d:b024
 Driver=hidpp20
+DeviceType=mouse
+
+[Driver/hidpp20]
+Quirk=INDEX_OFFSET
--- a/data/devices/logitech-g635.device
+++ b/data/devices/logitech-g635.device
@@ -1,7 +1,7 @@
 [Device]
 Name=Logitech G635
 DeviceMatch=usb:046d:0a89
-LedTypes=logo;side
+DeviceType=mouse
 Driver=hidpp20

 [Driver/hidpp20]
--- a/data/devices/logitech-g7.device
+++ b/data/devices/logitech-g7.device
@@ -4,6 +4,7 @@
 Name=Logitech G7
 DeviceMatch=usb:046d:c51a
 Driver=hidpp10
+DeviceType=mouse

 [Driver/hidpp10]
 Profiles=1
--- a/data/devices/logitech-g700-wireless.device
+++ b/data/devices/logitech-g700-wireless.device
@@ -4,6 +4,7 @@
 Name=Logitech G700
 DeviceMatch=usb:046d:c531
 Driver=hidpp10
+DeviceType=mouse

 [Driver/hidpp10]
 DpiRange=0:5700@23.53
--- a/data/devices/logitech-g700.device
+++ b/data/devices/logitech-g700.device
@@ -4,6 +4,7 @@
 Name=Logitech G700
 DeviceMatch=usb:046d:c06b
 Driver=hidpp10
+DeviceType=mouse

 [Driver/hidpp10]
 DpiRange=0:5700@23.53
--- a/data/devices/logitech-g700s.device
+++ b/data/devices/logitech-g700s.device
@@ -4,6 +4,7 @@
 Name=Logitech G700s
 DeviceMatch=usb:046d:c07c
 Driver=hidpp10
+DeviceType=mouse

 [Driver/hidpp10]
 DpiRange=0:8200@50
--- a/data/devices/logitech-g703-hero.device
+++ b/data/devices/logitech-g703-hero.device
@@ -2,4 +2,4 @@
 Name=Logitech G703 Hero
 DeviceMatch=usb:046d:4086;usb:046d:c090
 Driver=hidpp20
-
+DeviceType=mouse
--- a/data/devices/logitech-g703.device
+++ b/data/devices/logitech-g703.device
@@ -2,4 +2,4 @@
 Name=Logitech G703
 DeviceMatch=usb:046d:c087;usb:046d:4070
 Driver=hidpp20
-
+DeviceType=mouse
--- a/data/devices/logitech-g705.device
+++ b/data/devices/logitech-g705.device
@@ -0,0 +1,8 @@
+[Device]
+Name=Logitech G705
+DeviceMatch=usb:046d:c096;usb:046d:409d;bluetooth:046d:b02e
+Driver=hidpp20
+DeviceType=mouse
+
+[Driver/hidpp20]
+Quirk=G502X_PLUS
--- a/data/devices/logitech-g733.device
+++ b/data/devices/logitech-g733.device
@@ -1,6 +1,7 @@
 [Device]
 Name=Logitech G733 Gaming Headset
-DeviceMatch=usb:046d:0ab5
+DeviceMatch=usb:046d:0ab5;usb:046d:0afe
+DeviceType=mouse
 Driver=hidpp20

 [Driver/hidpp20]
--- a/data/devices/logitech-g815.device
+++ b/data/devices/logitech-g815.device
@@ -1,5 +1,5 @@
 [Device]
 Name=Logitech G815
 DeviceMatch=usb:046d:c33f
-LedTypes=logo;switches
 Driver=hidpp20
+DeviceType=keyboard
--- a/data/devices/logitech-g9.device
+++ b/data/devices/logitech-g9.device
@@ -3,8 +3,8 @@
 [Device]
 Name=Logitech G9
 DeviceMatch=usb:046d:c048
-LedTypes=dpi
 Driver=hidpp10
+DeviceType=mouse

 [Driver/hidpp10]
 DpiList=200;400;600;800;1000;1200;1400;1600;1800;2000;2200;2400;2600;2800;3000;3200
--- a/Show More
+++ b/Show More