X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=hwdb%2F70-mouse.hwdb;h=e16cf538bd02fafe7542ae8b012295c09ace120c;hp=50ae7545c338643b4697593205ae5cfd4f166d7d;hb=6a057a99854268afe19738022205416bd5a0f4b5;hpb=40dba7022a2affe42a774a73828475a488cca751

diff --git a/hwdb/70-mouse.hwdb b/hwdb/70-mouse.hwdb
index 50ae7545c..e16cf538b 100644
--- a/hwdb/70-mouse.hwdb
+++ b/hwdb/70-mouse.hwdb
@@ -40,7 +40,7 @@
 #   or, if the frequency is known:
 #   MOUSE_DPI=800@120
 # - a space-separated list of resolutions for multi-resolution mice.
-#   The default resolution must be prefixed by an asterisk, the resultions
+#   The default resolution must be prefixed by an asterisk, the resolutions
 #   in the database must be as shipped by the manufacturer. e.g.
 #   MOUSE_DPI=400 *800 2000
 #
@@ -77,6 +77,10 @@
 #   udevadm info /dev/input/eventXX
 # (or /dev/input/event*).
 
+#
+# Sort by by brand, type (usb, bluetooth), DPI, frequency.
+# For mice with switchable resolution, sort by the starred entry.
+
 ##########################################
 # Dell
 ##########################################
@@ -89,6 +93,10 @@ mouse:usb:v046dpc063:name:DELL DELL USB Laser Mouse:
 # Lenovo
 ##########################################
 
+# Lenovo Optical USB Mouse
+mouse:usb:v046dpc016:name:Logitech Optical USB Mouse:
+ MOUSE_DPI=600@125
+
 # Lenovo Optical USB Mouse
 mouse:usb:v17efp6019:name:Lenovo Optical USB Mouse:
  MOUSE_DPI=1000@125
@@ -106,64 +114,85 @@ mouse:usb:v17efp6044:name:ThinkPad USB Laser Mouse:
 # model name. The usb vid/pid is the same for all those devices.
 # Until 3.19 is available, this list just has the Wireless PID entry.
 
-# Logitech B605 Wireless Mouse (also M505)
-mouse:usb:v046dpc52b:name:Logitech Unifying Device. Wireless PID:101d:
- MOUSE_DPI=900@166
+# Logitech M-BJ58 Optical Mouse
+mouse:usb:v046dpc00e:name:Logitech USB-PS/2 Optical Mouse:
+# Logitech MX310 Optical Mouse
+mouse:usb:v046dpc01b:name:Logitech USB-PS/2 Optical Mouse:
+# Logitech USB-PS/2 M-BT58
+mouse:usb:v046dpc03e:name:Logitech USB-PS/2 Optical Mouse:
+ MOUSE_DPI=400@125
+
+# Logitech USB-PS/2 M-BZ96C
+mouse:usb:v046dpc045:name:Logitech USB-PS/2 Optical Mouse:
+ MOUSE_DPI=600@125
 
+# Logitech Wirless Mouse M325
+mouse:usb:v046dpc52b:name:Logitech Unifying Device. Wireless PID:400a:
+ MOUSE_DPI=600@166
+
+# Logitech MX1000 Laser Cordless Mouse
+mouse:usb:v046dpc50e:name:Logitech USB RECEIVER:
 # Logitech Cordless Click! Plus
 mouse:usb:v046dpc50e:name:Logitech USB Receiver:
  MOUSE_DPI=800@125
 
