From 76b575e562adb3cd881be65c8c9d8b8ca9c7e65a Mon Sep 17 00:00:00 2001 From: Adam Honse Date: Sun, 25 Oct 2020 01:30:31 -0500 Subject: [PATCH] Fix ROG Gladius II Core --- .../AuraUSBControllerDetect.cpp | 8 +++++- .../RGBController_AuraMouse.cpp | 26 +++++++++---------- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/Controllers/AuraUSBController/AuraUSBControllerDetect.cpp b/Controllers/AuraUSBController/AuraUSBControllerDetect.cpp index 5a6be2b6d..f2bc93175 100644 --- a/Controllers/AuraUSBController/AuraUSBControllerDetect.cpp +++ b/Controllers/AuraUSBController/AuraUSBControllerDetect.cpp @@ -136,7 +136,13 @@ void DetectAuraUSBControllers(std::vector& rgb_controllers) hid_device* dev = NULL; if((info->vendor_id == mouse_device_list[pid_idx].usb_vid) - &&(info->product_id == mouse_device_list[pid_idx].usb_pid)) + &&(info->product_id == mouse_device_list[pid_idx].usb_pid) +#ifdef USE_HID_USAGE + &&(info->interface_number == 0 ) + &&(info->usage_page == 0xFF01)) +#else + &&(info->interface_number == 0 )) +#endif { dev = hid_open_path(info->path); diff --git a/Controllers/AuraUSBController/RGBController_AuraMouse.cpp b/Controllers/AuraUSBController/RGBController_AuraMouse.cpp index ad4beb8b1..65dc8ba3c 100644 --- a/Controllers/AuraUSBController/RGBController_AuraMouse.cpp +++ b/Controllers/AuraUSBController/RGBController_AuraMouse.cpp @@ -125,17 +125,17 @@ void RGBController_AuraMouse::UpdateSingleLED(int led) { if(led == 0) { - red = RGBGetRValue(modes[active_mode].colors[led]); - grn = RGBGetGValue(modes[active_mode].colors[led]); - blu = RGBGetBValue(modes[active_mode].colors[led]); + red = RGBGetRValue(colors[led]); + grn = RGBGetGValue(colors[led]); + blu = RGBGetBValue(colors[led]); aura->SendUpdate(AURA_MOUSE_ZONE_LOGO, modes[active_mode].value, red, grn, blu); } else { - red = RGBGetRValue(modes[active_mode].colors[led]); - grn = RGBGetGValue(modes[active_mode].colors[led]); - blu = RGBGetBValue(modes[active_mode].colors[led]); + red = RGBGetRValue(colors[led]); + grn = RGBGetGValue(colors[led]); + blu = RGBGetBValue(colors[led]); aura->SendUpdate(AURA_MOUSE_ZONE_SCROLL, modes[active_mode].value, red, grn, blu); } @@ -148,7 +148,7 @@ void RGBController_AuraMouse::UpdateSingleLED(int led) void RGBController_AuraMouse::SetCustomMode() { - + active_mode = 0; } void RGBController_AuraMouse::DeviceUpdateMode() @@ -159,15 +159,15 @@ void RGBController_AuraMouse::DeviceUpdateMode() if(modes[active_mode].color_mode == MODE_COLORS_PER_LED) { - red = RGBGetRValue(modes[active_mode].colors[0]); - grn = RGBGetGValue(modes[active_mode].colors[0]); - blu = RGBGetBValue(modes[active_mode].colors[0]); + red = RGBGetRValue(colors[0]); + grn = RGBGetGValue(colors[0]); + blu = RGBGetBValue(colors[0]); aura->SendUpdate(AURA_MOUSE_ZONE_LOGO, modes[active_mode].value, red, grn, blu); - red = RGBGetRValue(modes[active_mode].colors[1]); - grn = RGBGetGValue(modes[active_mode].colors[1]); - blu = RGBGetBValue(modes[active_mode].colors[1]); + red = RGBGetRValue(colors[1]); + grn = RGBGetGValue(colors[1]); + blu = RGBGetBValue(colors[1]); aura->SendUpdate(AURA_MOUSE_ZONE_SCROLL, modes[active_mode].value, red, grn, blu); }