From dba3e4d42c9f1ea248f4886a2dcf044e95d087bd Mon Sep 17 00:00:00 2001 From: Mola19 Date: Fri, 14 Apr 2023 16:44:11 +0200 Subject: [PATCH] Add support for Asus ROG Azoth to resolve #3304 --- .../AsusAuraTUFKeyboardController.cpp | 9 +- .../AsusAuraTUFKeyboardController.h | 3 +- .../AsusAuraTUFKeyboardLayouts.h | 241 +++++++++++++++++- .../AsusAuraUSBControllerDetect.cpp | 4 + .../RGBController_AsusAuraTUFKeyboard.cpp | 6 + 5 files changed, 257 insertions(+), 6 deletions(-) diff --git a/Controllers/AsusAuraUSBController/AsusAuraTUFKeyboardController.cpp b/Controllers/AsusAuraUSBController/AsusAuraTUFKeyboardController.cpp index 9af45ab9..3d0607b8 100644 --- a/Controllers/AsusAuraUSBController/AsusAuraTUFKeyboardController.cpp +++ b/Controllers/AsusAuraUSBController/AsusAuraTUFKeyboardController.cpp @@ -95,6 +95,8 @@ std::string AuraTUFKeyboardController::GetVersion() switch(device_pid) { + case AURA_ROG_AZOTH_USB_PID: + case AURA_ROG_AZOTH_2_4_PID: case AURA_TUF_K3_GAMING_PID: case AURA_ROG_STRIX_FLARE_II_ANIMATE_PID: case AURA_ROG_STRIX_SCOPE_NX_WIRELESS_DELUXE_USB_PID: @@ -473,7 +475,6 @@ void AuraTUFKeyboardController::UpdateScopeIIQuicksand AwaitResponse(20); } - void AuraTUFKeyboardController::UpdateDevice ( unsigned char mode, @@ -488,8 +489,10 @@ void AuraTUFKeyboardController::UpdateDevice { return UpdateK1Wave(colors, direction, speed, brightness); } - - if(device_pid == AURA_ROG_STRIX_SCOPE_NX_WIRELESS_DELUXE_USB_PID + + if(device_pid == AURA_ROG_AZOTH_USB_PID + || device_pid == AURA_ROG_AZOTH_2_4_PID + || device_pid == AURA_ROG_STRIX_SCOPE_NX_WIRELESS_DELUXE_USB_PID || device_pid == AURA_ROG_STRIX_SCOPE_NX_WIRELESS_DELUXE_2_4_PID || device_pid == AURA_ROG_STRIX_SCOPE_II_96_WIRELESS_USB_PID || device_pid == AURA_ROG_STRIX_SCOPE_II_RX_PID) diff --git a/Controllers/AsusAuraUSBController/AsusAuraTUFKeyboardController.h b/Controllers/AsusAuraUSBController/AsusAuraTUFKeyboardController.h index ab5c3b08..27b14f0e 100644 --- a/Controllers/AsusAuraUSBController/AsusAuraTUFKeyboardController.h +++ b/Controllers/AsusAuraUSBController/AsusAuraTUFKeyboardController.h @@ -33,6 +33,8 @@ enum enum { + AURA_ROG_AZOTH_USB_PID = 0x1A83, + AURA_ROG_AZOTH_2_4_PID = 0x1A85, AURA_ROG_CLAYMORE_PID = 0x184D, AURA_ROG_FALCHION_WIRED_PID = 0x193C, AURA_ROG_FALCHION_WIRELESS_PID = 0x193E, @@ -113,7 +115,6 @@ public: unsigned char brightness ); - void UpdateDevice ( unsigned char mode, diff --git a/Controllers/AsusAuraUSBController/AsusAuraTUFKeyboardLayouts.h b/Controllers/AsusAuraUSBController/AsusAuraTUFKeyboardLayouts.h index 5605e396..8b19c501 100644 --- a/Controllers/AsusAuraUSBController/AsusAuraTUFKeyboardLayouts.h +++ b/Controllers/AsusAuraUSBController/AsusAuraTUFKeyboardLayouts.h @@ -80,6 +80,24 @@ static unsigned int ASUS_TUF_K7_LAYOUT_KEYS_ISO[6][24] = { 5, 8, 14, NA, NA, NA, 34, NA, NA, NA, 55, 61, 66, NA, 74, NA, 78, 83, 87, NA, 92, NA, 101, NA } }; +static unsigned int ASUS_ROG_AZOTH_LAYOUT_KEYS_US[6][16] = { + { 0, 6, 9, 15, 20, 25, 30, 36, 41, 46, 51, 57, 63, NA, NA, NA }, + { 1, 7, 10, 16, 21, 26, 31, 37, 42, 47, 52, 58, 64, 69, NA, 76 }, + { 2, NA, 11, 17, 22, 27, 32, 38, 43, 48, 53, 59, 65, 70, 72, 77 }, + { 3, NA, 12, 18, 23, 28, 33, 39, 44, 49, 54, 60, 66, NA, 73, 78 }, + { 4, NA, 13, 19, 24, 29, 34, 40, 45, 50, 55, 61, 67, NA, 74, 79 }, + { 5, 8, 14, NA, NA, NA, 35, NA, NA, NA, 56, 62, 68, 71, 75, 80 } +}; + +static unsigned int ASUS_ROG_AZOTH_LAYOUT_KEYS_UK[6][16] = { + { 0, 6, 10, 16, 21, 26, 31, 37, 42, 47, 52, 58, 64, NA, NA, NA }, + { 1, 7, 11, 17, 22, 27, 32, 38, 43, 48, 53, 59, 65, 70, NA, 77 }, + { 2, NA, 12, 18, 23, 28, 33, 39, 44, 49, 54, 60, 66, 71, NA, 78 }, + { 3, NA, 13, 19, 24, 29, 34, 40, 45, 50, 55, 61, 67, 72, 74, 79 }, + { 4, 8, 14, 20, 25, 30, 35, 41, 46, 51, 56, 62, 68, NA, 75, 80 }, + { 5, 9, 15, NA, NA, NA, 36, NA, NA, NA, 57, 63, 69, 73, 76, 81 } +}; + static unsigned int ASUS_ROG_STRIX_SCOPE_LAYOUT_KEYS_ANSI[6][24] = { { 0, NA, 8, 14, 19, 24, NA, 34, 39, 44, 49, 55, 61, 66, 70, NA, 74, 78, 83, NA, NA, NA, 104, 105 }, @@ -218,8 +236,8 @@ static unsigned int ASUS_FALCHION_LAYOUT_KEYS_ANSI[5][16] = static unsigned int ASUS_FALCHION_LAYOUT_KEYS_ISO[5][16] = { { 0, 5, 8, 13, 17, 21, 25, 30, 34, 38, 42, 47, 52, 57, NA, 64 }, - { 1, NA, 9, 14, 18, 22, 26, 31, 35, 39, 43, 48, 53, 58, 61, 65 }, - { 2, NA, 10, 15, 19, 23, 27, 32, 36, 40, 44, 49, 54, 59, NA, 66 }, + { 1, NA, 9, 14, 18, 22, 26, 31, 35, 39, 43, 48, 53, 58, NA, 65 }, + { 2, NA, 10, 15, 19, 23, 27, 32, 36, 40, 44, 49, 54, 59, 61, 66 }, { 3, 6, 11, 16, 20, 24, 28, 33, 37, 41, 45, 50, 55, NA, 62, 67 }, { 4, 7, 12, NA, NA, NA, 29, NA, NA, NA, 46, 51, 56, 60, 63, 68 } }; @@ -572,6 +590,225 @@ static std::map AsusTUFK7Layouts = }, }; +static std::map AsusROGAzothLayouts = +{ + { + ASUS_TUF_K7_LAYOUT_UK, + { + *ASUS_ROG_AZOTH_LAYOUT_KEYS_UK, + 82, + 6, + 16, + { + { KEY_EN_ESCAPE, 0x00 }, + { KEY_EN_BACK_TICK, 0x01 }, + { KEY_EN_TAB, 0x02 }, + { KEY_EN_CAPS_LOCK, 0x03 }, + { KEY_EN_LEFT_SHIFT, 0x04 }, + { KEY_EN_LEFT_CONTROL, 0x05 }, + + { KEY_EN_F1, 0x08 }, + { KEY_EN_1, 0x09 }, + { KEY_EN_ISO_BACK_SLASH, 0x0C }, + { KEY_EN_LEFT_WINDOWS, 0x0D }, + + { KEY_EN_F2, 0x10 }, + { KEY_EN_2, 0x11 }, + { KEY_EN_Q, 0x0A }, + { KEY_EN_A, 0x0B }, + { KEY_EN_Z, 0x14 }, + { KEY_EN_LEFT_ALT, 0x15 }, + + { KEY_EN_F3, 0x18 }, + { KEY_EN_3, 0x19 }, + { KEY_EN_W, 0x12 }, + { KEY_EN_S, 0x13 }, + { KEY_EN_X, 0x1C }, + + { KEY_EN_F4, 0x20 }, + { KEY_EN_4, 0x21 }, + { KEY_EN_E, 0x1A }, + { KEY_EN_D, 0x1B }, + { KEY_EN_C, 0x24 }, + + { KEY_EN_F5, 0x28 }, + { KEY_EN_5, 0x29 }, + { KEY_EN_R, 0x22 }, + { KEY_EN_F, 0x23 }, + { KEY_EN_V, 0x2C }, + + { KEY_EN_F6, 0x30 }, + { KEY_EN_6, 0x31 }, + { KEY_EN_T, 0x2A }, + { KEY_EN_G, 0x2B }, + { KEY_EN_B, 0x34 }, + { KEY_EN_SPACE, 0x35 }, + + { KEY_EN_F7, 0x38 }, + { KEY_EN_7, 0x39 }, + { KEY_EN_Y, 0x32 }, + { KEY_EN_H, 0x33 }, + { KEY_EN_N, 0x3C }, + + { KEY_EN_F8, 0x40 }, + { KEY_EN_8, 0x41 }, + { KEY_EN_U, 0x3A }, + { KEY_EN_J, 0x3B }, + { KEY_EN_M, 0x44 }, + + { KEY_EN_F9, 0x48 }, + { KEY_EN_9, 0x49 }, + { KEY_EN_I, 0x42 }, + { KEY_EN_K, 0x43 }, + { KEY_EN_COMMA, 0x4C }, + + { KEY_EN_F10, 0x50 }, + { KEY_EN_0, 0x51 }, + { KEY_EN_O, 0x4A }, + { KEY_EN_L, 0x4B }, + { KEY_EN_PERIOD, 0x54 }, + { KEY_EN_RIGHT_ALT, 0x55 }, + + { KEY_EN_F11, 0x58 }, + { KEY_EN_MINUS, 0x59 }, + { KEY_EN_P, 0x52 }, + { KEY_EN_SEMICOLON, 0x53 }, + { KEY_EN_FORWARD_SLASH, 0x5C }, + { KEY_EN_RIGHT_FUNCTION, 0x5D }, + + { KEY_EN_F12, 0x60 }, + { KEY_EN_EQUALS, 0x61 }, + { KEY_EN_LEFT_BRACKET, 0x5A }, + { KEY_EN_QUOTE, 0x5B }, + { KEY_EN_RIGHT_SHIFT, 0x64 }, + { KEY_EN_RIGHT_CONTROL, 0x65 }, + + { KEY_EN_BACKSPACE, 0x69 }, + { KEY_EN_RIGHT_BRACKET, 0x62 }, + { KEY_EN_POUND, 0x6B }, + { KEY_EN_LEFT_ARROW, 0x6D }, + + { KEY_EN_ISO_ENTER, 0x6A }, + { KEY_EN_UP_ARROW, 0x74 }, + { KEY_EN_DOWN_ARROW, 0x75 }, + + { KEY_EN_INSERT, 0x79 }, + { KEY_EN_DELETE, 0x7A }, + { KEY_EN_PAGE_UP, 0x7B }, + { KEY_EN_PAGE_DOWN, 0x7C }, + { KEY_EN_RIGHT_ARROW, 0x7D }, + } + } + }, + { + ASUS_TUF_K7_LAYOUT_US, + { + *ASUS_ROG_AZOTH_LAYOUT_KEYS_US, + 81, + 6, + 16, + { + { KEY_EN_ESCAPE, 0x00 }, + { KEY_EN_BACK_TICK, 0x01 }, + { KEY_EN_TAB, 0x02 }, + { KEY_EN_CAPS_LOCK, 0x03 }, + { KEY_EN_LEFT_SHIFT, 0x04 }, + { KEY_EN_LEFT_CONTROL, 0x05 }, + + { KEY_EN_F1, 0x08 }, + { KEY_EN_1, 0x09 }, + { KEY_EN_LEFT_WINDOWS, 0x0D }, + + { KEY_EN_F2, 0x10 }, + { KEY_EN_2, 0x11 }, + { KEY_EN_Q, 0x0A }, + { KEY_EN_A, 0x0B }, + { KEY_EN_Z, 0x14 }, + { KEY_EN_LEFT_ALT, 0x15 }, + + { KEY_EN_F3, 0x18 }, + { KEY_EN_3, 0x19 }, + { KEY_EN_W, 0x12 }, + { KEY_EN_S, 0x13 }, + { KEY_EN_X, 0x1C }, + + { KEY_EN_F4, 0x20 }, + { KEY_EN_4, 0x21 }, + { KEY_EN_E, 0x1A }, + { KEY_EN_D, 0x1B }, + { KEY_EN_C, 0x24 }, + + { KEY_EN_F5, 0x28 }, + { KEY_EN_5, 0x29 }, + { KEY_EN_R, 0x22 }, + { KEY_EN_F, 0x23 }, + { KEY_EN_V, 0x2C }, + + { KEY_EN_F6, 0x30 }, + { KEY_EN_6, 0x31 }, + { KEY_EN_T, 0x2A }, + { KEY_EN_G, 0x2B }, + { KEY_EN_B, 0x34 }, + { KEY_EN_SPACE, 0x35 }, + + { KEY_EN_F7, 0x38 }, + { KEY_EN_7, 0x39 }, + { KEY_EN_Y, 0x32 }, + { KEY_EN_H, 0x33 }, + { KEY_EN_N, 0x3C }, + + { KEY_EN_F8, 0x40 }, + { KEY_EN_8, 0x41 }, + { KEY_EN_U, 0x3A }, + { KEY_EN_J, 0x3B }, + { KEY_EN_M, 0x44 }, + + { KEY_EN_F9, 0x48 }, + { KEY_EN_9, 0x49 }, + { KEY_EN_I, 0x42 }, + { KEY_EN_K, 0x43 }, + { KEY_EN_COMMA, 0x4C }, + + { KEY_EN_F10, 0x50 }, + { KEY_EN_0, 0x51 }, + { KEY_EN_O, 0x4A }, + { KEY_EN_L, 0x4B }, + { KEY_EN_PERIOD, 0x54 }, + { KEY_EN_RIGHT_ALT, 0x55 }, + + { KEY_EN_F11, 0x58 }, + { KEY_EN_MINUS, 0x59 }, + { KEY_EN_P, 0x52 }, + { KEY_EN_SEMICOLON, 0x53 }, + { KEY_EN_FORWARD_SLASH, 0x5C }, + { KEY_EN_RIGHT_FUNCTION, 0x5D }, + + { KEY_EN_F12, 0x60 }, + { KEY_EN_EQUALS, 0x61 }, + { KEY_EN_LEFT_BRACKET, 0x5A }, + { KEY_EN_QUOTE, 0x5B }, + { KEY_EN_RIGHT_SHIFT, 0x64 }, + { KEY_EN_RIGHT_CONTROL, 0x65 }, + + { KEY_EN_BACKSPACE, 0x69 }, + { KEY_EN_RIGHT_BRACKET, 0x62 }, + { KEY_EN_LEFT_ARROW, 0x6D }, + + { KEY_EN_ANSI_BACK_SLASH, 0x6A }, + { KEY_EN_ANSI_ENTER, 0x6B }, + { KEY_EN_UP_ARROW, 0x74 }, + { KEY_EN_DOWN_ARROW, 0x75 }, + + { KEY_EN_INSERT, 0x79 }, + { KEY_EN_DELETE, 0x7A }, + { KEY_EN_PAGE_UP, 0x7B }, + { KEY_EN_PAGE_DOWN, 0x7C }, + { KEY_EN_RIGHT_ARROW, 0x7D }, + } + } + }, +}; + static std::map AsusROGStrixScopeLayouts = { { diff --git a/Controllers/AsusAuraUSBController/AsusAuraUSBControllerDetect.cpp b/Controllers/AsusAuraUSBController/AsusAuraUSBControllerDetect.cpp index 4c6d77d6..75a209d3 100644 --- a/Controllers/AsusAuraUSBController/AsusAuraUSBControllerDetect.cpp +++ b/Controllers/AsusAuraUSBController/AsusAuraUSBControllerDetect.cpp @@ -44,6 +44,8 @@ /*-----------------------------------------------------------------*\ | KEYBOARDS | \*-----------------------------------------------------------------*/ +#define AURA_ROG_AZOTH_USB_PID 0x1A83 +#define AURA_ROG_AZOTH_2_4_PID 0x1A85 #define AURA_ROG_CLAYMORE_PID 0x184D #define AURA_ROG_FALCHION_WIRED_PID 0x193C #define AURA_ROG_FALCHION_WIRELESS_PID 0x193E @@ -337,6 +339,8 @@ REGISTER_HID_DETECTOR ("ASUS Aura Motherboard", DetectAs 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 ROG Strix Scope RX TKL Wireless Deluxe", DetectAsusAuraUSBKeyboards, AURA_USB_VID, AURA_ROG_STRIX_SCOPE_RX_TKL_DELUXE_PID, 1, 0xFF00); REGISTER_HID_DETECTOR_IP("ASUS ROG Strix Scope TKL PNK LTD", DetectAsusAuraUSBKeyboards, AURA_USB_VID, AURA_ROG_STRIX_SCOPE_TKL_PNK_LTD_PID, 1, 0xFF00); +REGISTER_HID_DETECTOR_IP("ASUS ROG Azoth USB", DetectAsusAuraTUFUSBKeyboard, AURA_USB_VID, AURA_ROG_AZOTH_USB_PID, 1, 0xFF00); +REGISTER_HID_DETECTOR_IP("ASUS ROG Azoth 2.4GHz", DetectAsusAuraTUFUSBKeyboard, AURA_USB_VID, AURA_ROG_AZOTH_2_4_PID, 1, 0xFF00); REGISTER_HID_DETECTOR_IP("ASUS ROG Claymore", DetectAsusAuraTUFUSBKeyboard, AURA_USB_VID, AURA_ROG_CLAYMORE_PID, 1, 0xFF00); REGISTER_HID_DETECTOR_IP("ASUS ROG Falchion (Wired)", DetectAsusAuraTUFUSBKeyboard, AURA_USB_VID, AURA_ROG_FALCHION_WIRED_PID, 1, 0xFF00); REGISTER_HID_DETECTOR_IP("ASUS ROG Falchion (Wireless)", DetectAsusAuraTUFUSBKeyboard, AURA_USB_VID, AURA_ROG_FALCHION_WIRELESS_PID, 1, 0xFF00); diff --git a/Controllers/AsusAuraUSBController/RGBController_AsusAuraTUFKeyboard.cpp b/Controllers/AsusAuraUSBController/RGBController_AsusAuraTUFKeyboard.cpp index 8f1fc8e8..aeb1014d 100644 --- a/Controllers/AsusAuraUSBController/RGBController_AsusAuraTUFKeyboard.cpp +++ b/Controllers/AsusAuraUSBController/RGBController_AsusAuraTUFKeyboard.cpp @@ -58,6 +58,8 @@ RGBController_AuraTUFKeyboard::RGBController_AuraTUFKeyboard(AuraTUFKeyboardCont AURA_KEYBOARD_SPEED_MAX = 0; AURA_KEYBOARD_SPEED_DEFAULT = 8; break; + case AURA_ROG_AZOTH_USB_PID: + case AURA_ROG_AZOTH_2_4_PID: case AURA_ROG_FALCHION_WIRED_PID: case AURA_ROG_FALCHION_WIRELESS_PID: case AURA_ROG_STRIX_FLARE_II_PID: @@ -430,6 +432,10 @@ void RGBController_AuraTUFKeyboard::SetupZones() case AURA_ROG_STRIX_FLARE_II_ANIMATE_PID: keyboard_ptr = &AsusROGStrixFlareIIAnimateLayouts; break; + case AURA_ROG_AZOTH_USB_PID: + case AURA_ROG_AZOTH_2_4_PID: + keyboard_ptr = &AsusROGAzothLayouts; + break; case AURA_ROG_FALCHION_WIRED_PID: case AURA_ROG_FALCHION_WIRELESS_PID: keyboard_ptr = &AsusFalchionLayouts;