+# Logitech MX 518
+mouse:usb:v046dpc01e:name:Logitech USB-PS/2 Optical Mouse:
+ MOUSE_DPI=400@125 *800@125 1600@125
+
+# Logitech G400s (Wired)
+mouse:usb:v046dpc24c:name:Logitech G400s Optical Gaming Mouse:
+ MOUSE_DPI=400@1000 *800@1000 2000@1000 4000@1000
+
+# Logitech Wireless Mouse M185
+mouse:usb:v046dpc52b:name:Logitech Unifying Device. Wireless PID:4008:
+# Logitech M705 (marathon mouse)
+mouse:usb:v046dpc52b:name:Logitech Unifying Device. Wireless PID:101b:
+ MOUSE_DPI=800@166
+
 # Logitech G500s Laser Gaming Mouse
 mouse:usb:v046dpc24e:name:Logitech G500s Laser Gaming Mouse:
  MOUSE_DPI=400@500 *800@500 2000@500
 
+# Logitech B605 Wireless Mouse (also M505)
+mouse:usb:v046dpc52b:name:Logitech Unifying Device. Wireless PID:101d:
+ MOUSE_DPI=900@166
+
+# Logitech RX1000 Laser Mouse
+mouse:usb:v046dpc046:name:Logitech USB Optical Mouse:
+# Logitech M100 Optical Mouse
+mouse:usb:v046dpc05a:name:Logitech USB Optical Mouse:
+ MOUSE_DPI=1000@125
+
 # Logitech G700 Laser Mouse (Wired)
 mouse:usb:v046dpc06b:name:Logitech G700 Laser Mouse:
 # Logitech G700 Laser Mouse (Wireless)
 mouse:usb:v046dpc531:name:Logitech USB Receiver:
  MOUSE_DPI=*1000@500 3800@500 500@1000 1500@1000 2000@1000
 
-# Logitech Wireless Mouse M185
-mouse:usb:v046dpc52b:name:Logitech Unifying Device. Wireless PID:4008:
- MOUSE_DPI=800@166
-
-# Logitech M705 (marathon mouse)
-mouse:usb:v046dpc52b:name:Logitech Unifying Device. Wireless PID:101b:
- MOUSE_DPI=800@166
-
-# Logitech ZoneTouch Mouse T400
-mouse:usb:v046dpc52b:name:Logitech Unifying Device. Wireless PID:4026:
- MOUSE_DPI=1300@166
-
 # Logitech T620 (or, the soap)
 mouse:usb:v046dpc52b:name:Logitech Unifying Device. Wireless PID:4027:
  MOUSE_DPI=1200@250
 
-# Logitech Wirless Mouse M325
-mouse:usb:v046dpc52b:name:Logitech Unifying Device. Wireless PID:400a:
- MOUSE_DPI=600@166
+# Logitech ZoneTouch Mouse T400
+mouse:usb:v046dpc52b:name:Logitech Unifying Device. Wireless PID:4026:
+ MOUSE_DPI=1300@166
 
 # Logitech Ultrathin Touch Mouse
 mouse:bluetooth:v046dpb00d:name:Ultrathin Touch Mouse:
  MOUSE_DPI=1000@1000
 
-# Logitech USB Optical Mouse
-mouse:usb:v046dpc05a:name:Logitech USB Optical Mouse:
- MOUSE_DPI=1000@125
-
-# Logitech USB-PS/2 M-BZ96C
-mouse:usb:v046dpc045:name:Logitech USB-PS/2 Optical Mouse:
- MOUSE_DPI=600@125
-
-# Logitech USB-PS/2 M-BT58
-mouse:usb:v046dpc03e:name:Logitech USB-PS/2 Optical Mouse:
- MOUSE_DPI=400@125
-
 ##########################################
 # Microsoft
 ##########################################
 
+# Note: unsure that these work, it's likely that all devices on these
+# receivers show up with the same vid/pid/name
+
+# Microsoft Sculpt Ergonomic Mouse
+mouse:usb:v045ep07a5:name:Microsoft Microsoft® 2.4GHz Transceiver v9.0:
+ MOUSE_DPI=1000@142
+
 # Microsoft Arc Touch Mouse USB
 mouse:usb:v045ep07b1:name:Microsoft Microsoft® Nano Transceiver v1.0:
  MOUSE_DPI=1400@142