From 6709fe4a1a4784eab6a19d24d5592999e7bb0db1 Mon Sep 17 00:00:00 2001 From: Mola19 Date: Tue, 12 Apr 2022 16:37:16 +0000 Subject: [PATCH] Support for asus rog strix impact --- 60-openrgb.rules | 1 + .../AsusAuraMouseController.cpp | 9 +++++++++ .../AsusAuraUSBController/AsusAuraMouseDevices.h | 12 ++++++++++++ .../AsusAuraUSBControllerDetect.cpp | 1 + 4 files changed, 23 insertions(+) diff --git a/60-openrgb.rules b/60-openrgb.rules index 110b3efa..7fe99214 100644 --- a/60-openrgb.rules +++ b/60-openrgb.rules @@ -79,6 +79,7 @@ SUBSYSTEMS=="usb", ATTR{idVendor}=="0b05", ATTR{idProduct}=="1958", TAG+="uacces SUBSYSTEMS=="usb", ATTR{idVendor}=="0b05", ATTR{idProduct}=="1846", TAG+="uaccess", TAG+="ROG_Pugio" SUBSYSTEMS=="usb", ATTR{idVendor}=="0b05", ATTR{idProduct}=="1906", TAG+="uaccess", TAG+="ROG_Pugio_II_Wired" SUBSYSTEMS=="usb", ATTR{idVendor}=="0b05", ATTR{idProduct}=="1908", TAG+="uaccess", TAG+="ROG_Pugio_II_Wireless" +SUBSYSTEMS=="usb", ATTR{idVendor}=="0b05", ATTR{idProduct}=="1847", TAG+="uaccess", TAG+="ROG_Strix_Impact" SUBSYSTEMS=="usb", ATTR{idVendor}=="0b05", ATTR{idProduct}=="18e1", TAG+="uaccess", TAG+="ROG_Strix_Impact_II" SUBSYSTEMS=="usb", ATTR{idVendor}=="0b05", ATTR{idProduct}=="195c", TAG+="uaccess", TAG+="ROG_Keris" SUBSYSTEMS=="usb", ATTR{idVendor}=="0b05", ATTR{idProduct}=="195e", TAG+="uaccess", TAG+="ROG_Keris_Wireless_USB" diff --git a/Controllers/AsusAuraUSBController/AsusAuraMouseController.cpp b/Controllers/AsusAuraUSBController/AsusAuraMouseController.cpp index c4815071..c6a54163 100644 --- a/Controllers/AsusAuraUSBController/AsusAuraMouseController.cpp +++ b/Controllers/AsusAuraUSBController/AsusAuraMouseController.cpp @@ -82,6 +82,15 @@ std::string AuraMouseController::GetVersion(bool wireless, int protocol) str = "0." + str.substr(0, 2) + "." + str.substr(2, 2); } break; + + case 3: + { + char version[9]; + int offset = (wireless ? 13 : 4); + snprintf(version, 9, "%2d.%02d.%02d", usb_buf_out[offset + 1], usb_buf_out[offset + 2], usb_buf_out[offset + 3]); + str = std::string(version); + } + break; } return str; diff --git a/Controllers/AsusAuraUSBController/AsusAuraMouseDevices.h b/Controllers/AsusAuraUSBController/AsusAuraMouseDevices.h index 3966aee0..903ba562 100644 --- a/Controllers/AsusAuraUSBController/AsusAuraMouseDevices.h +++ b/Controllers/AsusAuraUSBController/AsusAuraMouseDevices.h @@ -24,6 +24,7 @@ #define AURA_ROG_PUGIO_PID 0x1846 #define AURA_ROG_PUGIO_II_WIRED_PID 0x1906 #define AURA_ROG_PUGIO_II_WIRELESS_PID 0x1908 +#define AURA_ROG_STRIX_IMPACT_PID 0x1847 #define AURA_ROG_STRIX_IMPACT_II_PID 0x18E1 #define AURA_ROG_KERIS 0x195C #define AURA_ROG_KERIS_WIRELESS_USB_PID 0x195E @@ -215,6 +216,17 @@ static std::map aura_mouse_devices = { AURA_MOUSE_MODE_STATIC, AURA_MOUSE_MODE_BREATHING, AURA_MOUSE_MODE_SPECTRUM, AURA_MOUSE_MODE_WAVE, AURA_MOUSE_MODE_REACTIVE, AURA_MOUSE_MODE_COMET, AURA_MOUSE_MODE_BATTERY } } }, + { + AURA_ROG_STRIX_IMPACT_PID, // ROG Strix Impact + { + 0, + 0, + false, + 3, + { AURA_MOUSE_ZONE_LOGO }, + { AURA_MOUSE_MODE_STATIC, AURA_MOUSE_MODE_BREATHING, AURA_MOUSE_MODE_SPECTRUM } + } + }, { AURA_ROG_STRIX_IMPACT_II_PID, // ROG Strix Impact II { diff --git a/Controllers/AsusAuraUSBController/AsusAuraUSBControllerDetect.cpp b/Controllers/AsusAuraUSBController/AsusAuraUSBControllerDetect.cpp index 4302a9bd..3fca84b6 100644 --- a/Controllers/AsusAuraUSBController/AsusAuraUSBControllerDetect.cpp +++ b/Controllers/AsusAuraUSBController/AsusAuraUSBControllerDetect.cpp @@ -300,6 +300,7 @@ REGISTER_HID_DETECTOR_IP("Asus ROG Chakram Core", DetectAsusAuraUS REGISTER_HID_DETECTOR_IP("ASUS ROG Pugio", DetectAsusAuraUSBMice, AURA_USB_VID, AURA_ROG_PUGIO_PID, 2, 0xFF01); REGISTER_HID_DETECTOR_IP("ASUS ROG Pugio II (Wired)", DetectAsusAuraUSBMice, AURA_USB_VID, AURA_ROG_PUGIO_II_WIRED_PID, 0, 0xFF01); REGISTER_HID_DETECTOR_IP("ASUS ROG Pugio II (Wireless)", DetectAsusAuraUSBMice, AURA_USB_VID, AURA_ROG_PUGIO_II_WIRELESS_PID, 0, 0xFF01); +REGISTER_HID_DETECTOR_IP("ASUS ROG Strix Impact", DetectAsusAuraUSBMice, AURA_USB_VID, AURA_ROG_STRIX_IMPACT_PID, 0, 0xFF01); REGISTER_HID_DETECTOR_IP("ASUS ROG Strix Impact II", DetectAsusAuraUSBMice, AURA_USB_VID, AURA_ROG_STRIX_IMPACT_II_PID, 0, 0xFF01); REGISTER_HID_DETECTOR_IP("ASUS ROG Keris", DetectAsusAuraUSBMice, AURA_USB_VID, AURA_ROG_KERIS, 0, 0xFF01); REGISTER_HID_DETECTOR_IP("ASUS ROG Keris Wireless USB", DetectAsusAuraUSBMice, AURA_USB_VID, AURA_ROG_KERIS_WIRELESS_USB_PID, 0, 0xFF01);