From 07e37c857c76154325774d56af53d94d99016cff Mon Sep 17 00:00:00 2001
From: fauxpark <fauxpark@gmail.com>
Date: Sat, 11 Jul 2020 12:37:01 +1000
Subject: [PATCH] Update rules in doctor.py

---
 docs/faq_build.md            |  4 ++--
 lib/python/qmk/cli/doctor.py | 33 ++++++++++++++++++++++++---------
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/docs/faq_build.md b/docs/faq_build.md
index 990ebe3aff..41a11bb58d 100644
--- a/docs/faq_build.md
+++ b/docs/faq_build.md
@@ -32,7 +32,7 @@ SUBSYSTEMS=="usb", ATTRS{idVendor}=="03EB", ATTRS{idProduct}=="2FF0", TAG+="uacc
 SUBSYSTEMS=="usb", ATTRS{idVendor}=="03EB", ATTRS{idProduct}=="2FF3", TAG+="uaccess", RUN{builtin}+="uaccess"
 # ATmega32U4
 SUBSYSTEMS=="usb", ATTRS{idVendor}=="03EB", ATTRS{idProduct}=="2FF4", TAG+="uaccess", RUN{builtin}+="uaccess"
-# AT90USB128
+# AT90USB64
 SUBSYSTEMS=="usb", ATTRS{idVendor}=="03EB", ATTRS{idProduct}=="2FF9", TAG+="uaccess", RUN{builtin}+="uaccess"
 # AT90USB128
 SUBSYSTEMS=="usb", ATTRS{idVendor}=="03EB", ATTRS{idProduct}=="2FFB", TAG+="uaccess", RUN{builtin}+="uaccess"
@@ -54,7 +54,7 @@ SUBSYSTEMS=="usb", ATTRS{idVendor}=="16C0", ATTRS{idProduct}=="05DC", TAG+="uacc
 # ModemManager should ignore the following devices
 # Atmel SAM-BA (Massdrop)
 SUBSYSTEMS=="usb", ATTRS{idVendor}=="03EB" ATTRS{idProduct}=="6124" TAG+="uaccess", RUN{builtin}+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
-# Caterina
+# Caterina (Pro Micro)
 SUBSYSTEMS=="usb", ATTRS{idVendor}=="2A03" TAG+="uaccess", RUN{builtin}+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
 SUBSYSTEMS=="usb", ATTRS{idVendor}=="2341" TAG+="uaccess", RUN{builtin}+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
 SUBSYSTEMS=="usb", ATTRS{idVendor}=="1B4F" TAG+="uaccess", RUN{builtin}+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
diff --git a/lib/python/qmk/cli/doctor.py b/lib/python/qmk/cli/doctor.py
index 4d7ba52181..46a2180b22 100755
--- a/lib/python/qmk/cli/doctor.py
+++ b/lib/python/qmk/cli/doctor.py
@@ -149,15 +149,30 @@ def check_udev_rules():
     ok = True
     udev_dir = Path("/etc/udev/rules.d/")
     desired_rules = {
-        'dfu': {_udev_rule("03eb", "2ff4"), _udev_rule("03eb", "2ffb"), _udev_rule("03eb", "2ff0")},
-        'input_club': {_udev_rule("1c11", "b007")},
-        'stm32': {_udev_rule("1eaf", "0003"), _udev_rule("0483", "df11")},
-        'bootloadhid': {_udev_rule("16c0", "05df")},
-        'caterina': {
-            _udev_rule("2341", "0036", 'ENV{ID_MM_DEVICE_IGNORE}="1"'),
-            _udev_rule("1b4f", "9205", 'ENV{ID_MM_DEVICE_IGNORE}="1"'),
-            _udev_rule("1b4f", "9203", 'ENV{ID_MM_DEVICE_IGNORE}="1"'),
-            _udev_rule("2a03", "0036", 'ENV{ID_MM_DEVICE_IGNORE}="1"')
+        'qmk': {
+            # Atmel DFU
+            _udev_rule("03EB", "2FEF"), # ATmega16U2
+            _udev_rule("03EB", "2FF0"), # ATmega32U2
+            _udev_rule("03EB", "2FF3"), # ATmega16U4
+            _udev_rule("03EB", "2FF4"), # ATmega32U4
+            _udev_rule("03EB", "2FF9"), # AT90USB64
+            _udev_rule("03EB", "2FFB"), # AT90USB128
+            # Kiibohd bootloader
+            _udev_rule("1C11", "B007"),
+            # STM32duino
+            _udev_rule("1EAF", "0003"),
+            # STM32 DFU
+            _udev_rule("0483", "DF11"),
+            # BootloadHID
+            _udev_rule("16C0", "05DF"),
+            # USBAspLoader
+            _udev_rule("16C0", "05DC"),
+            # Atmel SAM-Ba (Massdrop)
+            _udev_rule("03EB", "6124"),
+            # Caterina (Pro Micro)
+            _udev_rule("1B4F", None, 'ENV{ID_MM_DEVICE_IGNORE}="1"'), # Sparkfun
+            _udev_rule("2341", None, 'ENV{ID_MM_DEVICE_IGNORE}="1"'), # Arduino SA
+            _udev_rule("2A03", None, 'ENV{ID_MM_DEVICE_IGNORE}="1"')  # dog hunter AG
         }
     }