From 699fd4050d873e00d5af7a826b6cc8dcf4186574 Mon Sep 17 00:00:00 2001 From: Mola19 Date: Tue, 30 Nov 2021 18:21:21 +0100 Subject: [PATCH] support for Asus ROG Gladius III Wireless to resolve #1972 --- .../AsusAuraMouseDevices.h | 94 +++++++++++++++++- .../AsusAuraUSBControllerDetect.cpp | 95 ++++++++++--------- .../RGBController_AsusAuraMouse.cpp | 42 ++++---- .../RGBController_AsusAuraMouse.h | 6 -- 4 files changed, 160 insertions(+), 77 deletions(-) diff --git a/Controllers/AsusAuraUSBController/AsusAuraMouseDevices.h b/Controllers/AsusAuraUSBController/AsusAuraMouseDevices.h index 903ba562..2f3c6364 100644 --- a/Controllers/AsusAuraUSBController/AsusAuraMouseDevices.h +++ b/Controllers/AsusAuraUSBController/AsusAuraMouseDevices.h @@ -18,6 +18,9 @@ #define AURA_ROG_GLADIUS_II_ORIGIN_COD_PID 0x18B1 #define AURA_ROG_GLADIUS_II_WIRELESS_1_PID 0x189E #define AURA_ROG_GLADIUS_II_WIRELESS_2_PID 0x18A0 +#define AURA_ROG_GLADIUS_III_WIRELESS_USB_PID 0x197D +#define AURA_ROG_GLADIUS_III_WIRELESS_2_4_PID 0x197F +#define AURA_ROG_GLADIUS_III_WIRELESS_BT_PID 0x1981 #define AURA_ROG_CHAKRAM_WIRELESS_PID 0x18E5 #define AURA_ROG_CHAKRAM_WIRED_1_PID 0x18E3 #define AURA_ROG_CHAKRAM_CORE_PID 0x1958 @@ -57,6 +60,8 @@ typedef struct { uint8_t speed_min; uint8_t speed_max; + uint8_t brightness_min; + uint8_t brightness_max; bool wireless; int version_protocol; std::vector mouse_zones; @@ -76,10 +81,12 @@ static std::map aura_mouse_devices = { AURA_ROG_GLADIUS_II_CORE_PID, // ROG Gladius II Core { - 0, //Speed Min - The Asus Mouse protocol defines larger numbers as slow - 0, //Speed Max - false, - 1, + 0, // Speed Min - The Asus Mouse protocol defines larger numbers as slow + 0, // Speed Max + 0, // Brightness Min + 4, // Brightness Max + false, // is wireless? (important for fetching the version) + 1, // version protocol { AURA_MOUSE_ZONE_LOGO, AURA_MOUSE_ZONE_SCROLL }, { AURA_MOUSE_MODE_STATIC, AURA_MOUSE_MODE_BREATHING, AURA_MOUSE_MODE_SPECTRUM, AURA_MOUSE_MODE_REACTIVE } } @@ -89,6 +96,8 @@ static std::map aura_mouse_devices = { 255, 1, + 0, + 4, false, 0, { AURA_MOUSE_ZONE_LOGO, AURA_MOUSE_ZONE_SCROLL, AURA_MOUSE_ZONE_UNDERGLOW }, @@ -100,6 +109,8 @@ static std::map aura_mouse_devices = { 255, 1, + 0, + 4, false, 0, { AURA_MOUSE_ZONE_LOGO, AURA_MOUSE_ZONE_SCROLL, AURA_MOUSE_ZONE_UNDERGLOW }, @@ -111,6 +122,8 @@ static std::map aura_mouse_devices = { 255, 1, + 0, + 4, false, 0, { AURA_MOUSE_ZONE_LOGO, AURA_MOUSE_ZONE_SCROLL, AURA_MOUSE_ZONE_UNDERGLOW }, @@ -122,6 +135,8 @@ static std::map aura_mouse_devices = { 255, 1, + 0, + 4, false, 0, { AURA_MOUSE_ZONE_SCROLL, AURA_MOUSE_ZONE_UNDERGLOW }, @@ -133,6 +148,8 @@ static std::map aura_mouse_devices = { 0, 0, + 0, + 4, true, 1, { AURA_MOUSE_ZONE_LOGO, AURA_MOUSE_ZONE_SCROLL }, @@ -144,17 +161,60 @@ static std::map aura_mouse_devices = { 0, 0, + 0, + 4, true, 1, { AURA_MOUSE_ZONE_LOGO, AURA_MOUSE_ZONE_SCROLL }, { AURA_MOUSE_MODE_STATIC, AURA_MOUSE_MODE_BREATHING, AURA_MOUSE_MODE_SPECTRUM, AURA_MOUSE_MODE_NONE, AURA_MOUSE_MODE_REACTIVE, AURA_MOUSE_MODE_NONE, AURA_MOUSE_MODE_BATTERY } } }, + { + AURA_ROG_GLADIUS_III_WIRELESS_USB_PID, // ROG Gladius III Wireless USB + { + 255, + 1, + 0, + 64, + false, + 1, + { AURA_MOUSE_ZONE_LOGO, AURA_MOUSE_ZONE_SCROLL, AURA_MOUSE_ZONE_UNDERGLOW }, + { 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_GLADIUS_III_WIRELESS_2_4_PID, // ROG Gladius III Wireless 2.4 GHz Dongle + { + 255, + 1, + 0, + 64, + true, + 1, + { AURA_MOUSE_ZONE_LOGO, AURA_MOUSE_ZONE_SCROLL, AURA_MOUSE_ZONE_UNDERGLOW }, + { 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_GLADIUS_III_WIRELESS_BT_PID, // ROG Gladius III Wireless Bluetooth + { + 255, + 1, + 0, + 64, + true, + 1, + { AURA_MOUSE_ZONE_LOGO, AURA_MOUSE_ZONE_SCROLL, AURA_MOUSE_ZONE_UNDERGLOW }, + { 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_CHAKRAM_WIRELESS_PID, // ROG Chakram Wireless { 15, 1, + 0, + 4, true, 1, { AURA_MOUSE_ZONE_LOGO, AURA_MOUSE_ZONE_SCROLL, AURA_MOUSE_ZONE_UNDERGLOW }, @@ -166,6 +226,8 @@ static std::map aura_mouse_devices = { 15, 1, + 0, + 4, false, 1, { AURA_MOUSE_ZONE_LOGO, AURA_MOUSE_ZONE_SCROLL, AURA_MOUSE_ZONE_UNDERGLOW }, @@ -177,6 +239,8 @@ static std::map aura_mouse_devices = { 0, 0, + 0, + 4, false, 1, { AURA_MOUSE_ZONE_LOGO, AURA_MOUSE_ZONE_SCROLL }, @@ -188,6 +252,8 @@ static std::map aura_mouse_devices = { 255, 1, + 0, + 4, false, 0, { AURA_MOUSE_ZONE_LOGO, AURA_MOUSE_ZONE_SCROLL, AURA_MOUSE_ZONE_UNDERGLOW }, @@ -199,6 +265,8 @@ static std::map aura_mouse_devices = { 15, 1, + 0, + 4, false, 1, { AURA_MOUSE_ZONE_LOGO, AURA_MOUSE_ZONE_SCROLL, AURA_MOUSE_ZONE_UNDERGLOW }, @@ -210,6 +278,8 @@ static std::map aura_mouse_devices = { 15, 1, + 0, + 4, true, 1, { AURA_MOUSE_ZONE_LOGO, AURA_MOUSE_ZONE_SCROLL, AURA_MOUSE_ZONE_UNDERGLOW }, @@ -221,6 +291,8 @@ static std::map aura_mouse_devices = { 0, 0, + 0, + 4, false, 3, { AURA_MOUSE_ZONE_LOGO }, @@ -232,6 +304,8 @@ static std::map aura_mouse_devices = { 0, 0, + 0, + 4, false, 1, { AURA_MOUSE_ZONE_LOGO, AURA_MOUSE_ZONE_SCROLL, AURA_MOUSE_ZONE_UNDERGLOW }, @@ -243,6 +317,8 @@ static std::map aura_mouse_devices = { 0, 0, + 0, + 4, false, 1, // might be the wrong protocol for version { AURA_MOUSE_ZONE_LOGO, AURA_MOUSE_ZONE_SCROLL }, @@ -254,6 +330,8 @@ static std::map aura_mouse_devices = { 0, 0, + 0, + 4, true, 1, // might be the wrong protocol for version { AURA_MOUSE_ZONE_LOGO, AURA_MOUSE_ZONE_SCROLL }, @@ -265,6 +343,8 @@ static std::map aura_mouse_devices = { 0, 0, + 0, + 4, true, 1, // might be the wrong protocol for version { AURA_MOUSE_ZONE_LOGO, AURA_MOUSE_ZONE_SCROLL }, @@ -276,6 +356,8 @@ static std::map aura_mouse_devices = { 0, 0, + 0, + 4, true, 1, // might be the wrong protocol for version { AURA_MOUSE_ZONE_LOGO, AURA_MOUSE_ZONE_SCROLL }, @@ -287,6 +369,8 @@ static std::map aura_mouse_devices = { 0, 0, + 0, + 4, false, 1, { AURA_MOUSE_ZONE_LOGO }, @@ -298,6 +382,8 @@ static std::map aura_mouse_devices = { 0, 0, + 0, + 4, false, 2, { AURA_MOUSE_ZONE_LOGO }, diff --git a/Controllers/AsusAuraUSBController/AsusAuraUSBControllerDetect.cpp b/Controllers/AsusAuraUSBController/AsusAuraUSBControllerDetect.cpp index 353e17df..0c60392d 100644 --- a/Controllers/AsusAuraUSBController/AsusAuraUSBControllerDetect.cpp +++ b/Controllers/AsusAuraUSBController/AsusAuraUSBControllerDetect.cpp @@ -263,70 +263,73 @@ void DetectAsusAuraUSBMonitor(hid_device_info* info, const std::string& name) /*-----------------------------------------------------------------*\ | MOTHERBOARDS | \*-----------------------------------------------------------------*/ -REGISTER_HID_DETECTOR ("ASUS Aura Addressable", DetectAsusAuraUSBAddressable, AURA_USB_VID, AURA_ADDRESSABLE_1_PID); -REGISTER_HID_DETECTOR ("ASUS Aura Addressable", DetectAsusAuraUSBAddressable, AURA_USB_VID, AURA_ADDRESSABLE_2_PID); -REGISTER_HID_DETECTOR ("ASUS Aura Addressable", DetectAsusAuraUSBAddressable, AURA_USB_VID, AURA_ADDRESSABLE_3_PID); -REGISTER_HID_DETECTOR ("ASUS Aura Addressable", DetectAsusAuraUSBAddressable, AURA_USB_VID, AURA_ADDRESSABLE_4_PID); -REGISTER_HID_DETECTOR ("ASUS Aura Motherboard", DetectAsusAuraUSBMotherboards, AURA_USB_VID, AURA_MOTHERBOARD_1_PID); -REGISTER_HID_DETECTOR ("ASUS Aura Motherboard", DetectAsusAuraUSBMotherboards, AURA_USB_VID, AURA_MOTHERBOARD_2_PID); -REGISTER_HID_DETECTOR ("ASUS Aura Motherboard", DetectAsusAuraUSBMotherboards, AURA_USB_VID, AURA_MOTHERBOARD_3_PID); +REGISTER_HID_DETECTOR ("ASUS Aura Addressable", DetectAsusAuraUSBAddressable, AURA_USB_VID, AURA_ADDRESSABLE_1_PID); +REGISTER_HID_DETECTOR ("ASUS Aura Addressable", DetectAsusAuraUSBAddressable, AURA_USB_VID, AURA_ADDRESSABLE_2_PID); +REGISTER_HID_DETECTOR ("ASUS Aura Addressable", DetectAsusAuraUSBAddressable, AURA_USB_VID, AURA_ADDRESSABLE_3_PID); +REGISTER_HID_DETECTOR ("ASUS Aura Addressable", DetectAsusAuraUSBAddressable, AURA_USB_VID, AURA_ADDRESSABLE_4_PID); +REGISTER_HID_DETECTOR ("ASUS Aura Motherboard", DetectAsusAuraUSBMotherboards, AURA_USB_VID, AURA_MOTHERBOARD_1_PID); +REGISTER_HID_DETECTOR ("ASUS Aura Motherboard", DetectAsusAuraUSBMotherboards, AURA_USB_VID, AURA_MOTHERBOARD_2_PID); +REGISTER_HID_DETECTOR ("ASUS Aura Motherboard", DetectAsusAuraUSBMotherboards, AURA_USB_VID, AURA_MOTHERBOARD_3_PID); /*-----------------------------------------------------------------*\ | KEYBOARDS | \*-----------------------------------------------------------------*/ -REGISTER_HID_DETECTOR_IP("ASUS ROG Falchion (Wired)", DetectAsusAuraUSBKeyboards, AURA_USB_VID, AURA_ROG_FALCHION_WIRED_PID, 1, 0xFF00); -REGISTER_HID_DETECTOR_IP("ASUS ROG Falchion (Wireless)", DetectAsusAuraUSBKeyboards, AURA_USB_VID, AURA_ROG_FALCHION_WIRELESS_PID, 1, 0xFF00); -REGISTER_HID_DETECTOR_IP("ASUS ROG Strix Flare", DetectAsusAuraUSBKeyboards, AURA_USB_VID, AURA_ROG_STRIX_FLARE_PID, 1, 0xFF00); -REGISTER_HID_DETECTOR_IP("ASUS ROG Strix Flare PNK LTD", DetectAsusAuraUSBKeyboards, AURA_USB_VID, AURA_ROG_STRIX_FLARE_PNK_LTD_PID, 1, 0xFF00); -REGISTER_HID_DETECTOR_IP("ASUS ROG Strix Scope", DetectAsusAuraUSBKeyboards, AURA_USB_VID, AURA_ROG_STRIX_SCOPE_PID, 1, 0xFF00); -REGISTER_HID_DETECTOR_IP("ASUS ROG Strix Scope RX", DetectAsusAuraUSBKeyboards, AURA_USB_VID, AURA_ROG_STRIX_SCOPE_RX_PID, 1, 0xFF00); -REGISTER_HID_DETECTOR_IP("ASUS ROG Strix Scope TKL", DetectAsusAuraUSBKeyboards, AURA_USB_VID, AURA_ROG_STRIX_SCOPE_TKL_PID, 1, 0xFF00); -REGISTER_HID_DETECTOR_IP("ASUS TUF Gaming K7", DetectAsusAuraTUFUSBKeyboard, AURA_USB_VID, AURA_TUF_K7_GAMING_PID, 1, 0xFF00); -REGISTER_HID_DETECTOR_IP("ASUS TUF Gaming K3", DetectAsusAuraTUFUSBKeyboard, AURA_USB_VID, AURA_TUF_K3_GAMING_PID, 1, 0xFF00); +REGISTER_HID_DETECTOR_IP("ASUS ROG Falchion (Wired)", DetectAsusAuraUSBKeyboards, AURA_USB_VID, AURA_ROG_FALCHION_WIRED_PID, 1, 0xFF00); +REGISTER_HID_DETECTOR_IP("ASUS ROG Falchion (Wireless)", DetectAsusAuraUSBKeyboards, AURA_USB_VID, AURA_ROG_FALCHION_WIRELESS_PID, 1, 0xFF00); +REGISTER_HID_DETECTOR_IP("ASUS ROG Strix Flare", DetectAsusAuraUSBKeyboards, AURA_USB_VID, AURA_ROG_STRIX_FLARE_PID, 1, 0xFF00); +REGISTER_HID_DETECTOR_IP("ASUS ROG Strix Flare PNK LTD", DetectAsusAuraUSBKeyboards, AURA_USB_VID, AURA_ROG_STRIX_FLARE_PNK_LTD_PID, 1, 0xFF00); +REGISTER_HID_DETECTOR_IP("ASUS ROG Strix Scope", DetectAsusAuraUSBKeyboards, AURA_USB_VID, AURA_ROG_STRIX_SCOPE_PID, 1, 0xFF00); +REGISTER_HID_DETECTOR_IP("ASUS ROG Strix Scope RX", DetectAsusAuraUSBKeyboards, AURA_USB_VID, AURA_ROG_STRIX_SCOPE_RX_PID, 1, 0xFF00); +REGISTER_HID_DETECTOR_IP("ASUS ROG Strix Scope TKL", DetectAsusAuraUSBKeyboards, AURA_USB_VID, AURA_ROG_STRIX_SCOPE_TKL_PID, 1, 0xFF00); +REGISTER_HID_DETECTOR_IP("ASUS TUF Gaming K7", DetectAsusAuraTUFUSBKeyboard, AURA_USB_VID, AURA_TUF_K7_GAMING_PID, 1, 0xFF00); +REGISTER_HID_DETECTOR_IP("ASUS TUF Gaming K3", DetectAsusAuraTUFUSBKeyboard, AURA_USB_VID, AURA_TUF_K3_GAMING_PID, 1, 0xFF00); /*-----------------------------------------------------------------*\ | MICE | \*-----------------------------------------------------------------*/ -REGISTER_HID_DETECTOR_IP("ASUS ROG Gladius II Core", DetectAsusAuraUSBMice, AURA_USB_VID, AURA_ROG_GLADIUS_II_CORE_PID, 0, 0xFF01); -REGISTER_HID_DETECTOR_IP("ASUS ROG Gladius II", DetectAsusAuraUSBMice, AURA_USB_VID, AURA_ROG_GLADIUS_II_PID, 2, 0xFF01); -REGISTER_HID_DETECTOR_IP("ASUS ROG Gladius II Origin", DetectAsusAuraUSBMice, AURA_USB_VID, AURA_ROG_GLADIUS_II_ORIGIN_PID, 2, 0xFF01); -REGISTER_HID_DETECTOR_IP("ASUS ROG Gladius II Origin PNK LTD", DetectAsusAuraUSBMice, AURA_USB_VID, AURA_ROG_GLADIUS_II_ORIGIN_PNK_LTD_PID, 2, 0xFF01); -REGISTER_HID_DETECTOR_IP("ASUS ROG Gladius II Origin COD", DetectAsusAuraUSBMice, AURA_USB_VID, AURA_ROG_GLADIUS_II_ORIGIN_COD_PID, 2, 0xFF01); -REGISTER_HID_DETECTOR_IP("ASUS ROG Gladius II Wireless", DetectAsusAuraUSBMice, AURA_USB_VID, AURA_ROG_GLADIUS_II_WIRELESS_1_PID, 1, 0xFF13); -REGISTER_HID_DETECTOR_IP("ASUS ROG Gladius II Wireless", DetectAsusAuraUSBMice, AURA_USB_VID, AURA_ROG_GLADIUS_II_WIRELESS_2_PID, 2, 0xFF01); -REGISTER_HID_DETECTOR_IP("ASUS ROG Chakram (Wireless)", DetectAsusAuraUSBMice, AURA_USB_VID, AURA_ROG_CHAKRAM_WIRELESS_PID, 0, 0xFF01); -REGISTER_HID_DETECTOR_IP("Asus ROG Chakram (Wired)", DetectAsusAuraUSBMice, AURA_USB_VID, AURA_ROG_CHAKRAM_WIRED_1_PID, 0, 0xFF01); -REGISTER_HID_DETECTOR_IP("Asus ROG Chakram Core", DetectAsusAuraUSBMice, AURA_USB_VID, AURA_ROG_CHAKRAM_CORE_PID, 0, 0xFF01); -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); -REGISTER_HID_DETECTOR_IP("ASUS ROG Keris Wireless 2.4Ghz", DetectAsusAuraUSBMice, AURA_USB_VID, AURA_ROG_KERIS_WIRELESS_2_4_PID, 0, 0xFF01); -REGISTER_HID_DETECTOR_IP("ASUS ROG Keris Wireless Bluetooth", DetectAsusAuraUSBMice, AURA_USB_VID, AURA_ROG_KERIS_WIRELESS_BT_PID, 0, 0xFF01); -REGISTER_HID_DETECTOR_IP("ASUS TUF Gaming M3", DetectAsusAuraUSBMice, AURA_USB_VID, AURA_TUF_M3_PID, 1, 0xFF01); -REGISTER_HID_DETECTOR_IP("ASUS TUF Gaming M5", DetectAsusAuraUSBMice, AURA_USB_VID, AURA_TUF_M5_PID, 2, 0xFF01); +REGISTER_HID_DETECTOR_IP("ASUS ROG Gladius II Core", DetectAsusAuraUSBMice, AURA_USB_VID, AURA_ROG_GLADIUS_II_CORE_PID, 0, 0xFF01); +REGISTER_HID_DETECTOR_IP("ASUS ROG Gladius II", DetectAsusAuraUSBMice, AURA_USB_VID, AURA_ROG_GLADIUS_II_PID, 2, 0xFF01); +REGISTER_HID_DETECTOR_IP("ASUS ROG Gladius II Origin", DetectAsusAuraUSBMice, AURA_USB_VID, AURA_ROG_GLADIUS_II_ORIGIN_PID, 2, 0xFF01); +REGISTER_HID_DETECTOR_IP("ASUS ROG Gladius II Origin PNK LTD", DetectAsusAuraUSBMice, AURA_USB_VID, AURA_ROG_GLADIUS_II_ORIGIN_PNK_LTD_PID, 2, 0xFF01); +REGISTER_HID_DETECTOR_IP("ASUS ROG Gladius II Origin COD", DetectAsusAuraUSBMice, AURA_USB_VID, AURA_ROG_GLADIUS_II_ORIGIN_COD_PID, 2, 0xFF01); +REGISTER_HID_DETECTOR_IP("ASUS ROG Gladius II Wireless", DetectAsusAuraUSBMice, AURA_USB_VID, AURA_ROG_GLADIUS_II_WIRELESS_1_PID, 1, 0xFF13); +REGISTER_HID_DETECTOR_IP("ASUS ROG Gladius II Wireless", DetectAsusAuraUSBMice, AURA_USB_VID, AURA_ROG_GLADIUS_II_WIRELESS_2_PID, 2, 0xFF01); +REGISTER_HID_DETECTOR_IP("ASUS ROG Gladius III Wireless USB", DetectAsusAuraUSBMice, AURA_USB_VID, AURA_ROG_GLADIUS_III_WIRELESS_USB_PID, 0, 0xFF01); +REGISTER_HID_DETECTOR_IP("ASUS ROG Gladius III Wireless 2.4Ghz", DetectAsusAuraUSBMice, AURA_USB_VID, AURA_ROG_GLADIUS_III_WIRELESS_2_4_PID, 0, 0xFF01); +REGISTER_HID_DETECTOR_IP("ASUS ROG Gladius III Wireless Bluetooth", DetectAsusAuraUSBMice, AURA_USB_VID, AURA_ROG_GLADIUS_III_WIRELESS_BT_PID, 0, 0xFF01); +REGISTER_HID_DETECTOR_IP("ASUS ROG Chakram (Wireless)", DetectAsusAuraUSBMice, AURA_USB_VID, AURA_ROG_CHAKRAM_WIRELESS_PID, 0, 0xFF01); +REGISTER_HID_DETECTOR_IP("Asus ROG Chakram (Wired)", DetectAsusAuraUSBMice, AURA_USB_VID, AURA_ROG_CHAKRAM_WIRED_1_PID, 0, 0xFF01); +REGISTER_HID_DETECTOR_IP("Asus ROG Chakram Core", DetectAsusAuraUSBMice, AURA_USB_VID, AURA_ROG_CHAKRAM_CORE_PID, 0, 0xFF01); +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); +REGISTER_HID_DETECTOR_IP("ASUS ROG Keris Wireless 2.4Ghz", DetectAsusAuraUSBMice, AURA_USB_VID, AURA_ROG_KERIS_WIRELESS_2_4_PID, 0, 0xFF01); +REGISTER_HID_DETECTOR_IP("ASUS ROG Keris Wireless Bluetooth", DetectAsusAuraUSBMice, AURA_USB_VID, AURA_ROG_KERIS_WIRELESS_BT_PID, 0, 0xFF01); +REGISTER_HID_DETECTOR_IP("ASUS TUF Gaming M3", DetectAsusAuraUSBMice, AURA_USB_VID, AURA_TUF_M3_PID, 1, 0xFF01); +REGISTER_HID_DETECTOR_IP("ASUS TUF Gaming M5", DetectAsusAuraUSBMice, AURA_USB_VID, AURA_TUF_M5_PID, 2, 0xFF01); -REGISTER_HID_DETECTOR_IP("ASUS ROG Strix Evolve", DetectAsusAuraUSBStrixEvolve, AURA_USB_VID, AURA_ROG_STRIX_EVOLVE_PID, 1, 0x0008); +REGISTER_HID_DETECTOR_IP("ASUS ROG Strix Evolve", DetectAsusAuraUSBStrixEvolve, AURA_USB_VID, AURA_ROG_STRIX_EVOLVE_PID, 1, 0x0008); /*-----------------------------------------------------------------*\ | MOUSEMATS | \*-----------------------------------------------------------------*/ -REGISTER_HID_DETECTOR_PU("ASUS ROG Balteus", DetectAsusAuraUSBMousemats, AURA_USB_VID, AURA_ROG_BALTEUS_PID, 0xFF06, 1); -REGISTER_HID_DETECTOR_PU("ASUS ROG Balteus Qi", DetectAsusAuraUSBMousemats, AURA_USB_VID, AURA_ROG_BALTEUS_QI_PID, 0xFF06, 1); +REGISTER_HID_DETECTOR_PU("ASUS ROG Balteus", DetectAsusAuraUSBMousemats, AURA_USB_VID, AURA_ROG_BALTEUS_PID, 0xFF06, 1); +REGISTER_HID_DETECTOR_PU("ASUS ROG Balteus Qi", DetectAsusAuraUSBMousemats, AURA_USB_VID, AURA_ROG_BALTEUS_QI_PID, 0xFF06, 1); /*-----------------------------------------------------------------*\ | MONITORS | \*-----------------------------------------------------------------*/ -REGISTER_HID_DETECTOR_PU("ASUS ROG Strix XG27AQ", DetectAsusAuraUSBMonitor, AURA_USB_VID, AURA_ROG_STRIX_XG27AQ_PID, 0xFFA0, 1); +REGISTER_HID_DETECTOR_PU("ASUS ROG Strix XG27AQ", DetectAsusAuraUSBMonitor, AURA_USB_VID, AURA_ROG_STRIX_XG27AQ_PID, 0xFFA0, 1); /*-----------------------------------------------------------------*\ | OTHER | \*-----------------------------------------------------------------*/ -REGISTER_HID_DETECTOR ("ASUS ROG AURA Terminal", DetectAsusAuraUSBTerminal, AURA_USB_VID, AURA_TERMINAL_PID); -REGISTER_HID_DETECTOR_PU ("ASUS ROG Strix LC", DetectAsusAuraUSBROGStrixLC, AURA_USB_VID, ROG_STRIX_LC120_PID, 0x00FF, 1); -REGISTER_HID_DETECTOR_I ("ASUS ROG Throne", DetectAsusAuraUSBHeadsetStand, AURA_USB_VID, AURA_ROG_THRONE_PID, 0); -REGISTER_HID_DETECTOR_I ("ASUS ROG Throne QI", DetectAsusAuraUSBHeadsetStand, AURA_USB_VID, AURA_ROG_THRONE_QI_PID, 0); -REGISTER_HID_DETECTOR_I ("ASUS ROG Throne QI GUNDAM", DetectAsusAuraUSBHeadsetStand, AURA_USB_VID, AURA_ROG_THRONE_QI_GUNDAM_PID, 0); +REGISTER_HID_DETECTOR ("ASUS ROG AURA Terminal", DetectAsusAuraUSBTerminal, AURA_USB_VID, AURA_TERMINAL_PID); +REGISTER_HID_DETECTOR_PU ("ASUS ROG Strix LC", DetectAsusAuraUSBROGStrixLC, AURA_USB_VID, ROG_STRIX_LC120_PID, 0x00FF, 1); +REGISTER_HID_DETECTOR_I ("ASUS ROG Throne", DetectAsusAuraUSBHeadsetStand, AURA_USB_VID, AURA_ROG_THRONE_PID, 0); +REGISTER_HID_DETECTOR_I ("ASUS ROG Throne QI", DetectAsusAuraUSBHeadsetStand, AURA_USB_VID, AURA_ROG_THRONE_QI_PID, 0); +REGISTER_HID_DETECTOR_I ("ASUS ROG Throne QI GUNDAM", DetectAsusAuraUSBHeadsetStand, AURA_USB_VID, AURA_ROG_THRONE_QI_GUNDAM_PID, 0); diff --git a/Controllers/AsusAuraUSBController/RGBController_AsusAuraMouse.cpp b/Controllers/AsusAuraUSBController/RGBController_AsusAuraMouse.cpp index 7fe71493..ada3dfb0 100644 --- a/Controllers/AsusAuraUSBController/RGBController_AsusAuraMouse.cpp +++ b/Controllers/AsusAuraUSBController/RGBController_AsusAuraMouse.cpp @@ -54,9 +54,9 @@ RGBController_AuraMouse::RGBController_AuraMouse(AuraMouseController* controller Direct.name = "Direct"; Direct.value = mode_value; Direct.flags = MODE_FLAG_HAS_PER_LED_COLOR | MODE_FLAG_MANUAL_SAVE | MODE_FLAG_HAS_BRIGHTNESS; - Direct.brightness_min = AURA_MOUSE_BRIGHTNESS_MIN; - Direct.brightness_max = AURA_MOUSE_BRIGHTNESS_MAX; - Direct.brightness = AURA_MOUSE_BRIGHTNESS_DEFAULT; + Direct.brightness_min = aura_mouse_devices[pid].brightness_min; + Direct.brightness_max = aura_mouse_devices[pid].brightness_max; + Direct.brightness = aura_mouse_devices[pid].brightness_max; Direct.color_mode = MODE_COLORS_PER_LED; modes.push_back(Direct); } @@ -68,9 +68,9 @@ RGBController_AuraMouse::RGBController_AuraMouse(AuraMouseController* controller Breathing.name = "Breathing"; Breathing.value = mode_value; Breathing.flags = MODE_FLAG_HAS_PER_LED_COLOR | MODE_FLAG_MANUAL_SAVE | MODE_FLAG_HAS_BRIGHTNESS; - Breathing.brightness_min = AURA_MOUSE_BRIGHTNESS_MIN; - Breathing.brightness_max = AURA_MOUSE_BRIGHTNESS_MAX; - Breathing.brightness = AURA_MOUSE_BRIGHTNESS_DEFAULT; + Breathing.brightness_min = aura_mouse_devices[pid].brightness_min; + Breathing.brightness_max = aura_mouse_devices[pid].brightness_max; + Breathing.brightness = aura_mouse_devices[pid].brightness_max; Breathing.color_mode = MODE_COLORS_PER_LED; modes.push_back(Breathing); } @@ -82,9 +82,9 @@ RGBController_AuraMouse::RGBController_AuraMouse(AuraMouseController* controller ColorCycle.name = "Spectrum Cycle"; ColorCycle.value = mode_value; ColorCycle.flags = MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_MANUAL_SAVE ; - ColorCycle.brightness_min = AURA_MOUSE_BRIGHTNESS_MIN; - ColorCycle.brightness_max = AURA_MOUSE_BRIGHTNESS_MAX; - ColorCycle.brightness = AURA_MOUSE_BRIGHTNESS_DEFAULT; + ColorCycle.brightness_min = aura_mouse_devices[pid].brightness_min; + ColorCycle.brightness_max = aura_mouse_devices[pid].brightness_max; + ColorCycle.brightness = aura_mouse_devices[pid].brightness_max; ColorCycle.color_mode = MODE_COLORS_NONE; modes.push_back(ColorCycle); } @@ -100,9 +100,9 @@ RGBController_AuraMouse::RGBController_AuraMouse(AuraMouseController* controller Wave.speed_min = aura_mouse_devices[pid].speed_min; Wave.speed_max = aura_mouse_devices[pid].speed_max; Wave.speed = (aura_mouse_devices[pid].speed_min + aura_mouse_devices[pid].speed_max) / 2; - Wave.brightness_min = AURA_MOUSE_BRIGHTNESS_MIN; - Wave.brightness_max = AURA_MOUSE_BRIGHTNESS_MAX; - Wave.brightness = AURA_MOUSE_BRIGHTNESS_DEFAULT; + Wave.brightness_min = aura_mouse_devices[pid].brightness_min; + Wave.brightness_max = aura_mouse_devices[pid].brightness_max; + Wave.brightness = aura_mouse_devices[pid].brightness_max; Wave.color_mode = MODE_COLORS_NONE; modes.push_back(Wave); } @@ -114,9 +114,9 @@ RGBController_AuraMouse::RGBController_AuraMouse(AuraMouseController* controller Reactive.name = "Reactive"; Reactive.value = mode_value; Reactive.flags = MODE_FLAG_HAS_PER_LED_COLOR | MODE_FLAG_MANUAL_SAVE | MODE_FLAG_HAS_BRIGHTNESS; - Reactive.brightness_min = AURA_MOUSE_BRIGHTNESS_MIN; - Reactive.brightness_max = AURA_MOUSE_BRIGHTNESS_MAX; - Reactive.brightness = AURA_MOUSE_BRIGHTNESS_DEFAULT; + Reactive.brightness_min = aura_mouse_devices[pid].brightness_min; + Reactive.brightness_max = aura_mouse_devices[pid].brightness_max; + Reactive.brightness = aura_mouse_devices[pid].brightness_max; Reactive.color_mode = MODE_COLORS_PER_LED; modes.push_back(Reactive); } @@ -128,9 +128,9 @@ RGBController_AuraMouse::RGBController_AuraMouse(AuraMouseController* controller Comet.name = "Comet"; Comet.value = mode_value; Comet.flags = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_RANDOM_COLOR | MODE_FLAG_HAS_DIRECTION_LR | MODE_FLAG_MANUAL_SAVE | MODE_FLAG_HAS_BRIGHTNESS; - Comet.brightness_min = AURA_MOUSE_BRIGHTNESS_MIN; - Comet.brightness_max = AURA_MOUSE_BRIGHTNESS_MAX; - Comet.brightness = AURA_MOUSE_BRIGHTNESS_DEFAULT; + Comet.brightness_min = aura_mouse_devices[pid].brightness_min; + Comet.brightness_max = aura_mouse_devices[pid].brightness_max; + Comet.brightness = aura_mouse_devices[pid].brightness_max; Comet.color_mode = MODE_COLORS_MODE_SPECIFIC; Comet.direction = 0; Comet.colors_min = 1; @@ -146,9 +146,9 @@ RGBController_AuraMouse::RGBController_AuraMouse(AuraMouseController* controller BatteryMode.name = "Battery"; BatteryMode.value = mode_value; BatteryMode.flags = MODE_FLAG_MANUAL_SAVE | MODE_FLAG_HAS_BRIGHTNESS; - BatteryMode.brightness_min = AURA_MOUSE_BRIGHTNESS_MIN; - BatteryMode.brightness_max = AURA_MOUSE_BRIGHTNESS_MAX; - BatteryMode.brightness = AURA_MOUSE_BRIGHTNESS_DEFAULT; + BatteryMode.brightness_min = aura_mouse_devices[pid].brightness_min; + BatteryMode.brightness_max = aura_mouse_devices[pid].brightness_max; + BatteryMode.brightness = aura_mouse_devices[pid].brightness_max; BatteryMode.color_mode = MODE_COLORS_NONE; modes.push_back(BatteryMode); } diff --git a/Controllers/AsusAuraUSBController/RGBController_AsusAuraMouse.h b/Controllers/AsusAuraUSBController/RGBController_AsusAuraMouse.h index 83ee4b6e..980f31bd 100644 --- a/Controllers/AsusAuraUSBController/RGBController_AsusAuraMouse.h +++ b/Controllers/AsusAuraUSBController/RGBController_AsusAuraMouse.h @@ -11,12 +11,6 @@ #include "RGBController.h" #include "AsusAuraMouseController.h" -enum { - AURA_MOUSE_BRIGHTNESS_MIN = 0, - AURA_MOUSE_BRIGHTNESS_MAX = 4, - AURA_MOUSE_BRIGHTNESS_DEFAULT = 4 -}; - class RGBController_AuraMouse : public RGBController { public: