From d19b5bc87d9e47f7bbf09b62261ac4e63e035d24 Mon Sep 17 00:00:00 2001
From: TheRogueZeta <6479694-TheRogueZeta@users.noreply.gitlab.com>
Date: Sun, 30 Aug 2020 23:44:52 -0700
Subject: [PATCH] Update Logitech Lighspeed nameing and openrgb.rule

---
 60-openrgb.rules                                | 17 +++++++++++++----
 .../LogitechControllerDetect.cpp                | 14 +++++++-------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/60-openrgb.rules b/60-openrgb.rules
index 77418e37..950f31a7 100644
--- a/60-openrgb.rules
+++ b/60-openrgb.rules
@@ -142,25 +142,34 @@ SUBSYSTEMS=="usb", ATTR{idVendor}=="0951", ATTR{idProduct}=="16be", TAG+="uacces
 #                                                               #
 #  Mice:                                                        #
 #       Logitech G203 Prodigy                                   #
+#       Logitech G203 Lightsync                                 #
 #       Logitech G403 Prodigy                                   #
 #       Logitech G403 Hero                                      #
 #       Logitech G502 Proteus Spectrum                          #
-#       Logitech G502 Lightspeed with Powerplay Mousepad        #
+#       Logitech G Lightspeed Wireless Gaming Mouse             #
+#       Logitech G Pro Wireless Gaming Mouse (Wired)            #
+#       Logitech G Powerplay Mousepad with Lightspeed           #
 #                                                               #
 #   Keyboards:                                                  #
+#       Logitech G512                                           #
 #       Logitech G512 RGB                                       #
-#       Logitech G Pro Wireless Gaming Mouse Lightspeed         #
-#       Logitech G Pro Wireless Gaming Mouse (Wired)            #
+#       Logitech G810 #1                                        #
+#       Logitech G810 #2                                        #
 #---------------------------------------------------------------#
 SUBSYSTEMS=="usb", ATTR{idVendor}=="046d", ATTR{idProduct}=="c084", TAG+="uaccess"
+SUBSYSTEMS=="usb", ATTR{idVendor}=="046d", ATTR{idProduct}=="c092", TAG+="uaccess"
 SUBSYSTEMS=="usb", ATTR{idVendor}=="046d", ATTR{idProduct}=="c083", TAG+="uaccess"
 SUBSYSTEMS=="usb", ATTR{idVendor}=="046d", ATTR{idProduct}=="c08f", TAG+="uaccess"
 SUBSYSTEMS=="usb", ATTR{idVendor}=="046d", ATTR{idProduct}=="c332", TAG+="uaccess"
-SUBSYSTEMS=="usb", ATTR{idVendor}=="046d", ATTR{idProduct}=="c33c", TAG+="uaccess"
 SUBSYSTEMS=="usb", ATTR{idVendor}=="046d", ATTR{idProduct}=="c539", TAG+="uaccess"
 SUBSYSTEMS=="usb", ATTR{idVendor}=="046d", ATTR{idProduct}=="c088", TAG+="uaccess"
 SUBSYSTEMS=="usb", ATTR{idVendor}=="046d", ATTR{idProduct}=="c53a", TAG+="uaccess"
 
+SUBSYSTEMS=="usb", ATTR{idVendor}=="046d", ATTR{idProduct}=="c342", TAG+="uaccess"
+SUBSYSTEMS=="usb", ATTR{idVendor}=="046d", ATTR{idProduct}=="c33c", TAG+="uaccess"
+SUBSYSTEMS=="usb", ATTR{idVendor}=="046d", ATTR{idProduct}=="c337", TAG+="uaccess"
+SUBSYSTEMS=="usb", ATTR{idVendor}=="046d", ATTR{idProduct}=="c331", TAG+="uaccess"
+
 #---------------------------------------------------------------#
 #  MSI Mysticlight                                              #
 #---------------------------------------------------------------#
diff --git a/Controllers/LogitechController/LogitechControllerDetect.cpp b/Controllers/LogitechController/LogitechControllerDetect.cpp
index dae3eb4a..476f1477 100644
--- a/Controllers/LogitechController/LogitechControllerDetect.cpp
+++ b/Controllers/LogitechController/LogitechControllerDetect.cpp
@@ -35,9 +35,9 @@
 #define LOGITECH_G403H_PID                      0xC08F
 #define LOGITECH_G502_PS_PID                    0xC332
 #define LOGITECH_G502H_PID                      0xC08B
-#define LOGITECH_GPRO_WIRELESS_LIGHTSPEED_PID   0xC539
+#define LOGITECH_G_LIGHTSPEED_WIRELESS_PID      0xC539
 #define LOGITECH_GPRO_WIRELESS_PID              0xC088
-#define LOGITECH_G502_LIGHTSPEED_POWERPLAY_PID  0xC53A
+#define LOGITECH_G_LIGHTSPEED_POWERPLAY_PID     0xC53A
 
 typedef struct
 {
@@ -68,9 +68,9 @@ static const logitech_device device_list[] =
     { LOGITECH_VID,             LOGITECH_G403H_PID,                     1,  DEVICE_TYPE_MOUSE,      "Logitech G403 Hero"                                },
     { LOGITECH_VID,             LOGITECH_G502_PS_PID,                   1,  DEVICE_TYPE_MOUSE,      "Logitech G502 Proteus Spectrum"                    },
     { LOGITECH_VID,             LOGITECH_G502H_PID,                     1,  DEVICE_TYPE_MOUSE,      "Logitech G502 Hero"                                },
-    { LOGITECH_VID,             LOGITECH_GPRO_WIRELESS_LIGHTSPEED_PID,  2,  DEVICE_TYPE_MOUSE,      "Logitech G Pro Wireless Gaming Mouse"              },
+    { LOGITECH_VID,             LOGITECH_G_LIGHTSPEED_WIRELESS_PID,     2,  DEVICE_TYPE_MOUSE,      "Logitech G Lightspeed Wireless Gaming Mouse"       },
     { LOGITECH_VID,             LOGITECH_GPRO_WIRELESS_PID,             2,  DEVICE_TYPE_MOUSE,      "Logitech G Pro Wireless Gaming Mouse (Wired)"      },
-    { LOGITECH_VID,             LOGITECH_G502_LIGHTSPEED_POWERPLAY_PID, 2,  DEVICE_TYPE_MOUSE,      "Logitech G502 Lightspeed With Powerplay Mousepad"  },
+    { LOGITECH_VID,             LOGITECH_G_LIGHTSPEED_POWERPLAY_PID,    2,  DEVICE_TYPE_MOUSE,      "Logitech G Powerplay Mousepad with Lightspeed"     },
     /*-------------------------------------------------------------------------------------------------------------------------------------------------*\
     | Mousemats                                                                                                                                         |
     \*-------------------------------------------------------------------------------------------------------------------------------------------------*/
@@ -227,10 +227,10 @@ void DetectLogitechControllers(std::vector<RGBController*>& rgb_controllers)
                                     rgb_controllers.push_back(rgb_controller);
                                 }
                                 break;
-                                
-                            case LOGITECH_GPRO_WIRELESS_LIGHTSPEED_PID:
+                            
                             case LOGITECH_GPRO_WIRELESS_PID:
-                            case LOGITECH_G502_LIGHTSPEED_POWERPLAY_PID:
+                            case LOGITECH_G_LIGHTSPEED_WIRELESS_PID:
+                            case LOGITECH_G_LIGHTSPEED_POWERPLAY_PID:
                                 {
                                     LogitechGProWirelessController* controller = new LogitechGProWirelessController(dev);