diff --git a/60-openrgb.rules b/60-openrgb.rules index c1267a75..ce671d3a 100644 --- a/60-openrgb.rules +++ b/60-openrgb.rules @@ -133,6 +133,51 @@ SUBSYSTEMS=="usb", ATTR{idVendor}=="046d", ATTR{idProduct}=="c084", TAG+="uacces SUBSYSTEMS=="usb", ATTR{idVendor}=="046d", ATTR{idProduct}=="c083", TAG+="uaccess" SUBSYSTEMS=="usb", ATTR{idVendor}=="046d", ATTR{idProduct}=="c08f", TAG+="uaccess" +#---------------------------------------------------------------# +# MSI Mysticlight # +#---------------------------------------------------------------# +SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="3EA4", TAG+="uaccess" +SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="4559", TAG+="uaccess" +SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7B10", TAG+="uaccess" +SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7B93", TAG+="uaccess" +SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7B94", TAG+="uaccess" +SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7B96", TAG+="uaccess" +SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7C34", TAG+="uaccess" +SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7C35", TAG+="uaccess" +SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7C36", TAG+="uaccess" +SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7C37", TAG+="uaccess" +SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7C42", TAG+="uaccess" +SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7C56", TAG+="uaccess" +SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7C59", TAG+="uaccess" +SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7C60", TAG+="uaccess" +SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7C67", TAG+="uaccess" +SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7C70", TAG+="uaccess" +SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7C71", TAG+="uaccess" +SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7C73", TAG+="uaccess" +SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7C75", TAG+="uaccess" +SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7C76", TAG+="uaccess" +SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7C77", TAG+="uaccess" +SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7C79", TAG+="uaccess" +SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7C80", TAG+="uaccess" +SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7C81", TAG+="uaccess" +SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7C82", TAG+="uaccess" +SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7C83", TAG+="uaccess" +SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7C84", TAG+="uaccess" +SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7C85", TAG+="uaccess" +SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7C86", TAG+="uaccess" +SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7C87", TAG+="uaccess" +SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7C88", TAG+="uaccess" +SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7C89", TAG+="uaccess" +SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7C90", TAG+="uaccess" +SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7C91", TAG+="uaccess" +SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7C92", TAG+="uaccess" +SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7C94", TAG+="uaccess" +SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7C95", TAG+="uaccess" +SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7C96", TAG+="uaccess" +SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7C98", TAG+="uaccess" +SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="7C99", TAG+="uaccess" +SUBSYSTEMS=="usb", ATTR{idVendor}=="1462", ATTR{idProduct}=="905D", TAG+="uaccess" + #---------------------------------------------------------------# # MSI/SteelSeries 3-Zone Laptop Keyboard # #---------------------------------------------------------------# @@ -177,6 +222,7 @@ SUBSYSTEMS=="usb", ATTR{idVendor}=="04d9", ATTR{idProduct}=="fc39", TAG+="uacces # Gigabyte/Aorus RGB Fusion 2 USB # #---------------------------------------------------------------# SUBSYSTEMS=="usb", ATTR{idVendor}=="048d", ATTR{idProduct}=="8297", TAG+="uaccess" +SUBSYSTEMS=="usb", ATTR{idVendor}=="048d", ATTR{idProduct}=="5702", TAG+="uaccess" #---------------------------------------------------------------# # SteelSeries Peripheral Devices # diff --git a/Controllers/CoolerMasterController/CoolerMasterControllerDetect.cpp b/Controllers/CoolerMasterController/CoolerMasterControllerDetect.cpp index 3fa8af57..a1970c70 100644 --- a/Controllers/CoolerMasterController/CoolerMasterControllerDetect.cpp +++ b/Controllers/CoolerMasterController/CoolerMasterControllerDetect.cpp @@ -36,7 +36,7 @@ void DetectCoolerMasterControllers(std::vector& rgb_controllers) //Look for the passed in cm_pids hid_init(); - info = hid_enumerate(0x0, 0x0); + info = hid_enumerate(COOLERMASTER_VID, 0x0); while(info) { diff --git a/Controllers/MSIMysticLightController/MSIMysticLightControllerDetect.cpp b/Controllers/MSIMysticLightController/MSIMysticLightControllerDetect.cpp index 77448a24..cde7b310 100644 --- a/Controllers/MSIMysticLightController/MSIMysticLightControllerDetect.cpp +++ b/Controllers/MSIMysticLightController/MSIMysticLightControllerDetect.cpp @@ -7,20 +7,23 @@ static const unsigned short msi_pid_table[] = { - 0x7C67, // MS_7C67 + 0x3EA4, // MS_3EA4 + 0x4559, // MS_4459 + 0x7B10, // MS_7B10 - 0x7C87, // MS_7C87 - 0x7B93, // MS_7B93 + 0x7B93, // MSI B450 Gaming Pro Carbon AC + 0x7B94, // MS_7B94 + 0x7B96, // MS_7B96 + 0x7C34, // MS_7C34 0x7C35, // MS_7C35 0x7C36, // MS_7C36 0x7C37, // MS_7C37 0x7C42, // MS_7C42 - 0x7C84, // MS_7C84 - 0x7B94, // MS_7B94 - 0x7B96, // MS_7B96 + 0x7C56, // MS_7C56 0x7C59, // MS_7C59 0x7C60, // MS_7C60 + 0x7C67, // MS_7C67 0x7C70, // MS_7C70 0x7C71, // MS_7C71 0x7C73, // MS_7C73 @@ -29,25 +32,25 @@ static const unsigned short msi_pid_table[] = 0x7C77, // MS_7C77 0x7C79, // MS_7C79 0x7C80, // MS_7C80 - 0x7C98, // MS_7C98 - 0x7C99, // MS_7C99 0x7C81, // MS_7C81 0x7C82, // MS_7C82 0x7C83, // MS_7C83 + 0x7C84, // MS_7C84 0x7C85, // MS_7C85 0x7C86, // MS_7C86 + 0x7C87, // MS_7C87 0x7C88, // MS_7C88 0x7C89, // MS_7C89 - 0x4559, // MS_4459 - 0x3EA4, // MS_3EA4 - 0x905D, // MS_905D 0x7C90, // MS_7C90 0x7C91, // MS_7C91 0x7C92, // MS_7C92 0x7C94, // MS_7C94 0x7C95, // MS_7C95 0x7C96, // MS_7C96 - 0x7C56 // MS_7C56 + 0x7C98, // MS_7C98 + 0x7C99, // MS_7C99 + + 0x905D // MS_905D }; /******************************************************************************************\